diff --git a/.github/ISSUE_TEMPLATE/ar_bug_report.md b/.github/ISSUE_TEMPLATE/ar_bug_report.md
index 0d4aee9397..93b6e70b03 100644
--- a/.github/ISSUE_TEMPLATE/ar_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/ar_bug_report.md
@@ -1,5 +1,5 @@
 ---
-name: ar_bug_report.md
+name: Automated Review bug report
 about: Create a bug for a an issue found in the Automated Review
 title: 'AR Bug Report'
 labels: 'needs-triage,kind/bug,kind/automation'
diff --git a/.gitignore b/.gitignore
index 5f6172cd76..9012ec7576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .vscode/
 __pycache__
 AssetProcessorTemp/**
-[Bb]uild/**
+[Bb]uild/
 [Oo]ut/**
 CMakeUserPresets.json
 [Cc]ache/
diff --git a/Assets/Editor/Scripts/export_all_project_levels.py b/Assets/Editor/Scripts/export_all_project_levels.py
deleted file mode 100755
index ba900b37a8..0000000000
--- a/Assets/Editor/Scripts/export_all_project_levels.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-"""
-This script loads every level in a game project and exports them.  You will be prompted with the standard
-Check-Out/Overwrite/Cancel dialog for each level.
-This is useful when there is a version update to a file that requires re-exporting.
-"""
-import sys, os
-import azlmbr.legacy.general as general
-import azlmbr.legacy.checkout_dialog as checkout_dialog
-
-
-class CheckOutDialogEnableAll:
-    """
-    Helper class to wrap enabling the "Apply to all" checkbox in the CheckOutDialog.
-    Guarantees that the old setting will be restored.
-    To use, do:
-
-    with CheckOutDialogEnableAll():
-        # your code here
-    """
-
-    def __init__(self):
-        self.old_setting = False
-
-    def __enter__(self):
-        self.old_setting = checkout_dialog.enable_for_all(True)
-        print(self.old_setting)
-
-    def __exit__(self, type, value, traceback):
-        checkout_dialog.enable_for_all(self.old_setting)
-
-
-level_list = []
-
-
-def is_in_special_folder(file_full_path):
-    if file_full_path.find("_savebackup") >= 0:
-        return True
-    if file_full_path.find("_autobackup") >= 0:
-        return True
-    if file_full_path.find("_hold") >= 0:
-        return True
-    if file_full_path.find("_tmpresize") >= 0:
-        return True
-
-    return False
-
-
-game_folder = general.get_game_folder()
-
-
-# Recursively search every directory in the game project for files ending with .cry and .ly
-for root, dirs, files in os.walk(game_folder):
-    for file in files:
-        if file.endswith(".cry") or file.endswith(".ly"):
-            # The engine expects the full path of the .cry file
-            file_full_path = os.path.abspath(os.path.join(root, file))
-            # Exclude files in special directories
-            if not is_in_special_folder(file_full_path):
-                level_list.append(file_full_path)
-
-# make the checkout dialog enable the 'Apply to all' checkbox
-with CheckOutDialogEnableAll():
-
-    # For each valid .cry file found, open it in the editor and export it
-    for level in level_list:
-        if not isinstance(level, str):
-            # general.open_level_no_prompt expects the file path in utf8 format
-            level = level.encode("utf-8")
-
-        general.open_level_no_prompt(level)
-        general.export_to_engine()
diff --git a/Assets/Editor/Scripts/generatelod.py b/Assets/Editor/Scripts/generatelod.py
deleted file mode 100755
index 618827c5b4..0000000000
--- a/Assets/Editor/Scripts/generatelod.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-'''
-Generates a 50% lod for the selected model
-
-@argument name="Lod Percentage", type="string", default="50.0f"
-'''
-
-import sys
-import time
-
-percentage = float(sys.argv[1])
-
-selectedcgf = lodtools.getselected()
-selectedmaterial = lodtools.getselectedmaterial()
-
-loadedmodel = lodtools.loadcgf(selectedcgf)
-loadedmaterial = lodtools.loadmaterial(selectedmaterial)
-
-if loadedmodel == True and loadedmaterial == True:
-    lodtools.generatelodchain()
-    finished = 0.0
-    while finished >= 0.0:
-        finished = lodtools.generatetick()
-        print 'Lod Chain Generation progress: ' + str(finished)
-        time.sleep(1)
-        if finished == 1.0:
-            break
-    
-    lodtools.createlod(1,percentage)
-    lodtools.generatematerials(1,512,512)
-    lodtools.savetextures(1)
-    lodtools.savesettings()
-    lodtools.reloadmodel()
-
diff --git a/Assets/Editor/Scripts/lua_symbols.py b/Assets/Editor/Scripts/lua_symbols.py
deleted file mode 100644
index b21edb41d0..0000000000
--- a/Assets/Editor/Scripts/lua_symbols.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-
-# This script shows basic usage of LuaSymbolsReporterBus,
-# Which can be used to report all symbols available for
-# game scripting with Lua.
-
-import sys
-import os
-
-import azlmbr.bus as azbus
-import azlmbr.script as azscript
-import azlmbr.legacy.general as azgeneral
-
-
-def _dump_class_symbol(class_symbol: azlmbr.script.LuaClassSymbol):
-    print(f"** {class_symbol}")
-    print("Properties:")
-    for property_symbol in class_symbol.properties:
-        print(f"   - {property_symbol}")
-    print("Methods:")
-    for method_symbol in class_symbol.methods:
-        print(f"   - {method_symbol}")
-
-
-def _dump_lua_classes():
-    class_symbols = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
-                                           "GetListOfClasses")
-    print("========  Classes ==========")
-    sorted_classes_by_named = sorted(class_symbols, key=lambda class_symbol: class_symbol.name)
-    for class_symbol in sorted_classes_by_named:
-        _dump_class_symbol(class_symbol)
-        print("\n\n")
-
-
-def _dump_lua_globals():
-    global_properties = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
-                                           "GetListOfGlobalProperties")
-    print("========  Global Properties ==========")
-    sorted_properties_by_name = sorted(global_properties, key=lambda symbol: symbol.name)
-    for property_symbol in sorted_properties_by_name:
-        print(f"- {property_symbol}")
-    print("\n\n")
-    global_functions = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
-                                           "GetListOfGlobalFunctions")
-    print("========  Global Functions ==========")
-    sorted_functions_by_name = sorted(global_functions, key=lambda symbol: symbol.name)
-    for function_symbol in sorted_functions_by_name:
-        print(f"- {function_symbol}")
-    print("\n\n")    
-
-
-def _dump_lua_ebus(ebus_symbol: azlmbr.script.LuaEBusSymbol):
-    print(f">> {ebus_symbol}")
-    sorted_senders = sorted(ebus_symbol.senders, key=lambda symbol: symbol.name)
-    for sender in sorted_senders:
-        print(f"  - {sender}")
-    print("\n")
-
-
-def _dump_lua_ebuses():
-    ebuses = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
-                                           "GetListOfEBuses")
-    print("========  Ebus List ==========")
-    sorted_ebuses_by_name = sorted(ebuses, key=lambda symbol: symbol.name)
-    for ebus_symbol in sorted_ebuses_by_name:
-        _dump_lua_ebus(ebus_symbol)
-    print("\n\n")
-
-
-class WhatToDo:
-    DumpClasses = "c"
-    DumpGlobals = "g"
-    DumpEBuses  = "e"
-
-if __name__ == "__main__":
-    redirecting_stdout = False
-    orig_stdout = sys.stdout
-    if len(sys.argv) > 1:
-        output_file_name = sys.argv[1]
-        if not os.path.isabs(output_file_name):
-            game_root_path = os.path.normpath(azgeneral.get_game_folder())
-            output_file_name = os.path.join(game_root_path, output_file_name)
-        try:
-            file_obj = open(output_file_name, 'wt')
-            sys.stdout = file_obj
-            redirecting_stdout = True
-        except Exception as e:
-            print(f"Failed to open {output_file_name}: {e}")
-            sys.exit(-1)
-
-    what_to_do = [action.lower() for action in sys.argv[2:]]
-
-    # If the user did not specify what to do, then let's dump
-    # all the symbols.
-    if len(what_to_do) < 1:
-        what_to_do = [WhatToDo.DumpClasses, WhatToDo.DumpGlobals, WhatToDo.DumpEBuses]
-
-    for action in what_to_do:
-        if action == WhatToDo.DumpClasses:
-            _dump_lua_classes()
-        elif action == WhatToDo.DumpGlobals:
-            _dump_lua_globals()
-        elif action == WhatToDo.DumpEBuses:
-            _dump_lua_ebuses()
-    
-    if redirecting_stdout:
-        sys.stdout.close()
-        sys.stdout = orig_stdout
-        print(f" Lua Symbols Are available in: {output_file_name}")
diff --git a/Assets/Editor/Scripts/rename_cgf.py b/Assets/Editor/Scripts/rename_cgf.py
deleted file mode 100755
index 1196c4c6a2..0000000000
--- a/Assets/Editor/Scripts/rename_cgf.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-objects = general.get_all_objects("", "") # Get the name list of all objects in the level.
-# If there is any object with the geometry file of "objects\\default\\primitive_box.cgf",
-# change it to "objects\\default\\primitive_cube.cgf".
-for obj in objects:
-    geometry_file = general.get_entity_geometry_file(obj)
-    if geometry_file == "objects\\default\\primitive_box.cgf":
-        general.set_entity_geometry_file(obj, "objects\\default\\primitive_cube.cgf")
diff --git a/Assets/Editor/Scripts/select_story_anim_objects.py b/Assets/Editor/Scripts/select_story_anim_objects.py
deleted file mode 100755
index 93021baac4..0000000000
--- a/Assets/Editor/Scripts/select_story_anim_objects.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-objects = general.get_all_objects("AnimObject", "") # Get the name list of all anim objects in the level.
-general.clear_selection()
-# If there is any object with the geometry file whose name contains "\\story\\", select it
-for obj in objects:
-    geometry_file = general.get_entity_geometry_file(obj)
-    if geometry_file.find("\\story\\") != -1:
-        general.select_object(obj)
diff --git a/Assets/Editor/Scripts/tools_shelf_actions.py b/Assets/Editor/Scripts/tools_shelf_actions.py
deleted file mode 100755
index 8b99d76e1f..0000000000
--- a/Assets/Editor/Scripts/tools_shelf_actions.py
+++ /dev/null
@@ -1,508 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-import __future__
-import time, re, os, sys, itertools, ast 
-import azlmbr.legacy.general as general
-
-global ctrlFile
-ctrlFile = 'setState.txt'
-global logfile
-logfile = 'Editor.log'
-
-global HIDDEN_MASK_PREFIX
-HIDDEN_MASK_PREFIX= 'hidden_mask_for_'
-global HIDDEN_MASK_PREFIX_LENGTH
-HIDDEN_MASK_PREFIX_LENGTH = len(HIDDEN_MASK_PREFIX)
-
-def getLogList(logfile):
-    logList = [x for x in open(logfile, 'r')]
-    return logList
-
-def getCheckList(ctrlFile):    
-    try:
-        with open(ctrlFile):
-            stateList = open(ctrlFile, 'r')
-
-    except:
-        open(ctrlFile, 'w').close()
-        stateList = open(ctrlFile, 'r')
-
-    checkList = [x for x in stateList]
-    return checkList
-
-#Store/Restore CVars default values -----------------------------------------------------------------#
-if 'CVARS' not in globals():
-    CVARS = {}
-
-def saveDefaultValue(cVars, value):
-    if cVars not in CVARS:
-        CVARS[cVars] = value
-
-def restoreDefaultValue(cVars):
-    if cVars not in CVARS:
-        return
-
-    defaultValue = CVARS[cVars]
-    del CVARS[cVars]
-    if cVars.startswith(HIDDEN_MASK_PREFIX):
-        type = cVars[HIDDEN_MASK_PREFIX_LENGTH:]
-        general.set_hidemask(type, defaultValue)
-    else:
-        general.set_cvar(cVars, defaultValue)
-
-#toggle CVars--------------------------------------------------------------------#
-
-def updateCvars(cVars, value):
-    saveDefaultValue(cVars, value)
-    general.set_cvar(cVars, value)
-
-def toggleCvarsRestartCheck(log, state, mode, cVars, onValue, offValue, ctrlFile):
-    if log in state:
-        toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile)
-    else:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(log)
-        stateList = open(ctrlFile, 'r')
-        toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile)
-
-def toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile):
-    stateList = open(ctrlFile, 'r') 
-    setState = [x for x in enumerate(stateList)] 
-    blankCheck = [x for x in setState]
-    getList = [x for x in stateList]
-    
-    if blankCheck == []:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(''.join(str("%s,{'%s': %s}" % (mode, cVars, offValue))+'\n'))
-        general.set_cvar(cVars, offValue)
-    else:
-        stateList = open(ctrlFile, 'r')
-        checkFor = str([x for x in stateList])
-
-        if mode not in str(checkFor):
-            stateList = open(ctrlFile, 'r')
-            getList = [x for x in stateList] 
-            getList.insert(1, str("%s,{'%s': %s}\n" % (mode, cVars , offValue)))
-            print (str("{'%s': %s}\n" % (cVars , offValue)))
-            stateList = open(ctrlFile, 'w')
-            stateList.write(''.join(getList))    
-            general.set_cvar(cVars, offValue)
-            
-        else:
-            stateList = open(ctrlFile, 'r')
-            for d in enumerate(stateList):
-                values = d[1].split(',')
-                stateList = open(ctrlFile, 'r')
-                getList = [x for x in stateList] 
-                
-                if mode in values[0]:
-                    getDict = ast.literal_eval(values[1])
-                    getState = getDict.get(cVars)
-                    
-                    if getState == offValue:
-                        getDict[cVars] = onValue
-                        joinStr = [mode,",",str(getDict), '\n']
-                        newLine = ''.join(joinStr)
-                        print (getDict)
-                        getList[d[0]] = newLine
-                        stateList = open(ctrlFile, 'w')
-                        stateList.write(''.join(str(''.join(getList))))
-                        general.set_cvar(cVars, onValue)
-                    else: 
-                        getDict[cVars] = offValue
-                        joinStr = [mode,",",str(getDict), '\n']
-                        newLine = ''.join(joinStr)
-                        print (getDict)
-                        getList[d[0]] = newLine
-                        stateList = open(ctrlFile, 'w')
-                        stateList.write(''.join(str(''.join(getList))))
-                        general.set_cvar(cVars, offValue)
-
-def toggleCvarsValue(mode, cVars, onValue, offValue):
-    currentValue = general.get_cvar(cVars)
-
-    if type(onValue) is str:
-        saveDefaultValue(cVars, currentValue)
-    elif type(onValue) is int:
-        saveDefaultValue(cVars, int(currentValue))
-    elif type(onValue) is float:
-        saveDefaultValue(cVars, float(currentValue))
-    else:
-        general.log('Failed to store default value for {0}'.format(cVars))
-
-    if currentValue == str(onValue):
-        general.set_cvar(cVars, offValue)
-    else:
-        general.set_cvar(cVars, onValue)
-                            
-#toggleConsol--------------------------------------------------------------------#        
-                    
-def toggleConsolRestartCheck(log,state, mode, onValue, offValue, ctrlFile):    
-    if log in state:
-        toggleConsolV(mode, onValue, offValue, ctrlFile)
-    else:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(log)
-        stateList = open(ctrlFile, 'r') 
-        toggleConsolV(mode, onValue, offValue, ctrlFile)
-    
-def toggleConsolV(mode, onValue, offValue):
-    stateList = open(ctrlFile, 'r') 
-    setState     = [x for x in enumerate(stateList)] 
-    blankCheck     = [x for x in setState]
-    getList = [x for x in stateList]
-    onOffList = [onValue, offValue]
-    
-    if blankCheck == []:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(''.join(str("%s,'%s'" % (mode, offValue))+'\n'))
-        general.run_console(offValue)
-    else:
-        stateList = open(ctrlFile, 'r')
-        checkFor = str([x for x in stateList])
-        
-        if mode not in str(checkFor):
-            stateList = open(ctrlFile, 'r')
-            getList = [x for x in stateList] 
-            getList.insert(1, str("%s,'%s'\n" % (mode, offValue)))
-            print (str("{'%s': %s}\n" % (cVars , offValue)))
-            stateList = open(ctrlFile, 'w')
-            stateList.write(''.join(getList))    
-            general.run_console(onValue)
-            
-        else:
-            stateList = open(ctrlFile, 'r')
-            for d in enumerate(stateList):
-            
-                values = d[1].split(',')
-                
-                stateList = open(ctrlFile, 'r')
-                getList = [x for x in stateList] 
-            
-                if mode in values[0]:
-                    getDict = values[1]
-                    off = ["'",str(offValue),"'", '\n']
-                    joinoff = ''.join(off)
-
-                    if values[1] == joinoff:
-                        getDict = onValue
-                        joinStr = [mode,",","'",getDict,"'", '\n']
-                        newLine = ''.join(joinStr)
-                        print (getDict)
-                        getList[d[0]] = str(newLine)                            
-                        stateList = open(ctrlFile, 'w')
-                        stateList.write(''.join(str(''.join(getList))))
-                        general.run_console(onValue)
-                    else: 
-                        getDict = offValue
-                        joinStr = [mode,",","'",getDict,"'", '\n']
-                        newLine = ''.join(joinStr)
-                        print (getDict)
-                        getList[d[0]] = str(newLine)                    
-                        stateList = open(ctrlFile, 'w')
-                        stateList.write(''.join(str(''.join(getList))))
-                        general.run_console(offValue)            
-
-def toggleConsolValue(log, state, mode, onValue, offValue):
-    logList = getLogList(logfile)
-    checkList = getCheckList(ctrlFile)
-    toggleConsolRestartCheck(logList[1],checkList, mode, onValue, offValue, ctrlFile)
-    
-#cycleCvars----------------------------------------------------------------------#
-        
-def cycleCvarsRestartCheck(log, state, mode, cVars, cycleList, ctrlFile):    
-    if log in state:
-        cycleCvarsV(mode, cVars, cycleList, ctrlFile)
-    else:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(log)
-        stateList = open(ctrlFile, 'r') 
-        cycleCvarsV(mode, cVars, cycleList, ctrlFile)
-    
-def cycleCvarsV(mode, cVars, cycleList, ctrlFile):
-    stateList = open(ctrlFile, 'r') 
-    setState     = [x for x in enumerate(stateList)] 
-    blankCheck     = [x for x in setState]
-    getList = [x for x in stateList]
-
-    if blankCheck == []:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(''.join(str("%s,{'%s': %s}" % (mode, cVars, cycleList[1]))+'\n'))
-        general.set_cvar(cVars, cycleList[1])
-    else:
-        stateList = open(ctrlFile, 'r')
-        checkFor = str([x for x in stateList])
-        
-        if mode not in str(checkFor):
-            stateList = open(ctrlFile, 'r')
-            getList = [x for x in stateList] 
-            getList.insert(1, str("%s,{'%s': %s}\n" % (mode, cVars , cycleList[1])))
-            stateList = open(ctrlFile, 'w')
-            stateList.write(''.join(getList))    
-            general.set_cvar(cVars, cycleList[1])
-
-        else:
-            stateList = open(ctrlFile, 'r')
-            
-            for d in enumerate(stateList):
-                stateList = open(ctrlFile, 'r')
-                getList = [x for x in stateList] 
-                values = d[1].split(',')
-                
-                if mode in values[0]:
-                    getDict = ast.literal_eval(values[1])
-                    getState = getDict.get(cVars)
-
-                    cycleL = [x for x in enumerate(cycleList)]
-
-                    for x in cycleL:
-                        if getState == x[1]:
-                            number = [n[1] for n in cycleL] 
-                            getMax = max(number)
-                            nextNum = x[0]+1
-                        
-                            if nextNum > getMax:
-                                getDict[cVars] = cycleList[0]
-                                joinStr = [mode,",",str(getDict), '\n']
-                                newLine = ''.join(joinStr)
-                                getList[d[0]] = newLine
-                                print (getDict)
-                                stateList = open(ctrlFile, 'w')
-                                stateList.write(''.join(str(''.join(getList))))
-                                general.set_cvar(cVars, cycleList[0])
-                            else:
-                                getDict[cVars] = cycleList[x[0]+1]
-                                joinStr = [mode,",",str(getDict), '\n']
-                                newLine = ''.join(joinStr)
-                                getList[d[0]] = newLine
-                                print (getDict)
-                                stateList = open(ctrlFile, 'w')
-                                stateList.write(''.join(str(''.join(getList))))
-                                general.set_cvar(cVars, cycleList[x[0]+1])
-
-def cycleCvarsValue(log, state, mode, cVars, cycleList):
-    logList = getLogList(logfile)
-    checkList = getCheckList(ctrlFile)
-    cycleCvarsRestartCheck(logList[1],checkList, mode, cVars, cycleList, ctrlFile)        
-    
-def cycleCvarsFloatValue(cVars, cycleList):
-    currentValueAsString = general.get_cvar(cVars)
-    try:
-        currentValue = float(currentValueAsString)
-    except:
-        currentValue = -1.0
-
-    saveDefaultValue(cVars, currentValue)
-
-    # make sure we sort the list in ascending fashion
-    cycleList = sorted(cycleList)
-
-    # find out what the next closest index is
-    newIndex = 0
-    for x in cycleList:
-        if (currentValue < x):
-            break
-        newIndex = newIndex + 1
-
-    # loop around, if we need to
-    if newIndex >= len(cycleList):
-        newIndex = 0
-
-    general.set_cvar(cVars, cycleList[newIndex])
-
-
-def cycleCvarsIntValue(cVars, cycleList):
-    currentValueAsString = general.get_cvar(cVars)
-    try:
-        currentValue = int(currentValueAsString)
-    except:
-        currentValue = 0
-
-    saveDefaultValue(cVars, currentValue)
-
-    # find out what index we're on already
-    # default to -1 so that when we increment to the next, we'll be at 0
-    newIndex = -1
-    for x in cycleList:
-        if (currentValue == x):
-            break
-        newIndex = newIndex + 1
-
-    # move to the next item
-    newIndex = newIndex + 1
-
-    # validate
-    if newIndex >= len(cycleList):
-        newIndex = 0
-
-    general.set_cvar(cVars, cycleList[newIndex])
-
-#cycleConsol----------------------------------------------------------------------#        
-        
-def cycleConsolRestartCheck(log, state, mode, cycleList, ctrlFile):    
-    if log in state:
-        cycleConsolV(mode, cycleList, ctrlFile)
-    else:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(log)
-        stateList = open(ctrlFile, 'r') 
-        cycleConsolV(mode, cycleList, ctrlFile)
-    
-def cycleConsolV(mode, cycleList, ctrlFile):
-    stateList = open(ctrlFile, 'r') 
-    setState     = [x for x in enumerate(stateList)] 
-    blankCheck     = [x for x in setState]
-    getList = [x for x in stateList]
-    
-    if blankCheck == []:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(''.join(str("%s,'%s'" % (mode, cycleList[0]))+'\n'))
-        general.run_console(cycleList[0])
-    else:
-        stateList = open(ctrlFile, 'r')
-        checkFor = str([x for x in stateList])
-                
-        if mode not in str(checkFor):
-            stateList = open(ctrlFile, 'r')
-            getList = [x for x in stateList] 
-            getList.insert(1, str("%s,'%s'\n" % (mode, cycleList[0])))
-            stateList = open(ctrlFile, 'w')
-            stateList.write(''.join(getList))    
-            general.run_console(cycleList[0])
-            
-        else:
-            stateList = open(ctrlFile, 'r')
-            for d in enumerate(stateList):
-                stateList = open(ctrlFile, 'r')
-                getList = [x for x in stateList] 
-                values = d[1].split(',')
-
-                if mode in values[0]:
-                    newValue = ''.join(values[1].split('\n'))
-                    cycleL = [e for e in enumerate(cycleList)]
-                    getDict = ''.join(values[1].split('\n'))
-                    
-                    for x in cycleL:
-
-                        if newValue in "'%s'" % x[1]:
-                            number = [n[0] for n in cycleL] 
-                            getMax = max(number)
-                            nextNum = x[0]+1
-                            
-                            if nextNum > getMax:
-                                getDict = '%s' % cycleList[0]
-                                joinStr = [mode,",","'",getDict,"'", '\n']
-                                newLine = ''.join(joinStr)
-                                getList[d[0]] = newLine
-                                print (getDict)
-                                stateList = open(ctrlFile, 'w')
-                                stateList.write(''.join(str(''.join(getList))))
-                                general.run_console(getDict)
-                            else:
-                                getDict = '%s' % cycleList[x[0]+1]
-                                joinStr = [mode,",","'",getDict,"'", '\n']
-                                newLine = ''.join(joinStr)
-                                getList[d[0]] = newLine
-                                print (getDict)
-                                stateList = open(ctrlFile, 'w')
-                                stateList.write(''.join(str(''.join(getList))))
-                                general.run_console(getDict)
-                                
-def cycleConsolValue(mode, cycleList):
-    logList = getLogList(logfile)
-    checkList = getCheckList(ctrlFile)
-    cycleConsolRestartCheck(logList[1],checkList, mode, cycleList, ctrlFile)
-
-def toggleHideMaskValues(type):
-    cVars = "%s%s" % (HIDDEN_MASK_PREFIX, type)
-    currentValue = general.get_hidemask(type)
-    saveDefaultValue(cVars, int(currentValue))
-    if (currentValue):
-        general.set_hidemask(type, 0)
-    else:
-        general.set_hidemask(type, 1)
-
-#toggleHide------------------------------------------------------------------------#
-        
-def toggleHideRestartCheck(log, state, mode, type, onValue, offValue, ctrlFile):
-    if log in state:
-        toggleHideByT(mode, type, onValue, offValue, ctrlFile)
-    else:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(log)
-        stateList = open(ctrlFile, 'r') 
-        toggleHideByT(mode, type, onValue, offValue, ctrlFile)
-
-def toggleHideByType(mode, type, onValue, offValue):
-    logList = getLogList(logfile)
-    checkList = getCheckList(ctrlFile)
-    toggleHideRestartCheck(logList[1],checkList, mode, type, onValue, offValue, ctrlFile)
-    
-def toggleHideByT(mode, type, onValue, offValue, ctrlFile):
-    stateList = open(ctrlFile, 'r') 
-    setState     = [x for x in enumerate(stateList)] 
-    blankCheck     = [x for x in setState]
-    getList = [x for x in stateList]
-    
-    if blankCheck == []:
-        stateList = open(ctrlFile, 'w')
-        stateList.write(''.join(str("%s,{'%s': %s}" % (mode, type, offValue))+'\n'))
-        
-        hideByType(type)
-    else:
-        stateList = open(ctrlFile, 'r')
-        checkFor = str([x for x in stateList])
-        
-        if mode not in str(checkFor):
-            stateList = open(ctrlFile, 'r')
-            getList = [x for x in stateList] 
-            getList.insert(1, str("%s,{'%s': %s}\n" % (mode, type , offValue)))
-            print (str("{'%s': %s}\n" % (type , offValue)))
-            stateList = open(ctrlFile, 'w')
-            stateList.write(''.join(getList))    
-            hideByType(type)
-
-        else:
-            stateList = open(ctrlFile, 'r')
-            for d in enumerate(stateList):
-                values = d[1].split(',')
-                stateList = open(ctrlFile, 'r')
-                getList = [x for x in stateList] 
-                
-                if mode in values[0]:
-                    getDict = ast.literal_eval(values[1])
-                    getState = getDict.get(type)
-                    
-                    if getState == offValue:
-                        getDict[type] = onValue
-                        joinStr = [mode,",",str(getDict), '\n']
-                        newLine = ''.join(joinStr)
-                        print (getDict)
-                        getList[d[0]] = newLine
-                        stateList = open(ctrlFile, 'w')
-                        stateList.write(''.join(str(''.join(getList))))
-                        unHideByType(type)
-                    else: 
-                        getDict[type] = offValue
-                        joinStr = [mode,",",str(getDict), '\n']
-                        newLine = ''.join(joinStr)
-                        print (getDict)
-                        getList[d[0]] = newLine
-                        stateList = open(ctrlFile, 'w')
-                        stateList.write(''.join(str(''.join(getList))))
-                        hideByType(type)
-
-def hideByType(type):    
-    typeList = general.get_all_objects(str(type), "")
-    for x in typeList:
-        general.hide_object(x)
-            
-def unHideByType(type):                
-    typeList = general.get_all_objects(str(type), "")
-    for x in typeList:
-        general.unhide_object(x)
diff --git a/Assets/Editor/Translation/scriptcanvas_en_us.ts b/Assets/Editor/Translation/scriptcanvas_en_us.ts
index 7b8361c879..6d436b7caf 100644
--- a/Assets/Editor/Translation/scriptcanvas_en_us.ts
+++ b/Assets/Editor/Translation/scriptcanvas_en_us.ts
@@ -62164,7 +62164,7 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
     <message id="HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGADDED_OUTPUT0_NAME">
         <source>HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGADDED_OUTPUT0_NAME</source>
         <comment>Simple Type: EntityID C++ Type: const EntityId&amp;</comment>
-        <translation type="unfinished">Entity</translation>
+        <translation type="unfinished">EntityID</translation>
     </message>
     <message id="HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGADDED_OUTPUT0_TOOLTIP">
         <source>HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGADDED_OUTPUT0_TOOLTIP</source>
@@ -62202,7 +62202,7 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
     <message id="HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGREMOVED_OUTPUT0_NAME">
         <source>HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGREMOVED_OUTPUT0_NAME</source>
         <comment>Simple Type: EntityID C++ Type: const EntityId&amp;</comment>
-        <translation type="unfinished">Entity</translation>
+        <translation type="unfinished">EntityId</translation>
     </message>
     <message id="HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGREMOVED_OUTPUT0_TOOLTIP">
         <source>HANDLER_TAGGLOBALNOTIFICATIONBUS_ONENTITYTAGREMOVED_OUTPUT0_TOOLTIP</source>
@@ -81852,7 +81852,7 @@ The element is removed from its current parent and added as a child of the new p
     <message id="HANDLER_SPAWNERCOMPONENTNOTIFICATIONBUS_ONENTITYSPAWNED_OUTPUT1_NAME">
         <source>HANDLER_SPAWNERCOMPONENTNOTIFICATIONBUS_ONENTITYSPAWNED_OUTPUT1_NAME</source>
         <comment>Simple Type: EntityID C++ Type: const EntityId&amp;</comment>
-        <translation type="unfinished">Entity</translation>
+        <translation type="unfinished">EntityID</translation>
     </message>
     <message id="HANDLER_SPAWNERCOMPONENTNOTIFICATIONBUS_ONENTITYSPAWNED_OUTPUT1_TOOLTIP">
         <source>HANDLER_SPAWNERCOMPONENTNOTIFICATIONBUS_ONENTITYSPAWNED_OUTPUT1_TOOLTIP</source>
@@ -89198,7 +89198,7 @@ The element is removed from its current parent and added as a child of the new p
     <message id="HANDLER_ENTITYBUS_ONENTITYACTIVATED_OUTPUT0_NAME">
         <source>HANDLER_ENTITYBUS_ONENTITYACTIVATED_OUTPUT0_NAME</source>
         <comment>Simple Type: EntityID C++ Type: const EntityId&amp;</comment>
-        <translation type="unfinished">Entity</translation>
+        <translation type="unfinished">EntityID</translation>
     </message>
     <message id="HANDLER_ENTITYBUS_ONENTITYACTIVATED_OUTPUT0_TOOLTIP">
         <source>HANDLER_ENTITYBUS_ONENTITYACTIVATED_OUTPUT0_TOOLTIP</source>
@@ -89236,7 +89236,7 @@ The element is removed from its current parent and added as a child of the new p
     <message id="HANDLER_ENTITYBUS_ONENTITYDEACTIVATED_OUTPUT0_NAME">
         <source>HANDLER_ENTITYBUS_ONENTITYDEACTIVATED_OUTPUT0_NAME</source>
         <comment>Simple Type: EntityID C++ Type: const EntityId&amp;</comment>
-        <translation type="unfinished">Entity</translation>
+        <translation type="unfinished">EntityID</translation>
     </message>
     <message id="HANDLER_ENTITYBUS_ONENTITYDEACTIVATED_OUTPUT0_TOOLTIP">
         <source>HANDLER_ENTITYBUS_ONENTITYDEACTIVATED_OUTPUT0_TOOLTIP</source>
diff --git a/Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice b/Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
index 1b7dfdf40d..b82c482c4f 100644
--- a/Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
+++ b/Assets/Engine/EngineAssets/Slices/DefaultLevelSetup.slice
@@ -145,7 +145,7 @@
 											<Class name="float" field="ProjectorNearPlane" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}" value="0.0000000" specializationTypeId="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="ProjectorTexture" type="{68E92460-5C0C-4031-9620-6F1A08763243}" version="1" specializationTypeId="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}" version="1" specializationTypeId="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}" value="engineassets/textures/defaults/spot_default.dds" specializationTypeId="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="AssetPath" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}" value="" specializationTypeId="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 												</Class>
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::MaterialAsset&gt;" field="ProjectorMaterial" type="{B7B8ECC7-FF89-4A76-A50E-4C6CA2B6E6B4}" version="1" specializationTypeId="{B7B8ECC7-FF89-4A76-A50E-4C6CA2B6E6B4}">
diff --git a/Assets/Engine/Entities/GeomCache.ent b/Assets/Engine/Entities/GeomCache.ent
deleted file mode 100644
index e7a63190c3..0000000000
--- a/Assets/Engine/Entities/GeomCache.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf441215a769562f88aa20711aee68dadcbf02597d1e2270547055e8e6aec6a3
-size 77
diff --git a/Assets/Engine/Scripts/Entities/Render/GeomCache.lua b/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
deleted file mode 100644
index b496aecd8d..0000000000
--- a/Assets/Engine/Scripts/Entities/Render/GeomCache.lua
+++ /dev/null
@@ -1,178 +0,0 @@
-----------------------------------------------------------------------------------------------------
---
--- Copyright (c) Contributors to the Open 3D Engine Project.
--- For complete copyright and license terms please see the LICENSE at the root of this distribution.
---
--- SPDX-License-Identifier: Apache-2.0 OR MIT
---
---
---
-----------------------------------------------------------------------------------------------------
-Script.ReloadScript("scripts/Utils/EntityUtils.lua")
-
-GeomCache =
-{
-    Properties = {
-        geomcacheFile = "EngineAssets/GeomCaches/defaultGeomCache.cax",
-        bPlaying = 0,
-        fStartTime = 0,
-        bLooping = 0,
-        objectStandIn = "",
-        materialStandInMaterial = "",
-        objectFirstFrameStandIn = "",
-        materialFirstFrameStandInMaterial = "",
-        objectLastFrameStandIn = "",
-        materialLastFrameStandInMaterial = "",
-        fStandInDistance = 0,
-        fStreamInDistance = 0,        
-        Physics = {
-            bPhysicalize = 0,
-        }        
-    },
-
-    Editor={
-        Icon = "animobject.bmp",
-        IconOnTop = 1,
-    },
-    
-    bPlaying = 0,
-    currentTime = 0,
-    precacheTime = 0,
-    bPrecachedOutputTriggered = false,
-}
-
-function GeomCache:OnLoad(table)  
-    self.currentTime = table.currentTime;    
-end
-
-function GeomCache:OnSave(table)  
-    table.currentTime = self.currentTime;
-end
-
-function GeomCache:OnSpawn()
-    self.currentTime = self.Properties.fStartTime;
-    self:SetFromProperties();
-end
-
-function GeomCache:OnReset()
-    self.currentTime = self.Properties.fStartTime;
-    self.bPrecachedOutputTriggered = true;
-    self:SetFromProperties();    
-end
-
-function GeomCache:SetFromProperties()
-    local Properties = self.Properties;
-    
-    if (Properties.geomcacheFile == "") then
-        do return end;
-    end    
-    
-    self:LoadGeomCache(0, Properties.geomcacheFile);    
-    
-    self.bPlaying = Properties.bPlaying;
-    if (self.bPlaying == 0) then
-        self.currentTime = Properties.fStartTime;
-    end    
-    
-    self:SetGeomCachePlaybackTime(self.currentTime);
-    self:SetGeomCacheParams(Properties.bLooping, Properties.objectStandIn, Properties.materialStandInMaterial, Properties.objectFirstFrameStandIn, 
-        Properties.materialFirstFrameStandInMaterial, Properties.objectLastFrameStandIn, Properties.materialLastFrameStandInMaterial, 
-        Properties.fStandInDistance, Properties.fStreamInDistance);
-    self:SetGeomCacheStreaming(false, 0);
-
-    if (Properties.Physics.bPhysicalize == 1) then
-        local tempPhysParams = EntityCommon.TempPhysParams;
-        self:Physicalize(0, PE_ARTICULATED, tempPhysParams);
-    end
-    
-    self:Activate(1);
-end
-
-function GeomCache:PhysicalizeThis()
-    local Physics = self.Properties.Physics;
-    EntityCommon.PhysicalizeRigid(self, 0, Physics, false);
-end
-
-function GeomCache:OnUpdate(dt)
-    if (self.bPlaying == 1) then
-        self:SetGeomCachePlaybackTime(self.currentTime);
-    end
-
-    if (self:IsGeomCacheStreaming() and not self.bPrecachedOutputTriggered) then
-        local precachedTime = self:GetGeomCachePrecachedTime();
-        if (precachedTime >= self.precacheTime) then            
-            self:ActivateOutput("Precached", true);
-            self.bPrecachedOutputTriggered = true;
-        end
-    end
-
-    if (self.bPlaying == 1) then
-        self.currentTime = self.currentTime + dt;
-    end        
-end
-
-function GeomCache:OnPropertyChange()
-    self:SetFromProperties();
-end
-
-function GeomCache:Event_Start(sender, val)
-    self.bPlaying = 1;
-end
-
-function GeomCache:Event_Stop(sender, value)
-    self.bPlaying = 0;
-end
-
-function GeomCache:Event_SetTime(sender, value)
-    self.currentTime = value;
-end
-
-function GeomCache:Event_StartStreaming(sender, value)
-    self.bPrecachedOutputTriggered = false;
-    self:SetGeomCacheStreaming(true, self.currentTime);
-end
-
-function GeomCache:Event_StopStreaming(sender, value)
-    self:SetGeomCacheStreaming(false, 0);
-end
-
-function GeomCache:Event_PrecacheTime(sender, value)
-    self.precacheTime = value;
-end
-
-function GeomCache:Event_Hide(sender, value)
-    self:Hide(1);
-end
-
-function GeomCache:Event_Unhide(sender, value)
-    self:Hide(0);
-end
-
-function GeomCache:Event_StopDrawing(sender, value)
-    self:SetGeomCacheDrawing(false);
-end
-
-function GeomCache:Event_StartDrawing(sender, value)
-    self:SetGeomCacheDrawing(true);
-end
-
-GeomCache.FlowEvents =
-{
-    Inputs =
-    {
-        Start = { GeomCache.Event_Start, "any" },
-        Stop = { GeomCache.Event_Stop, "any" },
-        SetTime = { GeomCache.Event_SetTime, "float" },
-        StartStreaming = { GeomCache.Event_StartStreaming, "any" },
-        StopStreaming = { GeomCache.Event_StopStreaming, "any" },
-        PrecacheTime = { GeomCache.Event_PrecacheTime, "float" },
-        Hide = { GeomCache.Event_Hide, "any" },
-        Unhide = { GeomCache.Event_Unhide, "any" },
-        StopDrawing = { GeomCache.Event_StopDrawing, "any" },
-        StartDrawing = { GeomCache.Event_StartDrawing, "any" },
-    },
-    Outputs =
-    {
-        Precached = "bool",
-    },
-}
diff --git a/AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/r0-b_body.fbx.assetinfo b/AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/R0-B_Body.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/r0-b_body.fbx.assetinfo
rename to AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/R0-B_Body.fbx.assetinfo
diff --git a/AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/r0-b_body.fbx.assetinfo b/AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/R0-B_Body.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/r0-b_body.fbx.assetinfo
rename to AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/R0-B_Body.fbx.assetinfo
diff --git a/AutomatedTesting/CMakeLists.txt b/AutomatedTesting/CMakeLists.txt
index dee9d73aea..1c5382ba4b 100644
--- a/AutomatedTesting/CMakeLists.txt
+++ b/AutomatedTesting/CMakeLists.txt
@@ -8,11 +8,12 @@
 
 if(NOT PROJECT_NAME)
     cmake_minimum_required(VERSION 3.20)
+    include(cmake/CompilerSettings.cmake)
     project(AutomatedTesting
         LANGUAGES C CXX
         VERSION 1.0.0.0
     )
-    include(EngineFinder.cmake OPTIONAL)
+    include(cmake/EngineFinder.cmake OPTIONAL)
     find_package(o3de REQUIRED)
     o3de_initialize()
 else()
diff --git a/AutomatedTesting/Editor/Scripts/auto_lod.py b/AutomatedTesting/Editor/Scripts/auto_lod.py
new file mode 100644
index 0000000000..058303242a
--- /dev/null
+++ b/AutomatedTesting/Editor/Scripts/auto_lod.py
@@ -0,0 +1,124 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+import os, traceback, binascii, sys, json, pathlib, logging
+import azlmbr.math
+import azlmbr.bus
+from scene_helpers import *
+
+#
+# SceneAPI Processor
+#
+
+def update_manifest(scene):
+    import uuid
+    import azlmbr.scene as sceneApi
+    import azlmbr.scene.graph
+    from scene_api import scene_data as sceneData
+
+    graph = sceneData.SceneGraph(scene.graph)
+    # Get a list of all the mesh nodes, as well as all the nodes
+    mesh_name_list, all_node_paths = get_mesh_node_names(graph)
+    mesh_name_list.sort(key=lambda node: str.casefold(node.get_path()))
+    scene_manifest = sceneData.SceneManifest()
+
+    clean_filename = scene.sourceFilename.replace('.', '_')
+
+    # Compute the filename of the scene file
+    source_basepath = scene.watchFolder
+    source_relative_path = os.path.dirname(os.path.relpath(clean_filename, source_basepath))
+    source_filename_only = os.path.basename(clean_filename)
+
+    created_entities = []
+    previous_entity_id = azlmbr.entity.InvalidEntityId
+    first_mesh = True
+
+    # Make a list of mesh node paths
+    mesh_path_list = list(map(lambda node: node.get_path(), mesh_name_list))
+
+    # Assume the first mesh is the main mesh
+    main_mesh = mesh_name_list[0]
+    mesh_path = main_mesh.get_path()
+
+    # Create a unique mesh group name using the filename + node name
+    mesh_group_name = '{}_{}'.format(source_filename_only, main_mesh.get_name())
+    # Remove forbidden filename characters from the name since this will become a file on disk later
+    mesh_group_name = "".join(char for char in mesh_group_name if char not in "|<>:\"/?*\\")
+    # Add the MeshGroup to the manifest and give it a unique ID
+    mesh_group = scene_manifest.add_mesh_group(mesh_group_name)
+    mesh_group['id'] = '{' + str(uuid.uuid5(uuid.NAMESPACE_DNS, source_filename_only + mesh_path)) + '}'
+    # Set our current node as the only node that is included in this MeshGroup
+    scene_manifest.mesh_group_select_node(mesh_group, mesh_path)
+
+    # Explicitly remove all other nodes to prevent implicit inclusions
+    for node in mesh_path_list:
+        if node != mesh_path:
+            scene_manifest.mesh_group_unselect_node(mesh_group, node)
+
+    # Create a LOD rule
+    lod_rule = scene_manifest.mesh_group_add_lod_rule(mesh_group)
+
+    # Loop all the mesh nodes after the first
+    for x in mesh_path_list[1:]:
+        # Add a new LOD level
+        lod = scene_manifest.lod_rule_add_lod(lod_rule)
+        # Select the current mesh for this LOD level
+        scene_manifest.lod_select_node(lod, x)
+
+        # Unselect every other mesh for this LOD level
+        for y in mesh_path_list:
+            if y != x:
+                scene_manifest.lod_unselect_node(lod, y)
+
+    # Create an editor entity
+    entity_id = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "CreateEditorReadyEntity", mesh_group_name)
+    # Add an EditorMeshComponent to the entity
+    editor_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName", entity_id, "AZ::Render::EditorMeshComponent")
+    # Set the ModelAsset assetHint to the relative path of the input asset + the name of the MeshGroup we just created + the azmodel extension
+    # The MeshGroup we created will be output as a product in the asset's path named mesh_group_name.azmodel
+    # The assetHint will be converted to an AssetId later during prefab loading
+    json_update = json.dumps({
+        "Controller": { "Configuration": { "ModelAsset": {
+            "assetHint": os.path.join(source_relative_path, mesh_group_name) + ".azmodel" }}}
+        });
+    # Apply the JSON above to the component we created
+    result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, editor_mesh_component, json_update)
+
+    if not result:
+        raise RuntimeError("UpdateComponentForEntity failed for Mesh component")
+
+    create_prefab(scene_manifest, source_filename_only, [entity_id])
+
+    # Convert the manifest to a JSON string and return it
+    new_manifest = scene_manifest.export()
+
+    return new_manifest
+
+sceneJobHandler = None
+
+def on_update_manifest(args):
+    try:
+        scene = args[0]
+        return update_manifest(scene)
+    except RuntimeError as err:
+        print (f'ERROR - {err}')
+        log_exception_traceback()
+    except:
+        log_exception_traceback()
+
+    global sceneJobHandler
+    sceneJobHandler = None
+
+# try to create SceneAPI handler for processing
+try:
+    import azlmbr.scene as sceneApi
+    if (sceneJobHandler == None):
+        sceneJobHandler = sceneApi.ScriptBuildingNotificationBusHandler()
+        sceneJobHandler.connect()
+        sceneJobHandler.add_callback('OnUpdateManifest', on_update_manifest)
+except:
+    sceneJobHandler = None
diff --git a/AutomatedTesting/Editor/Scripts/scene_helpers.py b/AutomatedTesting/Editor/Scripts/scene_helpers.py
new file mode 100644
index 0000000000..761068e796
--- /dev/null
+++ b/AutomatedTesting/Editor/Scripts/scene_helpers.py
@@ -0,0 +1,95 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import traceback, logging, json
+from typing import Tuple, List
+
+import azlmbr.bus
+from scene_api import scene_data as sceneData
+from scene_api.scene_data import SceneGraphName
+
+
+def log_exception_traceback():
+    """
+    Outputs an exception stacktrace.
+    """
+    data = traceback.format_exc()
+    logger = logging.getLogger('python')
+    logger.error(data)
+
+
+def sanitize_name_for_disk(name: str):
+    """
+    Removes illegal filename characters from a string.
+
+    :param name: String to clean.
+    :return: Name with illegal characters removed.
+    """
+    return "".join(char for char in name if char not in "|<>:\"/?*\\")
+
+
+def get_mesh_node_names(scene_graph: sceneData.SceneGraph) -> Tuple[List[SceneGraphName], List[str]]:
+    """
+    Returns a tuple of all the mesh nodes as well as all the node paths
+
+    :param scene_graph: Scene graph to search
+    :return: Tuple of [Mesh Nodes, All Node Paths]
+    """
+    import azlmbr.scene as sceneApi
+    import azlmbr.scene.graph
+
+    mesh_data_list = []
+    node = scene_graph.get_root()
+    children = []
+    paths = []
+
+    while node.IsValid():
+        # store children to process after siblings
+        if scene_graph.has_node_child(node):
+            children.append(scene_graph.get_node_child(node))
+
+        node_name = sceneData.SceneGraphName(scene_graph.get_node_name(node))
+        paths.append(node_name.get_path())
+
+        # store any node that has mesh data content
+        node_content = scene_graph.get_node_content(node)
+        if node_content.CastWithTypeName('MeshData'):
+            if scene_graph.is_node_end_point(node) is False:
+                if len(node_name.get_path()):
+                    mesh_data_list.append(sceneData.SceneGraphName(scene_graph.get_node_name(node)))
+
+        # advance to next node
+        if scene_graph.has_node_sibling(node):
+            node = scene_graph.get_node_sibling(node)
+        elif children:
+            node = children.pop()
+        else:
+            node = azlmbr.scene.graph.NodeIndex()
+
+    return mesh_data_list, paths
+
+
+def create_prefab(scene_manifest: sceneData.SceneManifest, prefab_name: str, entities: list) -> None:
+    prefab_filename = prefab_name + ".prefab"
+    created_template_id = azlmbr.prefab.PrefabSystemScriptingBus(azlmbr.bus.Broadcast, "CreatePrefab", entities,
+                                                                 prefab_filename)
+
+    if created_template_id is None or created_template_id == azlmbr.prefab.InvalidTemplateId:
+        raise RuntimeError("CreatePrefab {} failed".format(prefab_filename))
+
+    # Convert the prefab to a JSON string
+    output = azlmbr.prefab.PrefabLoaderScriptingBus(azlmbr.bus.Broadcast, "SaveTemplateToString", created_template_id)
+
+    if output is not None and output.IsSuccess():
+        json_string = output.GetValue()
+        uuid = azlmbr.math.Uuid_CreateRandom().ToString()
+        json_result = json.loads(json_string)
+        # Add a PrefabGroup to the manifest and store the JSON on it
+        scene_manifest.add_prefab_group(prefab_name, uuid, json_result)
+    else:
+        raise RuntimeError(
+            "SaveTemplateToString failed for template id {}, prefab {}".format(created_template_id, prefab_filename))
diff --git a/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py b/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py
index e832b1f82b..6151585f26 100644
--- a/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py
+++ b/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py
@@ -5,55 +5,16 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 #
-import os, traceback, binascii, sys, json, pathlib
-import azlmbr.math
 import azlmbr.bus
+import azlmbr.math
+
+from scene_helpers import *
+
 
 #
 # SceneAPI Processor
 #
 
-
-def log_exception_traceback():
-    exc_type, exc_value, exc_tb = sys.exc_info()
-    data = traceback.format_exception(exc_type, exc_value, exc_tb)
-    print(str(data))
-
-def get_mesh_node_names(sceneGraph):
-    import azlmbr.scene as sceneApi
-    import azlmbr.scene.graph
-    from scene_api import scene_data as sceneData
-
-    meshDataList = []
-    node = sceneGraph.get_root()
-    children = []
-    paths = []
-
-    while node.IsValid():
-        # store children to process after siblings
-        if sceneGraph.has_node_child(node):
-            children.append(sceneGraph.get_node_child(node))
-
-        nodeName = sceneData.SceneGraphName(sceneGraph.get_node_name(node))
-        paths.append(nodeName.get_path())
-
-        # store any node that has mesh data content
-        nodeContent = sceneGraph.get_node_content(node)
-        if nodeContent.CastWithTypeName('MeshData'):
-            if sceneGraph.is_node_end_point(node) is False:
-                if (len(nodeName.get_path())):
-                    meshDataList.append(sceneData.SceneGraphName(sceneGraph.get_node_name(node)))
-
-        # advance to next node
-        if sceneGraph.has_node_sibling(node):
-            node = sceneGraph.get_node_sibling(node)
-        elif children:
-            node = children.pop()
-        else:
-            node = azlmbr.scene.graph.NodeIndex()
-
-    return meshDataList, paths
-
 def add_material_component(entity_id):
     # Create an override AZ::Render::EditorMaterialComponent
     editor_material_component = azlmbr.entity.EntityUtilityBus(
@@ -64,24 +25,24 @@ def add_material_component(entity_id):
 
     # this fills out the material asset to a known product AZMaterial asset relative path
     json_update = json.dumps({
-            "Controller": { "Configuration": { "materials": [
-                {
-                    "Key": {},
-                    "Value": { "MaterialAsset":{
-                        "assetHint": "materials/basic_grey.azmaterial"
-                    }}
-                }]
-            }}
-        });
-    result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, editor_material_component, json_update)
+        "Controller": {"Configuration": {"materials": [
+            {
+                "Key": {},
+                "Value": {"MaterialAsset": {
+                    "assetHint": "materials/basic_grey.azmaterial"
+                }}
+            }]
+        }}
+    })
+    result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id,
+                                            editor_material_component, json_update)
 
     if not result:
         raise RuntimeError("UpdateComponentForEntity for editor_material_component failed")
 
+
 def update_manifest(scene):
-    import json
     import uuid, os
-    import azlmbr.scene as sceneApi
     import azlmbr.scene.graph
     from scene_api import scene_data as sceneData
 
@@ -89,9 +50,9 @@ def update_manifest(scene):
     # Get a list of all the mesh nodes, as well as all the nodes
     mesh_name_list, all_node_paths = get_mesh_node_names(graph)
     scene_manifest = sceneData.SceneManifest()
-    
+
     clean_filename = scene.sourceFilename.replace('.', '_')
-    
+
     # Compute the filename of the scene file
     source_basepath = scene.watchFolder
     source_relative_path = os.path.dirname(os.path.relpath(clean_filename, source_basepath))
@@ -108,31 +69,39 @@ def update_manifest(scene):
         # Create a unique mesh group name using the filename + node name
         mesh_group_name = '{}_{}'.format(source_filename_only, mesh_name.get_name())
         # Remove forbidden filename characters from the name since this will become a file on disk later
-        mesh_group_name = "".join(char for char in mesh_group_name if char not in "|<>:\"/?*\\")
+        mesh_group_name = sanitize_name_for_disk(mesh_group_name)
         # Add the MeshGroup to the manifest and give it a unique ID
         mesh_group = scene_manifest.add_mesh_group(mesh_group_name)
         mesh_group['id'] = '{' + str(uuid.uuid5(uuid.NAMESPACE_DNS, source_filename_only + mesh_path)) + '}'
         # Set our current node as the only node that is included in this MeshGroup
         scene_manifest.mesh_group_select_node(mesh_group, mesh_path)
+        scene_manifest.mesh_group_add_comment(mesh_group, "Hello World")
 
         # Explicitly remove all other nodes to prevent implicit inclusions
         for node in all_node_paths:
             if node != mesh_path:
                 scene_manifest.mesh_group_unselect_node(mesh_group, node)
 
+        scene_manifest.mesh_group_add_cloth_rule(mesh_group, mesh_path, "Col0", 1, "Col0", 2, "Col0", 2, 3)
+        scene_manifest.mesh_group_add_advanced_mesh_rule(mesh_group, True, False, True, "Col0")
+        scene_manifest.mesh_group_add_skin_rule(mesh_group, 3, 0.002)
+        scene_manifest.mesh_group_add_tangent_rule(mesh_group, 1, 0)
+
         # Create an editor entity
         entity_id = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "CreateEditorReadyEntity", mesh_group_name)
         # Add an EditorMeshComponent to the entity
-        editor_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName", entity_id, "AZ::Render::EditorMeshComponent")
-        # Set the ModelAsset assetHint to the relative path of the input asset + the name of the MeshGroup we just created + the azmodel extension
-        # The MeshGroup we created will be output as a product in the asset's path named mesh_group_name.azmodel
-        # The assetHint will be converted to an AssetId later during prefab loading
+        editor_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName",
+                                                               entity_id, "AZ::Render::EditorMeshComponent")
+        # Set the ModelAsset assetHint to the relative path of the input asset + the name of the MeshGroup we just
+        # created + the azmodel extension The MeshGroup we created will be output as a product in the asset's path
+        # named mesh_group_name.azmodel The assetHint will be converted to an AssetId later during prefab loading
         json_update = json.dumps({
-            "Controller": { "Configuration": { "ModelAsset": {
-                "assetHint": os.path.join(source_relative_path, mesh_group_name) + ".azmodel" }}}
-            });
+            "Controller": {"Configuration": {"ModelAsset": {
+                "assetHint": os.path.join(source_relative_path, mesh_group_name) + ".azmodel"}}}
+        })
         # Apply the JSON above to the component we created
-        result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, editor_mesh_component, json_update)
+        result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id,
+                                                editor_mesh_component, json_update)
 
         if not result:
             raise RuntimeError("UpdateComponentForEntity failed for Mesh component")
@@ -143,17 +112,19 @@ def update_manifest(scene):
             add_material_component(entity_id)
 
         # Get the transform component
-        transform_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName", entity_id, "27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0")
+        transform_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName",
+                                                             entity_id, "27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0")
 
         # Set this entity to be a child of the last entity we created
         # This is just an example of how to do parenting and isn't necessarily useful to parent everything like this
         if previous_entity_id is not None:
             transform_json = json.dumps({
-                "Parent Entity" : previous_entity_id.to_json()
-                });
+                "Parent Entity": previous_entity_id.to_json()
+            })
 
             # Apply the JSON update
-            result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, transform_component, transform_json)
+            result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id,
+                                                    transform_component, transform_json)
 
             if not result:
                 raise RuntimeError("UpdateComponentForEntity failed for Transform component")
@@ -165,37 +136,23 @@ def update_manifest(scene):
         created_entities.append(entity_id)
 
     # Create a prefab with all our entities
-    prefab_filename = source_filename_only + ".prefab"
-    created_template_id = azlmbr.prefab.PrefabSystemScriptingBus(azlmbr.bus.Broadcast, "CreatePrefab", created_entities, prefab_filename)
-
-    if created_template_id == azlmbr.prefab.InvalidTemplateId:
-        raise RuntimeError("CreatePrefab {} failed".format(prefab_filename))
-
-    # Convert the prefab to a JSON string
-    output = azlmbr.prefab.PrefabLoaderScriptingBus(azlmbr.bus.Broadcast, "SaveTemplateToString", created_template_id)
-
-    if output.IsSuccess():
-        jsonString = output.GetValue()
-        uuid = azlmbr.math.Uuid_CreateRandom().ToString()
-        jsonResult = json.loads(jsonString)
-        # Add a PrefabGroup to the manifest and store the JSON on it
-        scene_manifest.add_prefab_group(source_filename_only, uuid, jsonResult)
-    else:
-        raise RuntimeError("SaveTemplateToString failed for template id {}, prefab {}".format(created_template_id, prefab_filename))
+    create_prefab(scene_manifest, source_filename_only, created_entities)
 
     # Convert the manifest to a JSON string and return it
     new_manifest = scene_manifest.export()
 
     return new_manifest
 
+
 sceneJobHandler = None
 
+
 def on_update_manifest(args):
     try:
         scene = args[0]
         return update_manifest(scene)
     except RuntimeError as err:
-        print (f'ERROR - {err}')
+        print(f'ERROR - {err}')
         log_exception_traceback()
     except:
         log_exception_traceback()
@@ -203,10 +160,12 @@ def on_update_manifest(args):
     global sceneJobHandler
     sceneJobHandler = None
 
+
 # try to create SceneAPI handler for processing
 try:
     import azlmbr.scene as sceneApi
-    if (sceneJobHandler == None):
+
+    if sceneJobHandler is None:
         sceneJobHandler = sceneApi.ScriptBuildingNotificationBusHandler()
         sceneJobHandler.connect()
         sceneJobHandler.add_callback('OnUpdateManifest', on_update_manifest)
diff --git a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml
index 12c222add6..46d6191835 100644
--- a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml
+++ b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml
@@ -13,4 +13,29 @@
     <NetworkInput Type="float" Name="FwdBack" Init="0.0f" ExposeToScript="true"/>
     <NetworkInput Type="float" Name="LeftRight" Init="0.0f" ExposeToScript="true"/>
 
+    <RemoteProcedure Name="AutonomousToAuthority" InvokeFrom="Autonomous" HandleOn="Authority" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" >
+        <Param Type="float" Name="SomeFloat" />
+    </RemoteProcedure>
+  
+    <RemoteProcedure Name="AutonomousToAuthorityNoParams" InvokeFrom="Autonomous" HandleOn="Authority" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" />
+
+    <RemoteProcedure Name="AuthorityToAutonomous" InvokeFrom="Authority" HandleOn="Autonomous" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" >
+        <Param Type="float" Name="SomeFloat" />
+    </RemoteProcedure>
+    
+    <RemoteProcedure Name="AuthorityToAutonomousNoParams" InvokeFrom="Authority" HandleOn="Autonomous" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" />
+
+    <RemoteProcedure Name="AuthorityToClient" InvokeFrom="Authority" HandleOn="Client" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" >
+        <Param Type="float" Name="SomeFloat" />
+    </RemoteProcedure>
+
+    <RemoteProcedure Name="AuthorityToClientNoParams" InvokeFrom="Authority" HandleOn="Client" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" />
+
+    <RemoteProcedure Name="ServerToAuthority" InvokeFrom="Server" HandleOn="Authority" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" >
+        <Param Type="float" Name="SomeFloat" />
+    </RemoteProcedure>
+    
+    <RemoteProcedure Name="ServerToAuthorityNoParam" InvokeFrom="Server" HandleOn="Authority" IsPublic="false" IsReliable="false" GenerateEventBindings="true" Description="" />
+
+
 </Component>
diff --git a/AutomatedTesting/Gem/Code/enabled_gems.cmake b/AutomatedTesting/Gem/Code/enabled_gems.cmake
index e6a4d6ca37..3915fd36da 100644
--- a/AutomatedTesting/Gem/Code/enabled_gems.cmake
+++ b/AutomatedTesting/Gem/Code/enabled_gems.cmake
@@ -54,6 +54,7 @@ set(ENABLED_GEMS
     AWSMetrics
     PrefabBuilder
     AudioSystem
+    Terrain
     Profiler
     Multiplayer
 )
diff --git a/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_automation_test.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_automation_test.py
index 34b2217916..6f3113d771 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_automation_test.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/aws_metrics/aws_metrics_automation_test.py
@@ -14,6 +14,7 @@ from datetime import datetime
 import ly_test_tools.log.log_monitor
 
 from AWS.common import constants
+from AWS.common.resource_mappings import AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY
 from .aws_metrics_custom_thread import AWSMetricsThread
 
 # fixture imports
@@ -200,6 +201,59 @@ class TestAWSMetricsWindows(object):
         for thread in operational_threads:
             thread.join()
 
+    @pytest.mark.parametrize('level', ['AWS/Metrics'])
+    def test_realtime_and_batch_analytics_no_global_accountid(self,
+                                                            level: str,
+                                                            launcher: pytest.fixture,
+                                                            asset_processor: pytest.fixture,
+                                                            workspace: pytest.fixture,
+                                                            aws_utils: pytest.fixture,
+                                                            resource_mappings: pytest.fixture,
+                                                            aws_metrics_utils: pytest.fixture):
+        """
+        Verify that the metrics events are sent to CloudWatch and S3 for analytics.
+        """
+        # Remove top-level account ID from resource mappings
+        resource_mappings.clear_select_keys([AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY])
+        # Start Kinesis analytics application on a separate thread to avoid blocking the test.
+        kinesis_analytics_application_thread = AWSMetricsThread(target=update_kinesis_analytics_application_status,
+                                                                args=(aws_metrics_utils, resource_mappings, True))
+        kinesis_analytics_application_thread.start()
+
+        log_monitor = setup(launcher, asset_processor)
+
+        # Kinesis analytics application needs to be in the running state before we start the game launcher.
+        kinesis_analytics_application_thread.join()
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+        start_time = datetime.utcnow()
+        with launcher.start(launch_ap=False):
+            monitor_metrics_submission(log_monitor)
+
+            # Verify that real-time analytics metrics are delivered to CloudWatch.
+            aws_metrics_utils.verify_cloud_watch_delivery(
+                AWS_METRICS_FEATURE_NAME,
+                'TotalLogins',
+                [],
+                start_time)
+            logger.info('Real-time metrics are sent to CloudWatch.')
+
+        # Run time-consuming operations on separate threads to avoid blocking the test.
+        operational_threads = list()
+        operational_threads.append(
+            AWSMetricsThread(target=query_metrics_from_s3,
+                             args=(aws_metrics_utils, resource_mappings)))
+        operational_threads.append(
+            AWSMetricsThread(target=verify_operational_metrics,
+                             args=(aws_metrics_utils, resource_mappings, start_time)))
+        operational_threads.append(
+            AWSMetricsThread(target=update_kinesis_analytics_application_status,
+                             args=(aws_metrics_utils, resource_mappings, False)))
+        for thread in operational_threads:
+            thread.start()
+        for thread in operational_threads:
+            thread.join()
+
     @pytest.mark.parametrize('level', ['AWS/Metrics'])
     def test_unauthorized_user_request_rejected(self,
                                                 level: str,
diff --git a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py
index 198fb934d9..077a068a18 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py
@@ -12,6 +12,7 @@ import pytest
 import ly_test_tools.log.log_monitor
 
 from AWS.common import constants
+from AWS.common.resource_mappings import AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY
 
 # fixture imports
 from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
@@ -70,6 +71,41 @@ class TestAWSClientAuthWindows(object):
                 halt_on_unexpected=True,
             )
             assert result, 'Anonymous credentials fetched successfully.'
+    
+    @pytest.mark.parametrize('level', ['AWS/ClientAuth'])
+    def test_anonymous_credentials_no_global_accountid(self,
+                                                       level: str,
+                                                       launcher: pytest.fixture,
+                                                       resource_mappings: pytest.fixture,
+                                                       workspace: pytest.fixture,
+                                                       asset_processor: pytest.fixture
+                                                       ):
+        """
+        Test to verify AWS Cognito Identity pool anonymous authorization.
+
+        Setup: Updates resource mapping file using existing CloudFormation stacks.
+        Tests: Getting credentials when no credentials are configured
+        Verification: Log monitor looks for success credentials log.
+        """
+        # Remove top-level account ID from resource mappings
+        resource_mappings.clear_select_keys([AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY])
+        
+        asset_processor.start()
+        asset_processor.wait_for_idle()
+
+        file_to_monitor = os.path.join(launcher.workspace.paths.project_log(), constants.GAME_LOG_NAME)
+        log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor)
+
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+
+        with launcher.start(launch_ap=False):
+            result = log_monitor.monitor_log_for_lines(
+                expected_lines=['(Script) - Success anonymous credentials'],
+                unexpected_lines=['(Script) - Fail anonymous credentials'],
+                halt_on_unexpected=True,
+            )
+            assert result, 'Anonymous credentials fetched successfully.'
 
     def test_password_signin_credentials(self,
                                          launcher: pytest.fixture,
diff --git a/AutomatedTesting/Gem/PythonTests/AWS/Windows/core/test_aws_resource_interaction.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/core/test_aws_resource_interaction.py
index 949186ad50..59c517fd1c 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/core/test_aws_resource_interaction.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/core/test_aws_resource_interaction.py
@@ -18,6 +18,7 @@ import ly_test_tools.environment.process_utils as process_utils
 import ly_test_tools.o3de.asset_processor_utils as asset_processor_utils
 
 from AWS.common import constants
+from AWS.common.resource_mappings import AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY
 
 # fixture imports
 from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor
@@ -141,3 +142,51 @@ class TestAWSCoreAWSResourceInteraction(object):
             'The expected file wasn\'t successfully downloaded.'
         # clean up the file directories.
         shutil.rmtree(s3_download_dir)
+
+    @pytest.mark.parametrize('expected_lines', [
+        ['(Script) - [S3] Head object request is done',
+         '(Script) - [S3] Head object success: Object example.txt is found.',
+         '(Script) - [S3] Get object success: Object example.txt is downloaded.',
+         '(Script) - [Lambda] Completed Invoke',
+         '(Script) - [Lambda] Invoke success: {"statusCode": 200, "body": {}}',
+         '(Script) - [DynamoDB] Results finished']])
+    @pytest.mark.parametrize('unexpected_lines', [
+        ['(Script) - [S3] Head object error: No response body.',
+         '(Script) - [S3] Get object error: Request validation failed, output file directory doesn\'t exist.',
+         '(Script) - Request validation failed, output file miss full path.',
+         '(Script) - ']])
+    def test_scripting_behavior_no_global_accountid(self,
+                                                    level: str,
+                                                    launcher: pytest.fixture,
+                                                    workspace: pytest.fixture,
+                                                    asset_processor: pytest.fixture,
+                                                    resource_mappings: pytest.fixture,
+                                                    aws_utils: pytest.fixture,
+                                                    expected_lines: typing.List[str],
+                                                    unexpected_lines: typing.List[str]):
+        """
+        Setup: Updates resource mapping file using existing CloudFormation stacks.
+        Tests: Interact with AWS S3, DynamoDB and Lambda services.
+        Verification: Script canvas nodes can communicate with AWS services successfully.
+        """
+
+        resource_mappings.clear_select_keys([AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY])
+        log_monitor, s3_download_dir = setup(launcher, asset_processor)
+        write_test_data_to_dynamodb_table(resource_mappings, aws_utils)
+
+        launcher.args = ['+LoadLevel', level]
+        launcher.args.extend(['-rhi=null'])
+
+        with launcher.start(launch_ap=False):
+            result = log_monitor.monitor_log_for_lines(
+                expected_lines=expected_lines,
+                unexpected_lines=unexpected_lines,
+                halt_on_unexpected=True
+                )
+
+            assert result, "Expected lines weren't found."
+
+        assert os.path.exists(os.path.join(s3_download_dir, 'output.txt')), \
+            'The expected file wasn\'t successfully downloaded.'
+        # clean up the file directories.
+        shutil.rmtree(s3_download_dir)
diff --git a/AutomatedTesting/Gem/PythonTests/AWS/common/resource_mappings.py b/AutomatedTesting/Gem/PythonTests/AWS/common/resource_mappings.py
index 5f01ecdbf8..988d5bf1fc 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/common/resource_mappings.py
+++ b/AutomatedTesting/Gem/PythonTests/AWS/common/resource_mappings.py
@@ -102,3 +102,17 @@ class ResourceMappings:
 
     def get_resource_name_id(self, resource_key: str):
         return self._resource_mappings[AWS_RESOURCE_MAPPINGS_KEY][resource_key]['Name/ID']
+
+    def clear_select_keys(self, resource_keys=None) -> None:
+        """
+        Clears values from select resource mapping keys.
+        :param resource_keys: list of keys to clear out
+        """
+        with open(self._resource_mapping_file_path) as file_content:
+            resource_mappings = json.load(file_content)
+
+        for key in resource_keys:
+            resource_mappings[key] = ''
+
+        with open(self._resource_mapping_file_path, 'w') as file_content:
+            json.dump(resource_mappings, file_content, indent=4)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py
index 402a6fd8f0..d79e144ae0 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py
@@ -13,6 +13,8 @@ from ly_test_tools.o3de.editor_test import EditorSharedTest, EditorTestSuite
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 class TestAutomation(EditorTestSuite):
 
+    enable_prefab_system = False
+
     @pytest.mark.test_case_id("C36525657")
     class AtomEditorComponents_BloomAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponents_BloomAdded as test_module
@@ -61,10 +63,18 @@ class TestAutomation(EditorTestSuite):
     class AtomEditorComponents_HDRColorGradingAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponents_HDRColorGradingAdded as test_module
 
+    @pytest.mark.test_case_id("C32078116")
+    class AtomEditorComponents_HDRiSkyboxAdded(EditorSharedTest):
+        from Atom.tests import hydra_AtomEditorComponents_HDRiSkyboxAdded as test_module
+
     @pytest.mark.test_case_id("C32078117")
     class AtomEditorComponents_LightAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponents_LightAdded as test_module
 
+    @pytest.mark.test_case_id("C36525662")
+    class AtomEditorComponents_LookModificationAdded(EditorSharedTest):
+        from Atom.tests import hydra_AtomEditorComponents_LookModificationAdded as test_module
+
     @pytest.mark.test_case_id("C32078123")
     class AtomEditorComponents_MaterialAdded(EditorSharedTest):
         from Atom.tests import hydra_AtomEditorComponents_MaterialAdded as test_module
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
index f0e92c7e3e..6a220d1bd8 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
@@ -104,6 +104,7 @@ class TestAllComponentsIndepthTests(object):
             halt_on_unexpected=True,
             cfg_args=[level],
             null_renderer=False,
+            enable_prefab_system=False,
         )
 
         similarity_threshold = 0.99
@@ -158,6 +159,7 @@ class TestAllComponentsIndepthTests(object):
             halt_on_unexpected=True,
             cfg_args=[level],
             null_renderer=False,
+            enable_prefab_system=False,
         )
 
         similarity_threshold = 0.99
@@ -205,6 +207,7 @@ class TestPerformanceBenchmarkSuite(object):
             halt_on_unexpected=True,
             cfg_args=[level],
             null_renderer=False,
+            enable_prefab_system=False,
         )
 
         aggregator = BenchmarkDataAggregator(workspace, logger, 'periodic')
@@ -242,5 +245,6 @@ class TestMaterialEditor(object):
             halt_on_unexpected=False,
             null_renderer=False,
             cfg_args=[cfg_args],
-            log_file_name="MaterialEditor.log"
+            log_file_name="MaterialEditor.log",
+            enable_prefab_system=False,
         )
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py
index 568768e12e..7f97c132bb 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py
@@ -23,6 +23,8 @@ class TestAutomation(EditorTestSuite):
     # Remove -autotest_mode from global_extra_cmdline_args since we need rendering for these tests.
     global_extra_cmdline_args = ["-BatchMode"]  # Default is ["-BatchMode", "-autotest_mode"]
 
+    enable_prefab_system = False
+
     @pytest.mark.test_case_id("C34603773")
     class AtomGPU_BasicLevelSetup_SetsUpLevel(EditorSharedTest):
         use_null_renderer = False  # Default is True
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
index 9ceb3c951f..292bb9c19c 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
@@ -85,6 +85,7 @@ class TestAtomEditorComponentsMain(object):
             halt_on_unexpected=True,
             null_renderer=True,
             cfg_args=cfg_args,
+            enable_prefab_system=False,
         )
 
 
@@ -155,5 +156,6 @@ class TestMaterialEditorBasicTests(object):
             halt_on_unexpected=True,
             null_renderer=True,
             log_file_name="MaterialEditor.log",
+            enable_prefab_system=False,
         )
 
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py
index 50cc15f7e8..9f37873557 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py
@@ -172,8 +172,7 @@ def create_basic_atom_level(level_name):
         entity_position=default_position,
         components=["HDRi Skybox", "Global Skylight (IBL)"],
         parent_id=default_level.id)
-    global_skylight_asset_path = os.path.join(
-        "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage")
+    global_skylight_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage")
     global_skylight_asset_value = asset.AssetCatalogRequestBus(
         bus.Broadcast, "GetAssetIdByPath", global_skylight_asset_path, math.Uuid(), False)
     global_skylight.get_set_test(0, "Controller|Configuration|Cubemap Texture", global_skylight_asset_value)
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
index 817ff1fad0..290e1cd2e4 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
@@ -57,11 +57,13 @@ class AtomComponentProperties:
     def camera(property: str = 'name') -> str:
         """
         Camera component properties.
+          - 'Field of view': Sets the value for the camera's FOV (Field of View) in degrees, i.e. 60.0
         :param property: From the last element of the property tree path. Default 'name' for component name string.
         :return: Full property path OR component name if no property specified.
         """
         properties = {
             'name': 'Camera',
+            'Field of view': 'Controller|Configuration|Field of view'
         }
         return properties[property]
 
@@ -147,11 +149,14 @@ class AtomComponentProperties:
     def display_mapper(property: str = 'name') -> str:
         """
         Display Mapper component properties.
+          - 'LDR color Grading LUT' is the Low Definition Range (LDR) color grading for Look-up Textures (LUT) which is
+            an Asset.id value corresponding to a lighting asset file.
         :param property: From the last element of the property tree path. Default 'name' for component name string.
         :return: Full property path OR component name if no property specified.
         """
         properties = {
             'name': 'Display Mapper',
+            'LDR color Grading LUT': 'Controller|Configuration|LDR color Grading LUT',
         }
         return properties[property]
 
@@ -202,11 +207,13 @@ class AtomComponentProperties:
     def grid(property: str = 'name') -> str:
         """
         Grid component properties.
+          - 'Secondary Grid Spacing': The spacing value for the secondary grid, i.e. 1.0
         :param property: From the last element of the property tree path. Default 'name' for component name string.
         :return: Full property path OR component name if no property specified.
         """
         properties = {
             'name': 'Grid',
+            'Secondary Grid Spacing': 'Controller|Configuration|Secondary Grid Spacing',
         }
         return properties[property]
 
@@ -231,11 +238,13 @@ class AtomComponentProperties:
     def hdri_skybox(property: str = 'name') -> str:
         """
         HDRi Skybox component properties.
+          - 'Cubemap Texture': Asset.id for the cubemap texture to set.
         :param property: From the last element of the property tree path. Default 'name' for component name string.
         :return: Full property path OR component name if no property specified.
         """
         properties = {
             'name': 'HDRi Skybox',
+            'Cubemap Texture': 'Controller|Configuration|Cubemap Texture',
         }
         return properties[property]
 
@@ -259,12 +268,16 @@ class AtomComponentProperties:
         Look Modification component properties. Requires PostFX Layer component.
           - 'requires' a list of component names as strings required by this component.
             Use editor_entity_utils EditorEntity.add_components(list) to add this list of requirements.\n
+          - 'Enable look modification' Toggle active state of the component True/False
+          - 'Color Grading LUT' Asset.id for the LUT used for affecting level look.
         :param property: From the last element of the property tree path. Default 'name' for component name string.
         :return: Full property path OR component name if no property specified.
         """
         properties = {
             'name': 'Look Modification',
             'requires': [AtomComponentProperties.postfx_layer()],
+            'Enable look modification': 'Controller|Configuration|Enable look modification',
+            'Color Grading LUT': 'Controller|Configuration|Color Grading LUT',
         }
         return properties[property]
 
@@ -274,12 +287,14 @@ class AtomComponentProperties:
         Material component properties. Requires one of Actor OR Mesh component.
           - 'requires' a list of component names as strings required by this component.
             Only one of these is required at a time for this component.\n
+          - 'Material Asset': the material Asset.id of the material.
         :param property: From the last element of the property tree path. Default 'name' for component name string.
         :return: Full property path OR component name if no property specified.
         """
         properties = {
             'name': 'Material',
             'requires': [AtomComponentProperties.actor(), AtomComponentProperties.mesh()],
+            'Material Asset': 'Default Material|Material Asset',
         }
         return properties[property]
 
@@ -378,7 +393,7 @@ class AtomComponentProperties:
             'name': 'PostFX Shape Weight Modifier',
             'requires': [AtomComponentProperties.postfx_layer()],
             'shapes': ['Axis Aligned Box Shape', 'Box Shape', 'Capsule Shape', 'Compound Shape', 'Cylinder Shape',
-                       'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Vegetation Reference Shape'],
+                       'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Shape Reference'],
         }
         return properties[property]
 
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm
index 0725999dcf..8695f6bb93 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:954d7d0df47c840a24e313893800eb3126d0c0d47c3380926776b51833778db7
+oid sha256:aee1fd4d5264e5ef1676b507409ce70af6358cf1ff368d9aeb17f7b2597dfbca
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm
index 3a45bd31e3..d45d3f1581 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e81c19128f42ba362a2d5f3ccf159dfbc942d67ceeb1ac8c21f295a6fd9d2ce5
+oid sha256:d4787cdafbcc2fe71c1cb3f1da53a249db839a9df539a9e88be43ccd6d8e4d6a
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm
index 15d679b784..0661ead69f 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e20801213e065b6ea8c95ede81c23faa9b6dc70a2002dc5bced293e1bed989f
+oid sha256:5fac5bf41c9b16b6fbd762868e5cf514376af92d6ef7ebb9e819f024f1a3e1a7
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm
index 85c083a386..a7fc77f0ec 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e250f812e594e5152bf2d6f23caa8b53b78276bfdf344d7a8d355dd96cb995c0
+oid sha256:7a23969670499524725535e8be7428b55b6f3e887cc24e2e903f7ea821a6d1a5
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm
index d575de761e..7404ab3ccc 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95be359041f8291c74b335297a4dfe9902a180510f24a181b15e1a5ba4d3b024
+oid sha256:2f1f4d8865c56ed7f96f339c39e5feb4e0dbc6c6a8b4a7843b4166381b06b00d
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm
index ef41b6cf77..acfbe57900 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07e09d3eb5bf0cee3d9b3752aaad40f3ead1dcc5ddd837a6226fadde55d57274
+oid sha256:5d4ee5641e19eef08dd6b93d2f4054a1aae2165325416ed2cbf0b8243f2c0b06
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm
index bbbd127929..3104088689 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:118e43e4b915e262726183467cc4b82f244565213fea5b6bfe02be07f0851ab1
+oid sha256:55c8f0d1790bb12660b7557630efca297b2a1b59e6c93167a2563da79e0a8255
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm
index 8e716fabcc..287ec406e1 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc2ce3256a6552975962c9e113c52c1a22bf3817d417151f6f60640dd568e0fa
+oid sha256:082ff368b621e12b083d96562a0889b11a1d683767a74296cbe6d8732830e9e8
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm
index 6b6a5a5d6e..9de8785f65 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:287d98890b35427688999760f9d066bcbff1a3bc9001534241dc212b32edabd8
+oid sha256:78cc62d89782899747875b41abee57c2efdfacf4c8af6511c88f82d76eaae4ca
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm
index eb05228cc2..93acc14dbc 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66e91c92c868167c850078cd91714db47e10a96e23cc30191994486bd79c353f
+oid sha256:3d6719326f4dacae278d1723090ce1182193b793f250963af8be4b2c298e8841
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm
index 5e12edc46d..9cd58caae5 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d950d173f5101820c5e18205401ca08ce5feeff2302ac2920b292750d86a8fa4
+oid sha256:9e492bb394fb18fb117f8a5b61cd2789922f9d6e88fc83189b5b6d59ffb1c3ef
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm
index d442d90287..136eecbaaf 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm
+++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72eddb7126eae0c839b933886e0fb69d78229f72d49ef13199de28df2b7879db
+oid sha256:caca85f7728f660daae36afc81d681ba2de2377c516eb3c637599de5c94012aa
 size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py
index f8881bfa2a..e2e432364d 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py
@@ -5,6 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
+
 class Tests:
     camera_creation = (
         "Camera Entity successfully created",
@@ -39,6 +40,9 @@ class Tests:
     is_hidden = (
         "Entity is hidden",
         "Entity was not hidden")
+    ldr_color_grading_lut = (
+        "LDR color Grading LUT asset set",
+        "LDR color Grading LUT asset could not be set")
     entity_deleted = (
         "Entity deleted",
         "Entity was not deleted")
@@ -71,16 +75,19 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
     5) Enter/Exit game mode.
     6) Test IsHidden.
     7) Test IsVisible.
-    8) Delete Display Mapper entity.
-    9) UNDO deletion.
-    10) REDO deletion.
-    11) Look for errors and asserts.
+    8) Set LDR color Grading LUT asset.
+    9) Delete Display Mapper entity.
+    10) UNDO deletion.
+    11) REDO deletion.
+    12) Look for errors and asserts.
 
     :return: None
     """
+    import os
 
     import azlmbr.legacy.general as general
 
+    from editor_python_test_tools.asset_utils import Asset
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.utils import Report, Tracer, TestHelper
     from Atom.atom_utils.atom_constants import AtomComponentProperties
@@ -97,7 +104,7 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
         Report.critical_result(Tests.display_mapper_creation, display_mapper_entity.exists())
 
         # 2. Add Display Mapper component to Display Mapper entity.
-        display_mapper_entity.add_component(AtomComponentProperties.display_mapper())
+        display_mapper_component = display_mapper_entity.add_component(AtomComponentProperties.display_mapper())
         Report.critical_result(
             Tests.display_mapper_component,
             display_mapper_entity.has_component(AtomComponentProperties.display_mapper()))
@@ -140,19 +147,29 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
         general.idle_wait_frames(1)
         Report.result(Tests.is_visible, display_mapper_entity.is_visible() is True)
 
-        # 8. Delete Display Mapper entity.
+        # 8. Set LDR color Grading LUT asset.
+        display_mapper_asset_path = os.path.join("TestData", "test.lightingpreset.azasset")
+        display_mapper_asset = Asset.find_asset_by_path(display_mapper_asset_path, False)
+        display_mapper_component.set_component_property_value(
+            AtomComponentProperties.display_mapper("LDR color Grading LUT"), display_mapper_asset.id)
+        Report.result(
+            Tests.ldr_color_grading_lut,
+            display_mapper_component.get_component_property_value(
+                AtomComponentProperties.display_mapper("LDR color Grading LUT")) == display_mapper_asset.id)
+
+        # 9. Delete Display Mapper entity.
         display_mapper_entity.delete()
         Report.result(Tests.entity_deleted, not display_mapper_entity.exists())
 
-        # 9. UNDO deletion.
+        # 10. UNDO deletion.
         general.undo()
         Report.result(Tests.deletion_undo, display_mapper_entity.exists())
 
-        # 10. REDO deletion.
+        # 11. REDO deletion.
         general.redo()
         Report.result(Tests.deletion_redo, not display_mapper_entity.exists())
 
-        # 11. Look for errors and asserts.
+        # 12. Look for errors and asserts.
         TestHelper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
         for error_info in error_tracer.errors:
             Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py
index db8f2daaee..7f0c38e289 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py
@@ -151,7 +151,7 @@ def AtomEditorComponents_GlobalSkylightIBL_AddedToEntity():
         Report.result(Tests.is_visible, global_skylight_entity.is_visible() is True)
 
         # 8. Set the Diffuse Image asset on the Global Skylight (IBL) entity.
-        diffuse_image_path = os.path.join("LightingPresets", "greenwich_park_02_4k_iblskyboxcm.exr.streamingimage")
+        diffuse_image_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage")
         diffuse_image_asset = Asset.find_asset_by_path(diffuse_image_path, False)
         global_skylight_component.set_component_property_value(
             AtomComponentProperties.global_skylight('Diffuse Image'), diffuse_image_asset.id)
@@ -161,7 +161,7 @@ def AtomEditorComponents_GlobalSkylightIBL_AddedToEntity():
                                           AtomComponentProperties.global_skylight('Diffuse Image')))
 
         # 9. Set the Specular Image asset on the Global Light (IBL) entity.
-        specular_image_path = os.path.join("LightingPresets", "greenwich_park_02_4k_iblskyboxcm.exr.streamingimage")
+        specular_image_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage")
         specular_image_asset = Asset.find_asset_by_path(specular_image_path, False)
         global_skylight_component.set_component_property_value(
             AtomComponentProperties.global_skylight('Specular Image'), specular_image_asset.id)
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_HDRiSkyboxAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_HDRiSkyboxAdded.py
new file mode 100644
index 0000000000..0f96bc5424
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_HDRiSkyboxAdded.py
@@ -0,0 +1,177 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+
+class Tests:
+    creation_undo = (
+        "UNDO Entity creation success",
+        "UNDO Entity creation failed")
+    creation_redo = (
+        "REDO Entity creation success",
+        "REDO Entity creation failed")
+    hdri_skybox_entity_creation = (
+        "HDRi Skybox successfully created",
+        "HDRi Skybox failed to be created")
+    hdri_skybox_component = (
+        "Entity has an HDRi Skybox component",
+        "Entity failed to find HDRi Skybox component")
+    cubemap_property_set = (
+        "Cubemap property set on HDRi Skybox component",
+        "Couldn't set Cubemap property on HDRi Skybox component")
+    enter_game_mode = (
+        "Entered game mode",
+        "Failed to enter game mode")
+    exit_game_mode = (
+        "Exited game mode",
+        "Couldn't exit game mode")
+    is_visible = (
+        "Entity is visible",
+        "Entity was not visible")
+    is_hidden = (
+        "Entity is hidden",
+        "Entity was not hidden")
+    entity_deleted = (
+        "Entity deleted",
+        "Entity was not deleted")
+    deletion_undo = (
+        "UNDO deletion success",
+        "UNDO deletion failed")
+    deletion_redo = (
+        "REDO deletion success",
+        "REDO deletion failed")
+
+
+def AtomEditorComponents_HDRiSkybox_AddedToEntity():
+    """
+    Summary:
+    Tests the HDRi Skybox component can be added to an entity and has the expected functionality.
+
+    Test setup:
+    - Wait for Editor idle loop.
+    - Open the "Base" level.
+
+    Expected Behavior:
+    The component can be added, used in game mode, hidden/shown, deleted, and has accurate required components.
+    Creation and deletion undo/redo should also work.
+
+    Test Steps:
+    1) Create an HDRi Skybox with no components.
+    2) Add an HDRi Skybox component to HDRi Skybox.
+    3) UNDO the entity creation and component addition.
+    4) REDO the entity creation and component addition.
+    5) Enter/Exit game mode.
+    6) Test IsHidden.
+    7) Test IsVisible.
+    8) Delete HDRi Skybox.
+    9) UNDO deletion.
+    10) REDO deletion.
+    11) Look for errors.
+
+    :return: None
+    """
+
+    import os
+
+    import azlmbr.legacy.general as general
+
+    from editor_python_test_tools.asset_utils import Asset
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
+    from editor_python_test_tools.utils import Report, Tracer, TestHelper
+    from Atom.atom_utils.atom_constants import AtomComponentProperties
+
+    with Tracer() as error_tracer:
+        # Test setup begins.
+        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
+        TestHelper.init_idle()
+        TestHelper.open_level("", "Base")
+
+        # Test steps begin.
+        # 1. Create an HDRi Skybox with no components.
+        hdri_skybox_entity = EditorEntity.create_editor_entity(
+            AtomComponentProperties.hdri_skybox())
+        Report.critical_result(Tests.hdri_skybox_entity_creation, 
+                               hdri_skybox_entity.exists())
+
+        # 2. Add an HDRi Skybox component to HDRi Skybox.
+        hdri_skybox_component = hdri_skybox_entity.add_component(
+            AtomComponentProperties.hdri_skybox())
+        Report.critical_result(
+            Tests.hdri_skybox_component,
+            hdri_skybox_entity.has_component(AtomComponentProperties.hdri_skybox()))
+
+        # 3. UNDO the entity creation and component addition.
+        # -> UNDO component addition.
+        general.undo()
+        # -> UNDO naming entity.
+        general.undo()
+        # -> UNDO selecting entity.
+        general.undo()
+        # -> UNDO entity creation.
+        general.undo()
+        general.idle_wait_frames(1)
+        Report.result(Tests.creation_undo, not hdri_skybox_entity.exists())
+
+        # 4. REDO the entity creation and component addition.
+        # -> REDO entity creation.
+        general.redo()
+        # -> REDO selecting entity.
+        general.redo()
+        # -> REDO naming entity.
+        general.redo()
+        # -> REDO component addition.
+        general.redo()
+        general.idle_wait_frames(1)
+        Report.result(Tests.creation_redo, hdri_skybox_entity.exists())
+
+
+        # 5. Set Cubemap Texture on HDRi Skybox component.
+        skybox_cubemap_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage")
+        skybox_cubemap_material_asset = Asset.find_asset_by_path(skybox_cubemap_asset_path, False)
+        hdri_skybox_component.set_component_property_value(
+            AtomComponentProperties.hdri_skybox('Cubemap Texture'), skybox_cubemap_material_asset.id)
+        get_cubemap_property = hdri_skybox_component.get_component_property_value(
+            AtomComponentProperties.hdri_skybox('Cubemap Texture'))
+        Report.result(Tests.cubemap_property_set, get_cubemap_property == skybox_cubemap_material_asset.id)
+
+
+        # 6. Enter/Exit game mode.
+        TestHelper.enter_game_mode(Tests.enter_game_mode)
+        general.idle_wait_frames(1)
+        TestHelper.exit_game_mode(Tests.exit_game_mode)
+
+        # 7. Test IsHidden.
+        hdri_skybox_entity.set_visibility_state(False)
+        Report.result(Tests.is_hidden, hdri_skybox_entity.is_hidden() is True)
+
+        # 8. Test IsVisible.
+        hdri_skybox_entity.set_visibility_state(True)
+        general.idle_wait_frames(1)
+        Report.result(Tests.is_visible, hdri_skybox_entity.is_visible() is True)
+
+        # 9. Delete hdri_skybox entity.
+        hdri_skybox_entity.delete()
+        Report.result(Tests.entity_deleted, not hdri_skybox_entity.exists())
+
+        # 10. UNDO deletion.
+        general.undo()
+        Report.result(Tests.deletion_undo, hdri_skybox_entity.exists())
+
+        # 11. REDO deletion.
+        general.redo()
+        Report.result(Tests.deletion_redo, not hdri_skybox_entity.exists())
+
+        # 12. Look for errors or asserts.
+        TestHelper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
+        for error_info in error_tracer.errors:
+            Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
+        for assert_info in error_tracer.asserts:
+            Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
+
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+    Report.start_test(AtomEditorComponents_HDRiSkybox_AddedToEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_LookModificationAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_LookModificationAdded.py
new file mode 100644
index 0000000000..afb8033426
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_LookModificationAdded.py
@@ -0,0 +1,211 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+
+class Tests:
+    creation_undo = (
+        "UNDO Entity creation success",
+        "UNDO Entity creation failed")
+    creation_redo = (
+        "REDO Entity creation success",
+        "REDO Entity creation failed")
+    look_modification_creation = (
+        "Look Modification Entity successfully created",
+        "Look Modification Entity failed to be created")
+    look_modification_component = (
+        "Entity has a Look Modification component",
+        "Entity failed to find Look Modification component")
+    look_modification_disabled = (
+        "Look Modification component disabled",
+        "Look Modification component was not disabled")
+    postfx_layer_component = (
+        "Entity has a PostFX Layer component",
+        "Entity did not have an PostFX Layer component")
+    look_modification_enabled = (
+        "Look Modification component enabled",
+        "Look Modification component was not enabled")
+    enable_look_modification_parameter_enabled = (
+        "Enable look modification parameter enabled",
+        "Enable look modification parameter was not enabled")
+    color_grading_lut_set = (
+        "Entity has the Color Grading LUT set",
+        "Entity did not the Color Grading LUT set")
+    enter_game_mode = (
+        "Entered game mode",
+        "Failed to enter game mode")
+    exit_game_mode = (
+        "Exited game mode",
+        "Couldn't exit game mode")
+    is_visible = (
+        "Entity is visible",
+        "Entity was not visible")
+    is_hidden = (
+        "Entity is hidden",
+        "Entity was not hidden")
+    entity_deleted = (
+        "Entity deleted",
+        "Entity was not deleted")
+    deletion_undo = (
+        "UNDO deletion success",
+        "UNDO deletion failed")
+    deletion_redo = (
+        "REDO deletion success",
+        "REDO deletion failed")
+
+
+def AtomEditorComponents_LookModification_AddedToEntity():
+    """
+    Summary:
+    Tests the Look Modification component can be added to an entity and has the expected functionality.
+
+    Test setup:
+    - Wait for Editor idle loop.
+    - Open the "Base" level.
+
+    Expected Behavior:
+    The component can be added, used in game mode, hidden/shown, deleted, and has accurate required components.
+    Creation and deletion undo/redo should also work.
+
+    Test Steps:
+    1) Create an Look Modification entity with no components.
+    2) Add Look Modification component to Look Modification entity.
+    3) UNDO the entity creation and component addition.
+    4) REDO the entity creation and component addition.
+    5) Verify Look Modification component not enabled.
+    6) Add PostFX Layer component since it is required by the Look Modification component.
+    7) Verify Look Modification component is enabled.
+    8) Enable the "Enable Look Modification" parameter.
+    9) Add LUT asset to the Color Grading LUT parameter.
+    9) Enter/Exit game mode.
+    10) Test IsHidden.
+    11) Test IsVisible.
+    12) Delete Look Modification entity.
+    13) UNDO deletion.
+    14) REDO deletion.
+    15) Look for errors.
+
+    :return: None
+    """
+
+    import os
+
+    import azlmbr.legacy.general as general
+
+    from editor_python_test_tools.asset_utils import Asset
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
+    from editor_python_test_tools.utils import Report, Tracer, TestHelper
+    from Atom.atom_utils.atom_constants import AtomComponentProperties
+
+    with Tracer() as error_tracer:
+        # Test setup begins.
+        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
+        TestHelper.init_idle()
+        TestHelper.open_level("", "Base")
+
+        # Test steps begin.
+        # 1. Create an Look Modification entity with no components.
+        look_modification_entity = EditorEntity.create_editor_entity(AtomComponentProperties.look_modification())
+        Report.critical_result(Tests.look_modification_creation, look_modification_entity.exists())
+
+        # 2. Add Look Modification component to Look Modification entity.
+        look_modification_component = look_modification_entity.add_component(
+            AtomComponentProperties.look_modification())
+        Report.critical_result(
+            Tests.look_modification_component,
+            look_modification_entity.has_component(AtomComponentProperties.look_modification()))
+
+        # 3. UNDO the entity creation and component addition.
+        # -> UNDO component addition.
+        general.undo()
+        # -> UNDO naming entity.
+        general.undo()
+        # -> UNDO selecting entity.
+        general.undo()
+        # -> UNDO entity creation.
+        general.undo()
+        general.idle_wait_frames(1)
+        Report.result(Tests.creation_undo, not look_modification_entity.exists())
+
+        # 4. REDO the entity creation and component addition.
+        # -> REDO entity creation.
+        general.redo()
+        # -> REDO selecting entity.
+        general.redo()
+        # -> REDO naming entity.
+        general.redo()
+        # -> REDO component addition.
+        general.redo()
+        general.idle_wait_frames(1)
+        Report.result(Tests.creation_redo, look_modification_entity.exists())
+
+        # 5. Verify Look Modification component not enabled.
+        Report.result(Tests.look_modification_disabled, not look_modification_component.is_enabled())
+
+        # 6. Add PostFX Layer component since it is required by the Look Modification component.
+        look_modification_entity.add_component(AtomComponentProperties.postfx_layer())
+        Report.result(
+            Tests.postfx_layer_component,
+            look_modification_entity.has_component(AtomComponentProperties.postfx_layer()))
+
+        # 7. Verify Look Modification component is enabled.
+        Report.result(Tests.look_modification_enabled, look_modification_component.is_enabled())
+
+        # 8. Enable the "Enable look modification" parameter.
+        look_modification_component.set_component_property_value(
+            AtomComponentProperties.look_modification('Enable look modification'), True)
+        Report.result(Tests.enable_look_modification_parameter_enabled,
+                      look_modification_component.get_component_property_value(
+                          AtomComponentProperties.look_modification('Enable look modification')) is True)
+
+        # 9. Set the Color Grading LUT asset on the Look Modification entity.
+        color_grading_lut_path = os.path.join("ColorGrading", "TestData", "Photoshop", "inv-Log2-48nits",
+                                              "test_3dl_32_lut.azasset")
+        color_grading_lut_asset = Asset.find_asset_by_path(color_grading_lut_path, False)
+        look_modification_component.set_component_property_value(
+            AtomComponentProperties.look_modification('Color Grading LUT'), color_grading_lut_asset.id)
+        Report.result(
+            Tests.color_grading_lut_set,
+            color_grading_lut_asset.id == look_modification_component.get_component_property_value(
+                                          AtomComponentProperties.look_modification('Color Grading LUT')))
+
+        # 10. Enter/Exit game mode.
+        TestHelper.enter_game_mode(Tests.enter_game_mode)
+        general.idle_wait_frames(1)
+        TestHelper.exit_game_mode(Tests.exit_game_mode)
+
+        # 11. Test IsHidden.
+        look_modification_entity.set_visibility_state(False)
+        Report.result(Tests.is_hidden, look_modification_entity.is_hidden() is True)
+
+        # 12. Test IsVisible.
+        look_modification_entity.set_visibility_state(True)
+        general.idle_wait_frames(1)
+        Report.result(Tests.is_visible, look_modification_entity.is_visible() is True)
+
+        # 13. Delete Look Modification entity.
+        look_modification_entity.delete()
+        Report.result(Tests.entity_deleted, not look_modification_entity.exists())
+
+        # 14. UNDO deletion.
+        general.undo()
+        Report.result(Tests.deletion_undo, look_modification_entity.exists())
+
+        # 15. REDO deletion.
+        general.redo()
+        Report.result(Tests.deletion_redo, not look_modification_entity.exists())
+
+        # 16. Look for errors and asserts.
+        TestHelper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
+        for error_info in error_tracer.errors:
+            Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
+        for assert_info in error_tracer.asserts:
+            Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
+
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+    Report.start_test(AtomEditorComponents_LookModification_AddedToEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py
index 92c555127a..127b3e5b5f 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py
@@ -6,30 +6,70 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
 
-# fmt: off
-class Tests :
-    camera_component_added =                ("Camera component was added",                  "Camera component wasn't added")
-    camera_fov_set =                        ("Camera component FOV property set",           "Camera component FOV property wasn't set")
-    directional_light_component_added =     ("Directional Light component added",           "Directional Light component wasn't added")
-    enter_game_mode =                       ("Entered game mode",                           "Failed to enter game mode")
-    exit_game_mode =                        ("Exited game mode",                            "Couldn't exit game mode")
-    global_skylight_component_added =       ("Global Skylight (IBL) component added",       "Global Skylight (IBL) component wasn't added")
-    global_skylight_diffuse_image_set =     ("Global Skylight Diffuse Image property set",  "Global Skylight Diffuse Image property wasn't set")
-    global_skylight_specular_image_set =    ("Global Skylight Specular Image property set", "Global Skylight Specular Image property wasn't set")
-    ground_plane_material_asset_set =       ("Ground Plane Material Asset was set",         "Ground Plane Material Asset wasn't set")
-    ground_plane_material_component_added = ("Ground Plane Material component added",       "Ground Plane Material component wasn't added")
-    ground_plane_mesh_asset_set =           ("Ground Plane Mesh Asset property was set",    "Ground Plane Mesh Asset property wasn't set")
-    hdri_skybox_component_added =           ("HDRi Skybox component added",                 "HDRi Skybox component wasn't added")
-    hdri_skybox_cubemap_texture_set =       ("HDRi Skybox Cubemap Texture property set",    "HDRi Skybox Cubemap Texture property wasn't set")
-    mesh_component_added =                  ("Mesh component added",                        "Mesh component wasn't added")
-    no_assert_occurred =                    ("No asserts detected",                         "Asserts were detected")
-    no_error_occurred =                     ("No errors detected",                          "Errors were detected")
-    secondary_grid_spacing =                ("Secondary Grid Spacing set",                  "Secondary Grid Spacing not set")
-    sphere_material_component_added =       ("Sphere Material component added",             "Sphere Material component wasn't added")
-    sphere_material_set =                   ("Sphere Material Asset was set",               "Sphere Material Asset wasn't set")
-    sphere_mesh_asset_set =                 ("Sphere Mesh Asset was set",                   "Sphere Mesh Asset wasn't set")
-    viewport_set =                          ("Viewport set to correct size",                "Viewport not set to correct size")
-# fmt: on
+class Tests:
+    camera_component_added = (
+        "Camera component was added",
+        "Camera component wasn't added")
+    camera_fov_set = (
+        "Camera component FOV property set",
+        "Camera component FOV property wasn't set")
+    directional_light_component_added = (
+        "Directional Light component added",
+        "Directional Light component wasn't added")
+    enter_game_mode = (
+        "Entered game mode",
+        "Failed to enter game mode")
+    exit_game_mode = (
+        "Exited game mode",
+        "Couldn't exit game mode")
+    global_skylight_component_added = (
+        "Global Skylight (IBL) component added",
+        "Global Skylight (IBL) component wasn't added")
+    global_skylight_diffuse_image_set = (
+        "Global Skylight Diffuse Image property set",
+        "Global Skylight Diffuse Image property wasn't set")
+    global_skylight_specular_image_set = (
+        "Global Skylight Specular Image property set",
+        "Global Skylight Specular Image property wasn't set")
+    ground_plane_material_asset_set = (
+        "Ground Plane Material Asset was set",
+        "Ground Plane Material Asset wasn't set")
+    ground_plane_material_component_added = (
+        "Ground Plane Material component added",
+        "Ground Plane Material component wasn't added")
+    ground_plane_mesh_asset_set = (
+        "Ground Plane Mesh Asset property was set",
+        "Ground Plane Mesh Asset property wasn't set")
+    hdri_skybox_component_added = (
+        "HDRi Skybox component added",
+        "HDRi Skybox component wasn't added")
+    hdri_skybox_cubemap_texture_set = (
+        "HDRi Skybox Cubemap Texture property set",
+        "HDRi Skybox Cubemap Texture property wasn't set")
+    mesh_component_added = (
+        "Mesh component added",
+        "Mesh component wasn't added")
+    no_assert_occurred = (
+        "No asserts detected",
+        "Asserts were detected")
+    no_error_occurred = (
+        "No errors detected",
+        "Errors were detected")
+    secondary_grid_spacing = (
+        "Secondary Grid Spacing set",
+        "Secondary Grid Spacing not set")
+    sphere_material_component_added = (
+        "Sphere Material component added",
+        "Sphere Material component wasn't added")
+    sphere_material_set = (
+        "Sphere Material Asset was set",
+        "Sphere Material Asset wasn't set")
+    sphere_mesh_asset_set = (
+        "Sphere Mesh Asset was set",
+        "Sphere Mesh Asset wasn't set")
+    viewport_set = (
+        "Viewport set to correct size",
+        "Viewport not set to correct size")
 
 
 def AtomGPU_BasicLevelSetup_SetsUpLevel():
@@ -77,19 +117,17 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel():
     import os
     from math import isclose
 
-    import azlmbr.asset as asset
-    import azlmbr.bus as bus
     import azlmbr.legacy.general as general
     import azlmbr.math as math
     import azlmbr.paths
 
+    from editor_python_test_tools.asset_utils import Asset
     from editor_python_test_tools.editor_entity_utils import EditorEntity
-    from editor_python_test_tools.utils import Report, Tracer, TestHelper as helper
+    from editor_python_test_tools.utils import Report, Tracer, TestHelper
 
+    from Atom.atom_utils.atom_constants import AtomComponentProperties
     from Atom.atom_utils.screenshot_utils import ScreenshotHelper
 
-    MATERIAL_COMPONENT_NAME = "Material"
-    MESH_COMPONENT_NAME = "Mesh"
     SCREENSHOT_NAME = "AtomBasicLevelSetup"
     SCREEN_WIDTH = 1280
     SCREEN_HEIGHT = 720
@@ -98,24 +136,24 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel():
     def initial_viewport_setup(screen_width, screen_height):
         general.set_viewport_size(screen_width, screen_height)
         general.update_viewport()
-        result = isclose(
-            a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1) and isclose(
-            a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1)
-
-        return result
+        TestHelper.wait_for_condition(
+            function=lambda: isclose(a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1)
+                        and isclose(a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1),
+            timeout_in_seconds=4.0
+        )
 
     with Tracer() as error_tracer:
         # Test setup begins.
         # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
-        helper.init_idle()
-        helper.open_level("", "Base")
+        TestHelper.init_idle()
+        TestHelper.open_level("", "Base")
 
         # Test steps begin.
         # 1. Close error windows and display helpers then update the viewport size.
-        helper.close_error_windows()
-        helper.close_display_helpers()
+        TestHelper.close_error_windows()
+        TestHelper.close_display_helpers()
+        initial_viewport_setup(SCREEN_WIDTH, SCREEN_HEIGHT)
         general.update_viewport()
-        Report.critical_result(Tests.viewport_set, initial_viewport_setup(SCREEN_WIDTH, SCREEN_HEIGHT))
 
         # 2. Create Default Level Entity.
         default_level_entity_name = "Default Level"
@@ -123,168 +161,167 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel():
             math.Vector3(0.0, 0.0, 0.0), default_level_entity_name)
 
         # 3. Create Grid Entity as a child entity of the Default Level Entity.
-        grid_name = "Grid"
-        grid_entity = EditorEntity.create_editor_entity(grid_name, default_level_entity.id)
+        grid_entity = EditorEntity.create_editor_entity(AtomComponentProperties.grid(), default_level_entity.id)
 
         # 4. Add Grid component to Grid Entity and set Secondary Grid Spacing.
-        grid_component = grid_entity.add_component(grid_name)
-        secondary_grid_spacing_property = "Controller|Configuration|Secondary Grid Spacing"
+        grid_component = grid_entity.add_component(AtomComponentProperties.grid())
         secondary_grid_spacing_value = 1.0
-        grid_component.set_component_property_value(secondary_grid_spacing_property, secondary_grid_spacing_value)
+        grid_component.set_component_property_value(
+            AtomComponentProperties.grid('Secondary Grid Spacing'), secondary_grid_spacing_value)
         secondary_grid_spacing_set = grid_component.get_component_property_value(
-            secondary_grid_spacing_property) == secondary_grid_spacing_value
+            AtomComponentProperties.grid('Secondary Grid Spacing')) == secondary_grid_spacing_value
         Report.result(Tests.secondary_grid_spacing, secondary_grid_spacing_set)
 
         # 5. Create Global Skylight (IBL) Entity as a child entity of the Default Level Entity.
-        global_skylight_name = "Global Skylight (IBL)"
-        global_skylight_entity = EditorEntity.create_editor_entity(global_skylight_name, default_level_entity.id)
+        global_skylight_entity = EditorEntity.create_editor_entity(
+            AtomComponentProperties.global_skylight(), default_level_entity.id)
 
         # 6. Add HDRi Skybox component to the Global Skylight (IBL) Entity.
-        hdri_skybox_name = "HDRi Skybox"
-        hdri_skybox_component = global_skylight_entity.add_component(hdri_skybox_name)
-        Report.result(Tests.hdri_skybox_component_added, global_skylight_entity.has_component(hdri_skybox_name))
+        hdri_skybox_component = global_skylight_entity.add_component(AtomComponentProperties.hdri_skybox())
+        Report.result(Tests.hdri_skybox_component_added, global_skylight_entity.has_component(
+            AtomComponentProperties.hdri_skybox()))
 
         # 7. Add Global Skylight (IBL) component to the Global Skylight (IBL) Entity.
-        global_skylight_component = global_skylight_entity.add_component(global_skylight_name)
-        Report.result(Tests.global_skylight_component_added, global_skylight_entity.has_component(global_skylight_name))
+        global_skylight_component = global_skylight_entity.add_component(AtomComponentProperties.global_skylight())
+        Report.result(Tests.global_skylight_component_added, global_skylight_entity.has_component(
+            AtomComponentProperties.global_skylight()))
 
         # 8. Set the Cubemap Texture property of the HDRi Skybox component.
-        global_skylight_image_asset_path = os.path.join(
-            "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage")
-        global_skylight_image_asset = asset.AssetCatalogRequestBus(
-            bus.Broadcast, "GetAssetIdByPath", global_skylight_image_asset_path, math.Uuid(), False)
-        hdri_skybox_cubemap_texture_property = "Controller|Configuration|Cubemap Texture"
+        global_skylight_image_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage")
+        global_skylight_image_asset = Asset.find_asset_by_path(global_skylight_image_asset_path, False)
         hdri_skybox_component.set_component_property_value(
-            hdri_skybox_cubemap_texture_property, global_skylight_image_asset)
+            AtomComponentProperties.hdri_skybox('Cubemap Texture'), global_skylight_image_asset.id)
         Report.result(
             Tests.hdri_skybox_cubemap_texture_set,
             hdri_skybox_component.get_component_property_value(
-                hdri_skybox_cubemap_texture_property) == global_skylight_image_asset)
+                AtomComponentProperties.hdri_skybox('Cubemap Texture')) == global_skylight_image_asset.id)
 
         # 9. Set the Diffuse Image property of the Global Skylight (IBL) component.
         # Re-use the same image that was used in the previous test step.
-        global_skylight_diffuse_image_property = "Controller|Configuration|Diffuse Image"
+        global_skylight_diffuse_image_asset_path = os.path.join(
+            "LightingPresets", "default_iblskyboxcm_ibldiffuse.exr.streamingimage")
+        global_skylight_diffuse_image_asset = Asset.find_asset_by_path(global_skylight_diffuse_image_asset_path, False)
         global_skylight_component.set_component_property_value(
-            global_skylight_diffuse_image_property, global_skylight_image_asset)
+            AtomComponentProperties.global_skylight('Diffuse Image'), global_skylight_diffuse_image_asset.id)
         Report.result(
             Tests.global_skylight_diffuse_image_set,
             global_skylight_component.get_component_property_value(
-                global_skylight_diffuse_image_property) == global_skylight_image_asset)
+                AtomComponentProperties.global_skylight('Diffuse Image')) == global_skylight_diffuse_image_asset.id)
 
         # 10. Set the Specular Image property of the Global Skylight (IBL) component.
         # Re-use the same image that was used in the previous test step.
-        global_skylight_specular_image_property = "Controller|Configuration|Specular Image"
+        global_skylight_specular_image_asset_path = os.path.join(
+            "LightingPresets", "default_iblskyboxcm_iblspecular.exr.streamingimage")
+        global_skylight_specular_image_asset = Asset.find_asset_by_path(
+            global_skylight_specular_image_asset_path, False)
         global_skylight_component.set_component_property_value(
-            global_skylight_specular_image_property, global_skylight_image_asset)
+            AtomComponentProperties.global_skylight('Specular Image'), global_skylight_specular_image_asset.id)
         global_skylight_specular_image_set = global_skylight_component.get_component_property_value(
-            global_skylight_specular_image_property)
+            AtomComponentProperties.global_skylight('Specular Image'))
         Report.result(
-            Tests.global_skylight_specular_image_set, global_skylight_specular_image_set == global_skylight_image_asset)
+            Tests.global_skylight_specular_image_set,
+            global_skylight_specular_image_set == global_skylight_specular_image_asset.id)
 
         # 11. Create a Ground Plane Entity with a Material component that is a child entity of the Default Level Entity.
         ground_plane_name = "Ground Plane"
         ground_plane_entity = EditorEntity.create_editor_entity(ground_plane_name, default_level_entity.id)
-        ground_plane_material_component = ground_plane_entity.add_component(MATERIAL_COMPONENT_NAME)
+        ground_plane_material_component = ground_plane_entity.add_component(AtomComponentProperties.material())
         Report.result(
-            Tests.ground_plane_material_component_added, ground_plane_entity.has_component(MATERIAL_COMPONENT_NAME))
+            Tests.ground_plane_material_component_added,
+            ground_plane_entity.has_component(AtomComponentProperties.material()))
 
         # 12. Set the Material Asset property of the Material component for the Ground Plane Entity.
         ground_plane_entity.set_local_uniform_scale(32.0)
         ground_plane_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_chrome.azmaterial")
-        ground_plane_material_asset = asset.AssetCatalogRequestBus(
-            bus.Broadcast, "GetAssetIdByPath", ground_plane_material_asset_path, math.Uuid(), False)
-        ground_plane_material_asset_property = "Default Material|Material Asset"
+        ground_plane_material_asset = Asset.find_asset_by_path(ground_plane_material_asset_path, False)
         ground_plane_material_component.set_component_property_value(
-            ground_plane_material_asset_property, ground_plane_material_asset)
+            AtomComponentProperties.material('Material Asset'), ground_plane_material_asset.id)
         Report.result(
             Tests.ground_plane_material_asset_set,
             ground_plane_material_component.get_component_property_value(
-                ground_plane_material_asset_property) == ground_plane_material_asset)
+                AtomComponentProperties.material('Material Asset')) == ground_plane_material_asset.id)
 
         # 13. Add the Mesh component to the Ground Plane Entity and set the Mesh component Mesh Asset property.
-        ground_plane_mesh_component = ground_plane_entity.add_component(MESH_COMPONENT_NAME)
-        Report.result(Tests.mesh_component_added, ground_plane_entity.has_component(MESH_COMPONENT_NAME))
-        ground_plane_mesh_asset_path = os.path.join("Objects", "plane.azmodel")
-        ground_plane_mesh_asset = asset.AssetCatalogRequestBus(
-            bus.Broadcast, "GetAssetIdByPath", ground_plane_mesh_asset_path, math.Uuid(), False)
-        ground_plane_mesh_asset_property = "Controller|Configuration|Mesh Asset"
+        ground_plane_mesh_component = ground_plane_entity.add_component(AtomComponentProperties.mesh())
+        Report.result(Tests.mesh_component_added, ground_plane_entity.has_component(AtomComponentProperties.mesh()))
+        ground_plane_mesh_asset_path = os.path.join("TestData", "Objects", "plane.azmodel")
+        ground_plane_mesh_asset = Asset.find_asset_by_path(ground_plane_mesh_asset_path, False)
         ground_plane_mesh_component.set_component_property_value(
-            ground_plane_mesh_asset_property, ground_plane_mesh_asset)
+            AtomComponentProperties.mesh('Mesh Asset'), ground_plane_mesh_asset.id)
         Report.result(
             Tests.ground_plane_mesh_asset_set,
             ground_plane_mesh_component.get_component_property_value(
-                ground_plane_mesh_asset_property) == ground_plane_mesh_asset)
+                AtomComponentProperties.mesh('Mesh Asset')) == ground_plane_mesh_asset.id)
 
         # 14. Create a Directional Light Entity as a child entity of the Default Level Entity.
-        directional_light_name = "Directional Light"
         directional_light_entity = EditorEntity.create_editor_entity_at(
-            math.Vector3(0.0, 0.0, 10.0), directional_light_name, default_level_entity.id)
+            math.Vector3(0.0, 0.0, 10.0), AtomComponentProperties.directional_light(), default_level_entity.id)
 
         # 15. Add Directional Light component to Directional Light Entity and set entity rotation.
-        directional_light_entity.add_component(directional_light_name)
+        directional_light_entity.add_component(AtomComponentProperties.directional_light())
         directional_light_entity_rotation = math.Vector3(DEGREE_RADIAN_FACTOR * -90.0, 0.0, 0.0)
         directional_light_entity.set_local_rotation(directional_light_entity_rotation)
         Report.result(
-            Tests.directional_light_component_added, directional_light_entity.has_component(directional_light_name))
+            Tests.directional_light_component_added, directional_light_entity.has_component(
+                AtomComponentProperties.directional_light()))
 
         # 16. Create a Sphere Entity as a child entity of the Default Level Entity then add a Material component.
         sphere_entity = EditorEntity.create_editor_entity_at(
             math.Vector3(0.0, 0.0, 1.0), "Sphere", default_level_entity.id)
-        sphere_material_component = sphere_entity.add_component(MATERIAL_COMPONENT_NAME)
-        Report.result(Tests.sphere_material_component_added, sphere_entity.has_component(MATERIAL_COMPONENT_NAME))
+        sphere_material_component = sphere_entity.add_component(AtomComponentProperties.material())
+        Report.result(Tests.sphere_material_component_added, sphere_entity.has_component(
+            AtomComponentProperties.material()))
 
         # 17. Set the Material Asset property of the Material component for the Sphere Entity.
         sphere_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_brass_polished.azmaterial")
-        sphere_material_asset = asset.AssetCatalogRequestBus(
-            bus.Broadcast, "GetAssetIdByPath", sphere_material_asset_path, math.Uuid(), False)
-        sphere_material_asset_property = "Default Material|Material Asset"
-        sphere_material_component.set_component_property_value(sphere_material_asset_property, sphere_material_asset)
+        sphere_material_asset = Asset.find_asset_by_path(sphere_material_asset_path, False)
+        sphere_material_component.set_component_property_value(
+            AtomComponentProperties.material('Material Asset'), sphere_material_asset.id)
         Report.result(Tests.sphere_material_set, sphere_material_component.get_component_property_value(
-            sphere_material_asset_property) == sphere_material_asset)
+            AtomComponentProperties.material('Material Asset')) == sphere_material_asset.id)
 
         # 18. Add Mesh component to Sphere Entity and set the Mesh Asset property for the Mesh component.
-        sphere_mesh_component = sphere_entity.add_component(MESH_COMPONENT_NAME)
+        sphere_mesh_component = sphere_entity.add_component(AtomComponentProperties.mesh())
         sphere_mesh_asset_path = os.path.join("Models", "sphere.azmodel")
-        sphere_mesh_asset = asset.AssetCatalogRequestBus(
-            bus.Broadcast, "GetAssetIdByPath", sphere_mesh_asset_path, math.Uuid(), False)
-        sphere_mesh_asset_property = "Controller|Configuration|Mesh Asset"
-        sphere_mesh_component.set_component_property_value(sphere_mesh_asset_property, sphere_mesh_asset)
+        sphere_mesh_asset = Asset.find_asset_by_path(sphere_mesh_asset_path, False)
+        sphere_mesh_component.set_component_property_value(
+            AtomComponentProperties.mesh('Mesh Asset'), sphere_mesh_asset.id)
         Report.result(Tests.sphere_mesh_asset_set, sphere_mesh_component.get_component_property_value(
-            sphere_mesh_asset_property) == sphere_mesh_asset)
+            AtomComponentProperties.mesh('Mesh Asset')) == sphere_mesh_asset.id)
 
         # 19. Create a Camera Entity as a child entity of the Default Level Entity then add a Camera component.
-        camera_name = "Camera"
         camera_entity = EditorEntity.create_editor_entity_at(
-            math.Vector3(5.5, -12.0, 9.0), camera_name, default_level_entity.id)
-        camera_component = camera_entity.add_component(camera_name)
-        Report.result(Tests.camera_component_added, camera_entity.has_component(camera_name))
+            math.Vector3(5.5, -12.0, 9.0), AtomComponentProperties.camera(), default_level_entity.id)
+        camera_component = camera_entity.add_component(AtomComponentProperties.camera())
+        Report.result(Tests.camera_component_added, camera_entity.has_component(AtomComponentProperties.camera()))
 
         # 20. Set the Camera Entity rotation value and set the Camera component Field of View value.
         camera_entity_rotation = math.Vector3(
             DEGREE_RADIAN_FACTOR * -27.0, DEGREE_RADIAN_FACTOR * -12.0, DEGREE_RADIAN_FACTOR * 25.0)
         camera_entity.set_local_rotation(camera_entity_rotation)
-        camera_fov_property = "Controller|Configuration|Field of view"
         camera_fov_value = 60.0
-        camera_component.set_component_property_value(camera_fov_property, camera_fov_value)
+        camera_component.set_component_property_value(AtomComponentProperties.camera('Field of view'), camera_fov_value)
         azlmbr.camera.EditorCameraViewRequestBus(azlmbr.bus.Event, "ToggleCameraAsActiveView", camera_entity.id)
         Report.result(Tests.camera_fov_set, camera_component.get_component_property_value(
-            camera_fov_property) == camera_fov_value)
+            AtomComponentProperties.camera('Field of view')) == camera_fov_value)
 
         # 21. Enter game mode.
-        helper.enter_game_mode(Tests.enter_game_mode)
-        helper.wait_for_condition(function=lambda: general.is_in_game_mode(), timeout_in_seconds=4.0)
+        TestHelper.enter_game_mode(Tests.enter_game_mode)
+        TestHelper.wait_for_condition(function=lambda: general.is_in_game_mode(), timeout_in_seconds=4.0)
 
         # 22. Take screenshot.
         ScreenshotHelper(general.idle_wait_frames).capture_screenshot_blocking(f"{SCREENSHOT_NAME}.ppm")
 
         # 23. Exit game mode.
-        helper.exit_game_mode(Tests.exit_game_mode)
-        helper.wait_for_condition(function=lambda: not general.is_in_game_mode(), timeout_in_seconds=4.0)
+        TestHelper.exit_game_mode(Tests.exit_game_mode)
+        TestHelper.wait_for_condition(function=lambda: not general.is_in_game_mode(), timeout_in_seconds=4.0)
 
         # 24. Look for errors.
-        helper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
-        Report.result(Tests.no_assert_occurred, not error_tracer.has_asserts)
-        Report.result(Tests.no_error_occurred, not error_tracer.has_errors)
+        TestHelper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
+        for error_info in error_tracer.errors:
+            Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
+        for assert_info in error_tracer.asserts:
+            Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
 
 
 if __name__ == "__main__":
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py
index 645447e6de..1641b529ae 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py
@@ -106,8 +106,7 @@ def run():
         components=["HDRi Skybox", "Global Skylight (IBL)"],
         parent_id=default_level.id
     )
-    global_skylight_image_asset_path = os.path.join(
-        "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage")
+    global_skylight_image_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage")
     global_skylight_image_asset = asset.AssetCatalogRequestBus(
         bus.Broadcast, "GetAssetIdByPath", global_skylight_image_asset_path, math.Uuid(), False)
     global_skylight.get_set_test(0, "Controller|Configuration|Cubemap Texture", global_skylight_image_asset)
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py
index dbc4a1a456..a047d09d29 100644
--- a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py
@@ -23,28 +23,28 @@ from base import TestAutomationBase
 class TestAutomation(TestAutomationBase):
     def test_ActorSplitsAfterCollision(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterCollision as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ActorSplitsAfterRadialDamage(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterRadialDamage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ActorSplitsAfterCapsuleDamage(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterCapsuleDamage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ActorSplitsAfterImpactSpreadDamage(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterImpactSpreadDamage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ActorSplitsAfterShearDamage(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterShearDamage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ActorSplitsAfterTriangleDamage(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterTriangleDamage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ActorSplitsAfterStressDamage(self, request, workspace, editor, launcher_platform):
         from .tests import Blast_ActorSplitsAfterStressDamage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
index bec49185bd..800f347359 100644
--- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt
@@ -56,6 +56,9 @@ add_subdirectory(streaming)
 ## Smoke ##
 add_subdirectory(smoke)
 
+## Terrain ##
+add_subdirectory(Terrain)
+
 ## AWS ##
 add_subdirectory(AWS)
 
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py
index ed677ea185..a8ca721cca 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py
@@ -51,5 +51,6 @@ class TestComponentAssetListAutomation(object):
             editor,
             "ComponentUpdateListProperty_test_case.py",
             expected_lines=expected_lines,
-            cfg_args=[level]
+            cfg_args=[level],
+            enable_prefab_system=False,
         )
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
index 9a308ab9c1..28b49bb4cb 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
@@ -67,30 +67,6 @@ if (editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'GetCurrentLevelName'
     if(general.get_num_selected() == 0):
         print("clear_selection works")
     
-    general.hide_all_objects()
-    
-    if(general.is_object_hidden(objs_list[1])):
-        print("hide_all_objects works")
-    
-    general.unhide_object(objs_list[1])
-    
-    if not(general.is_object_hidden(objs_list[1])):
-        print("unhide_object works")
-    
-    general.hide_object(objs_list[1])
-    
-    if(general.is_object_hidden(objs_list[1])):
-        print("hide_object works")
-    
-    general.unhide_all_objects()
-    
-    general.freeze_object(objs_list[1])
-    
-    if(general.is_object_frozen(objs_list[1])):
-        print("freeze_object works")
-    
-    general.unfreeze_object(objs_list[1])
-    
     position = general.get_position(objs_list[1])
     px1, py1, pz1 = fetch_vector3_parts(position)
     general.set_position(objs_list[1], px1 + 10, py1 - 4, pz1 + 3)
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
index 90afee39bc..bd9740f60f 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
@@ -26,9 +26,9 @@ INSTALL
 It is recommended to set up these these tools with O3DE's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
     cd /path/to/od3e/
-    mkdir windows_vs2019
-    cd windows_vs2019
-    cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting
+    mkdir windows
+    cd windows
+    cmake .. -G "Visual Studio 16 2019" -DLY_PROJECTS=AutomatedTesting
 
 To manually install the project in development mode using your own installed Python interpreter:
     cd /path/to/od3e/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
index 9e857ed8bc..309601b0ba 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
@@ -132,6 +132,7 @@ class EditorEntity:
 
     def __init__(self, id: azlmbr.entity.EntityId):
         self.id: azlmbr.entity.EntityId = id
+        self.components: List[EditorComponent] = []
 
     # Creation functions
     @classmethod
@@ -279,7 +280,7 @@ class EditorEntity:
             ), f"Failure: Could not add component: '{new_comp.get_component_name()}' to entity: '{self.get_name()}'"
             new_comp.id = add_component_outcome.GetValue()[0]
             components.append(new_comp)
-
+            self.components.append(new_comp)
         return components
 
     def get_components_of_type(self, component_names: list) -> List[EditorComponent]:
@@ -458,3 +459,14 @@ class EditorEntity:
         """
         new_translation = convert_to_azvector3(new_translation)
         azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalTranslation", self.id, new_translation)
+
+    # Use this only when prefab system is enabled as it will fail otherwise.
+    def focus_on_owning_prefab(self) -> None:
+        """
+        Focuses on the owning prefab instance of the given entity.
+        :param entity: The entity used to fetch the owning prefab to focus on.
+        """
+
+        assert self.id.isValid(), "A valid entity id is required to focus on its owning prefab."
+        focus_prefab_result = azlmbr.prefab.PrefabFocusPublicRequestBus(bus.Broadcast, "FocusOnOwningPrefab", self.id)
+        assert focus_prefab_result.IsSuccess(), f"Prefab operation 'FocusOnOwningPrefab' failed. Error: {focus_prefab_result.GetError()}"
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
index 985e32ede5..19aa6e9d3c 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
@@ -57,6 +57,10 @@ def add_level_component(component_name):
                                                                  level_component_list, entity.EntityType().Level)
     level_component_outcome = editor.EditorLevelComponentAPIBus(bus.Broadcast, 'AddComponentsOfType',
                                                                 [level_component_type_ids_list[0]])
+    if not level_component_outcome.IsSuccess():
+        print('Failed to add {} level component'.format(component_name))
+        return None
+
     level_component = level_component_outcome.GetValue()[0]
     return level_component
 
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
index 510d1b1149..ee36a640f0 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
@@ -29,7 +29,7 @@ def teardown_editor(editor):
 
 def launch_and_validate_results(request, test_directory, editor, editor_script, expected_lines, unexpected_lines=[],
                                 halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=True, cfg_args=[],
-                                timeout=300, log_file_name="Editor.log"):
+                                timeout=300, log_file_name="Editor.log", enable_prefab_system=True):
     """
     Runs the Editor with the specified script, and monitors for expected log lines.
     :param request: Special fixture providing information of the requesting test function.
@@ -45,17 +45,22 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
     :param cfg_args: Additional arguments for CFG, such as LevelName.
     :param timeout: Length of time for test to run. Default is 60.
     :param log_file_name: Name of the log file created by the editor. Defaults to 'Editor.log'
+    :param enable_prefab_system: Flag to determine whether to use new prefab system or use deprecated slice system. Defaults to True.
     """
     test_case = os.path.join(test_directory, editor_script)
     request.addfinalizer(lambda: teardown_editor(editor))
     logger.debug("Running automated test: {}".format(editor_script))
     editor.args.extend(["--skipWelcomeScreenDialog", "--regset=/Amazon/Settings/EnableSourceControl=false", 
-                        "--regset=/Amazon/Preferences/EnablePrefabSystem=false", run_python, test_case,
+                        run_python, test_case,
                         f"--pythontestcase={request.node.name}", "--runpythonargs", " ".join(cfg_args)])
     if auto_test_mode:
         editor.args.extend(["--autotest_mode"])
     if null_renderer:
         editor.args.extend(["-rhi=Null"])
+    if enable_prefab_system:
+        editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=true"])
+    else:
+        editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=false"])
 
     with editor.start():
 
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
index 481d73274f..212c862efd 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
@@ -34,6 +34,38 @@ class TestHelper:
         # JIRA: SPEC-2880
         # general.idle_wait_frames(1)
 
+    @staticmethod
+    def create_level(level_name: str) -> bool:
+        """
+        :param level_name: The name of the level to be created
+        :return: True if ECreateLevelResult returns 0, False otherwise with logging to report reason
+        """
+        Report.info(f"Creating level {level_name}")
+
+        # Use these hardcoded values to pass expected values for old terrain system until new create_level API is
+        # available
+        heightmap_resolution = 1024
+        heightmap_meters_per_pixel = 1
+        terrain_texture_resolution = 4096
+        use_terrain = False
+
+        result = general.create_level_no_prompt(level_name, heightmap_resolution, heightmap_meters_per_pixel,
+                                                terrain_texture_resolution, use_terrain)
+
+        # Result codes are ECreateLevelResult defined in CryEdit.h
+        if result == 1:
+            Report.info(f"{level_name} level already exists")
+        elif result == 2:
+            Report.info("Failed to create directory")
+        elif result == 3:
+            Report.info("Directory length is too long")
+        elif result != 0:
+            Report.info("Unknown error, failed to create level")
+        else:
+            Report.info(f"{level_name} level created successfully")
+
+        return result == 0
+
     @staticmethod
     def open_level(directory : str, level : str):
         # type: (str, str) -> None
diff --git a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py
index df1eb62943..450c760786 100644
--- a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py
@@ -23,7 +23,6 @@ from base import TestAutomationBase
 class TestAutomation(TestAutomationBase):
     def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True):
         self._run_test(request, workspace, editor, test_module, 
-            extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], 
             batch_mode=batch_mode,
             autotest_mode=autotest_mode)
 
diff --git a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py
index 52ac19b26e..8f50d4d36d 100644
--- a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py
@@ -24,7 +24,6 @@ from base import TestAutomationBase
 class TestAutomation(TestAutomationBase):
     def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True):
         self._run_test(request, workspace, editor, test_module, 
-            extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], 
             batch_mode=batch_mode,
             autotest_mode=autotest_mode)
 
diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py
index 49a776a48c..f35f098b0f 100644
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py
@@ -25,8 +25,8 @@ class TestAutomation(TestAutomationBase):
 
     def test_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform):
         from .tests import NvCloth_AddClothSimulationToMesh as test_module
-        self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer)
+        self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer, enable_prefab_system=False)
 
     def test_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform):
         from .tests import NvCloth_AddClothSimulationToActor as test_module
-        self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer)
+        self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py
index 9e3a9cb4ff..09d8f5635f 100755
--- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py
@@ -26,158 +26,158 @@ class TestAutomation(TestAutomationBase):
                     r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnRagdollBones")
     def test_Material_LibraryCrudOperationsReflectOnRagdollBones(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryCrudOperationsReflectOnRagdollBones as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Material_RagdollBones(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_RagdollBones as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @fm.file_revert("c15308221_material_componentsinsyncwithlibrary.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_ComponentsInSyncWithLibrary")
     def test_Material_ComponentsInSyncWithLibrary(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_ComponentsInSyncWithLibrary as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # BUG: LY-107723")
     def test_ScriptCanvas_SetKinematicTargetTransform(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_SetKinematicTargetTransform as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Failing, PhysXTerrain
     @fm.file_revert("c4925579_material_addmodifydeleteonterrain.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnTerrain")
     def test_Material_LibraryCrudOperationsReflectOnTerrain(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryCrudOperationsReflectOnTerrain as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Failing, PhysXTerrain
     def test_Terrain_TerrainTexturePainterWorks(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_TerrainTexturePainterWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Failing, PhysXTerrain
     def test_Material_CanBeAssignedToTerrain(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_CanBeAssignedToTerrain as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Failing, PhysXTerrain
     def test_Material_DefaultLibraryConsistentOnAllFeatures(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_DefaultLibraryConsistentOnAllFeatures as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Failing, PhysXTerrain
     @fm.file_revert("all_ones_1.physmaterial", r"AutomatedTesting\Levels\Physics\Material_DefaultMaterialLibraryChangesWork")
     @fm.file_override("default.physxconfiguration", "Material_DefaultMaterialLibraryChangesWork.physxconfiguration", "AutomatedTesting")
     def test_Material_DefaultMaterialLibraryChangesWork(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_DefaultMaterialLibraryChangesWork as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Collider_SameCollisionGroupSameLayerCollide(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_SameCollisionGroupSameLayerCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Ragdoll_OldRagdollSerializationNoErrors(self, request, workspace, editor, launcher_platform):
         from .tests.ragdoll import Ragdoll_OldRagdollSerializationNoErrors as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @fm.file_override("default.physxconfiguration", "ScriptCanvas_OverlapNode.physxconfiguration")
     def test_ScriptCanvas_OverlapNode(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_OverlapNode as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Material_StaticFriction(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_StaticFriction as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
         
     @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCollider")
     def test_Material_LibraryCrudOperationsReflectOnCollider(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryCrudOperationsReflectOnCollider as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCharacterController")
     def test_Material_LibraryCrudOperationsReflectOnCharacterController(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryCrudOperationsReflectOnCharacterController as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCollider")
     def test_Material_LibraryCrudOperationsReflectOnCollider(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryCrudOperationsReflectOnCollider as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
     
 
     @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCharacterController")
     def test_Material_LibraryCrudOperationsReflectOnCharacterController(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryCrudOperationsReflectOnCharacterController as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @fm.file_revert("c4044455_material_librarychangesinstantly.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C4044455_Material_LibraryChangesInstantly")
     def test_Material_LibraryChangesReflectInstantly(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryChangesReflectInstantly as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @fm.file_revert("Material_LibraryUpdatedAcrossLevels.physmaterial",
                     r"AutomatedTesting\Levels\Physics\Material_LibraryUpdatedAcrossLevels")
     def test_Material_LibraryUpdatedAcrossLevels(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryUpdatedAcrossLevels as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
     
     def test_RigidBody_LinearDampingAffectsMotion(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_LinearDampingAffectsMotion as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_CollisionAgainstRigidBody(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_CollisionAgainstRigidBody as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform):
         from .tests.collider import ShapeCollider_CylinderShapeCollides as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Physics_WorldBodyBusWorksOnEditorComponents(self, request, workspace, editor, launcher_platform):
         from .tests import Physics_WorldBodyBusWorksOnEditorComponents as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Collider_PxMeshErrorIfNoMesh(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_PxMeshErrorIfNoMesh as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_ImpulsesBoxShapedRigidBody(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ImpulsesBoxShapedRigidBody as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_SpawnSecondTerrainComponentWarning(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_SpawnSecondTerrainComponentWarning as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_AddPhysTerrainComponent(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_AddPhysTerrainComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_CanAddMultipleTerrainComponents(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_CanAddMultipleTerrainComponents as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_MultipleTerrainComponentsWarning(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_MultipleTerrainComponentsWarning as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_MultipleTerrainComponentsWarning(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_MultipleTerrainComponentsWarning as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_HighValuesDirectionAxesWorkWithNoError(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_HighValuesDirectionAxesWorkWithNoError as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Terrain_MultipleResolutionsValid(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_MultipleResolutionsValid as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_SmallMagnitudeDeviationOnLargeForces(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_SmallMagnitudeDeviationOnLargeForces as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py
index fb2744deda..07ae5f6ca0 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py
@@ -30,33 +30,33 @@ class TestAutomation(TestAutomationBase):
 
     def test_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_LocalSpaceForceOnRigidBodies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_DynamicFriction.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_DynamicFriction(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_DynamicFriction as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_SameCollisionGroupDiffLayersCollide(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_SameCollisionGroupDiffLayersCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform):
         from .tests.character_controller import CharacterController_SwitchLevels as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Ragdoll_AddPhysxRagdollComponentWorks(self, request, workspace, editor, launcher_platform):
         from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform):
@@ -64,43 +64,43 @@ class TestAutomation(TestAutomationBase):
         # Fixme: This test previously relied on unexpected lines log reading with is now not supported.
         # Now the log reading must be done inside the test, preferably with the Tracer() utility
         #  unexpected_lines = ["Assert"] + test_module.Lines.unexpected
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Collider_DiffCollisionGroupDiffCollidingLayersNotCollide(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_DiffCollisionGroupDiffCollidingLayersNotCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_HingeLeadFollowerCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_PxMeshConvexMeshCollides(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
     
     @revert_physics_config    
     def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform):
         from .tests.shape_collider import ShapeCollider_CylinderShapeCollides as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
         from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.GROUP_tick
     @pytest.mark.xfail(reason="Test still under development.")
     def test_Tick_InterpolatedRigidBodyMotionIsSmooth(self, request, workspace, editor, launcher_platform):
         from .tests.tick import Tick_InterpolatedRigidBodyMotionIsSmooth as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.GROUP_tick
     @pytest.mark.xfail(reason="Test still under development.")
     def test_Tick_CharacterGameplayComponentMotionIsSmooth(self, request, workspace, editor, launcher_platform):
         from .tests.tick import Tick_CharacterGameplayComponentMotionIsSmooth as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py
index 3d668a2085..b25b4340e8 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py
@@ -59,9 +59,6 @@ class EditorSingleTest_WithFileOverrides(EditorSingleTest):
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomationWithPrefabSystemEnabled(EditorTestSuite):
 
-    global_extra_cmdline_args = ['-BatchMode', '-autotest_mode',
-                                 'extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]']
-
     @staticmethod
     def get_number_parallel_editors():
         return 16
@@ -81,6 +78,8 @@ class TestAutomationWithPrefabSystemEnabled(EditorTestSuite):
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(EditorTestSuite):
 
+    enable_prefab_system = False
+
     @staticmethod
     def get_number_parallel_editors():
         return 16
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py
index 55e51dd2f8..6daf852708 100755
--- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py
@@ -31,223 +31,223 @@ class TestAutomation(TestAutomationBase):
     @revert_physics_config
     def test_Terrain_NoPhysTerrainComponentNoCollision(self, request, workspace, editor, launcher_platform):
         from .tests.terrain import Terrain_NoPhysTerrainComponentNoCollision as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
         
     @revert_physics_config
     def test_RigidBody_InitialLinearVelocity(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_InitialLinearVelocity as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_StartGravityEnabledWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_StartGravityEnabledWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_KinematicModeWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_KinematicModeWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_LinearDampingForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_LinearDampingForceOnRigidBodies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_SimpleDragForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_SimpleDragForceOnRigidBodies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_CapsuleShapedForce(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_CapsuleShapedForce as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ImpulsesCapsuleShapedRigidBody(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ImpulsesCapsuleShapedRigidBody as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_MomentOfInertiaManualSetting(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_MomentOfInertiaManualSetting as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_COM_ManualSettingWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_COM_ManualSettingWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_AddRigidBodyComponent(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_AddRigidBodyComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_SplineForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_SplineForceOnRigidBodies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_RestitutionCombine.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_RestitutionCombine(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_RestitutionCombine as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_FrictionCombine.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_FrictionCombine(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_FrictionCombine as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_ColliderPositionOffset(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_ColliderPositionOffset as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_AngularDampingAffectsRotation(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_AngularDampingAffectsRotation as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether(self, request, workspace, editor, launcher_platform):
         from .tests import Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_MultipleForcesInSameComponentCombineForces(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_MultipleForcesInSameComponentCombineForces as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ImpulsesPxMeshShapedRigidBody(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ImpulsesPxMeshShapedRigidBody as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ScriptCanvas_TriggerEvents(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_TriggerEvents as test_module
         # FIXME: expected_lines = test_module.LogLines.expected_lines
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ZeroPointForceDoesNothing(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ZeroPointForceDoesNothing as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ZeroWorldSpaceForceDoesNothing(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ZeroWorldSpaceForceDoesNothing as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ZeroLinearDampingDoesNothing(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ZeroLinearDampingDoesNothing as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_MovingForceRegionChangesNetForce(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_MovingForceRegionChangesNetForce as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ScriptCanvas_CollisionEvents(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_CollisionEvents as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_DirectionHasNoAffectOnTotalForce(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_DirectionHasNoAffectOnTotalForce as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_StartAsleepWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_StartAsleepWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_SliceFileInstantiates(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_SliceFileInstantiates as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ZeroLocalSpaceForceDoesNothing(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ZeroLocalSpaceForceDoesNothing as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ZeroSimpleDragForceDoesNothing(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ZeroSimpleDragForceDoesNothing as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_COM_ComputingWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_COM_ComputingWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_MassDifferentValuesWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_MassDifferentValuesWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_RestitutionCombinePriorityOrder.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_RestitutionCombinePriorityOrder(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_RestitutionCombinePriorityOrder as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_SplineRegionWithModifiedTransform(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_SplineRegionWithModifiedTransform as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ScriptCanvas_ShapeCast(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_ShapeCast as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_InitialAngularVelocity(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_InitialAngularVelocity as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ZeroSplineForceDoesNothing(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ZeroSplineForceDoesNothing as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Physics_DynamicSliceWithPhysNotSpawnsStaticSlice(self, request, workspace, editor, launcher_platform):
         from .tests import Physics_DynamicSliceWithPhysNotSpawnsStaticSlice as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_PositionOffset(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_PositionOffset as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_FrictionCombinePriorityOrder.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_FrictionCombinePriorityOrder(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_FrictionCombinePriorityOrder as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(
         reason="Something with the CryRenderer disabling is causing this test to fail now.")
     @revert_physics_config
     def test_Ragdoll_LevelSwitchDoesNotCrash(self, request, workspace, editor, launcher_platform):
         from .tests.ragdoll import Ragdoll_LevelSwitchDoesNotCrash as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
     
     @revert_physics_config
     def test_ForceRegion_MultipleComponentsCombineForces(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_MultipleComponentsCombineForces as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Marking the test as an expected failure due to sporadic failure on Automated Review: LYN-2580
     # The test still runs, but a failure of the test doesn't result in the test run failing
@@ -258,102 +258,102 @@ class TestAutomation(TestAutomationBase):
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_PerFaceMaterialGetsCorrectMaterial(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_PerFaceMaterialGetsCorrectMaterial as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(
         reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.")
     @revert_physics_config
     def test_RigidBody_SleepWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_SleepWhenBelowKineticThreshold as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_COM_NotIncludesTriggerShapes(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_COM_NotIncludesTriggerShapes as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Material_NoEffectIfNoColliderShape(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_NoEffectIfNoColliderShape as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_TriggerPassThrough(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_TriggerPassThrough as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_SetGravityWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_SetGravityWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_CharacterController.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_CharacterController(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_CharacterController as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Material_EmptyLibraryUsesDefault(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_EmptyLibraryUsesDefault as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_NoQuiverOnHighLinearDampingForce(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_NoQuiverOnHighLinearDampingForce as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_RigidBody_ComputeInertiaWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_ComputeInertiaWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ScriptCanvas_PostPhysicsUpdate(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_PostPhysicsUpdate as test_module
         # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Collider_NoneCollisionGroupSameLayerNotCollide(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_NoneCollisionGroupSameLayerNotCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Collider_SameCollisionGroupSameCustomLayerCollide(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_SameCollisionGroupSameCustomLayerCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxdefaultsceneconfiguration.setreg','ScriptCanvas_PostUpdateEvent.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_PostUpdateEvent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Material_Restitution.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Material_Restitution(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_Restitution as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxdefaultsceneconfiguration.setreg', 'ScriptCanvas_PreUpdateEvent.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_PreUpdateEvent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_PxMeshShapedForce(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_PxMeshShapedForce as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     # Marking the Test  as expected to fail using the xfail decorator due to sporadic failure on Automated Review: SPEC-3146
     # The test still runs, but a failure of the test doesn't result in the test run failing
@@ -361,176 +361,173 @@ class TestAutomation(TestAutomationBase):
     @revert_physics_config
     def test_RigidBody_MaxAngularVelocityWorks(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_MaxAngularVelocityWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Joints_HingeSoftLimitsConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_HingeSoftLimitsConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Joints_BallSoftLimitsConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_BallSoftLimitsConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Joints_BallLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_BallLeadFollowerCollide as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Collider_AddingNewGroupWorks.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Collider_AddingNewGroupWorks(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_AddingNewGroupWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ShapeCollider_InactiveWhenNoShapeComponent(self, request, workspace, editor, launcher_platform):
         from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_CheckDefaultShapeSettingIsPxMesh(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor(self, request, workspace, editor, launcher_platform):
         from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_SphereShapeEditing(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_SphereShapeEditing as test_module
-        self._run_test(request, workspace, editor, test_module,
-                       extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"])
+        self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_Collider_BoxShapeEditing(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_BoxShapeEditing as test_module
-        self._run_test(request, workspace, editor, test_module,
-                       extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"])
+        self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_Collider_CapsuleShapeEditing(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_CapsuleShapeEditing as test_module
-        self._run_test(request, workspace, editor, test_module,
-                       extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ForceRegion_WithNonTriggerColliderWarning(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module
         # Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_WorldSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_WorldSpaceForceOnRigidBodies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_PointForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_PointForceOnRigidBodies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_SphereShapedForce(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_SphereShapedForce as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_RotationalOffset as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Material_LibraryClearingAssignsDefault(self, request, workspace, editor, launcher_platform):
         from .tests.material import Material_LibraryClearingAssignsDefault as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Collider_AddColliderComponent(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_AddColliderComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(
         reason="This will fail due to this issue ATOM-15487.")
     def test_Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Collider_MultipleSurfaceSlots(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_MultipleSurfaceSlots as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
         from .tests.rigid_body import RigidBody_EnablingGravityWorksPoC as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','Collider_CollisionGroupsWorkflow.setreg_override',
                       'AutomatedTesting/Registry', search_subdirs=True)
     def test_Collider_CollisionGroupsWorkflow(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_CollisionGroupsWorkflow as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform):
         from .tests.collider import Collider_ColliderRotationOffset as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @revert_physics_config
     def test_ForceRegion_ParentChildForcesCombineForces(self, request, workspace, editor, launcher_platform):
         from .tests.force_region import ForceRegion_ParentChildForcesCombineForces as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
         
     @revert_physics_config
     def test_ShapeCollider_CanBeAddedWitNoWarnings(self, request, workspace, editor, launcher_platform):
         from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
         
     @revert_physics_config
     def test_Physics_UndoRedoWorksOnEntityWithPhysComponents(self, request, workspace, editor, launcher_platform):
         from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
     
     def test_Joints_Fixed2BodiesConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_Fixed2BodiesConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_Hinge2BodiesConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_Hinge2BodiesConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_Ball2BodiesConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_Ball2BodiesConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_FixedBreakable(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_FixedBreakable as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_HingeBreakable(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_HingeBreakable as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_BallBreakable(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_BallBreakable as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_HingeNoLimitsConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_HingeNoLimitsConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_BallNoLimitsConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_BallNoLimitsConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Joints_GlobalFrameConstrained(self, request, workspace, editor, launcher_platform):
         from .tests.joints import Joints_GlobalFrameConstrained as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
     
     @revert_physics_config
     def test_Material_DefaultLibraryUpdatedAcrossLevels(self, request, workspace, editor, launcher_platform):
@@ -540,7 +537,7 @@ class TestAutomation(TestAutomationBase):
                           search_subdirs=True)
         def levels_before(self, request, workspace, editor, launcher_platform):
             from .tests.material import Material_DefaultLibraryUpdatedAcrossLevels_before as test_module_0
-            self._run_test(request, workspace, editor, test_module_0)
+            self._run_test(request, workspace, editor, test_module_0, enable_prefab_system=False)
 
         # File override replaces the previous physxconfiguration file with another where the only difference is the default material library
         @fm.file_override("physxsystemconfiguration.setreg",
@@ -549,7 +546,7 @@ class TestAutomation(TestAutomationBase):
                           search_subdirs=True)
         def levels_after(self, request, workspace, editor, launcher_platform):
             from .tests.material import Material_DefaultLibraryUpdatedAcrossLevels_after as test_module_1
-            self._run_test(request, workspace, editor, test_module_1)
+            self._run_test(request, workspace, editor, test_module_1, enable_prefab_system=False)
 
         levels_before(self, request, workspace, editor, launcher_platform)
         levels_after(self, request, workspace, editor, launcher_platform)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py
index 81fdc747d5..9b104ccfcf 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py
@@ -32,7 +32,7 @@ class TestAutomation(TestAutomationBase):
     def test_ScriptCanvas_GetCollisionNameReturnsName(self, request, workspace, editor, launcher_platform):
         from .tests.script_canvas import ScriptCanvas_GetCollisionNameReturnsName as test_module
         # Fixme: expected_lines=["Layer Name: Right"]
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     ## Seems to be flaky, need to investigate
     def test_ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer(self, request, workspace, editor, launcher_platform):
@@ -42,4 +42,4 @@ class TestAutomation(TestAutomationBase):
         # Fixme: for group in collision_groups:
         # Fixme:    unexpected_lines.append(f"GroupName: {group}")
         # Fixme: expected_lines=["GroupName: "]
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py
index 61c2816f50..3e00b684c0 100755
--- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py
@@ -30,11 +30,11 @@ class TestUtils(TestAutomationBase):
 
         expected_lines = []
         unexpected_lines = ["Assert"]
-        self._run_test(request, workspace, editor, physmaterial_editor_test_module, expected_lines, unexpected_lines)
+        self._run_test(request, workspace, editor, physmaterial_editor_test_module, expected_lines, unexpected_lines, enable_prefab_system=False)
     
     def test_UtilTest_Tracer_PicksErrorsAndWarnings(self, request, workspace, launcher_platform, editor):
         from .utils import UtilTest_Tracer_PicksErrorsAndWarnings as testcase_module
-        self._run_test(request, workspace, editor, testcase_module, [], [])
+        self._run_test(request, workspace, editor, testcase_module, [], [], enable_prefab_system=False)
 
     def test_FileManagement_FindingFiles(self, workspace, launcher_platform):
         """
@@ -263,4 +263,4 @@ class TestUtils(TestAutomationBase):
 
         expected_lines = []
         unexpected_lines = ["Assert"]
-        self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
+        self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py b/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py
index 22a41de4ea..017bb672a4 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py
@@ -218,6 +218,7 @@ class FileManagement:
         src_file_path = os.path.join(src_path, src_file)
         if os.path.exists(target_file_path):
             fs.unlock_file(target_file_path)
+        os.makedirs(target_path, exist_ok=True)
         shutil.copyfile(src_file_path, target_file_path)
 
     @staticmethod
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py
index 479915752f..6e1f94d358 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py
@@ -12,7 +12,6 @@ import pytest
 import os
 import sys
 
-from ly_test_tools import LAUNCHERS
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
 
 from base import TestAutomationBase
@@ -24,42 +23,49 @@ class TestAutomation(TestAutomationBase):
 
     def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True):
         self._run_test(request, workspace, editor, test_module, 
-            extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], 
             batch_mode=batch_mode,
             autotest_mode=autotest_mode)
 
-    def test_PrefabLevel_OpensLevelWithEntities(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabLevel_OpensLevelWithEntities as test_module
+    def test_OpenLevel_ContainingTwoEntities(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.open_level import OpenLevel_ContainingTwoEntities as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabBasicWorkflow_CreatePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreatePrefab as test_module
+    def test_CreatePrefab_WithSingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.create_prefab import CreatePrefab_WithSingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
         
-    def test_PrefabBasicWorkflow_InstantiatePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_InstantiatePrefab as test_module
+    def test_InstantiatePrefab_ContainingASingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.instantiate_prefab import InstantiatePrefab_ContainingASingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabBasicWorkflow_CreateAndDeletePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateAndDeletePrefab as test_module
+    def test_DeletePrefab_ContainingASingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.delete_prefab import DeletePrefab_ContainingASingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabBasicWorkflow_CreateAndReparentPrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateAndReparentPrefab as test_module
+    def test_ReparentPrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.reparent_prefab import ReparentPrefab_UnderAnotherPrefab as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
 
-    def test_PrefabBasicWorkflow_CreateReparentAndDetachPrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateReparentAndDetachPrefab as test_module
+    def test_DetachPrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.detach_prefab import DetachPrefab_UnderAnotherPrefab as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
 
-    def test_PrefabBasicWorkflow_CreateAndDuplicatePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateAndDuplicatePrefab as test_module
+    def test_DuplicatePrefab_ContainingASingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.duplicate_prefab import DuplicatePrefab_ContainingASingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabComplexWorflow_CreatePrefabOfChildEntity(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabComplexWorflow_CreatePrefabOfChildEntity as test_module
+    def test_CreatePrefab_UnderAnEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.create_prefab import CreatePrefab_UnderAnEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
 
-    def test_PrefabComplexWorflow_CreatePrefabInsidePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabComplexWorflow_CreatePrefabInsidePrefab as test_module
+    def test_CreatePrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.create_prefab import CreatePrefab_UnderAnotherPrefab as test_module
+        self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
+
+    def test_DeleteEntity_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.delete_entity import DeleteEntity_UnderAnotherPrefab as test_module
+        self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
+
+    def test_DeleteEntity_UnderLevelPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.delete_entity import DeleteEntity_UnderLevelPrefab as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabComplexWorflow_CreatePrefabOfChildEntity.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnEntity.py
similarity index 94%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabComplexWorflow_CreatePrefabOfChildEntity.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnEntity.py
index dec44d52be..5033c1da9c 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabComplexWorflow_CreatePrefabOfChildEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnEntity.py
@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabComplexWorflow_CreatePrefabOfChildEntity():
+def CreatePrefab_UnderAnEntity():
     """
     Test description:
     - Creates two entities, parent and child. Child entity has Parent entity as its parent.
@@ -18,7 +18,7 @@ def PrefabComplexWorflow_CreatePrefabOfChildEntity():
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -49,4 +49,4 @@ def PrefabComplexWorflow_CreatePrefabOfChildEntity():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabComplexWorflow_CreatePrefabOfChildEntity)
+    Report.start_test(CreatePrefab_UnderAnEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabComplexWorflow_CreatePrefabInsidePrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnotherPrefab.py
similarity index 94%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabComplexWorflow_CreatePrefabInsidePrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnotherPrefab.py
index e14fc96449..429da49434 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabComplexWorflow_CreatePrefabInsidePrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnotherPrefab.py
@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabComplexWorflow_CreatePrefabInsidePrefab():
+def CreatePrefab_UnderAnotherPrefab():
     """
     Test description:
     - Creates an entity with a physx collider
@@ -17,7 +17,7 @@ def PrefabComplexWorflow_CreatePrefabInsidePrefab():
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -54,4 +54,4 @@ def PrefabComplexWorflow_CreatePrefabInsidePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabComplexWorflow_CreatePrefabInsidePrefab)
+    Report.start_test(CreatePrefab_UnderAnotherPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreatePrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py
similarity index 84%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreatePrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py
index cae105a9a9..80f4c0e596 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreatePrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py
@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreatePrefab():
+def CreatePrefab_WithSingleEntity():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
 
@@ -13,7 +13,7 @@ def PrefabBasicWorkflow_CreatePrefab():
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -26,4 +26,4 @@ def PrefabBasicWorkflow_CreatePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreatePrefab)
+    Report.start_test(CreatePrefab_WithSingleEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py
new file mode 100644
index 0000000000..deaaaedf30
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py
@@ -0,0 +1,52 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+def DeleteEntity_UnderAnotherPrefab():
+    """
+    Test description:
+    - Creates an entity.
+    - Creates a prefab out of the above entity.
+    - Focuses on the created prefab and destroys the entity within.
+    Checks that the entity is correctly destroyed.
+    """
+
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
+    from editor_python_test_tools.prefab_utils import Prefab
+
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
+
+    prefab_test_utils.open_base_tests_level()
+
+    PREFAB_FILE_NAME = 'some_prefab'
+
+    # Creates a new entity at the root level
+    entity = EditorEntity.create_editor_entity()
+    assert entity.id.IsValid(), "Couldn't create entity."
+
+    # Asserts if prefab creation doesn't succeed
+    child_prefab, child_instance = Prefab.create_prefab([entity], PREFAB_FILE_NAME)
+    child_entity_ids_inside_prefab = child_instance.get_direct_child_entities()
+    assert len(
+        child_entity_ids_inside_prefab) == 1, f"{len(child_entity_ids_inside_prefab)} entities found inside prefab" \
+                                              f" when there should have been just 1 entity"
+
+    child_entity_inside_prefab = child_entity_ids_inside_prefab[0]
+    child_entity_inside_prefab.focus_on_owning_prefab()
+
+    child_entity_inside_prefab.delete()
+
+    # Wait till prefab propagation finishes before validating entity deletion.
+    azlmbr.legacy.general.idle_wait_frames(1)
+
+    child_entity_ids_inside_prefab = child_instance.get_direct_child_entities()
+    assert len(
+        child_entity_ids_inside_prefab) == 0, f"{len(child_entity_ids_inside_prefab)} entities found inside prefab" \
+                                              f" when there should have been 0 entities"
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+    Report.start_test(DeleteEntity_UnderAnotherPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py
new file mode 100644
index 0000000000..807427718c
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py
@@ -0,0 +1,37 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+def DeleteEntity_UnderLevelPrefab():
+    """
+    Test description:
+    - Creates an entity.
+    - Destroys the created entity.
+    Checks that the entity is correctly destroyed.
+    """
+
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
+
+    prefab_test_utils.open_base_tests_level()
+
+    # Creates a new Entity at the root level
+    # Asserts if creation didn't succeed
+    entity = EditorEntity.create_editor_entity_at((100.0, 100.0, 100.0), name = "TestEntity")
+    assert entity.id.IsValid(), "Couldn't create entity"
+
+    level_container_entity = EditorEntity(entity.get_parent_id())
+    entity.delete()
+
+    # Wait till prefab propagation finishes before validating entity deletion.
+    azlmbr.legacy.general.idle_wait_frames(1)
+    level_container_child_entities_count = len(level_container_entity.get_children_ids())
+    assert level_container_child_entities_count == 0, f"The level still has {level_container_child_entities_count}" \
+                                                      f" children when it should have 0."
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+    Report.start_test(DeleteEntity_UnderLevelPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndDeletePrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_prefab/DeletePrefab_ContainingASingleEntity.py
similarity index 83%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndDeletePrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_prefab/DeletePrefab_ContainingASingleEntity.py
index bbebd70e04..919168019e 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndDeletePrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_prefab/DeletePrefab_ContainingASingleEntity.py
@@ -5,14 +5,14 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateAndDeletePrefab():
+def DeletePrefab_ContainingASingleEntity():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
 
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -29,4 +29,4 @@ def PrefabBasicWorkflow_CreateAndDeletePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateAndDeletePrefab)
+    Report.start_test(DeletePrefab_ContainingASingleEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateReparentAndDetachPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/detach_prefab/DetachPrefab_UnderAnotherPrefab.py
similarity index 89%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateReparentAndDetachPrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/detach_prefab/DetachPrefab_UnderAnotherPrefab.py
index bdf77c4bf3..5c97f0b032 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateReparentAndDetachPrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/detach_prefab/DetachPrefab_UnderAnotherPrefab.py
@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateReparentAndDetachPrefab():
+def DetachPrefab_UnderAnotherPrefab():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
     WHEEL_PREFAB_FILE_NAME = 'wheel_prefab'
@@ -18,7 +18,7 @@ def PrefabBasicWorkflow_CreateReparentAndDetachPrefab():
         from editor_python_test_tools.editor_entity_utils import EditorEntity
         from editor_python_test_tools.prefab_utils import Prefab
 
-        import PrefabTestUtils as prefab_test_utils
+        import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
         prefab_test_utils.open_base_tests_level()
 
@@ -48,4 +48,4 @@ def PrefabBasicWorkflow_CreateReparentAndDetachPrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateReparentAndDetachPrefab)
+    Report.start_test(DetachPrefab_UnderAnotherPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndDuplicatePrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/duplicate_prefab/DuplicatePrefab_ContainingASingleEntity.py
similarity index 83%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndDuplicatePrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/duplicate_prefab/DuplicatePrefab_ContainingASingleEntity.py
index 2479ae549e..e611303fbb 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndDuplicatePrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/duplicate_prefab/DuplicatePrefab_ContainingASingleEntity.py
@@ -5,14 +5,14 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateAndDuplicatePrefab():
+def DuplicatePrefab_ContainingASingleEntity():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
 
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -29,4 +29,4 @@ def PrefabBasicWorkflow_CreateAndDuplicatePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateAndDuplicatePrefab)
+    Report.start_test(DuplicatePrefab_ContainingASingleEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_InstantiatePrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/instantiate_prefab/InstantiatePrefab_ContainingASingleEntity.py
similarity index 85%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_InstantiatePrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/instantiate_prefab/InstantiatePrefab_ContainingASingleEntity.py
index a701802cd4..a81608ee8a 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_InstantiatePrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/instantiate_prefab/InstantiatePrefab_ContainingASingleEntity.py
@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_InstantiatePrefab():
+def InstantiatePrefab_ContainingASingleEntity():
 
     from azlmbr.math import Vector3
 
@@ -15,7 +15,7 @@ def PrefabBasicWorkflow_InstantiatePrefab():
 
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -30,4 +30,4 @@ def PrefabBasicWorkflow_InstantiatePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_InstantiatePrefab)
+    Report.start_test(InstantiatePrefab_ContainingASingleEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabLevel_OpensLevelWithEntities.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/open_level/OpenLevel_ContainingTwoEntities.py
similarity index 96%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabLevel_OpensLevelWithEntities.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/open_level/OpenLevel_ContainingTwoEntities.py
index 0eb7e86a9e..787d7000d2 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabLevel_OpensLevelWithEntities.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/open_level/OpenLevel_ContainingTwoEntities.py
@@ -14,7 +14,7 @@ class Tests():
 
 # fmt:on
 
-def PrefabLevel_OpensLevelWithEntities():
+def OpenLevel_ContainingTwoEntities():
     """
     Opens the level that contains 2 entities, "EmptyEntity" and "EntityWithPxCollider".
     This test makes sure that both entities exist after opening the level and that:
@@ -70,4 +70,4 @@ def PrefabLevel_OpensLevelWithEntities():
 if __name__ == "__main__":
 
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabLevel_OpensLevelWithEntities)
+    Report.start_test(OpenLevel_ContainingTwoEntities)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndReparentPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/reparent_prefab/ReparentPrefab_UnderAnotherPrefab.py
similarity index 89%
rename from AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndReparentPrefab.py
rename to AutomatedTesting/Gem/PythonTests/Prefab/tests/reparent_prefab/ReparentPrefab_UnderAnotherPrefab.py
index 1cbc591c29..2c460a3298 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/PrefabBasicWorkflow_CreateAndReparentPrefab.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/reparent_prefab/ReparentPrefab_UnderAnotherPrefab.py
@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateAndReparentPrefab():
+def ReparentPrefab_UnderAnotherPrefab():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
     WHEEL_PREFAB_FILE_NAME = 'wheel_prefab'
@@ -18,7 +18,7 @@ def PrefabBasicWorkflow_CreateAndReparentPrefab():
         from editor_python_test_tools.editor_entity_utils import EditorEntity
         from editor_python_test_tools.prefab_utils import Prefab
 
-        import PrefabTestUtils as prefab_test_utils
+        import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
         prefab_test_utils.open_base_tests_level()
 
@@ -45,4 +45,4 @@ def PrefabBasicWorkflow_CreateAndReparentPrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateAndReparentPrefab)
+    Report.start_test(ReparentPrefab_UnderAnotherPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
index 8d418222ce..112fd013bf 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
@@ -8,42 +8,54 @@ import azlmbr.bus
 import azlmbr.asset
 import azlmbr.editor
 import azlmbr.math
-import azlmbr.legacy.general
 
-def raise_and_stop(msg):
-    print (msg)
+print('Starting mock asset tests')
+handler = azlmbr.editor.EditorEventBusHandler()
+
+def on_notify_editor_initialized(args):
+    # These tests are meant to check that the test_asset.mock source asset turned into
+    # a test_asset.mock_asset product asset via the Python asset builder system
+    mockAssetType = azlmbr.math.Uuid_CreateString('{9274AD17-3212-4651-9F3B-7DCCB080E467}', 0)
+    mockAssetPath = 'gem/pythontests/pythonassetbuilder/test_asset.mock_asset'
+    assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', mockAssetPath, mockAssetType, False)
+    if (assetId.is_valid() is False):
+        print(f'Mock AssetId is not valid! Got {assetId.to_string()} instead')
+    else:
+        print(f'Mock AssetId is valid!')
+
+    assetIdString = assetId.to_string()
+    if (assetIdString.endswith(':528cca58') is False):
+        print(f'Mock AssetId {assetIdString} has unexpected sub-id for {mockAssetPath}!')
+    else:
+        print(f'Mock AssetId has expected sub-id for {mockAssetPath}!')
+
+    print ('Mock asset exists')
+
+    # These tests detect if the geom_group.fbx file turns into a number of azmodel product assets
+    def test_azmodel_product(generatedModelAssetPath):
+        azModelAssetType = azlmbr.math.Uuid_CreateString('{2C7477B6-69C5-45BE-8163-BCD6A275B6D8}', 0)
+        assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False)
+        assetIdString = assetId.to_string()
+        if (assetId.is_valid()):
+            print(f'AssetId found for asset ({generatedModelAssetPath}) found')
+        else:
+            print(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString})!')
+
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel')
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel')
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel')
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel')
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel')
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel')
+    test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel')
+
+    # clear up notification handler
+    global handler
+    handler.disconnect()
+    handler = None
+
+    print('Finished mock asset tests')
     azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')
 
-# These tests are meant to check that the test_asset.mock source asset turned into
-# a test_asset.mock_asset product asset via the Python asset builder system
-mockAssetType = azlmbr.math.Uuid_CreateString('{9274AD17-3212-4651-9F3B-7DCCB080E467}', 0)
-mockAssetPath = 'gem/pythontests/pythonassetbuilder/test_asset.mock_asset'
-assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', mockAssetPath, mockAssetType, False)
-if (assetId.is_valid() is False):
-    raise_and_stop(f'Mock AssetId is not valid! Got {assetId.to_string()} instead')
-
-assetIdString = assetId.to_string()
-if (assetIdString.endswith(':528cca58') is False):
-    raise_and_stop(f'Mock AssetId {assetIdString} has unexpected sub-id for {mockAssetPath}!')
-
-print ('Mock asset exists')
-
-# These tests detect if the geom_group.fbx file turns into a number of azmodel product assets
-def test_azmodel_product(generatedModelAssetPath):
-    azModelAssetType = azlmbr.math.Uuid_CreateString('{2C7477B6-69C5-45BE-8163-BCD6A275B6D8}', 0)
-    assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False)
-    assetIdString = assetId.to_string()
-    if (assetId.is_valid()):
-        print(f'AssetId found for asset ({generatedModelAssetPath}) found')
-    else:
-        raise_and_stop(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString})!')
-
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel')
-
-azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')
+handler.connect()
+handler.add_callback('NotifyEditorInitialized', on_notify_editor_initialized)
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/Terrain/CMakeLists.txt
new file mode 100644
index 0000000000..9f8ba06829
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/CMakeLists.txt
@@ -0,0 +1,24 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+
+    ly_add_pytest(
+        NAME AutomatedTesting::TerrainTests_Main
+        TEST_SUITE main
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            Terrain
+    )
+
+endif()
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py
new file mode 100644
index 0000000000..f4c2a19884
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py
@@ -0,0 +1,89 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+#fmt: off
+class Tests():
+    create_test_entity                      = ("Entity created successfully",    "Failed to create Entity")
+    add_axis_aligned_box_shape              = ("Axis Aligned Box Shape component added", "Failed to add Axis Aligned Box Shape component")
+    add_terrain_collider                    = ("Terrain Physics Heightfield Collider component added", "Failed to add a Terrain Physics Heightfield Collider component")
+    box_dimensions_changed                  = ("Aabb dimensions changed successfully", "Failed change Aabb dimensions")
+    configuration_changed                   = ("Terrain size changed successfully", "Failed terrain size change")
+#fmt: on
+
+def TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges():
+    """
+    Summary:
+    Test aspects of the Terrain Physics Heightfield Collider through the BehaviorContext and the Property Tree.
+
+    Test Steps:
+    Expected Behavior:
+    The Editor is stable there are no warnings or errors.
+
+    Test Steps:
+     1) Load the base level
+     2) Create test entity
+     3) Start the Tracer to catch any errors and warnings
+     4) Add the Axis Aligned Box Shape and Terrain Physics Heightfield Collider components
+     5) Change the Axis Aligned Box Shape dimensions
+     6) Check the Heightfield provider is returning the correct size
+     7) Verify there are no errors and warnings in the logs
+
+
+    :return: None
+    """
+
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
+    from editor_python_test_tools.utils import TestHelper as helper
+    from editor_python_test_tools.utils import Report, Tracer
+    import azlmbr.legacy.general as general
+    import azlmbr.physics as physics
+    import azlmbr.math as azmath
+    import azlmbr.bus as bus
+    import sys
+    import math
+
+    SET_BOX_X_SIZE = 5.0
+    SET_BOX_Y_SIZE = 6.0
+    EXPECTED_COLUMN_SIZE = SET_BOX_X_SIZE + 1
+    EXPECTED_ROW_SIZE = SET_BOX_Y_SIZE + 1
+    helper.init_idle()
+    
+    # 1) Load the level
+    helper.open_level("", "Base")
+
+    # 2) Create test entity
+    test_entity = EditorEntity.create_editor_entity("TestEntity")
+    Report.result(Tests.create_test_entity, test_entity.id.IsValid())
+
+    # 3) Start the Tracer to catch any errors and warnings
+    with Tracer() as section_tracer:
+        # 4) Add the Axis Aligned Box Shape and Terrain Physics Heightfield Collider components
+        aaBoxShape_component = test_entity.add_component("Axis Aligned Box Shape")
+        Report.result(Tests.add_axis_aligned_box_shape, test_entity.has_component("Axis Aligned Box Shape"))
+        terrainPhysics_component = test_entity.add_component("Terrain Physics Heightfield Collider")
+        Report.result(Tests.add_terrain_collider, test_entity.has_component("Terrain Physics Heightfield Collider"))
+
+        # 5) Change the Axis Aligned Box Shape dimensions
+        aaBoxShape_component.set_component_property_value("Axis Aligned Box Shape|Box Configuration|Dimensions", azmath.Vector3(SET_BOX_X_SIZE, SET_BOX_Y_SIZE, 1.0))
+        add_check = aaBoxShape_component.get_component_property_value("Axis Aligned Box Shape|Box Configuration|Dimensions") == azmath.Vector3(SET_BOX_X_SIZE, SET_BOX_Y_SIZE, 1.0)
+        Report.result(Tests.box_dimensions_changed, add_check)
+
+        # 6) Check the Heightfield provider is returning the correct size
+        columns = physics.HeightfieldProviderRequestsBus(bus.Broadcast, "GetHeightfieldGridColumns")
+        rows = physics.HeightfieldProviderRequestsBus(bus.Broadcast, "GetHeightfieldGridRows")
+        Report.result(Tests.configuration_changed, math.isclose(columns, EXPECTED_COLUMN_SIZE) and math.isclose(rows, EXPECTED_ROW_SIZE))
+
+    helper.wait_for_condition(lambda: section_tracer.has_errors or section_tracer.has_asserts, 1.0)
+    for error_info in section_tracer.errors:
+        Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
+    for assert_info in section_tracer.asserts:
+        Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
+
+if __name__ == "__main__":
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges)
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py
new file mode 100644
index 0000000000..390ec6a6b0
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py
@@ -0,0 +1,164 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+#fmt: off
+class Tests():
+    create_terrain_spawner_entity               = ("Terrain_spawner_entity created successfully", "Failed to create terrain_spawner_entity")
+    create_height_provider_entity               = ("Height_provider_entity created successfully", "Failed to create height_provider_entity")
+    create_test_ball                            = ("Ball created successfully",    "Failed to create Ball")
+    box_dimensions_changed                      = ("Aabb dimensions changed successfully", "Failed change Aabb dimensions")
+    shape_changed                               = ("Shape changed successfully", "Failed Shape change")
+    entity_added                                = ("Entity added successfully", "Failed Entity add")
+    frequency_changed                           = ("Frequency changed successfully", "Failed Frequency change")
+    shape_set                                   = ("Shape set to Sphere successfully", "Failed to set Sphere shape")
+    test_collision                              = ("Ball collided with terrain", "Ball failed to collide with terrain")
+    no_errors_and_warnings_found                = ("No errors and warnings found", "Found errors and warnings")
+#fmt: on
+
+def Terrain_SupportsPhysics():
+    """
+    Summary:
+    Test aspects of the TerrainHeightGradientList through the BehaviorContext and the Property Tree.
+
+    Test Steps:
+    Expected Behavior:
+    The Editor is stable there are no warnings or errors.
+
+    Test Steps:
+     1) Load the base level
+     2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components
+     2a) Create a ball at 600.0, 600.0, 46.0 - This position is not too high over the heightfield so will collide in a reasonable time
+     3) Start the Tracer to catch any errors and warnings
+     4) Change the Axis Aligned Box Shape dimensions
+     5) Set the Vegetation Shape reference to TestEntity1
+     6) Set the FastNoise gradient frequency to 0.01
+     7) Set the Gradient List to TestEntity2
+     8) Set the PhysX Collider to Sphere mode
+     9) Disable and Enable the Terrain Gradient List so that it is recognised
+     10) Enter game mode and test if the ball hits the heightfield within 3 seconds
+     11) Verify there are no errors and warnings in the logs
+
+
+    :return: None
+    """
+
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
+    from editor_python_test_tools.utils import TestHelper as helper, Report
+    from editor_python_test_tools.utils import Report, Tracer
+    import editor_python_test_tools.hydra_editor_utils as hydra
+    import azlmbr.math as azmath
+    import azlmbr.legacy.general as general
+    import azlmbr.bus as bus
+    import azlmbr.editor as editor
+    import math
+
+    SET_BOX_X_SIZE = 1024.0
+    SET_BOX_Y_SIZE = 1024.0
+    SET_BOX_Z_SIZE = 100.0
+    
+    helper.init_idle()
+    
+    # 1) Load the level
+    helper.open_level("", "Base")
+    helper.wait_for_condition(lambda: general.get_current_level_name() == "Base", 2.0)
+
+    #1a) Load the level components
+    hydra.add_level_component("Terrain World")
+    hydra.add_level_component("Terrain World Renderer")
+
+    # 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components
+    entity1_components_to_add = ["Axis Aligned Box Shape", "Terrain Layer Spawner", "Terrain Height Gradient List", "Terrain Physics Heightfield Collider", "PhysX Heightfield Collider"]
+    entity2_components_to_add = ["Shape Reference", "Gradient Transform Modifier", "FastNoise Gradient"]
+    ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Rigid Body"]
+    terrain_spawner_entity = hydra.Entity("TestEntity1")
+    terrain_spawner_entity.create_entity(azmath.Vector3(512.0, 512.0, 50.0), entity1_components_to_add)
+    Report.result(Tests.create_terrain_spawner_entity, terrain_spawner_entity.id.IsValid())
+    height_provider_entity = hydra.Entity("TestEntity2")
+    height_provider_entity.create_entity(azmath.Vector3(0.0, 0.0, 0.0), entity2_components_to_add,terrain_spawner_entity.id)
+    Report.result(Tests.create_height_provider_entity, height_provider_entity.id.IsValid())
+    # 2a) Create a ball at 600.0, 600.0, 46.0 - This position is not too high over the heightfield so will collide in a reasonable time
+    ball = hydra.Entity("Ball")
+    ball.create_entity(azmath.Vector3(600.0, 600.0, 46.0), ball_components_to_add)
+    Report.result(Tests.create_test_ball, ball.id.IsValid())
+    # Give everything a chance to finish initializing.
+    general.idle_wait_frames(1)
+
+    # 3) Start the Tracer to catch any errors and warnings
+    with Tracer() as section_tracer:
+        # 4) Change the Axis Aligned Box Shape dimensions
+        box_dimensions = azmath.Vector3(SET_BOX_X_SIZE, SET_BOX_Y_SIZE, SET_BOX_Z_SIZE)
+        terrain_spawner_entity.get_set_test(0, "Axis Aligned Box Shape|Box Configuration|Dimensions", box_dimensions)
+        box_shape_dimensions = hydra.get_component_property_value(terrain_spawner_entity.components[0], "Axis Aligned Box Shape|Box Configuration|Dimensions")
+        Report.result(Tests.box_dimensions_changed, box_dimensions == box_shape_dimensions)
+        
+        # 5) Set the Vegetaion Shape reference to TestEntity1
+        height_provider_entity.get_set_test(0, "Configuration|Shape Entity Id", terrain_spawner_entity.id)
+        entityId = hydra.get_component_property_value(height_provider_entity.components[0], "Configuration|Shape Entity Id")
+        Report.result(Tests.shape_changed, entityId == terrain_spawner_entity.id)
+
+        # 6) Set the FastNoise Gradient frequency to 0.01
+        Frequency = 0.01
+        height_provider_entity.get_set_test(2, "Configuration|Frequency", Frequency)
+        FrequencyVal = hydra.get_component_property_value(height_provider_entity.components[2], "Configuration|Frequency")
+        Report.result(Tests.frequency_changed, math.isclose(Frequency, FrequencyVal, abs_tol = 0.00001))
+
+        # 7) Set the Gradient List to TestEntity2
+        propertyTree = hydra.get_property_tree(terrain_spawner_entity.components[2])
+        propertyTree.add_container_item("Configuration|Gradient Entities", 0, height_provider_entity.id)
+        checkID = propertyTree.get_container_item("Configuration|Gradient Entities", 0)
+        Report.result(Tests.entity_added, checkID.GetValue() == height_provider_entity.id)
+
+        # 8) Set the PhysX Collider to Sphere mode
+        shape = 0
+        hydra.get_set_test(ball, 1, "Shape Configuration|Shape", shape)
+        setShape = hydra.get_component_property_value(ball.components[1], "Shape Configuration|Shape")
+        Report.result(Tests.shape_set, shape == setShape)
+
+        # 9) Disable and Enable the Terrain Gradient List so that it is recognised
+        editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [terrain_spawner_entity.components[2]])
+
+        general.enter_game_mode()
+
+        general.idle_wait_frames(1)
+
+        # 10) Enter game mode and test if the ball hits the heightfield within 3 seconds
+        TIMEOUT = 3.0
+
+        class Collider:
+            id = general.find_game_entity("Ball")
+            touched_ground = False
+
+        terrain_id = general.find_game_entity("TestEntity1")
+ 
+        def on_collision_begin(args):
+            other_id = args[0]
+            if other_id.Equal(terrain_id):
+                Report.info("Touched ground")
+                Collider.touched_ground = True
+
+        handler = azlmbr.physics.CollisionNotificationBusHandler()
+        handler.connect(Collider.id)
+        handler.add_callback("OnCollisionBegin", on_collision_begin)
+
+        helper.wait_for_condition(lambda: Collider.touched_ground, TIMEOUT)
+        Report.result(Tests.test_collision, Collider.touched_ground)
+
+        general.exit_game_mode()
+
+    # 11) Verify there are no errors and warnings in the logs
+    helper.wait_for_condition(lambda: section_tracer.has_errors or section_tracer.has_asserts, 1.0)
+    for error_info in section_tracer.errors:
+        Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
+    for assert_info in section_tracer.asserts:
+        Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
+    
+
+if __name__ == "__main__":
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(Terrain_SupportsPhysics)
+
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py
new file mode 100644
index 0000000000..786651713c
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py
@@ -0,0 +1,29 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+"""
+
+# This suite consists of all test cases that are passing and have been verified.
+
+import pytest
+import os
+import sys
+
+from ly_test_tools import LAUNCHERS
+from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSharedTest
+
+@pytest.mark.SUITE_main
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+class TestAutomation(EditorTestSuite):
+
+    enable_prefab_system = False
+
+    class test_AxisAlignedBoxShape_ConfigurationWorks(EditorSharedTest):
+        from .EditorScripts import TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges as test_module
+
+    class test_Terrain_SupportsPhysics(EditorSharedTest):
+        from .EditorScripts import Terrain_SupportsPhysics as test_module
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/__init__.py b/AutomatedTesting/Gem/PythonTests/Terrain/__init__.py
new file mode 100644
index 0000000000..f5193b300e
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/__init__.py
@@ -0,0 +1,6 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py
index fa6c81c98a..2fc717e256 100644
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py
@@ -24,12 +24,12 @@ from base import TestAutomationBase
 class TestAutomation(TestAutomationBase):
     def test_WhiteBox_AddComponentToEntity(self, request, workspace, editor, launcher_platform):
         from .tests import WhiteBox_AddComponentToEntity as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_WhiteBox_SetDefaultShape(self, request, workspace, editor, launcher_platform):
         from .tests import WhiteBox_SetDefaultShape as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_WhiteBox_SetInvisible(self, request, workspace, editor, launcher_platform):
         from .tests import WhiteBox_SetInvisible as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
index 857d91bb12..7f7f420fd0 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
@@ -183,23 +183,26 @@ def ap_missing_dependency_fixture(request, workspace, ap_setup_fixture) -> Any:
             :return: None
             """
             logger.info(f"Searching output for expected dependencies for product {product}")
+            sorted_expected = sorted(expected_dependencies)
             # Check dependencies found either in the log or console output
             for product_name, missing_deps in self.extract_missing_dependencies_from_output(log_output).items():
                 if product in product_name:
+                    sorted_missing = sorted(missing_deps)
                     # fmt:off
-                    assert sorted(missing_deps) == sorted(expected_dependencies), \
+                    assert sorted_expected == sorted_missing, \
                         f"Missing dependencies for '{product_name}' did not match expected. Expected: " \
-                        f"{expected_dependencies}, Actual: {missing_deps}"
+                        f"{sorted_expected}, Actual: {sorted_missing}"
                     # fmt:on
 
             # Check dependencies found in Database
             for product_name, missing_deps in self.extract_missing_dependencies_from_database(product,
                                                                                               platforms).items():
                 if product.replace("\\", "/") in product_name:
+                    sorted_missing = sorted(missing_deps)
                     # fmt:off
-                    assert sorted(expected_dependencies) == sorted(missing_deps), \
-                        f"Product '{product_name}' expected missing dependencies: {expected_dependencies}; " \
-                        f"actual missing dependencies {missing_deps}"
+                    assert sorted_expected == sorted_missing, \
+                        f"Product '{product_name}' expected missing dependencies: {sorted_expected}; " \
+                        f"actual missing dependencies {sorted_missing}"
                     # fmt:on
 
         def __getitem__(self, item: str) -> object:
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
index 244ecfb516..c5b02e4f28 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
@@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
 
-A fixture for Setting Up Asset Processor Batch workspace for tests in lmbr_test
+A fixture for Setting Up Asset Processor Batch workspace for tests
 """
 
 # Import builtin libraries
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
index eea6cb9224..885b4c2959 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
@@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
 
-A fixture for using the Asset Processor in lmbr_test, this will stop the asset processor after every test via
+A fixture for using the Asset Processor, this will stop the asset processor after every test via
 the teardown. Using the fixture at class level will stop the asset processor after the suite completes.
 Using the fixture at test level will stop asset processor after the test completes. Calling this fixture as a test argument will still run the teardown to stop the Asset Processor.
 """
@@ -15,6 +15,7 @@ import logging
 
 # Import LyTestTools
 import ly_test_tools.o3de.asset_processor as asset_processor_commands
+import ly_test_tools.o3de.asset_processor_utils
 
 logger = logging.getLogger(__name__)
 
@@ -36,5 +37,8 @@ def asset_processor(request: pytest.fixture, workspace: pytest.fixture) -> asset
         ap.stop()
 
     request.addfinalizer(teardown)
+    for n in ly_test_tools.o3de.asset_processor_utils.processList:
+        assert not ly_test_tools.o3de.asset_processor_utils.check_ap_running(n), f"{n} process did not shutdown correctly."
+
 
     return ap
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 35d7982ded..9281d5947e 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
@@ -158,7 +158,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
                 else:
                     cmd.append(f"--{key}")
             if append_defaults:
-                cmd.append(f"--project-path={os.path.join(workspace.paths.engine_root(), workspace.project)}")
+                cmd.append(f"--project-path={workspace.paths.project()}")
             return cmd
 
         # ******
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index 5a5809595e..e37a5ed99b 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -103,6 +103,19 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             AZ::AssetBundlerBatch
     )
 
+    ly_add_pytest(
+        NAME AssetPipelineTests.BundleMode
+        PATH ${CMAKE_CURRENT_LIST_DIR}/bundle_mode_tests.py
+        EXCLUDE_TEST_RUN_TARGET_FROM_IDE
+        TEST_SERIAL
+        TEST_SUITE periodic
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::AssetBundlerBatch
+            Legacy::Editor
+            AutomatedTesting.Assets
+    )
+
     ly_add_pytest(
         NAME AssetPipelineTests.AssetBuilder
         PATH ${CMAKE_CURRENT_LIST_DIR}/asset_builder_tests.py
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 7f85e5e317..f5e5642573 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
@@ -88,214 +88,6 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         bundler_batch_helper.call_bundles(help="")
         bundler_batch_helper.call_bundleSeed(help="")
 
-    @pytest.mark.BAT
-    @pytest.mark.assetpipeline
-    @pytest.mark.test_case_id("C16877175")
-    @pytest.mark.skip("'animations/animationeditorfiles/sample1.animgraph' missing, needs investigation")
-    def test_WindowsAndMac_CreateAssetList_DependenciesCorrect(self, workspace, bundler_batch_helper):
-        r"""
-        Tests that an asset list created maps dependencies correctly.
-        testdependencieslevel\level.pak and lists of known dependencies are used for validation
-
-        Test Steps:
-        1. Create an asset list from the level.pak
-        2. Create Lists of expected assets in the level.pak
-        3. Add lists of expected assets to a single list
-        4. Compare list of expected assets to actual assets
-        """
-        helper = bundler_batch_helper
-
-        # Create the asset list file
-        helper.call_assetLists(
-            addSeed=r"levels\testdependencieslevel\level.pak",
-            assetListFile=helper['asset_info_file_request']
-        )
-
-        assert os.path.isfile(helper["asset_info_file_result"])
-
-        # Lists of known relative locations of assets
-        default_level_assets = [
-            "engineassets/texturemsg/defaultnouvs.dds",
-            "engineassets/texturemsg/defaultnouvs.dds.1",
-            "engineassets/texturemsg/defaultnouvs.dds.2",
-            "engineassets/texturemsg/defaultnouvs.dds.3",
-            "engineassets/texturemsg/defaultnouvs.dds.4",
-            "engineassets/texturemsg/defaultnouvs.dds.5",
-            "engineassets/texturemsg/defaultnouvs.dds.6",
-            "engineassets/texturemsg/defaultnouvs.dds.7",
-            "engineassets/texturemsg/defaultnouvs_ddn.dds",
-            "engineassets/texturemsg/defaultnouvs_ddn.dds.1",
-            "engineassets/texturemsg/defaultnouvs_ddn.dds.2",
-            "engineassets/texturemsg/defaultnouvs_ddn.dds.3",
-            "engineassets/texturemsg/defaultnouvs_ddn.dds.4",
-            "engineassets/texturemsg/defaultnouvs_ddn.dds.5",
-            "engineassets/texturemsg/defaultnouvs_spec.dds",
-            "engineassets/texturemsg/defaultnouvs_spec.dds.1",
-            "engineassets/texturemsg/defaultnouvs_spec.dds.2",
-            "engineassets/texturemsg/defaultnouvs_spec.dds.3",
-            "engineassets/texturemsg/defaultnouvs_spec.dds.4",
-            "engineassets/texturemsg/defaultnouvs_spec.dds.5",
-            "engineassets/textures/defaults/16_grey.dds",
-            "engineassets/textures/cubemap/default_level_cubemap.dds",
-            "engineassets/textures/cubemap/default_level_cubemap.dds.1",
-            "engineassets/textures/cubemap/default_level_cubemap.dds.2",
-            "engineassets/textures/cubemap/default_level_cubemap.dds.3",
-            "engineassets/textures/cubemap/default_level_cubemap.dds.4",
-            "engineassets/textures/cubemap/default_level_cubemap_diff.dds",
-            "engineassets/materials/water/ocean_default.mtl",
-            "engineassets/textures/defaults/spot_default.dds",
-            "engineassets/textures/defaults/spot_default.dds.1",
-            "engineassets/textures/defaults/spot_default.dds.2",
-            "engineassets/textures/defaults/spot_default.dds.3",
-            "engineassets/textures/defaults/spot_default.dds.4",
-            "engineassets/textures/defaults/spot_default.dds.5",
-            "materials/material_terrain_default.mtl",
-            "textures/skys/night/half_moon.dds",
-            "textures/skys/night/half_moon.dds.1",
-            "textures/skys/night/half_moon.dds.2",
-            "textures/skys/night/half_moon.dds.3",
-            "textures/skys/night/half_moon.dds.4",
-            "textures/skys/night/half_moon.dds.5",
-            "textures/skys/night/half_moon.dds.6",
-            "engineassets/materials/sky/sky.mtl",
-            "levels/testdependencieslevel/level.pak",
-            "levels/testdependencieslevel/terrain/cover.ctc",
-            "levels/testdependencieslevel/terraintexture.pak",
-        ]
-
-        sequence_material_cube_assets = [
-            "textures/test_texture_sequence/test_texture_sequence000.dds",
-            "textures/test_texture_sequence/test_texture_sequence001.dds",
-            "textures/test_texture_sequence/test_texture_sequence002.dds",
-            "textures/test_texture_sequence/test_texture_sequence003.dds",
-            "textures/test_texture_sequence/test_texture_sequence004.dds",
-            "textures/test_texture_sequence/test_texture_sequence005.dds",
-            "objects/_primitives/_box_1x1.cgf",
-            "materials/test_texture_sequence.mtl",
-            "objects/_primitives/_box_1x1.mtl",
-            "textures/_primitives/middle_gray_checker.dds",
-            "textures/_primitives/middle_gray_checker.dds.1",
-            "textures/_primitives/middle_gray_checker.dds.2",
-            "textures/_primitives/middle_gray_checker.dds.3",
-            "textures/_primitives/middle_gray_checker.dds.4",
-            "textures/_primitives/middle_gray_checker.dds.5",
-            "textures/_primitives/middle_gray_checker_ddn.dds",
-            "textures/_primitives/middle_gray_checker_ddn.dds.1",
-            "textures/_primitives/middle_gray_checker_ddn.dds.2",
-            "textures/_primitives/middle_gray_checker_ddn.dds.3",
-            "textures/_primitives/middle_gray_checker_ddn.dds.4",
-            "textures/_primitives/middle_gray_checker_ddn.dds.5",
-            "textures/_primitives/middle_gray_checker_spec.dds",
-            "textures/_primitives/middle_gray_checker_spec.dds.1",
-            "textures/_primitives/middle_gray_checker_spec.dds.2",
-            "textures/_primitives/middle_gray_checker_spec.dds.3",
-            "textures/_primitives/middle_gray_checker_spec.dds.4",
-            "textures/_primitives/middle_gray_checker_spec.dds.5",
-        ]
-
-        character_with_simplified_material_assets = [
-            "objects/characters/jack/jack.actor",
-            "objects/characters/jack/jack.mtl",
-            "objects/characters/jack/textures/jack_diff.dds",
-            "objects/characters/jack/textures/jack_diff.dds.1",
-            "objects/characters/jack/textures/jack_diff.dds.2",
-            "objects/characters/jack/textures/jack_diff.dds.3",
-            "objects/characters/jack/textures/jack_diff.dds.4",
-            "objects/characters/jack/textures/jack_diff.dds.5",
-            "objects/characters/jack/textures/jack_diff.dds.6",
-            "objects/characters/jack/textures/jack_diff.dds.7",
-            "objects/characters/jack/textures/jack_spec.dds",
-            "objects/characters/jack/textures/jack_spec.dds.1",
-            "objects/characters/jack/textures/jack_spec.dds.2",
-            "objects/characters/jack/textures/jack_spec.dds.3",
-            "objects/characters/jack/textures/jack_spec.dds.4",
-            "objects/characters/jack/textures/jack_spec.dds.5",
-            "objects/characters/jack/textures/jack_spec.dds.6",
-            "objects/characters/jack/textures/jack_spec.dds.7",
-            "objects/default/editorprimitive.mtl",
-            "engineassets/textures/grey.dds",
-            "animations/animationeditorfiles/sample0.animgraph",
-            "animations/motions/jack_death_fall_back_zup.motion",
-            "animations/animationeditorfiles/sample1.animgraph",
-            "animations/animationeditorfiles/sample0.motionset",
-            "animations/motions/rin_jump.motion",
-            "animations/animationeditorfiles/sample1.motionset",
-            "animations/motions/rin_idle.motion",
-            "animations/motions/jack_idle_aim_zup.motion",
-        ]
-
-        spawner_assets = [
-            "slices/sphere.dynamicslice",
-            "objects/default/primitive_sphere.cgf",
-            "test1.luac",
-            "test2.luac",
-        ]
-
-        ui_canvas_assets = [
-            "fonts/vera.ttf",
-            "fonts/vera.font",
-            "scriptcanvas/mainmenu.scriptcanvas_compiled",
-            "fonts/vera.fontfamily",
-            "ui/canvas/start.uicanvas",
-            "fonts/vera-italic.font",
-            "ui/textureatlas/sample.texatlasidx",
-            "fonts/vera-bold-italic.ttf",
-            "fonts/vera-bold.font",
-            "ui/textures/prefab/button_normal.dds",
-            "ui/textures/prefab/button_normal.sprite",
-            "fonts/vera-italic.ttf",
-            "ui/textureatlas/sample.dds",
-            "fonts/vera-bold-italic.font",
-            "fonts/vera-bold.ttf",
-            "ui/textures/prefab/button_disabled.dds",
-            "ui/textures/prefab/button_disabled.sprite",
-        ]
-
-        wwise_and_atl_assets = [
-            "libs/gameaudio/wwise/levels/testdependencieslevel/test_dependencies_level.xml",
-            "sounds/wwise/test_bank3.bnk",
-            "sounds/wwise/test_bank4.bnk",
-            "sounds/wwise/test_bank5.bnk",
-            "sounds/wwise/test_bank1.bnk",
-            "sounds/wwise/init.bnk",
-            "sounds/wwise/499820003.wem",
-            "sounds/wwise/196049145.wem",
-        ]
-
-        particle_library_assets = [
-            "libs/particles/milestone2particles.xml",
-            "textures/milestone2/particles/fx_launchermuzzlering_01.dds",
-            "textures/milestone2/particles/fx_launchermuzzlering_01.dds.1",
-            "textures/milestone2/particles/fx_launchermuzzlering_01.dds.2",
-            "textures/milestone2/particles/fx_launchermuzzlering_01.dds.3",
-            "textures/milestone2/particles/fx_launchermuzzlering_01.dds.4",
-            "textures/milestone2/particles/fx_launchermuzzlering_01.dds.5",
-            "textures/milestone2/particles/fx_sparkstreak_01.dds",
-            "textures/milestone2/particles/fx_launchermuzzlefront_01.dds",
-            "textures/milestone2/particles/fx_launchermuzzlefront_01.dds.1",
-            "textures/milestone2/particles/fx_launchermuzzlefront_01.dds.2",
-            "textures/milestone2/particles/fx_launchermuzzlefront_01.dds.3",
-            "textures/milestone2/particles/fx_launchermuzzlefront_01.dds.4",
-            "textures/milestone2/particles/fx_launchermuzzlefront_01.dds.5",
-        ]
-
-        lens_flares_library_assets = ["libs/flares/flares.xml", "textures/lights/flare01.dds"]
-
-        expected_assets_list = default_level_assets
-        expected_assets_list.extend(sequence_material_cube_assets)
-        expected_assets_list.extend(character_with_simplified_material_assets)
-        expected_assets_list.extend(spawner_assets)
-        expected_assets_list.extend(ui_canvas_assets)
-        expected_assets_list.extend(wwise_and_atl_assets)
-        expected_assets_list.extend(particle_library_assets)
-        expected_assets_list.extend(lens_flares_library_assets)  # All expected assets
-
-        # Get actual calculated dependencies from the asset list created
-        actual_assets_list = []
-        for rel_path in helper.get_asset_relative_paths(helper["asset_info_file_result"]):
-            actual_assets_list.append(rel_path)
-
-        assert sorted(actual_assets_list) == sorted(expected_assets_list)
 
     @pytest.mark.BAT
     @pytest.mark.assetpipeline
@@ -310,9 +102,9 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         3. Read and store contents of asset list into memory
         4. Attempt to create a new asset list in without using --allowOverwrites
         5. Verify that Asset Bundler returns false
-        6. Verify that file contents of the orignally created asset list did not change from what was stored in memory
+        6. Verify that file contents of the originally created asset list did not change from what was stored in memory
         7. Attempt to create a new asset list without debug while allowing overwrites
-        8. Verify that file contents of the orignally created asset list changed from what was stored in memory
+        8. Verify that file contents of the originally created asset list changed from what was stored in memory
         """
         helper = bundler_batch_helper
         seed_list = os.path.join(workspace.paths.engine_root(), "Assets", "Engine", "SeedAssetList.seed")  # Engine seed list
@@ -919,7 +711,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                         # Extra arguments for pattern comparison
                         cmd.extend([f"--filePatternType={pattern_type}", f"--filePattern={pattern}"])
                 if workspace.project:
-                    cmd.append(f'--project-path={project_name}')
+                    cmd.append(f'--project-path={workspace.paths.project()}')
                 return cmd
             # End generate_compare_command()
 
@@ -960,7 +752,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     output_mac_asset_list = helper.platform_file_name(last_output_arg, platform)
 
                 # Build execution command
-                cmd = generate_compare_command(platform_arg, workspace.project)
+                cmd = generate_compare_command(platform_arg, workspace.paths.project())
 
                 # Execute command
                 subprocess.check_call(cmd)
@@ -995,7 +787,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                 f"--comparisonRulesFile={rule_file}",
                 f"--comparisonType={args[1]}",
                 r"--addComparison",
-                f"--project-path={workspace.project}",
+                f"--project-path={workspace.paths.project()}",
             ]
             if args[1] == "4":
                 # If pattern comparison, append a few extra arguments
@@ -1117,7 +909,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                 "--addDefaultSeedListFiles",
                 "--platform=pc",
                 "--print",
-                f"--project-path={workspace.project}"
+                f"--project-path={workspace.paths.project()}"
             ],
             universal_newlines=True,
         )
@@ -1189,7 +981,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         # Make sure file gets deleted on teardown
         request.addfinalizer(lambda: fs.delete([bundle_result_path], True, False))
 
-        bundles_folder = os.path.join(workspace.paths.engine_root(), workspace.project, "Bundles")
+        bundles_folder = os.path.join(workspace.paths.project(), "Bundles")
         level_pak = r"levels\testdependencieslevel\level.pak"
         bundle_request_path = os.path.join(bundles_folder, "bundle.pak")
         bundle_result_path = os.path.join(bundles_folder,
@@ -1243,23 +1035,64 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         2. Verify file was created
         3. Verify that only the expected assets are present in the created asset list
         """
-        expected_assets = [
+        expected_assets = sorted([
             "ui/canvases/lyshineexamples/animation/multiplesequences.uicanvas",
-            "ui/textures/prefab/button_normal.sprite"
-        ]
+            "ui/textures/prefab/button_disabled.tif.streamingimage",
+            "ui/textures/prefab/tooltip_sliced.tif.streamingimage",
+            "ui/textures/prefab/button_normal.tif.streamingimage"
+        ])
+        # Printing these lists out can save a step in debugging if this test fails on Jenkins.
+        logger.info(f"expected_assets: {expected_assets}")
+
+        skip_assets = sorted([
+            "ui/scripts/lyshineexamples/animation/multiplesequences.luac",
+            "ui/scripts/lyshineexamples/unloadthiscanvasbutton.luac",
+            "fonts/vera.fontfamily",
+            "fonts/vera-italic.font",
+            "fonts/vera.font",
+            "fonts/vera-bold.font",
+            "fonts/vera-bold-italic.font",
+            "fonts/vera-italic.ttf",
+            "fonts/vera.ttf",
+            "fonts/vera-bold.ttf",
+            "fonts/vera-bold-italic.ttf"
+        ])
+        logger.info(f"skip_assets: {skip_assets}")
+
+        expected_and_skip_assets = sorted(expected_assets + skip_assets)
+        # Printing both together to make it quick to compare the results in the logs for a test failure on Jenkins
+        logger.info(f"expected_and_skip_assets: {expected_and_skip_assets}")
+
+        # First, generate an asset info file without skipping, to get a list that can be used as a baseline to verify
+        # the files were actually skipped, and not just missing.
+        bundler_batch_helper.call_assetLists(
+            assetListFile=bundler_batch_helper['asset_info_file_request'],
+            addSeed="ui/canvases/lyshineexamples/animation/multiplesequences.uicanvas"
+        )
+        assert os.path.isfile(bundler_batch_helper["asset_info_file_result"])
+        assets_in_no_skip_list = []
+        for rel_path in bundler_batch_helper.get_asset_relative_paths(bundler_batch_helper["asset_info_file_result"]):
+            assets_in_no_skip_list.append(rel_path)
+        assets_in_no_skip_list = sorted(assets_in_no_skip_list)
+        logger.info(f"assets_in_no_skip_list: {assets_in_no_skip_list}")
+        assert assets_in_no_skip_list == expected_and_skip_assets
+
+        # Now generate an asset info file using the skip command, and verify the skip files are not in the list.
         bundler_batch_helper.call_assetLists(
             assetListFile=bundler_batch_helper['asset_info_file_request'],
             addSeed="ui/canvases/lyshineexamples/animation/multiplesequences.uicanvas",
-            skip="ui/textures/prefab/button_disabled.sprite,ui/scripts/lyshineexamples/animation/multiplesequences.luac,"
-                 "ui/textures/prefab/tooltip_sliced.sprite,ui/scripts/lyshineexamples/unloadthiscanvasbutton.luac,fonts/vera.fontfamily,fonts/vera-italic.font,"
-                 "fonts/vera.font,fonts/vera-bold.font,fonts/vera-bold-italic.font,fonts/vera-italic.ttf,fonts/vera.ttf,fonts/vera-bold.ttf,fonts/vera-bold-italic.ttf"
+            allowOverwrites="",
+            skip=','.join(skip_assets)
         )
+
         assert os.path.isfile(bundler_batch_helper["asset_info_file_result"])
         assets_in_list = []
         for rel_path in bundler_batch_helper.get_asset_relative_paths(bundler_batch_helper["asset_info_file_result"]):
             assets_in_list.append(rel_path)
+        assets_in_list = sorted(assets_in_list)
+        logger.info(f"assets_in_list: {assets_in_list}")
+        assert assets_in_list == expected_assets
 
-        assert sorted(assets_in_list) == sorted(expected_assets)
 
     @pytest.mark.BAT
     @pytest.mark.assetpipeline
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py
new file mode 100644
index 0000000000..33a55d6601
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py
@@ -0,0 +1,20 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+import azlmbr.bus
+import azlmbr.editor
+import azlmbr.legacy.general
+import sys
+
+# Print out the passed in bundle_path, so the outer test can verify this was sent in correctly
+bundle_path = sys.argv[1]
+print('Bundle mode test running with path {}'.format(sys.argv[1]))
+
+# Turn on bundle mode. This will trigger some printouts that the outer test logic will validate.
+azlmbr.legacy.general.set_cvar_integer("sys_report_files_not_found_in_paks", 1)
+azlmbr.legacy.general.run_console(f"loadbundles {bundle_path}")
+
+azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py
new file mode 100644
index 0000000000..af92bb1773
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py
@@ -0,0 +1,93 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import os
+import pytest
+import logging
+import sys
+import time
+pytest.importorskip('ly_test_tools')
+
+import ly_test_tools.environment.file_system as fs
+import ly_test_tools.environment.waiter as waiter
+import ly_test_tools.log.log_monitor
+
+from ..ap_fixtures.asset_processor_fixture import asset_processor as asset_processor
+from ..ap_fixtures.bundler_batch_setup_fixture import bundler_batch_setup_fixture as bundler_batch_helper
+from ..ap_fixtures.timeout_option_fixture import timeout_option_fixture as timeout
+
+@pytest.mark.SUITE_periodic
+@pytest.mark.parametrize('launcher_platform', ['windows_editor'])
+@pytest.mark.parametrize('project', ['AutomatedTesting'])
+@pytest.mark.parametrize('level', ['auto_test'])
+class TestBundleMode(object):
+    def test_bundle_mode_with_levels_mounts_bundles_correctly(self, request, editor, level, launcher_platform,
+                                                              asset_processor, workspace, bundler_batch_helper):
+        level_pak = os.path.join("levels", level, "level.pak")
+
+        bundles_folder = os.path.join(workspace.paths.project(), "Bundles")
+        bundle_request_path = os.path.join(bundles_folder, "bundle.pak")
+        bundle_result_path = os.path.join(bundles_folder,
+                                          bundler_batch_helper.platform_file_name(
+                                              "bundle.pak", workspace.asset_processor_platform))
+
+        # Create target 'Bundles' folder if it doesn't exist
+        if not os.path.exists(bundles_folder):
+            os.mkdir(bundles_folder)
+        # Delete target bundle file if it already exists
+        if os.path.exists(bundle_result_path):
+            fs.delete([bundle_result_path], True, False)
+
+        # Make asset list file to use in the bundle
+        bundler_batch_helper.call_assetLists(
+            addSeed=level_pak,
+            assetListFile=bundler_batch_helper["asset_info_file_request"],
+        )
+
+        # Make bundle in <project_folder>/Bundles
+        bundler_batch_helper.call_bundles(
+            assetListFile=bundler_batch_helper["asset_info_file_result"],
+            outputBundlePath=bundle_request_path,
+            maxSize="2048",
+        )
+
+        # Ensure the bundle was created
+        assert os.path.exists(bundle_result_path), f"Bundle was not created at location: {bundle_result_path}"
+
+        # The editor flips the slash direction in some of the printouts
+        bundle_result_path_editor_separator = bundle_result_path.replace('\\', '/')
+
+        expected_lines = [
+            # A beginning of test printout can help debug where failures occur, if this line is missing
+            # then the Editor didn't launch, didn't run the Python test, or didn't pass in the right parameter
+            f'Bundle mode test running with path {bundles_folder}',
+            # These printouts happen in response to the loadbundles call, and verify this bundle is actually loaded
+            f"[CONSOLE] Executing console command 'loadbundles {bundles_folder}'",
+            f'(BundlingSystem) - Loading bundles from {bundles_folder} of type .pak',
+            f'(Archive) - Opening archive file {bundle_result_path_editor_separator}',
+        ]
+        unexpected_lines = []
+
+        timeout = 180
+        halt_on_unexpected = False
+        test_directory = os.path.join(os.path.dirname(__file__))
+        test_file = os.path.join(test_directory, 'bundle_mode_in_editor_tests.py')
+        editor.args.extend(['-NullRenderer', '-rhi=Null', "--skipWelcomeScreenDialog",
+                            "--autotest_mode", "--runpythontest", test_file, "--runpythonargs", bundles_folder])
+
+        with editor.start(launch_ap=True):
+            editor_log_file = os.path.join(editor.workspace.paths.project_log(), 'Editor.log')
+            log_monitor = ly_test_tools.log.log_monitor.LogMonitor(editor, editor_log_file)
+            waiter.wait_for(
+                lambda: editor.is_alive(),
+                timeout,
+                exc=("Log file '{}' was never opened by another process.".format(editor_log_file)),
+                interval=1)
+            log_monitor.monitor_log_for_lines(expected_lines, unexpected_lines, halt_on_unexpected, timeout)
+
+        # Delete the bundle created and used in this test
+        fs.delete([bundle_result_path], True, False)
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
index 7159b2e83f..52321fceea 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
@@ -120,31 +120,29 @@ class TestsMissingDependencies_WindowsAndMac(object):
 
         # Relative path to the txt file with missing dependencies
         expected_product = f"testassets\\validuuidsnotdependency.txt"
-        self._asset_processor.add_source_folder_assets(f"{self._workspace.project}\\Objects\\LumberTank")
-        self._asset_processor.add_source_folder_assets(f"{self._workspace.project}\\Objects\\Characters\\Jack")
         # Expected missing dependencies
         expected_dependencies = [
             #            String                                      Asset                     #
-            ('1CB10C43F3245B93A294C602ADEF95F9:[0', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'),
+            # InvalidAssetIdNoReport.txt
+            ('E68A85B0-131D-5A82-B2D5-BC58EE4062AE', '{E68A85B0-131D-5A82-B2D5-BC58EE4062AE}:0'),
+            # InvalidRelativePathsNoReport.txt
+            ('B3EF12DD306C520EB0A8A6B0D031A195', '{B3EF12DD-306C-520E-B0A8-A6B0D031A195}:0'),
+            # SelfReferenceUUID.txt
             ('33bcee02F3225688ABEE534F6058593F', '{33BCEE02-F322-5688-ABEE-534F6058593F}:0'),
-            ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3e8'),
-            ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3ea'),
-            ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3eb'),
-            ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3e8'),
-            ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3ea'),
-            ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3eb'),
-            ('6BDE282B49C957F7B0714B26579BCA9A', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'),
-            ('747D31D71E62553592226173C49CF97E', '{747D31D7-1E62-5535-9222-6173C49CF97E}:1'),
-            ('747D31D71E62553592226173C49CF97E', '{747D31D7-1E62-5535-9222-6173C49CF97E}:2'),
-            ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3e8'),
-            ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3ea'),
-            ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3eb'),
-            ('B076CDDC-14DF-50F4-A5E9-7518ABB3E851', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'),
-            ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3e8'),
-            ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3ea'),
-            ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3eb'),
-            ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3ec'),
-            ('D92C4661C8985E19BD3597CB2318CFA6:[0', '{D92C4661-C898-5E19-BD35-97CB2318CFA6}:0'),
+            # SelfReferencePath.txt
+            ('DD587FBE-16C8-5B98-AE3C-A9F8750B2692', '{DD587FBE-16C8-5B98-AE3C-A9F8750B2692}:0'),
+            # InvalidUUIDNoReport.txt
+            ('837412DF-D05F-576D-81AA-ACF360463749', '{837412DF-D05F-576D-81AA-ACF360463749}:0'),
+            # MaxIteration31Deep.txt
+            ('3F642A0FDC825696A70A1DA5709744DF', '{3F642A0F-DC82-5696-A70A-1DA5709744DF}:0'),
+            # OnlyMatchesCorrectLengthUUIDs.txt
+            ('2545AD8B-1B9B-5F93-859D-D8DC1DC2B480', '{2545AD8B-1B9B-5F93-859D-D8DC1DC2B480}:0'),
+            # WildcardScanTest1.txt
+            ('1CB10C43F3245B93A294C602ADEF95F9:[0', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'),
+            # RelativeProductPathsNotDependencies.txt
+            ('B772953CA08A5D209491530E87D11504:[0', '{B772953C-A08A-5D20-9491-530E87D11504}:0'),
+            # WildcardScanTest2.txt
+            ('D92C4661C8985E19BD3597CB2318CFA6', '{D92C4661-C898-5E19-BD35-97CB2318CFA6}:0'),
         ]
         self.do_missing_dependency_test(expected_product, expected_dependencies,
                                         "%ValidUUIDsNotDependency.txt")
@@ -187,8 +185,11 @@ class TestsMissingDependencies_WindowsAndMac(object):
         # Expected missing dependencies
         expected_dependencies = [
             #            String                                                  Asset                     #
-            ('2ef92b8D044E5C278E2BB1AC0374A4E7:1003', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3eb'),
+            # _dev_Red.tif
+            ('2ef92b8D044E5C278E2BB1AC0374A4E7:1000', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3e8'),
+            # _dev_Purple.tif
             ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
+            # _dev_White.tif
             ('D83B36F1-61A6-5001-B191-4D0CE282E236}-1002', '{D83B36F1-61A6-5001-B191-4D0CE282E236}:3ea'),
         ]
 
@@ -237,11 +238,10 @@ class TestsMissingDependencies_WindowsAndMac(object):
         expected_dependencies = [
             #            String                               Asset                     #
             ('TestAssets\\WildcardScanTest1.txt', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'),
-            ('libs/particles/milestone2PARTICLES.XML', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'),
+            ('TESTASSETS/ReportONEmISSINGdEPENDENCY.tXT', '{BE5E2373-245E-59E4-B4C6-7370EEAA2EFD}:0'),
             ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3e8'),
             ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
-            ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3eb'),
-            ('project.json', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'),
+            ('TestAssets/InvalidAssetIdNoReport.txt', '{E68A85B0-131D-5A82-B2D5-BC58EE4062AE}:0'),
             ('TestAssets/RelativeProductPathsNotDependencies.txt', '{B772953C-A08A-5D20-9491-530E87D11504}:0'),
         ]
 
@@ -282,29 +282,31 @@ class TestsMissingDependencies_WindowsAndMac(object):
         2. Set the expected missing dependencies
         3. Execute test
         """
-
-        self._asset_processor.add_source_folder_assets(f"Gems\\LyShineExamples\\Assets\\UI\\Fonts\\LyShineExamples")
-        self._asset_processor.add_scan_folder(f"Gems\\LyShineExamples\\Assets")
         # Relative path to the txt file with missing dependencies as product paths
         expected_product = f"testassets\\relativeproductpathsnotdependencies.txt"
         expected_dependencies = [
             #            String                                 Asset                     #
-            ('materials/floor_tile.mtl', '{0EFF5E4A-F544-5D87-8696-6DDFA62D6063}:0'),
-            ('materials/am_grass1.mtl', '{1151F14D-38A6-5579-888A-BE3139882E68}:0'),
-            ('2ef92b8D044E5C278E2BB1AC0374A4E7:1002', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3ea'),
-            ('textures/milestone2/ama_grey_02.tif.streamingimage', '{3EE80AAD-EB9C-56BD-9E9C-65410578998C}:3e8'),
-            ('ui/milestone2menu.uicanvas', '{445D9AF3-6CA5-5281-82A9-5C570BCD1DB8}:0'),
-            ('libs/particles/milestone2particles.xml', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'),
-            ('textures/_dev_yellow_light.tif.1002.imagemipchain', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3ea'),
-            ('textures\\\\_dev_tan.tif.streamingimage', '{8F2BCEF5-C8CE-5B80-8103-8C1D694D012C}:3e8'),
-            ('materials/am_rockground.mtl', '{A1DA3D05-A020-5BB5-A608-C4812B7BD733}:0'),
             ('textures/_dev_purple.tif.streamingimage', '{A2482826-053D-5634-A27B-084B1326AAE5}:3e8'),
-            ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
-            ('project.json', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'),
-            ('CEAA362B4E505BCEB827CB92EF40A50E', '{CEAA362B-4E50-5BCE-B827-CB92EF40A50E}:1'),
-            ('CEAA362B4E505BCEB827CB92EF40A50E', '{CEAA362B-4E50-5BCE-B827-CB92EF40A50E}:2'),
+            ('textures\\_dev_stucco.tif.streamingimage', '{70114D85-D712-5AEB-A816-8FE3A37087AF}:3e8'),
+            ('textures\\\\_dev_tan.tif.streamingimage', '{8F2BCEF5-C8CE-5B80-8103-8C1D694D012C}:3e8'),
             ('TEXTURES/_DEV_WHITE.tif.streamingimage', '{D83B36F1-61A6-5001-B191-4D0CE282E236}:3e8'),
+            ('textures/_dev_yellow_light.tif.1002.imagemipchain', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3ea'),
+            ('textures/_dev_woodland.tif.1002.imagemipchain', '{F3DD193C-5845-569C-A974-AA338B30CF86}:3ea'),
             ('textures/_dev_woodland.tif.streamingimage', '{F3DD193C-5845-569C-A974-AA338B30CF86}:3e8'),
+            ('textures/_dev_yellow_light.tif.streamingimage', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3e8'),
+            ('textures/_dev_yellow_med.tif.1002.imagemipchain', '{BB4DFF57-52BD-525B-9628-68232E31802C}:3ea'),
+            ('textures/lights/flare01.tif.streamingimage', '{D8E49CC4-C743-5F31-A1EC-4AA89163B8F5}:3e8'),
+            # SelfReferenceUUID.txt
+            ('33BCEE02-F322-5688-ABEE-534F6058593F', '{33BCEE02-F322-5688-ABEE-534F6058593F}:0'),
+            ('textures/test_texture_sequence/test_texture_sequence000.png.streamingimage', '{6CC90BEE-0A9F-57A8-9013-7C1D643C0E8E}:3e8'),
+            # _dev_red.tif.streamingimage
+            ('2ef92b8D044E5C278E2BB1AC0374A4E7:1002', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3ea'),
+            # SelfReferenceAssetID.txt
+            ('785A05D2-483E-5B43-A2B9-92ACDAE6E938', '{785A05D2-483E-5B43-A2B9-92ACDAE6E938}:0'),
+            ('textures/test_texture_sequence/test_texture_sequence001.png.streamingimage', '{8A8A37DD-01B9-5D70-92E4-925E2C0FE826}:3e8'),
+            # _dev_purple.tif.1002.imagemipchain
+            ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
+            ('textures/_dev_purple_glass.tif.1002.imagemipchain', '{2FCDD831-77D1-5BE1-A4C8-CA47E4F89F19}:3ea'),
         ]
 
         self.do_missing_dependency_test(expected_product, expected_dependencies,
diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
index cbb6102a44..4543888a7c 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
@@ -52,7 +52,7 @@ class TestAutomationBase:
         cls._kill_ly_processes()
 
     def _run_test(self, request, workspace, editor, testcase_module, extra_cmdline_args=[], batch_mode=True,
-                  autotest_mode=True, use_null_renderer=True):
+                  autotest_mode=True, use_null_renderer=True, enable_prefab_system=True):
         test_starttime = time.time()
         self.logger = logging.getLogger(__name__)
         errors = []
@@ -97,6 +97,11 @@ class TestAutomationBase:
             pycmd += ["-BatchMode"]
         if autotest_mode:
             pycmd += ["-autotest_mode"]
+        if enable_prefab_system:
+            pycmd += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]
+        else:
+            pycmd += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]
+
         pycmd += extra_cmdline_args
         editor.args.extend(pycmd) # args are added to the WinLauncher start command
         editor.start(backupFiles = False, launch_ap = False)
@@ -165,7 +170,7 @@ class TestAutomationBase:
                     for line in f.readlines():
                         error_str += f"|{log_basename}| {line}"                        
             except Exception as ex:
-                error_str += "-- No log available --"
+                error_str += f"-- No log available ({ex})--"
 
             pytest.fail(error_str)     
         
diff --git a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
index bf42579970..1fc71da972 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
@@ -7,60 +7,6 @@
 #
 
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_FOUNDATION_TEST_SUPPORTED)
-    ly_add_pytest(
-        NAME AutomatedTesting::EditorTests_Main
-        TEST_SUITE main
-        TEST_SERIAL
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
-        PYTEST_MARKS "not REQUIRES_gpu"
-        RUNTIME_DEPENDENCIES
-            Legacy::Editor
-            AZ::AssetProcessor
-            AutomatedTesting.Assets
-        COMPONENT
-            Editor
-    )
-
-    ly_add_pytest(
-        NAME AutomatedTesting::EditorTests_Main_GPU
-        TEST_SUITE main
-        TEST_SERIAL
-        TEST_REQUIRES gpu
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
-        PYTEST_MARKS "REQUIRES_gpu"
-        RUNTIME_DEPENDENCIES
-            Legacy::Editor
-            AZ::AssetProcessor
-            AutomatedTesting.Assets
-        COMPONENT
-            Editor
-    )
-
-    ly_add_pytest(
-        NAME AutomatedTesting::EditorTests_Periodic
-        TEST_SUITE periodic
-        TEST_SERIAL
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
-        RUNTIME_DEPENDENCIES
-            Legacy::Editor
-            AZ::AssetProcessor
-            AutomatedTesting.Assets
-        COMPONENT
-            Editor
-    )
-
-    ly_add_pytest(
-        NAME AutomatedTesting::EditorTests_Sandbox
-        TEST_SUITE sandbox
-        TEST_SERIAL
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Sandbox.py
-        RUNTIME_DEPENDENCIES
-            Legacy::Editor
-            AZ::AssetProcessor
-            AutomatedTesting.Assets
-        COMPONENT
-            Editor
-    )
 
     ly_add_pytest(
         NAME AutomatedTesting::EditorTests_Main_Optimized
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py
index 33c48c7a77..7366faafdc 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py
@@ -62,7 +62,7 @@ def AssetBrowser_SearchFiltering():
         from editor_python_test_tools.utils import Report
         from editor_python_test_tools.utils import TestHelper as helper
 
-        def verify_files_appeared(model, allowed_asset_extentions, parent_index=QtCore.QModelIndex()):
+        def verify_files_appeared(model, allowed_asset_extensions, parent_index=QtCore.QModelIndex()):
             indexes = [parent_index]
             while len(indexes) > 0:
                 parent_index = indexes.pop(0)
@@ -71,7 +71,7 @@ def AssetBrowser_SearchFiltering():
                     cur_data = cur_index.data(Qt.DisplayRole)
                     if (
                         "." in cur_data
-                        and (cur_data.lower().split(".")[-1] not in allowed_asset_extentions)
+                        and (cur_data.lower().split(".")[-1] not in allowed_asset_extensions)
                         and not cur_data[-1] == ")"
                     ):
                         Report.info(f"Incorrect file found: {cur_data}")
@@ -94,16 +94,21 @@ def AssetBrowser_SearchFiltering():
             Report.info("Asset Browser is already open")
         editor_window = pyside_utils.get_editor_main_window()
         app = QtWidgets.QApplication.instance()
-        
-        # 3) Type the name of an asset in the search bar and make sure only one asset is filtered in Asset browser
+
+        # 3) Type the name of an asset in the search bar and make sure it is filtered to and selectable
         asset_browser = editor_window.findChild(QtWidgets.QDockWidget, "Asset Browser")
         search_bar = asset_browser.findChild(QtWidgets.QLineEdit, "textSearch")
         search_bar.setText("cedar.fbx")
         asset_browser_tree = asset_browser.findChild(QtWidgets.QTreeView, "m_assetBrowserTreeViewWidget")
-        model_index = pyside_utils.find_child_by_pattern(asset_browser_tree, "cedar.fbx")
-        pyside_utils.item_view_index_mouse_click(asset_browser_tree, model_index)
+        asset_browser_table = asset_browser.findChild(QtWidgets.QTreeView, "m_assetBrowserTableViewWidget")
+        found = await pyside_utils.wait_for_condition(lambda: pyside_utils.find_child_by_pattern(asset_browser_table, "cedar.fbx"), 5.0)
+        if found:
+            model_index = pyside_utils.find_child_by_pattern(asset_browser_table, "cedar.fbx")
+        else:
+            Report.result(Tests.asset_filtered, found)
+        pyside_utils.item_view_index_mouse_click(asset_browser_table, model_index)
         is_filtered = await pyside_utils.wait_for_condition(
-            lambda: asset_browser_tree.indexBelow(asset_browser_tree.currentIndex()) == QtCore.QModelIndex(), 5.0)
+            lambda: asset_browser_table.currentIndex() == model_index, 5.0)
         Report.result(Tests.asset_filtered, is_filtered)
 
         # 4) Click the "X" in the search bar.
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py
index b4f0dc7f6c..ecc77778cc 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py
@@ -84,8 +84,8 @@ def AssetBrowser_TreeNavigation():
 
     # 3) Collapse all files initially
     main_window = editor_window.findChild(QtWidgets.QMainWindow)
-    asset_browser = pyside_utils.find_child_by_hierarchy(main_window, ..., "Asset Browser")
-    tree = pyside_utils.find_child_by_hierarchy(asset_browser, ..., "m_assetBrowserTreeViewWidget")
+    asset_browser = pyside_utils.find_child_by_pattern(main_window, text="Asset Browser", type=QtWidgets.QDockWidget)
+    tree = pyside_utils.find_child_by_pattern(asset_browser, "m_assetBrowserTreeViewWidget")
     scroll_area = tree.findChild(QtWidgets.QWidget, "qt_scrollarea_vcontainer")
     scroll_bar = scroll_area.findChild(QtWidgets.QScrollBar)
     tree.collapseAll()
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py
index 2a91e7a374..6683fc952a 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py
@@ -140,13 +140,13 @@ def Docking_BasicDockedTools():
 
         # 2.5,6) Send a console command.
         console_line_edit = console.findChild(QtWidgets.QLineEdit, "lineEdit")
-        console_line_edit.setText("t_Scale 2")
+        console_line_edit.setText("t_simulationTickScale 2")
         QtTest.QTest.keyClick(console_line_edit, QtCore.Qt.Key_Enter)
-        general.get_cvar("t_Scale")
-        Report.result(Tests.docked_console_works, general.get_cvar("t_Scale") == "2")
+        general.get_cvar("t_simulationTickScale")
+        Report.result(Tests.docked_console_works, general.get_cvar("t_simulationTickScale") == "2")
 
         # Reset the altered cvar
-        console_line_edit.setText("t_Scale 1")
+        console_line_edit.setText("t_simulationTickScale 1")
         QtTest.QTest.keyClick(console_line_edit, QtCore.Qt.Key_Enter)
 
     run_test()
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py
new file mode 100644
index 0000000000..5fa8130302
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py
@@ -0,0 +1,147 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+
+class Tests:
+    entities_sorted = (
+        "Entities sorted in the expected order",
+        "Entities sorted in an incorrect order",
+    )
+
+
+def EntityOutliner_EntityOrdering():
+    """
+    Summary:
+    Verify that manual entity ordering in the entity outliner works and is stable.
+
+    Expected Behavior:
+    Several entities are created, some are manually ordered, and their order
+    is maintained, even when new entities are added.
+
+    Test Steps:
+    1) Open the empty Prefab Base level
+    2) Add 5 entities to the outliner
+    3) Move "Entity1" to the top of the order
+    4) Move "Entity4" to the bottom of the order
+    5) Add another new entity, ensure the rest of the order is unchanged
+    """
+
+    import editor_python_test_tools.pyside_utils as pyside_utils
+    import azlmbr.legacy.general as general
+    from editor_python_test_tools.utils import Report
+    from editor_python_test_tools.utils import TestHelper as helper
+    from PySide2 import QtCore, QtWidgets, QtGui, QtTest
+
+    # Grab the Editor, Entity Outliner, and Outliner Model
+    editor_window = pyside_utils.get_editor_main_window()
+    entity_outliner = pyside_utils.find_child_by_hierarchy(
+        editor_window, ..., "EntityOutlinerWidgetUI", ..., "m_objectTree"
+    )
+    entity_outliner_model = entity_outliner.model()
+
+    # Get the outliner index for the root prefab container entity
+    def get_root_prefab_container_index():
+        return entity_outliner_model.index(0, 0)
+
+    # Get the outliner index for the top level entity of a given name
+    def index_for_name(name):
+        root_index = get_root_prefab_container_index()
+        for row in range(entity_outliner_model.rowCount(root_index)):
+            row_index = entity_outliner_model.index(row, 0, root_index)
+            if row_index.data() == name:
+                return row_index
+        return None
+
+    # Validate that the outliner top level entity order matches the expected order
+    def verify_entities_sorted(expected_order):
+        actual_order = []
+        root_index = get_root_prefab_container_index()
+        for row in range(entity_outliner_model.rowCount(root_index)):
+            row_index = entity_outliner_model.index(row, 0, root_index)
+            actual_order.append(row_index.data())
+
+        sorted_correctly = actual_order == expected_order
+        Report.result(Tests.entities_sorted, sorted_correctly)
+        if not sorted_correctly:
+            print(f"Expected entity order: {expected_order}")
+            print(f"Actual entity order: {actual_order}")
+
+    # Creates an entity from the outliner context menu
+    def create_entity():
+        pyside_utils.trigger_context_menu_entry(
+            entity_outliner, "Create entity", index=get_root_prefab_container_index()
+        )
+        # Wait a tick after entity creation to let events process
+        general.idle_wait(0.0)
+
+    # Moves an entity (wrapped by move_entity_before and move_entity_after)
+    def _move_entity(source_name, target_name, move_after=False):
+        source_index = index_for_name(source_name)
+        target_index = index_for_name(target_name)
+
+        target_row = target_index.row()
+        if move_after:
+            target_row += 1
+
+        # Generate MIME data and directly inject it into the model instead of
+        # generating mouse click operations, as it's more reliable and we're
+        # testing the underlying drag & drop logic as opposed to Qt's mouse
+        # handling here
+        mime_data = entity_outliner_model.mimeData([source_index])
+        entity_outliner_model.dropMimeData(
+            mime_data, QtCore.Qt.MoveAction, target_row, 0, target_index.parent()
+        )
+        # Wait after move to let events (i.e. prefab propagation) process
+        general.idle_wait(1.0)
+
+    # Move an entity before another entity in the order by dragging the source above the target
+    move_entity_before = lambda source_name, target_name: _move_entity(
+        source_name, target_name, move_after=False
+    )
+    # Move an entity after another entity in the order by dragging the source beloew the target
+    move_entity_after = lambda source_name, target_name: _move_entity(
+        source_name, target_name, move_after=True
+    )
+
+    expected_order = []
+
+    # 1) Open the empty Prefab Base level
+    helper.init_idle()
+    helper.open_level("Prefab", "Base")
+
+    # 2) Add 5 entities to the outliner
+    ENTITIES_TO_ADD = 5
+    for i in range(ENTITIES_TO_ADD):
+        create_entity()
+
+        # Our new entity should be given a name with a number automatically
+        new_entity = f"Entity{i+1}"
+        # The new entity should be added to the bottom of its parent entity
+        expected_order = expected_order + [new_entity]
+
+        verify_entities_sorted(expected_order)
+
+    # 3) Move "Entity5" to the top of the order
+    move_entity_before("Entity5", "Entity1")
+    expected_order = ["Entity5", "Entity1", "Entity2", "Entity3", "Entity4"]
+    verify_entities_sorted(expected_order)
+
+    # 4) Move "Entity2" to the bottom of the order
+    move_entity_after("Entity2", "Entity4")
+    expected_order = ["Entity5", "Entity1", "Entity3", "Entity4", "Entity2"]
+    verify_entities_sorted(expected_order)
+
+    # 5) Add another new entity, ensure the rest of the order is unchanged
+    create_entity()
+    expected_order = ["Entity5", "Entity1", "Entity3", "Entity4", "Entity2", "Entity6"]
+    verify_entities_sorted(expected_order)
+
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+
+    Report.start_test(EntityOutliner_EntityOrdering)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py
index 26b254ae71..c9e91687e0 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py
@@ -33,11 +33,22 @@ class TestAutomation(TestAutomationBase):
     def test_BasicEditorWorkflows_LevelEntityComponentCRUD(self, request, workspace, editor, launcher_platform,
                                                            remove_test_level):
         from .EditorScripts import BasicEditorWorkflows_LevelEntityComponentCRUD as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, enable_prefab_system=False)
 
     @pytest.mark.REQUIRES_gpu
     def test_BasicEditorWorkflows_GPU_LevelEntityComponentCRUD(self, request, workspace, editor, launcher_platform,
                                                                remove_test_level):
         from .EditorScripts import BasicEditorWorkflows_LevelEntityComponentCRUD as test_module
         self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False,
-                       use_null_renderer=False)
+                       use_null_renderer=False, enable_prefab_system=False)
+
+    def test_EntityOutlienr_EntityOrdering(self, request, workspace, editor, launcher_platform):
+        from .EditorScripts import EntityOutliner_EntityOrdering as test_module
+        self._run_test(
+            request, 
+            workspace, 
+            editor, 
+            test_module, 
+            batch_mode=False, 
+            autotest_mode=True,
+        )
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
index afc52f962d..d87fd8625b 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
@@ -21,6 +21,8 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
     # Disable -autotest_mode and -BatchMode. Tests cannot run in -BatchMode due to UI interactions, and these tests
     # interact with modal dialogs
     global_extra_cmdline_args = []
+    
+    enable_prefab_system = False
 
     class test_BasicEditorWorkflows_LevelEntityComponentCRUD(EditorSingleTest):
         # Custom teardown to remove slice asset created during test
@@ -43,12 +45,10 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
     class test_InputBindings_Add_Remove_Input_Events(EditorSharedTest):
         from .EditorScripts import InputBindings_Add_Remove_Input_Events as test_module
 
-    @pytest.mark.skip(reason="Crashes Editor: ATOM-15493")
     class test_AssetPicker_UI_UX(EditorSharedTest):
         from .EditorScripts import AssetPicker_UI_UX as test_module
 
 
-@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.")
 @pytest.mark.SUITE_main
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
@@ -57,10 +57,11 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     # Enable only -autotest_mode for these tests. Tests cannot run in -BatchMode due to UI interactions
     global_extra_cmdline_args = ["-autotest_mode"]
 
+    enable_prefab_system = False
+
     class test_AssetBrowser_TreeNavigation(EditorSharedTest):
         from .EditorScripts import AssetBrowser_TreeNavigation as test_module
 
-    @pytest.mark.skip(reason="Crashes Editor: ATOM-15493")
     class test_AssetBrowser_SearchFiltering(EditorSharedTest):
         from .EditorScripts import AssetBrowser_SearchFiltering as test_module
 
@@ -74,6 +75,5 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     class test_Menus_FileMenuOptions_Work(EditorSharedTest):
         from .EditorScripts import Menus_FileMenuOptions as test_module
 
-    
     class test_BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD(EditorSharedTest):
         from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py
index 398b64bc87..1bd1d7f987 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py
@@ -32,31 +32,29 @@ class TestAutomation(TestAutomationBase):
 
     def test_AssetBrowser_TreeNavigation(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetBrowser_TreeNavigation as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
 
-    @pytest.mark.skip(reason="Crashes Editor: ATOM-15493")
     def test_AssetBrowser_SearchFiltering(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetBrowser_SearchFiltering as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
 
-    @pytest.mark.skip(reason="Crashes Editor: ATOM-15493")
     def test_AssetPicker_UI_UX(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetPicker_UI_UX as test_module
-        self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False, enable_prefab_system=False)
 
     def test_ComponentCRUD_Add_Delete_Components(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ComponentCRUD_Add_Delete_Components as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
 
     def test_InputBindings_Add_Remove_Input_Events(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import InputBindings_Add_Remove_Input_Events as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, enable_prefab_system=False)
 
     def test_Menus_ViewMenuOptions_Work(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Menus_ViewMenuOptions as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
 
     @pytest.mark.skip(reason="Times out due to dialogs failing to dismiss: LYN-4208")
     def test_Menus_FileMenuOptions_Work(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Menus_FileMenuOptions as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py
index 98a6620d9c..8a56a2dbfd 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py
@@ -20,8 +20,8 @@ class TestAutomation(TestAutomationBase):
 
     def test_Menus_EditMenuOptions_Work(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Menus_EditMenuOptions as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
 
     def test_Docking_BasicDockedTools(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Docking_BasicDockedTools as test_module
-        self._run_test(request, workspace, editor, test_module, batch_mode=False)
+        self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py
index 4a472095ae..ce0d5e43e9 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py
@@ -19,6 +19,8 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     # Enable only -autotest_mode for these tests. Tests cannot run in -BatchMode due to UI interactions
     global_extra_cmdline_args = ["-autotest_mode"]
 
+    enable_prefab_system = False
+
     class test_Docking_BasicDockedTools(EditorSharedTest):
         from .EditorScripts import Docking_BasicDockedTools as test_module
 
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
index c2123d683c..ba607ede32 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
@@ -10,45 +10,29 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
 
 ## DynVeg ##
 
-    ly_add_pytest(
-        NAME AutomatedTesting::DynamicVegetationTests_Main
-        TEST_SERIAL
-        TEST_SUITE main
-        PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main.py
-        RUNTIME_DEPENDENCIES
-            AZ::AssetProcessor
-            Legacy::Editor
-            AutomatedTesting.GameLauncher
-            AutomatedTesting.Assets
-        COMPONENT
-            LargeWorlds
-    )
-
-
-    ly_add_pytest(
-        NAME AutomatedTesting::DynamicVegetationTests_Periodic
-        TEST_SERIAL
-        TEST_SUITE periodic
-        PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Periodic.py
-        RUNTIME_DEPENDENCIES
-            AZ::AssetProcessor
-            Legacy::Editor
-            AutomatedTesting.Assets
-            AutomatedTesting.GameLauncher
-        COMPONENT
-            LargeWorlds
-    )
-
     ly_add_pytest(
         NAME AutomatedTesting::DynamicVegetationTests_Main_Optimized
         TEST_SERIAL
         TEST_SUITE main
         PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main_Optimized.py
         RUNTIME_DEPENDENCIES
-           AZ::AssetProcessor
-           Legacy::Editor
-           AutomatedTesting.Assets
-           AutomatedTesting.GameLauncher
+            AZ::AssetProcessor
+            Legacy::Editor
+            AutomatedTesting.Assets
+            AutomatedTesting.GameLauncher
+        COMPONENT
+            LargeWorlds
+    )
+    ly_add_pytest(
+        NAME AutomatedTesting::DynamicVegetationTests_Periodic_Optimized
+        TEST_SERIAL
+        TEST_SUITE periodic
+        PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Periodic_Optimized.py
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            Legacy::Editor
+            AutomatedTesting.Assets
+            AutomatedTesting.GameLauncher
         COMPONENT
             LargeWorlds
     )
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py
new file mode 100644
index 0000000000..d016473d5e
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py
@@ -0,0 +1,85 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+
+def DynVegUtils_TempPrefabCreationWorks():
+    """
+    Summary:
+    An existing level is opened. Each Prefab setup to be spawned by Dynamic Vegetation tests is created in memory and
+    validated against existing test slice components/mesh assignments.
+
+    Expected Behavior:
+    Temporary prefabs contain the expected components/assets.
+
+    Test Steps:
+     1) Open an existing level
+     2) Create each of the necessary temporary Mesh prefabs, and validate the component/mesh setups
+     3) Create the necessary temporary PhysX Collider, and validate the component setup
+     4) Report errors/asserts
+
+    :return: None
+    """
+
+    import os
+
+    import azlmbr.asset as asset
+    import azlmbr.bus as bus
+    import azlmbr.math as math
+
+    from Prefab.tests import PrefabTestUtils as prefab_test_utils
+    from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg
+    from editor_python_test_tools.utils import Report, Tracer
+    from editor_python_test_tools.utils import TestHelper as helper
+    from editor_python_test_tools.prefab_utils import PrefabInstance
+
+    with Tracer() as error_tracer:
+        # Create dictionary for prefab filenames and paths to create using helper function
+        mesh_prefabs = {
+            "PinkFlower": os.path.join("assets", "objects", "foliage", "grass_flower_pink.azmodel"),
+            "PurpleFlower": os.path.join("assets", "objects", "foliage", "grass_flower_purple.azmodel"),
+            "1m_Cube": os.path.join("objects", "_primitives", "_box_1x1.azmodel"),
+            "CedarTree": os.path.join("assets", "objects", "foliage", "cedar.azmodel"),
+            "Bush": os.path.join("assets", "objects", "foliage", "bush_privet_01.azmodel"),
+                   }
+
+        # 1) Open an existing simple level
+        prefab_test_utils.open_base_tests_level()
+
+        # 2) Create each of the Mesh asset prefabs and validate that the prefab created successfully
+        for prefab_filename, asset_path in mesh_prefabs.items():
+            mesh_prefab_created = (
+                f"Temporary mesh prefab: {prefab_filename} created successfully",
+                f"Failed to create temporary mesh prefab: {prefab_filename}"
+            )
+            prefab = dynveg.create_temp_mesh_prefab(asset_path, prefab_filename)
+            Report.result(mesh_prefab_created, helper.wait_for_condition(lambda:
+                                                                         PrefabInstance.is_valid(prefab[1]), 3.0))
+
+        # 3) Create temp PhysX Collider prefab and validate that the prefab created successfully
+        physx_prefab_filename = "CedarTree_Collision"
+        physx_collider_prefab_created = (
+            f"Temporary mesh prefab: {physx_prefab_filename} created successfully",
+            f"Failed to create temporary mesh prefab: {physx_prefab_filename}"
+        )
+        test_physx_mesh_asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", os.path.join(
+            "assets", "objects", "foliage", "cedar.pxmesh"), math.Uuid(), False)
+        dynveg.create_temp_physx_mesh_collider(test_physx_mesh_asset_id, physx_prefab_filename)
+        Report.result(physx_collider_prefab_created, helper.wait_for_condition(lambda:
+                                                                               PrefabInstance.is_valid(prefab[1]), 3.0))
+
+        # 4) Report errors/asserts
+        helper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
+        for error_info in error_tracer.errors:
+            Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
+        for assert_info in error_tracer.asserts:
+            Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
+
+
+if __name__ == "__main__":
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(DynVegUtils_TempPrefabCreationWorks)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
index 84c661873c..fa45e057e2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
@@ -72,9 +72,9 @@ def DynamicSliceInstanceSpawner_Embedded_E2E():
     # 1) Create a new, temporary level
     lvl_name = "tmp_level"
     helper.init_idle()
-    level_created = general.create_level_no_prompt(lvl_name, 1024, 1, 4096, False)
+    level_created = helper.create_level(lvl_name)
     general.idle_wait(1.0)
-    Report.critical_result(Tests.level_created, level_created == 0)
+    Report.critical_result(Tests.level_created, level_created)
     general.set_current_view_position(512.0, 480.0, 38.0)
 
     # 2) Create a new entity with required vegetation area components and Script Canvas component for launcher test
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
index de2554034f..2353095849 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
@@ -73,9 +73,9 @@ def DynamicSliceInstanceSpawner_External_E2E():
     # 1) Create a new, temporary level
     lvl_name = "tmp_level"
     helper.init_idle()
-    level_created = general.create_level_no_prompt(lvl_name, 1024, 1, 4096, False)
+    level_created = helper.create_level(lvl_name)
     general.idle_wait(1.0)
-    Report.critical_result(Tests.level_created, level_created == 0)
+    Report.critical_result(Tests.level_created, level_created)
     general.set_current_view_position(512.0, 480.0, 38.0)
 
     # 2) Create a new entity with required vegetation area components and switch the Vegetation Asset List Source
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
index bf6501f469..130d56937b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
@@ -76,9 +76,9 @@ def LayerBlender_E2E_Editor():
     # 1) Create a new, temporary level
     lvl_name = "tmp_level"
     helper.init_idle()
-    level_created = general.create_level_no_prompt(lvl_name, 1024, 1, 4096, False)
+    level_created = helper.create_level(lvl_name)
     general.idle_wait(1.0)
-    Report.critical_result(Tests.level_created, level_created == 0)
+    Report.critical_result(Tests.level_created, level_created)
 
     general.set_current_view_position(500.49, 498.69, 46.66)
     general.set_current_view_rotation(-42.05, 0.00, -36.33)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
index 649c7d0776..1153ae2657 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
@@ -78,7 +78,7 @@ def LayerSpawner_InheritBehaviorFlag():
     # Create Vegetation area and assign a valid asset
     veg_1 = hydra.Entity("veg_1")
     veg_1.create_entity(
-        position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
+        position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
     )
     set_dynamic_slice_asset(veg_1, 2, os.path.join("Slices", "PinkFlower.dynamicslice"))
     veg_1.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
@@ -86,7 +86,7 @@ def LayerSpawner_InheritBehaviorFlag():
     # Create second vegetation area and assign a valid asset
     veg_2 = hydra.Entity("veg_2")
     veg_2.create_entity(
-        position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
+        position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
     )
     set_dynamic_slice_asset(veg_2, 2, os.path.join("Slices", "PurpleFlower.dynamicslice"))
     veg_2.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
index 0da200d87a..42604cd2da 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 def LayerSpawner_InstancesPlantInAllSupportedShapes():
     """
     Summary:
-    The level is loaded and vegetation area is created. Then the Vegetation Reference Shape
+    The level is loaded and vegetation area is created. Then the Shape Reference
     component of vegetation area is pinned with entities of different shape components to check
     if the vegetation plants in different shaped areas.
 
@@ -67,7 +67,7 @@ def LayerSpawner_InstancesPlantInAllSupportedShapes():
                                                10.0, 10.0, 10.0,
                                                asset_path)
     vegetation.remove_component("Box Shape")
-    vegetation.add_component("Vegetation Reference Shape")
+    vegetation.add_component("Shape Reference")
 
     # Create surface for planting on
     dynveg.create_surface_entity("Surface Entity", entity_position, 60.0, 60.0, 1.0)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py
index 4c02c887ef..06c9c5f615 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py
@@ -20,8 +20,8 @@ class TestAutomation(TestAutomationBase):
 
     def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import EmptyInstanceSpawner_EmptySpawnerWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py
index ded2dda4e9..673e40e397 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py
@@ -12,12 +12,24 @@ import ly_test_tools.environment.file_system as file_system
 from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite
 
 
-@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.")
 @pytest.mark.SUITE_main
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(EditorTestSuite):
 
+    enable_prefab_system = False
+
+    # Helpers for test asset cleanup
+    def cleanup_test_level(self, workspace):
+        file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
+                           True, True)
+
+    def cleanup_test_slices(self, workspace):
+        file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
+                                         "TestSlice_1.slice")], True, True)
+        file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
+                                         "TestSlice_2.slice")], True, True)
+    
     class test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(EditorParallelTest):
         from .EditorScripts import DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks as test_module
 
@@ -36,10 +48,7 @@ class TestAutomation(EditorTestSuite):
     class test_SpawnerSlices_SliceCreationAndVisibilityToggleWorks(EditorSingleTest):
         # Custom teardown to remove slice asset created during test
         def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
-            file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
-                                             "TestSlice_1.slice")], True, True)
-            file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
-                                             "TestSlice_2.slice")], True, True)
+            TestAutomation.cleanup_test_slices(self, workspace)
         from .EditorScripts import SpawnerSlices_SliceCreationAndVisibilityToggleWorks as test_module
 
     class test_AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea(EditorParallelTest):
@@ -150,23 +159,29 @@ class TestAutomation(EditorTestSuite):
     class test_DynamicSliceInstanceSpawner_Embedded_E2E_Editor(EditorSingleTest):
         from .EditorScripts import DynamicSliceInstanceSpawner_Embedded_E2E as test_module
 
-        # Custom teardown to remove test level created during test
+        # Custom setup/teardown to remove test level created during test
+        def setup(self, request, workspace, editor, editor_test_results, launcher_platform):
+            TestAutomation.cleanup_test_level(self, workspace)
+
         def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
-            file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
-                               True, True)
+            TestAutomation.cleanup_test_level(self, workspace)
 
     class test_DynamicSliceInstanceSpawner_External_E2E_Editor(EditorSingleTest):
         from .EditorScripts import DynamicSliceInstanceSpawner_External_E2E as test_module
 
-        # Custom teardown to remove test level created during test
+        # Custom setup/teardown to remove test level created during test
+        def setup(self, request, workspace, editor, editor_test_results, launcher_platform):
+            TestAutomation.cleanup_test_level(self, workspace)
+
         def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
-            file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
-                               True, True)
-        
+            TestAutomation.cleanup_test_level(self, workspace)
+
     class test_LayerBlender_E2E_Editor(EditorSingleTest):
         from .EditorScripts import LayerBlender_E2E_Editor as test_module
 
-        # Custom teardown to remove test level created during test
+        # Custom setup/teardown to remove test level created during test
+        def setup(self, request, workspace, editor, editor_test_results, launcher_platform):
+            TestAutomation.cleanup_test_level(self, workspace)
+
         def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
-            file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
-                               True, True)
+            TestAutomation.cleanup_test_level(self, workspace)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py
index 2780c0f471..d0d570950b 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py
@@ -52,158 +52,158 @@ class TestAutomation(TestAutomationBase):
 
     def test_AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_AltitudeFilter_FilterStageToggle(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AltitudeFilter_FilterStageToggle as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SpawnerSlices_SliceCreationAndVisibilityToggleWorks(self, request, workspace, editor, remove_test_slice, launcher_platform):
         from .EditorScripts import SpawnerSlices_SliceCreationAndVisibilityToggleWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_AssetWeightSelector_InstancesExpressBasedOnWeight(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AssetWeightSelector_InstancesExpressBasedOnWeight as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4155")
     def test_DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4155")
     def test_DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SurfaceDataRefreshes_RemainsStable(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SurfaceDataRefreshes_RemainsStable as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_VegetationInstances_DespawnWhenOutOfRange(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import VegetationInstances_DespawnWhenOutOfRange as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_InstanceSpawnerPriority_LayerAndSubPriority_HigherValuesPlantOverLower(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import InstanceSpawnerPriority_LayerAndSubPriority as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LayerBlocker_InstancesBlockedInConfiguredArea(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerBlocker_InstancesBlockedInConfiguredArea as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LayerSpawner_InheritBehaviorFlag(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerSpawner_InheritBehaviorFlag as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LayerSpawner_InstancesPlantInAllSupportedShapes(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerSpawner_InstancesPlantInAllSupportedShapes as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LayerSpawner_FilterStageToggle(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerSpawner_FilterStageToggle as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2038")
     def test_LayerSpawner_InstancesRefreshUsingCorrectViewportCamera(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerSpawner_InstancesRefreshUsingCorrectViewportCamera as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_MeshBlocker_InstancesBlockedByMesh(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import MeshBlocker_InstancesBlockedByMesh as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_MeshBlocker_InstancesBlockedByMeshHeightTuning(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import MeshBlocker_InstancesBlockedByMeshHeightTuning as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_MeshSurfaceTagEmitter_DependentOnMeshComponent(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import MeshSurfaceTagEmitter_DependentOnMeshComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_PhysXColliderSurfaceTagEmitter_E2E_Editor(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import PhysXColliderSurfaceTagEmitter_E2E_Editor as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_PositionModifier_AutoSnapToSurfaceWorks(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import PositionModifier_AutoSnapToSurfaceWorks as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_RotationModifier_InstancesRotateWithinRange(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import RotationModifier_InstancesRotateWithinRange as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_RotationModifierOverrides_InstancesRotateWithinRange(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import RotationModifierOverrides_InstancesRotateWithinRange as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ScaleModifier_InstancesProperlyScale(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ScaleModifier_InstancesProperlyScale as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ScaleModifierOverrides_InstancesProperlyScale(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ScaleModifierOverrides_InstancesProperlyScale as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ShapeIntersectionFilter_InstancesPlantInAssignedShape(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ShapeIntersectionFilter_InstancesPlantInAssignedShape as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ShapeIntersectionFilter_FilterStageToggle(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ShapeIntersectionFilter_FilterStageToggle as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SlopeAlignmentModifier_InstanceSurfaceAlignment(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SlopeAlignmentModifier_InstanceSurfaceAlignment as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SurfaceMaskFilter_BasicSurfaceTagCreation(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SurfaceMaskFilter_BasicSurfaceTagCreation as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SurfaceMaskFilter_ExclusiveSurfaceTags_Function(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SurfaceMaskFilter_ExclusionList as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SurfaceMaskFilter_InclusiveSurfaceTags_Function(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SurfaceMaskFilter_InclusionList as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SystemSettings_SectorPointDensity(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SystemSettings_SectorPointDensity as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SystemSettings_SectorSize(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SystemSettings_SectorSize as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlopes(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
 
 @pytest.mark.SUITE_periodic
@@ -219,7 +219,7 @@ class TestAutomationE2E(TestAutomationBase):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
         from .EditorScripts import DynamicSliceInstanceSpawner_Embedded_E2E as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.parametrize("launcher_platform", ['windows'])
     def test_DynamicSliceInstanceSpawner_Embedded_E2E_Launcher(self, workspace, launcher, level,
@@ -240,7 +240,7 @@ class TestAutomationE2E(TestAutomationBase):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
         from .EditorScripts import DynamicSliceInstanceSpawner_External_E2E as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.parametrize("launcher_platform", ['windows'])
     def test_DynamicSliceInstanceSpawner_External_E2E_Launcher(self, workspace, launcher, level,
@@ -261,7 +261,7 @@ class TestAutomationE2E(TestAutomationBase):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
         from .EditorScripts import LayerBlender_E2E_Editor as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.parametrize("launcher_platform", ['windows'])
     @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4170")
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py
new file mode 100644
index 0000000000..f87d6567ef
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py
@@ -0,0 +1,23 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import os
+import pytest
+
+import ly_test_tools.environment.file_system as file_system
+from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite
+
+
+@pytest.mark.SUITE_main
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+class TestAutomation(EditorTestSuite):
+
+    global_extra_cmdline_args = ["-BatchMode", "-autotest_mode"]
+
+    class test_DynVegUtils_TempPrefabCreationWorks(EditorSharedTest):
+        from .EditorScripts import DynVegUtils_TempPrefabCreationWorks as test_module
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py
index 21eecf642c..3ad27eb973 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py
@@ -20,52 +20,52 @@ class TestAutomation(TestAutomationBase):
 
     def test_GradientGenerators_Incompatibilities(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientGenerators_Incompatibilities as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientModifiers_Incompatibilities(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientModifiers_Incompatibilities as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientPreviewSettings_DefaultPinnedEntityIsSelf(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientPreviewSettings_DefaultPinnedEntityIsSelf as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientSampling_GradientReferencesAddRemoveSuccessfully(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientSampling_GradientReferencesAddRemoveSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientSurfaceTagEmitter_ComponentDependencies(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientSurfaceTagEmitter_ComponentDependencies as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientTransform_RequiresShape(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientTransform_RequiresShape as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientTransform_ComponentIncompatibleWithSpawners(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientTransform_ComponentIncompatibleWithSpawners as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_GradientTransform_ComponentIncompatibleWithExpectedGradients(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientTransform_ComponentIncompatibleWithExpectedGradients as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ImageGradient_RequiresShape(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ImageGradient_RequiresShape as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ImageGradient_ProcessedImageAssignedSuccessfully(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ImageGradient_ProcessedImageAssignedSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py
index 514504d324..6ac0658b4d 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py
@@ -15,6 +15,8 @@ from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, E
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(EditorTestSuite):
 
+    enable_prefab_system = False
+
     class test_GradientGenerators_Incompatibilities(EditorSharedTest):
         from .EditorScripts import GradientGenerators_Incompatibilities as test_module
 
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 9703423901..c69ce77041 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
@@ -96,7 +96,7 @@ def AreaNodes_DependentComponentsAdded():
         'SpawnerAreaNode': [
             'Vegetation Layer Spawner',
             'Vegetation Asset List',
-            'Vegetation Reference Shape'
+            'Shape Reference'
         ],
         'MeshBlockerAreaNode': [
             'Vegetation Layer Blocker (Mesh)',
@@ -104,7 +104,7 @@ def AreaNodes_DependentComponentsAdded():
         ],
         'BlockerAreaNode': [
             'Vegetation Layer Blocker',
-            'Vegetation Reference Shape'
+            'Shape Reference'
         ]
     }
 
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 417e093567..4dfc227c53 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
@@ -82,7 +82,7 @@ def Edit_DisabledNodeDuplication():
     nodes = {
         'SpawnerAreaNode': 'Vegetation Asset List',
         'MeshBlockerAreaNode': 'Mesh',
-        'BlockerAreaNode': 'Vegetation Reference Shape',
+        'BlockerAreaNode': 'Shape Reference',
         'FastNoiseGradientNode': 'Gradient Transform Modifier',
         'ImageGradientNode': 'Gradient Transform Modifier',
         'PerlinNoiseGradientNode': 'Gradient Transform Modifier',
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 c04f9f05f6..63df9a6fcb 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
@@ -104,7 +104,7 @@ def GradientNodes_DependentComponentsAdded():
     # we will be checking for
     commonComponents = [
         'Gradient Transform Modifier',
-        'Vegetation Reference Shape'
+        'Shape Reference'
     ]
     componentNames = []
     for name in gradients:
@@ -114,7 +114,7 @@ def GradientNodes_DependentComponentsAdded():
 
     # Create nodes for the gradients that have additional required dependencies and check if
     # the Entity created by adding the node has the appropriate Component and required
-    # Gradient Transform Modifier and Vegetation Reference Shape components added automatically to it
+    # Gradient Transform Modifier and Shape Reference components added automatically to it
     newGraph = graph.GraphManagerRequestBus(bus.Broadcast, 'GetGraph', newGraphId)
     x = 10.0
     y = 10.0
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py
index af4855a546..dedc9c70c0 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py
@@ -22,8 +22,8 @@ class TestAutomation(TestAutomationBase):
 
     def test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GradientMixer_NodeConstruction(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientMixer_NodeConstruction as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py
index 1c3652cae9..402df133cb 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py
@@ -18,6 +18,8 @@ from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, E
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(EditorTestSuite):
 
+    enable_prefab_system = False
+
     class test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(EditorSharedTest):
         from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module
 
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py
index ef8b3e492b..a719b1a7c0 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py
@@ -33,89 +33,89 @@ class TestAutomation(TestAutomationBase):
 
     def test_LandscapeCanvas_AreaNodes_DependentComponentsAdded(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AreaNodes_DependentComponentsAdded as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_AreaNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AreaNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_AreaNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import AreaNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_LayerExtenderNodes_ComponentEntitySync(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerExtenderNodes_ComponentEntitySync as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_Edit_DisabledNodeDuplication(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Edit_DisabledNodeDuplication as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_Edit_UndoNodeDelete_SliceEntity(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Edit_UndoNodeDelete_SliceEntity as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_NewGraph_CreatedSuccessfully(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import NewGraph_CreatedSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_Component_AddedRemoved(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import Component_AddedRemoved as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GraphClosed_OnLevelChange(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GraphClosed_OnLevelChange as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
     def test_LandscapeCanvas_GraphClosed_OnEntityDelete(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GraphClosed_OnEntityDelete as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GraphClosed_TabbedGraphClosesIndependently(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GraphClosed_TabbedGraph as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_Slice_CreateInstantiate(self, request, workspace, editor, remove_test_slice, launcher_platform):
         from .EditorScripts import Slice_CreateInstantiate as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GradientModifierNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientModifierNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GradientModifierNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientModifierNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GradientNodes_DependentComponentsAdded(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientNodes_DependentComponentsAdded as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GradientNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GradientNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GradientNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_GraphUpdates_UpdateComponents(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import GraphUpdates_UpdateComponents as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_ComponentUpdates_UpdateGraph(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ComponentUpdates_UpdateGraph as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_LayerBlender_NodeConstruction(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import LayerBlender_NodeConstruction as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_ShapeNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ShapeNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_LandscapeCanvas_ShapeNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
         from .EditorScripts import ShapeNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py
index 957536fffb..d7d5842518 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py
@@ -19,6 +19,45 @@ import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.projectroot, 'Gem', 'PythonTests'))
 import editor_python_test_tools.hydra_editor_utils as hydra
+from editor_python_test_tools.editor_entity_utils import EditorEntity
+from editor_python_test_tools.prefab_utils import Prefab
+
+
+def create_temp_mesh_prefab(mesh_asset_path, prefab_filename):
+    # Create initial entity
+    root = EditorEntity.create_editor_entity(name=prefab_filename)
+    assert root.exists(), "Failed to create entity"
+    # Add mesh component
+    mesh_component = root.add_component("Mesh")
+    assert root.has_component("Mesh") and mesh_component.is_enabled(), "Failed to add/activate Mesh component"
+    # Assign the specified mesh asset
+    mesh_asset = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", mesh_asset_path, math.Uuid(), False)
+    mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset)
+    assert mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset") == mesh_asset, \
+        "Failed to set Mesh asset"
+    # Create and return the temporary/in-memory prefab
+    temp_prefab = Prefab.create_prefab([root], prefab_filename)
+    return temp_prefab
+
+
+def create_temp_physx_mesh_collider(physx_mesh_id, prefab_filename):
+    # Create initial entity
+    root = EditorEntity.create_editor_entity(name=prefab_filename)
+    assert root.exists(), "Failed to create entity"
+    # Add PhysX Collider component
+    collider_component = root.add_component("PhysX Collider")
+    assert root.has_component("PhysX Collider") and collider_component.is_enabled(), \
+        "Failed to add/activate PhysX Collider component"
+    # Set the Collider's Shape Configuration field to PhysicsAsset, and assign the specified PhysX Mesh asset
+    collider_component.set_component_property_value("Shape Configuration|Shape", 7)
+    assert collider_component.get_component_property_value("Shape Configuration|Shape") == 7, \
+        "Failed to set Collider Shape to PhysicsAsset"
+    collider_component.set_component_property_value("Shape Configuration|Asset|PhysX Mesh", physx_mesh_id)
+    assert collider_component.get_component_property_value("Shape Configuration|Asset|PhysX Mesh") == physx_mesh_id, \
+        "Failed to assign PhysX Mesh asset"
+    # Create and return the temporary/in-memory prefab
+    temp_prefab = Prefab.create_prefab([root], prefab_filename)
+    return temp_prefab
 
 
 def create_surface_entity(name, center_point, box_size_x, box_size_y, box_size_z):
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
index b2001e6825..27af63ddbc 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
@@ -27,15 +27,15 @@ TEST_DIRECTORY = os.path.dirname(__file__)
 class TestAutomation(TestAutomationBase):
     def test_Pane_HappyPath_OpenCloseSuccessfully(self, request, workspace, editor, launcher_platform):
         from . import Pane_HappyPath_OpenCloseSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Pane_HappyPath_DocksProperly(self, request, workspace, editor, launcher_platform):
         from . import Pane_HappyPath_DocksProperly as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Pane_HappyPath_ResizesProperly(self, request, workspace, editor, launcher_platform):
         from . import Pane_HappyPath_ResizesProperly as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -45,7 +45,7 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptCanvas_TwoComponents_InteractSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -55,15 +55,15 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptCanvas_ChangingAssets_ComponentStable as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Graph_HappyPath_ZoomInZoomOut(self, request, workspace, editor, launcher_platform):
         from . import Graph_HappyPath_ZoomInZoomOut as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_NodePalette_HappyPath_CanSelectNode(self, request, workspace, editor, launcher_platform):
         from . import NodePalette_HappyPath_CanSelectNode as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -73,11 +73,11 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_NodePalette_HappyPath_ClearSelection(self, request, workspace, editor, launcher_platform, project):
         from . import NodePalette_HappyPath_ClearSelection as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -87,7 +87,7 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptCanvas_TwoEntities_UseSimultaneously as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ScriptEvent_HappyPath_CreatedWithoutError(self, request, workspace, editor, launcher_platform, project):
         def teardown():
@@ -99,19 +99,19 @@ class TestAutomation(TestAutomationBase):
             [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
         )
         from . import ScriptEvent_HappyPath_CreatedWithoutError as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ScriptCanvasTools_Toggle_OpenCloseSuccess(self, request, workspace, editor, launcher_platform):
         from . import ScriptCanvasTools_Toggle_OpenCloseSuccess as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_NodeInspector_HappyPath_VariableRenames(self, request, workspace, editor, launcher_platform, project):
         from . import NodeInspector_HappyPath_VariableRenames as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Debugger_HappyPath_TargetMultipleGraphs(self, request, workspace, editor, launcher_platform, project):
         from . import Debugger_HappyPath_TargetMultipleGraphs as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
     def test_Debugger_HappyPath_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level):
@@ -120,16 +120,16 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import Debugger_HappyPath_TargetMultipleEntities as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     def test_EditMenu_Default_UndoRedo(self, request, workspace, editor, launcher_platform, project):
         from . import EditMenu_Default_UndoRedo as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Pane_Undocked_ClosesSuccessfully(self, request, workspace, editor, launcher_platform):
         from . import Pane_Undocked_ClosesSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
     def test_Entity_HappyPath_AddScriptCanvasComponent(self, request, workspace, editor, launcher_platform, project, level):
@@ -138,11 +138,11 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import Entity_HappyPath_AddScriptCanvasComponent as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Pane_Default_RetainOnSCRestart(self, request, workspace, editor, launcher_platform):
         from . import Pane_Default_RetainOnSCRestart as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -152,7 +152,7 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptEvents_HappyPath_SendReceiveAcrossMultiple as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -162,7 +162,7 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptEvents_Default_SendReceiveSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
@@ -172,24 +172,24 @@ class TestAutomation(TestAutomationBase):
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         from . import ScriptEvents_ReturnSetType_Successfully as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_NodeCategory_ExpandOnClick(self, request, workspace, editor, launcher_platform):
         from . import NodeCategory_ExpandOnClick as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_NodePalette_SearchText_Deletion(self, request, workspace, editor, launcher_platform):
         from . import NodePalette_SearchText_Deletion as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
     def test_VariableManager_UnpinVariableType_Works(self, request, workspace, editor, launcher_platform):
         from . import VariableManager_UnpinVariableType_Works as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_Node_HappyPath_DuplicateNode(self, request, workspace, editor, launcher_platform):
         from . import Node_HappyPath_DuplicateNode as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
     def test_ScriptEvent_AddRemoveParameter_ActionsSuccessful(self, request, workspace, editor, launcher_platform):
         def teardown():
@@ -201,7 +201,7 @@ class TestAutomation(TestAutomationBase):
             [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
         )
         from . import ScriptEvent_AddRemoveParameter_ActionsSuccessful as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
 
 # NOTE: We had to use hydra_test_utils.py, as TestAutomationBase run_test method
 # fails because of pyside_utils import
@@ -220,7 +220,14 @@ class TestScriptCanvasTests(object):
             "File->Open action working as expected: True",
         ]
         hydra.launch_and_validate_results(
-            request, TEST_DIRECTORY, editor, "FileMenu_Default_NewAndOpen.py", expected_lines, auto_test_mode=False, timeout=60,
+            request, 
+            TEST_DIRECTORY, 
+            editor, 
+            "FileMenu_Default_NewAndOpen.py", 
+            expected_lines, 
+            auto_test_mode=False, 
+            timeout=60,
+            enable_prefab_system=False,
         )
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@@ -239,6 +246,7 @@ class TestScriptCanvasTests(object):
             expected_lines,
             auto_test_mode=False,
             timeout=60,
+            enable_prefab_system=False,
         )
 
     def test_GraphClose_Default_SavePrompt(self, request, editor, launcher_platform):
@@ -255,6 +263,7 @@ class TestScriptCanvasTests(object):
             expected_lines,
             auto_test_mode=False,
             timeout=60,
+            enable_prefab_system=False,
         )
 
     def test_VariableManager_Default_CreateDeleteVars(self, request, editor, launcher_platform):
@@ -269,6 +278,7 @@ class TestScriptCanvasTests(object):
             expected_lines,
             auto_test_mode=False,
             timeout=60,
+            enable_prefab_system=False,
         )
 
     @pytest.mark.parametrize(
@@ -304,6 +314,7 @@ class TestScriptCanvasTests(object):
             cfg_args=[config.get('cfg_args')],
             auto_test_mode=False,
             timeout=60,
+            enable_prefab_system=False,
         )
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@@ -332,6 +343,7 @@ class TestScriptCanvasTests(object):
             expected_lines,
             auto_test_mode=False,
             timeout=60,
+            enable_prefab_system=False,
         )
 
     @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@@ -359,5 +371,6 @@ class TestScriptCanvasTests(object):
             expected_lines,
             auto_test_mode=False,
             timeout=60,
+            enable_prefab_system=False,
         )
         
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
index 91b01d8d08..071ae2286c 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
@@ -23,4 +23,4 @@ class TestAutomation(TestAutomationBase):
 
     def test_Opening_Closing_Pane(self, request, workspace, editor, launcher_platform):
         from . import Opening_Closing_Pane as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py
index a3f6b8b09f..917ff17f82 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_SerializeContextTools_Works.py
@@ -13,7 +13,10 @@ import os
 import pytest
 import subprocess
 
+import ly_test_tools
 
+
+@pytest.mark.skipif(not ly_test_tools.WINDOWS, reason="Only succeeds on windows https://github.com/o3de/o3de/issues/5539")
 @pytest.mark.SUITE_smoke
 class TestCLIToolSerializeContextToolsWorks(object):
     def test_CLITool_SerializeContextTools_Works(self, build_directory):
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
index 6f654b9107..5caf7744c4 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
@@ -11,10 +11,13 @@ Test should run in both gpu and non gpu
 import pytest
 import os
 from automatedtesting_shared.base import TestAutomationBase
+
+import ly_test_tools
 import ly_test_tools.environment.file_system as file_system
 
 
 @pytest.mark.SUITE_smoke
+@pytest.mark.skipif(not ly_test_tools.WINDOWS, reason="Only succeeds on windows https://github.com/o3de/o3de/issues/5539")
 @pytest.mark.parametrize("launcher_platform", ["windows_editor"])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("level", ["temp_level"])
@@ -28,4 +31,4 @@ class TestAutomation(TestAutomationBase):
 
         from . import Editor_NewExistingLevels_Works as test_module
 
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
diff --git a/AutomatedTesting/Levels/Base/Base.prefab b/AutomatedTesting/Levels/Base/Base.prefab
index 98495663b7..7765fe488e 100644
--- a/AutomatedTesting/Levels/Base/Base.prefab
+++ b/AutomatedTesting/Levels/Base/Base.prefab
@@ -1,52 +1,61 @@
 {
     "ContainerEntity": {
-        "Id": "ContainerEntity",
-        "Name": "Base",
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
         "Components": {
-            "Component_[10182366347512475253]": {
-                "$type": "EditorPrefabComponent",
-                "Id": 10182366347512475253
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
             },
-            "Component_[12917798267488243668]": {
-                "$type": "EditorPendingCompositionComponent",
-                "Id": 12917798267488243668
-            },
-            "Component_[3261249813163778338]": {
+            "Component_[12039882709170782873]": {
                 "$type": "EditorOnlyEntityComponent",
-                "Id": 3261249813163778338
+                "Id": 12039882709170782873
             },
-            "Component_[3837204912784440039]": {
-                "$type": "EditorDisabledCompositionComponent",
-                "Id": 3837204912784440039
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
             },
-            "Component_[4272963378099646759]": {
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043,
+                "ChildEntityOrderEntryArray": [
+                    {
+                        "EntityId": ""
+                    },
+                    {
+                        "EntityId": "",
+                        "SortIndex": 1
+                    }
+                ]
+            },
+            "Component_[15230859088967841193]": {
                 "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                "Id": 4272963378099646759,
+                "Id": 15230859088967841193,
                 "Parent Entity": ""
             },
-            "Component_[4848458548047175816]": {
-                "$type": "EditorVisibilityComponent",
-                "Id": 4848458548047175816
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
             },
-            "Component_[5787060997243919943]": {
-                "$type": "EditorInspectorComponent",
-                "Id": 5787060997243919943
-            },
-            "Component_[7804170251266531779]": {
-                "$type": "EditorLockComponent",
-                "Id": 7804170251266531779
-            },
-            "Component_[7874177159288365422]": {
-                "$type": "EditorEntitySortComponent",
-                "Id": 7874177159288365422
-            },
-            "Component_[8018146290632383969]": {
+            "Component_[5688118765544765547]": {
                 "$type": "EditorEntityIconComponent",
-                "Id": 8018146290632383969
+                "Id": 5688118765544765547
             },
-            "Component_[8452360690590857075]": {
+            "Component_[6545738857812235305]": {
                 "$type": "SelectionComponent",
-                "Id": 8452360690590857075
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
             }
         }
     }
diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo
rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo
rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - copy.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - Copy.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - copy.fbx.assetinfo
rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - Copy.fbx.assetinfo
diff --git a/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo
rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
diff --git a/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
similarity index 100%
rename from AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo
rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_Sedan_r0-b.fbx.assetinfo
diff --git a/AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab b/AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab
new file mode 100644
index 0000000000..22504f168a
--- /dev/null
+++ b/AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab
@@ -0,0 +1,3401 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "macbeth_shaderballs",
+        "Components": {
+            "Component_[10182366347512475253]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 10182366347512475253
+            },
+            "Component_[12917798267488243668]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12917798267488243668
+            },
+            "Component_[3261249813163778338]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 3261249813163778338
+            },
+            "Component_[3837204912784440039]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 3837204912784440039
+            },
+            "Component_[4272963378099646759]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 4272963378099646759,
+                "Parent Entity": ""
+            },
+            "Component_[4848458548047175816]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 4848458548047175816
+            },
+            "Component_[5787060997243919943]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 5787060997243919943
+            },
+            "Component_[7804170251266531779]": {
+                "$type": "EditorLockComponent",
+                "Id": 7804170251266531779
+            },
+            "Component_[7874177159288365422]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 7874177159288365422
+            },
+            "Component_[8018146290632383969]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 8018146290632383969
+            },
+            "Component_[8452360690590857075]": {
+                "$type": "SelectionComponent",
+                "Id": 8452360690590857075
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[471076350497]": {
+            "Id": "Entity_[471076350497]",
+            "Name": "WorldOrigin",
+            "Components": {
+                "Component_[10118378636607282023]": {
+                    "$type": "AZ::Render::EditorImageBasedLightComponent",
+                    "Id": 10118378636607282023,
+                    "Controller": {
+                        "Configuration": {
+                            "diffuseImageAsset": {
+                                "assetId": {
+                                    "guid": "{10853039-DC8A-558A-B27E-4433A6386731}",
+                                    "subId": 3000
+                                },
+                                "assetHint": "lightingpresets/lowcontrast/blouberg_sunrise_1_4k_iblskyboxcm_ibldiffuse.exr.streamingimage"
+                            },
+                            "specularImageAsset": {
+                                "assetId": {
+                                    "guid": "{10853039-DC8A-558A-B27E-4433A6386731}",
+                                    "subId": 2000
+                                },
+                                "assetHint": "lightingpresets/lowcontrast/blouberg_sunrise_1_4k_iblskyboxcm_iblspecular.exr.streamingimage"
+                            },
+                            "exposure": 1.0
+                        }
+                    }
+                },
+                "Component_[10390989140659450689]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 10390989140659450689,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 6066687697346848609
+                        },
+                        {
+                            "ComponentId": 1538992203183232042,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 10118378636607282023,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[1122756123782465575]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 1122756123782465575
+                },
+                "Component_[1411541685315998773]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1411541685315998773
+                },
+                "Component_[1538992203183232042]": {
+                    "$type": "AZ::Render::EditorGridComponent",
+                    "Id": 1538992203183232042
+                },
+                "Component_[16871442125196328877]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 16871442125196328877,
+                    "ChildEntityOrderEntryArray": [
+                        {
+                            "EntityId": "Entity_[604220336673]"
+                        },
+                        {
+                            "EntityId": "Entity_[599925369377]",
+                            "SortIndex": 1
+                        },
+                        {
+                            "EntityId": "Entity_[475371317793]",
+                            "SortIndex": 2
+                        },
+                        {
+                            "EntityId": "Entity_[509731056161]",
+                            "SortIndex": 3
+                        },
+                        {
+                            "EntityId": "Entity_[505436088865]",
+                            "SortIndex": 4
+                        },
+                        {
+                            "EntityId": "Entity_[539795827233]",
+                            "SortIndex": 5
+                        },
+                        {
+                            "EntityId": "Entity_[569860598305]",
+                            "SortIndex": 6
+                        }
+                    ]
+                },
+                "Component_[18389136819207633744]": {
+                    "$type": "SelectionComponent",
+                    "Id": 18389136819207633744
+                },
+                "Component_[2967708543517171475]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2967708543517171475
+                },
+                "Component_[6066687697346848609]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6066687697346848609,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[7035058231756199033]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7035058231756199033
+                },
+                "Component_[7861798362721154905]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 7861798362721154905
+                },
+                "Component_[8535986786667781968]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 8535986786667781968
+                }
+            }
+        },
+        "Entity_[475371317793]": {
+            "Id": "Entity_[475371317793]",
+            "Name": "00_Illuminant",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{29C7358C-9899-56DF-8F99-F654C7138DB8}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/00_illuminant.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            -0.020035700872540474,
+                            10.880657196044922,
+                            1.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[479666285089]": {
+            "Id": "Entity_[479666285089]",
+            "Name": "09_moderate_red",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{FD3D09E1-9B20-5761-87A2-388ADD3C966A}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/09_moderate_red.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[505436088865]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[483961252385]": {
+            "Id": "Entity_[483961252385]",
+            "Name": "08_purplish_blue",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{0478869F-5E19-5A5C-AA22-0D31972E83B7}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/08_purplish_blue.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[505436088865]",
+                    "Transform Data": {
+                        "Translate": [
+                            -6.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[488256219681]": {
+            "Id": "Entity_[488256219681]",
+            "Name": "07_orange",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{3E414822-FF6A-5A79-BF1A-66F4C48C381D}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/07_orange.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[505436088865]",
+                    "Transform Data": {
+                        "Translate": [
+                            -10.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[492551186977]": {
+            "Id": "Entity_[492551186977]",
+            "Name": "10_purple",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{6A0A0CBE-FE95-5732-B2A9-442ABAC6B3AA}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/10_purple.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[505436088865]",
+                    "Transform Data": {
+                        "Translate": [
+                            1.8866175413131714,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[496846154273]": {
+            "Id": "Entity_[496846154273]",
+            "Name": "11_yellowish_green",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{8D382D9F-D56E-523E-8372-C372B002B81D}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/11_yellow_green.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[505436088865]",
+                    "Transform Data": {
+                        "Translate": [
+                            5.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[501141121569]": {
+            "Id": "Entity_[501141121569]",
+            "Name": "12_orange_yellow",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{7C8D9C96-8D79-5AA5-9A1D-DE68760127D7}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/12_orange_yellow.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[505436088865]",
+                    "Transform Data": {
+                        "Translate": [
+                            9.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[505436088865]": {
+            "Id": "Entity_[505436088865]",
+            "Name": "Row",
+            "Components": {
+                "Component_[10247332857034196288]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10247332857034196288
+                },
+                "Component_[1050259146293298025]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1050259146293298025
+                },
+                "Component_[10963468433108777551]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 10963468433108777551,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 5648156935684358836
+                        }
+                    ]
+                },
+                "Component_[11044618010943237536]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11044618010943237536
+                },
+                "Component_[11056805018150955063]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11056805018150955063,
+                    "ChildEntityOrderEntryArray": [
+                        {
+                            "EntityId": "Entity_[488256219681]"
+                        },
+                        {
+                            "EntityId": "Entity_[483961252385]",
+                            "SortIndex": 1
+                        },
+                        {
+                            "EntityId": "Entity_[479666285089]",
+                            "SortIndex": 2
+                        },
+                        {
+                            "EntityId": "Entity_[492551186977]",
+                            "SortIndex": 3
+                        },
+                        {
+                            "EntityId": "Entity_[496846154273]",
+                            "SortIndex": 4
+                        },
+                        {
+                            "EntityId": "Entity_[501141121569]",
+                            "SortIndex": 5
+                        }
+                    ]
+                },
+                "Component_[11466054095979053511]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 11466054095979053511
+                },
+                "Component_[1364058654406679998]": {
+                    "$type": "SelectionComponent",
+                    "Id": 1364058654406679998
+                },
+                "Component_[1550934027474222562]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 1550934027474222562
+                },
+                "Component_[15938036103959223730]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 15938036103959223730
+                },
+                "Component_[5648156935684358836]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 5648156935684358836,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            2.0,
+                            1.0
+                        ]
+                    }
+                }
+            }
+        },
+        "Entity_[509731056161]": {
+            "Id": "Entity_[509731056161]",
+            "Name": "Row",
+            "Components": {
+                "Component_[10247332857034196288]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10247332857034196288
+                },
+                "Component_[1050259146293298025]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1050259146293298025
+                },
+                "Component_[10963468433108777551]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 10963468433108777551,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 5648156935684358836
+                        }
+                    ]
+                },
+                "Component_[11044618010943237536]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11044618010943237536
+                },
+                "Component_[11056805018150955063]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11056805018150955063,
+                    "ChildEntityOrderEntryArray": [
+                        {
+                            "EntityId": "Entity_[522615958049]"
+                        },
+                        {
+                            "EntityId": "Entity_[518320990753]",
+                            "SortIndex": 1
+                        },
+                        {
+                            "EntityId": "Entity_[514026023457]",
+                            "SortIndex": 2
+                        },
+                        {
+                            "EntityId": "Entity_[526910925345]",
+                            "SortIndex": 3
+                        },
+                        {
+                            "EntityId": "Entity_[531205892641]",
+                            "SortIndex": 4
+                        },
+                        {
+                            "EntityId": "Entity_[535500859937]",
+                            "SortIndex": 5
+                        }
+                    ]
+                },
+                "Component_[11466054095979053511]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 11466054095979053511
+                },
+                "Component_[1364058654406679998]": {
+                    "$type": "SelectionComponent",
+                    "Id": 1364058654406679998
+                },
+                "Component_[1550934027474222562]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 1550934027474222562
+                },
+                "Component_[15938036103959223730]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 15938036103959223730
+                },
+                "Component_[5648156935684358836]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 5648156935684358836,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            6.0,
+                            1.0
+                        ]
+                    }
+                }
+            }
+        },
+        "Entity_[514026023457]": {
+            "Id": "Entity_[514026023457]",
+            "Name": "03_blue_sky",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{65DF9715-8D50-5852-BDDF-345BF9A36AAF}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/03_blue_sky.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[509731056161]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[518320990753]": {
+            "Id": "Entity_[518320990753]",
+            "Name": "02_light_skin",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{0B0603C9-E7C3-5166-98EC-F8B3A4D469FB}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/02_light_skin.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[509731056161]",
+                    "Transform Data": {
+                        "Translate": [
+                            -6.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[522615958049]": {
+            "Id": "Entity_[522615958049]",
+            "Name": "01_dark_skin",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{73B6CE55-0766-51FD-8D9C-92C60862D270}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/01_dark_skin.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[509731056161]",
+                    "Transform Data": {
+                        "Translate": [
+                            -10.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[526910925345]": {
+            "Id": "Entity_[526910925345]",
+            "Name": "04_foliage",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{C11C560D-F984-5836-928A-45CF96179862}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/04_foliage.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[509731056161]",
+                    "Transform Data": {
+                        "Translate": [
+                            1.8866175413131714,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[531205892641]": {
+            "Id": "Entity_[531205892641]",
+            "Name": "05_blue_flower",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{3326A6D9-FEA4-5CDE-AE4A-8BD28DF3A7CA}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/05_blue_flower.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[509731056161]",
+                    "Transform Data": {
+                        "Translate": [
+                            5.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[535500859937]": {
+            "Id": "Entity_[535500859937]",
+            "Name": "06_bluish_green",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{BD7A8B80-242E-50CC-900F-9001945C5A0C}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/06_bluish_green.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[509731056161]",
+                    "Transform Data": {
+                        "Translate": [
+                            9.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[539795827233]": {
+            "Id": "Entity_[539795827233]",
+            "Name": "Row",
+            "Components": {
+                "Component_[10247332857034196288]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10247332857034196288
+                },
+                "Component_[1050259146293298025]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1050259146293298025
+                },
+                "Component_[10963468433108777551]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 10963468433108777551,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 5648156935684358836
+                        }
+                    ]
+                },
+                "Component_[11044618010943237536]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11044618010943237536
+                },
+                "Component_[11056805018150955063]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11056805018150955063,
+                    "ChildEntityOrderEntryArray": [
+                        {
+                            "EntityId": "Entity_[552680729121]"
+                        },
+                        {
+                            "EntityId": "Entity_[548385761825]",
+                            "SortIndex": 1
+                        },
+                        {
+                            "EntityId": "Entity_[544090794529]",
+                            "SortIndex": 2
+                        },
+                        {
+                            "EntityId": "Entity_[556975696417]",
+                            "SortIndex": 3
+                        },
+                        {
+                            "EntityId": "Entity_[561270663713]",
+                            "SortIndex": 4
+                        },
+                        {
+                            "EntityId": "Entity_[565565631009]",
+                            "SortIndex": 5
+                        }
+                    ]
+                },
+                "Component_[11466054095979053511]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 11466054095979053511
+                },
+                "Component_[1364058654406679998]": {
+                    "$type": "SelectionComponent",
+                    "Id": 1364058654406679998
+                },
+                "Component_[1550934027474222562]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 1550934027474222562
+                },
+                "Component_[15938036103959223730]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 15938036103959223730
+                },
+                "Component_[5648156935684358836]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 5648156935684358836,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            -2.0,
+                            1.0
+                        ]
+                    }
+                }
+            }
+        },
+        "Entity_[544090794529]": {
+            "Id": "Entity_[544090794529]",
+            "Name": "15_red",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{9C47066E-BD8F-5C1B-B935-933296BBE312}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/15_red.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[539795827233]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[548385761825]": {
+            "Id": "Entity_[548385761825]",
+            "Name": "14_green",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{82346ED7-D369-5EF0-A7E0-70C1082EE073}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/14_green.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[539795827233]",
+                    "Transform Data": {
+                        "Translate": [
+                            -6.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[552680729121]": {
+            "Id": "Entity_[552680729121]",
+            "Name": "13_blue",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{B8972ADB-DBA9-5807-9742-2B14453FDD96}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/13_blue.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[539795827233]",
+                    "Transform Data": {
+                        "Translate": [
+                            -10.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[556975696417]": {
+            "Id": "Entity_[556975696417]",
+            "Name": "16_yellow",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{099BB2A1-F76E-5B77-BCFD-B0A6249F0EA3}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/16_yellow.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[539795827233]",
+                    "Transform Data": {
+                        "Translate": [
+                            1.8866175413131714,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[561270663713]": {
+            "Id": "Entity_[561270663713]",
+            "Name": "17_magenta",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{2A83451E-0FE6-508E-BAA2-6142AAA53C42}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/17_magenta.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[539795827233]",
+                    "Transform Data": {
+                        "Translate": [
+                            5.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[565565631009]": {
+            "Id": "Entity_[565565631009]",
+            "Name": "18_cyan",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{6949B983-05D6-50A4-9D43-A6CDAB2BF3F5}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/18_cyan.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[539795827233]",
+                    "Transform Data": {
+                        "Translate": [
+                            9.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[569860598305]": {
+            "Id": "Entity_[569860598305]",
+            "Name": "Row",
+            "Components": {
+                "Component_[10247332857034196288]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10247332857034196288
+                },
+                "Component_[1050259146293298025]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1050259146293298025
+                },
+                "Component_[10963468433108777551]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 10963468433108777551,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 5648156935684358836
+                        }
+                    ]
+                },
+                "Component_[11044618010943237536]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 11044618010943237536
+                },
+                "Component_[11056805018150955063]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11056805018150955063,
+                    "ChildEntityOrderEntryArray": [
+                        {
+                            "EntityId": "Entity_[582745500193]"
+                        },
+                        {
+                            "EntityId": "Entity_[578450532897]",
+                            "SortIndex": 1
+                        },
+                        {
+                            "EntityId": "Entity_[574155565601]",
+                            "SortIndex": 2
+                        },
+                        {
+                            "EntityId": "Entity_[587040467489]",
+                            "SortIndex": 3
+                        },
+                        {
+                            "EntityId": "Entity_[591335434785]",
+                            "SortIndex": 4
+                        },
+                        {
+                            "EntityId": "Entity_[595630402081]",
+                            "SortIndex": 5
+                        }
+                    ]
+                },
+                "Component_[11466054095979053511]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 11466054095979053511
+                },
+                "Component_[1364058654406679998]": {
+                    "$type": "SelectionComponent",
+                    "Id": 1364058654406679998
+                },
+                "Component_[1550934027474222562]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 1550934027474222562
+                },
+                "Component_[15938036103959223730]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 15938036103959223730
+                },
+                "Component_[5648156935684358836]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 5648156935684358836,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            -6.0,
+                            1.0
+                        ]
+                    }
+                }
+            }
+        },
+        "Entity_[574155565601]": {
+            "Id": "Entity_[574155565601]",
+            "Name": "21_neutral_6.5",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{ADAA8BF6-1580-5684-A7F5-4B0150117375}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/21_neutral_6-5_0-44d.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[569860598305]",
+                    "Transform Data": {
+                        "Translate": [
+                            -2.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[578450532897]": {
+            "Id": "Entity_[578450532897]",
+            "Name": "20_neutral_8",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{A9BAEC06-A3F6-53E9-9E3E-61E12048FC75}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/20_neutral_8-0_0-23d.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[569860598305]",
+                    "Transform Data": {
+                        "Translate": [
+                            -6.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[582745500193]": {
+            "Id": "Entity_[582745500193]",
+            "Name": "19_white_9.5",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{94E3052F-2B5A-5C28-912A-C0FDC00F5CD3}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/19_white_9-5_0-05d.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[569860598305]",
+                    "Transform Data": {
+                        "Translate": [
+                            -10.113382339477539,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[587040467489]": {
+            "Id": "Entity_[587040467489]",
+            "Name": "22_neutral_5",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{1E45E15B-8035-5775-B796-A77654CDB094}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/22_neutral_5-0_0-70d.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[569860598305]",
+                    "Transform Data": {
+                        "Translate": [
+                            1.8866175413131714,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[591335434785]": {
+            "Id": "Entity_[591335434785]",
+            "Name": "23_neutral_3.5",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{23C26041-7155-5FE2-8E12-FACFD52DA006}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/23_neutral_3-5_1-05d.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[569860598305]",
+                    "Transform Data": {
+                        "Translate": [
+                            5.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[595630402081]": {
+            "Id": "Entity_[595630402081]",
+            "Name": "24_black_2",
+            "Components": {
+                "Component_[12222961627447331506]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 12222961627447331506,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{1D83625A-4016-58F0-A94A-13B92B19F5B5}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/24_black_2-0_1-50d.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[12780007764330464223]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12780007764330464223
+                },
+                "Component_[12904863407657276829]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12904863407657276829,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 7205597372613518510
+                        },
+                        {
+                            "ComponentId": 8564054653851438099,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 12222961627447331506,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[13729618014821386240]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13729618014821386240
+                },
+                "Component_[14429836600052599894]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14429836600052599894
+                },
+                "Component_[14808014799413383215]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14808014799413383215
+                },
+                "Component_[17252932649882883756]": {
+                    "$type": "SelectionComponent",
+                    "Id": 17252932649882883756
+                },
+                "Component_[2229055145450914672]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2229055145450914672
+                },
+                "Component_[2249882080644631374]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 2249882080644631374
+                },
+                "Component_[7205597372613518510]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7205597372613518510,
+                    "Parent Entity": "Entity_[569860598305]",
+                    "Transform Data": {
+                        "Translate": [
+                            9.886617660522461,
+                            -9.999999974752427e-7,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            180.00001525878906
+                        ]
+                    }
+                },
+                "Component_[7918371639409185899]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 7918371639409185899
+                },
+                "Component_[8564054653851438099]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 8564054653851438099,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+                                    "subId": 268677693
+                                },
+                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                }
+            }
+        },
+        "Entity_[599925369377]": {
+            "Id": "Entity_[599925369377]",
+            "Name": "MacBeth_Chart",
+            "Components": {
+                "Component_[10911367092756441312]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 10911367092756441312
+                },
+                "Component_[11487615730470734577]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11487615730470734577
+                },
+                "Component_[1380862607750834390]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1380862607750834390
+                },
+                "Component_[17376808010180534107]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 17376808010180534107
+                },
+                "Component_[18051852481298910543]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 18051852481298910543
+                },
+                "Component_[2468310869499941539]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 2468310869499941539
+                },
+                "Component_[3104847651593575388]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 3104847651593575388,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            1.0
+                        ],
+                        "Scale": [
+                            24.748918533325195,
+                            24.748918533325195,
+                            24.748918533325195
+                        ],
+                        "UniformScale": 24.748918533325195
+                    }
+                },
+                "Component_[4039743767801786212]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 4039743767801786212,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{767B3209-EDF7-503A-BF3D-6A69DAABC966}",
+                                    "subId": 285003870
+                                },
+                                "assetHint": "materialeditor/viewportmodels/plane_1x1.azmodel"
+                            },
+                            "LodOverride": 255
+                        }
+                    }
+                },
+                "Component_[4350883917310195183]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 4350883917310195183,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": {
+                                "{}": {
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{6BCA78B0-98F0-5843-A0D9-2FD6AB5B8B95}"
+                                        },
+                                        "assetHint": "materials/presets/macbeth/macbeth_lab_16bit_2014_srgb.azmaterial"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "materialSlotsByLodEnabled": true
+                },
+                "Component_[5382697958657080154]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 5382697958657080154,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 3104847651593575388
+                        },
+                        {
+                            "ComponentId": 4039743767801786212,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 4350883917310195183,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[5944774294236360498]": {
+                    "$type": "SelectionComponent",
+                    "Id": 5944774294236360498
+                },
+                "Component_[7918181081161287223]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 7918181081161287223
+                }
+            }
+        },
+        "Entity_[604220336673]": {
+            "Id": "Entity_[604220336673]",
+            "Name": "Camera1",
+            "Components": {
+                "Component_[10875630838724467144]": {
+                    "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+                    "Id": 10875630838724467144,
+                    "Controller": {
+                        "Configuration": {
+                            "EditorEntityId": 604220336673
+                        }
+                    }
+                },
+                "Component_[11853636775353879324]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11853636775353879324,
+                    "Parent Entity": "Entity_[471076350497]",
+                    "Transform Data": {
+                        "Translate": [
+                            -0.088332898914814,
+                            -14.735246658325195,
+                            12.247514724731445
+                        ],
+                        "Rotate": [
+                            -34.60991287231445,
+                            0.19504709541797638,
+                            -0.282683789730072
+                        ]
+                    }
+                },
+                "Component_[14115131108729471373]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14115131108729471373
+                },
+                "Component_[14490537709933782275]": {
+                    "$type": "SelectionComponent",
+                    "Id": 14490537709933782275
+                },
+                "Component_[15389860813854215395]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 15389860813854215395
+                },
+                "Component_[16956210187152487952]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16956210187152487952
+                },
+                "Component_[3120168445836073859]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 3120168445836073859,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 11853636775353879324
+                        },
+                        {
+                            "ComponentId": 6418726603140010485,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 6573470892650938647,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 10875630838724467144,
+                            "SortIndex": 3
+                        },
+                        {
+                            "ComponentId": 9127356411199949930,
+                            "SortIndex": 4
+                        }
+                    ]
+                },
+                "Component_[397791896240265054]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 397791896240265054
+                },
+                "Component_[6418726603140010485]": {
+                    "$type": "AZ::Render::EditorExposureControlComponent",
+                    "Id": 6418726603140010485,
+                    "Controller": {
+                        "Configuration": {
+                            "ExposureControlType": 1,
+                            "EyeAdaptationExposureMin": -10.0,
+                            "EyeAdaptationExposureMax": 10.0
+                        }
+                    }
+                },
+                "Component_[6572845495569063152]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 6572845495569063152
+                },
+                "Component_[6573470892650938647]": {
+                    "$type": "AZ::Render::EditorPostFxLayerComponent",
+                    "Id": 6573470892650938647
+                },
+                "Component_[7175586201406734874]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7175586201406734874
+                },
+                "Component_[7393764569438584638]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7393764569438584638
+                },
+                "Component_[9127356411199949930]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 9127356411199949930,
+                    "m_template": {
+                        "$type": "FlyCameraInputComponent"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/AutomatedTesting/Levels/macbeth_shaderballs/tags.txt b/AutomatedTesting/Levels/macbeth_shaderballs/tags.txt
new file mode 100644
index 0000000000..0d6c1880e7
--- /dev/null
+++ b/AutomatedTesting/Levels/macbeth_shaderballs/tags.txt
@@ -0,0 +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
diff --git a/AutomatedTesting/Objects/sphere_5lods.fbx b/AutomatedTesting/Objects/sphere_5lods.fbx
new file mode 100644
index 0000000000..965738c933
--- /dev/null
+++ b/AutomatedTesting/Objects/sphere_5lods.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e169277bca473325281d5fe043cffc9196bd3ef46f6bffbea6e0b5e3b7194a1
+size 62700
diff --git a/AutomatedTesting/Objects/sphere_5lods.fbx.assetinfo b/AutomatedTesting/Objects/sphere_5lods.fbx.assetinfo
new file mode 100644
index 0000000000..d46cbf322a
--- /dev/null
+++ b/AutomatedTesting/Objects/sphere_5lods.fbx.assetinfo
@@ -0,0 +1,8 @@
+{
+    "values": [
+        {
+            "$type": "ScriptProcessorRule",
+            "scriptFilename": "Editor/Scripts/auto_lod.py"
+        }
+    ]
+}
diff --git a/AutomatedTesting/Registry/editorpreferences.setreg b/AutomatedTesting/Registry/editorpreferences.setreg
index b338d6acad..e76e04f9ba 100644
--- a/AutomatedTesting/Registry/editorpreferences.setreg
+++ b/AutomatedTesting/Registry/editorpreferences.setreg
@@ -1,7 +1,7 @@
 {
     "Amazon": {
         "Preferences": {
-            "EnablePrefabSystem": false
+            "EnablePrefabSystem": true
         }
     }
 }
\ No newline at end of file
diff --git a/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt b/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt
index d3975ced7c..8084defe84 100644
--- a/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt
+++ b/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt
@@ -2,24 +2,24 @@ These tests are mostly done with files that have a different extension between s
 The source scan is done first, and will catch files in the source path.
 Product path searching is resolved using "endsWith" logic.
 textures/_dev_purple.tif.streamingimage
-Back slashes, and project name in the path
-pc/textures/_dev_stucco.tif.streamingimage
+Back slashes
+textures\_dev_stucco.tif.streamingimage
 Double back slashes
 textures\\_dev_tan.tif.streamingimage
 Casing doesn't match
 TEXTURES/_DEV_WHITE.tif.streamingimage
 Some files have multiple extensions, this verifies that won't trip up the scanner.
 textures/_dev_yellow_light.tif.1002.imagemipchain
-Path inline textures/milestone2/ama_grey_02.tif.streamingimage test
+Path inline textures/_dev_woodland.tif.1002.imagemipchain test
 Path after=textures/_dev_woodland.tif.streamingimage equal sign
 
 Multiple paths on one line
-Multiple materials/am_grass1.mtl paths materials/am_rockground.mtl on one line
-Path before a UUID
-Path materials/floor_tile.mtl before B92667DC-9F5B-5D72-A29D-99219DD9B691 a UUID
-Path before an asset ID
-Path ui/milestone2menu.uicanvas before an 2ef92b8D044E5C278E2BB1AC0374A4E7:1002 asset ID
-Path after a UUID
-Path after CEAA362B4E505BCEB827CB92EF40A50E a project.json UUID
-Path after an asset ID
-Path after {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] an libs/particles/milestone2particles.xml asset ID
+Multiple textures/_dev_yellow_light.tif.streamingimage paths textures/_dev_yellow_med.tif.1002.imagemipchain on one line
+Path before a UUID for SelfReferenceUUID text file
+Path textures/lights/flare01.tif.streamingimage before 33BCEE02-F322-5688-ABEE-534F6058593F a UUID
+Path before an asset ID for _dev_red image
+Path textures/test_texture_sequence/test_texture_sequence000.png.streamingimage before an 2ef92b8D044E5C278E2BB1AC0374A4E7:1002 asset ID
+Path after a UUID for SelfReferenceAssetID text file
+Path after 785A05D2-483E-5B43-A2B9-92ACDAE6E938 a textures/test_texture_sequence/test_texture_sequence001.png.streamingimage UUID
+Path after an asset ID for _dev_purple image file
+Path after {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] an textures/_dev_purple_glass.tif.1002.imagemipchain asset ID
diff --git a/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt b/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt
index a5ae046b11..df3bcc896e 100644
--- a/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt
+++ b/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt
@@ -3,6 +3,6 @@ TestAssets/RelativeProductPathsNotDependencies.txt
 Back slashes
 TestAssets\WildcardScanTest1.txt
 Casing doesn't match
-libs/particles/milestone2PARTICLES.XML
-Path inline project.json test
+TESTASSETS/ReportONEmISSINGdEPENDENCY.tXT
+Path inline TestAssets/InvalidAssetIdNoReport.txt test
 Path after=textures/_dev_Purple.tif equal sign
diff --git a/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt b/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt
index 4cda459232..0b9df7c99d 100644
--- a/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt
+++ b/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt
@@ -1,5 +1,7 @@
+File extensions are separated from file names, so the missing dependency scanner doesn't find when scanning, and only finds the asset IDs in this file.
+
  /textures /_dev_Purple . tif, the product ID is for one of the mips.
 {A2482826-053D-5634-A27B-084B1326AAE5}:[1002]
 _dev_Red . tif, another mip, different formatting.
-2ef92b8D044E5C278E2BB1AC0374A4E7:1003
+2ef92b8D044E5C278E2BB1AC0374A4E7:1000
 _dev_White.tif, {D83B36F1-61A6-5001-B191-4D0CE282E236}-1002 asset ID inline.
diff --git a/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt b/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt
index 436d6fb628..91c518ef2f 100644
--- a/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt
+++ b/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt
@@ -1,18 +1,19 @@
 Paths are broken up to avoid having them show up as relative path results.
+All references are to other text files in this folder, extensions are omitted to make sure only UUID scanning finds these references.
 
-This is the UUID for Materials / Default / AM_UV_v1_1K_source . png
-C67BEA9F-09FF-59AA-A7F0-A52B8F987508
-This is the UUID for libs / particles / milestone2particles . xml. This tests UUIDs without separators.
-6BDE282B49C957F7B0714B26579BCA9A
-This is the UUID for SelfReferenceUUID.txt. This tests UUIDs with mixed casing.
+This is the UUID for InvalidAssetIdNoReport
+E68A85B0-131D-5A82-B2D5-BC58EE4062AE
+This is the UUID for InvalidRelativePathsNoReport. This tests UUIDs without separators.
+B3EF12DD306C520EB0A8A6B0D031A195
+This is the UUID for SelfReferenceUUID. This tests UUIDs with mixed casing.
 33bcee02F3225688ABEE534F6058593F
-This is a UUID mid-line B076CDDC-14DF-50F4-A5E9-7518ABB3E851, for project . json
+This is a UUID mid-line DD587FBE-16C8-5B98-AE3C-A9F8750B2692, for SelfReferencePath
 
-Two UUIDs on the same line
-Two UUIDs 345E5C660D6254FF8D0F7C8EE66A2249 mixed on A26C73D1837E5AE59E68F916FA7C3699 the same line
+InvalidUUIDNoReport and MaxIteration31Deep
+Two UUIDs 837412DF-D05F-576D-81AA-ACF360463749 mixed on 3F642A0FDC825696A70A1DA5709744DF the same line
 
 Test UUIDs and Asset IDs mixed on the same line. Relative paths are handled in the relative path tests.
-UUID: slices / MuzzleFlash . slice, AssetID: TestsAssets / WildcardScanTest1 . txt
-This 747D31D71E62553592226173C49CF97E uuid is on the line with 1CB10C43F3245B93A294C602ADEF95F9:[0] a valid asset ID
-UUID: Objects / Lumbertank_turret . cgf, AssetID: TestsAssets / WildcardScanTest2 . txt
-This D92C4661C8985E19BD3597CB2318CFA6:[0] uuid is on the line with 37108522F50459499CD6C8D47A960CF1 a valid asset ID
+OnlyMatchesCorrectLengthUUIDs and WildcardScanTest1
+This 2545AD8B-1B9B-5F93-859D-D8DC1DC2B480 uuid is on the line with 1CB10C43F3245B93A294C602ADEF95F9:[0] a valid asset ID
+RelativeProductPathsNotDependencies and WildcardScanTest2
+This B772953CA08A5D209491530E87D11504:[0] uuid is on the line with D92C4661C8985E19BD3597CB2318CFA6 a valid asset ID
diff --git a/AutomatedTesting/cmake/CompilerSettings.cmake b/AutomatedTesting/cmake/CompilerSettings.cmake
new file mode 100644
index 0000000000..60bda1d45b
--- /dev/null
+++ b/AutomatedTesting/cmake/CompilerSettings.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+# File to tweak compiler settings before compiler detection happens (before project() is called)
+# We dont have PAL enabled at this point, so we can only use pure-CMake variables
+if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+    include(cmake/Platform/Linux/CompilerSettings_linux.cmake)
+endif()
diff --git a/AutomatedTesting/EngineFinder.cmake b/AutomatedTesting/cmake/EngineFinder.cmake
similarity index 63%
rename from AutomatedTesting/EngineFinder.cmake
rename to AutomatedTesting/cmake/EngineFinder.cmake
index 0a34a43b77..15b96eb8a9 100644
--- a/AutomatedTesting/EngineFinder.cmake
+++ b/AutomatedTesting/cmake/EngineFinder.cmake
@@ -1,3 +1,4 @@
+# {BEGIN_LICENSE}
 #
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -5,18 +6,34 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 #
+# {END_LICENSE}
 # This file is copied during engine registration. Edits to this file will be lost next
 # time a registration happens.
 
 include_guard()
 
 # Read the engine name from the project_json file
-file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json)
-set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json)
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/project.json project_json)
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/project.json)
 
 string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine)
 if(json_error)
-    message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}")
+    message(FATAL_ERROR "Unable to read key 'engine' from 'project.json'\nError: ${json_error}")
+endif()
+
+if(CMAKE_MODULE_PATH)
+    foreach(module_path ${CMAKE_MODULE_PATH})
+        if(EXISTS ${module_path}/Findo3de.cmake)
+            file(READ ${module_path}/../engine.json engine_json)
+            string(JSON engine_name ERROR_VARIABLE json_error GET ${engine_json} engine_name)
+            if(json_error)
+                message(FATAL_ERROR "Unable to read key 'engine_name' from 'engine.json'\nError: ${json_error}")
+            endif()
+            if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name)
+                return() # Engine being forced through CMAKE_MODULE_PATH
+            endif()
+        endif()
+    endforeach()
 endif()
 
 if(DEFINED ENV{USERPROFILE} AND EXISTS $ENV{USERPROFILE})
@@ -25,6 +42,11 @@ else()
     set(manifest_path $ENV{HOME}/.o3de/o3de_manifest.json) # Unix
 endif()
 
+set(registration_error [=[
+Engine registration is required before configuring a project.
+Run 'scripts/o3de register --this-engine' from the engine root.
+]=])
+
 # Read the ~/.o3de/o3de_manifest.json file and look through the 'engines_path' object.
 # Find a key that matches LY_ENGINE_NAME_TO_USE and use that as the engine path.
 if(EXISTS ${manifest_path})
@@ -33,36 +55,38 @@ if(EXISTS ${manifest_path})
 
     string(JSON engines_path_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines_path)
     if(json_error)
-        message(FATAL_ERROR "Unable to read key 'engines_path' from '${manifest_path}', error: ${json_error}")
+        message(FATAL_ERROR "Unable to read key 'engines_path' from '${manifest_path}'\nError: ${json_error}\n${registration_error}")
     endif()
 
     string(JSON engines_path_type ERROR_VARIABLE json_error TYPE ${manifest_json} engines_path)
     if(json_error OR NOT ${engines_path_type} STREQUAL "OBJECT")
-        message(FATAL_ERROR "Type of 'engines_path' in '${manifest_path}' is not a JSON Object, error: ${json_error}")
+        message(FATAL_ERROR "Type of 'engines_path' in '${manifest_path}' is not a JSON Object\nError: ${json_error}")
     endif()
 
     math(EXPR engines_path_count "${engines_path_count}-1")
     foreach(engine_path_index RANGE ${engines_path_count})
         string(JSON engine_name ERROR_VARIABLE json_error MEMBER ${manifest_json} engines_path ${engine_path_index})
         if(json_error)
-            message(FATAL_ERROR "Unable to read 'engines_path/${engine_path_index}' from '${manifest_path}', error: ${json_error}")
+            message(FATAL_ERROR "Unable to read 'engines_path/${engine_path_index}' from '${manifest_path}'\nError: ${json_error}")
         endif()
 
         if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name)
             string(JSON engine_path ERROR_VARIABLE json_error GET ${manifest_json} engines_path ${engine_name})
             if(json_error)
-                message(FATAL_ERROR "Unable to read value from 'engines_path/${engine_name}', error: ${json_error}")
+                message(FATAL_ERROR "Unable to read value from 'engines_path/${engine_name}'\nError: ${json_error}")
             endif()
 
             if(engine_path)
                 list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake")
-                break()
+                return()
             endif()
         endif()
     endforeach()
+    
+    message(FATAL_ERROR "The project.json uses engine name '${LY_ENGINE_NAME_TO_USE}' but no engine with that name has been registered.\n${registration_error}")
 else()
     # If the user is passing CMAKE_MODULE_PATH we assume thats where we will find the engine
     if(NOT CMAKE_MODULE_PATH)
-        message(FATAL_ERROR "Engine registration is required before configuring a project.  Please register an engine by running 'scripts/o3de register --this-engine'")
+        message(FATAL_ERROR "O3DE Manifest file not found.\n${registration_error}")
     endif()
 endif()
diff --git a/Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake b/AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake
similarity index 100%
rename from Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake
rename to AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake
diff --git a/Code/Editor/2DViewport.cpp b/Code/Editor/2DViewport.cpp
index ed810aea29..4d0609907f 100644
--- a/Code/Editor/2DViewport.cpp
+++ b/Code/Editor/2DViewport.cpp
@@ -234,7 +234,7 @@ void Q2DViewport::UpdateContent(int flags)
 }
 
 //////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+void Q2DViewport::OnRButtonDown([[maybe_unused]] Qt::KeyboardModifiers modifiers, const QPoint& point)
 {
     if (GetIEditor()->IsInGameMode())
     {
@@ -246,9 +246,6 @@ void Q2DViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& p
         setFocus();
     }
 
-    // Check Edit Tool.
-    MouseCallback(eMouseRDown, point, modifiers);
-
     SetCurrentCursor(STD_CURSOR_MOVE, QString());
 
     // Save the mouse down position
@@ -273,17 +270,8 @@ void Q2DViewport::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers,
 }
 
 //////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
+void Q2DViewport::OnMButtonDown([[maybe_unused]] Qt::KeyboardModifiers modifiers, const QPoint& point)
 {
-    ////////////////////////////////////////////////////////////////////////
-    // User pressed the middle mouse button
-    ////////////////////////////////////////////////////////////////////////
-    // Check Edit Tool.
-    if (MouseCallback(eMouseMDown, point, modifiers))
-    {
-        return;
-    }
-
     // Save the mouse down position
     m_RMouseDownPos = point;
 
@@ -300,14 +288,8 @@ void Q2DViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& p
 }
 
 //////////////////////////////////////////////////////////////////////////
-void Q2DViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
+void Q2DViewport::OnMButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
 {
-    // Check Edit Tool.
-    if (MouseCallback(eMouseMUp, point, modifiers))
-    {
-        return;
-    }
-
     SetViewMode(NothingMode);
 
     ReleaseMouse();
@@ -547,13 +529,6 @@ QPoint Q2DViewport::WorldToView(const Vec3& wp) const
     QPoint p = QPoint(static_cast<int>(sp.x), static_cast<int>(sp.y));
     return p;
 }
-//////////////////////////////////////////////////////////////////////////
-QPoint Q2DViewport::WorldToViewParticleEditor(const Vec3& wp, [[maybe_unused]] int width, [[maybe_unused]] int height) const //Eric@conffx implement for the children class of IDisplayViewport
-{
-    Vec3 sp = m_screenTM.TransformPoint(wp);
-    QPoint p = QPoint(static_cast<int>(sp.x), static_cast<int>(sp.y));
-    return p;
-}
 
 //////////////////////////////////////////////////////////////////////////
 Vec3    Q2DViewport::ViewToWorld(const QPoint& vp, [[maybe_unused]] bool* collideWithTerrain, [[maybe_unused]] bool onlyTerrain, [[maybe_unused]] bool bSkipVegetation, [[maybe_unused]] bool bTestRenderMesh, [[maybe_unused]] bool* collideWithObject) const
diff --git a/Code/Editor/2DViewport.h b/Code/Editor/2DViewport.h
index 007c1a47d3..e89f4aed34 100644
--- a/Code/Editor/2DViewport.h
+++ b/Code/Editor/2DViewport.h
@@ -50,8 +50,6 @@ public:
     //! Map world space position to viewport position.
     QPoint     WorldToView(const Vec3& wp) const override;
 
-    QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const override; //Eric@conffx
-
     //! Map viewport position to world space position.
     Vec3        ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
     //! Map viewport position to world space ray from camera.
@@ -64,7 +62,6 @@ public:
 
     // ovverided from CViewport.
     float GetScreenScaleFactor(const Vec3& worldPoint) const override;
-    float GetScreenScaleFactor([[maybe_unused]] const CCamera& camera, [[maybe_unused]] const Vec3& object_position) override { return 1; } //Eric@conffx
 
     // Overrided from CViewport.
     void OnDragSelectRectangle(const QRect &rect, bool bNormalizeRect = false) override;
diff --git a/Code/Editor/AboutDialog.ui b/Code/Editor/AboutDialog.ui
index a6c5bb5d52..09a7c18841 100644
--- a/Code/Editor/AboutDialog.ui
+++ b/Code/Editor/AboutDialog.ui
@@ -125,7 +125,7 @@
             </size>
            </property>
            <property name="text">
-            <string>General Availability</string>
+            <string>development</string>
            </property>
            <property name="textFormat">
             <enum>Qt::AutoText</enum>
diff --git a/Code/Editor/ActionManager.cpp b/Code/Editor/ActionManager.cpp
index ff74a2c208..4cc64a532e 100644
--- a/Code/Editor/ActionManager.cpp
+++ b/Code/Editor/ActionManager.cpp
@@ -152,15 +152,6 @@ ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetMenu(DynamicMenu*
     return *this;
 }
 
-ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetApplyHoverEffect()
-{
-    // Our standard toolbar icons, when hovered on, get a white color effect.
-    // But for this to work we need .pngs that look good with this effect, so this only works with the standard toolbars
-    // and looks very ugly for other toolbars, including toolbars loaded from XML (which just show a white rectangle)
-    m_action->setProperty("IconHasHoverEffect", true);
-    return *this;
-}
-
 ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetReserved()
 {
     m_action->setProperty("Reserved", true);
diff --git a/Code/Editor/ActionManager.h b/Code/Editor/ActionManager.h
index 8879bdc1fb..58504f860c 100644
--- a/Code/Editor/ActionManager.h
+++ b/Code/Editor/ActionManager.h
@@ -151,7 +151,6 @@ public:
         }
 
         ActionWrapper& SetMenu(DynamicMenu* menu);
-        ActionWrapper& SetApplyHoverEffect();
 
         operator QAction*() const {
             return m_action;
diff --git a/Code/Editor/Animation/AnimationBipedBoneNames.cpp b/Code/Editor/Animation/AnimationBipedBoneNames.cpp
index d9f1b845ca..72502fe61d 100644
--- a/Code/Editor/Animation/AnimationBipedBoneNames.cpp
+++ b/Code/Editor/Animation/AnimationBipedBoneNames.cpp
@@ -10,24 +10,21 @@
 
 #include "AnimationBipedBoneNames.h"
 
-namespace EditorAnimationBones
+namespace EditorAnimationBones::Biped
 {
-    namespace Biped
-    {
-        const char* Pelvis = "Bip01 Pelvis";
-        const char* Head = "Bip01 Head";
-        const char* Weapon = "weapon_bone";
+    const char* Pelvis = "Bip01 Pelvis";
+    const char* Head = "Bip01 Head";
+    const char* Weapon = "weapon_bone";
 
-        const char* LeftEye = "eye_bone_left";
-        const char* RightEye = "eye_bone_right";
+    const char* LeftEye = "eye_bone_left";
+    const char* RightEye = "eye_bone_right";
 
-        const char* Spine[5] = { "Bip01 Spine", "Bip01 Spine1", "Bip01 Spine2", "Bip01 Spine3", "Bip01 Spine4" };
-        const char* Neck[2] = { "Bip01 Neck", "Bip01 Neck1" };
+    const char* Spine[5] = { "Bip01 Spine", "Bip01 Spine1", "Bip01 Spine2", "Bip01 Spine3", "Bip01 Spine4" };
+    const char* Neck[2] = { "Bip01 Neck", "Bip01 Neck1" };
 
-        const char* LeftHeel = "Bip01 L Heel";
-        const char* LeftToe[2] = { "Bip01 L Toe0", "Bip01 L Toe1" };
+    const char* LeftHeel = "Bip01 L Heel";
+    const char* LeftToe[2] = { "Bip01 L Toe0", "Bip01 L Toe1" };
 
-        const char* RightHeel = "Bip01 R Heel";
-        const char* RightToe[2] = { "Bip01 R Toe0", "Bip01 R Toe1" };
-    }
-}
+    const char* RightHeel = "Bip01 R Heel";
+    const char* RightToe[2] = { "Bip01 R Toe0", "Bip01 R Toe1" };
+} // namespace EditorAnimationBones::Biped
diff --git a/Code/Editor/AnimationContext.cpp b/Code/Editor/AnimationContext.cpp
index fce1150878..51dd8deefc 100644
--- a/Code/Editor/AnimationContext.cpp
+++ b/Code/Editor/AnimationContext.cpp
@@ -21,6 +21,8 @@
 #include "Include/IObjectManager.h"
 #include "Objects/EntityObject.h"
 
+#include <AzCore/Time/ITime.h>
+
 //////////////////////////////////////////////////////////////////////////
 // Movie Callback.
 //////////////////////////////////////////////////////////////////////////
@@ -499,25 +501,24 @@ void CAnimationContext::Update()
         return;
     }
 
-    ITimer* pTimer = GetIEditor()->GetSystem()->GetITimer();
+    const AZ::TimeUs frameDeltaTimeUs = AZ::GetSimulationTickDeltaTimeUs();
+    const float frameDeltaTime = AZ::TimeUsToSeconds(frameDeltaTimeUs);
 
     if (!m_bAutoRecording)
     {
         AnimateActiveSequence();
 
-        float dt = pTimer->GetFrameTime();
-        m_currTime += dt * m_fTimeScale;
+        m_currTime += frameDeltaTime * m_fTimeScale;
 
         if (!m_recording)
         {
-            GetIEditor()->GetMovieSystem()->PreUpdate(dt);
-            GetIEditor()->GetMovieSystem()->PostUpdate(dt);
+            GetIEditor()->GetMovieSystem()->PreUpdate(frameDeltaTime);
+            GetIEditor()->GetMovieSystem()->PostUpdate(frameDeltaTime);
         }
     }
     else
     {
-        float dt = pTimer->GetFrameTime();
-        m_fRecordingCurrTime += dt * m_fTimeScale;
+        m_fRecordingCurrTime += frameDeltaTime * m_fTimeScale;
         if (fabs(m_fRecordingCurrTime - m_currTime) > m_fRecordingTimeStep)
         {
             m_currTime += m_fRecordingTimeStep;
@@ -644,7 +645,9 @@ void CAnimationContext::OnPostRender()
     {
         SAnimContext ac;
         ac.dt = 0;
-        ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
+        const AZ::TimeUs frameDeltaTimeUs = AZ::GetSimulationTickDeltaTimeUs();
+        const float frameDeltaTime = AZ::TimeUsToSeconds(frameDeltaTimeUs);
+        ac.fps = 1.0f / frameDeltaTime;
         ac.time = m_currTime;
         ac.singleFrame = true;
         ac.forcePlay = true;
@@ -797,7 +800,9 @@ void CAnimationContext::AnimateActiveSequence()
 
     SAnimContext ac;
     ac.dt = 0;
-    ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
+    const AZ::TimeUs frameDeltaTimeUs = AZ::GetSimulationTickDeltaTimeUs();
+    const float frameDeltaTime = AZ::TimeUsToSeconds(frameDeltaTimeUs);
+    ac.fps = 1.0f / frameDeltaTime;
     ac.time = m_currTime;
     ac.singleFrame = true;
     ac.forcePlay = true;
diff --git a/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
index b721b8759e..baa287e47f 100644
--- a/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
+++ b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
@@ -140,7 +140,7 @@ bool AssetImporterManager::OnBrowseFiles()
     bool encounteredCrate = false;
     QStringList invalidFiles;
 
-    for (QString path : fileDialog.selectedFiles())
+    for (const QString& path : fileDialog.selectedFiles())
     {
         QString fileName = GetFileName(path);
         QFileInfo info(path);
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
index 1c2be16a3d..6fc10e379a 100644
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
@@ -199,41 +199,6 @@ namespace AzAssetBrowserRequestHandlerPrivate
             }
         }
     }
-
-    // Helper utility - determines if the thing being dragged is a FBX from the scene import pipeline
-    // This is important to differentiate.
-    // when someone drags a MTL file directly into the viewport, even from a FBX, we want to spawn it as a decal
-    // but when someone drags a FBX that contains MTL files, we want only to spawn the meshes.
-    // so we have to specifically differentiate here between the mimeData type that contains the source as the root
-    // (dragging the fbx file itself)
-    // and one which contains the actual product at its root.
-
-    bool IsDragOfFBX(const QMimeData* mimeData)
-    {
-        AZStd::vector<AssetBrowserEntry*> entries;
-        if (!AssetBrowserEntry::FromMimeData(mimeData, entries))
-        {
-            // if mimedata does not even contain entries, no point in proceeding.
-            return false;
-        }
-
-        for (auto entry : entries)
-        {
-            if (entry->GetEntryType() != AssetBrowserEntry::AssetEntryType::Source)
-            {
-                continue;
-            }
-            // this is a source file.  Is it the filetype we're looking for?
-            if (SourceAssetBrowserEntry* source = azrtti_cast<SourceAssetBrowserEntry*>(entry))
-            {
-                if (AzFramework::StringFunc::Equal(source->GetExtension().c_str(), ".fbx", false))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
 }
 
 AzAssetBrowserRequestHandler::AzAssetBrowserRequestHandler()
diff --git a/Code/Editor/BaseLibrary.cpp b/Code/Editor/BaseLibrary.cpp
index 9f26630c2c..15742bd254 100644
--- a/Code/Editor/BaseLibrary.cpp
+++ b/Code/Editor/BaseLibrary.cpp
@@ -14,66 +14,6 @@
 #include "Include/IBaseLibraryManager.h"
 #include <Util/PathUtil.h>
 #include <IFileUtil.h>
-#include "Undo/IUndoObject.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Undo functionality for libraries.
-//////////////////////////////////////////////////////////////////////////
-
-class CUndoBaseLibrary
-    : public IUndoObject
-{
-public:
-    CUndoBaseLibrary(CBaseLibrary* pLib, const QString& description, const QString& selectedItem = QString())
-        : m_pLib(pLib)
-        , m_description(description)
-        , m_redo(nullptr)
-        , m_selectedItem(selectedItem)
-    {
-        assert(m_pLib);
-
-        m_undo = GetIEditor()->GetSystem()->CreateXmlNode("Undo");
-        m_pLib->Serialize(m_undo, false);
-    }
-
-    QString GetEditorObjectName() override
-    {
-        return m_selectedItem;
-    }
-
-protected:
-    int GetSize() override { return sizeof(CUndoBaseLibrary); }
-    QString GetDescription() override { return m_description; };
-
-    void Undo(bool bUndo) override
-    {
-        if (bUndo)
-        {
-            m_redo = GetIEditor()->GetSystem()->CreateXmlNode("Redo");
-            m_pLib->Serialize(m_redo, false);
-        }
-        m_pLib->Serialize(m_undo, true);
-        m_pLib->SetModified();
-        GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
-    }
-
-    void Redo() override
-    {
-        m_pLib->Serialize(m_redo, true);
-        m_pLib->SetModified();
-        GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
-    }
-
-private:
-    QString m_description;
-    QString m_selectedItem;
-    _smart_ptr<CBaseLibrary> m_pLib;
-    XmlNodeRef m_undo;
-    XmlNodeRef m_redo;
-};
-
-
-
 
 //////////////////////////////////////////////////////////////////////////
 // CBaseLibrary implementation.
diff --git a/Code/Editor/BaseLibraryItem.cpp b/Code/Editor/BaseLibraryItem.cpp
index b1fba91fad..e3788bc3e4 100644
--- a/Code/Editor/BaseLibraryItem.cpp
+++ b/Code/Editor/BaseLibraryItem.cpp
@@ -29,7 +29,6 @@ public:
         assert(libMgr);
 
         m_itemPath = libItem->GetFullName();
-        m_description = "Lib item changed: " + m_itemPath;
 
         //serialize the lib item to undo
         m_undoCtx.node = GetIEditor()->GetSystem()->CreateXmlNode("Undo");
@@ -45,13 +44,8 @@ public:
         m_size = sizeof(CUndoBaseLibraryItem);
         m_size += static_cast<int>(xmlStr.GetAllocatedMemory());
         m_size += m_itemPath.length();
-        m_size += m_description.length();
     }
 
-    QString GetEditorObjectName() override
-    {
-        return m_itemPath;
-    }
 
 protected:
     int GetSize() override
@@ -59,11 +53,6 @@ protected:
         return m_size;
     }
 
-    QString GetDescription() override
-    {
-        return m_description;
-    }
-
     void Undo(bool bUndo) override
     {
         //find the libItem
@@ -111,7 +100,6 @@ protected:
     }
 
 private:
-    QString m_description;
     QString m_itemPath;
     IDataBaseItem::SerializeContext m_undoCtx; //saved before operation
     IDataBaseItem::SerializeContext m_redoCtx; //saved after operation so used for redo
diff --git a/Code/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp
index 7346ffaf8c..0e51a5238c 100644
--- a/Code/Editor/BaseLibraryManager.cpp
+++ b/Code/Editor/BaseLibraryManager.cpp
@@ -17,120 +17,6 @@
 #include "ErrorReport.h"
 #include "Undo/IUndoObject.h"
 
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Undo functionality for Managers, including add library, remove library, and rename library -- Vera, Confetti
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CUndoBaseLibraryManager
-    : public IUndoObject
-{
-public:
-    CUndoBaseLibraryManager(CBaseLibraryManager* pMngr, const QString& description, const QString& modifiedManager = nullptr)
-        : m_pMngr(pMngr)
-        , m_description(description)
-        , m_editorObject(modifiedManager)
-    {
-        assert(m_pMngr);
-        SerializeTo(m_undos);
-    }
-
-    QString GetEditorObjectName() override
-    {
-        return m_editorObject;
-    }
-
-protected:
-    int GetSize() override { return sizeof(CUndoBaseLibraryManager); }
-    QString GetDescription() override { return m_description; };
-
-    void Undo(bool bUndo) override
-    {
-        if (bUndo)
-        {
-            SerializeTo(m_redos);
-        }
-        m_pMngr->ClearAll();
-        UnserializeFrom(m_undos);
-        GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
-    }
-
-    void Redo() override
-    {
-        m_pMngr->ClearAll();
-        UnserializeFrom(m_redos);
-        GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
-    }
-
-private:
-    struct LibUndoNode
-        : public _i_reference_target_t
-    {
-        LibUndoNode()
-        {
-            node = nullptr;
-            fileName = "";
-        }
-        XmlNodeRef node;
-        QString fileName;
-    };
-
-    static const char* const LIBRARY_TAG;
-    static const char* const LEVEL_LIBRARY_TAG;
-
-    void SerializeTo(std::vector<_smart_ptr<LibUndoNode> >& undos) // Save Library Undo
-    {
-        undos.clear();
-        for (int i = 0; i < m_pMngr->GetLibraryCount(); i++)
-        {
-            IDataBaseLibrary* library = m_pMngr->GetLibrary(i);
-
-            const char* tag = library->IsLevelLibrary() ? LEVEL_LIBRARY_TAG : LIBRARY_TAG;
-            XmlNodeRef node = GetIEditor()->GetSystem()->CreateXmlNode(tag);
-            QString file = library->GetFilename().isEmpty() ? library->GetFilename() : library->GetName();
-            library->Serialize(node, false);
-            if (node && !file.isEmpty())
-            {
-                _smart_ptr<LibUndoNode> undo = new LibUndoNode();
-                undo->fileName = file;
-                undo->node = node;
-                undos.push_back(undo);
-            }
-        }
-    }
-
-    void UnserializeFrom(std::vector<_smart_ptr<LibUndoNode> >& undos) // Load Library Undo
-    {
-        for (int i = 0; i < undos.size(); i++)
-        {
-            _smart_ptr<LibUndoNode> undo = undos[i];
-            if (undo->node && !undo->fileName.isEmpty())
-            {
-                //AddLibrary adds a .xml to the end of the library path, this will remove the extra for compatibility
-                undo->fileName.replace(m_pMngr->GetLibsPath().toLower(), "");
-                undo->fileName.replace(".xml", "");
-
-                const bool isLevelLibrary = (strcmp(undo->node->getTag(), LEVEL_LIBRARY_TAG) == 0);
-
-                IDataBaseLibrary* library = m_pMngr->AddLibrary(undo->fileName, isLevelLibrary);
-                library->Serialize(undo->node, true);
-            }
-        }
-    }
-
-
-    QString m_description;
-    QString m_editorObject;
-    CBaseLibraryManager* m_pMngr;
-    std::vector<_smart_ptr<LibUndoNode> > m_undos;
-    std::vector<_smart_ptr<LibUndoNode> > m_redos;
-};
-
-const char* const CUndoBaseLibraryManager::LIBRARY_TAG = "UndoLibrary";
-const char* const CUndoBaseLibraryManager::LEVEL_LIBRARY_TAG = "UndoLevelLibrary";
-
-
-
 //////////////////////////////////////////////////////////////////////////
 // CBaseLibraryManager implementation.
 //////////////////////////////////////////////////////////////////////////
@@ -606,11 +492,9 @@ void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid)
 
     if (m_bUniqGuidMap)
     {
-        bool bNewItem = true;
         REFGUID oldGuid = pItem->GetGUID();
         if (!GuidUtil::IsEmpty(oldGuid))
         {
-            bNewItem = false;
             m_itemsGuidMap.erase(oldGuid);
         }
         if (GuidUtil::IsEmpty(newGuid))
diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt
index 693799e08b..3358b49dce 100644
--- a/Code/Editor/CMakeLists.txt
+++ b/Code/Editor/CMakeLists.txt
@@ -131,7 +131,7 @@ ly_add_source_properties(
     PROPERTY COMPILE_DEFINITIONS 
     VALUES 
         O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
-        LY_BUILD=${LY_VERSION_BUILD_NUMBER}
+        LY_VERSION_BUILD_NUMBER=${LY_VERSION_BUILD_NUMBER}
         ${LY_PAL_TOOLS_DEFINES}
 )
 ly_add_source_properties(
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
index 1151137bfc..c5bf6a4d81 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
@@ -671,7 +671,7 @@ AzToolsFramework::PropertyRowWidget* ReflectedPropertyControl::FindPropertyRowWi
         return nullptr;
     }
     const AzToolsFramework::ReflectedPropertyEditor::WidgetList& widgets = m_editor->GetWidgets();
-    for (auto instance : widgets)
+    for (const auto& instance : widgets)
     {
         if (instance.second->label() == item->GetPropertyName())
         {
diff --git a/Code/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp
index 1dc2ff19e1..bff75af169 100644
--- a/Code/Editor/Controls/SplineCtrlEx.cpp
+++ b/Code/Editor/Controls/SplineCtrlEx.cpp
@@ -82,7 +82,6 @@ protected:
     }
 
     int GetSize() override { return sizeof(*this); }
-    QString GetDescription() override { return "UndoSplineCtrlEx"; };
 
     void Undo(bool bUndo) override
     {
diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
index 5bcb77797c..d5f2305dfb 100644
--- a/Code/Editor/CryEdit.cpp
+++ b/Code/Editor/CryEdit.cpp
@@ -33,6 +33,7 @@ AZ_POP_DISABLE_WARNING
 #include <QScopedValueRollback>
 #include <QClipboard>
 #include <QMenuBar>
+#include <QMessageBox>
 #include <QDialogButtonBox>
 
 // Aws Native SDK
@@ -80,7 +81,6 @@ AZ_POP_DISABLE_WARNING
 #include <AzQtComponents/Utilities/QtPluginPaths.h>
 
 // CryCommon
-#include <CryCommon/ITimer.h>
 #include <CryCommon/ILevelSystem.h>
 
 // Editor
@@ -371,10 +371,8 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_EDIT_FETCH, OnEditFetch)
     ON_COMMAND(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, OnFileExportToGameNoSurfaceTexture)
     ON_COMMAND(ID_VIEW_SWITCHTOGAME, OnViewSwitchToGame)
-    MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_VIEW_SWITCHTOGAME_FULLSCREEN, [this]() {
-        ed_previewGameInFullscreen_once = true;
-        OnViewSwitchToGame();
-    });
+    ON_COMMAND(ID_VIEW_SWITCHTOGAME_VIEWPORT, OnViewSwitchToGame)
+    ON_COMMAND(ID_VIEW_SWITCHTOGAME_FULLSCREEN, OnViewSwitchToGameFullScreen)
     ON_COMMAND(ID_MOVE_OBJECT, OnMoveObject)
     ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
     ON_COMMAND(ID_UNDO, OnUndo)
@@ -914,13 +912,9 @@ namespace
     QWidget* g_splashScreen = nullptr;
 }
 
-QString FormatVersion(const SFileVersion& v)
+QString FormatVersion([[maybe_unused]] const SFileVersion& v)
 {
-#if defined(LY_BUILD)
-    return QObject::tr("Version %1.%2.%3.%4 - Build %5").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]).arg(LY_BUILD);
-#else
-    return QObject::tr("Version %1.%2.%3.%4").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]);
-#endif
+    return QObject::tr("Version %1").arg(LY_VERSION_BUILD_NUMBER);
 }
 
 QString FormatRichTextCopyrightNotice()
@@ -1361,16 +1355,6 @@ void CCryEditApp::CompileCriticalAssets() const
     assetsInQueueNotifcation.BusDisconnect();
     CCryEditApp::OutputStartupMessage(QString("Asset Processor is now ready."));
 
-    // VERY early on, as soon as we can, request that the asset system make sure the following assets take priority over others,
-    // so that by the time we ask for them there is a greater likelihood that they're already good to go.
-    // these can be loaded later but are still important:
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "/texturemsg/");
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "engineassets/materials");
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "engineassets/geomcaches");
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "engineassets/objects");
-
-    // some are specifically extra important and will cause issues if missing completely:
-    AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::CompileAssetSync, "engineassets/objects/default.cgf");
 }
 
 bool CCryEditApp::ConnectToAssetProcessor() const
@@ -2584,6 +2568,12 @@ void CCryEditApp::OnViewSwitchToGame()
     GetIEditor()->SetInGameMode(inGame);
 }
 
+void CCryEditApp::OnViewSwitchToGameFullScreen()
+{
+    ed_previewGameInFullscreen_once = true;
+    OnViewSwitchToGame();
+}
+
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnExportSelectedObjects()
 {
@@ -3974,9 +3964,8 @@ void CCryEditApp::OpenLUAEditor(const char* files)
         }
     }
 
-    const char* engineRoot = nullptr;
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-    AZ_Assert(engineRoot != nullptr, "Unable to communicate to AzFramework::ApplicationRequests::Bus");
+    AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
+    AZ_Assert(!engineRoot.empty(), "Unable to query Engine Path");
 
     AZStd::string_view exePath;
     AZ::ComponentApplicationBus::BroadcastResult(exePath, &AZ::ComponentApplicationRequests::GetExecutableFolder);
@@ -3995,7 +3984,7 @@ void CCryEditApp::OpenLUAEditor(const char* files)
 #endif
         "%s", argumentQuoteString, aznumeric_cast<int>(exePath.size()), exePath.data(), argumentQuoteString);
 
-    AZStd::string processArgs = AZStd::string::format("%s -engine-path \"%s\"", args.c_str(), engineRoot);
+    AZStd::string processArgs = AZStd::string::format("%s -engine-path \"%s\"", args.c_str(), engineRoot.c_str());
     StartProcessDetached(process.c_str(), processArgs.c_str());
 }
 
@@ -4028,7 +4017,7 @@ void CCryEditApp::OnError(AzFramework::AssetSystem::AssetSystemErrors error)
         break;
     }
 
-    CryMessageBox(errorMessage.c_str(), "Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
+    QMessageBox::critical(nullptr,"Error",errorMessage.c_str());
 }
 
 void CCryEditApp::OnOpenProceduralMaterialEditor()
@@ -4196,6 +4185,8 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
             "\nThis could be because of incorrectly configured components, or missing required gems."
             "\nSee other errors for more details.");
 
+        AzToolsFramework::EditorEventsBus::Broadcast(&AzToolsFramework::EditorEvents::NotifyEditorInitialized);
+
         if (didCryEditStart)
         {
             app->EnableOnIdle();
diff --git a/Code/Editor/CryEdit.h b/Code/Editor/CryEdit.h
index 53ee8f1905..8c514170ae 100644
--- a/Code/Editor/CryEdit.h
+++ b/Code/Editor/CryEdit.h
@@ -212,6 +212,7 @@ public:
     void OnEditFetch();
     void OnFileExportToGameNoSurfaceTexture();
     void OnViewSwitchToGame();
+    void OnViewSwitchToGameFullScreen();
     void OnViewDeploy();
     void DeleteSelectedEntities(bool includeDescendants);
     void OnMoveObject();
diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
index 212606c737..3bcba4d5e0 100644
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@@ -19,6 +19,7 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/Time/ITime.h>
 #include <AzCore/Utils/Utils.h>
 #include <MathConversion.h>
 
@@ -50,7 +51,6 @@
 #include "GameExporter.h"
 #include "MainWindow.h"
 #include "LevelFileDialog.h"
-#include "StatObjBus.h"
 #include "Undo/Undo.h"
 
 #include <Atom/RPI.Public/ViewportContext.h>
@@ -245,9 +245,6 @@ void CCryEditDoc::DeleteContents()
 
     EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext);
 
-    // [LY-90904] move this to the EditorVegetationManager component
-    InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData);
-
     //////////////////////////////////////////////////////////////////////////
     // Clear all undo info.
     //////////////////////////////////////////////////////////////////////////
@@ -307,8 +304,6 @@ void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr)
 
             // Fog settings  ///////////////////////////////////////////////////////
             SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
-
-            SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
         }
     }
     AfterSave();
@@ -454,12 +449,6 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
             }
         }
 
-        if (!isPrefabEnabled)
-        {
-            // Name Selection groups
-            SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
-        }
-
         {
             CAutoLogTime logtime("Post Load");
 
@@ -594,16 +583,6 @@ void CCryEditDoc::SerializeFogSettings(CXmlArchive& xmlAr)
     }
 }
 
-void CCryEditDoc::SerializeNameSelection(CXmlArchive& xmlAr)
-{
-    IObjectManager* pObjManager = GetIEditor()->GetObjectManager();
-
-    if (pObjManager)
-    {
-        pObjManager->SerializeNameSelection(xmlAr.root, xmlAr.bLoading);
-    }
-}
-
 void CCryEditDoc::SetModifiedModules(EModifiedModule eModifiedModule, bool boSet)
 {
     if (!boSet)
@@ -749,7 +728,9 @@ bool CCryEditDoc::OnOpenDocument(const QString& lpszPathName)
 
 bool CCryEditDoc::BeforeOpenDocument(const QString& lpszPathName, TOpenDocContext& context)
 {
-    CTimeValue loading_start_time = gEnv->pTimer->GetAsyncTime();
+    const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+    const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+    const CTimeValue loading_start_time(timeSec);
 
     bool usePrefabSystemForLevels = false;
     AzFramework::ApplicationRequests::Bus::BroadcastResult(
@@ -790,7 +771,7 @@ bool CCryEditDoc::BeforeOpenDocument(const QString& lpszPathName, TOpenDocContex
 
 bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
 {
-    CTimeValue& loading_start_time = context.loading_start_time;
+    const CTimeValue& loading_start_time = context.loading_start_time;
 
     bool isPrefabEnabled = false;
     AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
@@ -860,7 +841,9 @@ bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
 
     StartStreamingLoad();
 
-    CTimeValue loading_end_time = gEnv->pTimer->GetAsyncTime();
+    const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+    const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+    const CTimeValue loading_end_time(timeSec);
 
     CLogFile::FormatLine("-----------------------------------------------------------");
     CLogFile::FormatLine("Successfully opened document %s", context.absoluteLevelPath.toUtf8().data());
@@ -1123,7 +1106,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
         const QString oldLevelPattern = QDir(oldLevelFolder).absoluteFilePath("*.*");
         const QString oldLevelName = Path::GetFile(GetLevelPathName());
         const QString oldLevelXml = Path::ReplaceExtension(oldLevelName, "xml");
-        AZ::IO::ArchiveFileIterator findHandle = pIPak->FindFirst(oldLevelPattern.toUtf8().data(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskAndInZips);
+        AZ::IO::ArchiveFileIterator findHandle = pIPak->FindFirst(oldLevelPattern.toUtf8().data(), AZ::IO::FileSearchLocation::Any);
         if (findHandle)
         {
             do
diff --git a/Code/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h
index e64bdb1308..f7e97d308e 100644
--- a/Code/Editor/CryEditDoc.h
+++ b/Code/Editor/CryEditDoc.h
@@ -24,7 +24,6 @@
 #include <IEditor.h>
 #endif
 
-class CClouds;
 struct LightingSettings;
 struct IVariable;
 struct ICVar;
@@ -124,7 +123,6 @@ public: // Create from serialization only
     const char* GetTemporaryLevelName() const;
     void DeleteTemporaryLevel();
 
-    CClouds* GetClouds() { return m_pClouds; }
     void SetWaterColor(const QColor& col) { m_waterColor = col; }
     QColor GetWaterColor() const { return m_waterColor; }
     XmlNodeRef& GetFogTemplate() { return m_fogTemplate; }
@@ -163,7 +161,6 @@ protected:
     bool LoadEntitiesFromSlice(const QString& sliceFile);
     void SerializeFogSettings(CXmlArchive& xmlAr);
     virtual void SerializeViewSettings(CXmlArchive& xmlAr);
-    void SerializeNameSelection(CXmlArchive& xmlAr);
     void LogLoadTime(int time) const;
 
     struct TSaveDocContext
@@ -195,7 +192,6 @@ protected:
     QColor m_waterColor = QColor(0, 0, 255);
     XmlNodeRef m_fogTemplate;
     XmlNodeRef m_environmentTemplate;
-    CClouds* m_pClouds;
     std::list<IDocListener*> m_listeners;
     bool m_bDocumentReady = false;
     ICVar* doc_validate_surface_types = nullptr;
diff --git a/Code/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
index 35047947ac..06b1acdbc8 100644
--- a/Code/Editor/Dialogs/PythonScriptsDialog.cpp
+++ b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
@@ -40,10 +40,10 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 namespace
 {
     // File name extension for python files
-    const QString s_kPythonFileNameSpec = "*.py";
+    const QString s_kPythonFileNameSpec("*.py");
 
     // Tree root element name
-    const QString s_kRootElementName = "Python Scripts";
+    const QString s_kRootElementName("Python Scripts");
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/EditorDefs.h b/Code/Editor/EditorDefs.h
index 4115e8433a..97c03b2b45 100644
--- a/Code/Editor/EditorDefs.h
+++ b/Code/Editor/EditorDefs.h
@@ -105,7 +105,6 @@
 #include <CryFile.h>
 #include <ISystem.h>
 #include <IIndexedMesh.h>
-#include <ITimer.h>
 #include <IXml.h>
 #include <IMovieSystem.h>
 
diff --git a/Code/Editor/EditorModularViewportCameraComposer.cpp b/Code/Editor/EditorModularViewportCameraComposer.cpp
index 72fd37605a..f145adf72f 100644
--- a/Code/Editor/EditorModularViewportCameraComposer.cpp
+++ b/Code/Editor/EditorModularViewportCameraComposer.cpp
@@ -145,6 +145,15 @@ namespace SandboxEditor
             }
         };
 
+        const auto trackingTransform = [viewportId = m_viewportId]
+        {
+            bool tracking = false;
+            AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+                tracking, viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsTrackingTransform);
+
+            return tracking;
+        };
+
         m_firstPersonRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(SandboxEditor::CameraFreeLookChannelId());
 
         m_firstPersonRotateCamera->m_rotateSpeedFn = []
@@ -152,6 +161,11 @@ namespace SandboxEditor
             return SandboxEditor::CameraRotateSpeed();
         };
 
+        m_firstPersonRotateCamera->m_constrainPitch = [trackingTransform]
+        {
+            return !trackingTransform();
+        };
+
         // default behavior is to hide the cursor but this can be disabled (useful for remote desktop)
         // note: See CaptureCursorLook in the Settings Registry
         m_firstPersonRotateCamera->SetActivationBeganFn(hideCursor);
@@ -255,6 +269,11 @@ namespace SandboxEditor
             return SandboxEditor::CameraOrbitYawRotationInverted();
         };
 
+        m_orbitRotateCamera->m_constrainPitch = [trackingTransform]
+        {
+            return !trackingTransform();
+        };
+
         m_orbitTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(
             translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslateOffsetOrbit);
 
@@ -337,12 +356,12 @@ namespace SandboxEditor
             AZ::TransformBus::EventResult(worldFromLocal, viewEntityId, &AZ::TransformBus::Events::GetWorldTM);
 
             AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-                m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, worldFromLocal);
+                m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, worldFromLocal);
         }
         else
         {
             AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-                m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::ClearReferenceFrame);
+                m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StopTrackingTransform);
         }
     }
 
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 290f0fd17f..7323da9e95 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -53,7 +53,6 @@
 #include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
 
 // CryCommon
-#include <CryCommon/HMDBus.h>
 #include <CryCommon/IRenderAuxGeom.h>
 
 // AzFramework
@@ -98,9 +97,6 @@
 
 #include <QtGui/private/qhighdpiscaling_p.h>
 
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
-
 AZ_CVAR(
     bool, ed_visibility_logTiming, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Output the timing of the new IVisibilitySystem query");
 
@@ -299,13 +295,9 @@ AzToolsFramework::ViewportInteraction::MousePick EditorViewportWidget::BuildMous
 {
     AzToolsFramework::ViewportInteraction::MousePick mousePick;
     mousePick.m_screenCoordinates = AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(point);
-    if (const auto& ray = m_renderViewport->ViewportScreenToWorldRay(mousePick.m_screenCoordinates);
-        ray.has_value())
-    {
-        mousePick.m_rayOrigin = ray.value().origin;
-        mousePick.m_rayDirection = ray.value().direction;
-    }
-
+    const auto[origin, direction] = m_renderViewport->ViewportScreenToWorldRay(mousePick.m_screenCoordinates);
+    mousePick.m_rayOrigin = origin;
+    mousePick.m_rayDirection = direction;
     return mousePick;
 }
 
@@ -480,7 +472,7 @@ void EditorViewportWidget::Update()
     {
         auto start = std::chrono::steady_clock::now();
 
-        m_entityVisibilityQuery.UpdateVisibility(GetCameraState());
+        m_entityVisibilityQuery.UpdateVisibility(m_renderViewport->GetCameraState());
 
         if (ed_visibility_logTiming)
         {
@@ -556,22 +548,6 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
             // this should only occur for the main viewport and no others.
             ShowCursor();
 
-            // If the user has selected game mode, enable outputting to any attached HMD and properly size the context
-            // to the resolution specified by the VR device.
-            if (gSettings.bEnableGameModeVR)
-            {
-                const AZ::VR::HMDDeviceInfo* deviceInfo = nullptr;
-                EBUS_EVENT_RESULT(deviceInfo, AZ::VR::HMDDeviceRequestBus, GetDeviceInfo);
-                AZ_Warning("Render Viewport", deviceInfo, "No VR device detected");
-
-                if (deviceInfo)
-                {
-                    // Note: This may also need to adjust the viewport size
-                    SetActiveWindow();
-                    SetFocus();
-                    SetSelected(true);
-                }
-            }
             SetCurrentCursor(STD_CURSOR_GAME);
 
             if (ShouldPreviewFullscreen())
@@ -738,7 +714,7 @@ void EditorViewportWidget::RenderAll()
 
         m_debugDisplay->DepthTestOff();
         m_manipulatorManager->DrawManipulators(
-            *m_debugDisplay, GetCameraState(),
+            *m_debugDisplay, m_renderViewport->GetCameraState(),
             BuildMouseInteractionInternal(
                 AztfVi::MouseButtons(AztfVi::TranslateMouseButtons(QGuiApplication::mouseButtons())), keyboardModifiers,
                 BuildMousePick(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
@@ -902,48 +878,11 @@ void EditorViewportWidget::OnMenuSelectCurrentCamera()
     }
 }
 
-AzFramework::CameraState EditorViewportWidget::GetCameraState()
-{
-    return m_renderViewport->GetCameraState();
-}
-
-AZ::Vector3 EditorViewportWidget::PickTerrain(const AzFramework::ScreenPoint& point)
-{
-    return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true));
-}
-
-AZ::EntityId EditorViewportWidget::PickEntity(const AzFramework::ScreenPoint& point)
-{
-    AZ::EntityId entityId;
-    HitContext hitInfo;
-    hitInfo.view = this;
-    if (HitTest(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), hitInfo))
-    {
-        if (hitInfo.object && (hitInfo.object->GetType() == OBJTYPE_AZENTITY))
-        {
-            auto entityObject = static_cast<CComponentEntityObject*>(hitInfo.object);
-            entityId = entityObject->GetAssociatedEntityId();
-        }
-    }
-
-    return entityId;
-}
-
-float EditorViewportWidget::TerrainHeight(const AZ::Vector2& position)
-{
-    return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY());
-}
-
 void EditorViewportWidget::FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntitiesOut)
 {
     visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
 }
 
-AzFramework::ScreenPoint EditorViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
-{
-    return m_renderViewport->ViewportWorldToScreen(worldPosition);
-}
-
 QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu()
 {
     return this;
@@ -1653,16 +1592,15 @@ void EditorViewportWidget::RenderSelectedRegion()
 Vec3 EditorViewportWidget::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const
 {
     Vec3 out(0, 0, 0);
-    float x, y, z;
+    float x, y;
 
-    ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
-    if (_finite(x) && _finite(y) && _finite(z))
+    ProjectToScreen(wp.x, wp.y, wp.z, &x, &y);
+    if (_finite(x) && _finite(y))
     {
         out.x = (x / 100) * m_rcClient.width();
         out.y = (y / 100) * m_rcClient.height();
         out.x /= static_cast<float>(QHighDpiScaling::factor(windowHandle()->screen()));
         out.y /= static_cast<float>(QHighDpiScaling::factor(windowHandle()->screen()));
-        out.z = z;
     }
     return out;
 }
@@ -1672,24 +1610,6 @@ QPoint EditorViewportWidget::WorldToView(const Vec3& wp) const
 {
     return AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(m_renderViewport->ViewportWorldToScreen(LYVec3ToAZVec3(wp)));
 }
-//////////////////////////////////////////////////////////////////////////
-QPoint EditorViewportWidget::WorldToViewParticleEditor(const Vec3& wp, int width, int height) const
-{
-    QPoint p;
-    float x, y, z;
-
-    ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z);
-    if (_finite(x) || _finite(y))
-    {
-        p.rx() = static_cast<int>((x / 100) * width);
-        p.ry() = static_cast<int>((y / 100) * height);
-    }
-    else
-    {
-        QPoint(0, 0);
-    }
-    return p;
-}
 
 //////////////////////////////////////////////////////////////////////////
 Vec3 EditorViewportWidget::ViewToWorld(
@@ -1705,20 +1625,16 @@ Vec3 EditorViewportWidget::ViewToWorld(
     AZ_UNUSED(collideWithObject);
 
     auto ray = m_renderViewport->ViewportScreenToWorldRay(AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(vp));
-    if (!ray.has_value())
-    {
-        return Vec3(0, 0, 0);
-    }
 
     const float maxDistance = 10000.f;
-    Vec3 v = AZVec3ToLYVec3(ray.value().direction) * maxDistance;
+    Vec3 v = AZVec3ToLYVec3(ray.direction) * maxDistance;
 
     if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z))
     {
         return Vec3(0, 0, 0);
     }
 
-    Vec3 colp = AZVec3ToLYVec3(ray.value().origin) + 0.002f * v;
+    Vec3 colp = AZVec3ToLYVec3(ray.origin) + 0.002f * v;
 
     return colp;
 }
@@ -1757,21 +1673,19 @@ bool EditorViewportWidget::RayRenderMeshIntersection(IRenderMesh* pRenderMesh, c
     return bRes;*/
 }
 
-void EditorViewportWidget::UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz) const
+void EditorViewportWidget::UnProjectFromScreen(float sx, float sy, float* px, float* py, float* pz) const
 {
-    AZ::Vector3 wp;
-    wp = m_renderViewport->ViewportScreenToWorld(AzFramework::ScreenPoint{(int)sx, m_rcClient.bottom() - ((int)sy)}, sz).value_or(wp);
+    const AZ::Vector3 wp = m_renderViewport->ViewportScreenToWorld(AzFramework::ScreenPoint{(int)sx, m_rcClient.bottom() - ((int)sy)});
     *px = wp.GetX();
     *py = wp.GetY();
     *pz = wp.GetZ();
 }
 
-void EditorViewportWidget::ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz) const
+void EditorViewportWidget::ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy) const
 {
     AzFramework::ScreenPoint screenPosition = m_renderViewport->ViewportWorldToScreen(AZ::Vector3{ptx, pty, ptz});
     *sx = static_cast<float>(screenPosition.m_x);
     *sy = static_cast<float>(screenPosition.m_y);
-    *sz = 0.f;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1781,32 +1695,22 @@ void EditorViewportWidget::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3&
 
     Vec3 pos0, pos1;
     float wx, wy, wz;
-    UnProjectFromScreen(static_cast<float>(vp.x()), static_cast<float>(rc.bottom() - vp.y()), 0.0f, &wx, &wy, &wz);
-    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
-    {
-        return;
-    }
-    if (fabs(wx) > 1000000 || fabs(wy) > 1000000 || fabs(wz) > 1000000)
-    {
-        return;
-    }
-    pos0(wx, wy, wz);
-    UnProjectFromScreen(static_cast<float>(vp.x()), static_cast<float>(rc.bottom() - vp.y()), 1.0f, &wx, &wy, &wz);
-    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
-    {
-        return;
-    }
-    if (fabs(wx) > 1000000 || fabs(wy) > 1000000 || fabs(wz) > 1000000)
-    {
-        return;
-    }
-    pos1(wx, wy, wz);
+    UnProjectFromScreen(static_cast<float>(vp.x()), static_cast<float>(rc.bottom() - vp.y()), &wx, &wy, &wz);
 
-    Vec3 v = (pos1 - pos0);
-    v = v.GetNormalized();
+    if (!_finite(wx) || !_finite(wy) || !_finite(wz))
+    {
+        return;
+    }
+
+    if (fabs(wx) > 1000000 || fabs(wy) > 1000000 || fabs(wz) > 1000000)
+    {
+        return;
+    }
+
+    pos0(wx, wy, wz);
 
     raySrc = pos0;
-    rayDir = v;
+    rayDir = (pos0 - AZVec3ToLYVec3(m_renderViewport->GetCameraState().m_position)).GetNormalized();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1815,13 +1719,6 @@ float EditorViewportWidget::GetScreenScaleFactor([[maybe_unused]] const Vec3& wo
     AZ_Error("CryLegacy", false, "EditorViewportWidget::GetScreenScaleFactor not implemented");
     return 1.f;
 }
-//////////////////////////////////////////////////////////////////////////
-float EditorViewportWidget::GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position)
-{
-    Vec3 camPos = camera.GetPosition();
-    float dist = camPos.GetDistance(object_position);
-    return dist;
-}
 
 //////////////////////////////////////////////////////////////////////////
 bool EditorViewportWidget::CheckRespondToInput() const
@@ -1842,7 +1739,6 @@ bool EditorViewportWidget::CheckRespondToInput() const
 //////////////////////////////////////////////////////////////////////////
 bool EditorViewportWidget::HitTest(const QPoint& point, HitContext& hitInfo)
 {
-    hitInfo.camera = nullptr;
     hitInfo.pExcludedObject = GetCameraObject();
     return QtViewport::HitTest(point, hitInfo);
 }
@@ -2216,7 +2112,7 @@ bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& camera
 {
     if (m_pPrimaryViewport == this)
     {
-        cameraState = GetCameraState();
+        cameraState = m_renderViewport->GetCameraState();
         return true;
     }
 
@@ -2363,10 +2259,10 @@ void* EditorViewportWidget::GetSystemCursorConstraintWindow() const
     return systemCursorConstrained ? renderOverlayHWND() : nullptr;
 }
 
-void EditorViewportWidget::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
+void EditorViewportWidget::BuildDragDropContext(
+    AzQtComponents::ViewportDragContext& context, const AzFramework::ViewportId viewportId, const QPoint& point)
 {
-    const auto scaledPoint = WidgetToViewport(pt);
-    QtViewport::BuildDragDropContext(context, scaledPoint);
+    QtViewport::BuildDragDropContext(context, viewportId, point);
 }
 
 void EditorViewportWidget::RestoreViewportAfterGameMode()
@@ -2547,12 +2443,6 @@ bool EditorViewportWidget::ShouldPreviewFullscreen() const
         return false;
     }
 
-    // Not supported in VR
-    if (gSettings.bEnableGameModeVR)
-    {
-        return false;
-    }
-
     // If level not loaded, don't preview in fullscreen (preview shouldn't work at all without a level, but it does)
     if (auto ge = GetIEditor()->GetGameEngine())
     {
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
index 01f6068d56..3d52b2416d 100644
--- a/Code/Editor/EditorViewportWidget.h
+++ b/Code/Editor/EditorViewportWidget.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Cry_Camera.h>
 
 #include <QSet>
 
@@ -166,13 +165,11 @@ private:
         Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
     void SetViewportId(int id) override;
     QPoint WorldToView(const Vec3& wp) const override;
-    QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const override;
     Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const override;
     Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
     void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
     Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
     float GetScreenScaleFactor(const Vec3& worldPoint) const override;
-    float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position) override;
     float GetAspectRatio() const override;
     bool HitTest(const QPoint& point, HitContext& hitInfo) override;
     bool IsBoundsVisible(const AABB& box) const override;
@@ -208,9 +205,6 @@ private:
     void* GetSystemCursorConstraintWindow() const override;
 
     // AzToolsFramework::MainEditorViewportInteractionRequestBus overrides ...
-    AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override;
-    AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
-    float TerrainHeight(const AZ::Vector2& position) override;
     bool ShowingWorldSpace() override;
     QWidget* GetWidgetForViewportContextMenu() override;
 
@@ -275,7 +269,8 @@ private:
 
     bool CheckRespondToInput() const;
 
-    void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override;
+    void BuildDragDropContext(
+        AzQtComponents::ViewportDragContext& context, AzFramework::ViewportId viewportId, const QPoint& point) override;
 
     void SetAsActiveViewport();
     void PushDisableRendering();
@@ -296,9 +291,6 @@ private:
     // This switches the active camera to the next one in the list of (default, all custom cams).
     void CycleCamera();
 
-    AzFramework::CameraState GetCameraState();
-    AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
-
     QPoint WidgetToViewport(const QPoint& point) const;
     QPoint ViewportToWidget(const QPoint& point) const;
     QSize WidgetToViewport(const QSize& size) const;
@@ -306,8 +298,8 @@ private:
     const DisplayContext& GetDisplayContext() const { return m_displayContext; }
     CBaseObject* GetCameraObject() const;
 
-    void UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz) const;
-    void ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz) const;
+    void UnProjectFromScreen(float sx, float sy, float* px, float* py, float* pz) const;
+    void ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy) const;
 
     AZ::RPI::ViewPtr GetCurrentAtomView() const;
 
diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
index 5527aa6ce6..b27b7e0387 100644
--- a/Code/Editor/Export/ExportManager.cpp
+++ b/Code/Editor/Export/ExportManager.cpp
@@ -35,20 +35,8 @@
 #include "Resource.h"
 #include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
 
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
-
 namespace
 {
-    inline Export::Vector3D Vec3ToVector3D(const Vec3& vec)
-    {
-        Export::Vector3D ret;
-        ret.x = vec.x;
-        ret.y = vec.y;
-        ret.z = vec.z;
-        return ret;
-    }
-
     const float kTangentDelta = 0.01f;
     const float kAspectRatio = 1.777778f;
     const int kReserveCount = 7; // x,y,z,rot_x,rot_y,rot_z,fov
@@ -106,22 +94,22 @@ void Export::CData::Clear()
 // CExportManager
 CExportManager::CExportManager()
     : m_isPrecaching(false)
-    , m_pBaseObj(nullptr)
-    , m_FBXBakedExportFPS(0.0f)
     , m_fScale(100.0f)
+    , m_bAnimationExport(false)
+    , m_pBaseObj(nullptr)
     ,                 // this scale is used by CryEngine RC
-    m_bAnimationExport(false)
+    m_FBXBakedExportFPS(0.0f)
     , m_bExportLocalCoords(false)
+    , m_bExportOnlyPrimaryCamera(false)
     , m_numberOfExportFrames(0)
     , m_pivotEntityObject(nullptr)
     , m_bBakedKeysSequenceExport(true)
     , m_animTimeExportPrimarySequenceCurrentTime(0.0f)
     , m_animKeyTimeExport(true)
     , m_soundKeyTimeExport(true)
-    , m_bExportOnlyPrimaryCamera(false)
 {
-    RegisterExporter(new COBJExporter());
-    RegisterExporter(new COCMExporter());
+    CExportManager::RegisterExporter(new COBJExporter());
+    CExportManager::RegisterExporter(new COCMExporter());
 }
 
 
@@ -313,203 +301,6 @@ void CExportManager::AddEntityAnimationData(AZ::EntityId entityId)
     ProcessEntityAnimationTrack(entityId, pObj, AnimParamType::Rotation);
 }
 
-
-void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm)
-{
-    if (m_isPrecaching || !pObj)
-    {
-        return;
-    }
-
-    pObj->m_MeshHash    =   reinterpret_cast<size_t>(pIndMesh);
-    IIndexedMesh::SMeshDescription meshDesc;
-    pIndMesh->GetMeshDescription(meshDesc);
-
-    // if we have subset of meshes we need to duplicate vertices,
-    // keep transformation of submesh,
-    // and store new offset for indices
-    int newOffsetIndex = pObj->GetVertexCount();
-
-    if (meshDesc.m_nVertCount)
-    {
-        pObj->m_vertices.reserve(meshDesc.m_nVertCount + newOffsetIndex);
-        pObj->m_normals.reserve(meshDesc.m_nVertCount + newOffsetIndex);
-    }
-
-    for (int v = 0; v < meshDesc.m_nVertCount; ++v)
-    {
-        Vec3 n = meshDesc.m_pNorms[v].GetN();
-        Vec3 tmp = (meshDesc.m_pVerts ? meshDesc.m_pVerts[v] : meshDesc.m_pVertsF16[v].ToVec3());
-        if (pTm)
-        {
-            tmp = pTm->TransformPoint(tmp);
-        }
-
-        pObj->m_vertices.push_back(Vec3ToVector3D(tmp * m_fScale));
-        pObj->m_normals.push_back(Vec3ToVector3D(n));
-    }
-
-    if (meshDesc.m_nCoorCount)
-    {
-        pObj->m_texCoords.reserve(meshDesc.m_nCoorCount + newOffsetIndex);
-    }
-
-    for (int v = 0; v < meshDesc.m_nCoorCount; ++v)
-    {
-        Vec2 uv = meshDesc.m_pTexCoord[v].GetUV();
-        uv.y = 1.0f - uv.y;
-        pObj->m_texCoords.push_back({uv.x,uv.y});
-    }
-
-    if (pIndMesh->GetSubSetCount() && !(pIndMesh->GetSubSetCount() == 1 && pIndMesh->GetSubSet(0).nNumIndices == 0))
-    {
-        for (int i = 0; i < pIndMesh->GetSubSetCount(); ++i)
-        {
-            Export::CMesh* pMesh = new Export::CMesh();
-
-            const SMeshSubset& sms = pIndMesh->GetSubSet(i);
-            const vtx_idx* pIndices = &meshDesc.m_pIndices[sms.nFirstIndexId];
-            int nTris = sms.nNumIndices / 3;
-            pMesh->m_faces.reserve(nTris);
-            for (int f = 0; f < nTris; ++f)
-            {
-                Export::Face face;
-                face.idx[0] = *(pIndices++) + newOffsetIndex;
-                face.idx[1] = *(pIndices++) + newOffsetIndex;
-                face.idx[2] = *(pIndices++) + newOffsetIndex;
-                pMesh->m_faces.push_back(face);
-            }
-
-            pObj->m_meshes.push_back(pMesh);
-        }
-    }
-    else
-    {
-        Export::CMesh* pMesh = new Export::CMesh();
-        if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != nullptr)
-        {
-            const vtx_idx* pIndices = &meshDesc.m_pIndices[0];
-            int nTris = meshDesc.m_nIndexCount / 3;
-            pMesh->m_faces.reserve(nTris);
-            for (int f = 0; f < nTris; ++f)
-            {
-                Export::Face face;
-                face.idx[0] = *(pIndices++) + newOffsetIndex;
-                face.idx[1] = *(pIndices++) + newOffsetIndex;
-                face.idx[2] = *(pIndices++) + newOffsetIndex;
-                pMesh->m_faces.push_back(face);
-            }
-        }
-        else
-        {
-            pMesh->m_faces.reserve(meshDesc.m_nFaceCount);
-            for (int f = 0; f < meshDesc.m_nFaceCount; ++f)
-            {
-                Export::Face face;
-                face.idx[0] = meshDesc.m_pFaces[f].v[0];
-                face.idx[1] = meshDesc.m_pFaces[f].v[1];
-                face.idx[2] = meshDesc.m_pFaces[f].v[2];
-                pMesh->m_faces.push_back(face);
-            }
-        }
-
-        pObj->m_meshes.push_back(pMesh);
-    }
-}
-
-
-bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm)
-{
-    IIndexedMesh* pIndMesh = nullptr;
-
-    if (pStatObj->GetSubObjectCount())
-    {
-        for (int i = 0; i < pStatObj->GetSubObjectCount(); i++)
-        {
-            IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i);
-            if (pSubObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj)
-            {
-                pIndMesh = nullptr;
-                if (m_isOccluder)
-                {
-                    if (pSubObj->pStatObj->GetLodObject(2))
-                    {
-                        pIndMesh = pSubObj->pStatObj->GetLodObject(2)->GetIndexedMesh(true);
-                    }
-                    if (!pIndMesh && pSubObj->pStatObj->GetLodObject(1))
-                    {
-                        pIndMesh = pSubObj->pStatObj->GetLodObject(1)->GetIndexedMesh(true);
-                    }
-                }
-                if (!pIndMesh)
-                {
-                    pIndMesh = pSubObj->pStatObj->GetIndexedMesh(true);
-                }
-                if (pIndMesh)
-                {
-                    AddMesh(pObj, pIndMesh, pTm);
-                }
-            }
-        }
-    }
-
-    if (!pIndMesh)
-    {
-        if (m_isOccluder)
-        {
-            if (pStatObj->GetLodObject(2))
-            {
-                pIndMesh = pStatObj->GetLodObject(2)->GetIndexedMesh(true);
-            }
-            if (!pIndMesh && pStatObj->GetLodObject(1))
-            {
-                pIndMesh = pStatObj->GetLodObject(1)->GetIndexedMesh(true);
-            }
-        }
-        if (!pIndMesh)
-        {
-            pIndMesh = pStatObj->GetIndexedMesh(true);
-        }
-        if (pIndMesh)
-        {
-            AddMesh(pObj, pIndMesh, pTm);
-        }
-    }
-
-    return true;
-}
-
-bool CExportManager::AddMeshes(Export::CObject* pObj)
-{
-    if (m_pBaseObj->GetType() == OBJTYPE_AZENTITY)
-    {
-        CEntityObject* pEntityObject = (CEntityObject*)m_pBaseObj;
-        IRenderNode* pEngineNode = pEntityObject->GetEngineNode();
-
-        if (pEngineNode)
-        {
-            if (!m_isPrecaching)
-            {
-                for (int i = 0; i < pEngineNode->GetSlotCount(); ++i)
-                {
-                    Matrix34A tm;
-                    IStatObj* pStatObj = pEngineNode->GetEntityStatObj(i, 0, &tm);
-                    if (pStatObj)
-                    {
-                        Matrix34A objTM = m_pBaseObj->GetWorldTM();
-                        objTM.Invert();
-                        tm = objTM * tm;
-                        AddStatObj(pObj, pStatObj, &tm);
-                    }
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-
 bool CExportManager::AddObject(CBaseObject* pBaseObj)
 {
     if (m_isOccluder)
@@ -531,7 +322,6 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
 
     if (m_isPrecaching)
     {
-        AddMeshes(nullptr);
         return true;
     }
 
@@ -542,7 +332,6 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
 
     m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1);
 
-    AddMeshes(pObj);
     m_pBaseObj = nullptr;
 
     return true;
@@ -1227,15 +1016,6 @@ bool CExportManager::ImportFromFile(const char* filename)
     return bRet;
 }
 
-bool CExportManager::ExportSingleStatObj(IStatObj* pStatObj, const char* filename)
-{
-    Export::CObject* pObj = new Export::CObject(Path::GetFileName(filename).toUtf8().data());
-    AddStatObj(pObj, pStatObj);
-    m_data.m_objects.push_back(pObj);
-    ExportToFile(filename, true);
-    return true;
-}
-
 void CExportManager::SaveNodeKeysTimeToXML()
 {
     CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
diff --git a/Code/Editor/Export/ExportManager.h b/Code/Editor/Export/ExportManager.h
index 14318be957..6908bcf0f7 100644
--- a/Code/Editor/Export/ExportManager.h
+++ b/Code/Editor/Export/ExportManager.h
@@ -139,18 +139,11 @@ public:
     bool ImportFromFile(const char* filename);
     const Export::CData& GetData() const {return m_data; };
 
-    //! Exports the stat obj to the obj file specified
-    //! returns true if succeeded, otherwise false
-    bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename) override;
-
     void SetBakedKeysSequenceExport(bool bBaked){m_bBakedKeysSequenceExport = bBaked; };
 
     void SaveNodeKeysTimeToXML();
 
 private:
-    void AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm = nullptr);
-    bool AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm = nullptr);
-    bool AddMeshes(Export::CObject* pObj);
     bool AddObject(CBaseObject* pBaseObj);
     void SolveHierarchy();
 
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
index ff247c1e6c..ed8f30af93 100644
--- a/Code/Editor/GameEngine.cpp
+++ b/Code/Editor/GameEngine.cpp
@@ -157,20 +157,20 @@ struct SSystemUserCallback
         }
     }
 
-    int ShowMessage(const char* text, const char* caption, unsigned int uType) override
+    void ShowMessage(const char* text, const char* caption, unsigned int uType) override
     {
         if (CCryEditApp::instance()->IsInAutotestMode())
         {
-            return IDOK;
+            return;
         }
 
         const UINT kMessageBoxButtonMask = 0x000f;
         if (!GetIEditor()->IsInGameMode() && (uType == 0 || uType == MB_OK || !(uType & kMessageBoxButtonMask)))
         {
             static_cast<CEditorImpl*>(GetIEditor())->AddErrorMessage(text, caption);
-            return IDOK;
+            return;
         }
-        return CryMessageBox(text, caption, uType);
+        CryMessageBox(text, caption, uType);
     }
 
     void OnSplashScreenDone()
@@ -822,7 +822,7 @@ void CGameEngine::Update()
         if (gEnv->pSystem)
         {
             gEnv->pSystem->UpdatePreTickBus();
-            componentApplication->Tick(gEnv->pTimer->GetFrameTime(ITimer::ETIMER_GAME));
+            componentApplication->Tick();
             gEnv->pSystem->UpdatePostTickBus();
         }
 
@@ -838,7 +838,7 @@ void CGameEngine::Update()
         unsigned int updateFlags = ESYSUPDATE_EDITOR;
         GetIEditor()->GetAnimation()->Update();
         GetIEditor()->GetSystem()->UpdatePreTickBus(updateFlags);
-        componentApplication->Tick(gEnv->pTimer->GetFrameTime(ITimer::ETIMER_GAME));
+        componentApplication->Tick();
         GetIEditor()->GetSystem()->UpdatePostTickBus(updateFlags);
     }
 }
diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h
index 4104e9aeac..5a77fc2fb1 100644
--- a/Code/Editor/GameEngine.h
+++ b/Code/Editor/GameEngine.h
@@ -8,17 +8,11 @@
 
 
 // Description : The game engine for editor
-
-
-#ifndef CRYINCLUDE_EDITOR_GAMEENGINE_H
-#define CRYINCLUDE_EDITOR_GAMEENGINE_H
-
 #pragma once
 
 #if !defined(Q_MOC_RUN)
 #include <AzCore/Outcome/Outcome.h>
 #include "LogFile.h"
-#include "CryListenerSet.h"
 #include "Util/ModalWindowDismisser.h"
 #endif
 
@@ -159,5 +153,3 @@ private:
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 };
 
-
-#endif // CRYINCLUDE_EDITOR_GAMEENGINE_H
diff --git a/Code/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp
index ae1095b03a..a768861b90 100644
--- a/Code/Editor/GameExporter.cpp
+++ b/Code/Editor/GameExporter.cpp
@@ -146,13 +146,11 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
             exportSuccessful = false;
         }
 
-        if (exportSuccessful)
+        if (exportSuccessful && m_bAutoExportMode)
         {
-            if (m_bAutoExportMode)
-            {
-                // Remove read-only flags.
-                CrySetFileAttributes(m_levelPak.m_sPath.toUtf8().data(), FILE_ATTRIBUTE_NORMAL);
-            }
+            // Remove read-only flags.
+            auto perms = QFile::permissions(m_levelPak.m_sPath) | QFile::Permission::WriteOwner;
+            QFile::setPermissions(m_levelPak.m_sPath, perms);
         }
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/IEditor.h b/Code/Editor/IEditor.h
index 7c49819d83..48c8392f32 100644
--- a/Code/Editor/IEditor.h
+++ b/Code/Editor/IEditor.h
@@ -508,8 +508,6 @@ struct IEditor
     virtual CBaseObject* NewObject(const char* typeName, const char* fileName = "", const char* name = "", float x = 0.0f, float y = 0.0f, float z = 0.0f, bool modifyDoc = true) = 0;
     //! Delete object
     virtual void DeleteObject(CBaseObject* obj) = 0;
-    //! Clone object
-    virtual CBaseObject* CloneObject(CBaseObject* obj) = 0;
     //! Get current selection group
     virtual CSelectionGroup* GetSelection() = 0;
     virtual CBaseObject* GetSelectedObject() = 0;
diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
index 66c64d5bef..e5df6be58e 100644
--- a/Code/Editor/IEditorImpl.cpp
+++ b/Code/Editor/IEditorImpl.cpp
@@ -397,11 +397,6 @@ void CEditorImpl::Update()
     // Make sure this is not called recursively
     m_bUpdates = false;
 
-    //@FIXME: Restore this latter.
-    //if (GetGameEngine() && GetGameEngine()->IsLevelLoaded())
-    {
-        m_pObjectManager->Update();
-    }
     if (IsInPreviewMode())
     {
         SetModifiedFlag(false);
@@ -687,13 +682,6 @@ void CEditorImpl::DeleteObject(CBaseObject* obj)
     GetObjectManager()->DeleteObject(obj);
 }
 
-CBaseObject* CEditorImpl::CloneObject(CBaseObject* obj)
-{
-    SetModifiedFlag();
-    GetIEditor()->SetModifiedModule(eModifiedBrushes);
-    return GetObjectManager()->CloneObject(obj);
-}
-
 CBaseObject* CEditorImpl::GetSelectedObject()
 {
     if (m_pObjectManager->GetSelection()->GetCount() != 1)
diff --git a/Code/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h
index 26701edec2..4976c0c1ca 100644
--- a/Code/Editor/IEditorImpl.h
+++ b/Code/Editor/IEditorImpl.h
@@ -141,7 +141,6 @@ public:
     const SGizmoParameters& GetGlobalGizmoParameters() override;
     CBaseObject* NewObject(const char* typeName, const char* fileName = "", const char* name = "", float x = 0.0f, float y = 0.0f, float z = 0.0f, bool modifyDoc = true) override;
     void DeleteObject(CBaseObject* obj) override;
-    CBaseObject* CloneObject(CBaseObject* obj) override;
     IObjectManager* GetObjectManager() override;
     // This will return a null pointer if CrySystem is not loaded before
     // Global Sandbox Settings are loaded from the registry before CrySystem
diff --git a/Code/Editor/IconManager.cpp b/Code/Editor/IconManager.cpp
index 820213bbd9..a9d31aef7b 100644
--- a/Code/Editor/IconManager.cpp
+++ b/Code/Editor/IconManager.cpp
@@ -21,8 +21,6 @@
 #include "Util/Image.h"
 #include "Util/ImageUtil.h"
 
-#include <IStatObj.h>
-
 #define HELPER_MATERIAL "Objects/Helper"
 
 namespace
@@ -38,7 +36,6 @@ namespace
 CIconManager::CIconManager()
 {
     ZeroStruct(m_icons);
-    ZeroStruct(m_objects);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -61,13 +58,7 @@ void CIconManager::Done()
 void CIconManager::Reset()
 {
     // Do not unload objects. but clears them.
-    int i;
-    for (i = 0; i < sizeof(m_objects) / sizeof(m_objects[0]); i++)
-    {
-        delete m_objects[i];
-        m_objects[i] = nullptr;
-    }
-    for (i = 0; i < eIcon_COUNT; i++)
+    for (int i = 0; i < eIcon_COUNT; i++)
     {
         m_icons[i] = 0;
     }
@@ -110,12 +101,6 @@ int CIconManager::GetIconTexture(EIcon icon)
     return m_icons[icon];
 }
 
-//////////////////////////////////////////////////////////////////////////
-IStatObj*   CIconManager::GetObject(EStatObject)
-{
-    return nullptr;
-}
-
 //////////////////////////////////////////////////////////////////////////
 QImage* CIconManager::GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects /*=0*/)
 {
diff --git a/Code/Editor/IconManager.h b/Code/Editor/IconManager.h
index 7183f036ed..7e9be63665 100644
--- a/Code/Editor/IconManager.h
+++ b/Code/Editor/IconManager.h
@@ -8,11 +8,6 @@
 
 
 // Description : Manages Textures used by Icon.
-
-
-#ifndef CRYINCLUDE_EDITOR_ICONMANAGER_H
-#define CRYINCLUDE_EDITOR_ICONMANAGER_H
-
 #pragma once
 
 #include "Include/IIconManager.h"   // for IIconManager
@@ -31,7 +26,7 @@ class CIconManager
 public:
     // Construction
     CIconManager();
-    ~CIconManager();
+    ~CIconManager() override;
 
     void Init();
     void Done();
@@ -41,8 +36,6 @@ public:
 
     // Operations
     virtual int GetIconTexture(EIcon icon);
-
-    virtual IStatObj*   GetObject(EStatObject object);
     virtual int GetIconTexture(const char* iconName);
 
     //////////////////////////////////////////////////////////////////////////
@@ -61,7 +54,6 @@ public:
 private:
     StdMap<QString, int> m_textures;
 
-    IStatObj*   m_objects[eStatObject_COUNT];
     int m_icons[eIcon_COUNT];
 
     //////////////////////////////////////////////////////////////////////////
@@ -70,5 +62,3 @@ private:
     typedef std::map<QString, QImage*> IconsMap;
     IconsMap m_iconBitmapsMap;
 };
-
-#endif // CRYINCLUDE_EDITOR_ICONMANAGER_H
diff --git a/Code/Editor/Include/HitContext.h b/Code/Editor/Include/HitContext.h
index 186124555f..ceff0adb22 100644
--- a/Code/Editor/Include/HitContext.h
+++ b/Code/Editor/Include/HitContext.h
@@ -19,7 +19,6 @@ class CBaseObject;
 struct IDisplayViewport;
 class CDeepSelection;
 struct AABB;
-class CCamera;
 
 #include <QRect>
 #include <platform.h>
@@ -68,8 +67,6 @@ struct HitContext
     QRect rect;
     //! Optional limiting bounding box for hit testing.
     AABB* bounds;
-    //! Optional camera for culling perspective viewports.
-    CCamera* camera;
 
     //! Testing performed in 2D viewport.
     bool b2DViewport;
@@ -120,7 +117,6 @@ struct HitContext
         rect = QRect();
         b2DViewport = false;
         view = 0;
-        camera = 0;
         point2d = QPoint();
         axis = 0;
         distanceTolerance = 0;
diff --git a/Code/Editor/Include/IDisplayViewport.h b/Code/Editor/Include/IDisplayViewport.h
index c7dff33e50..2dab2802c7 100644
--- a/Code/Editor/Include/IDisplayViewport.h
+++ b/Code/Editor/Include/IDisplayViewport.h
@@ -6,15 +6,11 @@
  *
  */
 
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
 #pragma once
 
 struct DisplayContext;
 class CBaseObjectsCache;
 class QPoint;
-class CCamera;
 struct AABB;
 class CViewport;
 
@@ -23,8 +19,6 @@ struct IDisplayViewport
 {
     virtual void Update() = 0;
     virtual float GetScreenScaleFactor(const Vec3& position) const = 0;
-    virtual float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position) = 0;
-    virtual bool HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance = 0) const = 0;
 
     /**
      * Gets the distance of the point on screen to the line defined by the two points, converted to screenspace.
@@ -47,16 +41,12 @@ struct IDisplayViewport
     virtual const Matrix34& GetViewTM() const = 0;
     virtual const Matrix34& GetScreenTM() const = 0;
     virtual QPoint WorldToView(const Vec3& worldPoint) const = 0;
-    virtual QPoint WorldToViewParticleEditor(const Vec3& worldPoint, int width, int height) const = 0;
     virtual Vec3 WorldToView3D(const Vec3& worldPoint, int flags = 0) const = 0;
     virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const = 0;
     virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const = 0;
-    virtual float GetGridStep() const = 0;
     virtual void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) = 0;
-    virtual void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir) = 0;
 
     virtual float GetAspectRatio() const = 0;
-    virtual const ::Plane* GetConstructionPlane() const = 0;
 
     virtual bool IsBoundsVisible(const AABB& box) const = 0;
 
@@ -65,5 +55,3 @@ struct IDisplayViewport
 
     virtual CViewport *asCViewport() { return nullptr; }
 };
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
diff --git a/Code/Editor/Include/IEditorMaterialManager.h b/Code/Editor/Include/IEditorMaterialManager.h
index d76ec32829..6f71c5ddd1 100644
--- a/Code/Editor/Include/IEditorMaterialManager.h
+++ b/Code/Editor/Include/IEditorMaterialManager.h
@@ -9,10 +9,6 @@
 #define CRYINCLUDE_EDITOR_MATERIAL_IEDITORMATERIALMANAGER_H
 #pragma once
 
-#define MATERIAL_FILE_EXT ".mtl"
-#define DCC_MATERIAL_FILE_EXT ".dccmtl"
-#define MATERIALS_PATH "materials/"
-
 #include <Include/IBaseLibraryManager.h>
 #include <IMaterial.h>
 
diff --git a/Code/Editor/Include/IExportManager.h b/Code/Editor/Include/IExportManager.h
index ea802134b6..ce79e52e15 100644
--- a/Code/Editor/Include/IExportManager.h
+++ b/Code/Editor/Include/IExportManager.h
@@ -8,14 +8,9 @@
 
 
 // Description : Export geometry interfaces
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H
 #pragma once
 
 #define EXP_NAMESIZE 32
-struct IStatObj;
 enum class AnimParamType;
 
 namespace Export
@@ -178,18 +173,10 @@ struct IExporter
     virtual void Release() = 0;
 };
 
-
-
 // IExportManager: interface to export manager
 struct IExportManager
 {
     //! Register exporter
     //! return true if succeed, otherwise false
     virtual bool RegisterExporter(IExporter* pExporter) = 0;
-
-    virtual bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename) = 0;
 };
-
-
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H
diff --git a/Code/Editor/Include/IFileUtil.h b/Code/Editor/Include/IFileUtil.h
index e179f892d9..036a0bc5ee 100644
--- a/Code/Editor/Include/IFileUtil.h
+++ b/Code/Editor/Include/IFileUtil.h
@@ -60,7 +60,6 @@ struct IFileUtil
         EFILE_TYPE_GEOMETRY,
         EFILE_TYPE_TEXTURE,
         EFILE_TYPE_SOUND,
-        EFILE_TYPE_GEOMCACHE,
         EFILE_TYPE_LAST,
     };
 
@@ -114,9 +113,7 @@ struct IFileUtil
 
     virtual void ShowInExplorer(const QString& path) = 0;
 
-    virtual bool CompileLuaFile(const char* luaFilename) = 0;
     virtual bool ExtractFile(QString& file, bool bMsgBoxAskForExtraction = true, const char* pDestinationFilename = nullptr) = 0;
-    virtual void EditTextFile(const char* txtFile, int line = 0, ETextFileType fileType = FILE_TYPE_SCRIPT) = 0;
     virtual void EditTextureFile(const char* txtureFile, bool bUseGameFolder) = 0;
 
     //! dcc filename calculation and extraction sub-routines
diff --git a/Code/Editor/Include/IIconManager.h b/Code/Editor/Include/IIconManager.h
index 4925e47ae8..2407ea31bd 100644
--- a/Code/Editor/Include/IIconManager.h
+++ b/Code/Editor/Include/IIconManager.h
@@ -6,12 +6,8 @@
  *
  */
 
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
 #pragma once
 
-struct IStatObj;
 struct IMaterial;
 class CBitmap;
 
@@ -56,12 +52,9 @@ enum EIconEffect
 struct IIconManager
 {
     virtual ~IIconManager() = default;
-    virtual IStatObj*   GetObject(EStatObject object) = 0;
     virtual int GetIconTexture(EIcon icon) = 0;
     virtual int GetIconTexture(const char* iconName) = 0;
     virtual QImage* GetIconBitmap(const char* filename, bool& haveAlpha, uint32 effects = 0) = 0;
     // Register an Icon for the specific command
     virtual void RegisterCommandIcon([[maybe_unused]] const char* filename, [[maybe_unused]] int nCommandId) {}
 };
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
diff --git a/Code/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h
index 0a7bc8dcca..b612bcb80c 100644
--- a/Code/Editor/Include/IObjectManager.h
+++ b/Code/Editor/Include/IObjectManager.h
@@ -5,10 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
 #pragma once
 
 #include <AzCore/PlatformIncl.h>
@@ -29,32 +25,15 @@ class CObjectArchive;
 class CViewport;
 struct HitContext;
 enum class ImageRotationDegrees;
-struct IStatObj;
 class CBaseObject;
 class XmlNodeRef;
 
 #include "ObjectEvent.h"
 
-enum SerializeFlags
-{
-    SERIALIZE_ALL = 0,
-    SERIALIZE_ONLY_SHARED = 1,
-    SERIALIZE_ONLY_NOTSHARED = 2,
-};
-
 //////////////////////////////////////////////////////////////////////////
 typedef std::vector<CBaseObject*> CBaseObjectsArray;
 typedef std::pair< bool(CALLBACK*)(CBaseObject const&, void*), void* > BaseObjectFilterFunctor;
 
-struct IObjectSelectCallback
-{
-    //! Called when object is selected.
-    //! Return true if selection should proceed, or false to abort object selection.
-    virtual bool OnSelectObject(CBaseObject* obj) = 0;
-    //! Return true if object can be selected.
-    virtual bool CanSelectObject(CBaseObject* obj) = 0;
-};
-
 //////////////////////////////////////////////////////////////////////////
 //
 // Interface to access editor objects scene graph.
@@ -78,10 +57,6 @@ public:
     virtual void DeleteObject(CBaseObject* obj) = 0;
     virtual void DeleteSelection(CSelectionGroup* pSelection) = 0;
     virtual void DeleteAllObjects() = 0;
-    virtual CBaseObject* CloneObject(CBaseObject* obj) = 0;
-
-    virtual void BeginEditParams(CBaseObject* obj, int flags) = 0;
-    virtual void EndEditParams(int flags = 0) = 0;
 
     //! Get number of objects manager by ObjectManager (not contain sub objects of groups).
     virtual int GetObjectCount() const = 0;
@@ -90,27 +65,9 @@ public:
     //! @param layer if 0 get objects for all layers, or layer to get objects from.
     virtual void GetObjects(CBaseObjectsArray& objects) const = 0;
 
-    //! Get array of objects that pass the filter.
-    //! @param filter The filter functor, return true if you want to get the certain obj, return false if want to skip it.
-    virtual void GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const = 0;
-
     //! Display objects on specified display context.
     virtual void Display(DisplayContext& dc) = 0;
 
-    //! Called when selecting without selection helpers - this is needed since
-    //! the visible object cache is normally not updated when not displaying helpers.
-    virtual void ForceUpdateVisibleObjectCache(DisplayContext& dc) = 0;
-
-    //! Check intersection with objects.
-    //! Find intersection with nearest to ray origin object hit by ray.
-    //! If distance tollerance is specified certain relaxation applied on collision test.
-    //! @return true if hit any object, and fills hitInfo structure.
-    virtual bool HitTest(HitContext& hitInfo) = 0;
-
-    //! Check intersection with an object.
-    //! @return true if hit, and fills hitInfo structure.
-    virtual bool HitTestObject(CBaseObject* obj, HitContext& hc) = 0;
-
     //! Gets a radius to be used for hit tests on the axis helpers, like the transform gizmo.
     //! @return the axis helper hit radius.
     virtual int GetAxisHelperHitRadius() const = 0;
@@ -137,59 +94,18 @@ public:
     //! Find objects which intersect with a given AABB.
     virtual void FindObjectsInAABB(const AABB& aabb, std::vector<CBaseObject*>& result) const = 0;
 
-    //////////////////////////////////////////////////////////////////////////
-    // Operations on objects.
-    //////////////////////////////////////////////////////////////////////////
-    //! Makes object visible or invisible.
-    virtual void HideObject(CBaseObject* obj, bool hide) = 0;
-    //! Shows the last hidden object based on hidden ID
-    virtual void ShowLastHiddenObject() = 0;
-    //! Freeze object, making it unselectable.
-    virtual void FreezeObject(CBaseObject* obj, bool freeze) = 0;
-    //! Unhide all hidden objects.
-    virtual void UnhideAll() = 0;
-    //! Unfreeze all frozen objects.
-    virtual void UnfreezeAll() = 0;
-
     //////////////////////////////////////////////////////////////////////////
     // Object Selection.
     //////////////////////////////////////////////////////////////////////////
     virtual bool    SelectObject(CBaseObject* obj, bool bUseMask = true) = 0;
     virtual void    UnselectObject(CBaseObject* obj) = 0;
 
-    //! Select objects within specified distance from given position.
-    //! Return number of selected objects.
-    virtual int SelectObjects(const AABB& box, bool bUnselect = false) = 0;
-
-    virtual void SelectEntities(std::set<CEntityObject*>& s) = 0;
-
-    virtual int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false) = 0;
-
-    //! Selects/Unselects all objects within 2d rectangle in given viewport.
-    virtual void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect) = 0;
-    virtual void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector<GUID>& guids) = 0;
-
     //! Clear default selection set.
     //! @Return number of objects removed from selection.
     virtual int ClearSelection() = 0;
 
-    //! Deselect all current selected objects and selects object that were unselected.
-    //! @Return number of selected objects.
-    virtual int InvertSelection() = 0;
-
     //! Get current selection.
     virtual CSelectionGroup*    GetSelection() const = 0;
-    //! Get named selection.
-    virtual CSelectionGroup*    GetSelection(const QString& name) const = 0;
-    // Get selection group names
-    virtual void GetNameSelectionStrings(QStringList& names) = 0;
-    //! Change name of current selection group.
-    //! And store it in list.
-    virtual void    NameSelection(const QString& name) = 0;
-    //! Set one of name selections as current selection.
-    virtual void    SetSelection(const QString& name) = 0;
-    //! Removes one of named selections.
-    virtual void    RemoveSelection(const QString& name) = 0;
 
     //! Delete all objects in current selection group.
     virtual void DeleteSelection() = 0;
@@ -198,54 +114,11 @@ public:
     virtual QString GenerateUniqueObjectName(const QString& typeName) = 0;
     //! Register object name in object manager, needed for generating uniq names.
     virtual void RegisterObjectName(const QString& name) = 0;
-    //! Enable/Disable generating of unique object names (Enabled by default).
-    //! Return previous value.
-    virtual bool EnableUniqObjectNames(bool bEnable) = 0;
 
     //! Find object class by name.
     virtual CObjectClassDesc* FindClass(const QString& className) = 0;
-    virtual void GetClassCategories(QStringList& categories) = 0;
-    virtual void GetClassCategoryToolClassNamePairs(std::vector< std::pair<QString, QString> >& categoryToolClassNamePairs) = 0;
-    virtual void GetClassTypes(const QString& category, QStringList& types) = 0;
-
-    //! Export objects to xml.
-    //! When onlyShared is true ony objects with shared flags exported, overwise only not shared object exported.
-    virtual void Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) = 0;
-    //! Export only entities to xml.
-    virtual void    ExportEntities(XmlNodeRef& rootNode) = 0;
-
-    //! Serialize Objects in manager to specified XML Node.
-    //! @param flags Can be one of SerializeFlags.
-    virtual void Serialize(XmlNodeRef& rootNode, bool bLoading, int flags = SERIALIZE_ALL) = 0;
-    virtual void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) = 0;
-
-    //! Load objects from object archive.
-    //! @param bSelect if set newly loaded object will be selected.
-    virtual void LoadObjects(CObjectArchive& ar, bool bSelect) = 0;
 
     virtual void ChangeObjectId(REFGUID oldId, REFGUID newId) = 0;
-    virtual bool IsDuplicateObjectName(const QString& newName) const = 0;
-    virtual void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const = 0;
-    virtual void ChangeObjectName(CBaseObject* obj, const QString& newName) = 0;
-
-    //! while loading PreFabs we need to force this IDs
-    //! to force always the same IDs, on each load.
-    //! needed for RAM-maps assignments
-    virtual uint32  ForceID() const  =   0;
-    virtual void    ForceID(uint32 FID) =   0;
-
-    //! Convert object of one type to object of another type.
-    //! Original object is deleted.
-    virtual bool ConvertToType(CBaseObject* pObject, const QString& typeName) = 0;
-
-    //! Set new selection callback.
-    //! @return previous selection callback.
-    virtual IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback) = 0;
-
-    // Enables/Disables creating of game objects.
-    virtual void SetCreateGameObject(bool enable) = 0;
-    //! Return true if objects loaded from xml should immidiatly create game objects associated with them.
-    virtual bool IsCreateGameObjects() const = 0;
 
     virtual IGizmoManager* GetGizmoManager() = 0;
 
@@ -253,34 +126,9 @@ public:
     //! Invalidate visibily settings of objects.
     virtual void InvalidateVisibleList() = 0;
 
-    //////////////////////////////////////////////////////////////////////////
-    // ObjectManager notification Callbacks.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void AddObjectEventListener(EventListener* listener) = 0;
-    virtual void RemoveObjectEventListener(EventListener* listener) = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Used to indicate starting and ending of objects loading.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void StartObjectsLoading(int numObjects) = 0;
-    virtual void EndObjectsLoading() = 0;
-
     //////////////////////////////////////////////////////////////////////////
     // Gathers all resources used by all objects.
     virtual void GatherUsedResources(CUsedResources& resources) = 0;
 
     virtual bool IsLightClass(CBaseObject* pObject) = 0;
-
-    virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) = 0;
-    virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) = 0;
-
-    virtual bool IsReloading() const = 0;
-
-    // Set bSkipUpdate to true if you want to skip update objects on the idle loop.
-    virtual void SetSkipUpdate(bool bSkipUpdate) = 0;
-
-    virtual void SetExportingLevel(bool bExporting) = 0;
-    virtual bool IsExportingLevelInprogress() const = 0;
 };
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
diff --git a/Code/Editor/Include/ObjectEvent.h b/Code/Editor/Include/ObjectEvent.h
index e59bca6111..a117a8f8f1 100644
--- a/Code/Editor/Include/ObjectEvent.h
+++ b/Code/Editor/Include/ObjectEvent.h
@@ -14,7 +14,6 @@
 //! Standart objects types.
 enum ObjectType
 {
-    OBJTYPE_DUMMY           = 1 << 20,
     OBJTYPE_AZENTITY        = 1 << 21,
 };
 
diff --git a/Code/Editor/LayoutWnd.cpp b/Code/Editor/LayoutWnd.cpp
index aa2a008844..ea125ca3d4 100644
--- a/Code/Editor/LayoutWnd.cpp
+++ b/Code/Editor/LayoutWnd.cpp
@@ -487,7 +487,6 @@ bool CLayoutWnd::LoadConfig()
 
     CreateLayout((EViewLayout)layout, false);
 
-    bool bRebindViewports = false;
     if (m_splitWnd)
     {
         const QString str = settings.value("Viewports").toString();
@@ -498,14 +497,12 @@ bool CLayoutWnd::LoadConfig()
             {
                 break;
             }
-            bRebindViewports = true;
             if (!resToken.isEmpty())
             {
                 m_viewType[nIndex] = resToken;
             }
             nIndex++;
         }
-        ;
     }
 
     BindViewports();
diff --git a/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp b/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp
index 637b9c44c5..dd7698a82e 100644
--- a/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp
+++ b/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp
@@ -27,7 +27,9 @@ namespace UnitTest
         AZ::Entity* m_entity = nullptr;
         AZ::ComponentDescriptor* m_transformComponent = nullptr;
 
-        static const AzFramework::ViewportId TestViewportId;
+        static inline constexpr AzFramework::ViewportId TestViewportId = 2345;
+        static inline constexpr float HalfInterpolateToTransformDuration =
+            AtomToolsFramework::ModularViewportCameraControllerRequests::InterpolateToTransformDuration * 0.5f;
 
         void SetUp() override
         {
@@ -76,8 +78,6 @@ namespace UnitTest
         }
     };
 
-    const AzFramework::ViewportId EditorCameraFixture::TestViewportId = AzFramework::ViewportId(1337);
-
     TEST_F(EditorCameraFixture, ModularViewportCameraControllerReferenceFrameUpdatedWhenViewportEntityisChanged)
     {
         // Given
@@ -91,8 +91,8 @@ namespace UnitTest
             &Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_entity->GetId());
 
         // ensure the viewport updates after the viewport view entity change
-        const float deltaTime = 1.0f / 60.0f;
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() });
+        // note: do a large step to ensure smoothing finishes (e.g. not 1.0f/60.0f)
+        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(2.0f), AZ::ScriptTimePoint() });
 
         // retrieve updated camera transform
         const AZ::Transform cameraTransform = m_cameraViewportContextView->GetCameraTransform();
@@ -102,61 +102,40 @@ namespace UnitTest
         EXPECT_THAT(cameraTransform, IsClose(entityTransform));
     }
 
-    TEST_F(EditorCameraFixture, ReferenceFrameRemainsIdentityAfterExternalCameraTransformChangeWhenNotSet)
+    TEST_F(EditorCameraFixture, TrackingTransformIsTrueAfterTransformIsTracked)
     {
-        // Given
-        m_cameraViewportContextView->SetCameraTransform(AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 20.0f, 30.0f)));
+        // Given/When
+        const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation(
+            AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f));
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
+            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, referenceFrame);
 
-        // When
-        AZ::Transform referenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f));
+        bool trackingTransform = false;
         AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
-            referenceFrame, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame);
+            trackingTransform, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsTrackingTransform);
 
         // Then
-        // reference frame is still the identity
-        EXPECT_THAT(referenceFrame, IsClose(AZ::Transform::CreateIdentity()));
+        EXPECT_THAT(trackingTransform, ::testing::IsTrue());
     }
 
-    TEST_F(EditorCameraFixture, ExternalCameraTransformChangeWhenReferenceFrameIsSetUpdatesReferenceFrame)
+    TEST_F(EditorCameraFixture, TrackingTransformIsFalseAfterTransformIsStoppedBeingTracked)
     {
         // Given
         const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation(
             AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f));
         AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, referenceFrame);
-
-        const AZ::Transform nextTransform = AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 20.0f, 30.0f));
-        m_cameraViewportContextView->SetCameraTransform(nextTransform);
-
-        // When
-        AZ::Transform currentReferenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f));
-        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
-            currentReferenceFrame, TestViewportId,
-            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame);
-
-        // Then
-        EXPECT_THAT(currentReferenceFrame, IsClose(nextTransform));
-    }
-
-    TEST_F(EditorCameraFixture, ReferenceFrameReturnedToIdentityAfterClear)
-    {
-        // Given
-        const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation(
-            AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f));
-        AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, referenceFrame);
+            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, referenceFrame);
 
         // When
         AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::ClearReferenceFrame);
-
-        AZ::Transform currentReferenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f));
-        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
-            currentReferenceFrame, TestViewportId,
-            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame);
+            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StopTrackingTransform);
 
         // Then
-        EXPECT_THAT(currentReferenceFrame, IsClose(AZ::Transform::CreateIdentity()));
+        bool trackingTransform = false;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            trackingTransform, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsTrackingTransform);
+
+        EXPECT_THAT(trackingTransform, ::testing::IsFalse());
     }
 
     TEST_F(EditorCameraFixture, InterpolateToTransform)
@@ -169,8 +148,10 @@ namespace UnitTest
             transformToInterpolateTo);
 
         // simulate interpolation
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() });
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() });
+        m_controllerList->UpdateViewport(
+            { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() });
+        m_controllerList->UpdateViewport(
+            { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() });
 
         const auto finalTransform = m_cameraViewportContextView->GetCameraTransform();
 
@@ -184,7 +165,7 @@ namespace UnitTest
         const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation(
             AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f));
         AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, referenceFrame);
+            TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, referenceFrame);
 
         AZ::Transform transformToInterpolateTo = AZ::Transform::CreateFromQuaternionAndTranslation(
             AZ::Quaternion::CreateRotationZ(AZ::DegToRad(90.0f)), AZ::Vector3(20.0f, 40.0f, 60.0f));
@@ -195,18 +176,85 @@ namespace UnitTest
             transformToInterpolateTo);
 
         // simulate interpolation
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() });
-        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() });
-
-        AZ::Transform currentReferenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f));
-        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
-            currentReferenceFrame, TestViewportId,
-            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame);
+        m_controllerList->UpdateViewport(
+            { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() });
+        m_controllerList->UpdateViewport(
+            { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() });
 
         const auto finalTransform = m_cameraViewportContextView->GetCameraTransform();
 
         // Then
         EXPECT_THAT(finalTransform, IsClose(transformToInterpolateTo));
-        EXPECT_THAT(currentReferenceFrame, IsClose(AZ::Transform::CreateIdentity()));
+    }
+
+    TEST_F(EditorCameraFixture, BeginningCameraInterpolationReturnsTrue)
+    {
+        // Given/When
+        bool interpolationBegan = false;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            interpolationBegan, TestViewportId,
+            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
+            AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f)));
+
+        // Then
+        EXPECT_THAT(interpolationBegan, ::testing::IsTrue());
+    }
+
+    TEST_F(EditorCameraFixture, CameraInterpolationDoesNotBeginDuringAnExistingInterpolation)
+    {
+        // Given/When
+        bool initialInterpolationBegan = false;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            initialInterpolationBegan, TestViewportId,
+            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
+            AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f)));
+
+        m_controllerList->UpdateViewport(
+            { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() });
+
+        bool nextInterpolationBegan = true;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            nextInterpolationBegan, TestViewportId,
+            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
+            AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f)));
+
+        bool interpolating = false;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            interpolating, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsInterpolating);
+
+        // Then
+        EXPECT_THAT(initialInterpolationBegan, ::testing::IsTrue());
+        EXPECT_THAT(nextInterpolationBegan, ::testing::IsFalse());
+        EXPECT_THAT(interpolating, ::testing::IsTrue());
+    }
+
+    TEST_F(EditorCameraFixture, CameraInterpolationCanBeginAfterAnInterpolationCompletes)
+    {
+        // Given/When
+        bool initialInterpolationBegan = false;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            initialInterpolationBegan, TestViewportId,
+            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
+            AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f)));
+
+        m_controllerList->UpdateViewport(
+            { TestViewportId,
+              AzFramework::FloatSeconds(AtomToolsFramework::ModularViewportCameraControllerRequests::InterpolateToTransformDuration + 0.5f),
+              AZ::ScriptTimePoint() });
+
+        bool interpolating = true;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            interpolating, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsInterpolating);
+
+        bool nextInterpolationBegan = false;
+        AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
+            nextInterpolationBegan, TestViewportId,
+            &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
+            AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f)));
+
+        // Then
+        EXPECT_THAT(initialInterpolationBegan, ::testing::IsTrue());
+        EXPECT_THAT(interpolating, ::testing::IsFalse());
+        EXPECT_THAT(nextInterpolationBegan, ::testing::IsTrue());
     }
 } // namespace UnitTest
diff --git a/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp b/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
index 1006c339ee..de0eb5df6f 100644
--- a/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
@@ -25,7 +25,6 @@
 #include <Mocks/ISystemMock.h>
 #include <Mocks/IConsoleMock.h>
 #include <Mocks/ILogMock.h>
-#include <Mocks/ITimerMock.h>
 #include <Mocks/IConsoleMock.h>
 #include "IEditorMock.h"
 
diff --git a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
index 275df11784..67d89ad967 100644
--- a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
+++ b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
@@ -9,7 +9,7 @@
 #include <AtomToolsFramework/Viewport/ModularViewportCameraController.h>
 #include <AzCore/Settings/SettingsRegistryImpl.h>
 #include <AzFramework/Viewport/ViewportControllerList.h>
-#include <AzToolsFramework/Input/QtEventToAzInputManager.h>
+#include <AzToolsFramework/Input/QtEventToAzInputMapper.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <EditorViewportWidget.h>
 #include <Mocks/MockWindowRequests.h>
@@ -74,7 +74,7 @@ namespace UnitTest
     class ModularViewportCameraControllerFixture : public AllocatorsTestFixture
     {
     public:
-        static const AzFramework::ViewportId TestViewportId;
+        static inline constexpr AzFramework::ViewportId TestViewportId = 1234;
 
         void SetUp() override
         {
@@ -146,6 +146,17 @@ namespace UnitTest
             controller->SetCameraPropsBuilderCallback(
                 [](AzFramework::CameraProps& cameraProps)
                 {
+                    // note: rotateSmoothness is also used for roll (not related to camera input directly)
+                    cameraProps.m_rotateSmoothnessFn = []
+                    {
+                        return 5.0f;
+                    };
+
+                    cameraProps.m_translateSmoothnessFn = []
+                    {
+                        return 5.0f;
+                    };
+
                     cameraProps.m_rotateSmoothingEnabledFn = []
                     {
                         return false;
@@ -209,8 +220,6 @@ namespace UnitTest
         AZStd::unique_ptr<SandboxEditor::EditorModularViewportCameraComposer> m_editorModularViewportCameraComposer;
     };
 
-    const AzFramework::ViewportId ModularViewportCameraControllerFixture::TestViewportId = AzFramework::ViewportId(0);
-
     TEST_F(ModularViewportCameraControllerFixture, MouseMovementDoesNotAccumulateExcessiveDriftInModularViewportCameraWithVaryingDeltaTime)
     {
         SandboxEditor::SetCameraCaptureCursorForLook(false);
@@ -380,6 +389,7 @@ namespace UnitTest
         m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() });
 
         QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::RightButton, Qt::NoModifier, start + mouseDelta);
+        m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() });
 
         // update the position of the widget
         const auto offset = QPoint(500, 500);
diff --git a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
index 39a89670ef..64b7d36d30 100644
--- a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
@@ -63,16 +63,6 @@ namespace ObjectManagerPythonBindingsUnitTests
         EXPECT_TRUE(behaviorContext->m_methods.find("get_selection_center") != behaviorContext->m_methods.end());
         EXPECT_TRUE(behaviorContext->m_methods.find("get_selection_aabb") != behaviorContext->m_methods.end());
 
-        EXPECT_TRUE(behaviorContext->m_methods.find("hide_object") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_object_hidden") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("unhide_object") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("hide_all_objects") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("unhide_all_objects") != behaviorContext->m_methods.end());
-
-        EXPECT_TRUE(behaviorContext->m_methods.find("freeze_object") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("is_object_frozen") != behaviorContext->m_methods.end());
-        EXPECT_TRUE(behaviorContext->m_methods.find("unfreeze_object") != behaviorContext->m_methods.end());
-
         EXPECT_TRUE(behaviorContext->m_methods.find("delete_object") != behaviorContext->m_methods.end());
         EXPECT_TRUE(behaviorContext->m_methods.find("delete_selected") != behaviorContext->m_methods.end());
 
diff --git a/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
index 191596f4ae..88a4b4f63f 100644
--- a/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
@@ -94,6 +94,9 @@ namespace TrackViewPythonBindingsUnitTests
 
             m_app.Start(appDesc);
             m_app.RegisterComponentDescriptor(AzToolsFramework::TrackViewComponent::CreateDescriptor());
+
+            // Disable saving global user settings to prevent failure due to detecting file updates
+            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
         }
 
         void TearDown() override
diff --git a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp
index 63e59ea940..473ddd81f7 100644
--- a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp
+++ b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp
@@ -8,10 +8,11 @@
 
 #include <AzFramework/Viewport/CameraInput.h>
 #include <AzFramework/Viewport/ViewportControllerList.h>
-#include <AzToolsFramework/Input/QtEventToAzInputManager.h>
+#include <AzToolsFramework/Input/QtEventToAzInputMapper.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
 #include <Editor/ViewportManipulatorController.h>
+#include <Mocks/MockWindowRequests.h>
 
 namespace UnitTest
 {
@@ -77,14 +78,15 @@ namespace UnitTest
     class ViewportManipulatorControllerFixture : public AllocatorsTestFixture
     {
     public:
-        static const AzFramework::ViewportId TestViewportId;
+        static inline constexpr AzFramework::ViewportId TestViewportId = 1234;
+        static inline const QSize WidgetSize = QSize(1920, 1080);
 
         void SetUp() override
         {
             AllocatorsTestFixture::SetUp();
 
             m_rootWidget = AZStd::make_unique<QWidget>();
-            m_rootWidget->setFixedSize(QSize(100, 100));
+            m_rootWidget->setFixedSize(WidgetSize);
             QApplication::setActiveWindow(m_rootWidget.get());
 
             m_controllerList = AZStd::make_shared<AzFramework::ViewportControllerList>();
@@ -111,8 +113,6 @@ namespace UnitTest
         AZStd::unique_ptr<AzToolsFramework::QtEventToAzInputMapper> m_inputChannelMapper;
     };
 
-    const AzFramework::ViewportId ViewportManipulatorControllerFixture::TestViewportId = AzFramework::ViewportId(0);
-
     TEST_F(ViewportManipulatorControllerFixture, AnEventIsNotPropagatedToTheViewportWhenAManipulatorHandlesItFirst)
     {
         // forward input events to our controller list
@@ -227,4 +227,74 @@ namespace UnitTest
         // the key was released (cleared)
         EXPECT_TRUE(endedEvent);
     }
+
+    TEST_F(ViewportManipulatorControllerFixture, DoubleClickIsNotRegisteredIfMouseDeltaHasMovedMoreThanDeadzoneInClickInterval)
+    {
+        AzFramework::NativeWindowHandle nativeWindowHandle = nullptr;
+
+        // forward input events to our controller list
+        QObject::connect(
+            m_inputChannelMapper.get(), &AzToolsFramework::QtEventToAzInputMapper::InputChannelUpdated, m_rootWidget.get(),
+            [this, nativeWindowHandle](const AzFramework::InputChannel* inputChannel, [[maybe_unused]] QEvent* event)
+            {
+                m_controllerList->HandleInputChannelEvent(
+                    AzFramework::ViewportControllerInputEvent{ TestViewportId, nativeWindowHandle, *inputChannel });
+            });
+
+        ::testing::NiceMock<MockWindowRequests> mockWindowRequests;
+        mockWindowRequests.Connect(nativeWindowHandle);
+
+        using ::testing::Return;
+        // note: WindowRequests is used internally by ViewportManipulatorController
+        ON_CALL(mockWindowRequests, GetClientAreaSize())
+            .WillByDefault(Return(AzFramework::WindowSize(WidgetSize.width(), WidgetSize.height())));
+
+        EditorInteractionViewportSelectionFake editorInteractionViewportFake;
+        editorInteractionViewportFake.m_internalHandleMouseManipulatorInteraction = [](const MouseInteractionEvent&)
+        {
+            // report the event was not handled (manipulator was not interacted with)
+            return false;
+        };
+
+        bool doubleClickDetected = false;
+        editorInteractionViewportFake.m_internalHandleMouseViewportInteraction =
+            [&doubleClickDetected](const MouseInteractionEvent& mouseInteractionEvent)
+        {
+            // ensure no double click event is detected with the given inputs below
+            if (mouseInteractionEvent.m_mouseEvent == AzToolsFramework::ViewportInteraction::MouseEvent::DoubleClick)
+            {
+                doubleClickDetected = true;
+            }
+
+            return true;
+        };
+
+        editorInteractionViewportFake.Connect();
+
+        m_controllerList->Add(AZStd::make_shared<SandboxEditor::ViewportManipulatorController>());
+
+        // simulate a click, move, click
+        MouseMove(m_rootWidget.get(), QPoint(0, 0), QPoint(10, 10));
+        MousePressAndMove(m_rootWidget.get(), QPoint(10, 10), QPoint(0, 0), Qt::MouseButton::LeftButton);
+        QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(10, 10));
+        MouseMove(m_rootWidget.get(), QPoint(10, 10), QPoint(20, 20));
+        MousePressAndMove(m_rootWidget.get(), QPoint(20, 20), QPoint(0, 0), Qt::MouseButton::LeftButton);
+        QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(20, 20));
+
+        // ensure no double click was detected
+        EXPECT_FALSE(doubleClickDetected);
+
+        // simulate double click (sanity check it still is detected correctly with no movement)
+        MouseMove(m_rootWidget.get(), QPoint(0, 0), QPoint(10, 10));
+        MousePressAndMove(m_rootWidget.get(), QPoint(10, 10), QPoint(0, 0), Qt::MouseButton::LeftButton);
+        QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(10, 10));
+        MousePressAndMove(m_rootWidget.get(), QPoint(10, 10), QPoint(0, 0), Qt::MouseButton::LeftButton);
+        QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(10, 10));
+
+        // ensure a double click was detected
+        EXPECT_TRUE(doubleClickDetected);
+
+        mockWindowRequests.Disconnect();
+        editorInteractionViewportFake.Disconnect();
+    }
 } // namespace UnitTest
diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
index 528b4eba6b..38e433c3a3 100644
--- a/Code/Editor/MainWindow.cpp
+++ b/Code/Editor/MainWindow.cpp
@@ -519,7 +519,7 @@ MainWindow* MainWindow::instance()
 
 void MainWindow::closeEvent(QCloseEvent* event)
 {
-    gSettings.Save();
+    gSettings.Save(true);
 
     AzFramework::SystemCursorState currentCursorState;
     bool isInGameMode = false;
@@ -576,7 +576,6 @@ void MainWindow::closeEvent(QCloseEvent* event)
     }
     // Close all edit panels.
     GetIEditor()->ClearSelection();
-    GetIEditor()->GetObjectManager()->EndEditParams();
 
     // force clean up of all deferred deletes, so that we don't have any issues with windows from plugins not being deleted yet
     qApp->sendPostedEvents(nullptr, QEvent::DeferredDelete);
@@ -708,14 +707,10 @@ void MainWindow::InitActions()
         .SetShortcut(QKeySequence::Undo)
         .SetReserved()
         .SetStatusTip(tr("Undo last operation"))
-        //.SetMenu(new QMenu("FIXME"))
-        .SetApplyHoverEffect()
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateUndo);
     am->AddAction(ID_REDO, tr("&Redo"))
         .SetShortcut(AzQtComponents::RedoKeySequence)
         .SetReserved()
-        //.SetMenu(new QMenu("FIXME"))
-        .SetApplyHoverEffect()
         .SetStatusTip(tr("Redo last undo operation"))
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateRedo);
 
@@ -731,7 +726,6 @@ void MainWindow::InitActions()
     // Modify actions
     am->AddAction(AzToolsFramework::EditModeMove, tr("Move"))
         .SetIcon(Style::icon("Move"))
-        .SetApplyHoverEffect()
         .SetShortcut(tr("1"))
         .SetToolTip(tr("Move (1)"))
         .SetCheckable(true)
@@ -757,7 +751,6 @@ void MainWindow::InitActions()
             });                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
     am->AddAction(AzToolsFramework::EditModeRotate, tr("Rotate"))
         .SetIcon(Style::icon("Translate"))
-        .SetApplyHoverEffect()
         .SetShortcut(tr("2"))
         .SetToolTip(tr("Rotate (2)"))
         .SetCheckable(true)
@@ -783,7 +776,6 @@ void MainWindow::InitActions()
             });
     am->AddAction(AzToolsFramework::EditModeScale, tr("Scale"))
         .SetIcon(Style::icon("Scale"))
-        .SetApplyHoverEffect()
         .SetShortcut(tr("3"))
         .SetToolTip(tr("Scale (3)"))
         .SetCheckable(true)
@@ -808,7 +800,6 @@ void MainWindow::InitActions()
 
     am->AddAction(AzToolsFramework::SnapToGrid, tr("Snap to grid"))
         .SetIcon(Style::icon("Grid"))
-        .SetApplyHoverEffect()
         .SetShortcut(tr("G"))
         .SetToolTip(tr("Snap to grid (G)"))
         .SetStatusTip(tr("Toggles snap to grid"))
@@ -821,7 +812,6 @@ void MainWindow::InitActions()
 
     am->AddAction(AzToolsFramework::SnapAngle, tr("Snap angle"))
         .SetIcon(Style::icon("Angle"))
-        .SetApplyHoverEffect()
         .SetStatusTip(tr("Snap angle"))
         .SetCheckable(true)
         .RegisterUpdateCallback([](QAction* action) {
@@ -939,29 +929,28 @@ void MainWindow::InitActions()
         .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem);
 
     // Game actions
-    am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game"))
+    am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play Game"))
         .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg"))
+        .SetToolTip(tr("Play Game"))
+        .SetStatusTip(tr("Activate the game input mode"))
+        .SetCheckable(true)
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame);
+    am->AddAction(ID_VIEW_SWITCHTOGAME_VIEWPORT, tr("Play Game"))
         .SetShortcut(tr("Ctrl+G"))
         .SetToolTip(tr("Play Game (Ctrl+G)"))
         .SetStatusTip(tr("Activate the game input mode"))
-        .SetApplyHoverEffect()
-        .SetCheckable(true)
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame);
-    am->AddAction(ID_VIEW_SWITCHTOGAME_FULLSCREEN, tr("Play &Game (Maximized)"))
+    am->AddAction(ID_VIEW_SWITCHTOGAME_FULLSCREEN, tr("Play Game (Maximized)"))
         .SetShortcut(tr("Ctrl+Shift+G"))
         .SetStatusTip(tr("Activate the game input mode (maximized)"))
-        .SetIcon(Style::icon("Play"))
-        .SetApplyHoverEffect()
-        .SetCheckable(true);
+        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame);
     am->AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, tr("Play Controls"))
         .SetText(tr("Play Controls"));
     am->AddAction(ID_SWITCH_PHYSICS, tr("Simulate"))
         .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Simulate_Physics.svg"))
         .SetShortcut(tr("Ctrl+P"))
         .SetToolTip(tr("Simulate (Ctrl+P)"))
-        .SetCheckable(true)
         .SetStatusTip(tr("Enable processing of Physics and AI."))
-        .SetApplyHoverEffect()
         .SetCheckable(true)
         .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnSwitchPhysicsUpdate);
     am->AddAction(ID_GAME_SYNCPLAYER, tr("Move Player and Camera Separately")).SetCheckable(true)
@@ -1051,8 +1040,7 @@ void MainWindow::InitActions()
 
     // Editors Toolbar actions
     am->AddAction(ID_OPEN_ASSET_BROWSER, tr("Asset browser"))
-        .SetToolTip(tr("Open Asset Browser"))
-        .SetApplyHoverEffect();
+        .SetToolTip(tr("Open Asset Browser"));
 
     AZ::EBusReduceResult<bool, AZStd::logical_or<bool>> emfxEnabled(false);
     using AnimationRequestBus = AzToolsFramework::EditorAnimationSystemRequestsBus;
@@ -1062,8 +1050,7 @@ void MainWindow::InitActions()
     {
         QAction* action = am->AddAction(ID_OPEN_EMOTIONFX_EDITOR, tr("Animation Editor"))
             .SetToolTip(tr("Open Animation Editor"))
-            .SetIcon(QIcon(":/EMotionFX/EMFX_icon_32x32.png"))
-            .SetApplyHoverEffect();
+            .SetIcon(QIcon(":/EMotionFX/EMFX_icon_32x32.png"));
         QObject::connect(action, &QAction::triggered, this, []() {
             QtViewPaneManager::instance()->OpenPane(LyViewPane::AnimationEditor);
         });
@@ -1071,12 +1058,10 @@ void MainWindow::InitActions()
 
     am->AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, tr("Audio Controls Editor"))
         .SetToolTip(tr("Open Audio Controls Editor"))
-        .SetIcon(Style::icon("Audio"))
-        .SetApplyHoverEffect();
+        .SetIcon(Style::icon("Audio"));
 
     am->AddAction(ID_OPEN_UICANVASEDITOR, tr(LyViewPane::UiEditor))
-        .SetToolTip(tr("Open UI Editor"))
-        .SetApplyHoverEffect();
+        .SetToolTip(tr("Open UI Editor"));
 
     // Edit Mode Toolbar Actions
     am->AddAction(IDC_SELECTION_MASK, tr("Selected Object Types"));
@@ -1089,12 +1074,10 @@ void MainWindow::InitActions()
     // Object Toolbar Actions
     am->AddAction(ID_GOTO_SELECTED, tr("Go to selected object"))
         .SetIcon(Style::icon("select_object"))
-        .SetApplyHoverEffect()
         .Connect(&QAction::triggered, this, &MainWindow::OnGotoSelected);
 
     // Misc Toolbar Actions
-    am->AddAction(ID_OPEN_SUBSTANCE_EDITOR, tr("Open Substance Editor"))
-        .SetApplyHoverEffect();
+    am->AddAction(ID_OPEN_SUBSTANCE_EDITOR, tr("Open Substance Editor"));
 }
 
 void MainWindow::InitToolActionHandlers()
@@ -1266,7 +1249,9 @@ void MainWindow::OnGameModeChanged(bool inGameMode)
     // block signals on the switch to game actions before setting the checked state, as
     // setting the checked state triggers the action, which will re-enter this function
     // and result in an infinite loop
-    AZStd::vector<QAction*> actions = { m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME), m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME_FULLSCREEN) };
+    AZStd::vector<QAction*> actions = { m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME_VIEWPORT),
+                                        m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME_FULLSCREEN),
+                                        m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME)};
     for (auto action : actions)
     {
         action->blockSignals(true);
diff --git a/Code/Editor/Objects/AxisGizmo.cpp b/Code/Editor/Objects/AxisGizmo.cpp
index a603b2615d..7215853854 100644
--- a/Code/Editor/Objects/AxisGizmo.cpp
+++ b/Code/Editor/Objects/AxisGizmo.cpp
@@ -329,7 +329,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point
             hc.b2DViewport = view->GetType() != ET_ViewportCamera;
             hc.point2d = point;
             view->ViewToWorldRay(point, hc.raySrc, hc.rayDir);
-            bool bHit = false;
             if (HitTest(hc))
             {
                 switch (hc.manipulatorMode)
@@ -344,7 +343,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point
                     view->SetCurrentCursor(STD_CURSOR_SCALE);
                     break;
                 }
-                bHit = true;
             }
         }
     }
diff --git a/Code/Editor/Objects/BaseObject.cpp b/Code/Editor/Objects/BaseObject.cpp
index 4ae01faddf..86840789dd 100644
--- a/Code/Editor/Objects/BaseObject.cpp
+++ b/Code/Editor/Objects/BaseObject.cpp
@@ -33,8 +33,6 @@
 #include "ViewManager.h"
 #include "IEditorImpl.h"
 #include "GameEngine.h"
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
 // To use the Andrew's algorithm in order to make convex hull from the points, this header is needed.
 #include "Util/GeometryUtil.h"
 
@@ -53,18 +51,16 @@ class CUndoBaseObject
     : public IUndoObject
 {
 public:
-    CUndoBaseObject(CBaseObject* pObj, const char* undoDescription);
+    CUndoBaseObject(CBaseObject* pObj);
 
 protected:
     int GetSize() override { return sizeof(*this);   }
-    QString GetDescription() override { return m_undoDescription; };
     QString GetObjectName() override;
 
     void Undo(bool bUndo) override;
     void Redo() override;
 
 protected:
-    QString m_undoDescription;
     GUID m_guid;
     XmlNodeRef m_undo;
     XmlNodeRef m_redo;
@@ -77,11 +73,10 @@ class CUndoBaseObjectMinimal
     : public IUndoObject
 {
 public:
-    CUndoBaseObjectMinimal(CBaseObject* obj, const char* undoDescription, int flags);
+    CUndoBaseObjectMinimal(CBaseObject* obj, int flags);
 
 protected:
     int GetSize() override { return sizeof(*this); }
-    QString GetDescription() override { return m_undoDescription; };
     QString GetObjectName() override;
 
     void Undo(bool bUndo) override;
@@ -101,7 +96,6 @@ private:
     void SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo);
 
     GUID m_guid;
-    QString m_undoDescription;
     StateStruct m_undoState;
     StateStruct m_redoState;
 };
@@ -167,7 +161,6 @@ private:
     }
 
     int GetSize() override { return sizeof(CUndoAttachBaseObject); }
-    QString GetDescription() override { return "Attachment Changed"; }
 
     GUID m_attachedObjectGUID;
     GUID m_parentObjectGUID;
@@ -176,11 +169,10 @@ private:
 };
 
 //////////////////////////////////////////////////////////////////////////
-CUndoBaseObject::CUndoBaseObject(CBaseObject* obj, const char* undoDescription)
+CUndoBaseObject::CUndoBaseObject(CBaseObject* obj)
 {
     // Stores the current state of this object.
     assert(obj != 0);
-    m_undoDescription = undoDescription;
     m_guid = obj->GetId();
 
     m_redo = nullptr;
@@ -254,11 +246,10 @@ void CUndoBaseObject::Redo()
 }
 
 //////////////////////////////////////////////////////////////////////////
-CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, const char* undoDescription, [[maybe_unused]] int flags)
+CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, [[maybe_unused]] int flags)
 {
     // Stores the current state of this object.
     assert(pObj != nullptr);
-    m_undoDescription = undoDescription;
     m_guid = pObj->GetId();
 
     ZeroStruct(m_redoState);
@@ -287,7 +278,7 @@ QString CUndoBaseObjectMinimal::GetObjectName()
 void CUndoBaseObjectMinimal::Undo(bool bUndo)
 {
     CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
+    if (!pObject)
     {
         return;
     }
@@ -316,7 +307,7 @@ void CUndoBaseObjectMinimal::Undo(bool bUndo)
 void CUndoBaseObjectMinimal::Redo()
 {
     CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
-    if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
+    if (!pObject)
     {
         return;
     }
@@ -382,7 +373,6 @@ CBaseObject::CBaseObject()
     , m_rotate(IDENTITY)
     , m_scale(1, 1, 1)
     , m_guid(GUID_NULL)
-    , m_floorNumber(-1)
     , m_flags(0)
     , m_nTextureIcon(0)
     , m_color(QColor(255, 255, 255))
@@ -398,11 +388,9 @@ CBaseObject::CBaseObject()
     , m_bMatrixInWorldSpace(false)
     , m_bMatrixValid(false)
     , m_bWorldBoxValid(false)
-    , m_nMaterialLayersMask(0)
     , m_nMinSpec(0)
     , m_vDrawIconPos(0, 0, 0)
     , m_nIconFlags(0)
-    , m_hideOrder(CBaseObject::s_invalidHiddenID)
 {
     m_worldBounds.min.Set(0, 0, 0);
     m_worldBounds.max.Set(0, 0, 0);
@@ -431,7 +419,6 @@ bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_
         SetLocalTM(prev->GetPos(), prev->GetRotation(), prev->GetScale());
         SetArea(prev->GetArea());
         SetColor(prev->GetColor());
-        m_nMaterialLayersMask = prev->m_nMaterialLayersMask;
         SetMinSpec(prev->GetMinSpec(), false);
 
         // Copy all basic variables.
@@ -488,7 +475,7 @@ void CBaseObject::SetName(const QString& name)
         return;
     }
 
-    StoreUndo("Name");
+    StoreUndo();
 
     // Notification is expensive and not required if this is during construction.
     bool notify = (!m_name.isEmpty());
@@ -500,7 +487,6 @@ void CBaseObject::SetName(const QString& name)
     if (notify)
     {
         NotifyListeners(ON_RENAME);
-        static_cast<CObjectManager*>(GetIEditor()->GetObjectManager())->NotifyObjectListeners(this, ON_RENAME);
     }
 }
 
@@ -529,47 +515,6 @@ const QString& CBaseObject::GetName() const
     return m_name;
 }
 
-//////////////////////////////////////////////////////////////////////////
-QString CBaseObject::GetWarningsText() const
-{
-    QString warnings;
-
-    if (gSettings.viewports.bShowScaleWarnings)
-    {
-        const EScaleWarningLevel scaleWarningLevel = GetScaleWarningLevel();
-        if (scaleWarningLevel == eScaleWarningLevel_Rescaled)
-        {
-            warnings += "\\n  Warning: Object Scale is not 100%.";
-        }
-        else if (scaleWarningLevel == eScaleWarningLevel_RescaledNonUniform)
-        {
-            warnings += "\\n  Warning: Object has non-uniform scale.";
-        }
-    }
-
-    if (gSettings.viewports.bShowRotationWarnings)
-    {
-        const ERotationWarningLevel rotationWarningLevel = GetRotationWarningLevel();
-
-        if (rotationWarningLevel == eRotationWarningLevel_Rotated)
-        {
-            warnings += "\\n  Warning: Object is rotated.";
-        }
-        else if (rotationWarningLevel == eRotationWarningLevel_RotatedNonRectangular)
-        {
-            warnings += "\\n  Warning: Object is rotated non-orthogonally.";
-        }
-    }
-
-    return warnings;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsSameClass(CBaseObject* obj)
-{
-    return GetClassDesc() == obj->GetClassDesc();
-}
-
 //////////////////////////////////////////////////////////////////////////
 bool CBaseObject::SetPos(const Vec3& pos, int flags)
 {
@@ -615,7 +560,7 @@ bool CBaseObject::SetPos(const Vec3& pos, int flags)
     //////////////////////////////////////////////////////////////////////////
     if (!bPositionDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
     {
-        StoreUndo("Position", true, flags);
+        StoreUndo(true, flags);
     }
 
     if (!bPositionDelegated)
@@ -659,7 +604,7 @@ bool CBaseObject::SetRotation(const Quat& rotate, int flags)
 
     if (!bRotationDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
     {
-        StoreUndo("Rotate", true, flags);
+        StoreUndo(true, flags);
     }
 
     if (!bRotationDelegated)
@@ -704,7 +649,7 @@ bool CBaseObject::SetScale(const Vec3& scale, int flags)
 
     if (!bScaleDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
     {
-        StoreUndo("Scale", true, flags);
+        StoreUndo(true, flags);
     }
 
     if (!bScaleDelegated)
@@ -763,7 +708,7 @@ void CBaseObject::ChangeColor(const QColor& color)
         return;
     }
 
-    StoreUndo("Color", true);
+    StoreUndo(true);
 
     SetColor(color);
     SetModified(false);
@@ -783,7 +728,7 @@ void CBaseObject::SetArea(float area)
         return;
     }
 
-    StoreUndo("Area", true);
+    StoreUndo(true);
 
     m_flattenArea = area;
     SetModified(false);
@@ -953,14 +898,8 @@ void CBaseObject::DrawTextureIcon(DisplayContext& dc, [[maybe_unused]] const Vec
 }
 
 //////////////////////////////////////////////////////////////////////////
-void CBaseObject::DrawWarningIcons(DisplayContext& dc, const Vec3& pos)
+void CBaseObject::DrawWarningIcons(DisplayContext& dc, const Vec3&)
 {
-    // Don't draw warning icons if they are beyond draw distance
-    if ((dc.camera->GetPosition() - pos).GetLength() > gSettings.viewports.fWarningIconsDrawDistance)
-    {
-        return;
-    }
-
     if (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons)
     {
         const int warningIconSizeX = OBJECT_TEXTURE_ICON_SIZEX / 2;
@@ -1010,11 +949,8 @@ void CBaseObject::DrawLabel(DisplayContext& dc, const Vec3& pos, const QColor& l
         labelColor = QColor(0, 0, 0);
     }
 
-    float camDist = dc.camera->GetPosition().GetDistance(pos);
-    float maxDist = dc.settings->GetLabelsDistance();
-    if (camDist < dc.settings->GetLabelsDistance() || (dc.flags & DISPLAY_SELECTION_HELPERS))
+    if (dc.flags & DISPLAY_SELECTION_HELPERS)
     {
-        float range = maxDist / 2.0f;
         Vec3 c(static_cast<f32>(labelColor.redF()), static_cast<f32>(labelColor.greenF()), static_cast<f32>(labelColor.redF()));
         if (IsSelected())
         {
@@ -1032,10 +968,6 @@ void CBaseObject::DrawLabel(DisplayContext& dc, const Vec3& pos, const QColor& l
             col[1] = c.y;
             col[2] = c.z;
         }
-        else if (camDist > range)
-        {
-            col[3] = col[3] * (1.0f - (camDist - range) / range);
-        }
 
         dc.SetColor(col[0], col[1], col[2], col[3] * alpha);
         dc.DrawTextLabel(pos, size, GetName().toUtf8().data());
@@ -1196,74 +1128,6 @@ bool CBaseObject::CanBeDrawn(const DisplayContext& dc, bool& outDisplaySelection
     return bResult;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsInCameraView(const CCamera& camera)
-{
-    AABB bbox;
-    GetBoundBox(bbox);
-    return (camera.IsAABBVisible_F(AABB(bbox.min, bbox.max)));
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CBaseObject::GetCameraVisRatio(const CCamera& camera)
-{
-    AABB bbox;
-    GetBoundBox(bbox);
-
-    static const float defaultVisRatio = 1000.0f;
-
-    const float objectHeightSq = max(1.0f, (bbox.max - bbox.min).GetLengthSquared());
-    const float camdistSq = (bbox.min - camera.GetPosition()).GetLengthSquared();
-    float visRatio = defaultVisRatio;
-    if (camdistSq > FLT_EPSILON)
-    {
-        visRatio = objectHeightSq / camdistSq;
-    }
-
-    return visRatio;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int CBaseObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-
-    if (event == eMouseMove || event == eMouseLDown)
-    {
-        Vec3 pos;
-        if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
-        {
-            pos = view->MapViewToCP(point);
-        }
-        else
-        {
-            // Snap to terrain.
-            bool hitTerrain;
-            pos = view->ViewToWorld(point, &hitTerrain);
-            if (hitTerrain)
-            {
-                pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y) + 1.0f;
-            }
-            pos = view->SnapToGrid(pos);
-        }
-        SetPos(pos);
-
-        if (event == eMouseLDown)
-        {
-            return MOUSECREATE_OK;
-        }
-    }
-
-    if (event == eMouseWheel)
-    {
-        float angle = 1;
-        Quat rot = GetRotation();
-        rot.SetRotationXYZ(Ang3(0.f, 0.f, rot.GetRotZ() + DEG2RAD(flags > 0 ? angle * (-1) : angle)));
-        SetRotation(rot);
-    }
-    return MOUSECREATE_CONTINUE;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CBaseObject::OnEvent(ObjectEvent event)
 {
@@ -1277,18 +1141,13 @@ void CBaseObject::OnEvent(ObjectEvent event)
 
 
 //////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetShared([[maybe_unused]] bool bShared)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated)
+void CBaseObject::SetHidden(bool bHidden, bool bAnimated)
 {
     if (CheckFlags(OBJFLAG_HIDDEN) != bHidden)
     {
         if (!bAnimated)
         {
-            StoreUndo("Hide Object");
+            StoreUndo();
         }
 
         if (bHidden)
@@ -1300,7 +1159,6 @@ void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated)
             ClearFlags(OBJFLAG_HIDDEN);
         }
 
-        m_hideOrder = hiddenID;
         UpdateVisibility(!IsHidden());
     }
 }
@@ -1310,7 +1168,7 @@ void CBaseObject::SetFrozen(bool bFrozen)
 {
     if (CheckFlags(OBJFLAG_FROZEN) != bFrozen)
     {
-        StoreUndo("Freeze Object");
+        StoreUndo();
         if (bFrozen)
         {
             SetFlags(OBJFLAG_FROZEN);
@@ -1396,14 +1254,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
     if (ar.bLoading)
     {
         // Loading.
-        if (ar.ShouldResetInternalMembers())
-        {
-            m_flags = 0;
-            m_flattenArea = 0.0f;
-            m_nMinSpec = 0;
-            m_scale.Set(1.0f, 1.0f, 1.0f);
-        }
-
         int flags = 0;
         int oldFlags = m_flags;
 
@@ -1443,7 +1293,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
         xmlNode->getAttr("LookAt", lookatId);
         xmlNode->getAttr("Material", mtlName);
         xmlNode->getAttr("MinSpec", nMinSpec);
-        xmlNode->getAttr("FloorNumber", m_floorNumber);
 
         if (nMinSpec <= CONFIG_VERYHIGH_SPEC) // Ignore invalid values.
         {
@@ -1507,18 +1356,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
         SetModified(false);
 
         //////////////////////////////////////////////////////////////////////////
-
-        if (ar.bUndo)
-        {
-            // If we are selected update UI Panel.
-            xmlNode->getAttr("HideOrder", m_hideOrder);
-        }
-
-        // We reseted the min spec and deserialized it so set it internally
-        if (ar.ShouldResetInternalMembers())
-        {
-            SetMinSpec(m_nMinSpec);
-        }
     }
     else
     {
@@ -1530,7 +1367,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
         xmlNode->setAttr("Id", m_guid);
 
         xmlNode->setAttr("Name", GetName().toUtf8().data());
-        xmlNode->setAttr("HideOrder", m_hideOrder);
 
         if (m_parent)
         {
@@ -1547,8 +1383,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
             xmlNode->setAttr("Pos", GetPos());
         }
 
-        xmlNode->setAttr("FloorNumber", m_floorNumber);
-
         xmlNode->setAttr("Rotate", m_rotate);
 
         if (!IsEquivalent(GetScale(), Vec3(1, 1, 1), 0))
@@ -1641,13 +1475,8 @@ CBaseObject* CBaseObject::FindObject(REFGUID id) const
 }
 
 //////////////////////////////////////////////////////////////////////////
-void CBaseObject::StoreUndo(const char* UndoDescription, bool minimal, int flags)
+void CBaseObject::StoreUndo(bool minimal, int flags)
 {
-    if (m_objType == OBJTYPE_DUMMY)
-    {
-        return;
-    }
-
     // Don't use Sandbox undo for AZ entities, except for the move & scale tools, which rely on it.
     const bool isGizmoTool = 0 != (flags & (eObjectUpdateFlags_MoveTool | eObjectUpdateFlags_ScaleTool | eObjectUpdateFlags_UserInput));
     if (!isGizmoTool && 0 != (m_flags & OBJFLAG_DONT_SAVE))
@@ -1659,28 +1488,18 @@ void CBaseObject::StoreUndo(const char* UndoDescription, bool minimal, int flags
     {
         if (minimal)
         {
-            CUndo::Record(new CUndoBaseObjectMinimal(this, UndoDescription, flags));
+            CUndo::Record(new CUndoBaseObjectMinimal(this, flags));
         }
         else
         {
-            CUndo::Record(new CUndoBaseObject(this, UndoDescription));
+            CUndo::Record(new CUndoBaseObject(this));
         }
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsCreateGameObjects() const
-{
-    return GetObjectManager()->IsCreateGameObjects();
-}
-
 //////////////////////////////////////////////////////////////////////////
 QString CBaseObject::GetTypeName() const
 {
-    if (m_objType == OBJTYPE_DUMMY)
-    {
-        return "";
-    }
     QString className = m_classDesc->ClassName();
     QString subClassName = strstr(className.toUtf8().data(), "::");
     if (subClassName.isEmpty())
@@ -1689,7 +1508,7 @@ QString CBaseObject::GetTypeName() const
     }
 
     QString name;
-    name.append(className.mid(0, className.length() - subClassName.length()));
+    name.append(className.midRef(0, className.length() - subClassName.length()));
     return name;
 }
 
@@ -1941,85 +1760,6 @@ bool CBaseObject::HitTestRect(HitContext& hc)
     return bHit;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitHelperTest(HitContext& hc)
-{
-    return HitHelperAtTest(hc, GetWorldPos());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitHelperAtTest(HitContext& hc, const Vec3& pos)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-
-    bool bResult = false;
-
-    if (m_nTextureIcon && (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons) && !hc.bUseSelectionHelpers)
-    {
-        int iconSizeX = OBJECT_TEXTURE_ICON_SIZEX;
-        int iconSizeY = OBJECT_TEXTURE_ICON_SIZEY;
-
-        if (gSettings.viewports.bDistanceScaleIcons)
-        {
-            float fScreenScale = hc.view->GetScreenScaleFactor(pos);
-
-            iconSizeX = static_cast<int>(static_cast<float>(iconSizeX) * OBJECT_TEXTURE_ICON_SCALE / fScreenScale);
-            iconSizeY = static_cast<int>(static_cast<float>(iconSizeY) * OBJECT_TEXTURE_ICON_SCALE / fScreenScale);
-        }
-
-        // Hit Test icon of this object.
-        Vec3 testPos = pos;
-        int y0 = -(iconSizeY / 2);
-        int y1 = +(iconSizeY / 2);
-        if (CheckFlags(OBJFLAG_SHOW_ICONONTOP))
-        {
-            Vec3 objectPos = GetWorldPos();
-
-            AABB box;
-            GetBoundBox(box);
-            testPos.z = (pos.z - objectPos.z) + box.max.z;
-            y0 = -(iconSizeY);
-            y1 = 0;
-        }
-        QPoint pnt = hc.view->WorldToView(testPos);
-
-        if (hc.point2d.x() >= pnt.x() - (iconSizeX / 2) && hc.point2d.x() <= pnt.x() + (iconSizeX / 2) &&
-            hc.point2d.y() >= pnt.y() + y0 && hc.point2d.y() <= pnt.y() + y1)
-        {
-            hc.dist = hc.raySrc.GetDistance(testPos) - 0.2f;
-            hc.iconHit = true;
-            bResult = true;
-        }
-    }
-    else if (hc.bUseSelectionHelpers)
-    {
-        // Check potentially children first
-        bResult = HitHelperTestForChildObjects(hc);
-
-        // If no hit check this object
-        if (!bResult)
-        {
-            // Hit test helper.
-            Vec3 w = pos - hc.raySrc;
-            w = hc.rayDir.Cross(w);
-            float d = w.GetLengthSquared();
-
-            static const float screenScaleToRadiusFactor = 0.008f;
-            const float radius = hc.view->GetScreenScaleFactor(pos) * screenScaleToRadiusFactor;
-            const float pickDistance = hc.raySrc.GetDistance(pos);
-            if (d < radius * radius + hc.distanceTolerance && hc.dist >= pickDistance)
-            {
-                hc.dist = pickDistance;
-                hc.object = this;
-                bResult = true;
-            }
-        }
-    }
-
-
-    return bResult;
-}
-
 //////////////////////////////////////////////////////////////////////////
 CBaseObject* CBaseObject::GetChild(size_t const i) const
 {
@@ -2027,47 +1767,6 @@ CBaseObject* CBaseObject::GetChild(size_t const i) const
     return m_childs[i];
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsChildOf(CBaseObject* node)
-{
-    CBaseObject* p = m_parent;
-    while (p && p != node)
-    {
-        p = p->m_parent;
-    }
-    if (p == node)
-    {
-        return true;
-    }
-    return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::CloneChildren(CBaseObject* pFromObject)
-{
-    if (pFromObject == nullptr)
-    {
-        return;
-    }
-
-    for (size_t i = 0, nChildCount(pFromObject->GetChildCount()); i < nChildCount; ++i)
-    {
-        CBaseObject* pFromChildObject = pFromObject->GetChild(i);
-
-        CBaseObject* pChildClone = GetObjectManager()->CloneObject(pFromChildObject);
-        if (pChildClone == nullptr)
-        {
-            continue;
-        }
-
-        pChildClone->CloneChildren(pFromChildObject);
-        AddMember(pChildClone, false);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
 {
@@ -2084,7 +1783,6 @@ void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
             return;
         }
 
-        static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(child, ON_PREATTACHED);
         child->NotifyListeners(bKeepPos ? ON_PREATTACHEDKEEPXFORM : ON_PREATTACHED);
 
         pTransformDelegate = m_pTransformDelegate;
@@ -2129,7 +1827,6 @@ void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
         m_pTransformDelegate = pTransformDelegate;
         child->m_pTransformDelegate = pChildTransformDelegate;
 
-        static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(child, ON_ATTACHED);
         child->NotifyListeners(ON_ATTACHED);
 
         NotifyListeners(ON_CHILDATTACHED);
@@ -2167,7 +1864,6 @@ void CBaseObject::DetachThis(bool bKeepPos)
 
         {
             CScopedSuspendUndo suspendUndo;
-            static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(this, ON_PREDETACHED);
             NotifyListeners(bKeepPos ? ON_PREDETACHEDKEEPXFORM : ON_PREDETACHED);
 
             pTransformDelegate = m_pTransformDelegate;
@@ -2198,7 +1894,6 @@ void CBaseObject::DetachThis(bool bKeepPos)
 
             SetTransformDelegate(pTransformDelegate);
 
-            static_cast<CObjectManager*>(GetObjectManager())->NotifyObjectListeners(this, ON_DETACHED);
             NotifyListeners(ON_DETACHED);
         }
     }
@@ -2302,12 +1997,6 @@ Matrix34 CBaseObject::GetParentAttachPointWorldTM() const
     return Matrix34(IDENTITY);
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsParentAttachmentValid() const
-{
-    return true;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CBaseObject::InvalidateTM([[maybe_unused]] int flags)
 {
@@ -2458,7 +2147,7 @@ void CBaseObject::SetLookAt(CBaseObject* target)
         return;
     }
 
-    StoreUndo("Change LookAt");
+    StoreUndo();
 
     if (m_lookat)
     {
@@ -2583,63 +2272,6 @@ void CBaseObject::Validate(IErrorReport* report)
     //////////////////////////////////////////////////////////////////////////
 };
 
-//////////////////////////////////////////////////////////////////////////
-Ang3 CBaseObject::GetWorldAngles() const
-{
-    if (m_scale == Vec3(1, 1, 1))
-    {
-        Quat q = Quat(GetWorldTM());
-        Ang3 angles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(q)));
-        return angles;
-    }
-    else
-    {
-        Matrix34 tm = GetWorldTM();
-        tm.OrthonormalizeFast();
-        Quat q = Quat(tm);
-        Ang3 angles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(q)));
-        return angles;
-    }
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx)
-{
-    CBaseObject* pFromParent = pFromObject->GetParent();
-    if (pFromParent)
-    {
-        SetFloorNumber(pFromObject->GetFloorNumber());
-
-        CBaseObject* pFromParentInContext = ctx.FindClone(pFromParent);
-        if (pFromParentInContext)
-        {
-            pFromParentInContext->AddMember(this, false);
-        }
-        else
-        {
-            pFromParent->AddMember(this, false);
-        }
-    }
-    if (pFromObject->ShouldCloneChildren())
-    {
-        for (int i = 0; i < pFromObject->GetChildCount(); i++)
-        {
-            CBaseObject* pChildObject = pFromObject->GetChild(i);
-            CBaseObject* pClonedChild = GetObjectManager()->CloneObject(pChildObject);
-            ctx.AddClone(pChildObject, pClonedChild);
-        }
-        for (int i = 0; i < pFromObject->GetChildCount(); i++)
-        {
-            CBaseObject* pChildObject = pFromObject->GetChild(i);
-            CBaseObject* pClonedChild = ctx.FindClone(pChildObject);
-            if (pClonedChild)
-            {
-                pClonedChild->PostClone(pChildObject, ctx);
-            }
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CBaseObject::GatherUsedResources(CUsedResources& resources)
 {
@@ -2675,79 +2307,6 @@ void CBaseObject::SetMinSpec(uint32 nSpec, bool bSetChildren)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnPropertyChanged(IVariable*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnMultiSelPropertyChanged(IVariable*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnMenuShowInAssetBrowser()
-{
-    if (!IsSelected())
-    {
-        CUndo undo("Select Object");
-        GetIEditor()->GetObjectManager()->ClearSelection();
-        GetIEditor()->SelectObject(this);
-    }
-
-    GetIEditor()->ExecuteCommand("asset_browser.show_viewport_selection");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnContextMenu(QMenu* menu)
-{
-    if (!menu->isEmpty())
-    {
-        menu->addSeparator();
-    }
-    CUsedResources resources;
-    GatherUsedResources(resources);
-
-    static_cast<CEditorImpl*>(GetIEditor())->OnObjectContextMenuOpened(menu, this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayHitInfo& outHitInfo) const
-{
-    const float fRenderMeshTestDistance = 0.2f;
-    IRenderNode* pRenderNode = GetEngineNode();
-    if (!pRenderNode)
-    {
-        return false;
-    }
-
-    Matrix34 worldTM;
-    IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM);
-    if (!pStatObj)
-    {
-        return false;
-    }
-
-    // transform decal into object space
-    Matrix34 worldTM_Inverted = worldTM.GetInverted();
-    Matrix33 worldRot(worldTM_Inverted);
-    worldRot.Transpose();
-    // put hit direction into the object space
-    Vec3 vRayDir = rayDir.GetNormalized() * worldRot;
-    // put hit position into the object space
-    Vec3 vHitPos = worldTM_Inverted.TransformPoint(raySrc);
-    Vec3 vLineP1 = vHitPos - vRayDir * fRenderMeshTestDistance;
-
-    memset(&outHitInfo, 0, sizeof(outHitInfo));
-    outHitInfo.inReferencePoint = vHitPos;
-    outHitInfo.inRay.origin = vLineP1;
-    outHitInfo.inRay.direction = vRayDir;
-    outHitInfo.bInFirstHit = false;
-    outHitInfo.bUseCache = false;
-
-    return pStatObj->RayIntersection(outHitInfo, nullptr);
-}
-
 //////////////////////////////////////////////////////////////////////////
 EScaleWarningLevel CBaseObject::GetScaleWarningLevel() const
 {
diff --git a/Code/Editor/Objects/BaseObject.h b/Code/Editor/Objects/BaseObject.h
index 3865696ecb..f78755e81d 100644
--- a/Code/Editor/Objects/BaseObject.h
+++ b/Code/Editor/Objects/BaseObject.h
@@ -35,8 +35,6 @@ struct SSubObjSelectionModifyContext;
 struct SRayHitInfo;
 class CPopupMenuItem;
 class QMenu;
-struct IRenderNode;
-struct IStatObj;
 
 //////////////////////////////////////////////////////////////////////////
 typedef _smart_ptr<CBaseObject> CBaseObjectPtr;
@@ -119,15 +117,6 @@ enum ObjectFlags
 
 #define ERF_GET_WRITABLE(flags) (flags)
 
-//////////////////////////////////////////////////////////////////////////
-//! This flags passed to CBaseObject::BeginEditParams method.
-enum ObjectEditFlags
-{
-    OBJECT_CREATE   = 0x001,
-    OBJECT_EDIT     = 0x002,
-    OBJECT_COLLAPSE_OBJECTPANEL = 0x004
-};
-
 //////////////////////////////////////////////////////////////////////////
 //! Return values from CBaseObject::MouseCreateCallback method.
 enum MouseCreateResult
@@ -137,19 +126,6 @@ enum MouseCreateResult
     MOUSECREATE_OK,                     //!< Accept this object.
 };
 
-//////////////////////////////////////////////////////////////////////////
-// Interface to the object create with the mouse callback.
-//////////////////////////////////////////////////////////////////////////
-struct IMouseCreateCallback
-{
-    virtual void Release() = 0;
-    virtual MouseCreateResult OnMouseEvent(CViewport* view, EMouseEvent event, QPoint& point, int flags) = 0;
-    // Some process of creation need to be able to be displayed such as creation for custom solid.
-    virtual void Display([[maybe_unused]] DisplayContext& dc){}
-    // Called after accepting an object to see if new object creation mode should be continued.
-    virtual bool ContinueCreation() = 0;
-};
-
 // Flags used for object interaction
 enum EObjectUpdateFlags
 {
@@ -261,22 +237,11 @@ public:
 
     /** Check if both object are of same class.
     */
-    virtual bool IsSameClass(CBaseObject* obj);
-    virtual void SetDefaultType() { m_objType = OBJTYPE_DUMMY; };
     virtual ObjectType GetType() const
     {
-        if (m_objType == OBJTYPE_DUMMY)
-        {
-            return m_objType;
-        }
-        else
-        {
-            return m_classDesc->GetObjectType();
-        }
+        return m_classDesc->GetObjectType();
     };
-    //  const char* GetTypeName() const { return m_classDesc->ClassName(); };
     QString GetTypeName() const;
-    virtual QString GetTypeDescription() const { return m_classDesc->ClassName(); };
 
     //////////////////////////////////////////////////////////////////////////
     // Flags.
@@ -289,8 +254,6 @@ public:
     // Hidden ID
     //////////////////////////////////////////////////////////////////////////
     static const uint64 s_invalidHiddenID = 0;
-    uint64 GetHideOrder() const { return m_hideOrder; }
-    void SetHideOrder(uint64 newID) { m_hideOrder = newID; }
 
     //! Returns true if object hidden.
     bool IsHidden() const;
@@ -307,26 +270,19 @@ public:
     virtual bool IsSelectable() const;
 
     // Return texture icon.
-    bool HaveTextureIcon() const { return m_nTextureIcon != 0; };
     int GetTextureIcon() const { return m_nTextureIcon; }
     void SetTextureIcon(int nTexIcon) { m_nTextureIcon = nTexIcon; }
 
-    //! Set shared between missions flag.
-    virtual void SetShared(bool bShared);
     //! Set object hidden status.
-    virtual void SetHidden(bool bHidden, uint64 hiddenId = CBaseObject::s_invalidHiddenID, bool bAnimated = false);
+    virtual void SetHidden(bool bHidden, bool bAnimated = false);
     //! Set object frozen status.
     virtual void SetFrozen(bool bFrozen);
     //! Set object selected status.
     virtual void SetSelected(bool bSelect);
-    //! Return associated 3DEngine render node
-    virtual IRenderNode* GetEngineNode() const { return nullptr; };
     //! Set object highlighted (Note: not selected)
     virtual void SetHighlight(bool bHighlight);
     //! Check if object is highlighted.
     bool IsHighlighted() const { return CheckFlags(OBJFLAG_HIGHLIGHT); }
-    //! Check if object can have measurement axises.
-    virtual bool HasMeasurementAxis() const {   return true;    }
     //! Check if the object is isolated when the editor is in Isolation Mode
     virtual bool IsIsolated() const { return false; }
 
@@ -345,8 +301,6 @@ public:
     //////////////////////////////////////////////////////////////////////////
     //! Get name of object.
     const QString& GetName() const;
-    virtual QString GetComment() const { return QString(); }
-    virtual QString GetWarningsText() const;
 
     //! Change name of object.
     virtual void SetName(const QString& name);
@@ -376,10 +330,6 @@ public:
     //! Get object scale.
     const Vec3 GetScale() const;
 
-    virtual bool StartScaling()                                                         {   return false;   }
-    virtual bool GetUntransformedScale([[maybe_unused]] Vec3& scale) const {   return false;   }
-    virtual bool TransformScale([[maybe_unused]] const Vec3& scale)                {   return false;   }
-
     //! Set flatten area.
     void SetArea(float area);
     float GetArea() const { return m_flattenArea; };
@@ -397,8 +347,6 @@ public:
     // CHILDS
     //////////////////////////////////////////////////////////////////////////
 
-    //! Return true if node have childs.
-    bool HaveChilds() const { return !m_childs.empty(); }
     //! Return true if have attached childs.
     size_t GetChildCount() const { return m_childs.size(); }
 
@@ -406,10 +354,6 @@ public:
     CBaseObject* GetChild(size_t const i) const;
     //! Return parent node if exist.
     CBaseObject* GetParent() const { return m_parent; };
-    //! Scans hierarchy up to determine if we child of specified node.
-    virtual bool IsChildOf(CBaseObject* node);
-    //! Clone Children
-    void CloneChildren(CBaseObject* pFromObject);
     //! Attach new child node.
     //! @param bKeepPos if true Child node will keep its world space position.
     virtual void AttachChild(CBaseObject* child, bool bKeepPos = true);
@@ -422,8 +366,6 @@ public:
     virtual void DetachAll(bool bKeepPos = true);
     // Detach this node from parent.
     virtual void DetachThis(bool bKeepPos = true);
-    // Returns the link parent.
-    virtual CBaseObject* GetLinkParent() const { return GetParent(); }
 
     //////////////////////////////////////////////////////////////////////////
     // MATRIX
@@ -437,15 +379,11 @@ public:
     // Gets matrix of parent attachment point
     virtual Matrix34 GetParentAttachPointWorldTM() const;
 
-    // Checks if the attachment point is valid
-    virtual bool IsParentAttachmentValid() const;
-
     //! Set position in world space.
     virtual void SetWorldPos(const Vec3& pos, int flags = 0);
 
     //! Get position in world space.
     Vec3 GetWorldPos() const { return GetWorldTM().GetTranslation(); };
-    Ang3 GetWorldAngles() const;
 
     //! Set xform of object given in world space.
     virtual void SetWorldTM(const Matrix34& tm, int flags = 0);
@@ -460,12 +398,6 @@ public:
     // Interface to be implemented in plugins.
     //////////////////////////////////////////////////////////////////////////
 
-    //! Called when object is being created (use GetMouseCreateCallback for more advanced mouse creation callback).
-    virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags);
-    // Return pointer to the callback object used when creating object by the mouse.
-    // If this function return nullptr MouseCreateCallback method will be used instead.
-    virtual IMouseCreateCallback* GetMouseCreateCallback() { return nullptr; };
-
     //! Draw object to specified viewport.
     virtual void Display([[maybe_unused]] DisplayContext& disp) {}
 
@@ -477,10 +409,6 @@ public:
     //! Return true if was hit.
     virtual bool HitTestRect(HitContext& hc);
 
-    //! Perform intersection testing of this object based on its icon helper.
-    //! Return true if was hit.
-    virtual bool HitHelperTest(HitContext& hc);
-
     //! Get bounding box of object in world coordinate space.
     virtual void GetBoundBox(AABB& box);
 
@@ -500,8 +428,6 @@ public:
     //! @param bUndo true if loading or saving data for Undo/Redo purposes.
     virtual void Serialize(CObjectArchive& ar);
 
-    //// Pre load called before serialize after all objects where completly loaded.
-    //virtual void PreLoad( CObjectArchive &ar ) {};
     // Post load called after all objects where completely loaded.
     virtual void PostLoad([[maybe_unused]] CObjectArchive& ar) {};
 
@@ -513,9 +439,6 @@ public:
     //! Override in derived classes, to handle specific events.
     virtual void OnEvent(ObjectEvent event);
 
-    //! Generate dynamic context menu for the object
-    virtual void OnContextMenu(QMenu* menu);
-
     //////////////////////////////////////////////////////////////////////////
     // LookAt Target.
     //////////////////////////////////////////////////////////////////////////
@@ -523,13 +446,11 @@ public:
     CBaseObject* GetLookAt() const { return m_lookat; };
     //! Returns true if this object is a look-at target.
     bool IsLookAtTarget() const;
-    CBaseObject* GetLookAtSource() const { return m_lookatSource; };
-
 
     IObjectManager* GetObjectManager() const;
 
     //! Store undo information for this object.
-    void StoreUndo(const char* undoDescription, bool minimal = false, int flags = 0);
+    void StoreUndo(bool minimal = false, int flags = 0);
 
     //! Add event listener callback.
     void AddEventListener(EventListener* listener);
@@ -548,52 +469,21 @@ public:
     //! Check if specified object is very similar to this one.
     virtual bool IsSimilarObject(CBaseObject* pObject);
 
-    //////////////////////////////////////////////////////////////////////////
-    // Material Layers Mask.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetMaterialLayersMask(uint32 nLayersMask) { m_nMaterialLayersMask = nLayersMask; }
-    uint32 GetMaterialLayersMask() const { return m_nMaterialLayersMask; };
-
     //////////////////////////////////////////////////////////////////////////
     // Object minimal usage spec (All/Low/Medium/High)
     //////////////////////////////////////////////////////////////////////////
     uint32 GetMinSpec() const { return m_nMinSpec; }
     virtual void SetMinSpec(uint32 nSpec, bool bSetChildren = true);
 
-    //////////////////////////////////////////////////////////////////////////
-    // SubObj selection.
-    //////////////////////////////////////////////////////////////////////////
-    // Return true if object support selecting of this sub object element type.
-    virtual bool StartSubObjSelection([[maybe_unused]] int elemType) { return false; };
-    virtual void EndSubObjectSelection() {};
-    virtual void ModifySubObjSelection([[maybe_unused]] SSubObjSelectionModifyContext& modCtx) {};
-    virtual void AcceptSubObjectModify() {};
-
     //! In This function variables of the object must be initialized.
     virtual void InitVariables() {};
 
-    //////////////////////////////////////////////////////////////////////////
-    // Procedural Floor Management.
-    //////////////////////////////////////////////////////////////////////////
-    int GetFloorNumber() const { return m_floorNumber; };
-    void SetFloorNumber(int floorNumber) { m_floorNumber = floorNumber; };
-
-    virtual void OnPropertyChanged(IVariable*);
-    virtual void OnMultiSelPropertyChanged(IVariable*);
-
     //! Draw a reddish highlight indicating its budget usage.
     virtual void DrawBudgetUsage(DisplayContext& dc, const QColor& color);
 
-    bool IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayHitInfo& outHitInfo) const;
-
-    virtual void EditTags([[maybe_unused]] bool alwaysTag) {}
-    virtual bool SupportsEditTags() const { return false; }
-
     bool CanBeHightlighted() const;
     bool IsSkipSelectionHelper() const;
 
-    virtual IStatObj* GetIStatObj() {   return nullptr; }
-
     // Invalidates cached transformation matrix.
     // nWhyFlags - Flags that indicate the reason for matrix invalidation.
     virtual void InvalidateTM(int nWhyFlags);
@@ -612,26 +502,14 @@ protected:
     //! Optional file parameter specify initial object or script for this object.
     virtual bool Init(IEditor* ie, CBaseObject* prev, const QString& file);
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Must be called after cloning the object on clone of object.
-    //! This will make sure object references are cloned correctly.
-    virtual void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx);
-
     //! Must be implemented by derived class to create game related objects.
     virtual bool CreateGameObject() { return true; };
 
-    //! If true, all attached chilren will be cloned when the parent object is cloned.
-    virtual bool ShouldCloneChildren() const { return true; }
-
     /** Called when object is about to be deleted.
-            All Game resources should be freed in this function.
+        All Game resources should be freed in this function.
     */
     virtual void Done();
 
-    /** Change current id of object.
-    */
-    //virtual void SetId( uint32 objectId ) { m_id = objectId; };
-
     //! Call this to delete an object.
     virtual void DeleteThis() = 0;
 
@@ -674,11 +552,6 @@ protected:
     //! Returns if the object can be drawn, and if its selection helper should also be drawn.
     bool CanBeDrawn(const DisplayContext& dc, bool& outDisplaySelectionHelper) const;
 
-    //! Returns if object is in the camera view.
-    virtual bool IsInCameraView(const CCamera& camera);
-    //! Returns vis ratio of object in camera
-    virtual float GetCameraVisRatio(const CCamera& camera);
-
     // Do basic intersection tests
     virtual bool IntersectRectBounds(const AABB& bbox);
     virtual bool IntersectRayBounds(const Ray& ray);
@@ -687,17 +560,11 @@ protected:
     // Function can be used by derived classes.
     bool HitTestRectBounds(HitContext& hc, const AABB& box);
 
-    // Do helper hit testing as specific location.
-    bool HitHelperAtTest(HitContext& hc, const Vec3& pos);
-
     // Do helper hit testing taking child objects into account (e.g. opened prefab)
     virtual bool HitHelperTestForChildObjects([[maybe_unused]] HitContext& hc) { return false; }
 
     CBaseObject* FindObject(REFGUID id) const;
 
-    // Returns true if game objects should be created.
-    bool IsCreateGameObjects() const;
-
     // Helper gizmo functions.
     void AddGizmo(CGizmo* gizmo);
     void RemoveGizmo(CGizmo* gizmo);
@@ -708,14 +575,6 @@ protected:
     //! Only used by ObjectManager.
     bool IsPotentiallyVisible() const;
 
-    //////////////////////////////////////////////////////////////////////////
-    // May be overridden in derived classes to handle helpers scaling.
-    //////////////////////////////////////////////////////////////////////////
-    virtual void SetHelperScale([[maybe_unused]] float scale) {};
-    virtual float GetHelperScale() { return 1.0f; };
-
-    void SetNameInternal(const QString& name) { m_name = name; }
-
     void SetDrawTextureIconProperties(DisplayContext& dc, const Vec3& pos, float alpha = 1.0f, int texIconFlags = 0);
     const Vec3& GetTextureIconDrawPos(){ return m_vDrawIconPos; };
     int GetTextureIconFlags(){ return m_nIconFlags; };
@@ -737,8 +596,6 @@ private:
     friend class CObjectArchive;
     friend class CSelectionGroup;
 
-    void OnMenuShowInAssetBrowser();
-
     //! Set class description for this object,
     //! Only called once after creation by ObjectManager.
     void SetClassDesc(CObjectClassDesc* classDesc);
@@ -746,9 +603,6 @@ private:
     EScaleWarningLevel GetScaleWarningLevel() const;
     ERotationWarningLevel GetRotationWarningLevel() const;
 
-    // auto resolving
-    void OnMtlResolved(uint32 id, bool success, const char* orgName, const char* newName);
-
     bool IsInSelectionBox() const { return m_bInSelectionBox; }
 
     void SetId(REFGUID guid) { m_guid = guid; }
@@ -771,13 +625,10 @@ private:
     //! Unique object Id.
     GUID m_guid;
 
-    // floor number of object if procedural object flag is set
-    int m_floorNumber;
-
     //! Flags of this object.
     int m_flags;
 
-    // Id of the texture icon for this object.
+    //! Id of the texture icon for this object.
     int m_nTextureIcon;
 
     //! Display color.
@@ -828,13 +679,10 @@ private:
     mutable uint32 m_bMatrixValid : 1;
     mutable uint32 m_bWorldBoxValid : 1;
     uint32 m_bInSelectionBox : 1;
-    uint32 m_nMaterialLayersMask : 8;
     uint32 m_nMinSpec : 8;
 
     Vec3 m_vDrawIconPos;
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-    uint64 m_hideOrder;
 };
 
 Q_DECLARE_METATYPE(CBaseObject*)
diff --git a/Code/Editor/Objects/DisplayContext.h b/Code/Editor/Objects/DisplayContext.h
index 0f0f0e665a..8f54be78fe 100644
--- a/Code/Editor/Objects/DisplayContext.h
+++ b/Code/Editor/Objects/DisplayContext.h
@@ -31,7 +31,6 @@ struct IRenderer;
 struct IRenderAuxGeom;
 struct IIconManager;
 class CDisplaySettings;
-class CCamera;
 class QPoint;
 
 enum DisplayFlags
@@ -66,7 +65,6 @@ struct SANDBOX_API DisplayContext
     IDisplayViewport* view;
     IRenderAuxGeom* pRenderAuxGeom;
     IIconManager* pIconManager;
-    CCamera*    camera;
     AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
     AABB    box;    // Bounding box of volume that need to be repainted.
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
@@ -83,11 +81,38 @@ struct SANDBOX_API DisplayContext
     // Draw functions
     //////////////////////////////////////////////////////////////////////////
     //! Set current materialc color.
-    void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(static_cast<uint8>(r * 255.0f), static_cast<uint8>(g * 255.0f), static_cast<uint8>(b * 255.0f), static_cast<uint8>(a * 255.0f)); };
-    void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(static_cast<uint8>(color.x * 255.0f), static_cast<uint8>(color.y * 255.0f), static_cast<uint8>(color.z * 255.0f), static_cast<uint8>(a * 255.0f)); };
-    void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(static_cast<uint8>(rgb.red()), static_cast<uint8>(rgb.green()), static_cast<uint8>(rgb.blue()), static_cast<uint8>(a * 255.0f)); };
-    void SetColor(const QColor& color) { m_color4b = ColorB(static_cast<uint8>(color.red()), static_cast<uint8>(color.green()), static_cast<uint8>(color.blue()), static_cast<uint8>(color.alpha())); };
-    void SetColor(const ColorB& color) { m_color4b = color; };
+    void SetColor(float r, float g, float b, float a = 1)
+    {
+        m_color4b = ColorB(
+            static_cast<uint8>(r * 255.0f), static_cast<uint8>(g * 255.0f), static_cast<uint8>(b * 255.0f), static_cast<uint8>(a * 255.0f));
+    };
+    void SetColor(const Vec3& color, float a = 1)
+    {
+        m_color4b = ColorB(
+            static_cast<uint8>(color.x * 255.0f), static_cast<uint8>(color.y * 255.0f), static_cast<uint8>(color.z * 255.0f),
+            static_cast<uint8>(a * 255.0f));
+    };
+    void SetColor(const AZ::Vector3& color, float a = 1)
+    {
+        m_color4b = ColorB(
+            static_cast<uint8>(color.GetX() * 255.0f), static_cast<uint8>(color.GetY() * 255.0f), static_cast<uint8>(color.GetZ() * 255.0f),
+            static_cast<uint8>(a * 255.0f));
+    };
+    void SetColor(const QColor& rgb, float a)
+    {
+        m_color4b = ColorB(
+            static_cast<uint8>(rgb.red()), static_cast<uint8>(rgb.green()), static_cast<uint8>(rgb.blue()), static_cast<uint8>(a * 255.0f));
+    };
+    void SetColor(const QColor& color)
+    {
+        m_color4b = ColorB(
+            static_cast<uint8>(color.red()), static_cast<uint8>(color.green()), static_cast<uint8>(color.blue()),
+            static_cast<uint8>(color.alpha()));
+    };
+    void SetColor(const ColorB& color)
+    {
+        m_color4b = color;
+    };
     void SetAlpha(float a = 1) { m_color4b.a = static_cast<uint8>(a * 255.0f); };
     ColorB GetColor() const { return m_color4b; }
 
@@ -110,6 +135,7 @@ struct SANDBOX_API DisplayContext
     void DrawTrianglesIndexed(const AZStd::vector<Vec3>& vertices, const AZStd::vector<vtx_idx>& indices, const ColorB& color);
     // Draw wireframe box.
     void DrawWireBox(const Vec3& min, const Vec3& max);
+    void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max);
     // Draw filled box
     void DrawSolidBox(const Vec3& min, const Vec3& max);
     void DrawSolidOBB(const Vec3& center, const Vec3& axisX, const Vec3& axisY, const Vec3& axisZ, const Vec3& halfExtents);
diff --git a/Code/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl
index df0b1f82a1..1fbd2ef7b6 100644
--- a/Code/Editor/Objects/DisplayContextShared.inl
+++ b/Code/Editor/Objects/DisplayContextShared.inl
@@ -225,6 +225,12 @@ void DisplayContext::DrawWireBox(const Vec3& min, const Vec3& max)
     pRenderAuxGeom->DrawAABB(AABB(min, max), m_matrixStack[m_currentMatrix], false, m_color4b, eBBD_Faceted);
 }
 
+void DisplayContext::DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max)
+{
+    pRenderAuxGeom->DrawAABB(
+        AABB(Vec3(min.GetX(), min.GetY(), min.GetZ()), Vec3(max.GetX(), max.GetY(), max.GetZ())),
+        m_matrixStack[m_currentMatrix], false, m_color4b, eBBD_Faceted);
+}
 //////////////////////////////////////////////////////////////////////////
 void DisplayContext::DrawSolidBox(const Vec3& min, const Vec3& max)
 {
@@ -1138,10 +1144,6 @@ bool DisplayContext::IsVisible(const AABB& bounds)
             return true;
         }
     }
-    else
-    {
-        return camera->IsAABBVisible_F(AABB(bounds.min, bounds.max));
-    }
     return false;
 }
 
diff --git a/Code/Editor/Objects/EntityObject.cpp b/Code/Editor/Objects/EntityObject.cpp
index 6e2354998c..86512377c6 100644
--- a/Code/Editor/Objects/EntityObject.cpp
+++ b/Code/Editor/Objects/EntityObject.cpp
@@ -28,8 +28,7 @@
 #include "HitContext.h"
 #include "Objects/SelectionGroup.h"
 
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
+static constexpr int VIEW_DISTANCE_MULTIPLIER_MAX = 100;
 
 //////////////////////////////////////////////////////////////////////////
 //! Undo Entity Link
@@ -58,7 +57,6 @@ public:
 protected:
     void Release() override { delete this; };
     int GetSize() override { return sizeof(*this); }; // Return size of xml state.
-    QString GetDescription() override { return "Entity Link"; };
     QString GetObjectName() override{ return ""; };
 
     void Undo([[maybe_unused]] bool bUndo) override
@@ -139,7 +137,6 @@ private:
     }
 
     int GetSize() override { return sizeof(CUndoAttachEntity); }
-    QString GetDescription() override { return "Attachment Changed"; }
 
     GUID m_attachedEntityGUID;
     CEntityObject::EAttachmentType m_attachmentType;
@@ -151,8 +148,6 @@ private:
 // CBase implementation.
 //////////////////////////////////////////////////////////////////////////
 
-float CEntityObject::m_helperScale = 1;
-
 namespace
 {
     CEntityObject* s_pPropertyPanelEntityObject = nullptr;
@@ -163,12 +158,9 @@ namespace
 
 //////////////////////////////////////////////////////////////////////////
 CEntityObject::CEntityObject()
-    : m_listeners(1)
 {
     m_bLoadFailed = false;
 
-    m_visualObject = nullptr;
-
     m_box.min.Set(0, 0, 0);
     m_box.max.Set(0, 0, 0);
 
@@ -223,7 +215,7 @@ CEntityObject::CEntityObject()
     mv_ratioLOD = 100;
     mv_viewDistanceMultiplier = 1.0f;
     mv_ratioLOD.SetLimits(0, 255);
-    mv_viewDistanceMultiplier.SetLimits(0.0f, IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX);
+    mv_viewDistanceMultiplier.SetLimits(0.0f, VIEW_DISTANCE_MULTIPLIER_MAX);
 
     m_physicsState = nullptr;
 
@@ -247,7 +239,6 @@ CEntityObject::CEntityObject()
     m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectInAllDirsChange(var); });
     m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectorFOVChange(var); });
     m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectorTextureChange(var); });
-    m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnPropertyChange(var); });
     m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnRadiusChange(var); });
 }
 
@@ -295,11 +286,6 @@ void CEntityObject::Done()
     ReleaseEventTargets();
     RemoveAllEntityLinks();
 
-    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
-    {
-        notifier->OnDone();
-    }
-
     CBaseObject::Done();
 }
 
@@ -365,12 +351,6 @@ void CEntityObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate)
     ResetCallbacks();
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::IsSameClass(CBaseObject* obj)
-{
-    return (GetClassDesc() == obj->GetClassDesc());
-}
-
 //////////////////////////////////////////////////////////////////////////
 bool CEntityObject::ConvertFromObject(CBaseObject* object)
 {
@@ -458,33 +438,10 @@ bool CEntityObject::HitTest(HitContext& hc)
     return false;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::HitHelperTest(HitContext& hc)
-{
-    bool bResult = CBaseObject::HitHelperTest(hc);
-    if (bResult)
-    {
-        hc.object = this;
-    }
-
-    return bResult;
-}
-
 //////////////////////////////////////////////////////////////////////////
 bool CEntityObject::HitTestRect(HitContext& hc)
 {
-    bool bResult = false;
-
-    if (m_visualObject && !gSettings.viewports.bShowIcons && !gSettings.viewports.bShowSizeBasedIcons)
-    {
-        AABB box;
-        box.SetTransformedAABB(GetWorldTM(), m_visualObject->GetAABB());
-        bResult = HitTestRectBounds(hc, box);
-    }
-    else
-    {
-        bResult = CBaseObject::HitTestRect(hc);
-    }
+    bool bResult = CBaseObject::HitTestRect(hc);
 
     if (bResult)
     {
@@ -494,42 +451,6 @@ bool CEntityObject::HitTestRect(HitContext& hc)
     return bResult;
 }
 
-//////////////////////////////////////////////////////////////////////////
-int CEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
-    AZ_PROFILE_FUNCTION(Entity);
-
-    if (event == eMouseMove || event == eMouseLDown)
-    {
-        Vec3 pos;
-        // Rise Entity above ground on Bounding box amount.
-        if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
-        {
-            pos = view->MapViewToCP(point);
-        }
-        else
-        {
-            // Snap to terrain.
-            bool hitTerrain;
-            pos = view->ViewToWorld(point, &hitTerrain);
-            if (hitTerrain)
-            {
-                pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
-                pos.z = pos.z - m_box.min.z;
-            }
-            pos = view->SnapToGrid(pos);
-        }
-        SetPos(pos);
-
-        if (event == eMouseLDown)
-        {
-            return MOUSECREATE_OK;
-        }
-        return MOUSECREATE_CONTINUE;
-    }
-    return CBaseObject::MouseCreateCallback(view, event, point, flags);
-}
-
 //////////////////////////////////////////////////////////////////////////
 IVariable* CEntityObject::FindVariableInSubBlock(CVarBlockPtr& properties, IVariable* pSubBlockVar, const char* pVarName)
 {
@@ -592,11 +513,11 @@ void CEntityObject::AdjustLightProperties(CVarBlockPtr& properties, const char*
     if (IVariable* pCastShadowVarLegacy = FindVariableInSubBlock(properties, pSubBlockVar, "bCastShadow"))
     {
         pCastShadowVarLegacy->SetFlags(pCastShadowVarLegacy->GetFlags() | IVariable::UI_INVISIBLE);
-
-        if (pCastShadowVarLegacy->GetDisplayValue()[0] != '0')
+        const QString zeroPrefix("0");
+        if (!pCastShadowVarLegacy->GetDisplayValue().startsWith(zeroPrefix))
         {
             bCastShadowLegacy = true;
-            pCastShadowVarLegacy->SetDisplayValue("0");
+            pCastShadowVarLegacy->SetDisplayValue(zeroPrefix);
         }
     }
 
@@ -680,11 +601,6 @@ void CEntityObject::SetName(const QString& name)
 
     CBaseObject::SetName(name);
 
-    CListenerSet<IEntityObjectListener*> listeners = m_listeners;
-    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(listeners); notifier.IsValid(); notifier.Next())
-    {
-        notifier->OnNameChanged(name.toUtf8().data());
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -697,19 +613,6 @@ void CEntityObject::SetSelected(bool bSelect)
         UpdateLightProperty();
     }
 
-    for (CListenerSet<IEntityObjectListener*>::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
-    {
-        notifier->OnSelectionChanged(bSelect);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnPropertyChange([[maybe_unused]] IVariable* var)
-{
-    if (s_ignorePropertiesUpdate)
-    {
-        return;
-    }
 }
 
 template <typename T>
@@ -941,11 +844,9 @@ void CEntityObject::Serialize(CObjectArchive& ar)
                 m_eventTargets.emplace_back(AZStd::move(et));
                 if (targetId != GUID_NULL)
                 {
-                    using namespace AZStd::placeholders;
                     ar.SetResolveCallback(
                         this, targetId,
-                        [this](CBaseObject* object, unsigned int index) { ResolveEventTarget(object, index); },
-                        i);
+                        [this,i](CBaseObject* object) { ResolveEventTarget(object, i); });
                 }
             }
         }
@@ -956,11 +857,7 @@ void CEntityObject::Serialize(CObjectArchive& ar)
         QString attachmentType;
         xmlNode->getAttr("AttachmentType", attachmentType);
 
-        if (attachmentType == "GeomCacheNode")
-        {
-            m_attachmentType = eAT_GeomCacheNode;
-        }
-        else if (attachmentType == "CharacterBone")
+        if (attachmentType == "CharacterBone")
         {
             m_attachmentType = eAT_CharacterBone;
         }
@@ -987,11 +884,7 @@ void CEntityObject::Serialize(CObjectArchive& ar)
     {
         if (m_attachmentType != eAT_Pivot)
         {
-            if (m_attachmentType == eAT_GeomCacheNode)
-            {
-                xmlNode->setAttr("AttachmentType", "GeomCacheNode");
-            }
-            else if (m_attachmentType == eAT_CharacterBone)
+            if (m_attachmentType == eAT_CharacterBone)
             {
                 xmlNode->setAttr("AttachmentType", "CharacterBone");
             }
@@ -1091,11 +984,7 @@ XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlN
                 objNode->setAttr("ParentId", parentEntity->GetEntityId());
                 if (m_attachmentType != eAT_Pivot)
                 {
-                    if (m_attachmentType == eAT_GeomCacheNode)
-                    {
-                        objNode->setAttr("AttachmentType", "GeomCacheNode");
-                    }
-                    else if (m_attachmentType == eAT_CharacterBone)
+                    if (m_attachmentType == eAT_CharacterBone)
                     {
                         objNode->setAttr("AttachmentType", "CharacterBone");
                     }
@@ -1166,12 +1055,6 @@ XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlN
         objNode->setAttr("MinSpec", ( uint32 )GetMinSpec());
     }
 
-    uint32 nMtlLayersMask = GetMaterialLayersMask();
-    if (nMtlLayersMask != 0)
-    {
-        objNode->setAttr("MatLayersMask", nMtlLayersMask);
-    }
-
     if (mv_hiddenInGame)
     {
         objNode->setAttr("HiddenInGame", true);
@@ -1268,11 +1151,6 @@ void CEntityObject::OnEvent(ObjectEvent event)
 
     case EVENT_CONFIG_SPEC_CHANGE:
     {
-        IObjectManager* objMan = GetIEditor()->GetObjectManager();
-        if (objMan && objMan->IsLightClass(this))
-        {
-            OnPropertyChange(nullptr);
-        }
         break;
     }
     default:
@@ -1362,56 +1240,6 @@ QString CEntityObject::GetLightAnimation() const
     return "";
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx)
-{
-    CBaseObject::PostClone(pFromObject, ctx);
-
-    CEntityObject* pFromEntity = ( CEntityObject* )pFromObject;
-    // Clone event targets.
-    if (!pFromEntity->m_eventTargets.empty())
-    {
-        size_t numTargets = pFromEntity->m_eventTargets.size();
-        for (size_t i = 0; i < numTargets; i++)
-        {
-            CEntityEventTarget& et = pFromEntity->m_eventTargets[i];
-            CBaseObject* pClonedTarget = ctx.FindClone(et.target);
-            if (!pClonedTarget)
-            {
-                pClonedTarget = et.target;  // If target not cloned, link to original target.
-            }
-
-            // Add cloned event.
-            AddEventTarget(pClonedTarget, et.event, et.sourceEvent, true);
-        }
-    }
-
-    // Clone links.
-    if (!pFromEntity->m_links.empty())
-    {
-        int numTargets = static_cast<int>(pFromEntity->m_links.size());
-        for (int i = 0; i < numTargets; i++)
-        {
-            CEntityLink& et = pFromEntity->m_links[i];
-            CBaseObject* pClonedTarget = ctx.FindClone(et.target);
-            if (!pClonedTarget)
-            {
-                pClonedTarget = et.target;  // If target not cloned, link to original target.
-            }
-
-            // Add cloned event.
-            if (pClonedTarget)
-            {
-                AddEntityLink(et.name, pClonedTarget->GetId());
-            }
-            else
-            {
-                AddEntityLink(et.name, GUID_NULL);
-            }
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::ResolveEventTarget(CBaseObject* object, unsigned int index)
 {
@@ -1566,7 +1394,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
 //////////////////////////////////////////////////////////////////////////
 int CEntityObject::AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, [[maybe_unused]] bool bUpdateScript)
 {
-    StoreUndo("Add EventTarget");
+    StoreUndo();
     CEntityEventTarget et;
     et.target = target;
     et.event = event;
@@ -1600,7 +1428,7 @@ void CEntityObject::RemoveEventTarget(int index, [[maybe_unused]] bool bUpdateSc
 {
     if (index >= 0 && index < m_eventTargets.size())
     {
-        StoreUndo("Remove EventTarget");
+        StoreUndo();
 
         if (m_eventTargets[index].pLineGizmo)
         {
@@ -1636,7 +1464,7 @@ int CEntityObject::AddEntityLink(const QString& name, GUID targetEntityId)
         }
     }
 
-    StoreUndo("Add EntityLink");
+    StoreUndo();
 
     CLineGizmo* pLineGizmo = nullptr;
 
@@ -1684,7 +1512,7 @@ void CEntityObject::RemoveEntityLink(int index)
     if (index >= 0 && index < m_links.size())
     {
         CEntityLink& link = m_links[index];
-        StoreUndo("Remove EntityLink");
+        StoreUndo();
 
         if (link.pLineGizmo)
         {
@@ -1707,7 +1535,7 @@ void CEntityObject::RenameEntityLink(int index, const QString& newName)
 {
     if (index >= 0 && index < m_links.size())
     {
-        StoreUndo("Rename EntityLink");
+        StoreUndo();
 
         if (m_links[index].pLineGizmo)
         {
@@ -1854,18 +1682,6 @@ void CEntityObject::OnLoadFailed()
     GetIEditor()->GetErrorReport()->ReportError(err);
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetHelperScale(float scale)
-{
-    m_helperScale = scale;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CEntityObject::GetHelperScale()
-{
-    return m_helperScale;
-}
-
 //////////////////////////////////////////////////////////////////////////
 //! Analyze errors for this object.
 void CEntityObject::Validate(IErrorReport* report)
@@ -1913,19 +1729,6 @@ bool CEntityObject::IsSimilarObject(CBaseObject* pObject)
     return false;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnContextMenu(QMenu* pMenu)
-{
-    if (!pMenu->isEmpty())
-    {
-        pMenu->addSeparator();
-    }
-
-    // Events
-
-    CBaseObject::OnContextMenu(pMenu);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CEntityObject::PreInitLightProperty()
 {
@@ -2183,16 +1986,6 @@ void CEntityObject::StoreUndoEntityLink(CSelectionGroup* pGroup)
     }
 }
 
-void CEntityObject::RegisterListener(IEntityObjectListener* pListener)
-{
-    m_listeners.Add(pListener);
-}
-
-void CEntityObject::UnregisterListener(IEntityObjectListener* pListener)
-{
-    m_listeners.Remove(pListener);
-}
-
 template <typename T>
 T CEntityObject::GetEntityProperty(const char* pName, T defaultvalue) const
 {
diff --git a/Code/Editor/Objects/EntityObject.h b/Code/Editor/Objects/EntityObject.h
index dcc6ff7b22..c3e379bccc 100644
--- a/Code/Editor/Objects/EntityObject.h
+++ b/Code/Editor/Objects/EntityObject.h
@@ -16,10 +16,7 @@
 #include "BaseObject.h"
 
 #include "IMovieSystem.h"
-#include "IEntityObjectListener.h"
 #include "Gizmo.h"
-#include "CryListenerSet.h"
-#include "StatObjBus.h"
 
 #include <QObject>
 #endif
@@ -81,11 +78,6 @@ public:
     //////////////////////////////////////////////////////////////////////////
     // Overrides from CBaseObject.
     //////////////////////////////////////////////////////////////////////////
-    //! Return type name of Entity.
-    QString GetTypeDescription() const override { return GetEntityClass(); };
-
-    //////////////////////////////////////////////////////////////////////////
-    bool IsSameClass(CBaseObject* obj) override;
 
     bool Init(IEditor* ie, CBaseObject* prev, const QString& file) override;
     void InitVariables() override;
@@ -102,16 +94,12 @@ public:
     void SetEntityPropertyFloat(const char* name, float value);
     void SetEntityPropertyString(const char* name, const QString& value);
 
-    int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override;
-    void OnContextMenu(QMenu* menu) override;
-
     void SetName(const QString& name) override;
     void SetSelected(bool bSelect) override;
 
     void GetLocalBounds(AABB& box) override;
 
     bool HitTest(HitContext& hc) override;
-    bool HitHelperTest(HitContext& hc) override;
     bool HitTestRect(HitContext& hc) override;
     void UpdateVisibility(bool bVisible) override;
     bool ConvertFromObject(CBaseObject* object) override;
@@ -131,7 +119,6 @@ public:
     enum EAttachmentType
     {
         eAT_Pivot,
-        eAT_GeomCacheNode,
         eAT_CharacterBone,
     };
 
@@ -140,14 +127,9 @@ public:
     EAttachmentType GetAttachType() const { return m_attachmentType; }
     QString GetAttachTarget() const { return m_attachmentTarget; }
 
-    void SetHelperScale(float scale) override;
-    float GetHelperScale() override;
-
     void GatherUsedResources(CUsedResources& resources) override;
     bool IsSimilarObject(CBaseObject* pObject) override;
 
-    bool HasMeasurementAxis() const override {   return false;   }
-
     bool IsIsolated() const override { return false; }
 
     //////////////////////////////////////////////////////////////////////////
@@ -221,20 +203,12 @@ public:
 
     static void StoreUndoEntityLink(CSelectionGroup* pGroup);
 
-    void RegisterListener(IEntityObjectListener* pListener);
-    void UnregisterListener(IEntityObjectListener* pListener);
-
 protected:
     template <typename T>
     void SetEntityProperty(const char* name, T value);
     template <typename T>
     T GetEntityProperty(const char* name, T defaultvalue) const;
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Must be called after cloning the object on clone of object.
-    //! This will make sure object references are cloned correctly.
-    void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx) override;
-
     //! Draw default object items.
     void DrawProjectorPyramid(DisplayContext& dc, float dist);
     void DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist);
@@ -243,10 +217,6 @@ protected:
 
     CVarBlock* CloneProperties(CVarBlock* srcProperties);
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Callback called when one of entity properties have been modified.
-    void OnPropertyChange(IVariable* var);
-
     //////////////////////////////////////////////////////////////////////////
     void OnObjectEvent(CBaseObject* target, int event) override;
     void ResolveEventTarget(CBaseObject* object, unsigned int index);
@@ -328,7 +298,6 @@ protected:
     // Used for light entities
     float m_projectorFOV;
 
-    IStatObj* m_visualObject;
     AABB m_box;
 
     //////////////////////////////////////////////////////////////////////////
@@ -389,8 +358,6 @@ protected:
     XmlNodeRef m_physicsState;
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 
-    static float m_helperScale;
-
     EAttachmentType m_attachmentType;
 
     bool m_bEnableReload;
@@ -434,7 +401,6 @@ private:
     void ForceVariableUpdate();
 
     AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-    CListenerSet<IEntityObjectListener*> m_listeners;
     std::vector< std::pair<IVariable*, IVariable::OnSetCallback*> > m_callbacks;
     AZStd::fixed_vector< IVariable::OnSetCallback, VariableCallbackIndex::Count > m_onSetCallbacksCache;
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
diff --git a/Code/Editor/Objects/IEntityObjectListener.h b/Code/Editor/Objects/IEntityObjectListener.h
deleted file mode 100644
index 9072a837d0..0000000000
--- a/Code/Editor/Objects/IEntityObjectListener.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-class IEntityObjectListener
-{
-public:
-    virtual ~IEntityObjectListener() = default;
-
-    virtual void OnNameChanged(const char* pName) = 0;
-    virtual void OnSelectionChanged(const bool bSelected) = 0;
-    virtual void OnDone() = 0;
-};
-
diff --git a/Code/Editor/Objects/LineGizmo.cpp b/Code/Editor/Objects/LineGizmo.cpp
index 31ea341f5b..991f449cd6 100644
--- a/Code/Editor/Objects/LineGizmo.cpp
+++ b/Code/Editor/Objects/LineGizmo.cpp
@@ -98,16 +98,8 @@ void CLineGizmo::Display(DisplayContext& dc)
             Vec3 pos = 0.5f * (m_point[0] + m_point[1]);
             //dc.renderer->DrawLabelEx( p3+Vec3(0,0,0.3f),1.2f,col,true,true,m_name );
 
-            float camDist = dc.camera->GetPosition().GetDistance(pos);
-            float maxDist = dc.settings->GetLabelsDistance();
-            if (camDist < dc.settings->GetLabelsDistance())
             {
-                float range = maxDist / 2.0f;
                 float col[4] = { m_color[0].r, m_color[0].g, m_color[0].b, m_color[0].a };
-                if (camDist > range)
-                {
-                    col[3] = col[3] * (1.0f - (camDist - range) / range);
-                }
                 dc.SetColor(col[0], col[1], col[2], col[3]);
                 dc.DrawTextLabel(pos + Vec3(0, 0, 0.2f), 1.2f, m_name.toUtf8().data());
             }
diff --git a/Code/Editor/Objects/ObjectLoader.cpp b/Code/Editor/Objects/ObjectLoader.cpp
index 9596265bb9..63ac4c93af 100644
--- a/Code/Editor/Objects/ObjectLoader.cpp
+++ b/Code/Editor/Objects/ObjectLoader.cpp
@@ -28,19 +28,12 @@ CObjectArchive::CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool
     m_nFlags = 0;
     node = xmlRoot;
     m_pCurrentErrorReport = GetIEditor()->GetErrorReport();
-    m_pGeometryPak = nullptr;
-    m_pCurrentObject = nullptr;
     m_bNeedResolveObjects = false;
-    m_bProgressBarEnabled = true;
 }
 
 //////////////////////////////////////////////////////////////////////////
 CObjectArchive::~CObjectArchive()
 {
-    if (m_pGeometryPak)
-    {
-        delete m_pGeometryPak;
-    }
     // Always make sure objects are resolved when loading from archive.
     if (bLoading && m_bNeedResolveObjects)
     {
@@ -74,31 +67,6 @@ void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectI
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor2 func, uint32 userData)
-{
-    if (objectId == GUID_NULL)
-    {
-        func(0, userData);
-        return;
-    }
-
-    CBaseObject* object = m_objectManager->FindObject(objectId);
-    if (object && !(m_nFlags & eObjectLoader_MakeNewIDs))
-    {
-        // Object is already resolved. immidiatly call callback.
-        func(object, userData);
-    }
-    else
-    {
-        Callback cb;
-        cb.fromObject = fromObject;
-        cb.func2 = func;
-        cb.userData = userData;
-        m_resolveCallbacks.insert(Callbacks::value_type(objectId, cb));
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 GUID CObjectArchive::ResolveID(REFGUID id)
 {
@@ -117,10 +85,7 @@ void CObjectArchive::ResolveObjects()
 
     {
         CWaitProgress wait("Loading Objects", false);
-        if (m_bProgressBarEnabled)
-        {
-            wait.Start();
-        }
+        wait.Start();
 
         GetIEditor()->SuspendUndo();
         //////////////////////////////////////////////////////////////////////////
@@ -129,10 +94,7 @@ void CObjectArchive::ResolveObjects()
         int numObj = static_cast<int>(m_loadedObjects.size());
         for (i = 0; i < numObj; i++)
         {
-            if (m_bProgressBarEnabled)
-            {
-                wait.Step((i * 100) / numObj);
-            }
+            wait.Step((i * 100) / numObj);
 
             SLoadedObjectInfo& obj = m_loadedObjects[i];
             m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
@@ -204,30 +166,20 @@ void CObjectArchive::ResolveObjects()
         {
             (cb.func1)(object);
         }
-        if (cb.func2)
-        {
-            (cb.func2)(object, cb.userData);
-        }
     }
     m_resolveCallbacks.clear();
     //////////////////////////////////////////////////////////////////////////
 
     {
         CWaitProgress wait("Creating Objects", false);
-        if (m_bProgressBarEnabled)
-        {
-            wait.Start();
-        }
+        wait.Start();
         //////////////////////////////////////////////////////////////////////////
         // Serialize All Objects from XML.
         //////////////////////////////////////////////////////////////////////////
         int numObj = static_cast<int>(m_loadedObjects.size());
         for (i = 0; i < numObj; i++)
         {
-            if (m_bProgressBarEnabled)
-            {
-                wait.Step((i * 100) / numObj);
-            }
+            wait.Step((i * 100) / numObj);
 
             SLoadedObjectInfo& obj = m_loadedObjects[i];
             m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
@@ -258,8 +210,6 @@ void CObjectArchive::ResolveObjects()
 
     m_bNeedResolveObjects = false;
     m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
-    m_sequenceIdRemap.clear();
-    m_pendingIds.clear();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -272,7 +222,6 @@ void CObjectArchive::SaveObject(CBaseObject* pObject)
 
     if (m_savedObjects.find(pObject) == m_savedObjects.end())
     {
-        m_pCurrentObject = pObject;
         m_savedObjects.insert(pObject);
         // If this object was not saved before.
         XmlNodeRef objNode = node->newChild("Object");
@@ -307,45 +256,6 @@ CBaseObject* CObjectArchive::LoadObject(const XmlNodeRef& objNode, CBaseObject*
     return pObject;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::LoadObjects(XmlNodeRef& rootObjectsNode)
-{
-    int numObjects = rootObjectsNode->getChildCount();
-    for (int i = 0; i < numObjects; i++)
-    {
-        XmlNodeRef objNode = rootObjectsNode->getChild(i);
-        LoadObject(objNode, nullptr);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::ReportError(CErrorRecord& err)
-{
-    if (m_pCurrentErrorReport)
-    {
-        m_pCurrentErrorReport->ReportError(err);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetErrorReport(CErrorReport* errReport)
-{
-    if (errReport)
-    {
-        m_pCurrentErrorReport = errReport;
-    }
-    else
-    {
-        m_pCurrentErrorReport = GetIEditor()->GetErrorReport();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::ShowErrors()
-{
-    GetIEditor()->GetErrorReport()->Display();
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CObjectArchive::MakeNewIds(bool bEnable)
 {
@@ -359,70 +269,8 @@ void CObjectArchive::MakeNewIds(bool bEnable)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetShouldResetInternalMembers(bool reset)
-{
-    if (reset)
-    {
-        m_nFlags |= eObjectLoader_ResetInternalMembers;
-    }
-    else
-    {
-        m_nFlags &= ~(eObjectLoader_ResetInternalMembers);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CObjectArchive::RemapID(REFGUID oldId, REFGUID newId)
 {
     m_IdRemap[oldId] = newId;
 }
-
-//////////////////////////////////////////////////////////////////////////
-CPakFile* CObjectArchive::GetGeometryPak(const char* sFilename)
-{
-    if (m_pGeometryPak)
-    {
-        return m_pGeometryPak;
-    }
-    m_pGeometryPak = new CPakFile;
-    m_pGeometryPak->Open(sFilename);
-    return m_pGeometryPak;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectArchive::GetCurrentObject()
-{
-    return m_pCurrentObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::AddSequenceIdMapping(uint32 oldId, uint32 newId)
-{
-    assert(oldId != newId);
-    assert(GetIEditor()->GetMovieSystem()->FindSequenceById(oldId) || stl::find(m_pendingIds, oldId));
-    assert(GetIEditor()->GetMovieSystem()->FindSequenceById(newId) == nullptr);
-    assert(stl::find(m_pendingIds, newId) == false);
-    m_sequenceIdRemap[oldId] = newId;
-    m_pendingIds.push_back(newId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 CObjectArchive::RemapSequenceId(uint32 id) const
-{
-    std::map<uint32, uint32>::const_iterator itr = m_sequenceIdRemap.find(id);
-    if (itr == m_sequenceIdRemap.end())
-    {
-        return id;
-    }
-    else
-    {
-        return itr->second;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectArchive::IsAmongPendingIds(uint32 id) const
-{
-    return stl::find(m_pendingIds, id);
-}
diff --git a/Code/Editor/Objects/ObjectLoader.h b/Code/Editor/Objects/ObjectLoader.h
index a491e50da0..fc1014ad03 100644
--- a/Code/Editor/Objects/ObjectLoader.h
+++ b/Code/Editor/Objects/ObjectLoader.h
@@ -6,18 +6,13 @@
  *
  */
 
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
 #pragma once
 
 
 #include "Util/GuidUtil.h"
 #include "ErrorReport.h"
+#include <AzCore/std/containers/set.h>
 
-#include <set>
-
-class CPakFile;
 class CErrorRecord;
 struct IObjectManager;
 
@@ -43,63 +38,27 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
 
     //! Resolve callback with only one parameter of CBaseObject.
     typedef AZStd::function<void(CBaseObject*)> ResolveObjRefFunctor1;
-    //! Resolve callback with two parameters one is pointer to CBaseObject and second use data integer.
-    typedef AZStd::function<void(CBaseObject*, unsigned int)> ResolveObjRefFunctor2;
-
-    /** Register Object id.
-        @param objectId Original object id from the file.
-        @param realObjectId Changed object id.
-    */
-    //void RegisterObjectId( int objectId,int realObjectId );
 
     // Return object ID remapped after loading.
     GUID ResolveID(REFGUID id);
 
     //! Set object resolve callback, it will be called once object with specified Id is loaded.
     void SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor1 func);
-    //! Set object resolve callback, it will be called once object with specified Id is loaded.
-    void SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor2 func, uint32 userData);
     //! Resolve all object ids and call callbacks on resolved objects.
     void ResolveObjects();
 
     // Save object to archive.
     void SaveObject(CBaseObject* pObject);
 
-    //! Load multiple objects from archive.
-    void LoadObjects(XmlNodeRef& rootObjectsNode);
-
     //! Load one object from archive.
     CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = nullptr);
 
-    //////////////////////////////////////////////////////////////////////////
-    int GetLoadedObjectsCount() { return static_cast<int>(m_loadedObjects.size()); }
-    CBaseObject* GetLoadedObject(int nIndex) const { return m_loadedObjects[nIndex].pObject; }
-
     //! If true new loaded objects will be assigned new GUIDs.
     void MakeNewIds(bool bEnable);
 
     //! Remap object ids.
     void RemapID(REFGUID oldId, REFGUID newId);
 
-    //! Report error during loading.
-    void ReportError(CErrorRecord& err);
-    //! Assigner different error report class.
-    void SetErrorReport(CErrorReport* errReport);
-    //! Display collected error reports.
-    void ShowErrors();
-
-    void EnableProgressBar(bool bEnable) { m_bProgressBarEnabled = bEnable; };
-
-    CPakFile* GetGeometryPak(const char* sFilename);
-    CBaseObject* GetCurrentObject();
-
-    void AddSequenceIdMapping(uint32 oldId, uint32 newId);
-    uint32 RemapSequenceId(uint32 id) const;
-    bool IsAmongPendingIds(uint32 id) const;
-
-    void SetShouldResetInternalMembers(bool reset);
-    bool ShouldResetInternalMembers() const { return m_nFlags & eObjectLoader_ResetInternalMembers; }
-
 private:
     struct SLoadedObjectInfo
     {
@@ -110,22 +69,19 @@ private:
         bool operator <(const SLoadedObjectInfo& oi) const { return nSortOrder < oi.nSortOrder;   }
     };
 
-
     IObjectManager* m_objectManager;
     struct Callback
     {
         ResolveObjRefFunctor1 func1;
-        ResolveObjRefFunctor2 func2;
-        uint32 userData;
         _smart_ptr<CBaseObject> fromObject;
-        Callback() { func1 = 0; func2 = 0; userData = 0; };
+        Callback() { func1 = 0; }
     };
     typedef std::multimap<GUID, Callback, guid_less_predicate> Callbacks;
     AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
     Callbacks m_resolveCallbacks;
 
     // Set of all saved objects to this archive.
-    typedef std::set<_smart_ptr<CBaseObject> > ObjectsSet;
+    typedef AZStd::set<_smart_ptr<CBaseObject> > ObjectsSet;
     ObjectsSet m_savedObjects;
 
     //typedef std::multimap<int,_smart_ptr<CBaseObject> > OrderedObjects;
@@ -138,20 +94,11 @@ private:
     enum EObjectLoaderFlags
     {
         eObjectLoader_MakeNewIDs = 0x0001,      // If true new loaded objects will be assigned new GUIDs.
-        eObjectLoader_ResetInternalMembers = 0x0004, // In case we are deserializing and we would like to wipe all previous state
     };
     int m_nFlags;
     IErrorReport* m_pCurrentErrorReport;
-    CPakFile* m_pGeometryPak;
-    CBaseObject* m_pCurrentObject;
 
     bool m_bNeedResolveObjects;
-    bool m_bProgressBarEnabled;
 
-    // This table is used when there is any collision of ids while importing TrackView sequences.
-    std::map<uint32, uint32> m_sequenceIdRemap;
-    std::vector<uint32> m_pendingIds;
     AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 };
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
diff --git a/Code/Editor/Objects/ObjectManager.cpp b/Code/Editor/Objects/ObjectManager.cpp
index ee7e9a8e96..1dea6ece7f 100644
--- a/Code/Editor/Objects/ObjectManager.cpp
+++ b/Code/Editor/Objects/ObjectManager.cpp
@@ -50,7 +50,7 @@ public:
     GUID guid;
 
 public:
-    virtual ~CXMLObjectClassDesc() = default; 
+    virtual ~CXMLObjectClassDesc() = default;
     REFGUID ClassID() override
     {
         return guid;
@@ -81,60 +81,27 @@ CObjectManager* g_pObjectManager = nullptr;
 
 //////////////////////////////////////////////////////////////////////////
 CObjectManager::CObjectManager()
-    : m_lastHideMask(0)
-    , m_maxObjectViewDistRatio(0.00001f)
-    , m_currSelection(&m_defaultSelection)
-    , m_nLastSelCount(0)
+    : m_currSelection(&m_defaultSelection)
     , m_bSelectionChanged(false)
-    , m_selectCallback(nullptr)
-    , m_currEditObject(nullptr)
-    , m_bSingleSelection(false)
-    , m_createGameObjects(true)
-    , m_bGenUniqObjectNames(true)
     , m_gizmoManager(new CGizmoManager())
-    , m_pLoadProgress(nullptr)
-    , m_loadedObjects(0)
-    , m_totalObjectsToLoad(0)
     , m_bExiting(false)
     , m_isUpdateVisibilityList(false)
     , m_currentHideCount(CBaseObject::s_invalidHiddenID)
-    , m_bInReloading(false)
-    , m_bSkipObjectUpdate(false)
-    , m_bLevelExporting(false)
 {
     g_pObjectManager = this;
 
-    RegisterObjectClasses();
-
     m_objectsByName.reserve(1024);
-    LoadRegistry();
 }
 
 //////////////////////////////////////////////////////////////////////////
 CObjectManager::~CObjectManager()
 {
     m_bExiting = true;
-    SaveRegistry();
     DeleteAllObjects();
 
     delete m_gizmoManager;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::RegisterObjectClasses()
-{
-    LoadRegistry();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void    CObjectManager::SaveRegistry()
-{
-}
-
-void    CObjectManager::LoadRegistry()
-{
-}
-
 //////////////////////////////////////////////////////////////////////////
 CBaseObject* CObjectManager::NewObject(CObjectClassDesc* cls, CBaseObject* prev, const QString& file, const char* newObjectName)
 {
@@ -186,17 +153,6 @@ CBaseObject* CObjectManager::NewObject(CObjectClassDesc* cls, CBaseObject* prev,
         if (obj->GetType() != OBJTYPE_AZENTITY)
         {
             GetIEditor()->RecordUndo(new CUndoBaseObjectNew(obj));
-
-            // check for script entities
-            const char* scriptClassName = "";
-            CEntityObject* entityObj = qobject_cast<CEntityObject*>(obj);
-            QByteArray entityClass; // Leave it outside of the if. Otherwise buffer is deleted.
-            if (entityObj)
-            {
-                entityClass = entityObj->GetEntityClass().toUtf8();
-                scriptClassName = entityClass.data();
-            }
-
         }
     }
 
@@ -318,12 +274,6 @@ CBaseObject* CObjectManager::NewObject(CObjectArchive& ar, CBaseObject* pUndoObj
         }
     }
 
-    m_loadedObjects++;
-    if (m_pLoadProgress && m_totalObjectsToLoad > 0)
-    {
-        m_pLoadProgress->Step((m_loadedObjects * 100) / m_totalObjectsToLoad);
-    }
-
     return pObject;
 }
 
@@ -351,10 +301,6 @@ CBaseObject* CObjectManager::NewObject(const QString& typeName, CBaseObject* pre
 void    CObjectManager::DeleteObject(CBaseObject* obj)
 {
     AZ_PROFILE_FUNCTION(Editor);
-    if (m_currEditObject == obj)
-    {
-        EndEditParams();
-    }
 
     if (!obj)
     {
@@ -367,7 +313,6 @@ void    CObjectManager::DeleteObject(CBaseObject* obj)
         return;
     }
 
-    NotifyObjectListeners(obj, CBaseObject::ON_PREDELETE);
     obj->NotifyListeners(CBaseObject::ON_PREDELETE);
 
     // Must be after object DetachAll to support restoring Parent/Child relations.
@@ -377,7 +322,7 @@ void    CObjectManager::DeleteObject(CBaseObject* obj)
         // Store undo for all child objects.
         for (int i = 0; i < obj->GetChildCount(); i++)
         {
-            obj->GetChild(i)->StoreUndo("DeleteParent");
+            obj->GetChild(i)->StoreUndo();
         }
         CUndo::Record(new CUndoBaseObjectDelete(obj));
     }
@@ -388,8 +333,6 @@ void    CObjectManager::DeleteObject(CBaseObject* obj)
 
     obj->Done();
 
-    NotifyObjectListeners(obj, CBaseObject::ON_DELETE);
-
     RemoveObject(obj);
 }
 
@@ -462,22 +405,10 @@ void CObjectManager::DeleteAllObjects()
 {
     AZ_PROFILE_FUNCTION(Editor);
 
-    EndEditParams();
-
     ClearSelection();
-    int i;
 
     InvalidateVisibleList();
 
-    // Delete all selection groups.
-    std::vector<CSelectionGroup*> sel;
-    stl::map_to_vector(m_selections, sel);
-    for (i = 0; i < sel.size(); i++)
-    {
-        delete sel[i];
-    }
-    m_selections.clear();
-
     TBaseObjects objectsHolder;
     GetAllObjects(objectsHolder);
 
@@ -485,7 +416,7 @@ void CObjectManager::DeleteAllObjects()
     m_objects.clear();
     m_objectsByName.clear();
 
-    for (i = 0; i < objectsHolder.size(); i++)
+    for (int i = 0; i < objectsHolder.size(); i++)
     {
         objectsHolder[i]->Done();
     }
@@ -499,17 +430,6 @@ void CObjectManager::DeleteAllObjects()
     m_animatedAttachedEntities.clear();
 }
 
-CBaseObject* CObjectManager::CloneObject(CBaseObject* obj)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-    assert(obj);
-    //CRuntimeClass *cls = obj->GetRuntimeClass();
-    //CBaseObject *clone = (CBaseObject*)cls->CreateObject();
-    //clone->CloneCopy( obj );
-    CBaseObject* clone = NewObject(obj->GetClassDesc(), obj);
-    return clone;
-}
-
 //////////////////////////////////////////////////////////////////////////
 CBaseObject* CObjectManager::FindObject(REFGUID guid) const
 {
@@ -608,7 +528,7 @@ bool CObjectManager::AddObject(CBaseObject* obj)
         if (CEntityObject* entityObj = qobject_cast<CEntityObject*>(obj))
         {
             CEntityObject::EAttachmentType attachType = entityObj->GetAttachType();
-            if (attachType == CEntityObject::EAttachmentType::eAT_GeomCacheNode || attachType == CEntityObject::EAttachmentType::eAT_CharacterBone)
+            if (attachType == CEntityObject::EAttachmentType::eAT_CharacterBone)
             {
                 m_animatedAttachedEntities.insert(entityObj);
             }
@@ -620,7 +540,6 @@ bool CObjectManager::AddObject(CBaseObject* obj)
 
     RegisterObjectName(obj->GetName());
     InvalidateVisibleList();
-    NotifyObjectListeners(obj, CBaseObject::ON_ADD);
     return true;
 }
 
@@ -641,12 +560,6 @@ void CObjectManager::RemoveObject(CBaseObject* obj)
 
     // Remove this object from selection groups.
     m_currSelection->RemoveObject(obj);
-    std::vector<CSelectionGroup*> sel;
-    stl::map_to_vector(m_selections, sel);
-    for (int i = 0; i < sel.size(); i++)
-    {
-        sel[i]->RemoveObject(obj);
-    }
 
     m_objectsByName.erase(AZ::Crc32(obj->GetName().toUtf8().data(), obj->GetName().toUtf8().count(), true));
 
@@ -674,54 +587,7 @@ void CObjectManager::ChangeObjectId(REFGUID oldGuid, REFGUID newGuid)
         CBaseObjectPtr pRemappedObject = (*it).second;
         pRemappedObject->SetId(newGuid);
         m_objects.erase(it);
-        m_objects.insert(std::make_pair(newGuid, pRemappedObject));
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const
-{
-    CBaseObject* pExisting = FindObject(newName);
-    if (pExisting)
-    {
-        QString sRenameWarning = QObject::tr("%1 \"%2\" was NOT renamed to \"%3\" because %4 with the same name already exists.")
-            .arg(obj->GetClassDesc()->ClassName())
-            .arg(obj->GetName())
-            .arg(newName)
-            .arg(pExisting->GetClassDesc()->ClassName()
-        );
-
-        // If id is taken.
-        CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "%s", sRenameWarning.toUtf8().data());
-
-        if (bShowMsgBox)
-        {
-            QMessageBox::critical(QApplication::activeWindow(), QString(), sRenameWarning);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ChangeObjectName(CBaseObject* obj, const QString& newName)
-{
-    assert(obj);
-
-    if (newName != obj->GetName())
-    {
-        if (IsDuplicateObjectName(newName))
-        {
-            return;
-        }
-
-        // Remove previous name from map
-        const AZ::Crc32 oldNameCrc(obj->GetName().toUtf8().data(), obj->GetName().count(), true);
-        m_objectsByName.erase(oldNameCrc);
-
-        obj->SetName(newName);
-
-        // Add new name to map
-        const AZ::Crc32 nameCrc(newName.toUtf8().data(), newName.count(), true);
-        m_objectsByName[nameCrc] = obj;
+        m_objects.insert(AZStd::make_pair(newGuid, pRemappedObject));
     }
 }
 
@@ -742,28 +608,9 @@ void CObjectManager::GetObjects(CBaseObjectsArray& objects) const
     }
 }
 
-void CObjectManager::GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const
-{
-    objects.clear();
-    objects.reserve(m_objects.size());
-    for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        assert(it->second);
-        if (filter.first(*it->second, filter.second))
-        {
-            objects.push_back(it->second);
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CObjectManager::SendEvent(ObjectEvent event)
 {
-    if (event == EVENT_RELOAD_ENTITY)
-    {
-        m_bInReloading = true;
-    }
-
     for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
     {
         CBaseObject* obj = it->second;
@@ -772,7 +619,6 @@ void CObjectManager::SendEvent(ObjectEvent event)
 
     if (event == EVENT_RELOAD_ENTITY)
     {
-        m_bInReloading = false;
         GetIEditor()->Notify(eNotify_OnReloadTrackView);
     }
 }
@@ -792,93 +638,6 @@ void CObjectManager::SendEvent(ObjectEvent event, const AABB& bounds)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Update()
-{
-    if (m_bSkipObjectUpdate)
-    {
-        return;
-    }
-
-    QWidget* prevActiveWindow = QApplication::activeWindow();
-
-    // Restore focus if it changed.
-    if (prevActiveWindow && QApplication::activeWindow() != prevActiveWindow)
-    {
-        prevActiveWindow->setFocus();
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::HideObject(CBaseObject* obj, bool hide)
-{
-    assert(obj != 0);
-    if (hide)
-    {
-        obj->SetHidden(hide, ++m_currentHideCount);
-    }
-    else
-    {
-        obj->SetHidden(false);
-    }
-    InvalidateVisibleList();
-}
-
-void CObjectManager::ShowLastHiddenObject()
-{
-    uint64 mostRecentID = CBaseObject::s_invalidHiddenID;
-    CBaseObject* mostRecentObject = nullptr;
-    for (auto it : m_objects)
-    {
-        CBaseObject* obj = it.second;
-
-        uint64 hiddenID = obj->GetHideOrder();
-
-        if (hiddenID > mostRecentID)
-        {
-            mostRecentID = hiddenID;
-            mostRecentObject = obj;
-        }
-    }
-
-    if (mostRecentObject != nullptr)
-    {
-        mostRecentObject->SetHidden(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UnhideAll()
-{
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-        obj->SetHidden(false);
-    }
-
-    InvalidateVisibleList();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::FreezeObject(CBaseObject* obj, bool freeze)
-{
-    assert(obj != 0);
-    // Remove object from main object set and put it to hidden set.
-    obj->SetFrozen(freeze);
-    InvalidateVisibleList();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UnfreezeAll()
-{
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-        obj->SetFrozen(false);
-    }
-    InvalidateVisibleList();
-}
-
 //////////////////////////////////////////////////////////////////////////
 bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask)
 {
@@ -894,14 +653,6 @@ bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask)
         return false;
     }
 
-    if (m_selectCallback)
-    {
-        if (!m_selectCallback->OnSelectObject(obj))
-        {
-            return true;
-        }
-    }
-
     m_currSelection->AddObject(obj);
 
     // while in ComponentMode we never explicitly change selection (the entity will always be selected).
@@ -921,14 +672,6 @@ bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask)
     return true;
 }
 
-void CObjectManager::SelectEntities(std::set<CEntityObject*>& s)
-{
-    for (std::set<CEntityObject*>::iterator it = s.begin(), end = s.end(); it != end; ++it)
-    {
-        SelectObject(*it);
-    }
-}
-
 void CObjectManager::UnselectObject(CBaseObject* obj)
 {
     // while in ComponentMode we never explicitly change selection (the entity will always be selected).
@@ -947,139 +690,6 @@ void CObjectManager::UnselectObject(CBaseObject* obj)
     m_currSelection->RemoveObject(obj);
 }
 
-CSelectionGroup* CObjectManager::GetSelection(const QString& name) const
-{
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
-    return selection;
-}
-
-void CObjectManager::GetNameSelectionStrings(QStringList& names)
-{
-    for (TNameSelectionMap::iterator it = m_selections.begin(); it != m_selections.end(); ++it)
-    {
-        names.push_back(it->first);
-    }
-}
-
-void CObjectManager::NameSelection(const QString& name)
-{
-    if (m_currSelection->IsEmpty())
-    {
-        return;
-    }
-
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
-    if (selection)
-    {
-        assert(selection != 0);
-        // Check if trying to rename itself to the same name.
-        if (selection == m_currSelection)
-        {
-            return;
-        }
-        m_selections.erase(name);
-        delete selection;
-    }
-    selection = new CSelectionGroup;
-    selection->Copy(*m_currSelection);
-    selection->SetName(name);
-    m_selections[name] = selection;
-    m_currSelection = selection;
-    m_defaultSelection.RemoveAll();
-}
-
-void CObjectManager::SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading)
-{
-    if (!rootNode)
-    {
-        return;
-    }
-
-    _smart_ptr<CSelectionGroup> tmpGroup(nullptr);
-
-    QString selRootStr("NameSelection");
-    QString selNodeStr("NameSelectionNode");
-    QString selNodeNameStr("name");
-    QString idStr("id");
-    QString objAttrStr("obj");
-
-    XmlNodeRef startNode = rootNode->findChild(selRootStr.toUtf8().data());
-
-    if (bLoading)
-    {
-        m_selections.erase(m_selections.begin(), m_selections.end());
-
-        if (startNode)
-        {
-            for (int selNodeNo = 0; selNodeNo < startNode->getChildCount(); ++selNodeNo)
-            {
-                XmlNodeRef selNode = startNode->getChild(selNodeNo);
-                tmpGroup = new CSelectionGroup;
-
-                for (int objIDNodeNo = 0; objIDNodeNo < selNode->getChildCount(); ++objIDNodeNo)
-                {
-                    GUID curID = GUID_NULL;
-                    XmlNodeRef idNode = selNode->getChild(objIDNodeNo);
-                    if (!idNode->getAttr(idStr.toUtf8().data(), curID))
-                    {
-                        continue;
-                    }
-
-                    if (curID != GUID_NULL)
-                    {
-                        if (GetIEditor()->GetObjectManager()->FindObject(curID))
-                        {
-                            tmpGroup->AddObject(GetIEditor()->GetObjectManager()->FindObject(curID));
-                        }
-                    }
-                }
-
-                if (tmpGroup->GetCount() > 0)
-                {
-                    QString nameStr;
-                    if (!selNode->getAttr(selNodeNameStr.toUtf8().data(), nameStr))
-                    {
-                        continue;
-                    }
-                    tmpGroup->SetName(nameStr);
-                    m_selections[nameStr] = tmpGroup;
-                }
-            }
-        }
-    }
-    else
-    {
-        startNode = rootNode->newChild(selRootStr.toUtf8().data());
-        CSelectionGroup* objSelection = nullptr;
-
-        for (TNameSelectionMap::iterator it = m_selections.begin(); it != m_selections.end(); ++it)
-        {
-            XmlNodeRef selectionNameNode = startNode->newChild(selNodeStr.toUtf8().data());
-            selectionNameNode->setAttr(selNodeNameStr.toUtf8().data(), it->first.toUtf8().data());
-            objSelection = it->second;
-
-            if (!objSelection)
-            {
-                continue;
-            }
-
-            if (objSelection->GetCount() == 0)
-            {
-                continue;
-            }
-
-            for (int i = 0; i < objSelection->GetCount(); ++i)
-            {
-                if (objSelection->GetObject(i))
-                {
-                    XmlNodeRef objNode = selectionNameNode->newChild(objAttrStr.toUtf8().data());
-                    objNode->setAttr(idStr.toUtf8().data(), GuidUtil::ToString(objSelection->GetObject(i)->GetId()));
-                }
-            }
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 int CObjectManager::ClearSelection()
 {
@@ -1133,63 +743,6 @@ int CObjectManager::ClearSelection()
     return numSel;
 }
 
-//////////////////////////////////////////////////////////////////////////
-int CObjectManager::InvertSelection()
-{
-    AZ_PROFILE_FUNCTION(Editor);
-
-    int selCount = 0;
-    // iterate all objects.
-    for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* pObj = it->second;
-        if (pObj->IsSelected())
-        {
-            UnselectObject(pObj);
-        }
-        else
-        {
-            if (SelectObject(pObj))
-            {
-                selCount++;
-            }
-        }
-    }
-    return selCount;
-}
-
-void CObjectManager::SetSelection(const QString& name)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
-    if (selection)
-    {
-        UnselectCurrent();
-        assert(selection != 0);
-        m_currSelection = selection;
-        SelectCurrent();
-    }
-}
-
-void CObjectManager::RemoveSelection(const QString& name)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-
-    QString selName = name;
-    CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
-    if (selection)
-    {
-        if (selection == m_currSelection)
-        {
-            UnselectCurrent();
-            m_currSelection = &m_defaultSelection;
-            m_defaultSelection.RemoveAll();
-        }
-        delete selection;
-        m_selections.erase(selName);
-    }
-}
-
 void CObjectManager::SelectCurrent()
 {
     AZ_PROFILE_FUNCTION(Editor);
@@ -1261,157 +814,7 @@ void CObjectManager::Display(DisplayContext& dc)
     }
 }
 
-void CObjectManager::ForceUpdateVisibleObjectCache([[maybe_unused]] DisplayContext& dc)
-{
-    AZ_Assert(false, "CObjectManager::ForceUpdateVisibleObjectCache is legacy/deprecated and should not be used.");
-}
-
-void CObjectManager::FindDisplayableObjects([[maybe_unused]] DisplayContext& dc, [[maybe_unused]] bool bDisplay)
-{
-    AZ_Assert(false, "CObjectManager::FindDisplayableObjects is legacy/deprecated and should not be used.");
-}
-
-void CObjectManager::BeginEditParams(CBaseObject* obj, int flags)
-{
-    assert(obj != 0);
-    if (obj == m_currEditObject)
-    {
-        return;
-    }
-
-    if (GetSelection()->GetCount() > 1)
-    {
-        return;
-    }
-
-    QWidget* prevActiveWindow = QApplication::activeWindow();
-
-    if (m_currEditObject)
-    {
-        //if (obj->GetClassDesc() != m_currEditObject->GetClassDesc())
-        if (!obj->IsSameClass(m_currEditObject))
-        {
-            EndEditParams(flags);
-        }
-    }
-
-    m_currEditObject = obj;
-
-    if (flags & OBJECT_CREATE)
-    {
-        // Unselect all other objects.
-        ClearSelection();
-        // Select this object.
-        SelectObject(obj, false);
-    }
-
-    m_bSingleSelection = true;
-
-    // Restore focus if it changed.
-    //  OBJECT_EDIT is used by the EntityOutliner when items are selected. Using it here to prevent shifting focus to the EntityInspector on select.
-    if (!(flags & OBJECT_EDIT) && prevActiveWindow && QApplication::activeWindow() != prevActiveWindow)
-    {
-        prevActiveWindow->setFocus();
-    }
-}
-
-void CObjectManager::EndEditParams([[maybe_unused]] int flags)
-{
-    m_bSingleSelection = false;
-    m_currEditObject = nullptr;
-    //m_bSelectionChanged = false; // don't need to clear for ungroup
-}
-
-//! Select objects within specified distance from given position.
-int CObjectManager::SelectObjects(const AABB& box, bool bUnselect)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-    int numSel = 0;
-
-    AABB objBounds;
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-
-        if (obj->IsHidden())
-        {
-            continue;
-        }
-
-        obj->GetBoundBox(objBounds);
-        if (box.IsIntersectBox(objBounds))
-        {
-            numSel++;
-            if (!bUnselect)
-            {
-                SelectObject(obj);
-            }
-            else
-            {
-                UnselectObject(obj);
-            }
-        }
-    }
-    return numSel;
-}
-
 //////////////////////////////////////////////////////////////////////////
-int CObjectManager::MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, [[maybe_unused]] bool bIsCopy)
-{
-    AABB objBounds;
-
-    Vec3 src = (box.min + box.max) / 2;
-    Vec3 dst = src + offset;
-    float alpha = 0.0f;
-    switch (rotation)
-    {
-        case ImageRotationDegrees::Rotate90:
-            alpha = gf_halfPI;
-            break;
-        case ImageRotationDegrees::Rotate180:
-            alpha = gf_PI;
-            break;
-        case ImageRotationDegrees::Rotate270:
-            alpha = gf_PI + gf_halfPI;
-            break;
-        default:
-            break;
-    }
-
-    float cosa = cos(alpha);
-    float sina = sin(alpha);
-
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-
-        if (obj->GetParent())
-        {
-            continue;
-        }
-
-        obj->GetBoundBox(objBounds);
-        if (box.IsIntersectBox(objBounds))
-        {
-            if (rotation == ImageRotationDegrees::Rotate0)
-            {
-                obj->SetPos(obj->GetPos() - src + dst);
-            }
-            else
-            {
-                Vec3 pos = obj->GetPos() - src;
-                Vec3 newPos(pos);
-                newPos.x = cosa * pos.x - sina * pos.y;
-                newPos.y = sina * pos.x + cosa * pos.y;
-                obj->SetPos(newPos + dst);
-                Quat q;
-                obj->SetRotation(q.CreateRotationZ(alpha) * obj->GetRotation());
-            }
-        }
-    }
-    return 0;
-}
-
 bool CObjectManager::IsObjectDeletionAllowed(CBaseObject* pObject)
 {
     if (!pObject)
@@ -1442,99 +845,12 @@ void CObjectManager::DeleteSelection()
         objects.AddObject(m_currSelection->GetObject(i));
     }
 
-    RemoveSelection(m_currSelection->GetName());
     m_currSelection = &m_defaultSelection;
     m_defaultSelection.RemoveAll();
 
     DeleteSelection(&objects);
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::HitTestObject(CBaseObject* obj, HitContext& hc)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-
-    if (obj->IsFrozen())
-    {
-        return false;
-    }
-
-    if (obj->IsHidden())
-    {
-        return false;
-    }
-
-    // This object is rejected by deep selection.
-    if (obj->CheckFlags(OBJFLAG_NO_HITTEST))
-    {
-        return false;
-    }
-
-    ObjectType objType = obj->GetType();
-
-    // Check if this object type is masked for selection.
-    if (!(objType & gSettings.objectSelectMask))
-    {
-        return false;
-    }
-
-    const bool bSelectionHelperHit = obj->HitHelperTest(hc);
-
-    if (hc.bUseSelectionHelpers && !bSelectionHelperHit)
-    {
-        return false;
-    }
-
-    if (!bSelectionHelperHit)
-    {
-        // Fast checking.
-        if (hc.camera && !obj->IsInCameraView(*hc.camera))
-        {
-            return false;
-        }
-        else if (hc.bounds && !obj->IntersectRectBounds(*hc.bounds))
-        {
-            return false;
-        }
-
-        // Do 2D space testing.
-        if (hc.nSubObjFlags == 0)
-        {
-            Ray ray(hc.raySrc, hc.rayDir);
-            if (!obj->IntersectRayBounds(ray))
-            {
-                return false;
-            }
-        }
-        else if (!obj->HitTestRect(hc))
-        {
-            return false;
-        }
-    }
-
-    return (bSelectionHelperHit || obj->HitTest(hc));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::HitTest([[maybe_unused]] HitContext& hitInfo)
-{
-    AZ_Assert(false, "CObjectManager::HitTest is legacy/deprecated and should not be used.");
-    return false;
-}
-
-void CObjectManager::FindObjectsInRect(
-    [[maybe_unused]] CViewport* view, [[maybe_unused]] const QRect& rect, [[maybe_unused]] std::vector<GUID>& guids)
-{
-    AZ_Assert(false, "CObjectManager::FindObjectsInRect is legacy/deprecated and should not be used.");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SelectObjectsInRect(
-    [[maybe_unused]] CViewport* view, [[maybe_unused]] const QRect& rect, [[maybe_unused]] bool bSelect)
-{
-    AZ_Assert(false, "CObjectManager::SelectObjectsInRect is legacy/deprecated and should not be used.");
-}
-
 //////////////////////////////////////////////////////////////////////////
 uint16 FindPossibleObjectNameNumber(std::set<uint16>& numberSet)
 {
@@ -1585,50 +901,9 @@ void CObjectManager::RegisterObjectName(const QString& name)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UpdateRegisterObjectName(const QString& name)
-{
-    // Remove all numbers from the end of typename.
-    QString typeName = name;
-    int nameLen = typeName.length();
-    int len = nameLen;
-
-    while (len > 0 && typeName[len - 1].isDigit())
-    {
-        len--;
-    }
-
-    typeName = typeName.left(len);
-
-    uint16 num = 1;
-    if (len < nameLen)
-    {
-        num = (uint16)atoi((const char*)name.toUtf8().data() + len) + 0;
-    }
-
-    NameNumbersMap::iterator it = m_nameNumbersMap.find(typeName);
-
-    if (it != m_nameNumbersMap.end())
-    {
-        if (it->second.end() != it->second.find(num))
-        {
-            it->second.erase(num);
-            if (it->second.empty())
-            {
-                m_nameNumbersMap.erase(it);
-            }
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 QString CObjectManager::GenerateUniqueObjectName(const QString& theTypeName)
 {
-    if (!m_bGenUniqObjectNames)
-    {
-        return theTypeName;
-    }
-
     QString typeName = theTypeName;
     const int subIndex = theTypeName.indexOf("::");
     if (subIndex != -1 && subIndex > typeName.length() - 2)
@@ -1663,14 +938,6 @@ QString CObjectManager::GenerateUniqueObjectName(const QString& theTypeName)
     return str;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::EnableUniqObjectNames(bool bEnable)
-{
-    bool bPrev = m_bGenUniqObjectNames;
-    m_bGenUniqObjectNames = bEnable;
-    return bPrev;
-}
-
 //////////////////////////////////////////////////////////////////////////
 CObjectClassDesc* CObjectManager::FindClass(const QString& className)
 {
@@ -1682,64 +949,6 @@ CObjectClassDesc* CObjectManager::FindClass(const QString& className)
     return nullptr;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::GetClassCategories(QStringList& categories)
-{
-    std::vector<IClassDesc*> classes;
-    CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes);
-    std::set<QString> cset;
-    for (int i = 0; i < classes.size(); i++)
-    {
-        QString category = classes[i]->Category();
-        if (!category.isEmpty())
-        {
-            cset.insert(category);
-        }
-    }
-    categories.clear();
-    categories.reserve(static_cast<int>(cset.size()));
-    for (std::set<QString>::iterator cit = cset.begin(); cit != cset.end(); ++cit)
-    {
-        categories.push_back(*cit);
-    }
-}
-
-void CObjectManager::GetClassCategoryToolClassNamePairs(std::vector< std::pair<QString, QString> >& categoryToolClassNamePairs)
-{
-    std::vector<IClassDesc*> classes;
-    CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes);
-    std::set< std::pair<QString, QString> > cset;
-    for (int i = 0; i < classes.size(); i++)
-    {
-        QString category = classes[i]->Category();
-        QString toolClassName = ((CObjectClassDesc*)classes[i])->GetToolClassName();
-        if (!category.isEmpty())
-        {
-            cset.insert(std::pair<QString, QString>(category, toolClassName));
-        }
-    }
-    categoryToolClassNamePairs.clear();
-    categoryToolClassNamePairs.reserve(cset.size());
-    for (std::set< std::pair<QString, QString> >::iterator cit = cset.begin(); cit != cset.end(); ++cit)
-    {
-        categoryToolClassNamePairs.push_back(*cit);
-    }
-}
-
-void CObjectManager::GetClassTypes(const QString& category, QStringList& types)
-{
-    std::vector<IClassDesc*> classes;
-    CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes);
-    for (int i = 0; i < classes.size(); i++)
-    {
-        QString cat = classes[i]->Category();
-        if (QString::compare(cat, category, Qt::CaseInsensitive) == 0 && classes[i]->IsEnabled())
-        {
-            types.push_back(classes[i]->ClassName());
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CObjectManager::RegisterClassTemplate(const XmlNodeRef& templ)
 {
@@ -1804,181 +1013,6 @@ void CObjectManager::RegisterCVars()
         "Adjust the hit radius used for axis helpers, like the transform gizmo.");
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Serialize(XmlNodeRef& xmlNode, bool bLoading, int flags)
-{
-    if (!xmlNode)
-    {
-        return;
-    }
-
-    if (bLoading)
-    {
-        m_loadedObjects = 0;
-
-        if (flags == SERIALIZE_ONLY_NOTSHARED)
-        {
-            DeleteNotSharedObjects();
-        }
-        else if (flags == SERIALIZE_ONLY_SHARED)
-        {
-            DeleteSharedObjects();
-        }
-        else
-        {
-            DeleteAllObjects();
-        }
-
-
-        XmlNodeRef root = xmlNode->findChild("Objects");
-
-        int totalObjects = 0;
-
-        if (root)
-        {
-            root->getAttr("NumObjects", totalObjects);
-        }
-
-
-        StartObjectsLoading(totalObjects);
-
-        CObjectArchive ar(this, xmlNode, true);
-
-        // Loading.
-        if (root)
-        {
-            ar.node = root;
-            LoadObjects(ar, false);
-        }
-        EndObjectsLoading();
-    }
-    else
-    {
-        // Saving.
-        XmlNodeRef root = xmlNode->newChild("Objects");
-
-        CObjectArchive ar(this, root, false);
-
-        // Save all objects to XML.
-        for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-        {
-            CBaseObject* obj = it->second;
-
-            if (obj->CheckFlags(OBJFLAG_DONT_SAVE))
-            {
-                continue;
-            }
-
-            if ((flags == SERIALIZE_ONLY_SHARED) && !obj->CheckFlags(OBJFLAG_SHARED))
-            {
-                continue;
-            }
-            else if ((flags == SERIALIZE_ONLY_NOTSHARED) && obj->CheckFlags(OBJFLAG_SHARED))
-            {
-                continue;
-            }
-
-            XmlNodeRef objNode = root->newChild("Object");
-            ar.node = objNode;
-            obj->Serialize(ar);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::LoadObjects(CObjectArchive& objectArchive, bool bSelect)
-{
-    m_bLoadingObjects = true;
-
-    XmlNodeRef objectsNode = objectArchive.node;
-    int numObjects = objectsNode->getChildCount();
-    for (int i = 0; i < numObjects; i++)
-    {
-        objectArchive.node = objectsNode->getChild(i);
-        CBaseObject* obj = objectArchive.LoadObject(objectsNode->getChild(i));
-        if (obj && bSelect)
-        {
-            SelectObject(obj);
-        }
-    }
-    EndObjectsLoading(); // End progress bar, here, Resolve objects have his own.
-    objectArchive.ResolveObjects();
-
-    InvalidateVisibleList();
-
-    m_bLoadingObjects = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared)
-{
-    // Clear export files.
-    QFile::remove(QStringLiteral("%1TagPoints.ini").arg(levelPath));
-    QFile::remove(QStringLiteral("%1Volumes.ini").arg(levelPath));
-
-    // Save all objects to XML.
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-        // Export Only shared objects.
-        if ((obj->CheckFlags(OBJFLAG_SHARED) && onlyShared) ||
-            (!obj->CheckFlags(OBJFLAG_SHARED) && !onlyShared))
-        {
-            obj->Export(levelPath, rootNode);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ExportEntities(XmlNodeRef& rootNode)
-{
-    // Save all objects to XML.
-    for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
-    {
-        CBaseObject* obj = it->second;
-        if (qobject_cast<CEntityObject*>(obj))
-        {
-            obj->Export("", rootNode);
-        }
-    }
-}
-
-void CObjectManager::DeleteNotSharedObjects()
-{
-    TBaseObjects objects;
-    GetAllObjects(objects);
-    for (int i = 0; i < objects.size(); i++)
-    {
-        CBaseObject* obj = objects[i];
-        if (!obj->CheckFlags(OBJFLAG_SHARED))
-        {
-            DeleteObject(obj);
-        }
-    }
-}
-
-void CObjectManager::DeleteSharedObjects()
-{
-    TBaseObjects objects;
-    GetAllObjects(objects);
-    for (int i = 0; i < objects.size(); i++)
-    {
-        CBaseObject* obj = objects[i];
-        if (obj->CheckFlags(OBJFLAG_SHARED))
-        {
-            DeleteObject(obj);
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IObjectSelectCallback* CObjectManager::SetSelectCallback(IObjectSelectCallback* callback)
-{
-    IObjectSelectCallback* prev = m_selectCallback;
-    m_selectCallback = callback;
-    return prev;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CObjectManager::InvalidateVisibleList()
 {
@@ -2020,27 +1054,6 @@ void CObjectManager::UpdateVisibilityList()
     m_isUpdateVisibilityList = false;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::ConvertToType(CBaseObject* pObject, const QString& typeName)
-{
-    QString message = QString("Convert ") + pObject->GetName() + " to " + typeName;
-    CUndo undo(message.toUtf8().data());
-
-    CBaseObjectPtr pNewObject = GetIEditor()->NewObject(typeName.toUtf8().data());
-    if (pNewObject)
-    {
-        if (pNewObject->ConvertFromObject(pObject))
-        {
-            DeleteObject(pObject);
-            return true;
-        }
-        DeleteObject(pNewObject);
-    }
-
-    Log((message + " is failed.").toUtf8().data());
-    return false;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect)
 {
@@ -2069,69 +1082,6 @@ void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect)
             m_gizmoManager->AddGizmo(new CAxisGizmo(pObject));
         }
     }
-
-    if (bSelect)
-    {
-        NotifyObjectListeners(pObject, CBaseObject::ON_SELECT);
-    }
-    else
-    {
-        NotifyObjectListeners(pObject, CBaseObject::ON_UNSELECT);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::HideTransformManipulators()
-{
-    m_gizmoManager->DeleteAllTransformManipulators();
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::AddObjectEventListener(EventListener* listener)
-{
-    stl::push_back_unique(m_objectEventListeners, listener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::RemoveObjectEventListener(EventListener* listener)
-{
-    stl::find_and_erase(m_objectEventListeners, listener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::NotifyObjectListeners(CBaseObject* pObject, CBaseObject::EObjectListenerEvent event)
-{
-    std::list<EventListener*>::iterator next;
-    for (std::list<EventListener*>::iterator it = m_objectEventListeners.begin(); it != m_objectEventListeners.end(); it = next)
-    {
-        next = it;
-        ++next;
-        // Call listener callback.
-        (*it)->OnObjectEvent(pObject, event);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::StartObjectsLoading(int numObjects)
-{
-    if (m_pLoadProgress)
-    {
-        return;
-    }
-    m_pLoadProgress = new CWaitProgress("Loading Objects");
-    m_totalObjectsToLoad = numObjects;
-    m_loadedObjects = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::EndObjectsLoading()
-{
-    if (m_pLoadProgress)
-    {
-        delete m_pLoadProgress;
-    }
-    m_pLoadProgress = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -2179,130 +1129,6 @@ bool CObjectManager::IsLightClass(CBaseObject* pObject)
     return false;
 }
 
-void CObjectManager::FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue)
-{
-    CBaseObjectsArray objects;
-    GetObjects(objects);
-
-    for (size_t i = 0, n = objects.size(); i < n; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        if (qobject_cast<CEntityObject*>(pObject))
-        {
-            CEntityObject* pEntity = static_cast<CEntityObject*>(pObject);
-            CVarBlock* pProperties2 = pEntity->GetProperties2();
-            if (pProperties2)
-            {
-                IVariable* pVariable = pProperties2->FindVariable(property2Name);
-                if (pVariable)
-                {
-                    QString sValue;
-                    pVariable->Get(sValue);
-                    if (sValue == oldValue)
-                    {
-                        pEntity->StoreUndo("Rename Property2");
-
-                        pVariable->Set(newValue);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CObjectManager::FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue)
-{
-    CBaseObjectsArray objects;
-    GetObjects(objects);
-
-    for (size_t i = 0, n = objects.size(); i < n; ++i)
-    {
-        CBaseObject* pObject = objects[i];
-        if (qobject_cast<CEntityObject*>(pObject))
-        {
-            CEntityObject* pEntity = static_cast<CEntityObject*>(pObject);
-            CVarBlock* pProperties2 = pEntity->GetProperties2();
-            if (pProperties2)
-            {
-                IVariable* pVariable      = pProperties2->FindVariable(property2Name);
-                IVariable* pOtherVariable = pProperties2->FindVariable(otherProperty2Name);
-                if (pVariable && pOtherVariable)
-                {
-                    QString sValue;
-                    pVariable->Get(sValue);
-
-                    QString sOtherValue;
-                    pOtherVariable->Get(sOtherValue);
-
-                    if ((sValue == oldValue) && (sOtherValue == otherValue))
-                    {
-                        pEntity->StoreUndo("Rename Property2 If");
-
-                        pVariable->Set(newValue);
-                    }
-                }
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::HitTestObjectAgainstRect(CBaseObject* pObj, CViewport* view, HitContext hc, std::vector<GUID>& guids)
-{
-    if (!pObj->IsSelectable())
-    {
-        return;
-    }
-
-    AABB box;
-
-    // Retrieve world space bound box.
-    pObj->GetBoundBox(box);
-
-    // Check if object visible in viewport.
-    if (!view->IsBoundsVisible(box))
-    {
-        return;
-    }
-
-    if (pObj->HitTestRect(hc))
-    {
-        stl::push_back_unique(guids, pObj->GetId());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SelectObjectInRect(CBaseObject* pObj, CViewport* view, HitContext hc, bool bSelect)
-{
-    if (!pObj->IsSelectable())
-    {
-        return;
-    }
-
-    AABB box;
-
-    // Retrieve world space bound box.
-    pObj->GetBoundBox(box);
-
-    // Check if object visible in viewport.
-    if (!view->IsBoundsVisible(box))
-    {
-        return;
-    }
-
-    if (pObj->HitTestRect(hc))
-    {
-        if (bSelect)
-        {
-            SelectObject(pObj);
-        }
-        else
-        {
-            UnselectObject(pObj);
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 namespace
 {
@@ -2382,93 +1208,6 @@ namespace
         }
     }
 
-    bool PyIsObjectHidden(const char* objName)
-    {
-        CBaseObject* pObject =  GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + objName + "\" is an invalid object name.").toUtf8().data());
-        }
-        return pObject->IsHidden();
-    }
-
-    void PyHideAllObjects()
-    {
-        CBaseObjectsArray baseObjects;
-        GetIEditor()->GetObjectManager()->GetObjects(baseObjects);
-
-        if (baseObjects.size() <= 0)
-        {
-            throw std::logic_error("Objects not found.");
-        }
-
-        CUndo undo("Hide All Objects");
-        for (int i = 0; i < baseObjects.size(); i++)
-        {
-            GetIEditor()->GetObjectManager()->HideObject(baseObjects[i], true);
-        }
-    }
-
-    void PyUnHideAllObjects()
-    {
-        CUndo undo("Unhide All Objects");
-        GetIEditor()->GetObjectManager()->UnhideAll();
-    }
-
-    void PyHideObject(const char* objName)
-    {
-        CUndo undo("Hide Object");
-
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (pObject)
-        {
-            GetIEditor()->GetObjectManager()->HideObject(pObject, true);
-        }
-    }
-
-    void PyUnhideObject(const char* objName)
-    {
-        CUndo undo("Unhide Object");
-
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (pObject)
-        {
-            GetIEditor()->GetObjectManager()->HideObject(pObject, false);
-        }
-    }
-
-    void PyFreezeObject(const char* objName)
-    {
-        CUndo undo("Freeze Object");
-
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (pObject)
-        {
-            GetIEditor()->GetObjectManager()->FreezeObject(pObject, true);
-        }
-    }
-
-    void PyUnfreezeObject(const char* objName)
-    {
-        CUndo undo("Unfreeze Object");
-
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (pObject)
-        {
-            GetIEditor()->GetObjectManager()->FreezeObject(pObject, false);
-        }
-    }
-
-    bool PyIsObjectFrozen(const char* objName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + objName + "\" is an invalid object name.").toUtf8().data());
-        }
-        return pObject->IsFrozen();
-    }
-
     void PyDeleteObject(const char* objName)
     {
         CUndo undo("Delete Object");
@@ -2656,16 +1395,6 @@ namespace AzToolsFramework
             addLegacyGeneral(behaviorContext->Method("get_selection_center", PyGetSelectionCenter, nullptr, "Returns the center point of the selection group."));
             addLegacyGeneral(behaviorContext->Method("get_selection_aabb", PyGetSelectionAABB, nullptr, "Returns the aabb of the selection group."));
 
-            addLegacyGeneral(behaviorContext->Method("hide_object", PyHideObject, nullptr, "Hides a specified object."));
-            addLegacyGeneral(behaviorContext->Method("is_object_hidden", PyIsObjectHidden, nullptr, "Checks if object is hidden and returns a bool value."));
-            addLegacyGeneral(behaviorContext->Method("unhide_object", PyUnhideObject, nullptr, "Unhides a specified object."));
-            addLegacyGeneral(behaviorContext->Method("hide_all_objects", PyHideAllObjects, nullptr, "Hides all objects."));
-            addLegacyGeneral(behaviorContext->Method("unhide_all_objects", PyUnHideAllObjects, nullptr, "Unhides all objects."));
-
-            addLegacyGeneral(behaviorContext->Method("freeze_object", PyFreezeObject, nullptr, "Freezes a specified object."));
-            addLegacyGeneral(behaviorContext->Method("is_object_frozen", PyIsObjectFrozen, nullptr, "Checks if object is frozen and returns a bool value."));
-            addLegacyGeneral(behaviorContext->Method("unfreeze_object", PyUnfreezeObject, nullptr, "Unfreezes a specified object."));
-
             addLegacyGeneral(behaviorContext->Method("delete_object", PyDeleteObject, nullptr, "Deletes a specified object."));
             addLegacyGeneral(behaviorContext->Method("delete_selected", PyDeleteSelected, nullptr, "Deletes selected object(s)."));
 
diff --git a/Code/Editor/Objects/ObjectManager.h b/Code/Editor/Objects/ObjectManager.h
index 7389dfa6a1..fb16c2fec3 100644
--- a/Code/Editor/Objects/ObjectManager.h
+++ b/Code/Editor/Objects/ObjectManager.h
@@ -8,10 +8,6 @@
 
 
 // Description : ObjectManager definition.
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
 #pragma once
 
 #include "IObjectManager.h"
@@ -42,12 +38,10 @@ public:
     CObjectManagerLevelIsExporting()
     {
         AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingStarting);
-        GetIEditor()->GetObjectManager()->SetExportingLevel(true);
     }
 
     ~CObjectManagerLevelIsExporting()
     {
-        GetIEditor()->GetObjectManager()->SetExportingLevel(false);
         AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingFinished);
     }
 };
@@ -66,20 +60,12 @@ public:
     CObjectManager();
     ~CObjectManager();
 
-    void RegisterObjectClasses();
-
     CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) override;
     CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newEntityName = nullptr) override;
 
     void    DeleteObject(CBaseObject* obj) override;
     void    DeleteSelection(CSelectionGroup* pSelection) override;
     void    DeleteAllObjects() override;
-    CBaseObject* CloneObject(CBaseObject* obj) override;
-
-    void BeginEditParams(CBaseObject* obj, int flags) override;
-    void EndEditParams(int flags = 0) override;
-    // Hides all transform manipulators.
-    void HideTransformManipulators();
 
     //! Get number of objects manager by ObjectManager (not contain sub objects of groups).
     int     GetObjectCount() const override;
@@ -88,30 +74,9 @@ public:
     //! @param layer if 0 get objects for all layers, or layer to get objects from.
     void GetObjects(CBaseObjectsArray& objects) const override;
 
-    //! Get array of objects that pass the filter.
-    //! @param filter The filter functor, return true if you want to get the certain obj, return false if want to skip it.
-    void    GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const override;
-
-    //! Update objects.
-    void    Update();
-
     //! Display objects on display context.
     void    Display(DisplayContext& dc) override;
 
-    //! Called when selecting without selection helpers - this is needed since
-    //! the visible object cache is normally not updated when not displaying helpers.
-    void ForceUpdateVisibleObjectCache(DisplayContext& dc) override;
-
-    //! Check intersection with objects.
-    //! Find intersection with nearest to ray origin object hit by ray.
-    //! If distance tollerance is specified certain relaxation applied on collision test.
-    //! @return true if hit any object, and fills hitInfo structure.
-    bool HitTest(HitContext& hitInfo) override;
-
-    //! Check intersection with an object.
-    //! @return true if hit, and fills hitInfo structure.
-    bool HitTestObject(CBaseObject* obj, HitContext& hc) override;
-
     //! Send event to all objects.
     //! Will cause OnEvent handler to be called on all objects.
     void    SendEvent(ObjectEvent event) override;
@@ -134,76 +99,28 @@ public:
     //! Find objects which intersect with a given AABB.
     void FindObjectsInAABB(const AABB& aabb, std::vector<CBaseObject*>& result) const override;
 
-    //////////////////////////////////////////////////////////////////////////
-    // Operations on objects.
-    //////////////////////////////////////////////////////////////////////////
-    //! Makes object visible or invisible.
-    void HideObject(CBaseObject* obj, bool hide) override;
-    //! Shows the last hidden object based on hidden ID
-    void ShowLastHiddenObject() override;
-    //! Freeze object, making it unselectable.
-    void FreezeObject(CBaseObject* obj, bool freeze) override;
-    //! Unhide all hidden objects.
-    void UnhideAll() override;
-    //! Unfreeze all frozen objects.
-    void UnfreezeAll() override;
-
     //////////////////////////////////////////////////////////////////////////
     // Object Selection.
     //////////////////////////////////////////////////////////////////////////
     bool    SelectObject(CBaseObject* obj, bool bUseMask = true) override;
     void    UnselectObject(CBaseObject* obj) override;
 
-    //! Select objects within specified distance from given position.
-    //! Return number of selected objects.
-    int SelectObjects(const AABB& box, bool bUnselect = false) override;
-
-    void SelectEntities(std::set<CEntityObject*>& s) override;
-
-    int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false) override;
-
-    //! Selects/Unselects all objects within 2d rectangle in given viewport.
-    void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect) override;
-    void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector<GUID>& guids) override;
-
     //! Clear default selection set.
     //! @Return number of objects removed from selection.
     int ClearSelection() override;
 
-    //! Deselect all current selected objects and selects object that were unselected.
-    //! @Return number of selected objects.
-    int InvertSelection() override;
-
     //! Get current selection.
     CSelectionGroup*    GetSelection() const override { return m_currSelection; };
-    //! Get named selection.
-    CSelectionGroup*    GetSelection(const QString& name) const override;
-    // Get selection group names
-    void GetNameSelectionStrings(QStringList& names) override;
-    //! Change name of current selection group.
-    //! And store it in list.
-    void    NameSelection(const QString& name) override;
-    //! Set one of name selections as current selection.
-    void    SetSelection(const QString& name) override;
-    void    RemoveSelection(const QString& name) override;
 
     bool IsObjectDeletionAllowed(CBaseObject* pObject);
 
     //! Delete all objects in selection group.
     void DeleteSelection() override;
 
-    uint32  ForceID() const override{return m_ForceID; }
-    void    ForceID(uint32 FID) override{m_ForceID = FID; }
-
     //! Generates uniq name base on type name of object.
     QString GenerateUniqueObjectName(const QString& typeName) override;
     //! Register object name in object manager, needed for generating uniq names.
     void RegisterObjectName(const QString& name) override;
-    //! Decrease name number and remove if it was last in object manager, needed for generating uniq names.
-    void UpdateRegisterObjectName(const QString& name);
-    //! Enable/Disable generating of unique object names (Enabled by default).
-    //! Return previous value.
-    bool EnableUniqObjectNames(bool bEnable) override;
 
     //! Register XML template of runtime class.
     void    RegisterClassTemplate(const XmlNodeRef& templ);
@@ -215,52 +132,10 @@ public:
 
     //! Find object class by name.
     CObjectClassDesc* FindClass(const QString& className) override;
-    void    GetClassCategories(QStringList& categories) override;
-    void    GetClassCategoryToolClassNamePairs(std::vector< std::pair<QString, QString> >& categoryToolClassNamePairs) override;
-    void    GetClassTypes(const QString& category, QStringList& types) override;
-
-    //! Export objects to xml.
-    //! When onlyShared is true ony objects with shared flags exported, overwise only not shared object exported.
-    void    Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) override;
-    void    ExportEntities(XmlNodeRef& rootNode) override;
-
-    //! Serialize Objects in manager to specified XML Node.
-    //! @param flags Can be one of SerializeFlags.
-    void    Serialize(XmlNodeRef& rootNode, bool bLoading, int flags = SERIALIZE_ALL) override;
-
-    void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) override;
-
-    //! Load objects from object archive.
-    //! @param bSelect if set newly loaded object will be selected.
-    void LoadObjects(CObjectArchive& ar, bool bSelect) override;
-
-    //! Delete from Object manager all objects without SHARED flag.
-    void    DeleteNotSharedObjects();
-    //! Delete from Object manager all objects with SHARED flag.
-    void    DeleteSharedObjects();
 
     bool AddObject(CBaseObject* obj);
     void RemoveObject(CBaseObject* obj);
     void ChangeObjectId(REFGUID oldId, REFGUID newId) override;
-    bool IsDuplicateObjectName(const QString& newName) const override
-    {
-        return FindObject(newName) ? true : false;
-    }
-    void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const override;
-    void ChangeObjectName(CBaseObject* obj, const QString& newName) override;
-
-    //! Convert object of one type to object of another type.
-    //! Original object is deleted.
-    bool ConvertToType(CBaseObject* pObject, const QString& typeName) override;
-
-    //! Set new selection callback.
-    //! @return previous selection callback.
-    IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback) override;
-
-    // Enables/Disables creating of game objects.
-    void SetCreateGameObject(bool enable) override { m_createGameObjects = enable; };
-    //! Return true if objects loaded from xml should immidiatly create game objects associated with them.
-    bool IsCreateGameObjects() const override { return m_createGameObjects; };
 
     //////////////////////////////////////////////////////////////////////////
     //! Get access to gizmo manager.
@@ -270,33 +145,12 @@ public:
     //! Invalidate visibily settings of objects.
     void InvalidateVisibleList() override;
 
-    //////////////////////////////////////////////////////////////////////////
-    // ObjectManager notification Callbacks.
-    //////////////////////////////////////////////////////////////////////////
-    void AddObjectEventListener(EventListener* listener) override;
-    void RemoveObjectEventListener(EventListener* listener) override;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Used to indicate starting and ending of objects loading.
-    //////////////////////////////////////////////////////////////////////////
-    void StartObjectsLoading(int numObjects) override;
-    void EndObjectsLoading() override;
-
     //////////////////////////////////////////////////////////////////////////
     // Gathers all resources used by all objects.
     void GatherUsedResources(CUsedResources& resources) override;
 
     bool IsLightClass(CBaseObject* pObject) override;
 
-    virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) override;
-    virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) override;
-
-    bool IsReloading() const override { return m_bInReloading; }
-    void SetSkipUpdate(bool bSkipUpdate) override { m_bSkipObjectUpdate = bSkipUpdate; }
-
-    void SetExportingLevel(bool bExporting) override { m_bLevelExporting = bExporting; }
-    bool IsExportingLevelInprogress() const override { return m_bLevelExporting; }
-
     int GetAxisHelperHitRadius() const override { return m_axisHelperHitRadius; }
 
 private:
@@ -317,29 +171,12 @@ private:
     void SelectCurrent();
     void SetObjectSelected(CBaseObject* pObject, bool bSelect);
 
-    // Recursive functions potentially taking into child objects into account
-    void SelectObjectInRect(CBaseObject* pObj, CViewport* view, HitContext hc, bool bSelect);
-    void HitTestObjectAgainstRect(CBaseObject* pObj, CViewport* view, HitContext hc, std::vector<GUID>& guids);
-
-    void SaveRegistry();
-    void LoadRegistry();
-
-    void NotifyObjectListeners(CBaseObject* pObject, CBaseObject::EObjectListenerEvent event);
-
-    void FindDisplayableObjects(DisplayContext& dc, bool bDisplay);
-
 private:
-    typedef std::map<GUID, CBaseObjectPtr, guid_less_predicate> Objects;
+    typedef AZStd::map<GUID, CBaseObjectPtr, guid_less_predicate> Objects;
     Objects m_objects;
-    typedef std::unordered_map<AZ::u32, CBaseObjectPtr> ObjectsByNameCrc;
+    typedef AZStd::unordered_map<AZ::u32, CBaseObjectPtr> ObjectsByNameCrc;
     ObjectsByNameCrc m_objectsByName;
 
-    typedef std::map<QString, CSelectionGroup*> TNameSelectionMap;
-    TNameSelectionMap m_selections;
-
-    //! Used for forcing IDs of "GetEditorObjectID" of PreFabs, as they used to have random IDs on each load
-    uint32  m_ForceID;
-
     //! Array of currently visible objects.
     TBaseObjects m_visibleObjects;
 
@@ -349,16 +186,11 @@ private:
     unsigned int m_lastComputedVisibility = 0; // when the object manager itself last updated visibility (since it also has a cache)
     int m_lastHideMask = 0;
 
-    float m_maxObjectViewDistRatio;
-
     //////////////////////////////////////////////////////////////////////////
     // Selection.
     //! Current selection group.
     CSelectionGroup* m_currSelection;
-    int m_nLastSelCount;
     bool m_bSelectionChanged;
-    IObjectSelectCallback* m_selectCallback;
-    bool m_bLoadingObjects;
 
     // True while performing a select or deselect operation on more than one object.
     // Prevents individual undo/redo commands for every object, allowing bulk undo/redo
@@ -367,20 +199,9 @@ private:
     //! Default selection.
     CSelectionGroup m_defaultSelection;
 
-    CBaseObjectPtr m_currEditObject;
-    bool m_bSingleSelection;
-
-    bool m_createGameObjects;
-    bool m_bGenUniqObjectNames;
-
     // Object manager also handles Gizmo manager.
     CGizmoManager* m_gizmoManager;
 
-    //////////////////////////////////////////////////////////////////////////
-    // Loading progress.
-    CWaitProgress* m_pLoadProgress;
-    int m_loadedObjects;
-    int m_totalObjectsToLoad;
     //////////////////////////////////////////////////////////////////////////
 
     //////////////////////////////////////////////////////////////////////////
@@ -389,10 +210,6 @@ private:
     typedef std::map<QString, std::set<uint16>, stl::less_stricmp<QString> > NameNumbersMap;
     NameNumbersMap m_nameNumbersMap;
 
-    //////////////////////////////////////////////////////////////////////////
-    // Listeners.
-    std::list<EventListener*> m_objectEventListeners;
-
     bool m_bExiting;
 
     std::unordered_set<CEntityObject*> m_animatedAttachedEntities;
@@ -401,10 +218,6 @@ private:
 
     uint64 m_currentHideCount;
 
-    bool m_bInReloading;
-    bool m_bSkipObjectUpdate;
-    bool m_bLevelExporting;
-
     int m_axisHelperHitRadius = 20;
 };
 
@@ -426,4 +239,3 @@ namespace AzToolsFramework
 
 } // namespace AzToolsFramework
 
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
diff --git a/Code/Editor/Objects/ObjectManagerLegacyUndo.h b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
index 721d188171..29dc2aa4ae 100644
--- a/Code/Editor/Objects/ObjectManagerLegacyUndo.h
+++ b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
@@ -24,12 +24,11 @@ public:
     CUndoBaseObjectNew(CBaseObject* object);
 
 protected:
-    virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state.
-    virtual QString GetDescription() override { return "New BaseObject"; };
-    virtual QString GetObjectName() override { return m_object->GetName(); };
+    int GetSize() override { return sizeof(*this); } // Return size of xml state.
+    QString GetObjectName() override { return m_object->GetName(); }
 
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
+    void Undo(bool bUndo) override;
+    void Redo() override;
 
 private:
     CBaseObjectPtr m_object;
@@ -47,12 +46,11 @@ public:
     CUndoBaseObjectDelete(CBaseObject* object);
 
 protected:
-    virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state.
-    virtual QString GetDescription() override { return "Delete BaseObject"; };
-    virtual QString GetObjectName() override { return m_object->GetName(); };
+    int GetSize() override { return sizeof(*this); } // Return size of xml state.
+    QString GetObjectName() override { return m_object->GetName(); }
 
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
+    void Undo(bool bUndo) override;
+    void Redo() override;
 
 private:
     CBaseObjectPtr m_object;
@@ -73,20 +71,19 @@ public:
     * This Undo command can be used for either Legacy or Component Entities, though for
     * performance reasons Component Entities are typically undone using CUndoBaseObjectBulkSelect
     *
-    * @param pObj The object to perform the undo/redo operation on.
+    * @param object The object to perform the undo/redo operation on.
     * @param isSelect This is true if you are trying to undo a select operation, and false if
     *        trying to undo a deselect operation
     */
     CUndoBaseObjectSelect(CBaseObject* object, bool isSelect);
 
 protected:
-    virtual void Release() override { delete this; };
-    virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state.
-    virtual QString GetDescription() override { return "Select Object"; };
-    virtual QString GetObjectName() override; 
+    void Release() override { delete this; }
+    int GetSize() override { return sizeof(*this); } // Return size of xml state.
+    QString GetObjectName() override; 
 
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
+    void Undo(bool bUndo) override;
+    void Redo() override;
 
 private:
     GUID m_guid;
@@ -116,7 +113,6 @@ public:
 
 protected:
     int GetSize() override { return sizeof(*this); } // Return size of xml state.
-    QString GetDescription() override { return QObject::tr("Select Objects"); }
 
     /*
     * Deselects the objects
@@ -153,7 +149,6 @@ public:
 
 protected:
     int GetSize() override { return sizeof(*this); } // Return size of xml state.
-    QString GetDescription() override { return QObject::tr("Select Objects"); }
 
     void Undo(bool bUndo) override;
 
diff --git a/Code/Editor/Objects/SelectionGroup.cpp b/Code/Editor/Objects/SelectionGroup.cpp
index 06d881d607..95a3cc7b14 100644
--- a/Code/Editor/Objects/SelectionGroup.cpp
+++ b/Code/Editor/Objects/SelectionGroup.cpp
@@ -18,8 +18,6 @@
 #include "ViewManager.h"
 #include "Include/IObjectManager.h"
 
-#include <IStatObj.h>
-
 //////////////////////////////////////////////////////////////////////////
 CSelectionGroup::CSelectionGroup()
     : m_ref(1)
@@ -226,7 +224,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
 
     m_bVertexSnapped = false;
     FilterParents();
-    Vec3 newPos;
 
     bool bValidFollowGeometryMode(true);
     if (point.x() == -1 || point.y() == -1)
@@ -234,8 +231,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
         bValidFollowGeometryMode = false;
     }
 
-    SRayHitInfo pickedInfo;
-
     if (moveFlag == eMS_FollowGeometryPosNorm)
     {
         if (m_LastestMoveSelectionFlag != eMS_FollowGeometryPosNorm)
@@ -249,6 +244,8 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
     }
 
     m_LastestMoveSelectionFlag = moveFlag;
+    Vec3 zeroPickedInfo_vHitNormal;
+    Vec3 zeroPickedInfo_vHitPos;
 
     for (int i = 0; i < GetFilteredCount(); i++)
     {
@@ -264,16 +261,15 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
             Vec3 zaxis = m_LastestMovedObjectRot * Vec3(0, 0, 1);
             zaxis.Normalize();
             Quat nq;
-            nq.SetRotationV0V1(zaxis, pickedInfo.vHitNormal);
-            obj->SetPos(pickedInfo.vHitPos);
+            nq.SetRotationV0V1(zaxis, zeroPickedInfo_vHitNormal);
+            obj->SetPos(zeroPickedInfo_vHitPos);
             obj->SetRotation(nq * m_LastestMovedObjectRot);
             continue;
         }
 
-        Matrix34 wtm = obj->GetWorldTM();
+        const Matrix34 &wtm = obj->GetWorldTM();
         Vec3 wp = wtm.GetTranslation();
-
-        newPos = wp + offset;
+        Vec3 newPos = wp + offset;
         if (moveFlag == eMS_FollowTerrain)
         {
             // Make sure object keeps it height.
@@ -465,17 +461,6 @@ void CSelectionGroup::SetScale(const Vec3& scale, int referenceCoordSys)
     Scale(relScale, referenceCoordSys);
 }
 
-
-void CSelectionGroup::StartScaling()
-{
-    for (int i = 0; i < GetFilteredCount(); i++)
-    {
-        CBaseObject* obj = GetFilteredObject(i);
-        obj->StartScaling();
-    }
-}
-
-
 //////////////////////////////////////////////////////////////////////////
 void CSelectionGroup::Align()
 {
@@ -533,45 +518,6 @@ void CSelectionGroup::ResetTransformation()
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Clone(CSelectionGroup& newGroup)
-{
-    IObjectManager* pObjMan = GetIEditor()->GetObjectManager();
-    assert(pObjMan);
-
-    int i;
-    CObjectCloneContext cloneContext;
-
-    FilterParents();
-
-    //////////////////////////////////////////////////////////////////////////
-    // Clone every object.
-    for (i = 0; i < GetFilteredCount(); i++)
-    {
-        CBaseObject* pFromObject = GetFilteredObject(i);
-        CBaseObject* newObj = pObjMan->CloneObject(pFromObject);
-        if (!newObj) // can be null, e.g. sequence can't be cloned
-        {
-            continue;
-        }
-
-        cloneContext.AddClone(pFromObject, newObj);
-        newGroup.AddObject(newObj);
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Only after everything was cloned, call PostClone on all cloned objects.
-    for (i = 0; i < newGroup.GetCount(); ++i)
-    {
-        CBaseObject* pFromObject = GetFilteredObject(i);
-        CBaseObject* pClonedObject = newGroup.GetObject(i);
-        if (pClonedObject)
-        {
-            pClonedObject->PostClone(pFromObject, cloneContext);
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CSelectionGroup::SendEvent(ObjectEvent event)
 {
diff --git a/Code/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h
index 600bce5f26..8d979d23be 100644
--- a/Code/Editor/Objects/SelectionGroup.h
+++ b/Code/Editor/Objects/SelectionGroup.h
@@ -98,7 +98,6 @@ public:
     //! Resets rotation and scale to identity and (1.0f, 1.0f, 1.0f)
     void ResetTransformation();
     //! Scale objects in selection by given scale.
-    void StartScaling();
     void Scale(const Vec3& scale, int referenceCoordSys);
     void SetScale(const Vec3& scale, int referenceCoordSys);
     //! Align objects in selection to surface normal
@@ -106,11 +105,6 @@ public:
     //! Very special method to move contents of a voxel.
     void MoveContent(const Vec3& offset);
 
-    //////////////////////////////////////////////////////////////////////////
-    //! Clone objects in this group and add cloned objects to new selection group.
-    //! Only topmost parent  objects will be added to this selection group.
-    void Clone(CSelectionGroup& newGroup);
-
     // Send event to all objects in selection group.
     void SendEvent(ObjectEvent event);
 
diff --git a/Code/Editor/Plugin.cpp b/Code/Editor/Plugin.cpp
index 4f6fe0279d..68f8d8833b 100644
--- a/Code/Editor/Plugin.cpp
+++ b/Code/Editor/Plugin.cpp
@@ -14,6 +14,7 @@
 // Editor
 #include "Include/IViewPane.h"
 
+#include <QMessageBox>
 
 CClassFactory* CClassFactory::s_pInstance = nullptr;
 CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pFirst = nullptr;
@@ -79,7 +80,7 @@ void CClassFactory::RegisterClass(IClassDesc* pClassDesc)
             existingUUIDString,
             findByGuid->second->ClassName().toUtf8().data());
 
-        CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate UUID", MB_OK);
+        QMessageBox::critical(nullptr,"Invalid class registration - Duplicate UUID",QString::fromLatin1(errorMessageBuffer));
         return;
     }
 
@@ -107,7 +108,7 @@ void CClassFactory::RegisterClass(IClassDesc* pClassDesc)
             newUUIDString,
             existingUUIDString);
 
-        CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate Class Name", MB_OK);
+        QMessageBox::critical(nullptr, "Invalid class registration - Duplicate Class Name", QString::fromLatin1(errorMessageBuffer));
         return;
     }
 
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
index 8957b6ced6..fbb700723b 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
@@ -36,7 +36,6 @@
 #include <AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h>
 #include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
 #include <AzToolsFramework/Undo/UndoCacheInterface.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
 
 #include <IDisplayViewport.h>
 #include <CryCommon/Cry_GeoIntersect.h>
@@ -48,14 +47,12 @@
 /**
  * Scalars for icon drawing behavior.
  */
-static const int s_kIconSize              = 36;       /// Icon display size (in pixels)
-
 CComponentEntityObject::CComponentEntityObject()
-    : m_hasIcon(false)
+    : m_accentType(AzToolsFramework::EntityAccentType::None)
+    , m_hasIcon(false)
     , m_entityIconVisible(false)
     , m_iconOnlyHitTest(false)
     , m_drawAccents(true)
-    , m_accentType(AzToolsFramework::EntityAccentType::None)
     , m_isIsolated(false)
     , m_iconTexture(nullptr)
 {
@@ -243,7 +240,7 @@ void CComponentEntityObject::SetSelected(bool bSelect)
     }
 
     bool anySelected = false;
-    
+
     AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(anySelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
 
     if (!anySelected)
@@ -266,18 +263,6 @@ void CComponentEntityObject::SetHighlight(bool bHighlight)
     }
 }
 
-IRenderNode* CComponentEntityObject::GetEngineNode() const
-{
-    // It's possible for AZ::Entities to have multiple IRenderNodes.
-    // However, the editor currently expects a single IRenderNode per "editor object".
-    // Therefore, return the highest priority handler.
-    if (auto* renderNodeHandler = LmbrCentral::RenderNodeRequestBus::FindFirstHandler(m_entityId))
-    {
-        return renderNodeHandler->GetRenderNode();
-    }
-    return nullptr;
-}
-
 void CComponentEntityObject::OnEntityNameChanged(const AZStd::string& name)
 {
     if (m_nameReentryGuard)
@@ -331,14 +316,6 @@ void CComponentEntityObject::DetachThis(bool /*bKeepPos*/)
     }
 }
 
-CBaseObject* CComponentEntityObject::GetLinkParent() const
-{
-    AZ::EntityId parentId;
-    EBUS_EVENT_ID_RESULT(parentId, m_entityId, AZ::TransformBus, GetParentId);
-
-    return CComponentEntityObject::FindObjectForEntity(parentId);
-}
-
 bool CComponentEntityObject::IsFrozen() const
 {
     return CheckFlags(OBJFLAG_FROZEN);
@@ -358,16 +335,6 @@ void CComponentEntityObject::OnEntityLockChanged(bool locked)
     CEntityObject::SetFrozen(locked);
 }
 
-void CComponentEntityObject::SetHidden(
-    bool bHidden, [[maybe_unused]] uint64 hiddenId /*=CBaseObject::s_invalidHiddenID*/, [[maybe_unused]] bool bAnimated /*=false*/)
-{
-    if (m_visibilityFlagReentryGuard)
-    {
-        EditorActionScope flagChange(m_visibilityFlagReentryGuard);
-        AzToolsFramework::SetEntityVisibility(m_entityId, !bHidden);
-    }
-}
-
 void CComponentEntityObject::OnEntityVisibilityChanged(bool visible)
 {
     CEntityObject::SetHidden(!visible);
@@ -612,66 +579,6 @@ void CComponentEntityObject::OnTransformChanged([[maybe_unused]] const AZ::Trans
     }
 }
 
-int CComponentEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
-    if (event == eMouseMove || event == eMouseLDown)
-    {
-        Vec3 pos;
-        if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
-        {
-            pos = view->MapViewToCP(point);
-        }
-        else
-        {
-            // Snap to terrain.
-            bool hitTerrain;
-            pos = view->ViewToWorld(point, &hitTerrain);
-            if (hitTerrain)
-            {
-                pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
-            }
-            pos = view->SnapToGrid(pos);
-        }
-
-        pos = view->SnapToGrid(pos);
-        SetPos(pos);
-
-        if (event == eMouseLDown)
-        {
-            return MOUSECREATE_OK;
-        }
-
-        return MOUSECREATE_CONTINUE;
-    }
-
-    return CBaseObject::MouseCreateCallback(view, event, point, flags);
-}
-
-bool CComponentEntityObject::HitHelperTest(HitContext& hc)
-{
-    bool hit = CEntityObject::HitHelperTest(hc);
-    if (!hit && m_entityId.IsValid())
-    {
-        // Pick against icon in screen space.
-        if (IsEntityIconVisible())
-        {
-            const QPoint entityScreenPos = hc.view->WorldToView(GetWorldPos());
-            const float screenPosX = static_cast<float>(entityScreenPos.x());
-            const float screenPosY = static_cast<float>(entityScreenPos.y());
-            const float iconRange = static_cast<float>(s_kIconSize / 2);
-
-            if ((hc.point2d.x() >= screenPosX - iconRange && hc.point2d.x() <= screenPosX + iconRange)
-                && (hc.point2d.y() >= screenPosY - iconRange && hc.point2d.y() <= screenPosY + iconRange))
-            {
-                hc.dist = hc.raySrc.GetDistance(GetWorldPos());
-                hc.iconHit = true;
-                return true;
-            }
-        }
-    }
-    return hit;
-}
-
 bool CComponentEntityObject::HitTest(HitContext& hc)
 {
     AZ_PROFILE_FUNCTION(Entity);
@@ -907,11 +814,6 @@ void CComponentEntityObject::DrawDefault(DisplayContext& dc, const QColor& label
     DrawAccent(dc);
 }
 
-IStatObj* CComponentEntityObject::GetIStatObj()
-{
-    return nullptr;
-}
-
 bool CComponentEntityObject::IsIsolated() const
 {
     return m_isIsolated;
@@ -952,11 +854,6 @@ void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags)
     CEntityObject::SetWorldPos(pos, flags);
 }
 
-void CComponentEntityObject::OnContextMenu(QMenu* /*pMenu*/)
-{
-    // Deliberately bypass the base class implementation (CEntityObject::OnContextMenu()).
-}
-
 void CComponentEntityObject::SetupEntityIcon()
 {
     bool hideIconInViewport = false;
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
index bb19f4d77e..7ccea8da84 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
@@ -56,27 +56,21 @@ public:
     bool SetScale(const Vec3& scale, int flags) override;
     void InvalidateTM(int nWhyFlags) override;
     void Display(DisplayContext& disp) override;
-    void OnContextMenu(QMenu* pMenu) override;
-    int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override;
-    bool HitHelperTest(HitContext& hc) override;
     bool HitTest(HitContext& hc) override;
     void GetLocalBounds(AABB& box) override;
     void GetBoundBox(AABB& box) override;
     void SetName(const QString& name) override;
     bool IsFrozen() const override;
     void SetFrozen(bool bFrozen) override;
-    void SetHidden(bool bHidden, uint64 hiddenId = CBaseObject::s_invalidHiddenID, bool bAnimated = false) override;
     void SetSelected(bool bSelect) override;
     void SetHighlight(bool bHighlight) override;
-    IRenderNode* GetEngineNode() const override;
     void AttachChild(CBaseObject* child, bool bKeepPos = true) override;
     void DetachAll(bool bKeepPos = true) override;
     void DetachThis(bool bKeepPos = true) override;
-    CBaseObject* GetLinkParent() const override;
     XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode) override;
     void DeleteEntity() override;
     void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255)) override;
-    IStatObj* GetIStatObj() override;
+
     bool IsIsolated() const override;
     bool IsSelected() const override;
     bool IsSelectable() const override;
@@ -88,12 +82,6 @@ public:
     // Component entity highlighting (accenting) is taken care of elsewhere
     void DrawHighlight(DisplayContext& /*dc*/) override {};
 
-    // Don't auto-clone children. Cloning happens in groups with reference fixups,
-    // and individually selected objercts should be cloned as individuals.
-    bool ShouldCloneChildren() const override { return false; }
-
-
-
     //////////////////////////////////////////////////////////////////////////
 
     //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index 82d9f9ede2..9342c17a37 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -10,7 +10,6 @@
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/TransformBus.h>
-#include <AzCore/Console/IConsole.h>
 #include <AzCore/Debug/Profiler.h>
 #include <AzCore/Math/Transform.h>
 #include <AzCore/RTTI/AttributeReader.h>
@@ -57,6 +56,7 @@
 #include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
 #include <AzToolsFramework/UI/Layer/NameConflictWarning.hxx>
 #include <AzToolsFramework/ViewportSelection/EditorHelpers.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <MathConversion.h>
 
 #include <Atom/RPI.Public/ViewportContext.h>
@@ -447,7 +447,7 @@ void SandboxIntegrationManager::OnEndUndo(const char* label, bool changed)
     // Add the undo only after we know it's got a legit change, we can't remove undos from the cry undo system so we do it here instead of OnBeginUndo
     if (changed && CUndo::IsRecording())
     {
-        CUndo::Record(new CToolsApplicationUndoLink(label));
+        CUndo::Record(new CToolsApplicationUndoLink());
     }
     if (m_startedUndoRecordingNestingLevel)
     {
@@ -498,13 +498,11 @@ void SandboxIntegrationManager::EntityParentChanged(
     // before finally being saved, it will result in all of those layers saving, too.
     AZ::EntityId oldAncestor = oldParentId;
 
-    bool wasNotInLayer = false;
     AZ::EntityId oldLayer;
     do
     {
         if (!oldAncestor.IsValid())
         {
-            wasNotInLayer = true;
             break;
         }
 
@@ -530,13 +528,11 @@ void SandboxIntegrationManager::EntityParentChanged(
 
     AZ::EntityId newAncestor = newParentId;
 
-    bool isGoingToRootScene = false;
     AZ::EntityId newLayer;
     do
     {
         if (!newAncestor.IsValid())
         {
-            isGoingToRootScene = true;
             break;
         }
 
@@ -1394,13 +1390,13 @@ void SandboxIntegrationManager::ContextMenu_NewEntity()
 {
     AZ::Vector3 worldPosition = AZ::Vector3::CreateZero();
 
-    CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport();
     // If we don't have a viewport active to aid in placement, the object
     // will be created at the origin.
-    if (view)
+    if (CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport())
     {
-        const QPoint viewPoint(static_cast<int>(m_contextMenuViewPoint.GetX()), static_cast<int>(m_contextMenuViewPoint.GetY()));
-        worldPosition = view->GetHitLocation(viewPoint);
+        worldPosition = AzToolsFramework::FindClosestPickIntersection(
+            view->GetViewportId(), AzFramework::ScreenPointFromVector2(m_contextMenuViewPoint), AzToolsFramework::EditorPickRayLength,
+            AzToolsFramework::GetDefaultEntityPlacementDistance());
     }
 
     CreateNewEntityAtPosition(worldPosition);
@@ -1675,6 +1671,12 @@ void SandboxIntegrationManager::GoToEntitiesInViewports(const AzToolsFramework::
         if (auto viewportContext = viewportContextManager->GetViewportContextById(viewIndex))
         {
             const AZ::Transform cameraTransform = viewportContext->GetCameraTransform();
+            // do not attempt to interpolate to where we currently are
+            if (cameraTransform.GetTranslation().IsClose(center))
+            {
+                continue;
+            }
+
             const AZ::Vector3 forward = (center - cameraTransform.GetTranslation()).GetNormalized();
 
             // move camera 25% further back than required
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
index 9afa944438..7fe2881b92 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
@@ -306,8 +306,7 @@ class CToolsApplicationUndoLink
 {
 public:
 
-    CToolsApplicationUndoLink(const char* description)
-        : m_description(description)
+    CToolsApplicationUndoLink()
     {
     }
 
@@ -316,11 +315,6 @@ public:
         return 0;
     }
 
-    QString GetDescription() override
-    {
-        return m_description.c_str();
-    }
-
     void Undo(bool bUndo = true) override
     {
         // Always run the undo even if the flag was set to false, that just means that undo wasn't expressly desired, but can be used in cases of canceling the current super undo.
@@ -354,8 +348,6 @@ public:
             w->setFocus(Qt::OtherFocusReason);
         }
     }
-
-    AZStd::string m_description;
 };
 
 #endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
index df8d6db4a8..60fda239dc 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp
@@ -18,7 +18,6 @@
 
 #include <LmbrCentral/Rendering/LensFlareAsset.h>
 #include <LmbrCentral/Rendering/MeshAsset.h>
-#include <LmbrCentral/Rendering/MaterialAsset.h>
 
 #include <AzCore/Memory/Memory.h>
 #include <AzCore/RTTI/TypeInfo.h>
@@ -136,14 +135,6 @@ AssetCatalogModel::AssetCatalogModel(QObject* parent)
         }
     }
 
-    //  Special cases for SimpleAssets. If these get full-fledged AssetData types, these cases can be removed.
-    QString textureExtensions = LmbrCentral::TextureAsset::GetFileFilter();
-    m_extensionToAssetType.insert(AZStd::make_pair(textureExtensions.replace("*", "").replace(" ", "").toStdString().c_str(), AZStd::vector<AZ::Uuid> { AZ::AzTypeInfo<LmbrCentral::TextureAsset>::Uuid() }));
-    QString materialExtensions = LmbrCentral::MaterialAsset::GetFileFilter();
-    m_extensionToAssetType.insert(AZStd::make_pair(materialExtensions.replace("*", "").replace(" ", "").toStdString().c_str(), AZStd::vector<AZ::Uuid> { AZ::AzTypeInfo<LmbrCentral::MaterialAsset>::Uuid() }));
-    QString dccMaterialExtensions = LmbrCentral::DccMaterialAsset::GetFileFilter();
-    m_extensionToAssetType.insert(AZStd::make_pair(dccMaterialExtensions.replace("*", "").replace(" ", "").toStdString().c_str(), AZStd::vector<AZ::Uuid> { AZ::AzTypeInfo<LmbrCentral::DccMaterialAsset>::Uuid() }));
-
     AZ::SerializeContext* serializeContext = nullptr;
     EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
     AZ_Assert(serializeContext, "Failed to acquire application serialize context.");
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
index c25248d4f6..08d79adcf5 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
@@ -2640,7 +2640,7 @@ QSize OutlinerItemDelegate::sizeHint(const QStyleOptionViewItem& option, const Q
             m_cachedBoundingRectOfTallCharacter = QRect(); 
         };
 
-        QTimer::singleShot(0, resetFunction);
+        QTimer::singleShot(0, this, resetFunction);
     }
   
     // And add 8 to it gives the outliner roughly the visible spacing we're looking for.
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
index 803deb3509..af58ac4b6b 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
@@ -121,6 +121,18 @@ namespace
             SortEntityChildrenRecursively(childId, comparer);
         }
     }
+
+    QModelIndex nextIndexForTree(bool direction, OutlinerTreeView *tree, QModelIndex current)
+    {
+        if (direction)
+        {
+            return tree->indexAbove(current);
+        }
+        else
+        {
+            return tree->indexBelow(current);
+        }
+    }
 }
 
 OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags)
@@ -891,9 +903,7 @@ void OutlinerWidget::DoSelectSliceRootNextToSelection(bool isTraversalUpwards)
         return;
     }
 
-    AZStd::function<QModelIndex(QModelIndex)> getNextIdxFunction =
-        AZStd::bind(isTraversalUpwards ? &QTreeView::indexAbove : &QTreeView::indexBelow, treeView, AZStd::placeholders::_1);
-    QModelIndex nextIdx = getNextIdxFunction(currentIdx);
+    QModelIndex nextIdx = nextIndexForTree(isTraversalUpwards,treeView,currentIdx);
     bool foundSliceRoot = false;
 
     while (nextIdx.isValid() && !foundSliceRoot)
@@ -904,7 +914,7 @@ void OutlinerWidget::DoSelectSliceRootNextToSelection(bool isTraversalUpwards)
         AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
             foundSliceRoot, &AzToolsFramework::ToolsApplicationRequests::IsSliceRootEntity, currentEntityId);
 
-        nextIdx = getNextIdxFunction(currentIdx);
+        nextIdx = nextIndexForTree(isTraversalUpwards, treeView, currentIdx);
     }
 
     if (foundSliceRoot)
@@ -934,13 +944,10 @@ void OutlinerWidget::DoSelectEdgeSliceRoot(bool shouldSelectTopMostSlice)
     }
 
     QModelIndex currentIdx;
-    AZStd::function<QModelIndex(QModelIndex)> getNextIdxFunction;
+
     if (shouldSelectTopMostSlice)
     {
         currentIdx = itemModel->index(0, OutlinerListModel::ColumnName);
-
-        getNextIdxFunction =
-            AZStd::bind(&QTreeView::indexBelow, treeView, AZStd::placeholders::_1);
     }
     else
     {
@@ -949,9 +956,6 @@ void OutlinerWidget::DoSelectEdgeSliceRoot(bool shouldSelectTopMostSlice)
         {
             currentIdx = itemModel->index(itemModel->rowCount(currentIdx) - 1, OutlinerListModel::ColumnName, currentIdx);
         }
-
-        getNextIdxFunction =
-            AZStd::bind(&QTreeView::indexAbove, treeView, AZStd::placeholders::_1);
     }
 
     QModelIndex nextIdx = currentIdx;
@@ -964,7 +968,7 @@ void OutlinerWidget::DoSelectEdgeSliceRoot(bool shouldSelectTopMostSlice)
 
         AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
             foundSliceRoot, &AzToolsFramework::ToolsApplicationRequests::IsSliceRootEntity, currentEntityId);
-        nextIdx = getNextIdxFunction(currentIdx);
+        nextIdx = nextIndexForTree(shouldSelectTopMostSlice,treeView,currentIdx);
     } while (nextIdx.isValid() && !foundSliceRoot);
 
     if (foundSliceRoot)
@@ -1416,7 +1420,10 @@ void OutlinerWidget::SortContent()
     }
     m_entitiesToSort.clear();
 
-    auto comparer = AZStd::bind(&CompareEntitiesForSorting, AZStd::placeholders::_1, AZStd::placeholders::_2, m_sortMode);
+    auto comparer = [sortMode = m_sortMode](AZ::EntityId left, AZ::EntityId right) -> bool
+    {
+        return CompareEntitiesForSorting(left, right, sortMode);
+    };
     for (const AZ::EntityId& entityId : parentsToSort)
     {
         SortEntityChildren(entityId, comparer);
@@ -1433,7 +1440,10 @@ void OutlinerWidget::OnSortModeChanged(EntityOutliner::DisplaySortMode sortMode)
     if (sortMode != EntityOutliner::DisplaySortMode::Manually)
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
-        auto comparer = AZStd::bind(&CompareEntitiesForSorting, AZStd::placeholders::_1, AZStd::placeholders::_2, sortMode);
+        auto comparer = [sortMode = m_sortMode](AZ::EntityId left, AZ::EntityId right) -> bool
+        {
+            return CompareEntitiesForSorting(left, right, sortMode);
+        };
         SortEntityChildrenRecursively(AZ::EntityId(), comparer);
     }
 
diff --git a/Code/Editor/Resource.h b/Code/Editor/Resource.h
index b3640fac70..ba3cd39fe7 100644
--- a/Code/Editor/Resource.h
+++ b/Code/Editor/Resource.h
@@ -104,6 +104,7 @@
 #define ID_FILE_EXPORTTOGAMENOSURFACETEXTURE       33473
 #define ID_VIEW_SWITCHTOGAME                       33477
 #define ID_VIEW_SWITCHTOGAME_FULLSCREEN            33478
+#define ID_VIEW_SWITCHTOGAME_VIEWPORT              33479
 #define ID_MOVE_OBJECT                             33481
 #define ID_RENAME_OBJ                              33483
 #define ID_FETCH                                   33496
diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp
index d548cffb52..acb48c3545 100644
--- a/Code/Editor/Settings.cpp
+++ b/Code/Editor/Settings.cpp
@@ -112,8 +112,6 @@ SEditorSettings::SEditorSettings()
     m_showCircularDependencyError = true;
     bAutoloadLastLevelAtStartup = false;
     bMuteAudio = false;
-    bEnableGameModeVR = false;
-
 
     objectHideMask = 0;
     objectSelectMask = 0xFFFFFFFF; // Initially all selectable.
@@ -473,7 +471,7 @@ void SEditorSettings::LoadValue(const char* sSection, const char* sKey, ESystemC
 }
 
 //////////////////////////////////////////////////////////////////////////
-void SEditorSettings::Save()
+void SEditorSettings::Save(bool isEditorClosing)
 {
     QString strStringPlaceholder;
 
@@ -640,14 +638,16 @@ void SEditorSettings::Save()
     // --- Settings Registry values
 
     // Prefab System UI
-    AzFramework::ApplicationRequests::Bus::Broadcast(
-        &AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
+    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
 
     AzToolsFramework::Prefab::PrefabLoaderInterface* prefabLoaderInterface =
         AZ::Interface<AzToolsFramework::Prefab::PrefabLoaderInterface>::Get();
     prefabLoaderInterface->SetSaveAllPrefabsPreference(levelSaveSettings.saveAllPrefabsPreference);
 
-    SaveSettingsRegistryFile();
+    if (!isEditorClosing)
+    {
+        SaveSettingsRegistryFile();
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Settings.h b/Code/Editor/Settings.h
index 426d2300d3..9276d9b715 100644
--- a/Code/Editor/Settings.h
+++ b/Code/Editor/Settings.h
@@ -267,7 +267,7 @@ struct SANDBOX_API SEditorSettings
 AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     SEditorSettings();
     ~SEditorSettings() = default;
-    void    Save();
+    void    Save(bool isEditorClosing = false);
     void    Load();
     void    LoadCloudSettings();
 
@@ -305,7 +305,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     bool m_showCircularDependencyError;
     bool bAutoloadLastLevelAtStartup;
     bool bMuteAudio;
-    bool bEnableGameModeVR;
 
     //! Speed of camera movement.
     float cameraMoveSpeed;
diff --git a/Code/Editor/StartupLogoDialog.ui b/Code/Editor/StartupLogoDialog.ui
index c0b8115cb0..cbc596f53a 100644
--- a/Code/Editor/StartupLogoDialog.ui
+++ b/Code/Editor/StartupLogoDialog.ui
@@ -103,7 +103,7 @@
          <item>
           <widget class="QLabel" name="label_2">
            <property name="text">
-            <string>General Availability</string>
+            <string>development</string>
            </property>
           </widget>
          </item>
diff --git a/Code/Editor/ToolbarManager.cpp b/Code/Editor/ToolbarManager.cpp
index 00b7992ef0..6b610d23ce 100644
--- a/Code/Editor/ToolbarManager.cpp
+++ b/Code/Editor/ToolbarManager.cpp
@@ -590,6 +590,16 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const
     return t;
 }
 
+QMenu* ToolbarManager::CreatePlayButtonMenu() const
+{
+    QMenu* playButtonMenu = new QMenu("Play Game");
+
+    playButtonMenu->addAction(m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME_VIEWPORT));
+    playButtonMenu->addAction(m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME_FULLSCREEN));
+
+    return playButtonMenu;
+}
+
 AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
 {
     AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Controls"));
@@ -598,8 +608,17 @@ AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
     t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); 
     t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, ORIGINAL_TOOLBAR_VERSION);
-    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
-    t.AddAction(ID_VIEW_SWITCHTOGAME_FULLSCREEN, TOOLBARS_WITH_PLAY_GAME);
+
+    QAction* playAction = m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME);
+    QToolButton* playButton = new QToolButton(t.Toolbar());
+
+    QMenu* menu = CreatePlayButtonMenu();
+    menu->setParent(t.Toolbar());
+    playAction->setMenu(menu);
+
+    playButton->setDefaultAction(playAction);
+    t.AddWidget(playButton, ID_VIEW_SWITCHTOGAME, ORIGINAL_TOOLBAR_VERSION);
+
     t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
     t.AddAction(ID_SWITCH_PHYSICS, TOOLBARS_WITH_PLAY_GAME);    
     return t;
@@ -728,7 +747,14 @@ void AmazonToolbar::SetActionsOnInternalToolbar(ActionManager* actionManager)
         {
             if (actionManager->HasAction(actionId))
             {
-                m_toolbar->addAction(actionManager->GetAction(actionId));
+                if (actionData.widget != nullptr)
+                {
+                    m_toolbar->addWidget(actionData.widget);
+                }
+                else
+                {
+                    m_toolbar->addAction(actionManager->GetAction(actionId));
+                }
             }
         }
     }
@@ -1367,7 +1393,12 @@ void AmazonToolbar::InstantiateToolbar(QMainWindow* mainWindow, ToolbarManager*
 
 void AmazonToolbar::AddAction(int actionId, int toolbarVersionAdded)
 {
-    m_actions.push_back({ actionId, toolbarVersionAdded });
+    AddWidget(nullptr, actionId, toolbarVersionAdded);
+}
+
+void AmazonToolbar::AddWidget(QWidget* widget, int actionId, int toolbarVersionAdded)
+{
+    m_actions.push_back({ actionId, toolbarVersionAdded, widget });
 }
 
 void AmazonToolbar::Clear()
diff --git a/Code/Editor/ToolbarManager.h b/Code/Editor/ToolbarManager.h
index be537533b6..ae6b0c7296 100644
--- a/Code/Editor/ToolbarManager.h
+++ b/Code/Editor/ToolbarManager.h
@@ -87,6 +87,7 @@ public:
     const QString& GetTranslatedName() const { return m_translatedName; }
 
     void AddAction(int actionId, int toolbarVersionAdded = 0);
+    void AddWidget(QWidget* widget, int actionId, int toolbarVersionAdded = 0);
 
     QToolBar* Toolbar() const { return m_toolbar; }
 
@@ -117,6 +118,7 @@ private:
     {
         int actionId;
         int toolbarVersionAdded;
+        QWidget* widget;
 
         bool operator ==(const AmazonToolbar::ActionData& other) const
         {
@@ -133,7 +135,9 @@ private:
 class AmazonToolBarExpanderWatcher;
 
 class ToolbarManager
+    : public QObject
 {
+    Q_OBJECT
 public:
     explicit ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow);
     ~ToolbarManager();
@@ -178,6 +182,8 @@ private:
     void UpdateAllowedAreas(QToolBar* toolbar);
     bool IsDirty(const AmazonToolbar& toolbar) const;
 
+    QMenu* CreatePlayButtonMenu() const;
+
     const AmazonToolbar* FindDefaultToolbar(const QString& toolbarName) const;
     AmazonToolbar* FindToolbar(const QString& toolbarName);
 
diff --git a/Code/Editor/TrackView/AtomOutputFrameCapture.cpp b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
index 94451e6914..5943e3c2d7 100644
--- a/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
+++ b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
@@ -13,6 +13,7 @@
 #include <Atom/RPI.Public/Scene.h>
 #include <Atom/RPI.Public/View.h>
 #include <Atom/RPI.Reflect/System/RenderPipelineDescriptor.h>
+#include <PostProcess/PostProcessFeatureProcessor.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/MatrixUtils.h>
 #include <AzCore/Name/Name.h>
@@ -47,18 +48,42 @@ namespace TrackView
         AZ::Name viewName = AZ::Name("MainCamera");
         m_view = AZ::RPI::View::CreateView(viewName, AZ::RPI::View::UsageCamera);
         m_renderPipeline->SetDefaultView(m_view);
+        m_targetView = scene.GetDefaultRenderPipeline()->GetDefaultView();
+        if (AZ::Render::PostProcessFeatureProcessor* fp = scene.GetFeatureProcessor<AZ::Render::PostProcessFeatureProcessor>())
+        {
+            // This will be set again to mimic the active camera in UpdateView
+            fp->SetViewAlias(m_view, m_targetView);
+        }
     }
 
     void AtomOutputFrameCapture::DestroyPipeline(AZ::RPI::Scene& scene)
     {
+        if (AZ::Render::PostProcessFeatureProcessor* fp = scene.GetFeatureProcessor<AZ::Render::PostProcessFeatureProcessor>())
+        {
+            // Remove view alias introduced in CreatePipeline and UpdateView
+            fp->RemoveViewAlias(m_view);
+        }
         scene.RemoveRenderPipeline(m_renderPipeline->GetId());
         m_passHierarchy.clear();
         m_renderPipeline.reset();
         m_view.reset();
+        m_targetView.reset();
     }
 
-    void AtomOutputFrameCapture::UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection)
+    void AtomOutputFrameCapture::UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection, const AZ::RPI::ViewPtr targetView)
     {
+        if (targetView && targetView != m_targetView)
+        {
+            if (AZ::RPI::Scene* scene = SceneFromGameEntityContext())
+            {
+                if (AZ::Render::PostProcessFeatureProcessor* fp = scene->GetFeatureProcessor<AZ::Render::PostProcessFeatureProcessor>())
+                {
+                    fp->SetViewAlias(m_view, targetView);
+                    m_targetView = targetView;
+                }
+            }
+        }
+
         m_view->SetCameraTransform(cameraTransform);
         m_view->SetViewToClipMatrix(cameraProjection);
     }
diff --git a/Code/Editor/TrackView/AtomOutputFrameCapture.h b/Code/Editor/TrackView/AtomOutputFrameCapture.h
index 2686a81c99..4719ab08e5 100644
--- a/Code/Editor/TrackView/AtomOutputFrameCapture.h
+++ b/Code/Editor/TrackView/AtomOutputFrameCapture.h
@@ -39,11 +39,12 @@ namespace TrackView
             CaptureFinishedCallback captureFinishedCallback);
 
         //! Update the internal view that is associated with the created pipeline.
-        void UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection);
+        void UpdateView(const AZ::Matrix3x4& cameraTransform, const AZ::Matrix4x4& cameraProjection, const AZ::RPI::ViewPtr targetView = nullptr);
 
     private:
         AZ::RPI::RenderPipelinePtr m_renderPipeline; //!< The internal render pipeline.
         AZ::RPI::ViewPtr m_view; //!< The view associated with the render pipeline.
+        AZ::RPI::ViewPtr m_targetView; //!< The view that this render pipeline will mimic.
         AZStd::vector<AZStd::string> m_passHierarchy; //!< Pass hierarchy (includes pipelineName and CopyToSwapChain).
         CaptureFinishedCallback m_captureFinishedCallback; //!< Stored callback called from OnCaptureFinished.
 
diff --git a/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
index d7901e338a..a796a8ce37 100644
--- a/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
+++ b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
@@ -16,6 +16,7 @@
 
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzFramework/Windowing/WindowBus.h>
+#include <Atom/RPI.Public/ViewProviderBus.h>
 
 // Qt
 #include <QAction>
@@ -91,9 +92,12 @@ namespace
 static void UpdateAtomOutputFrameCaptureView(TrackView::AtomOutputFrameCapture& atomOutputFrameCapture, const int width, const int height)
 {
     const AZ::EntityId activeCameraEntityId = TrackView::ActiveCameraEntityId();
+    AZ::RPI::ViewPtr view = nullptr;
+    AZ::RPI::ViewProviderBus::EventResult(view, activeCameraEntityId, &AZ::RPI::ViewProvider::GetView);
     atomOutputFrameCapture.UpdateView(
         TrackView::TransformFromEntityId(activeCameraEntityId),
-        TrackView::ProjectionFromCameraEntityId(activeCameraEntityId, static_cast<float>(width), static_cast<float>(height)));
+        TrackView::ProjectionFromCameraEntityId(activeCameraEntityId, aznumeric_cast<float>(width), aznumeric_cast<float>(height)),
+        view);
 }
 
 CSequenceBatchRenderDialog::CSequenceBatchRenderDialog(float fps, QWidget* pParent /* = nullptr */)
diff --git a/Code/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Editor/TrackView/SoundKeyUIControls.cpp
index 8c18b58aed..f001937e82 100644
--- a/Code/Editor/TrackView/SoundKeyUIControls.cpp
+++ b/Code/Editor/TrackView/SoundKeyUIControls.cpp
@@ -108,18 +108,15 @@ void CSoundKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selec
         {
             ISoundKey soundKey;
             keyHandle.GetKey(&soundKey);
-            bool bChangedSoundFile = false;
 
             if (pVar == mv_startTrigger.GetVar())
             {
                 QString sFilename = mv_startTrigger;
-                bChangedSoundFile = sFilename != soundKey.sStartTrigger.c_str();
                 soundKey.sStartTrigger = sFilename.toUtf8().data();
             }
             else if (pVar == mv_stopTrigger.GetVar())
             {
                 QString sFilename = mv_stopTrigger;
-                bChangedSoundFile = sFilename != soundKey.sStopTrigger.c_str();
                 soundKey.sStopTrigger = sFilename.toUtf8().data();
             }
 
diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
index a14da0ae09..2907bebdb4 100644
--- a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
@@ -2233,7 +2233,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
 
     if (pTrack && inRange)
     {
-        bool keyCreated = false;
         if (bTryAddKeysInGroup && pNode->GetParentNode())       // Add keys in group
         {
             CTrackViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType());
@@ -2248,8 +2247,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
                         AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
                         pCurrTrack->CreateKey(keyTime);
                         undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-                        keyCreated = true;
                     }
                 }
                 else                                                                            // A compound track
@@ -2262,8 +2259,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
                             AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
                             pSubTrack->CreateKey(keyTime);
                             undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-                            keyCreated = true;
                         }
                     }
                 }
@@ -2276,15 +2271,13 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
                 AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
                 pTrack->CreateKey(keyTime);
                 undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
-                keyCreated = true;
             }
         }
         else                                                                                // A compound track
         {
             if (pTrack->GetValueType() == AnimValueType::RGB)
             {
-                keyCreated = CreateColorKey(pTrack, keyTime);
+                CreateColorKey(pTrack, keyTime);
             }
             else
             {
@@ -2295,7 +2288,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
                     if (IsOkToAddKeyHere(pSubTrack, keyTime))
                     {
                         pSubTrack->CreateKey(keyTime);
-                        keyCreated = true;
                     }
                 }
                 undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
@@ -2617,7 +2609,6 @@ void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter*
 void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
 {
     int x0 = TimeToClient(timeRange.start);
-    float t0 = timeRange.start;
 
     const QBrush prevBrush = painter->brush();
     painter->setBrush(m_visibilityBrush);
@@ -2648,7 +2639,6 @@ void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* pa
             painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
         }
 
-        t0 = time;
         x0 = x;
     }
     int x = TimeToClient(timeRange.end);
diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
index 2fd46b0fc5..a17d92ac0a 100644
--- a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
+++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
@@ -198,7 +198,6 @@ void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* seque
 
     m_wndProps->setEnabled(false);
     m_wndTrackProps->setEnabled(false);
-    bool bAssigned = false;
     if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType())
     {
         CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack();
@@ -215,12 +214,6 @@ void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* seque
                 {
                     AddVars(m_keyControls[i]);
                 }
-
-                if (m_keyControls[i]->OnKeySelectionChange(selectedKeys))
-                {
-                    bAssigned = true;
-                }
-
                 break;
             }
         }
diff --git a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
index 352f2f3699..b80818db0d 100644
--- a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
+++ b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
@@ -57,7 +57,6 @@ protected:
     }
 
     int GetSize() override { return sizeof(*this); }
-    QString GetDescription() override { return "UndoTrackViewSplineCtrl"; };
 
     void Undo(bool bUndo) override
     {
diff --git a/Code/Editor/TrackView/TrackViewUndo.h b/Code/Editor/TrackView/TrackViewUndo.h
index ff5964ec7f..7f3b4737a1 100644
--- a/Code/Editor/TrackView/TrackViewUndo.h
+++ b/Code/Editor/TrackView/TrackViewUndo.h
@@ -6,9 +6,6 @@
  *
  */
 
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
 #pragma once
 
 #include "TrackViewTrack.h"
@@ -27,11 +24,10 @@ public:
     CUndoComponentEntityTrackObject(CTrackViewTrack* track);
 
 protected:
-    virtual int GetSize() override { return sizeof(*this); }
-    virtual QString GetDescription() override { return "Undo Component Entity Track Modify"; };
+    int GetSize() override { return sizeof(*this); }
 
-    virtual void Undo(bool bUndo) override;
-    virtual void Redo() override;
+    void Undo(bool bUndo) override;
+    void Redo() override;
 
 private:
 
@@ -50,5 +46,3 @@ private:
     CTrackViewTrackMemento m_undo;
     CTrackViewTrackMemento m_redo;
 };
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
diff --git a/Code/Editor/Undo/IUndoObject.h b/Code/Editor/Undo/IUndoObject.h
index 47d853dd9a..3791b76d48 100644
--- a/Code/Editor/Undo/IUndoObject.h
+++ b/Code/Editor/Undo/IUndoObject.h
@@ -8,10 +8,6 @@
 
 
 // Description : Interface for implementation of IUndo objects.
-
-
-#ifndef CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
-#define CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
 #pragma once
 
 #include <QString>
@@ -26,8 +22,6 @@ struct IUndoObject
     virtual void Release() { delete this; };
     //! Return size of this Undo object.
     virtual int GetSize() = 0;
-    //! Return description of this Undo object.
-    virtual QString GetDescription() = 0;
 
     //! Undo this object.
     //! @param bUndo If true this operation called in response to Undo operation.
@@ -37,14 +31,5 @@ struct IUndoObject
     virtual void Redo() = 0;
 
     // Returns the name of undo object
-    virtual QString GetObjectName(){ return QString(); };
-
-    // Returns the name of related editor object.
-    // Ex: For a undo action which would modify value for var "Emitter Strength" of emitter "Level.example",
-    // this function will return emitter name "Level.example" - Vera, Confetti
-    virtual QString GetEditorObjectName() { return QString(); };
-
-    virtual bool IsChanged([[maybe_unused]] unsigned int& compareValue) const { return false; }
+    virtual QString GetObjectName(){ return QString(); }
 };
-
-#endif // CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
diff --git a/Code/Editor/Util/FileUtil.cpp b/Code/Editor/Util/FileUtil.cpp
index baca69d628..9f96d45381 100644
--- a/Code/Editor/Util/FileUtil.cpp
+++ b/Code/Editor/Util/FileUtil.cpp
@@ -23,9 +23,9 @@
 // AzCore
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Utils/Utils.h>
 
 // AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
 
 // AzQtComponents
 #include <AzQtComponents/Utilities/DesktopUtilities.h>
@@ -54,92 +54,14 @@
 #include <Shellapi.h>
 #endif
 
-bool CFileUtil::s_singleFileDlgPref[IFileUtil::EFILE_TYPE_LAST] = { true, true, true, true, true };
-bool CFileUtil::s_multiFileDlgPref[IFileUtil::EFILE_TYPE_LAST] = { true, true, true, true, true };
+bool CFileUtil::s_singleFileDlgPref[IFileUtil::EFILE_TYPE_LAST] = { true, true, true, true };
+bool CFileUtil::s_multiFileDlgPref[IFileUtil::EFILE_TYPE_LAST] = { true, true, true, true };
 
 CAutoRestorePrimaryCDRoot::~CAutoRestorePrimaryCDRoot()
 {
     QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
 }
 
-bool CFileUtil::CompileLuaFile(const char* luaFilename)
-{
-    QString luaFile = luaFilename;
-
-    if (luaFile.isEmpty())
-    {
-        return false;
-    }
-
-    // Check if this file is in Archive.
-    {
-        CCryFile file;
-        if (file.Open(luaFilename, "rb"))
-        {
-            // Check if in pack.
-            if (file.IsInPak())
-            {
-                return true;
-            }
-        }
-    }
-
-    luaFile = Path::GamePathToFullPath(luaFilename);
-
-    // First try compiling script and see if it have any errors.
-    QString LuaCompiler;
-    QString CompilerOutput;
-
-    // Create the filepath of the lua compiler
-    QString szExeFileName = qApp->applicationFilePath();
-    QString exePath = Path::GetPath(szExeFileName);
-
-#if defined(AZ_PLATFORM_WINDOWS)
-    const char* luaCompiler = "LuaCompiler.exe";
-#else
-    const char* luaCompiler = "lua";
-#endif
-    LuaCompiler = Path::AddPathSlash(exePath) + luaCompiler + " ";
-
-    AZStd::string path = luaFile.toUtf8().data();
-    EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePath, path);
-
-    QString finalPath = path.c_str();
-    finalPath = "\"" + finalPath + "\"";
-
-    // Add the name of the Lua file
-    QString cmdLine = LuaCompiler + finalPath;
-
-    // Execute the compiler and capture the output
-    if (!GetIEditor()->ExecuteConsoleApp(cmdLine, CompilerOutput))
-    {
-        QMessageBox::critical(QApplication::activeWindow(), QString(), QObject::tr("Error while executing '%1', make sure the file is in" \
-            " your Primary CD folder !").arg(luaCompiler));
-        return false;
-    }
-
-    // Check return string
-    if (!CompilerOutput.isEmpty())
-    {
-        // Errors while compiling file.
-
-        // Show output from Lua compiler
-        if (QMessageBox::critical(QApplication::activeWindow(), QObject::tr("Lua Compiler"),
-            QObject::tr("Error output from Lua compiler:\r\n%1\r\nDo you want to edit the file ?").arg(CompilerOutput), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
-        {
-            int line = 0;
-            int index = CompilerOutput.indexOf("at line");
-            if (index >= 0)
-            {
-                azsscanf(CompilerOutput.mid(index).toUtf8().data(), "at line %d", &line);
-            }
-            // Open the Lua file for editing
-            EditTextFile(luaFile.toUtf8().data(), line);
-        }
-        return false;
-    }
-    return true;
-}
 //////////////////////////////////////////////////////////////////////////
 bool CFileUtil::ExtractFile(QString& file, bool bMsgBoxAskForExtraction, const char* pDestinationFilename)
 {
@@ -205,7 +127,7 @@ void CFileUtil::EditTextFile(const char* txtFile, int line, IFileUtil::ETextFile
 {
     QString file = txtFile;
 
-    QString fullPathName =  Path::GamePathToFullPath(file);
+    QString fullPathName = Path::GamePathToFullPath(file);
     ExtractFile(fullPathName);
     QString cmd(fullPathName);
 #if defined (AZ_PLATFORM_WINDOWS)
@@ -301,64 +223,6 @@ void CFileUtil::EditTextureFile(const char* textureFile, [[maybe_unused]] bool b
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::EditMayaFile(const char* filepath, const bool bExtractFromPak, const bool bUseGameFolder)
-{
-    QString dosFilepath = PathUtil::ToDosPath(filepath).c_str();
-    if (bExtractFromPak)
-    {
-        ExtractFile(dosFilepath);
-    }
-
-    if (bUseGameFolder)
-    {
-        const QString sGameFolder = Path::GetEditingGameDataFolder().c_str();
-        int nLength = sGameFolder.toUtf8().count();
-        if (azstrnicmp(filepath, sGameFolder.toUtf8().data(), nLength) != 0)
-        {
-            dosFilepath = sGameFolder + '\\' + filepath;
-        }
-
-        dosFilepath = PathUtil::ToDosPath(dosFilepath.toUtf8().data()).c_str();
-    }
-
-    const char* engineRoot;
-    EBUS_EVENT_RESULT(engineRoot, AzFramework::ApplicationRequests::Bus, GetEngineRoot);
-
-    const QString fullPath = QString(engineRoot) + '\\' + dosFilepath;
-
-    if (gSettings.animEditor.isEmpty())
-    {
-        AzQtComponents::ShowFileOnDesktop(fullPath);
-    }
-    else
-    {
-        if (!QProcess::startDetached(gSettings.animEditor, { fullPath }))
-        {
-            CryMessageBox("Can't open the file. You can specify a source editor in Sandbox Preferences or create an association in Windows.", "Cannot open file!", MB_OK | MB_ICONERROR);
-        }
-    }
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CFileUtil::EditFile(const char* filePath, const bool bExtrackFromPak, const bool bUseGameFolder)
-{
-    QString extension = filePath;
-    extension.remove(0, extension.lastIndexOf('.'));
-
-    if (extension.compare(".ma") == 0)
-    {
-        return EditMayaFile(filePath, bExtrackFromPak, bUseGameFolder);
-    }
-    else if ((extension.compare(".bspace") == 0) || (extension.compare(".comb") == 0))
-    {
-        EditTextFile(filePath, 0, IFileUtil::FILE_TYPE_BSPACE);
-        return true;
-    }
-
-    return false;
-}
 
 //////////////////////////////////////////////////////////////////////////
 bool CFileUtil::CalculateDccFilename(const QString& assetFilename, QString& dccFilename)
diff --git a/Code/Editor/Util/FileUtil.h b/Code/Editor/Util/FileUtil.h
index 5820c32081..fc0fc942fe 100644
--- a/Code/Editor/Util/FileUtil.h
+++ b/Code/Editor/Util/FileUtil.h
@@ -25,14 +25,9 @@ public:
 
     static void ShowInExplorer(const QString& path);
 
-    // Try to compile the given lua file: returns true if compilation succeeded, false on failure.
-    static bool CompileLuaFile(const char* luaFilename);
-
     static bool ExtractFile(QString& file, bool bMsgBoxAskForExtraction = true, const char* pDestinationFilename = nullptr);
     static void EditTextFile(const char* txtFile, int line = 0, IFileUtil::ETextFileType fileType = IFileUtil::FILE_TYPE_SCRIPT);
     static void EditTextureFile(const char* txtureFile, bool bUseGameFolder);
-    static bool EditMayaFile(const char* mayaFile, const bool bExtractFromPak, const bool bUseGameFolder);
-    static bool EditFile(const char* filePath, const bool bExtrackFromPak, const bool bUseGameFolder);
 
     //! dcc filename calculation and extraction sub-routines
     static bool CalculateDccFilename(const QString& assetFilename, QString& dccFilename);
diff --git a/Code/Editor/Util/FileUtil_impl.cpp b/Code/Editor/Util/FileUtil_impl.cpp
index 0dd3a0ca87..28090d28d5 100644
--- a/Code/Editor/Util/FileUtil_impl.cpp
+++ b/Code/Editor/Util/FileUtil_impl.cpp
@@ -20,21 +20,11 @@ void CFileUtil_impl::ShowInExplorer(const QString& path)
     CFileUtil::ShowInExplorer(path);
 }
 
-bool CFileUtil_impl::CompileLuaFile(const char* luaFilename)
-{
-    return CFileUtil::CompileLuaFile(luaFilename);
-}
-
 bool CFileUtil_impl::ExtractFile(QString& file, bool bMsgBoxAskForExtraction, const char* pDestinationFilename)
 {
     return CFileUtil::ExtractFile(file, bMsgBoxAskForExtraction, pDestinationFilename);
 }
 
-void CFileUtil_impl::EditTextFile(const char* txtFile, int line, ETextFileType fileType)
-{
-    CFileUtil::EditTextFile(txtFile, line, fileType);
-}
-
 void CFileUtil_impl::EditTextureFile(const char* txtureFile, bool bUseGameFolder)
 {
     CFileUtil::EditTextureFile(txtureFile, bUseGameFolder);
diff --git a/Code/Editor/Util/FileUtil_impl.h b/Code/Editor/Util/FileUtil_impl.h
index 04d9e829b9..aa8d0bf3b5 100644
--- a/Code/Editor/Util/FileUtil_impl.h
+++ b/Code/Editor/Util/FileUtil_impl.h
@@ -36,9 +36,7 @@ public:
 
     void ShowInExplorer(const QString& path) override;
 
-    bool CompileLuaFile(const char* luaFilename) override;
     bool ExtractFile(QString& file, bool bMsgBoxAskForExtraction = true, const char* pDestinationFilename = nullptr) override;
-    void EditTextFile(const char* txtFile, int line = 0, ETextFileType fileType = FILE_TYPE_SCRIPT) override;
     void EditTextureFile(const char* txtureFile, bool bUseGameFolder) override;
 
     //! dcc filename calculation and extraction sub-routines
diff --git a/Code/Editor/Util/Image.cpp b/Code/Editor/Util/Image.cpp
index 773bfa93d2..8b26f54075 100644
--- a/Code/Editor/Util/Image.cpp
+++ b/Code/Editor/Util/Image.cpp
@@ -75,17 +75,16 @@ void CImageEx::ReverseUpDown()
     }
 
     uint32* pPixData = GetData();
-    uint32* pReversePix = new uint32[GetWidth() * GetHeight()];
-
-    for (int i = GetHeight() - 1, i2 = 0; i >= 0; i--, i2++)
+    const int height = GetHeight();
+    const int width = GetWidth(); 
+    for (int i = 0; i < height / 2; i++)
     {
-        for (int k = 0; k < GetWidth(); k++)
+        for (int j = 0; j < width; j++)
         {
-            pReversePix[i2 * GetWidth() + k] = pPixData[i * GetWidth() + k];
+            AZStd::swap(pPixData[i * width + j], pPixData[(height - 1 - i) * width + j]);
         }
     }
 
-    Attach(pReversePix, GetWidth(), GetHeight());
 }
 
 void CImageEx::FillAlpha(unsigned char value)
diff --git a/Code/Editor/Util/ImageGif.cpp b/Code/Editor/Util/ImageGif.cpp
index 67c5911344..336584b959 100644
--- a/Code/Editor/Util/ImageGif.cpp
+++ b/Code/Editor/Util/ImageGif.cpp
@@ -197,11 +197,9 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
         return false;
     }
 
-    int                numcols;
     unsigned  char ch, ch1;
     uint8* ptr1;
     int   i;
-    short transparency = -1;
 
     TImage<uint8> outImageIndex;
 
@@ -246,7 +244,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
     HasColormap  = ((ch & COLORMAPMASK) ? true : false);
 
     BitsPerPixel = (ch & 7) + 1;
-    numcols      = ColorMapSize = 1 << BitsPerPixel;
     BitMask      = ColorMapSize - 1;
 
     Background   = NEXTBYTE;            /* background color... not used. */
@@ -290,10 +287,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
         {
         case GRAPHIC_EXT:
             ch = NEXTBYTE;
-            if (ptr[0] & 0x1)
-            {
-                transparency = ptr[3];       /* transparent color index */
-            }
             ptr += ch;
             break;
         case PLAINTEXT_EXT:
@@ -317,9 +310,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
         }
     }
 
-    //if (transparency >= 0)
-    //mfSet_transparency(transparency);
-
     /* Now read in values from the image descriptor */
 
     ch        = NEXTBYTE;
diff --git a/Code/Editor/Util/KDTree.cpp b/Code/Editor/Util/KDTree.cpp
deleted file mode 100644
index af06a58c9f..0000000000
--- a/Code/Editor/Util/KDTree.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "KDTree.h"
-
-#include <IStatObj.h>
-
-class KDTreeNode
-{
-public:
-    KDTreeNode()
-    {
-        pChildren[0] = nullptr;
-        pChildren[1] = nullptr;
-        pVertexIndices = nullptr;
-    }
-    ~KDTreeNode()
-    {
-        if (!IsLeaf())
-        {
-            if (pChildren[0])
-            {
-                delete pChildren[0];
-            }
-            if (pChildren[1])
-            {
-                delete pChildren[1];
-            }
-        }
-        else if (GetVertexBufferSize() > 1)
-        {
-            if (pVertexIndices)
-            {
-                delete [] pVertexIndices;
-            }
-        }
-    }
-    uint32 GetVertexBufferSize() const
-    {
-        return nVertexIndexBufferSize;
-    }
-    float GetSplitPos() const
-    {
-        return splitPos;
-    }
-    void SetSplitPos(float pos)
-    {
-        splitPos = pos;
-    }
-    CKDTree::ESplitAxis GetSplitAxis() const
-    {
-        if (splitAxis == 0)
-        {
-            return CKDTree::eSA_X;
-        }
-        if (splitAxis == 1)
-        {
-            return CKDTree::eSA_Y;
-        }
-        if (splitAxis == 2)
-        {
-            return CKDTree::eSA_Z;
-        }
-        return CKDTree::eSA_Invalid;
-    }
-    void SetSplitAxis(const CKDTree::ESplitAxis& axis)
-    {
-        splitAxis = axis;
-    }
-    bool IsLeaf() const
-    {
-        return pChildren[0] == nullptr && pChildren[1] == nullptr;
-    }
-    KDTreeNode* GetChild(uint32 nIndex) const
-    {
-        if (nIndex > 1)
-        {
-            return nullptr;
-        }
-        return pChildren[nIndex];
-    }
-    void SetChild(uint32 nIndex, KDTreeNode* pNode)
-    {
-        if (nIndex > 1)
-        {
-            return;
-        }
-        if (pChildren[nIndex])
-        {
-            delete pChildren[nIndex];
-        }
-        pChildren[nIndex] = pNode;
-    }
-    const AABB& GetBoundBox()
-    {
-        return boundbox;
-    }
-    void SetBoundBox(const AABB& aabb)
-    {
-        boundbox = aabb;
-    }
-    void SetVertexIndexBuffer(std::vector<uint32>& vertexInfos)
-    {
-        nVertexIndexBufferSize = (uint32)vertexInfos.size();
-        if (nVertexIndexBufferSize == 0)
-        {
-            return;
-        }
-        if (nVertexIndexBufferSize == 1)
-        {
-            oneIndex = vertexInfos[0];
-        }
-        else
-        {
-            pVertexIndices = new uint32[nVertexIndexBufferSize];
-            memcpy(pVertexIndices, &vertexInfos[0], sizeof(uint32) * nVertexIndexBufferSize);
-        }
-    }
-    uint32 GetVertexIndex(uint32 nIndex) const
-    {
-        if (GetVertexBufferSize() == 1)
-        {
-            return oneIndex & 0x00FFFFFF;
-        }
-
-        return pVertexIndices[nIndex] & 0x00FFFFFF;
-    }
-    uint32 GetObjIndex(uint32 nIndex) const
-    {
-        if (GetVertexBufferSize() == 1)
-        {
-            return (oneIndex & 0xFF000000) >> 24;
-        }
-
-        return (pVertexIndices[nIndex] & 0xFF000000) >> 24;
-    }
-
-private:
-    union
-    {
-        float splitPos;         // Interior
-        uint32 oneIndex;        // Leaf
-        uint32* pVertexIndices; // Leaf : high 8bits - object index, low 24bits - vertex index
-    };
-    union
-    {
-        uint32 splitAxis;   // Interior
-        uint32 nVertexIndexBufferSize;  // Leaf
-    };
-    AABB boundbox;  // Both
-    KDTreeNode* pChildren[2];   // Interior
-};
-
-CKDTree::ESplitAxis SearchForBestSplitAxis(const AABB& aabb)
-{
-    float xsize = aabb.max.x - aabb.min.x;
-    float ysize = aabb.max.y - aabb.min.y;
-    float zsize = aabb.max.z - aabb.min.z;
-
-    CKDTree::ESplitAxis axis;
-    if (xsize > ysize && xsize > zsize)
-    {
-        axis = CKDTree::eSA_X;
-    }
-    else if (ysize > zsize && ysize > xsize)
-    {
-        axis = CKDTree::eSA_Y;
-    }
-    else
-    {
-        axis = CKDTree::eSA_Z;
-    }
-
-    return axis;
-}
-
-bool SearchForBestSplitPos(CKDTree::ESplitAxis axis, const std::vector<CKDTree::SStatObj>& statObjList, std::vector<uint32>& indices, float& outBestSplitPos)
-{
-    if (axis != CKDTree::eSA_X && axis != CKDTree::eSA_Y && axis != CKDTree::eSA_Z)
-    {
-        return false;
-    }
-
-    outBestSplitPos = 0;
-
-    int nSizeOfIndices = static_cast<int>(indices.size());
-
-    for (int i = 0; i < nSizeOfIndices; ++i)
-    {
-        int nObjIndex = (indices[i] & 0xFF000000) >> 24;
-        int nVertexIndex = (indices[i] & 0xFFFFFF);
-
-        const CKDTree::SStatObj* pObj = &statObjList[nObjIndex];
-
-        const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh();
-        if (pMesh == nullptr)
-        {
-            continue;
-        }
-
-        IIndexedMesh::SMeshDescription meshDesc;
-        pMesh->GetMeshDescription(meshDesc);
-
-        if (meshDesc.m_pVerts)
-        {
-            outBestSplitPos += pObj->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex])[axis];
-        }
-        else if (meshDesc.m_pVertsF16)
-        {
-            outBestSplitPos += pObj->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3())[axis];
-        }
-    }
-
-    outBestSplitPos /= nSizeOfIndices;
-
-    return true;
-}
-
-struct SSplitInfo
-{
-    AABB aboveBoundbox;
-    std::vector<uint32> aboveIndices;
-    AABB belowBoundbox;
-    std::vector<uint32> belowIndices;
-};
-
-bool SplitNode(const std::vector<CKDTree::SStatObj>& statObjList, const AABB& boundbox, const std::vector<uint32>& indices, CKDTree::ESplitAxis splitAxis, float splitPos, SSplitInfo& outInfo)
-{
-    if (splitAxis != CKDTree::eSA_X && splitAxis != CKDTree::eSA_Y && splitAxis != CKDTree::eSA_Z)
-    {
-        return false;
-    }
-
-    outInfo.aboveBoundbox = boundbox;
-    outInfo.belowBoundbox = boundbox;
-
-    outInfo.aboveBoundbox.max[splitAxis] = splitPos;
-    outInfo.belowBoundbox.min[splitAxis] = splitPos;
-
-    uint32 iIndexSize = (uint32)indices.size();
-    outInfo.aboveIndices.reserve(iIndexSize);
-    outInfo.belowIndices.reserve(iIndexSize);
-
-    for (uint32 i = 0; i < iIndexSize; ++i)
-    {
-        int nObjIndex = (indices[i] & 0xFF000000) >> 24;
-        int nVertexIndex = indices[i] & 0xFFFFFF;
-
-        const CKDTree::SStatObj* pObj = &statObjList[nObjIndex];
-
-        const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh();
-        if (pMesh == nullptr)
-        {
-            return false;
-        }
-
-        IIndexedMesh::SMeshDescription meshDesc;
-        pMesh->GetMeshDescription(meshDesc);
-
-        Vec3 vPos;
-        if (meshDesc.m_pVerts)
-        {
-            vPos = pObj->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex]);
-        }
-        else if (meshDesc.m_pVertsF16)
-        {
-            vPos = pObj->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3());
-        }
-        else
-        {
-            continue;
-        }
-
-        if (vPos[splitAxis] < splitPos)
-        {
-            outInfo.aboveIndices.push_back(indices[i]);
-            assert(outInfo.aboveBoundbox.IsContainPoint(vPos));
-        }
-        else
-        {
-            outInfo.belowIndices.push_back(indices[i]);
-            assert(outInfo.belowBoundbox.IsContainPoint(vPos));
-        }
-    }
-
-    return true;
-}
-
-CKDTree::CKDTree()
-{
-    m_pRootNode = nullptr;
-}
-
-CKDTree::~CKDTree()
-{
-    if (m_pRootNode)
-    {
-        delete m_pRootNode;
-    }
-}
-
-bool CKDTree::Build(IStatObj* pStatObj)
-{
-    if (pStatObj == nullptr)
-    {
-        return false;
-    }
-
-    m_StatObjectList.clear();
-
-    if (pStatObj->GetIndexedMesh(true))
-    {
-        SStatObj rootObj;
-        rootObj.tm.SetIdentity();
-        rootObj.pStatObj = pStatObj;
-        m_StatObjectList.push_back(rootObj);
-    }
-
-    ConstructStatObjList(pStatObj, Matrix34::CreateIdentity());
-
-    AABB entireBoundBox;
-    entireBoundBox.Reset();
-
-    std::vector<uint32> indices;
-    for (int i = 0, iStatObjSize = static_cast<uint32>(m_StatObjectList.size()); i < iStatObjSize; ++i)
-    {
-        IIndexedMesh* pMesh = m_StatObjectList[i].pStatObj->GetIndexedMesh(true);
-        if (pMesh == nullptr)
-        {
-            continue;
-        }
-
-        IIndexedMesh::SMeshDescription meshDesc;
-        pMesh->GetMeshDescription(meshDesc);
-
-        for (int k = 0; k < meshDesc.m_nVertCount; ++k)
-        {
-            entireBoundBox.Add(m_StatObjectList[i].tm.TransformPoint(meshDesc.m_pVerts[k]));
-            indices.push_back((i << 24) | k);
-        }
-    }
-
-    if (m_pRootNode)
-    {
-        delete m_pRootNode;
-    }
-
-    m_pRootNode = new KDTreeNode;
-    BuildRecursively(m_pRootNode, entireBoundBox, indices);
-
-    return true;
-}
-
-void CKDTree::BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vector<uint32>& indices) const
-{
-    pNode->SetBoundBox(boundbox);
-
-    if (indices.size() <= s_MinimumVertexSizeInLeafNode)
-    {
-        pNode->SetVertexIndexBuffer(indices);
-        return;
-    }
-
-    ESplitAxis splitAxis = SearchForBestSplitAxis(boundbox);
-    float splitPos(0);
-    SearchForBestSplitPos(splitAxis, m_StatObjectList, indices, splitPos);
-    pNode->SetSplitAxis(splitAxis);
-    pNode->SetSplitPos(splitPos);
-
-    SSplitInfo splitInfo;
-    if (!SplitNode(m_StatObjectList, boundbox, indices, splitAxis, splitPos, splitInfo))
-    {
-        return;
-    }
-
-    if (splitInfo.aboveIndices.empty() || splitInfo.belowIndices.empty())
-    {
-        pNode->SetVertexIndexBuffer(indices);
-        return;
-    }
-
-    KDTreeNode* pChild0 = new KDTreeNode;
-    KDTreeNode* pChild1 = new KDTreeNode;
-
-    pNode->SetChild(0, pChild0);
-    pNode->SetChild(1, pChild1);
-
-    BuildRecursively(pChild0, splitInfo.aboveBoundbox, splitInfo.aboveIndices);
-    BuildRecursively(pChild1, splitInfo.belowBoundbox, splitInfo.belowIndices);
-}
-
-void CKDTree::ConstructStatObjList(IStatObj* pStatObj, const Matrix34& matParent)
-{
-    if (pStatObj == nullptr)
-    {
-        return;
-    }
-    for (int i = 0, nChildObjSize(pStatObj->GetSubObjectCount()); i < nChildObjSize; ++i)
-    {
-        IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i);
-        SStatObj s;
-        s.tm = matParent * pSubObj->localTM;
-        if (pSubObj->pStatObj && pSubObj->pStatObj->GetIndexedMesh(true))
-        {
-            s.pStatObj = pSubObj->pStatObj;
-            m_StatObjectList.push_back(s);
-        }
-        ConstructStatObjList(pSubObj->pStatObj, s.tm);
-    }
-}
-
-bool CKDTree::FindNearestVertex(const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const
-{
-    return FindNearestVertexRecursively(m_pRootNode, raySrc, rayDir, vVertexBoxSize, localCameraPos, outPos, vOutHitPosOnCube);
-}
-
-AABB GetNodeBoundBox(KDTreeNode* pNode, float vVertexBoxSize, const Vec3& localCameraPos)
-{
-    AABB nodeAABB = pNode->GetBoundBox();
-    float fScreenFactorMin = localCameraPos.GetDistance(nodeAABB.min);
-    Vec3 vBoundBoxMin(fScreenFactorMin * vVertexBoxSize, fScreenFactorMin * vVertexBoxSize, fScreenFactorMin * vVertexBoxSize);
-    float fScreenFactorMax = localCameraPos.GetDistance(nodeAABB.max);
-    Vec3 vBoundBoxMax(fScreenFactorMax * vVertexBoxSize, fScreenFactorMax * vVertexBoxSize, fScreenFactorMax * vVertexBoxSize);
-    nodeAABB.min -= vBoundBoxMin;
-    nodeAABB.max += vBoundBoxMax;
-    return nodeAABB;
-}
-
-bool CKDTree::FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const
-{
-    if (!pNode)
-    {
-        return false;
-    }
-
-    Vec3 vHitPos;
-    AABB nodeAABB = GetNodeBoundBox(pNode, vVertexBoxSize, localCameraPos);
-    if (!pNode->GetBoundBox().IsContainPoint(raySrc) && !Intersect::Ray_AABB(raySrc, rayDir, nodeAABB, vHitPos))
-    {
-        return false;
-    }
-
-    if (pNode->IsLeaf())
-    {
-        if (m_StatObjectList.empty())
-        {
-            return false;
-        }
-
-        uint32 nVBuffSize = pNode->GetVertexBufferSize();
-        if (nVBuffSize == 0)
-        {
-            return false;
-        }
-
-        float fNearestDist = 3e10f;
-
-        for (uint32 i = 0; i < nVBuffSize; ++i)
-        {
-            uint32 nVertexIndex = pNode->GetVertexIndex(i);
-            uint32 nObjIndex = pNode->GetObjIndex(i);
-
-            assert(nObjIndex < m_StatObjectList.size());
-
-            const SStatObj* pStatObjInfo = &(m_StatObjectList[nObjIndex]);
-
-            IIndexedMesh* pMesh = m_StatObjectList[nObjIndex].pStatObj->GetIndexedMesh();
-            if (pMesh == nullptr)
-            {
-                continue;
-            }
-
-            IIndexedMesh::SMeshDescription meshDesc;
-            pMesh->GetMeshDescription(meshDesc);
-
-            Vec3 vCandidatePos(0, 0, 0);
-            if (meshDesc.m_pVerts)
-            {
-                vCandidatePos = pStatObjInfo->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex]);
-            }
-            else if (meshDesc.m_pVertsF16)
-            {
-                vCandidatePos = pStatObjInfo->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3());
-            }
-            else
-            {
-                continue;
-            }
-
-            float fScreenFactor = localCameraPos.GetDistance(vCandidatePos);
-            Vec3 vBoundBox(fScreenFactor * vVertexBoxSize, fScreenFactor * vVertexBoxSize, fScreenFactor * vVertexBoxSize);
-
-            Vec3 vHitPosOnCube;
-            if (Intersect::Ray_AABB(raySrc, rayDir, AABB(vCandidatePos - vBoundBox, vCandidatePos + vBoundBox), vHitPosOnCube))
-            {
-                float fDist = vHitPosOnCube.GetDistance(raySrc);
-                if (fDist < fNearestDist)
-                {
-                    fNearestDist = fDist;
-                    outPos = vCandidatePos;
-                    vOutHitPosOnCube = vHitPosOnCube;
-                }
-            }
-        }
-
-        if (fNearestDist < 3e10f)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    Vec3 vNearestPos0, vNearestPos0OnCube;
-    Vec3 vNearestPos1, vNearestPos1OnCube;
-    bool bFoundChild0 = FindNearestVertexRecursively(pNode->GetChild(0), raySrc, rayDir, vVertexBoxSize, localCameraPos, vNearestPos0, vNearestPos0OnCube);
-    bool bFoundChild1 = FindNearestVertexRecursively(pNode->GetChild(1), raySrc, rayDir, vVertexBoxSize, localCameraPos, vNearestPos1, vNearestPos1OnCube);
-
-    if (bFoundChild0 && bFoundChild1)
-    {
-        float fDist0 = raySrc.GetDistance(vNearestPos0OnCube);
-        float fDist1 = raySrc.GetDistance(vNearestPos1OnCube);
-        if (fDist0 < fDist1)
-        {
-            outPos = vNearestPos0;
-            vOutHitPosOnCube = vNearestPos0OnCube;
-        }
-        else
-        {
-            outPos = vNearestPos1;
-            vOutHitPosOnCube = vNearestPos1OnCube;
-        }
-    }
-    else if (bFoundChild0 && !bFoundChild1)
-    {
-        outPos = vNearestPos0;
-        vOutHitPosOnCube = vNearestPos0OnCube;
-    }
-    else if (!bFoundChild0 && bFoundChild1)
-    {
-        outPos = vNearestPos1;
-        vOutHitPosOnCube = vNearestPos1OnCube;
-    }
-
-    return bFoundChild0 || bFoundChild1;
-}
-
-void CKDTree::GetPenetratedBoxes(const Vec3& raySrc, const Vec3& rayDir, std::vector<AABB>& outBoxes)
-{
-    GetPenetratedBoxesRecursively(m_pRootNode, raySrc, rayDir, outBoxes);
-}
-
-void CKDTree::GetPenetratedBoxesRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, std::vector<AABB>& outBoxes)
-{
-    Vec3 vHitPos;
-    if (!pNode || (!pNode->GetBoundBox().IsContainPoint(raySrc) && !Intersect::Ray_AABB(raySrc, rayDir, pNode->GetBoundBox(), vHitPos)))
-    {
-        return;
-    }
-
-    outBoxes.push_back(pNode->GetBoundBox());
-
-    GetPenetratedBoxesRecursively(pNode->GetChild(0), raySrc, rayDir, outBoxes);
-    GetPenetratedBoxesRecursively(pNode->GetChild(1), raySrc, rayDir, outBoxes);
-}
diff --git a/Code/Editor/Util/KDTree.h b/Code/Editor/Util/KDTree.h
deleted file mode 100644
index df25a9ded7..0000000000
--- a/Code/Editor/Util/KDTree.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_KDTREE_H
-#define CRYINCLUDE_EDITOR_UTIL_KDTREE_H
-#pragma once
-
-struct IStatObj;
-
-class KDTreeNode;
-
-class CKDTree
-{
-public:
-
-    CKDTree();
-    ~CKDTree();
-
-    bool Build(IStatObj* pStatObj);
-    bool FindNearestVertex(const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const;
-    void GetPenetratedBoxes(const Vec3& raySrc, const Vec3& rayDir, std::vector<AABB>& outBoxes);
-
-    enum ESplitAxis
-    {
-        eSA_X = 0,
-        eSA_Y,
-        eSA_Z,
-        eSA_Invalid
-    };
-
-    struct SStatObj
-    {
-        Matrix34 tm;
-        IStatObj* pStatObj;
-    };
-
-private:
-
-    void BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vector<uint32>& indices) const;
-    bool FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const;
-    void GetPenetratedBoxesRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, std::vector<AABB>& outBoxes);
-    void ConstructStatObjList(IStatObj* pStatObj, const Matrix34& matParent);
-
-    static const int s_MinimumVertexSizeInLeafNode = 4;
-
-private:
-
-    KDTreeNode* m_pRootNode;
-    std::vector<SStatObj> m_StatObjectList;
-};
-#endif // CRYINCLUDE_EDITOR_UTIL_KDTREE_H
diff --git a/Code/Editor/Util/PathUtil.cpp b/Code/Editor/Util/PathUtil.cpp
index ca3481ddae..8b745ee1bc 100644
--- a/Code/Editor/Util/PathUtil.cpp
+++ b/Code/Editor/Util/PathUtil.cpp
@@ -14,7 +14,6 @@
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h> // for ebus events
-#include <AzFramework/API/ApplicationAPI.h>
 #include <AzCore/std/string/conversions.h>
 #include <AzFramework/IO/LocalFileIO.h>
 
@@ -175,9 +174,8 @@ namespace Path
     //////////////////////////////////////////////////////////////////////////
     QString GetEngineRootPath()
     {
-        const char* engineRoot;
-        EBUS_EVENT_RESULT(engineRoot, AzFramework::ApplicationRequests::Bus, GetEngineRoot);
-        return QString(engineRoot);
+        const AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
+        return QString::fromUtf8(engineRoot.c_str(), static_cast<int>(engineRoot.size()));
     }
 
     //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Util/XmlArchive.cpp b/Code/Editor/Util/XmlArchive.cpp
index 3a965fb239..72999efdf4 100644
--- a/Code/Editor/Util/XmlArchive.cpp
+++ b/Code/Editor/Util/XmlArchive.cpp
@@ -16,102 +16,6 @@
 
 //////////////////////////////////////////////////////////////////////////
 // CXmlArchive
-bool CXmlArchive::Load(const QString& file)
-{
-    bLoading = true;
-
-    char filename[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(file.toUtf8().data(), filename, AZ_MAX_PATH_LEN);
-
-    QFile cFile(filename);
-    if (!cFile.open(QFile::ReadOnly))
-    {
-        CLogFile::FormatLine("Warning: Loading of %s failed", filename);
-        return false;
-    }
-    CArchive ar(&cFile, CArchive::load);
-
-    QString str;
-    ar >> str;
-
-    root = XmlHelpers::LoadXmlFromBuffer(str.toUtf8().data(), str.toUtf8().length());
-    if (!root)
-    {
-        // If we didn't extract valid XML, attempt to check the header to see if we're dealing with an improperly serialized archive
-        // When deserializing QStrings, we use readStringLength in EditorUtils, which mimics MFC's decoding.
-        // In this encoding, the length is first read as an unsigned 8-bit value, if that is 0xFF then the next two bytes are read
-        // If the 16 bit uint is 0xFFFF, then the next four bytes are read, etc. up to a final 64 bit value.
-
-        // In 1.09, there was a bug in which we'd serialize out the 32-bit length improperly like so:
-        // 0xFF 0xFF 0x00 <4 byte proper length>
-        
-        // Note that the header could also historically start with  0xFF 0xFF 0xFE to indicate wide strings prior to the length data
-        // but we don't have to deal with that here as the broken version of the code never prepended this
-        cFile.seek(0);
-        quint8 len8;
-        ar >> len8;
-
-        quint16 len16;
-        ar >> len16;
-
-        // Possible bad header, attempt to read 32 bit length.
-        if (len8 == 0xff && len16 == 0xff)
-        {
-            // This version of operator<< only serialized out UTF8 strings up to 32 bits of length, no need to 64-bit check or do wchar.
-            quint32 len32;
-            ar >> len32;
-
-            str = QString::fromUtf8(cFile.read(len32));
-            root = XmlHelpers::LoadXmlFromBuffer(str.toUtf8().data(), str.toUtf8().length());
-        }
-
-        if (!root)
-        {
-            CLogFile::FormatLine("Warning: Loading of %s failed", filename);
-            return false;
-        }
-    }
-
-    const bool loaded = pNamedData->Serialize(ar);
-    if (!loaded)
-    {
-        CLogFile::FormatLine("Error: Can't load xml file: '%s'! File corrupted. Binary file possibly was corrupted by Source Control if it was marked like text format.", filename);
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CXmlArchive::Save(const QString& file)
-{
-    char filename[AZ_MAX_PATH_LEN] = { 0 };
-    AZ::IO::FileIOBase::GetInstance()->ResolvePath(file.toUtf8().data(), filename, AZ_MAX_PATH_LEN);
-
-    bLoading = false;
-    if (!root)
-    {
-        return;
-    }
-
-    QFile cFile(filename);
-    // Open the file for writing, create it if needed
-    if (!cFile.open(QFile::WriteOnly))
-    {
-        CLogFile::FormatLine("Warning: Saving of %s failed", filename);
-        return;
-    }
-    // Create the archive object
-    CArchive ar(&cFile, CArchive::store);
-
-    _smart_ptr<IXmlStringData> pXmlStrData = root->getXMLData(5000000);
-
-    // Need convert to QString for CArchive::operator<<
-    QString str = pXmlStrData->GetString();
-    ar << str;
-
-    pNamedData->Serialize(ar);
-}
 
 //////////////////////////////////////////////////////////////////////////
 bool CXmlArchive::SaveToPak([[maybe_unused]] const QString& levelPath, CPakFile& pakFile)
diff --git a/Code/Editor/Util/XmlArchive.h b/Code/Editor/Util/XmlArchive.h
index 3d45a7a2e6..e7de4c5be8 100644
--- a/Code/Editor/Util/XmlArchive.h
+++ b/Code/Editor/Util/XmlArchive.h
@@ -60,9 +60,6 @@ public:
         return *this;
     }
 
-    bool Load(const QString& file);
-    void Save(const QString& file);
-
     //! Save XML Archive to pak file.
     //! @return true if saved.
     bool SaveToPak(const QString& levelPath, CPakFile& pakFile);
diff --git a/Code/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp
index c8f2e268d9..437dcead3b 100644
--- a/Code/Editor/Viewport.cpp
+++ b/Code/Editor/Viewport.cpp
@@ -17,11 +17,13 @@
 // AzQtComponents
 #include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>
 
+// AzToolsFramework
 #include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
-#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
 // Editor
+#include "Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h"
 #include "ViewManager.h"
 #include "Include/ITransformManipulator.h"
 #include "Include/HitContext.h"
@@ -32,7 +34,6 @@
 #include "GameEngine.h"
 #include "Settings.h"
 
-
 #ifdef LoadCursor
 #undef LoadCursor
 #endif
@@ -41,13 +42,14 @@
 // Viewport drag and drop support
 //////////////////////////////////////////////////////////////////////
 
-void QtViewport::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt)
+void QtViewport::BuildDragDropContext(
+    AzQtComponents::ViewportDragContext& context, const AzFramework::ViewportId viewportId, const QPoint& point)
 {
-    context.m_hitLocation = AZ::Vector3::CreateZero();
-    context.m_hitLocation = GetHitLocation(pt);
+    context.m_hitLocation = AzToolsFramework::FindClosestPickIntersection(
+        viewportId, AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(point), AzToolsFramework::EditorPickRayLength,
+        AzToolsFramework::GetDefaultEntityPlacementDistance());
 }
 
-
 void QtViewport::dragEnterEvent(QDragEnterEvent* event)
 {
     if (!GetIEditor()->GetGameEngine()->IsLevelLoaded())
@@ -66,7 +68,7 @@ void QtViewport::dragEnterEvent(QDragEnterEvent* event)
         // new bus-based way of doing it (install a listener!)
         using namespace AzQtComponents;
         ViewportDragContext context;
-        BuildDragDropContext(context, event->pos());
+        BuildDragDropContext(context, GetViewportId(), event->pos());
         DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragEnter, event, context);
     }
 }
@@ -89,7 +91,7 @@ void QtViewport::dragMoveEvent(QDragMoveEvent* event)
         // new bus-based way of doing it (install a listener!)
         using namespace AzQtComponents;
         ViewportDragContext context;
-        BuildDragDropContext(context, event->pos());
+        BuildDragDropContext(context, GetViewportId(), event->pos());
         DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragMove, event, context);
     }
 }
@@ -112,7 +114,7 @@ void QtViewport::dropEvent(QDropEvent* event)
     {
         // new bus-based way of doing it (install a listener!)
         ViewportDragContext context;
-        BuildDragDropContext(context, event->pos());
+        BuildDragDropContext(context, GetViewportId(), event->pos());
         DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::Drop, event, context);
     }
 }
@@ -340,13 +342,6 @@ void QtViewport::resizeEvent(QResizeEvent* event)
     Update();
 }
 
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::leaveEvent(QEvent* event)
-{
-    QWidget::leaveEvent(event);
-    MouseCallback(eMouseLeave, QPoint(), Qt::KeyboardModifiers(), Qt::MouseButtons());
-}
-
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::paintEvent([[maybe_unused]] QPaintEvent* event)
 {
@@ -581,63 +576,7 @@ void QtViewport::keyReleaseEvent(QKeyEvent* event)
     OnKeyUp(nativeKey, 1, event->nativeModifiers());
 }
 
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    // Save the mouse down position
-    m_cMouseDownPos = point;
 
-    if (MouseCallback(eMouseLDown, point, modifiers))
-    {
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    // Check Edit Tool.
-    MouseCallback(eMouseLUp, point, modifiers);
-}
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    MouseCallback(eMouseRDown, point, modifiers);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    MouseCallback(eMouseRUp, point, modifiers);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    // Check Edit Tool.
-    MouseCallback(eMouseMDown, point, modifiers);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    // Move the viewer to the mouse location.
-    // Check Edit Tool.
-    MouseCallback(eMouseMUp, point, modifiers);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnMButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    MouseCallback(eMouseMDblClick, point, modifiers);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point)
-{
-    MouseCallback(eMouseMove, point, modifiers, buttons);
-}
 
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::OnSetCursor()
@@ -696,44 +635,6 @@ void QtViewport::OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect)
     GetIEditor()->SetStatusText(szNewStatusText);
 }
 
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        // Ignore double clicks while in game.
-        return;
-    }
-
-    MouseCallback(eMouseLDblClick, point, modifiers);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnRButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point)
-{
-    MouseCallback(eMouseRDblClick, point, modifiers);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnKeyDown([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags)
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        // Ignore key downs while in game.
-        return;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void QtViewport::OnKeyUp([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags)
-{
-    if (GetIEditor()->IsInGameMode())
-    {
-        // Ignore key downs while in game.
-        return;
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::SetCurrentCursor(const QCursor& hCursor, const QString& cursorString)
 {
@@ -1119,29 +1020,6 @@ bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
     return false;
 }
 
-AZ::Vector3 QtViewport::GetHitLocation(const QPoint& point)
-{
-    Vec3 pos = Vec3(ZERO);
-    HitContext hit;
-    if (HitTest(point, hit))
-    {
-        pos = hit.raySrc + hit.rayDir * hit.dist;
-        pos = SnapToGrid(pos);
-    }
-    else
-    {
-        bool hitTerrain;
-        pos = ViewToWorld(point, &hitTerrain);
-        if (hitTerrain)
-        {
-            pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
-        }
-        pos = SnapToGrid(pos);
-    }
-
-    return AZ::Vector3(pos.x, pos.y, pos.z);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::SetZoomFactor(float fZoomFactor)
 {
@@ -1168,11 +1046,6 @@ Vec3 QtViewport::SnapToGrid(const Vec3& vec)
     return vec;
 }
 
-float QtViewport::GetGridStep() const
-{
-    return 0.0f;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::BeginUndo()
 {
@@ -1227,30 +1100,6 @@ bool QtViewport::IsBoundsVisible([[maybe_unused]] const AABB& box) const
     return true;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance) const
-{
-    float dist = GetDistanceToLine(lineP1, lineP2, hitpoint);
-    if (dist <= pixelRadius)
-    {
-        if (pToCameraDistance)
-        {
-            Vec3 raySrc, rayDir;
-            ViewToWorldRay(hitpoint, raySrc, rayDir);
-            Vec3 rayTrg = raySrc + rayDir * 10000.0f;
-
-            Vec3 pa, pb;
-            float mua, mub;
-            LineLineIntersect(lineP1, lineP2, raySrc, rayTrg, pa, pb, mua, mub);
-            *pToCameraDistance = mub;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
 //////////////////////////////////////////////////////////////////////////
 float QtViewport::GetDistanceToLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& point) const
 {
@@ -1315,84 +1164,6 @@ bool QtViewport::GetAdvancedSelectModeFlag()
     return m_bAdvancedSelectMode;
 }
 
-//////////////////////////////////////////////////////////////////////////
-bool QtViewport::MouseCallback(EMouseEvent event, const QPoint& point, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons)
-{
-    AZ_PROFILE_FUNCTION(Editor);
-
-    // Ignore any mouse events in game mode.
-    if (GetIEditor()->IsInGameMode())
-    {
-        return true;
-    }
-
-    // We must ignore mouse events when we are in the middle of an assert.
-    // Reason: If we have an assert called from an engine module under the editor, if we call this function,
-    // it may call the engine again and cause a deadlock.
-    // Concrete example: CryPhysics called from Trackview causing an assert, and moving the cursor over the viewport
-    // would cause the editor to freeze as it calls CryPhysics again for a raycast while it didn't release the lock.
-    if (gEnv->pSystem->IsAssertDialogVisible())
-    {
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Hit test gizmo objects.
-    //////////////////////////////////////////////////////////////////////////
-    bool bAltClick = (modifiers & Qt::AltModifier);
-    bool bCtrlClick = (modifiers & Qt::ControlModifier);
-    bool bShiftClick = (modifiers & Qt::ShiftModifier);
-
-    int flags = (bCtrlClick ? MK_CONTROL : 0) |
-        (bShiftClick ? MK_SHIFT : 0) |
-        ((buttons& Qt::LeftButton) ? MK_LBUTTON : 0) |
-        ((buttons& Qt::MiddleButton) ? MK_MBUTTON : 0) |
-        ((buttons& Qt::RightButton) ? MK_RBUTTON : 0);
-
-    switch (event)
-    {
-    case eMouseMove:
-
-        if (m_nLastUpdateFrame == m_nLastMouseMoveFrame)
-        {
-            // If mouse move event generated in the same frame, ignore it.
-            return false;
-        }
-        m_nLastMouseMoveFrame = m_nLastUpdateFrame;
-
-        // Skip the marker position update if anything is selected, since it is only used
-        // by the info bar which doesn't show the marker when there is an active selection.
-        // This helps a performance issue when calling ViewToWorld (which calls RayWorldIntersection)
-        // on every mouse movement becomes very expensive in scenes with large amounts of entities.
-        CSelectionGroup* selection = GetIEditor()->GetSelection();
-        if (!(buttons & Qt::RightButton) /* && m_nLastUpdateFrame != m_nLastMouseMoveFrame*/ && (selection && selection->IsEmpty()))
-        {
-            //m_nLastMouseMoveFrame = m_nLastUpdateFrame;
-            Vec3 pos = ViewToWorld(point);
-            GetIEditor()->SetMarkerPosition(pos);
-        }
-        break;
-    }
-
-    QPoint tempPoint(point.x(), point.y());
-
-    //////////////////////////////////////////////////////////////////////////
-    // Handle viewport manipulators.
-    //////////////////////////////////////////////////////////////////////////
-    if (!bAltClick)
-    {
-        ITransformManipulator* pManipulator = GetIEditor()->GetTransformManipulator();
-        if (pManipulator)
-        {
-            if (pManipulator->MouseCallback(this, event, tempPoint, flags))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::ProcessRenderLisneters(DisplayContext& rstDisplayContext)
 {
@@ -1407,6 +1178,69 @@ void QtViewport::ProcessRenderLisneters(DisplayContext& rstDisplayContext)
 }
 //////////////////////////////////////////////////////////////////////////
 #if defined(AZ_PLATFORM_WINDOWS)
+// Note: Both CreateAnglesYPR and CreateOrientationYPR were copied verbatim from Cry_Camera.h which has been removed.
+// 
+// Description
+//   <PRE>
+//   x-YAW
+//   y-PITCH (negative=looking down / positive=looking up)
+//   z-ROLL
+//   </PRE>
+// Note: If we are looking along the z-axis, its not possible to specify the x and z-angle
+inline Ang3 CreateAnglesYPR(const Matrix33& m)
+{
+    assert(m.IsOrthonormal());
+    float l = Vec3(m.m01, m.m11, 0.0f).GetLength();
+    if (l > 0.0001)
+    {
+        return Ang3(atan2f(-m.m01 / l, m.m11 / l), atan2f(m.m21, l), atan2f(-m.m20 / l, m.m22 / l));
+    }
+    else
+    {
+        return Ang3(0, atan2f(m.m21, l), 0);
+    }
+}
+
+// Description
+//  This function builds a 3x3 orientation matrix using YPR-angles
+//  Rotation order for the orientation-matrix is Z-X-Y. (Zaxis=YAW / Xaxis=PITCH / Yaxis=ROLL)
+//
+// <PRE>
+//  COORDINATE-SYSTEM
+//
+//  z-axis
+//    ^
+//    |
+//    |  y-axis
+//    |  /
+//    | /
+//    |/
+//    +--------------->   x-axis
+// </PRE>
+//
+//  Example:
+//      Matrix33 orientation=CreateOrientationYPR( Ang3(1,2,3) );
+inline Matrix33 CreateOrientationYPR(const Ang3& ypr)
+{
+    f32 sz, cz;
+    sincos_tpl(ypr.x, &sz, &cz);            //Zaxis = YAW
+    f32 sx, cx;
+    sincos_tpl(ypr.y, &sx, &cx);            //Xaxis = PITCH
+    f32 sy, cy;
+    sincos_tpl(ypr.z, &sy, &cy);            //Yaxis = ROLL
+    Matrix33 c;
+    c.m00 = cy * cz - sy * sz * sx;
+    c.m01 = -sz * cx;
+    c.m02 = sy * cz + cy * sz * sx;
+    c.m10 = cy * sz + sy * sx * cz;
+    c.m11 = cz * cx;
+    c.m12 = sy * sz - cy * sx * cz;
+    c.m20 = -sy * cx;
+    c.m21 = sx;
+    c.m22 = cy * cx;
+    return c;
+}
+
 void QtViewport::OnRawInput([[maybe_unused]] UINT wParam, HRAWINPUT lParam)
 {
     static C3DConnexionDriver* p3DConnexionDriver = 0;
@@ -1450,12 +1284,12 @@ void QtViewport::OnRawInput([[maybe_unused]] UINT wParam, HRAWINPUT lParam)
                     t *= sys_scale3DMouseTranslation->GetFVal();
 
                     float as = 0.001f * gSettings.cameraMoveSpeed;
-                    Ang3 ypr = CCamera::CreateAnglesYPR(Matrix33(viewTM));
+                    Ang3 ypr = CreateAnglesYPR(Matrix33(viewTM));
                     ypr.x += -all6DOFs[5] * as * fScaleYPR;
                     ypr.y = AZStd::clamp(ypr.y + all6DOFs[3] * as * fScaleYPR, -1.5f, 1.5f); // to keep rotation in reasonable range
                     ypr.z = 0;                                                  // to have camera always upward
 
-                    viewTM = Matrix34(CCamera::CreateOrientationYPR(ypr), viewTM.GetTranslation());
+                    viewTM = Matrix34(CreateOrientationYPR(ypr), viewTM.GetTranslation());
                     viewTM = viewTM * Matrix34::CreateTranslationMat(t);
 
                     SetViewTM(viewTM);
@@ -1470,6 +1304,7 @@ float QtViewport::GetFOV() const
 {
     return gSettings.viewports.fDefaultFov;
 }
+
 //////////////////////////////////////////////////////////////////////////
 void QtViewport::setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir)
 {
@@ -1477,12 +1312,5 @@ void QtViewport::setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir)
     m_raySrc = raySrc;
     m_rayDir = rayDir;
 }
-////////////////////////////////////////////////////////////////////////
-void QtViewport::setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir)
-{
-    vp = m_vp;
-    raySrc = m_raySrc;
-    rayDir = m_rayDir;
-}
 
 #include <moc_Viewport.cpp>
diff --git a/Code/Editor/Viewport.h b/Code/Editor/Viewport.h
index 7f8ccc4c4f..a71df6a9cd 100644
--- a/Code/Editor/Viewport.h
+++ b/Code/Editor/Viewport.h
@@ -6,13 +6,12 @@
  *
  */
 
-
 // Description : interface for the CViewport class.
 
-
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzFramework/Viewport/ViewportId.h>
 #include <AzToolsFramework/Viewport/ViewportTypes.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <Cry_Color.h>
@@ -201,7 +200,6 @@ public:
 
     //! Performs hit testing of 2d point in view to find which object hit.
     virtual bool HitTest(const QPoint& point, HitContext& hitInfo) = 0;
-    virtual AZ::Vector3 GetHitLocation(const QPoint& point) = 0;
 
     virtual void MakeConstructionPlane(int axis) = 0;
 
@@ -396,7 +394,6 @@ public:
 
     //! Snap any given 3D world position to grid lines if snap is enabled.
     Vec3 SnapToGrid(const Vec3& vec) override;
-    float GetGridStep() const override;
 
     //! Returns the screen scale factor for a point given in world coordinates.
     //! This factor gives the width in world-space units at the point's distance of the viewport.
@@ -432,11 +429,6 @@ public:
 
     //! Performs hit testing of 2d point in view to find which object hit.
     bool HitTest(const QPoint& point, HitContext& hitInfo) override;
-    AZ::Vector3 GetHitLocation(const QPoint& point) override;
-
-    //! Do 2D hit testing of line in world space.
-    // pToCameraDistance is an optional output parameter in which distance from the camera to the line is returned.
-    bool HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance = 0) const override;
 
     float GetDistanceToLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& point) const override;
 
@@ -444,9 +436,6 @@ public:
     bool GetAdvancedSelectModeFlag() override;
 
     void GetPerpendicularAxis(EAxis* pAxis, bool* pIs2D) const override;
-    const ::Plane* GetConstructionPlane() const override { return &m_constructionPlane; }
-
-    //////////////////////////////////////////////////////////////////////////
 
     //////////////////////////////////////////////////////////////////////////
     //! Set construction plane from given position construction matrix refrence coord system and axis settings.
@@ -502,7 +491,7 @@ public:
     void ReleaseMouse() override { m_mouseCaptured = false;  QWidget::releaseMouse(); }
 
     void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) override;
-    void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir) override;
+
     QPoint m_vp;
     AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
     Vec3 m_raySrc;
@@ -522,9 +511,6 @@ protected:
     void setRenderOverlayVisible(bool);
     bool isRenderOverlayVisible() const;
 
-    // called to process mouse callback inside the viewport.
-    virtual bool MouseCallback(EMouseEvent event, const QPoint& point, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons = Qt::NoButton);
-
     void ProcessRenderLisneters(DisplayContext& rstDisplayContext);
 
     void mousePressEvent(QMouseEvent* event) override;
@@ -535,29 +521,29 @@ protected:
     void keyPressEvent(QKeyEvent* event) override;
     void keyReleaseEvent(QKeyEvent* event) override;
     void resizeEvent(QResizeEvent* event) override;
-    void leaveEvent(QEvent* event) override;
-
     void paintEvent(QPaintEvent* event) override;
 
-    virtual void OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point);
-    virtual void OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& pt);
-    virtual void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnMButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnRButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point);
-    virtual void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-    virtual void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
+    virtual void OnMouseMove(Qt::KeyboardModifiers, Qt::MouseButtons, const QPoint&) {}
+    virtual void OnMouseWheel(Qt::KeyboardModifiers, short zDelta, const QPoint&);
+    virtual void OnLButtonDown(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnLButtonUp(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnRButtonDown(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnRButtonUp(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnMButtonDblClk(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnMButtonDown(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnMButtonUp(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnLButtonDblClk(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnRButtonDblClk(Qt::KeyboardModifiers, const QPoint&) {}
+    virtual void OnKeyDown([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags) {}
+    virtual void OnKeyUp([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags) {}
 #if defined(AZ_PLATFORM_WINDOWS)
     void OnRawInput(UINT wParam, HRAWINPUT lParam);
 #endif
     void OnSetCursor();
 
-    virtual void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt);
+    virtual void BuildDragDropContext(
+        AzQtComponents::ViewportDragContext& context, AzFramework::ViewportId viewportId, const QPoint& point);
+
     void dragEnterEvent(QDragEnterEvent* event) override;
     void dragMoveEvent(QDragMoveEvent* event) override;
     void dragLeaveEvent(QDragLeaveEvent* event) override;
diff --git a/Code/Editor/ViewportManipulatorController.cpp b/Code/Editor/ViewportManipulatorController.cpp
index 1766945541..e46328eb65 100644
--- a/Code/Editor/ViewportManipulatorController.cpp
+++ b/Code/Editor/ViewportManipulatorController.cpp
@@ -8,13 +8,15 @@
 
 #include "ViewportManipulatorController.h"
 
+#include <AzCore/Script/ScriptTimePoint.h>
+#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
+#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
+#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
+#include <AzFramework/Viewport/ScreenGeometry.h>
+#include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
-#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzFramework/Viewport/ScreenGeometry.h>
-#include <AzCore/Script/ScriptTimePoint.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
 #include <QApplication>
 
@@ -87,8 +89,14 @@ namespace SandboxEditor
         }
 
         using InteractionBus = AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
-        using namespace AzToolsFramework::ViewportInteraction;
         using AzFramework::InputChannel;
+        using AzToolsFramework::ViewportInteraction::KeyboardModifier;
+        using AzToolsFramework::ViewportInteraction::MouseButton;
+        using AzToolsFramework::ViewportInteraction::MouseEvent;
+        using AzToolsFramework::ViewportInteraction::MouseInteraction;
+        using AzToolsFramework::ViewportInteraction::MouseInteractionEvent;
+        using AzToolsFramework::ViewportInteraction::ProjectedViewportRay;
+        using AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus;
 
         bool interactionHandled = false;
         float wheelDelta = 0.0f;
@@ -117,16 +125,13 @@ namespace SandboxEditor
                     aznumeric_cast<int>(position->m_normalizedPosition.GetX() * windowSize.m_width),
                     aznumeric_cast<int>(position->m_normalizedPosition.GetY() * windowSize.m_height));
 
-                m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPoint;
-                AZStd::optional<ProjectedViewportRay> ray;
+                ProjectedViewportRay ray{};
                 ViewportInteractionRequestBus::EventResult(
                     ray, GetViewportId(), &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPoint);
 
-                if (ray.has_value())
-                {
-                    m_mouseInteraction.m_mousePick.m_rayOrigin = ray.value().origin;
-                    m_mouseInteraction.m_mousePick.m_rayDirection = ray.value().direction;
-                }
+                m_mouseInteraction.m_mousePick.m_rayOrigin = ray.origin;
+                m_mouseInteraction.m_mousePick.m_rayDirection = ray.direction;
+                m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPoint;
             }
 
             eventType = MouseEvent::Move;
@@ -152,7 +157,7 @@ namespace SandboxEditor
                     // Only insert the double click timing once we're done processing events, to avoid a false IsDoubleClick positive
                     if (finishedProcessingEvents)
                     {
-                        m_pendingDoubleClicks[mouseButton] = m_curTime;
+                        m_pendingDoubleClicks[mouseButton] = { m_currentTime, m_mouseInteraction.m_mousePick.m_screenCoordinates };
                     }
                     eventType = MouseEvent::Down;
                 }
@@ -160,8 +165,8 @@ namespace SandboxEditor
             else if (state == InputChannel::State::Ended)
             {
                 // If we've actually logged a mouse down event, forward a mouse up event.
-                // This prevents corner cases like the context menu thinking it should be opened even though no one clicked in this viewport,
-                // due to RenderViewportWidget ensuring all controllers get InputChannel::State::Ended events.
+                // This prevents corner cases like the context menu thinking it should be opened even though no one clicked in this
+                // viewport, due to RenderViewportWidget ensuring all controllers get InputChannel::State::Ended events.
                 if (m_mouseInteraction.m_mouseButtons.m_mouseButtons & mouseButtonValue)
                 {
                     // Erase the button from our state if we're done processing events.
@@ -246,17 +251,22 @@ namespace SandboxEditor
 
     void ViewportManipulatorControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
     {
-        m_curTime = event.m_time;
+        m_currentTime = event.m_time;
     }
 
     bool ViewportManipulatorControllerInstance::IsDoubleClick(AzToolsFramework::ViewportInteraction::MouseButton button) const
     {
-        auto clickIt = m_pendingDoubleClicks.find(button);
-        if (clickIt == m_pendingDoubleClicks.end())
+        if (auto clickIt = m_pendingDoubleClicks.find(button); clickIt != m_pendingDoubleClicks.end())
         {
-            return false;
+            const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval();
+            const bool insideTimeThreshold =
+                (m_currentTime.GetMilliseconds() - clickIt->second.m_time.GetMilliseconds()) < doubleClickThresholdMilliseconds;
+            const bool insideDistanceThreshold =
+                AzFramework::ScreenVectorLength(clickIt->second.m_position - m_mouseInteraction.m_mousePick.m_screenCoordinates) <
+                AzFramework::DefaultMouseMoveDeadZone;
+            return insideTimeThreshold && insideDistanceThreshold;
         }
-        const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval();
-        return (m_curTime.GetMilliseconds() - clickIt->second.GetMilliseconds()) < doubleClickThresholdMilliseconds;
+
+        return false;
     }
-} //namespace SandboxEditor
+} // namespace SandboxEditor
diff --git a/Code/Editor/ViewportManipulatorController.h b/Code/Editor/ViewportManipulatorController.h
index d551eb3647..b9c359a544 100644
--- a/Code/Editor/ViewportManipulatorController.h
+++ b/Code/Editor/ViewportManipulatorController.h
@@ -39,8 +39,16 @@ namespace SandboxEditor
         static bool IsMouseMove(const AzFramework::InputChannel& inputChannel);
         static AzToolsFramework::ViewportInteraction::KeyboardModifier GetKeyboardModifier(const AzFramework::InputChannel& inputChannel);
 
+        //! Represents the time and location of a click.
+        struct ClickEvent
+        {
+            AZ::ScriptTimePoint m_time;
+            AzFramework::ScreenPoint m_position;
+        };
+
         AzToolsFramework::ViewportInteraction::MouseInteraction m_mouseInteraction;
-        AZStd::unordered_map<AzToolsFramework::ViewportInteraction::MouseButton, AZ::ScriptTimePoint> m_pendingDoubleClicks;
-        AZ::ScriptTimePoint m_curTime;
+        AZStd::unordered_map<AzToolsFramework::ViewportInteraction::MouseButton, ClickEvent> m_pendingDoubleClicks;
+
+        AZ::ScriptTimePoint m_currentTime;
     };
 } // namespace SandboxEditor
diff --git a/Code/Editor/ViewportTitleDlg.cpp b/Code/Editor/ViewportTitleDlg.cpp
index 75d16e9a40..49459fad0f 100644
--- a/Code/Editor/ViewportTitleDlg.cpp
+++ b/Code/Editor/ViewportTitleDlg.cpp
@@ -138,14 +138,11 @@ CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
 
     connect(this, &CViewportTitleDlg::ActionTriggered, MainWindow::instance()->GetActionManager(), &ActionManager::ActionTriggered);
 
-    AZ::VR::VREventBus::Handler::BusConnect();
-
     OnInitDialog();
 }
 
 CViewportTitleDlg::~CViewportTitleDlg()
 {
-    AZ::VR::VREventBus::Handler::BusDisconnect();
     GetISystem()->GetISystemEventDispatcher()->RemoveListener(this);
     GetIEditor()->UnregisterNotifyListener(this);
 
@@ -236,10 +233,6 @@ void CViewportTitleDlg::SetupOverflowMenu()
     connect(m_audioMuteAction, &QAction::triggered, this, &CViewportTitleDlg::OnBnClickedMuteAudio);
     overFlowMenu->addAction(m_audioMuteAction);
 
-    m_enableVRAction = new QAction("Enable VR Preview", overFlowMenu);
-    connect(m_enableVRAction, &QAction::triggered, this, &CViewportTitleDlg::OnBnClickedEnableVR);
-    overFlowMenu->addAction(m_enableVRAction);
-
     overFlowMenu->addSeparator();
 
     m_enableGridSnappingAction = new QAction("Enable Grid Snapping", overFlowMenu);
@@ -305,16 +298,6 @@ void CViewportTitleDlg::OnInitDialog()
     connect(displayInfoHelper, &CViewportTitleDlgDisplayInfoHelper::ViewportInfoStatusUpdated, this, &CViewportTitleDlg::UpdateDisplayInfo);
     UpdateDisplayInfo();
 
-    // This is here just in case this class hasn't been created before
-    // a VR headset was initialized
-    m_enableVRAction->setEnabled(false);
-    if (AZ::VR::HMDDeviceRequestBus::GetTotalNumOfEventHandlers() != 0)
-    {
-        m_enableVRAction->setEnabled(true);
-    }
-
-    AZ::VR::VREventBus::Handler::BusConnect();
-
     QFontMetrics metrics({});
     int width = static_cast<int>(metrics.boundingRect("-9999.99").width() * m_fieldWidthMultiplier);
 
@@ -931,23 +914,6 @@ void CViewportTitleDlg::UpdateMuteActionText()
     }
 }
 
-void CViewportTitleDlg::OnHMDInitialized()
-{
-    m_enableVRAction->setEnabled(true);
-}
-
-void CViewportTitleDlg::OnHMDShutdown()
-{
-    m_enableVRAction->setEnabled(false);
-}
-
-void CViewportTitleDlg::OnBnClickedEnableVR()
-{
-    gSettings.bEnableGameModeVR = !gSettings.bEnableGameModeVR;
-
-    m_enableVRAction->setText(gSettings.bEnableGameModeVR ? tr("Disable VR Preview") : tr("Enable VR Preview"));
-}
-
 inline double Round(double fVal, double fStep)
 {
     if (fStep > 0.f)
diff --git a/Code/Editor/ViewportTitleDlg.h b/Code/Editor/ViewportTitleDlg.h
index 6996fe7750..a3e19837b4 100644
--- a/Code/Editor/ViewportTitleDlg.h
+++ b/Code/Editor/ViewportTitleDlg.h
@@ -22,7 +22,6 @@
 #include <AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.h>
 #include <AzQtComponents/Components/Widgets/SpinBox.h>
 
-#include <HMDBus.h>
 #endif
 
 // CViewportTitleDlg dialog
@@ -44,7 +43,6 @@ class CViewportTitleDlg
     : public QWidget
     , public IEditorNotifyListener
     , public ISystemEventListener
-    , public AZ::VR::VREventBus::Handler
 {
     Q_OBJECT
 public:
@@ -85,13 +83,6 @@ protected:
     void OnToggleHelpers();
     void UpdateDisplayInfo();
 
-    //////////////////////////////////////////////////////////////////////////
-    /// VR Event Bus Implementation
-    //////////////////////////////////////////////////////////////////////////
-    void OnHMDInitialized() override;
-    void OnHMDShutdown() override;
-    //////////////////////////////////////////////////////////////////////////
-
     void SetupCameraDropdownMenu();
     void SetupResolutionDropdownMenu();
     void SetupViewportInformationMenu();
@@ -140,7 +131,6 @@ protected:
 
     void OnBnClickedGotoPosition();
     void OnBnClickedMuteAudio();
-    void OnBnClickedEnableVR();
 
     void UpdateMuteActionText();
 
@@ -168,7 +158,6 @@ protected:
     QAction* m_fullInformationAction = nullptr;
     QAction* m_compactInformationAction = nullptr;
     QAction* m_audioMuteAction = nullptr;
-    QAction* m_enableVRAction = nullptr;
     QAction* m_enableGridSnappingAction = nullptr;
     QAction* m_enableAngleSnappingAction = nullptr;
     QComboBox* m_cameraSpeed = nullptr;
diff --git a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
index 17f576b5ee..89dfcaffd1 100644
--- a/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
+++ b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
@@ -25,8 +25,6 @@
 
 #include <AzCore/Utils/Utils.h>
 
-// AzFramework
-#include <AzFramework/API/ApplicationAPI.h>
 
 // AzToolsFramework
 #include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
@@ -173,9 +171,6 @@ void WelcomeScreenDialog::SetRecentFileList(RecentFileList* pList)
 
     m_pRecentList = pList;
 
-    const char* engineRoot;
-    EBUS_EVENT_RESULT(engineRoot, AzFramework::ApplicationRequests::Bus, GetEngineRoot);
-
     auto projectPath = AZ::Utils::GetProjectPath();
     QString gamePath{projectPath.c_str()};
     Path::ConvertSlashToBackSlash(gamePath);
diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake
index 47b69765ba..fa627176d8 100644
--- a/Code/Editor/editor_lib_files.cmake
+++ b/Code/Editor/editor_lib_files.cmake
@@ -488,7 +488,6 @@ set(FILES
     UndoViewPosition.h
     UndoViewRotation.h
     Util/GeometryUtil.h
-    Util/KDTree.h
     WipFeaturesDlg.h
     WipFeaturesDlg.ui
     WipFeaturesDlg.qrc
@@ -499,7 +498,6 @@ set(FILES
     Objects/ClassDesc.cpp
     Objects/ClassDesc.h
     Objects/DisplayContextShared.inl
-    Objects/IEntityObjectListener.h
     Objects/SelectionGroup.cpp
     Objects/SelectionGroup.h
     Objects/SubObjSelection.cpp
@@ -710,7 +708,6 @@ set(FILES
     Util/GuidUtil.cpp
     Util/GuidUtil.h
     Util/IObservable.h
-    Util/KDTree.cpp
     Util/Mailer.h
     Util/NamedData.cpp
     Util/NamedData.h
diff --git a/Code/Framework/AtomCore/Tests/Main.cpp b/Code/Framework/AtomCore/Tests/Main.cpp
index 29ef408551..eb4c6bc835 100644
--- a/Code/Framework/AtomCore/Tests/Main.cpp
+++ b/Code/Framework/AtomCore/Tests/Main.cpp
@@ -7,7 +7,6 @@
  */
 
 
-#include <AzCore/Debug/Timer.h>
 #include <AzCore/Debug/TraceMessageBus.h>
 #include <AzCore/std/typetraits/typetraits.h>
 #include <AzCore/UnitTest/TestTypes.h>
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp
index fdc3053b5c..bf3ad20768 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.cpp
@@ -14,453 +14,450 @@
 #include <AzCore/std/parallel/lock.h>
 #include <AzCore/std/string/conversions.h>
 
-namespace AZ
+namespace AZ::Data
 {
-    namespace Data
+    AssetFilterInfo::AssetFilterInfo(const AssetId& id, const AssetType& assetType, AssetLoadBehavior loadBehavior)
+        : m_assetId(id)
+        , m_assetType(assetType)
+        , m_loadBehavior(loadBehavior)
     {
-        AssetFilterInfo::AssetFilterInfo(const AssetId& id, const AssetType& assetType, AssetLoadBehavior loadBehavior)
-            : m_assetId(id)
-            , m_assetType(assetType)
-            , m_loadBehavior(loadBehavior)
+    }
+
+    AssetFilterInfo::AssetFilterInfo(const Asset<AssetData>& asset)
+        : m_assetId(asset.GetId())
+        , m_assetType(asset.GetType())
+        , m_loadBehavior(asset.GetAutoLoadBehavior())
+    {
+    }
+
+
+    AssetId AssetId::CreateString(AZStd::string_view input)
+    {
+        size_t separatorIdx = input.find(':');
+        if (separatorIdx == AZStd::string_view::npos)
         {
+            return AssetId();
         }
 
-        AssetFilterInfo::AssetFilterInfo(const Asset<AssetData>& asset)
-            : m_assetId(asset.GetId())
-            , m_assetType(asset.GetType())
-            , m_loadBehavior(asset.GetAutoLoadBehavior())
+        AssetId assetId;
+        assetId.m_guid = Uuid::CreateString(input.data(), separatorIdx);
+        if (assetId.m_guid.IsNull())
         {
+            return AssetId();
         }
 
+        assetId.m_subId = strtoul(&input[separatorIdx + 1], nullptr, 16);
 
-        AssetId AssetId::CreateString(AZStd::string_view input)
+        return assetId;
+    }
+
+    void AssetId::Reflect(AZ::ReflectContext* context)
+    {
+        if (SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context))
         {
-            size_t separatorIdx = input.find(':');
-            if (separatorIdx == AZStd::string_view::npos)
-            {
-                return AssetId();
-            }
-
-            AssetId assetId;
-            assetId.m_guid = Uuid::CreateString(input.data(), separatorIdx);
-            if (assetId.m_guid.IsNull())
-            {
-                return AssetId();
-            }
-
-            assetId.m_subId = strtoul(&input[separatorIdx + 1], nullptr, 16);
-
-            return assetId;
+            serializeContext->Class<Data::AssetId>()
+                ->Version(1)
+                ->Field("guid", &Data::AssetId::m_guid)
+                ->Field("subId", &Data::AssetId::m_subId)
+                ;
         }
 
-        void AssetId::Reflect(AZ::ReflectContext* context)
+        if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
         {
-            if (SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context))
-            {
-                serializeContext->Class<Data::AssetId>()
-                    ->Version(1)
-                    ->Field("guid", &Data::AssetId::m_guid)
-                    ->Field("subId", &Data::AssetId::m_subId)
-                    ;
-            }
+            behaviorContext->Class<Data::AssetId>()
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Category, "Asset")
+                ->Attribute(AZ::Script::Attributes::Module, "asset")
+                ->Constructor()
+                ->Constructor<const Uuid&, u32>()
+                ->Method("CreateString", &Data::AssetId::CreateString)
+                ->Method("IsValid", &Data::AssetId::IsValid)
+                    ->Attribute(AZ::Script::Attributes::Alias, "is_valid")
+                ->Method("ToString", [](const Data::AssetId* self) { return self->ToString<AZStd::string>(); })
+                    ->Attribute(AZ::Script::Attributes::Alias, "to_string")
+                ->Method("IsEqual", [](const Data::AssetId& self, const Data::AssetId& other) { return self == other; })
+                    ->Attribute(AZ::Script::Attributes::Alias, "is_equal")
+                    ->Attribute(AZ::Script::Attributes::Operator, AZ::Script::Attributes::OperatorType::Equal)
+                ;
 
-            if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
-            {
-                behaviorContext->Class<Data::AssetId>()
-                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
-                    ->Attribute(AZ::Script::Attributes::Category, "Asset")
-                    ->Attribute(AZ::Script::Attributes::Module, "asset")
-                    ->Constructor()
-                    ->Constructor<const Uuid&, u32>()
-                    ->Method("CreateString", &Data::AssetId::CreateString)
-                    ->Method("IsValid", &Data::AssetId::IsValid)
-                        ->Attribute(AZ::Script::Attributes::Alias, "is_valid")
-                    ->Method("ToString", [](const Data::AssetId* self) { return self->ToString<AZStd::string>(); })
-                        ->Attribute(AZ::Script::Attributes::Alias, "to_string")
-                    ->Method("IsEqual", [](const Data::AssetId& self, const Data::AssetId& other) { return self == other; })
-                        ->Attribute(AZ::Script::Attributes::Alias, "is_equal")
-                        ->Attribute(AZ::Script::Attributes::Operator, AZ::Script::Attributes::OperatorType::Equal)
-                    ;
+            behaviorContext->Class<Data::AssetInfo>()
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Category, "Asset")
+                ->Attribute(AZ::Script::Attributes::Module, "asset")
+                ->Property("assetId", BehaviorValueGetter(&Data::AssetInfo::m_assetId), nullptr)
+                ->Property("assetType", BehaviorValueGetter(&Data::AssetInfo::m_assetType), nullptr)
+                ->Property("sizeBytes", BehaviorValueGetter(&Data::AssetInfo::m_sizeBytes), nullptr)
+                ->Property("relativePath", BehaviorValueGetter(&Data::AssetInfo::m_relativePath), nullptr)
+                ;
+        }
+    }
 
-                behaviorContext->Class<Data::AssetInfo>()
-                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
-                    ->Attribute(AZ::Script::Attributes::Category, "Asset")
-                    ->Attribute(AZ::Script::Attributes::Module, "asset")
-                    ->Property("assetId", BehaviorValueGetter(&Data::AssetInfo::m_assetId), nullptr)
-                    ->Property("assetType", BehaviorValueGetter(&Data::AssetInfo::m_assetType), nullptr)
-                    ->Property("sizeBytes", BehaviorValueGetter(&Data::AssetInfo::m_sizeBytes), nullptr)
-                    ->Property("relativePath", BehaviorValueGetter(&Data::AssetInfo::m_relativePath), nullptr)
-                    ;
-            }
+    namespace AssetInternal
+    {
+        Asset<AssetData> FindOrCreateAsset(const AssetId& id, const AssetType& type, AssetLoadBehavior assetReferenceLoadBehavior)
+        {
+            return AssetManager::Instance().FindOrCreateAsset(id, type, assetReferenceLoadBehavior);
         }
 
-        namespace AssetInternal
+        Asset<AssetData> GetAsset(const AssetId& id, const AssetType& type, AssetLoadBehavior assetReferenceLoadBehavior,
+            const AssetLoadParameters& loadParams)
         {
-            Asset<AssetData> FindOrCreateAsset(const AssetId& id, const AssetType& type, AssetLoadBehavior assetReferenceLoadBehavior)
-            {
-                return AssetManager::Instance().FindOrCreateAsset(id, type, assetReferenceLoadBehavior);
-            }
-
-            Asset<AssetData> GetAsset(const AssetId& id, const AssetType& type, AssetLoadBehavior assetReferenceLoadBehavior,
-                const AssetLoadParameters& loadParams)
-            {
-                return AssetManager::Instance().GetAsset(id, type, assetReferenceLoadBehavior, loadParams);
-            }
-
-            AssetData::AssetStatus BlockUntilLoadComplete(const Asset<AssetData>& asset)
-            {
-                return AssetManager::Instance().BlockUntilLoadComplete(asset);
-            }
-
-            void UpdateAssetInfo(AssetId& id, AZStd::string& assetHint)
-            {
-                // it is possible that the assetID given is legacy / old and we have a new assetId we can use instead for it.
-                // in that case, upgrade the AssetID to the new one, so that future saves are in the new format.
-                // this function should only be invoked if the feature is turned on in the asset manager as it can be (slightly) expensive
-
-                if ((!AssetManager::IsReady()) || (!AssetManager::Instance().GetAssetInfoUpgradingEnabled()))
-                {
-                    return;
-                }
-
-                AZ::Data::AssetInfo assetInfo;
-                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, id);
-                if (assetInfo.m_assetId.IsValid())
-                {
-                    id = assetInfo.m_assetId;
-                    if (!assetInfo.m_relativePath.empty())
-                    {
-                        assetHint = assetInfo.m_relativePath;
-                    }
-                }
-            }
-
-            bool ReloadAsset(AssetData* assetData, AssetLoadBehavior assetReferenceLoadBehavior)
-            {
-                AssetManager::Instance().ReloadAsset(assetData->GetId(), assetReferenceLoadBehavior);
-                return true;
-            }
-
-            bool SaveAsset(AssetData* assetData, AssetLoadBehavior assetReferenceLoadBehavior)
-            {
-                AssetManager::Instance().SaveAsset({ assetData, assetReferenceLoadBehavior });
-                return true;
-            }
-
-            Asset<AssetData> GetAssetData(const AssetId& id, AssetLoadBehavior assetReferenceLoadBehavior)
-            {
-                if (AssetManager::IsReady())
-                {
-                    AZStd::lock_guard<AZStd::recursive_mutex> assetLock(AssetManager::Instance().m_assetMutex);
-                    auto it = AssetManager::Instance().m_assets.find(id);
-                    if (it != AssetManager::Instance().m_assets.end())
-                    {
-                        return { it->second, assetReferenceLoadBehavior };
-                    }
-                }
-                return {};
-            }
-
-            AssetId ResolveAssetId(const AssetId& id)
-            {
-                AZ::Data::AssetInfo assetInfo;
-                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, id);
-                if (assetInfo.m_assetId.IsValid())
-                {
-                    return assetInfo.m_assetId;
-                }
-                else
-                {
-                    return id;
-                }
-
-            }
+            return AssetManager::Instance().GetAsset(id, type, assetReferenceLoadBehavior, loadParams);
         }
 
-        AssetData::~AssetData()
+        AssetData::AssetStatus BlockUntilLoadComplete(const Asset<AssetData>& asset)
         {
-            UnregisterWithHandler();
+            return AssetManager::Instance().BlockUntilLoadComplete(asset);
         }
 
-        void AssetData::Reflect(AZ::ReflectContext* context)
+        void UpdateAssetInfo(AssetId& id, AZStd::string& assetHint)
         {
-            if (SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context))
+            // it is possible that the assetID given is legacy / old and we have a new assetId we can use instead for it.
+            // in that case, upgrade the AssetID to the new one, so that future saves are in the new format.
+            // this function should only be invoked if the feature is turned on in the asset manager as it can be (slightly) expensive
+
+            if ((!AssetManager::IsReady()) || (!AssetManager::Instance().GetAssetInfoUpgradingEnabled()))
             {
-                serializeContext->Class<AZ::Data::AssetData>()
-                    ->Version(1)
-                    ;
-            }
-
-            if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
-            {
-                behaviorContext->Class<AssetData>("AssetData")
-                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
-                    ->Attribute(AZ::Script::Attributes::Category, "Asset")
-                    ->Attribute(AZ::Script::Attributes::Module, "asset")
-                    ->Method("IsReady", &AssetData::IsReady)
-                        ->Attribute(AZ::Script::Attributes::Alias, "is_ready")
-                    ->Method("IsError", &AssetData::IsError)
-                        ->Attribute(AZ::Script::Attributes::Alias, "is_error")
-                    ->Method("IsLoading", &AssetData::IsLoading)
-                        ->Attribute(AZ::Script::Attributes::Alias, "is_loading")
-                    ->Method("GetId", &AssetData::GetId)
-                        ->Attribute(AZ::Script::Attributes::Alias, "get_id")
-                    ->Method("GetUseCount", &AssetData::GetUseCount)
-                        ->Attribute(AZ::Script::Attributes::Alias, "get_use_count")
-                    ;
-            }
-        }
-
-        void AssetData::Acquire()
-        {
-            AZ_Assert(m_useCount >= 0, "AssetData has been deleted");
-
-            AcquireWeak();
-            ++m_useCount;
-        }
-
-        void AssetData::Release()
-        {
-            AZ_Assert(m_useCount > 0, "Usecount is already 0!");
-
-            if (m_useCount.fetch_sub(1) == 1)
-            {
-                if (AssetManager::IsReady())
-                {
-                    AssetManager::Instance().OnAssetUnused(this);
-                }
-                else
-                {
-                    AZ_Assert(false, "Attempting to release asset after AssetManager has been destroyed!");
-                }
-            }
-
-            ReleaseWeak();
-        }
-
-        void AssetData::AcquireWeak()
-        {
-            AZ_Assert(m_useCount >= 0, "AssetData has been deleted");
-            ++m_weakUseCount;
-        }
-
-        void AssetData::ReleaseWeak()
-        {
-            AZ_Assert(m_weakUseCount > 0, "WeakUseCount is already 0");
-
-            AssetId assetId = m_assetId;
-            int creationToken = m_creationToken;
-            AssetType assetType = GetType();
-            bool removeFromHash = IsRegisterReadonlyAndShareable();
-            // default creation token implies that the asset was not created by the asset manager and therefore it cannot be in the asset map. 
-            removeFromHash = creationToken == s_defaultCreationToken ? false : removeFromHash;
-
-            if (m_weakUseCount.fetch_sub(1) == 1)
-            {
-                if (AssetManager::IsReady())
-                {
-                    AssetManager::Instance().ReleaseAsset(this, assetId, assetType, removeFromHash, creationToken);
-                }
-                else
-                {
-                    AZ_Assert(false, "Attempting to release asset after AssetManager has been destroyed!");
-                }
-            }
-        }
-
-        bool AssetData::IsLoading(bool includeQueued) const
-        {
-            auto curStatus = GetStatus();
-            return(curStatus == AssetStatus::Loading || curStatus == AssetStatus::LoadedPreReady || curStatus==AssetStatus::StreamReady || 
-                    (includeQueued && curStatus == AssetStatus::Queued));
-        }
-
-        void AssetData::RegisterWithHandler(AssetHandler* handler)
-        {
-            if (!handler)
-            {
-                AZ_Error("AssetData", false, "No handler to register with");
                 return;
             }
-            m_registeredHandler = handler;
-        }
 
-        void AssetData::UnregisterWithHandler()
-        {
-            if (m_registeredHandler)
+            AZ::Data::AssetInfo assetInfo;
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, id);
+            if (assetInfo.m_assetId.IsValid())
             {
-                m_registeredHandler = nullptr;
-            }
-        }
-
-        bool AssetData::GetFlag(const AssetDataFlags& checkFlag) const
-        {
-            return m_flags[aznumeric_cast<AZStd::size_t>(checkFlag)];
-        }
-
-        void AssetData::SetFlag(const AssetDataFlags& checkFlag, bool setValue)
-        {
-            m_flags.set(aznumeric_cast<AZStd::size_t>(checkFlag), setValue);
-        }
-
-        bool AssetData::GetRequeue() const
-        {
-            return GetFlag(AssetDataFlags::Requeue);
-        }
-        void AssetData::SetRequeue(bool requeue)
-        {
-            SetFlag(AssetDataFlags::Requeue, requeue);
-        }
-
-        void AssetBusCallbacks::SetCallbacks(const AssetReadyCB& readyCB, const AssetMovedCB& movedCB, const AssetReloadedCB& reloadedCB,
-            const AssetSavedCB& savedCB, const AssetUnloadedCB& unloadedCB, const AssetErrorCB& errorCB, const AssetCanceledCB& cancelCB)
-        {
-            m_onAssetReadyCB = readyCB;
-            m_onAssetMovedCB = movedCB;
-            m_onAssetReloadedCB = reloadedCB;
-            m_onAssetSavedCB = savedCB;
-            m_onAssetUnloadedCB = unloadedCB;
-            m_onAssetErrorCB = errorCB;
-            m_onAssetCanceledCB = cancelCB;
-        }
-
-        void AssetBusCallbacks::ClearCallbacks()
-        {
-            SetCallbacks(AssetBusCallbacks::AssetReadyCB(),
-                AssetBusCallbacks::AssetMovedCB(),
-                AssetBusCallbacks::AssetReloadedCB(),
-                AssetBusCallbacks::AssetSavedCB(),
-                AssetBusCallbacks::AssetUnloadedCB(),
-                AssetBusCallbacks::AssetErrorCB(),
-                AssetBusCallbacks::AssetCanceledCB());
-        }
-
-
-        void AssetBusCallbacks::SetOnAssetReadyCallback(const AssetReadyCB& readyCB)
-        {
-            m_onAssetReadyCB = readyCB;
-        }
-
-        void AssetBusCallbacks::SetOnAssetMovedCallback(const AssetMovedCB& movedCB)
-        {
-            m_onAssetMovedCB = movedCB;
-        }
-
-        void AssetBusCallbacks::SetOnAssetReloadedCallback(const AssetReloadedCB& reloadedCB)
-        {
-            m_onAssetReloadedCB = reloadedCB;
-        }
-
-        void AssetBusCallbacks::SetOnAssetSavedCallback(const AssetSavedCB& savedCB)
-        {
-            m_onAssetSavedCB = savedCB;
-        }
-
-        void AssetBusCallbacks::SetOnAssetUnloadedCallback(const AssetUnloadedCB& unloadedCB)
-        {
-            m_onAssetUnloadedCB = unloadedCB;
-        }
-
-        void AssetBusCallbacks::SetOnAssetErrorCallback(const AssetErrorCB& errorCB)
-        {
-            m_onAssetErrorCB = errorCB;
-        }
-
-        void AssetBusCallbacks::SetOnAssetCanceledCallback(const AssetCanceledCB& cancelCB)
-        {
-            m_onAssetCanceledCB = cancelCB;
-        }
-
-        void AssetBusCallbacks::OnAssetReady(Asset<AssetData> asset)
-        {
-            if (m_onAssetReadyCB)
-            {
-                m_onAssetReadyCB(asset, *this);
-            }
-        }
-
-        void AssetBusCallbacks::OnAssetMoved(Asset<AssetData> asset, void* oldDataPointer)
-        {
-            if (m_onAssetMovedCB)
-            {
-                m_onAssetMovedCB(asset, oldDataPointer, *this);
-            }
-        }
-
-        void AssetBusCallbacks::OnAssetReloaded(Asset<AssetData> asset)
-        {
-            if (m_onAssetReloadedCB)
-            {
-                m_onAssetReloadedCB(asset, *this);
-            }
-        }
-
-        void AssetBusCallbacks::OnAssetSaved(Asset<AssetData> asset, bool isSuccessful)
-        {
-            if (m_onAssetSavedCB)
-            {
-                m_onAssetSavedCB(asset, isSuccessful, *this);
-            }
-        }
-
-        void AssetBusCallbacks::OnAssetUnloaded(const AssetId assetId, const AssetType assetType)
-        {
-            if (m_onAssetUnloadedCB)
-            {
-                m_onAssetUnloadedCB(assetId, assetType, *this);
-            }
-        }
-
-        void AssetBusCallbacks::OnAssetError(Asset<AssetData> asset)
-        {
-            if (m_onAssetErrorCB)
-            {
-                m_onAssetErrorCB(asset, *this);
-            }
-        }
-
-        void AssetBusCallbacks::OnAssetCanceled(const AssetId assetId)
-        {
-            if (m_onAssetCanceledCB)
-            {
-                m_onAssetCanceledCB(assetId, *this);
-            }
-        }
-
-        /*static*/ bool AssetFilterNoAssetLoading([[maybe_unused]] const AssetFilterInfo& filterInfo)
-        {
-            return false;
-        }
-        namespace ProductDependencyInfo
-        {
-            AZ::Data::AssetLoadBehavior LoadBehaviorFromFlags(const ProductDependencyFlags& dependencyFlags)
-            {
-                AZ::u8 loadBehaviorValue = 0;
-                for (AZ::u8 thisFlag = aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorLow);
-                    thisFlag <= aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorHigh); ++thisFlag)
+                id = assetInfo.m_assetId;
+                if (!assetInfo.m_relativePath.empty())
                 {
-                    if (dependencyFlags[thisFlag])
-                    {
-                        loadBehaviorValue |= (1 << thisFlag);
-                    }
+                    assetHint = assetInfo.m_relativePath;
                 }
-                return static_cast<AZ::Data::AssetLoadBehavior>(loadBehaviorValue);
-            }
-
-            ProductDependencyFlags CreateFlags(AZ::Data::AssetLoadBehavior autoLoadBehavior)
-            {
-                AZ::Data::ProductDependencyInfo::ProductDependencyFlags returnFlags;
-                AZ::u8 loadBehavior = aznumeric_caster(autoLoadBehavior);
-                for (AZ::u8 thisFlag = aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorLow);
-                    thisFlag <= aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorHigh); ++thisFlag)
-                {
-                    if (loadBehavior & (1 << thisFlag))
-                    {
-                        returnFlags[thisFlag] = true;
-                    }
-                }
-                return returnFlags;
             }
         }
-    }   // namespace Data
-}   // namespace AZ
+
+        bool ReloadAsset(AssetData* assetData, AssetLoadBehavior assetReferenceLoadBehavior)
+        {
+            AssetManager::Instance().ReloadAsset(assetData->GetId(), assetReferenceLoadBehavior);
+            return true;
+        }
+
+        bool SaveAsset(AssetData* assetData, AssetLoadBehavior assetReferenceLoadBehavior)
+        {
+            AssetManager::Instance().SaveAsset({ assetData, assetReferenceLoadBehavior });
+            return true;
+        }
+
+        Asset<AssetData> GetAssetData(const AssetId& id, AssetLoadBehavior assetReferenceLoadBehavior)
+        {
+            if (AssetManager::IsReady())
+            {
+                AZStd::lock_guard<AZStd::recursive_mutex> assetLock(AssetManager::Instance().m_assetMutex);
+                auto it = AssetManager::Instance().m_assets.find(id);
+                if (it != AssetManager::Instance().m_assets.end())
+                {
+                    return { it->second, assetReferenceLoadBehavior };
+                }
+            }
+            return {};
+        }
+
+        AssetId ResolveAssetId(const AssetId& id)
+        {
+            AZ::Data::AssetInfo assetInfo;
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, id);
+            if (assetInfo.m_assetId.IsValid())
+            {
+                return assetInfo.m_assetId;
+            }
+            else
+            {
+                return id;
+            }
+
+        }
+    }
+
+    AssetData::~AssetData()
+    {
+        UnregisterWithHandler();
+    }
+
+    void AssetData::Reflect(AZ::ReflectContext* context)
+    {
+        if (SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context))
+        {
+            serializeContext->Class<AZ::Data::AssetData>()
+                ->Version(1)
+                ;
+        }
+
+        if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
+        {
+            behaviorContext->Class<AssetData>("AssetData")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Category, "Asset")
+                ->Attribute(AZ::Script::Attributes::Module, "asset")
+                ->Method("IsReady", &AssetData::IsReady)
+                    ->Attribute(AZ::Script::Attributes::Alias, "is_ready")
+                ->Method("IsError", &AssetData::IsError)
+                    ->Attribute(AZ::Script::Attributes::Alias, "is_error")
+                ->Method("IsLoading", &AssetData::IsLoading)
+                    ->Attribute(AZ::Script::Attributes::Alias, "is_loading")
+                ->Method("GetId", &AssetData::GetId)
+                    ->Attribute(AZ::Script::Attributes::Alias, "get_id")
+                ->Method("GetUseCount", &AssetData::GetUseCount)
+                    ->Attribute(AZ::Script::Attributes::Alias, "get_use_count")
+                ;
+        }
+    }
+
+    void AssetData::Acquire()
+    {
+        AZ_Assert(m_useCount >= 0, "AssetData has been deleted");
+
+        AcquireWeak();
+        ++m_useCount;
+    }
+
+    void AssetData::Release()
+    {
+        AZ_Assert(m_useCount > 0, "Usecount is already 0!");
+
+        if (m_useCount.fetch_sub(1) == 1)
+        {
+            if (AssetManager::IsReady())
+            {
+                AssetManager::Instance().OnAssetUnused(this);
+            }
+            else
+            {
+                AZ_Assert(false, "Attempting to release asset after AssetManager has been destroyed!");
+            }
+        }
+
+        ReleaseWeak();
+    }
+
+    void AssetData::AcquireWeak()
+    {
+        AZ_Assert(m_useCount >= 0, "AssetData has been deleted");
+        ++m_weakUseCount;
+    }
+
+    void AssetData::ReleaseWeak()
+    {
+        AZ_Assert(m_weakUseCount > 0, "WeakUseCount is already 0");
+
+        AssetId assetId = m_assetId;
+        int creationToken = m_creationToken;
+        AssetType assetType = GetType();
+        bool removeFromHash = IsRegisterReadonlyAndShareable();
+        // default creation token implies that the asset was not created by the asset manager and therefore it cannot be in the asset map.
+        removeFromHash = creationToken == s_defaultCreationToken ? false : removeFromHash;
+
+        if (m_weakUseCount.fetch_sub(1) == 1)
+        {
+            if (AssetManager::IsReady())
+            {
+                AssetManager::Instance().ReleaseAsset(this, assetId, assetType, removeFromHash, creationToken);
+            }
+            else
+            {
+                AZ_Assert(false, "Attempting to release asset after AssetManager has been destroyed!");
+            }
+        }
+    }
+
+    bool AssetData::IsLoading(bool includeQueued) const
+    {
+        auto curStatus = GetStatus();
+        return(curStatus == AssetStatus::Loading || curStatus == AssetStatus::LoadedPreReady || curStatus==AssetStatus::StreamReady ||
+                (includeQueued && curStatus == AssetStatus::Queued));
+    }
+
+    void AssetData::RegisterWithHandler(AssetHandler* handler)
+    {
+        if (!handler)
+        {
+            AZ_Error("AssetData", false, "No handler to register with");
+            return;
+        }
+        m_registeredHandler = handler;
+    }
+
+    void AssetData::UnregisterWithHandler()
+    {
+        if (m_registeredHandler)
+        {
+            m_registeredHandler = nullptr;
+        }
+    }
+
+    bool AssetData::GetFlag(const AssetDataFlags& checkFlag) const
+    {
+        return m_flags[aznumeric_cast<AZStd::size_t>(checkFlag)];
+    }
+
+    void AssetData::SetFlag(const AssetDataFlags& checkFlag, bool setValue)
+    {
+        m_flags.set(aznumeric_cast<AZStd::size_t>(checkFlag), setValue);
+    }
+
+    bool AssetData::GetRequeue() const
+    {
+        return GetFlag(AssetDataFlags::Requeue);
+    }
+    void AssetData::SetRequeue(bool requeue)
+    {
+        SetFlag(AssetDataFlags::Requeue, requeue);
+    }
+
+    void AssetBusCallbacks::SetCallbacks(const AssetReadyCB& readyCB, const AssetMovedCB& movedCB, const AssetReloadedCB& reloadedCB,
+        const AssetSavedCB& savedCB, const AssetUnloadedCB& unloadedCB, const AssetErrorCB& errorCB, const AssetCanceledCB& cancelCB)
+    {
+        m_onAssetReadyCB = readyCB;
+        m_onAssetMovedCB = movedCB;
+        m_onAssetReloadedCB = reloadedCB;
+        m_onAssetSavedCB = savedCB;
+        m_onAssetUnloadedCB = unloadedCB;
+        m_onAssetErrorCB = errorCB;
+        m_onAssetCanceledCB = cancelCB;
+    }
+
+    void AssetBusCallbacks::ClearCallbacks()
+    {
+        SetCallbacks(AssetBusCallbacks::AssetReadyCB(),
+            AssetBusCallbacks::AssetMovedCB(),
+            AssetBusCallbacks::AssetReloadedCB(),
+            AssetBusCallbacks::AssetSavedCB(),
+            AssetBusCallbacks::AssetUnloadedCB(),
+            AssetBusCallbacks::AssetErrorCB(),
+            AssetBusCallbacks::AssetCanceledCB());
+    }
+
+
+    void AssetBusCallbacks::SetOnAssetReadyCallback(const AssetReadyCB& readyCB)
+    {
+        m_onAssetReadyCB = readyCB;
+    }
+
+    void AssetBusCallbacks::SetOnAssetMovedCallback(const AssetMovedCB& movedCB)
+    {
+        m_onAssetMovedCB = movedCB;
+    }
+
+    void AssetBusCallbacks::SetOnAssetReloadedCallback(const AssetReloadedCB& reloadedCB)
+    {
+        m_onAssetReloadedCB = reloadedCB;
+    }
+
+    void AssetBusCallbacks::SetOnAssetSavedCallback(const AssetSavedCB& savedCB)
+    {
+        m_onAssetSavedCB = savedCB;
+    }
+
+    void AssetBusCallbacks::SetOnAssetUnloadedCallback(const AssetUnloadedCB& unloadedCB)
+    {
+        m_onAssetUnloadedCB = unloadedCB;
+    }
+
+    void AssetBusCallbacks::SetOnAssetErrorCallback(const AssetErrorCB& errorCB)
+    {
+        m_onAssetErrorCB = errorCB;
+    }
+
+    void AssetBusCallbacks::SetOnAssetCanceledCallback(const AssetCanceledCB& cancelCB)
+    {
+        m_onAssetCanceledCB = cancelCB;
+    }
+
+    void AssetBusCallbacks::OnAssetReady(Asset<AssetData> asset)
+    {
+        if (m_onAssetReadyCB)
+        {
+            m_onAssetReadyCB(asset, *this);
+        }
+    }
+
+    void AssetBusCallbacks::OnAssetMoved(Asset<AssetData> asset, void* oldDataPointer)
+    {
+        if (m_onAssetMovedCB)
+        {
+            m_onAssetMovedCB(asset, oldDataPointer, *this);
+        }
+    }
+
+    void AssetBusCallbacks::OnAssetReloaded(Asset<AssetData> asset)
+    {
+        if (m_onAssetReloadedCB)
+        {
+            m_onAssetReloadedCB(asset, *this);
+        }
+    }
+
+    void AssetBusCallbacks::OnAssetSaved(Asset<AssetData> asset, bool isSuccessful)
+    {
+        if (m_onAssetSavedCB)
+        {
+            m_onAssetSavedCB(asset, isSuccessful, *this);
+        }
+    }
+
+    void AssetBusCallbacks::OnAssetUnloaded(const AssetId assetId, const AssetType assetType)
+    {
+        if (m_onAssetUnloadedCB)
+        {
+            m_onAssetUnloadedCB(assetId, assetType, *this);
+        }
+    }
+
+    void AssetBusCallbacks::OnAssetError(Asset<AssetData> asset)
+    {
+        if (m_onAssetErrorCB)
+        {
+            m_onAssetErrorCB(asset, *this);
+        }
+    }
+
+    void AssetBusCallbacks::OnAssetCanceled(const AssetId assetId)
+    {
+        if (m_onAssetCanceledCB)
+        {
+            m_onAssetCanceledCB(assetId, *this);
+        }
+    }
+
+    /*static*/ bool AssetFilterNoAssetLoading([[maybe_unused]] const AssetFilterInfo& filterInfo)
+    {
+        return false;
+    }
+    namespace ProductDependencyInfo
+    {
+        AZ::Data::AssetLoadBehavior LoadBehaviorFromFlags(const ProductDependencyFlags& dependencyFlags)
+        {
+            AZ::u8 loadBehaviorValue = 0;
+            for (AZ::u8 thisFlag = aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorLow);
+                thisFlag <= aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorHigh); ++thisFlag)
+            {
+                if (dependencyFlags[thisFlag])
+                {
+                    loadBehaviorValue |= (1 << thisFlag);
+                }
+            }
+            return static_cast<AZ::Data::AssetLoadBehavior>(loadBehaviorValue);
+        }
+
+        ProductDependencyFlags CreateFlags(AZ::Data::AssetLoadBehavior autoLoadBehavior)
+        {
+            AZ::Data::ProductDependencyInfo::ProductDependencyFlags returnFlags;
+            AZ::u8 loadBehavior = aznumeric_caster(autoLoadBehavior);
+            for (AZ::u8 thisFlag = aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorLow);
+                thisFlag <= aznumeric_cast<AZ::u8>(ProductDependencyFlagBits::LoadBehaviorHigh); ++thisFlag)
+            {
+                if (loadBehavior & (1 << thisFlag))
+                {
+                    returnFlags[thisFlag] = true;
+                }
+            }
+            return returnFlags;
+        }
+    }
+} // namespace AZ::Data
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h
index 0c8e5209ca..0b181f6782 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h
@@ -325,13 +325,13 @@ namespace AZ
 
             T& operator*() const
             {
-                AZ_Assert(m_assetData, "Asset is not loaded");
+                AZ_Assert(m_assetData, "Asset %s (%s) is not loaded", m_assetId.ToString<AZStd::string>().c_str(), m_assetHint.c_str());
                 return *Get();
             }
 
             T* operator->() const
             {
-                AZ_Assert(m_assetData, "Asset is not loaded");
+                AZ_Assert(m_assetData, "Asset %s (%s) is not loaded", m_assetId.ToString<AZStd::string>().c_str(), m_assetHint.c_str());
                 return Get();
             }
 
@@ -556,16 +556,24 @@ namespace AZ
                     Asset<AssetData> assetData(AssetInternal::GetAssetData(actualId, AZ::Data::AssetLoadBehavior::Default));
                     if (assetData)
                     {
-                        auto curStatus = assetData->GetStatus();
+                        auto isReady = assetData->GetStatus() == AssetData::AssetStatus::Ready;
                         bool isError = assetData->IsError();
-                        connectLock.unlock();
-                        if (curStatus == AssetData::AssetStatus::Ready)
+
+                        if (isReady || isError)
                         {
-                            handler->OnAssetReady(assetData);
-                        }
-                        else if (isError)
-                        {
-                            handler->OnAssetError(assetData);
+                            connectLock.unlock();
+
+                            if (isReady)
+                            {
+                                handler->OnAssetReady(assetData);
+                            }
+                            else if (isError)
+                            {
+                                handler->OnAssetError(assetData);
+                            }
+
+                            // Lock the mutex again since some destructors will be modifying the context afterwards
+                            connectLock.lock();
                         }
                     }
                 }
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp
index ce15c7bc4e..bab161fc0a 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp
@@ -11,466 +11,469 @@
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Asset/AssetManager.h>
 
-namespace AZ
+namespace AZ::Data
 {
-    namespace Data
+    AssetContainer::AssetContainer(Asset<AssetData> rootAsset, const AssetLoadParameters& loadParams)
     {
-        AssetContainer::AssetContainer(Asset<AssetData> rootAsset, const AssetLoadParameters& loadParams)
-        {
-            m_rootAsset = AssetInternal::WeakAsset<AssetData>(rootAsset);
-            m_containerAssetId = m_rootAsset.GetId();
+        m_rootAsset = AssetInternal::WeakAsset<AssetData>(rootAsset);
+        m_containerAssetId = m_rootAsset.GetId();
 
-            AddDependentAssets(rootAsset, loadParams);
+        AddDependentAssets(rootAsset, loadParams);
+    }
+
+    AssetContainer::~AssetContainer()
+    {
+        // Validate that if the AssetManager is performing normal processing duties, the AssetContainer is only destroyed once all
+        // dependent asset loads have completed.
+        if (AssetManager::IsReady() && !AssetManager::Instance().ShouldCancelAllActiveJobs())
+        {
+            AZ_Assert(m_waitingCount == 0, "Container destroyed while dependent assets are still loading.  The dependent assets may "
+                "end up in a perpetual loading state if there is no top-level container signalling the completion of the full load.");
         }
 
-        AssetContainer::~AssetContainer()
-        {
-            // Validate that if the AssetManager is performing normal processing duties, the AssetContainer is only destroyed once all
-            // dependent asset loads have completed.
-            if (AssetManager::IsReady() && !AssetManager::Instance().ShouldCancelAllActiveJobs())
-            {
-                AZ_Assert(m_waitingCount == 0, "Container destroyed while dependent assets are still loading.  The dependent assets may "
-                    "end up in a perpetual loading state if there is no top-level container signalling the completion of the full load.");
-            }
+        AssetBus::MultiHandler::BusDisconnect();
+        AssetLoadBus::MultiHandler::BusDisconnect();
+    }
 
-            AssetBus::MultiHandler::BusDisconnect();
-            AssetLoadBus::MultiHandler::BusDisconnect();
+    AZStd::vector<AZStd::pair<AssetInfo, Asset<AssetData>>> AssetContainer::CreateAndQueueDependentAssets(
+        const AZStd::vector<AssetInfo>& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter)
+    {
+        AZStd::vector<AZStd::pair<AssetInfo, Asset<AssetData>>> dependencyAssets;
+
+        for (auto& thisInfo : dependencyInfoList)
+        {
+            auto dependentAsset = AssetManager::Instance().FindOrCreateAsset(
+                thisInfo.m_assetId, thisInfo.m_assetType, AZ::Data::AssetLoadBehavior::Default);
+
+            if (!dependentAsset || !dependentAsset.GetId().IsValid())
+            {
+                AZ_Warning("AssetContainer", false, "Dependency Asset %s (%s) was not found\n",
+                           thisInfo.m_assetId.ToString<AZStd::string>().c_str(), thisInfo.m_relativePath.c_str());
+                RemoveWaitingAsset(thisInfo.m_assetId);
+                continue;
+            }
+            dependencyAssets.emplace_back(thisInfo, AZStd::move(dependentAsset));
         }
 
-        void AssetContainer::AddDependentAssets(Asset<AssetData> rootAsset, const AssetLoadParameters& loadParams)
+        // Queue the loading of all of the dependent assets before loading the root asset.
+        for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets)
         {
-            AssetId rootAssetId = rootAsset.GetId();
-            AssetType rootAssetType = rootAsset.GetType();
+            // Queue each asset to load.
+            auto queuedDependentAsset = AssetManager::Instance().GetAssetInternal(
+                dependentAsset.GetId(), dependentAsset.GetType(),
+                AZ::Data::AssetLoadBehavior::Default, loadParamsCopyWithNoLoadingFilter,
+                dependentAssetInfo, HasPreloads(dependentAsset.GetId()));
 
-            // Every asset we're going to be waiting on a load for - the root and all valid dependencies
-            AZStd::vector<AssetId> waitingList;
-            waitingList.push_back(rootAssetId);
+            // Verify that the returned asset reference matches the one that we found or created and queued to load.
+            AZ_Assert(dependentAsset == queuedDependentAsset, "GetAssetInternal returned an unexpected asset reference for Asset %s",
+                      dependentAsset.GetId().ToString<AZStd::string>().c_str());
+        }
 
-            // Every asset dependency that we're aware of, whether or not it gets filtered out by the asset filter callback.
-            // This will be used at the point that asset references get serialized in to see whether or not we've received any
-            // unexpected assets that didn't appear in our asset catalog dependency list that need to be loaded anyways.
-            AZStd::vector<AssetId> handledAssetDependencyList;
+        return dependencyAssets;
+    }
 
-            // Cached AssetInfo to save another lookup inside Assetmanager
-            AZStd::vector<AssetInfo> dependencyInfoList;
-            Outcome<AZStd::vector<ProductDependency>, AZStd::string> getDependenciesResult = Failure(AZStd::string());
+    void AssetContainer::AddDependentAssets(Asset<AssetData> rootAsset, const AssetLoadParameters& loadParams)
+    {
+        AssetId rootAssetId = rootAsset.GetId();
+        AssetType rootAssetType = rootAsset.GetType();
 
-            // Track preloads in an additional list - they're in our waiting/dependencyInfo lists as well, but preloads require us to
-            // suppress emitting "AssetReady" until everything we care about in this context is ready
-            PreloadAssetListType preloadDependencies;
-            if (loadParams.m_dependencyRules == AssetDependencyLoadRules::UseLoadBehavior)
-            {
-                AZStd::unordered_set<AssetId> noloadDependencies;
-                AssetCatalogRequestBus::BroadcastResult(getDependenciesResult, &AssetCatalogRequestBus::Events::GetLoadBehaviorProductDependencies,
-                                                        rootAssetId, noloadDependencies, preloadDependencies);
-                if (!noloadDependencies.empty())
-                {
-                    AZStd::lock_guard<AZStd::recursive_mutex> dependencyLock(m_dependencyMutex);
-                    m_unloadedDependencies.insert(noloadDependencies.begin(), noloadDependencies.end());
-                }
-            }
-            else if (loadParams.m_dependencyRules == AssetDependencyLoadRules::LoadAll)
-            {
-                AssetCatalogRequestBus::BroadcastResult(getDependenciesResult, &AssetCatalogRequestBus::Events::GetAllProductDependencies, rootAssetId);
-            }
-            // Do as much validation of dependencies as we can before the AddWaitingAssets and GetAsset calls for dependencies below
-            if (getDependenciesResult.IsSuccess())
-            {
-                for (const auto& thisAsset : getDependenciesResult.GetValue())
-                {
-                    AssetInfo assetInfo;
-                    AssetCatalogRequestBus::BroadcastResult(assetInfo, &AssetCatalogRequestBus::Events::GetAssetInfoById, thisAsset.m_assetId);
+        // Every asset we're going to be waiting on a load for - the root and all valid dependencies
+        AZStd::vector<AssetId> waitingList;
+        waitingList.push_back(rootAssetId);
 
-                    // No matter whether or not the asset dependency is valid, loaded, or filtered out, mark it as successfully handled.
-                    // When we encounter the asset reference during serialization, we will know that it should intentionally be skipped.
-                    // Otherwise, it would be treated as a missing dependency and assert.
-                    handledAssetDependencyList.emplace_back(thisAsset.m_assetId);
+        // Every asset dependency that we're aware of, whether or not it gets filtered out by the asset filter callback.
+        // This will be used at the point that asset references get serialized in to see whether or not we've received any
+        // unexpected assets that didn't appear in our asset catalog dependency list that need to be loaded anyways.
+        AZStd::vector<AssetId> handledAssetDependencyList;
 
-                    if (!assetInfo.m_assetId.IsValid())
-                    {
-                        // Handlers may just not currently be around for a given asset type so we only warn here
-                        AZ_Warning("AssetContainer", false, "Asset %s (%s) references/depends on asset %s which does not exist in the catalog and cannot be loaded.",
-                            rootAsset.GetHint().c_str(),
-                            rootAssetId.ToString<AZStd::string>().c_str(),
-                            thisAsset.m_assetId.ToString<AZStd::string>().c_str());
-                        m_invalidDependencies++;
-                        continue;
-                    }
-                    if (assetInfo.m_assetId == rootAssetId)
-                    {
-                        // Circular dependencies in our graph need to be raised as errors as they could cause problems elsewhere
-                        AZ_Error("AssetContainer", false, "Circular dependency found under asset %s", rootAssetId.ToString<AZStd::string>().c_str());
-                        m_invalidDependencies++;
-                        continue;
-                    }
-                    if (!AssetManager::Instance().GetHandler(assetInfo.m_assetType))
-                    {
-                        // Handlers may just not currently be around for a given asset type so we only warn here
-                        m_invalidDependencies++;
-                        continue;
-                    }
-                    if (loadParams.m_assetLoadFilterCB)
-                    {
-                        if (!loadParams.m_assetLoadFilterCB({thisAsset.m_assetId, assetInfo.m_assetType,
-                            AZ::Data::ProductDependencyInfo::LoadBehaviorFromFlags(thisAsset.m_flags) }))
-                        {
-                            continue;
-                        }
-                    }
-                    dependencyInfoList.push_back(assetInfo);
-                }
-            }
-            for (auto& thisInfo : dependencyInfoList)
-            {
-                waitingList.push_back(thisInfo.m_assetId);
-            }
+        // Cached AssetInfo to save another lookup inside Assetmanager
+        AZStd::vector<AssetInfo> dependencyInfoList;
+        Outcome<AZStd::vector<ProductDependency>, AZStd::string> getDependenciesResult = Failure(AZStd::string());
 
-            // Add waiting assets ahead of time to hear signals for any which may already be loading
-            AddWaitingAssets(waitingList);
-            SetupPreloadLists(move(preloadDependencies), rootAssetId);
-
-            auto loadParamsCopyWithNoLoadingFilter = loadParams;
-
-            // All asset dependencies below the root asset should be provided by the asset catalog, and therefore should *not*
-            // get triggered to load when the asset reference is serialized in.  However, it's useful to detect, warn, and handle
-            // the case where the asset dependencies are NOT set up correctly.
-            loadParamsCopyWithNoLoadingFilter.m_assetLoadFilterCB = [handledAssetDependencyList](const AssetFilterInfo& filterInfo)
-            {
-                // NoLoad dependencies should always get filtered out and not loaded.
-                if (filterInfo.m_loadBehavior == AZ::Data::AssetLoadBehavior::NoLoad)
-                {
-                    return false;
-                }
-
-                // In the normal case, the dependent asset appears in the handled asset list, and we should return false so that
-                // the asset isn't attempted to be loaded, since the asset will already be triggered to get loaded or was possibly
-                // already filtered out by the load filter callback.
-                // In the error case, the asset dependencies haven't been produced by the builder correctly, so assets
-                // have shown up that the asset container hasn't triggered to load and isn't listening for.  Assert that this case
-                // has happened so that the builder for this asset type can be fixed.
-                // Ideally we would proceed forward and load them by returning "true", but the triggered load would use this lambda
-                // function as the asset load filter for that load as well, which isn't correct.  If we ever want to support that
-                // behavior, we would need to rework the way filters work as well as the code in AssetSerializer.cpp to pass down
-                // the loadParams.m_assetLoadFilterCB that was passed into the AddDependentAssets() methods to use as the dependent
-                // asset filter instead of this lambda function.
-                AZ_UNUSED(handledAssetDependencyList); // Prevent unused warning in release builds
-                AZ_Assert(AZStd::find(handledAssetDependencyList.begin(), handledAssetDependencyList.end(), filterInfo.m_assetId) !=
-                    handledAssetDependencyList.end(),
-                    "Dependent Asset ID (%s) is expected to load, but the Asset Catalog has no dependency recorded. "
-                    "Examine the asset builder for the asset relying on this to ensure it is generating the correct dependencies.",
-                    filterInfo.m_assetId.ToString<AZStd::string>().c_str());
-
-                // The dependent asset should have already been created and at least queued to load prior to reaching this point.
-                // The asset serializer needs to get a successful result from FindAsset(), or else our asset reference will fail
-                // to point to the asset data once it is loaded.
-                if (!Data::AssetManager::Instance().FindAsset(filterInfo.m_assetId, AZ::Data::AssetLoadBehavior::Default))
-                {
-                    AZ_Assert(!Data::AssetManager::Instance().FindAsset(filterInfo.m_assetId, AZ::Data::AssetLoadBehavior::Default),
-                        "Dependent Asset ID (%s) can't be found in the AssetManager, which means the asset referencing it has probably "
-                        "started loading before the dependent asset has been queued to load.  Verify that the asset dependencies have "
-                        "been created correctly for the parent asset.",
-                        filterInfo.m_assetId.ToString<AZStd::string>().c_str());
-                }
-
-                return false;
-            };
-
-            // This will contain the list of dependent assets that have been created (or found) and queued to load.
-            // We also keep a copy of the AssetInfo structure as a small optimization to avoid a redundant lookup in GetAssetInternal.
-            AZStd::vector<AZStd::pair<AssetInfo, Asset<AssetData>>> dependencyAssets;
-
-            // Make sure all the dependencies are created first before we try to load them.
-            // Since we've set the load filter to not load dependencies, we need to ensure all the assets are created beforehand
-            // so the dependencies can be hooked up as soon as each asset gets serialized in, even if they start getting serialized
-            // while we're still in the middle of triggering all of the asset loads below.
-            for (auto& thisInfo : dependencyInfoList)
-            {
-                auto dependentAsset = AssetManager::Instance().FindOrCreateAsset(
-                    thisInfo.m_assetId, thisInfo.m_assetType, AZ::Data::AssetLoadBehavior::Default);
-
-                if (!dependentAsset || !dependentAsset.GetId().IsValid())
-                {
-                    AZ_Warning("AssetContainer", false, "Dependency Asset %s (%s) was not found\n",
-                        thisInfo.m_assetId.ToString<AZStd::string>().c_str(), thisInfo.m_relativePath.c_str());
-                    RemoveWaitingAsset(thisInfo.m_assetId);
-                    continue;
-                }
-                dependencyAssets.emplace_back(thisInfo, AZStd::move(dependentAsset));
-            }
-
-            // Queue the loading of all of the dependent assets before loading the root asset.  
-            for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets)
-            {
-                // Queue each asset to load.
-                auto queuedDependentAsset = AssetManager::Instance().GetAssetInternal(
-                    dependentAsset.GetId(), dependentAsset.GetType(),
-                    AZ::Data::AssetLoadBehavior::Default, loadParamsCopyWithNoLoadingFilter,
-                    dependentAssetInfo, HasPreloads(dependentAsset.GetId()));
-
-                // Verify that the returned asset reference matches the one that we found or created and queued to load.
-                AZ_Assert(dependentAsset == queuedDependentAsset, "GetAssetInternal returned an unexpected asset reference for Asset %s",
-                    dependentAsset.GetId().ToString<AZStd::string>().c_str());
-            }
-
-            // Add all of the queued dependent assets as dependencies
+        // Track preloads in an additional list - they're in our waiting/dependencyInfo lists as well, but preloads require us to
+        // suppress emitting "AssetReady" until everything we care about in this context is ready
+        PreloadAssetListType preloadDependencies;
+        if (loadParams.m_dependencyRules == AssetDependencyLoadRules::UseLoadBehavior)
+        {
+            AZStd::unordered_set<AssetId> noloadDependencies;
+            AssetCatalogRequestBus::BroadcastResult(getDependenciesResult, &AssetCatalogRequestBus::Events::GetLoadBehaviorProductDependencies,
+                                                    rootAssetId, noloadDependencies, preloadDependencies);
+            if (!noloadDependencies.empty())
             {
                 AZStd::lock_guard<AZStd::recursive_mutex> dependencyLock(m_dependencyMutex);
-                for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets)
+                m_unloadedDependencies.insert(noloadDependencies.begin(), noloadDependencies.end());
+            }
+        }
+        else if (loadParams.m_dependencyRules == AssetDependencyLoadRules::LoadAll)
+        {
+            AssetCatalogRequestBus::BroadcastResult(getDependenciesResult, &AssetCatalogRequestBus::Events::GetAllProductDependencies, rootAssetId);
+        }
+        // Do as much validation of dependencies as we can before the AddWaitingAssets and GetAsset calls for dependencies below
+        if (getDependenciesResult.IsSuccess())
+        {
+            for (const auto& thisAsset : getDependenciesResult.GetValue())
+            {
+                AssetInfo assetInfo;
+                AssetCatalogRequestBus::BroadcastResult(assetInfo, &AssetCatalogRequestBus::Events::GetAssetInfoById, thisAsset.m_assetId);
+
+                // No matter whether or not the asset dependency is valid, loaded, or filtered out, mark it as successfully handled.
+                // When we encounter the asset reference during serialization, we will know that it should intentionally be skipped.
+                // Otherwise, it would be treated as a missing dependency and assert.
+                handledAssetDependencyList.emplace_back(thisAsset.m_assetId);
+
+                if (!assetInfo.m_assetId.IsValid())
                 {
-                    AddDependency(AZStd::move(dependentAsset));
+                    // Handlers may just not currently be around for a given asset type so we only warn here
+                    AZ_Warning("AssetContainer", false, "Asset %s (%s) references/depends on asset %s which does not exist in the catalog and cannot be loaded.",
+                        rootAsset.GetHint().c_str(),
+                        rootAssetId.ToString<AZStd::string>().c_str(),
+                        thisAsset.m_assetId.ToString<AZStd::string>().c_str());
+                    m_invalidDependencies++;
+                    continue;
                 }
+                if (assetInfo.m_assetId == rootAssetId)
+                {
+                    // Circular dependencies in our graph need to be raised as errors as they could cause problems elsewhere
+                    AZ_Error("AssetContainer", false, "Circular dependency found under asset %s", rootAssetId.ToString<AZStd::string>().c_str());
+                    m_invalidDependencies++;
+                    continue;
+                }
+                if (!AssetManager::Instance().GetHandler(assetInfo.m_assetType))
+                {
+                    // Handlers may just not currently be around for a given asset type so we only warn here
+                    m_invalidDependencies++;
+                    continue;
+                }
+                if (loadParams.m_assetLoadFilterCB)
+                {
+                    if (!loadParams.m_assetLoadFilterCB({thisAsset.m_assetId, assetInfo.m_assetType,
+                        AZ::Data::ProductDependencyInfo::LoadBehaviorFromFlags(thisAsset.m_flags) }))
+                    {
+                        continue;
+                    }
+                }
+                dependencyInfoList.push_back(assetInfo);
+            }
+        }
+        for (auto& thisInfo : dependencyInfoList)
+        {
+            waitingList.push_back(thisInfo.m_assetId);
+        }
+
+        // Add waiting assets ahead of time to hear signals for any which may already be loading
+        AddWaitingAssets(waitingList);
+        SetupPreloadLists(move(preloadDependencies), rootAssetId);
+
+        auto loadParamsCopyWithNoLoadingFilter = loadParams;
+
+        // All asset dependencies below the root asset should be provided by the asset catalog, and therefore should *not*
+        // get triggered to load when the asset reference is serialized in.  However, it's useful to detect, warn, and handle
+        // the case where the asset dependencies are NOT set up correctly.
+        loadParamsCopyWithNoLoadingFilter.m_assetLoadFilterCB = [handledAssetDependencyList](const AssetFilterInfo& filterInfo)
+        {
+            // NoLoad dependencies should always get filtered out and not loaded.
+            if (filterInfo.m_loadBehavior == AZ::Data::AssetLoadBehavior::NoLoad)
+            {
+                return false;
             }
 
-            // Finally, after creating and queueing the dependent assets, queue the root asset.  This is saved until last to ensure that
-            // it doesn't have any chance of serializing in until after all the dependent assets have been queued for loading and have
-            // been added to the list of dependencies.
-            auto thisAsset = AssetManager::Instance().GetAssetInternal(rootAssetId, rootAssetType, rootAsset.GetAutoLoadBehavior(),
-                loadParamsCopyWithNoLoadingFilter, AssetInfo(), HasPreloads(rootAssetId));
+            // In the normal case, the dependent asset appears in the handled asset list, and we should return false so that
+            // the asset isn't attempted to be loaded, since the asset will already be triggered to get loaded or was possibly
+            // already filtered out by the load filter callback.
+            // In the error case, the asset dependencies haven't been produced by the builder correctly, so assets
+            // have shown up that the asset container hasn't triggered to load and isn't listening for.  Assert that this case
+            // has happened so that the builder for this asset type can be fixed.
+            // Ideally we would proceed forward and load them by returning "true", but the triggered load would use this lambda
+            // function as the asset load filter for that load as well, which isn't correct.  If we ever want to support that
+            // behavior, we would need to rework the way filters work as well as the code in AssetSerializer.cpp to pass down
+            // the loadParams.m_assetLoadFilterCB that was passed into the AddDependentAssets() methods to use as the dependent
+            // asset filter instead of this lambda function.
+            AZ_UNUSED(handledAssetDependencyList); // Prevent unused warning in release builds
+            AZ_Assert(AZStd::find(handledAssetDependencyList.begin(), handledAssetDependencyList.end(), filterInfo.m_assetId) !=
+                handledAssetDependencyList.end(),
+                "Dependent Asset ID (%s) is expected to load, but the Asset Catalog has no dependency recorded. "
+                "Examine the asset builder for the asset relying on this to ensure it is generating the correct dependencies.",
+                filterInfo.m_assetId.ToString<AZStd::string>().c_str());
 
-            if (!thisAsset)
+            // The dependent asset should have already been created and at least queued to load prior to reaching this point.
+            // The asset serializer needs to get a successful result from FindAsset(), or else our asset reference will fail
+            // to point to the asset data once it is loaded.
+            if (!Data::AssetManager::Instance().FindAsset(filterInfo.m_assetId, AZ::Data::AssetLoadBehavior::Default))
             {
-                AZ_Assert(false, "Root asset with id %s failed to load, asset container is invalid.",
-                    rootAssetId.ToString<AZStd::string>().c_str());
-                ClearWaitingAssets();
-                // initComplete remains false, because we have failed to initialize successfully.
+                AZ_Assert(!Data::AssetManager::Instance().FindAsset(filterInfo.m_assetId, AZ::Data::AssetLoadBehavior::Default),
+                    "Dependent Asset ID (%s) can't be found in the AssetManager, which means the asset referencing it has probably "
+                    "started loading before the dependent asset has been queued to load.  Verify that the asset dependencies have "
+                    "been created correctly for the parent asset.",
+                    filterInfo.m_assetId.ToString<AZStd::string>().c_str());
+            }
+
+            return false;
+        };
+
+        // This will contain the list of dependent assets that have been created (or found) and queued to load.
+        // We also keep a copy of the AssetInfo structure as a small optimization to avoid a redundant lookup in GetAssetInternal.
+        AZStd::vector<AZStd::pair<AssetInfo, Asset<AssetData>>> dependencyAssets;
+
+        // Make sure all the dependencies are created first before we try to load them.
+        // Since we've set the load filter to not load dependencies, we need to ensure all the assets are created beforehand
+        // so the dependencies can be hooked up as soon as each asset gets serialized in, even if they start getting serialized
+        // while we're still in the middle of triggering all of the asset loads below.
+        dependencyAssets = CreateAndQueueDependentAssets(dependencyInfoList, loadParamsCopyWithNoLoadingFilter);
+
+        // Add all of the queued dependent assets as dependencies
+        {
+            AZStd::lock_guard<AZStd::recursive_mutex> dependencyLock(m_dependencyMutex);
+            for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets)
+            {
+                AddDependency(AZStd::move(dependentAsset));
+            }
+        }
+
+        // Finally, after creating and queueing the dependent assets, queue the root asset.  This is saved until last to ensure that
+        // it doesn't have any chance of serializing in until after all the dependent assets have been queued for loading and have
+        // been added to the list of dependencies.
+        auto thisAsset = AssetManager::Instance().GetAssetInternal(rootAssetId, rootAssetType, rootAsset.GetAutoLoadBehavior(),
+            loadParamsCopyWithNoLoadingFilter, AssetInfo(), HasPreloads(rootAssetId));
+
+        if (!thisAsset)
+        {
+            AZ_Assert(false, "Root asset with id %s failed to load, asset container is invalid.",
+                rootAssetId.ToString<AZStd::string>().c_str());
+            ClearWaitingAssets();
+            // initComplete remains false, because we have failed to initialize successfully.
+            return;
+        }
+
+        m_initComplete = true;
+
+        // *After* setting initComplete to true, check to see if the assets are already ready.
+        // This check needs to wait until after setting initComplete because if they *are* ready, we want the final call to
+        // RemoveWaitingAsset to trigger the OnAssetContainerReady/Canceled event.  If we call CheckReady() *before* setting
+        // initComplete, if all the assets are ready, the event will never get triggered.
+        CheckReady();
+    }
+
+    bool AssetContainer::IsReady() const
+    {
+        return (m_rootAsset && m_waitingCount == 0);
+    }
+
+    bool AssetContainer::IsLoading() const
+    {
+        return (m_rootAsset || m_waitingCount);
+    }
+
+    bool AssetContainer::IsValid() const
+    {
+        return (m_containerAssetId.IsValid() && m_initComplete && m_rootAsset);
+    }
+
+    void AssetContainer::CheckReady()
+    {
+        if (!m_dependencies.empty())
+        {
+            for (auto& [assetId, dependentAsset] : m_dependencies)
+            {
+                if (dependentAsset->IsReady() || dependentAsset->IsError())
+                {
+                    HandleReadyAsset(dependentAsset);
+                }
+            }
+        }
+        if (auto asset = m_rootAsset.GetStrongReference(); asset.IsReady() || asset.IsError())
+        {
+            HandleReadyAsset(asset);
+        }
+    }
+
+    Asset<AssetData> AssetContainer::GetRootAsset()
+    {
+        return m_rootAsset.GetStrongReference();
+    }
+
+    AssetId AssetContainer::GetContainerAssetId()
+    {
+        return m_containerAssetId;
+    }
+
+    void AssetContainer::ClearRootAsset()
+    {
+        AssetId rootId = m_rootAsset.GetId();
+
+        {
+            AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
+
+            // Erase the entry in the preloadWaitList for the root asset if one exists.
+            m_preloadWaitList.erase(rootId);
+
+            // It's possible that the root asset has preload dependencies, so make sure to check the preload list and remove
+            // the entry for the root asset if it has one.
+            auto rootAssetPreloadIter = m_preloadList.find(rootId);
+            if (rootAssetPreloadIter != m_preloadList.end())
+            {
+                // Since the root asset has a preload list, that means the preload wait list will also have references to the
+                // root asset.  (The preload wait list is a list of assets waiting on a preload asset to finish)  Clear those
+                // out as well.
+                auto waitAssetSet = rootAssetPreloadIter->second;
+                for (auto& waitId : waitAssetSet)
+                {
+                    auto waitAssetIter = m_preloadWaitList.find(waitId);
+                    if (waitAssetIter != m_preloadWaitList.end())
+                    {
+                        waitAssetIter->second.erase(rootId);
+                    }
+                }
+
+                m_preloadList.erase(rootAssetPreloadIter);
+            }
+        }
+
+        // Clear out the root asset before removing it from the waiting list to ensure that we trigger an "OnAssetContainerCanceled"
+        // event instead of "OnAssetContainerReady".
+        m_rootAsset = {};
+        RemoveWaitingAsset(rootId);
+
+    }
+
+    void AssetContainer::AddDependency(const Asset<AssetData>& newDependency)
+    {
+        m_dependencies[newDependency->GetId()] = newDependency;
+    }
+    void AssetContainer::AddDependency(Asset<AssetData>&& newDependency)
+    {
+        m_dependencies[newDependency->GetId()] = AZStd::move(newDependency);
+    }
+
+    void AssetContainer::OnAssetReady(Asset<AssetData> asset)
+    {
+        HandleReadyAsset(asset);
+    }
+
+    void AssetContainer::OnAssetError(Asset<AssetData> asset)
+    {
+        AZ_Warning("AssetContainer", false, "Error loading asset %s", asset->GetId().ToString<AZStd::string>().c_str());
+        HandleReadyAsset(asset);
+    }
+
+    void AssetContainer::HandleReadyAsset(Asset<AssetData> asset)
+    {
+        // Wait until we've finished initialization before allowing this
+        // If a ready event happens before we've gotten all the maps/structures set up, there may be some missing data
+        // which can lead to a crash
+        // We'll go through and check the ready status of every dependency immediately after finishing initialization anyway
+        if (m_initComplete)
+        {
+        RemoveFromAllWaitingPreloads(asset->GetId());
+        RemoveWaitingAsset(asset->GetId());
+    }
+    }
+
+    void AssetContainer::OnAssetDataLoaded(Asset<AssetData> asset)
+    {
+        // Remove only from this asset's waiting list.  Anything else should
+        // listen for OnAssetReady as the true signal.  This is essentially removing the
+        // "marker" we placed in SetupPreloads that we need to wait for our own data
+        RemoveFromWaitingPreloads(asset->GetId(), asset->GetId());
+    }
+
+    void AssetContainer::RemoveFromWaitingPreloads(const AssetId& waiterId, const AssetId& preloadID)
+    {
+        {
+            AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
+
+            auto remainingPreloadIter = m_preloadList.find(waiterId);
+            if (remainingPreloadIter == m_preloadList.end())
+            {
+                // If we got here without an entry on the preload list, it probably means this asset was triggered to load multiple
+                // times, some with dependencies and some without.  To ensure that we don't disturb the loads that expect the
+                // dependencies, just silently return and don't treat the asset as finished loading.  We'll rely on the other load
+                // to send an OnAssetReady() whenever its expected dependencies are met.
                 return;
             }
-
-            m_initComplete = true;
-
-            // *After* setting initComplete to true, check to see if the assets are already ready.
-            // This check needs to wait until after setting initComplete because if they *are* ready, we want the final call to
-            // RemoveWaitingAsset to trigger the OnAssetContainerReady/Canceled event.  If we call CheckReady() *before* setting
-            // initComplete, if all the assets are ready, the event will never get triggered.
-            CheckReady();
-        }
-
-        bool AssetContainer::IsReady() const
-        {
-            return (m_rootAsset && m_waitingCount == 0);
-        }
-
-        bool AssetContainer::IsLoading() const
-        {
-            return (m_rootAsset || m_waitingCount);
-        }
-
-        bool AssetContainer::IsValid() const
-        {
-            return (m_containerAssetId.IsValid() && m_initComplete && m_rootAsset);
-        }
-
-        void AssetContainer::CheckReady()
-        {
-            if (!m_dependencies.empty())
+            if (!remainingPreloadIter->second.erase(preloadID))
             {
-                for (auto& [assetId, dependentAsset] : m_dependencies)
-                {
-                    if (dependentAsset->IsReady() || dependentAsset->IsError())
-                    {
-                        HandleReadyAsset(dependentAsset);
-                    }
-                }
+                AZ_Warning("AssetContainer", !m_initComplete, "Couldn't remove %s from waiting list of %s", preloadID.ToString<AZStd::string>().c_str(), waiterId.ToString<AZStd::string>().c_str());
+                return;
             }
-            if (auto asset = m_rootAsset.GetStrongReference(); asset.IsReady() || asset.IsError())
+            if (!remainingPreloadIter->second.empty())
             {
-                HandleReadyAsset(asset);
+                return;
             }
         }
+        auto thisAsset = GetAssetData(waiterId);
+        AssetManager::Instance().ValidateAndPostLoad(thisAsset, true, false, nullptr);
+    }
 
-        Asset<AssetData> AssetContainer::GetRootAsset()
+    void AssetContainer::RemoveFromAllWaitingPreloads(const AssetId& thisId)
+    {
+        AZStd::unordered_set<AssetId> checkList;
         {
-            return m_rootAsset.GetStrongReference();
-        }
-
-        AssetId AssetContainer::GetContainerAssetId()
-        {
-            return m_containerAssetId;
-        }
-
-        void AssetContainer::ClearRootAsset()
-        {
-            AssetId rootId = m_rootAsset.GetId();
-
-            {
-                AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
-
-                // Erase the entry in the preloadWaitList for the root asset if one exists.
-                m_preloadWaitList.erase(rootId);
-
-                // It's possible that the root asset has preload dependencies, so make sure to check the preload list and remove
-                // the entry for the root asset if it has one.
-                auto rootAssetPreloadIter = m_preloadList.find(rootId);
-                if (rootAssetPreloadIter != m_preloadList.end())
-                {
-                    // Since the root asset has a preload list, that means the preload wait list will also have references to the
-                    // root asset.  (The preload wait list is a list of assets waiting on a preload asset to finish)  Clear those
-                    // out as well.
-                    auto waitAssetSet = rootAssetPreloadIter->second;
-                    for (auto& waitId : waitAssetSet)
-                    {
-                        auto waitAssetIter = m_preloadWaitList.find(waitId);
-                        if (waitAssetIter != m_preloadWaitList.end())
-                        {
-                            waitAssetIter->second.erase(rootId);
-                        }
-                    }
-
-                    m_preloadList.erase(rootAssetPreloadIter);
-                }
-            }
-
-            // Clear out the root asset before removing it from the waiting list to ensure that we trigger an "OnAssetContainerCanceled"
-            // event instead of "OnAssetContainerReady".
-            m_rootAsset = {};
-            RemoveWaitingAsset(rootId);
-
-        }
-
-        void AssetContainer::AddDependency(const Asset<AssetData>& newDependency)
-        {
-            m_dependencies[newDependency->GetId()] = newDependency;
-        }
-        void AssetContainer::AddDependency(Asset<AssetData>&& newDependency)
-        {
-            m_dependencies[newDependency->GetId()] = AZStd::move(newDependency);
-        }
-
-        void AssetContainer::OnAssetReady(Asset<AssetData> asset)
-        {
-            HandleReadyAsset(asset);
-        }
-
-        void AssetContainer::OnAssetError(Asset<AssetData> asset)
-        {
-            AZ_Warning("AssetContainer", false, "Error loading asset %s", asset->GetId().ToString<AZStd::string>().c_str());
-            HandleReadyAsset(asset);
-        }
-
-        void AssetContainer::HandleReadyAsset(Asset<AssetData> asset)
-        {
-            RemoveFromAllWaitingPreloads(asset->GetId());
-            RemoveWaitingAsset(asset->GetId());
-        }
-
-        void AssetContainer::OnAssetDataLoaded(Asset<AssetData> asset)
-        {
-            // Remove only from this asset's waiting list.  Anything else should
-            // listen for OnAssetReady as the true signal.  This is essentially removing the
-            // "marker" we placed in SetupPreloads that we need to wait for our own data
-            RemoveFromWaitingPreloads(asset->GetId(), asset->GetId());
-        }
-
-        void AssetContainer::RemoveFromWaitingPreloads(const AssetId& waiterId, const AssetId& preloadID)
-        {
-            {
-                AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
-
-                auto remainingPreloadIter = m_preloadList.find(waiterId);
-                if (remainingPreloadIter == m_preloadList.end())
-                {
-                    // If we got here without an entry on the preload list, it probably means this asset was triggered to load multiple
-                    // times, some with dependencies and some without.  To ensure that we don't disturb the loads that expect the
-                    // dependencies, just silently return and don't treat the asset as finished loading.  We'll rely on the other load
-                    // to send an OnAssetReady() whenever its expected dependencies are met.
-                    return;
-                }
-                if (!remainingPreloadIter->second.erase(preloadID))
-                {
-                    AZ_Warning("AssetContainer", !m_initComplete, "Couldn't remove %s from waiting list of %s", preloadID.ToString<AZStd::string>().c_str(), waiterId.ToString<AZStd::string>().c_str());
-                    return;
-                }
-                if (!remainingPreloadIter->second.empty())
-                {
-                    return;
-                }
-            }
-            auto thisAsset = GetAssetData(waiterId);
-            AssetManager::Instance().ValidateAndPostLoad(thisAsset, true, false, nullptr);
-        }
-
-        void AssetContainer::RemoveFromAllWaitingPreloads(const AssetId& thisId) 
-        {
-            AZStd::unordered_set<AssetId> checkList;
-            {
-                AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
-
-                auto waitingList = m_preloadWaitList.find(thisId);
-                if (waitingList != m_preloadWaitList.end())
-                {
-                    checkList = move(waitingList->second);
-                    m_preloadWaitList.erase(waitingList);
-                }
-            }
-            for (auto& thisDepId : checkList)
-            {
-                if (thisDepId != thisId)
-                {
-                    RemoveFromWaitingPreloads(thisDepId, thisId);
-                }
-            }
-        }
-
-        void AssetContainer::ClearWaitingAssets()
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
-            m_waitingCount = 0;
-            for (auto& thisAsset : m_waitingAssets)
-            {
-                AssetBus::MultiHandler::BusDisconnect(thisAsset);
-            }
-            m_waitingAssets.clear();
-        }
-
-        void AssetContainer::ListWaitingAssets() const
-        {
-#if defined(AZ_ENABLE_TRACING)
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
-            AZ_TracePrintf("AssetContainer", "Waiting on assets:\n");
-            for (auto& thisAsset : m_waitingAssets)
-            {
-                AZ_TracePrintf("AssetContainer", "  %s\n",thisAsset.ToString<AZStd::string>().c_str());
-            }
-#endif
-        }
-
-        void AssetContainer::ListWaitingPreloads([[maybe_unused]] const AssetId& assetId) const
-        {
-#if defined(AZ_ENABLE_TRACING)
             AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
-            auto preloadEntry = m_preloadList.find(assetId);
-            if (preloadEntry != m_preloadList.end())
+
+            auto waitingList = m_preloadWaitList.find(thisId);
+            if (waitingList != m_preloadWaitList.end())
             {
-                AZ_TracePrintf("AssetContainer", "%s waiting on preloads : \n",assetId.ToString<AZStd::string>().c_str());
-                for (auto& thisId : preloadEntry->second)
-                {
-                    AZ_TracePrintf("AssetContainer", "  %s\n",thisId.ToString<AZStd::string>().c_str());
-                }
+                checkList = move(waitingList->second);
+                m_preloadWaitList.erase(waitingList);
             }
-            else
+        }
+        for (auto& thisDepId : checkList)
+        {
+            if (thisDepId != thisId)
             {
-                AZ_TracePrintf("AssetContainer", "%s isn't waiting on any preloads:\n", assetId.ToString<AZStd::string>().c_str());
+                RemoveFromWaitingPreloads(thisDepId, thisId);
             }
+        }
+    }
+
+    void AssetContainer::ClearWaitingAssets()
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
+        m_waitingCount = 0;
+        for (auto& thisAsset : m_waitingAssets)
+        {
+            AssetBus::MultiHandler::BusDisconnect(thisAsset);
+        }
+        m_waitingAssets.clear();
+    }
+
+    void AssetContainer::ListWaitingAssets() const
+    {
+#if defined(AZ_ENABLE_TRACING)
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
+        AZ_TracePrintf("AssetContainer", "Waiting on assets:\n");
+        for (auto& thisAsset : m_waitingAssets)
+        {
+            AZ_TracePrintf("AssetContainer", "  %s\n",thisAsset.ToString<AZStd::string>().c_str());
+        }
 #endif
-        }
+    }
 
-        void AssetContainer::AddWaitingAssets(const AZStd::vector<AssetId>& assetList)
+    void AssetContainer::ListWaitingPreloads([[maybe_unused]] const AssetId& assetId) const
+    {
+#if defined(AZ_ENABLE_TRACING)
+        AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
+        auto preloadEntry = m_preloadList.find(assetId);
+        if (preloadEntry != m_preloadList.end())
         {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
-            for (auto& thisAsset : assetList)
+            AZ_TracePrintf("AssetContainer", "%s waiting on preloads : \n",assetId.ToString<AZStd::string>().c_str());
+            for (auto& thisId : preloadEntry->second)
             {
-                if (m_waitingAssets.insert(thisAsset).second)
-                {
-                    ++m_waitingCount;
-                    AssetBus::MultiHandler::BusConnect(thisAsset);
-                    AssetLoadBus::MultiHandler::BusConnect(thisAsset);
-                }
+                AZ_TracePrintf("AssetContainer", "  %s\n",thisId.ToString<AZStd::string>().c_str());
             }
         }
-
-        void AssetContainer::AddWaitingAsset(const AssetId& thisAsset)
+        else
+        {
+            AZ_TracePrintf("AssetContainer", "%s isn't waiting on any preloads:\n", assetId.ToString<AZStd::string>().c_str());
+        }
+#endif
+    }
+
+    void AssetContainer::AddWaitingAssets(const AZStd::vector<AssetId>& assetList)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
+        for (auto& thisAsset : assetList)
         {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
             if (m_waitingAssets.insert(thisAsset).second)
             {
                 ++m_waitingCount;
@@ -478,196 +481,207 @@ namespace AZ
                 AssetLoadBus::MultiHandler::BusConnect(thisAsset);
             }
         }
+    }
 
-        void AssetContainer::RemoveWaitingAsset(const AssetId& thisAsset)
+    void AssetContainer::AddWaitingAsset(const AssetId& thisAsset)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
+        if (m_waitingAssets.insert(thisAsset).second)
         {
-            bool allReady{ false };
-            {
-                bool disconnectEbus = false;
+            ++m_waitingCount;
+            AssetBus::MultiHandler::BusConnect(thisAsset);
+            AssetLoadBus::MultiHandler::BusConnect(thisAsset);
+        }
+    }
 
-                { // Intentionally limiting lock scope
-                    AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
-                    // If we're trying to remove something already removed, just ignore it
-                    if (m_waitingAssets.erase(thisAsset))
-                    {
-                        m_waitingCount -= 1;
-                        disconnectEbus = true;
+    void AssetContainer::RemoveWaitingAsset(const AssetId& thisAsset)
+    {
+        bool allReady{ false };
+        {
+            bool disconnectEbus = false;
 
-                    }
-                    if (m_waitingAssets.empty())
-                    {
-                        allReady = true;
-                    }
-                }
-
-                if(disconnectEbus)
+            { // Intentionally limiting lock scope
+                AZStd::lock_guard<AZStd::recursive_mutex> lock(m_readyMutex);
+                // If we're trying to remove something already removed, just ignore it
+                if (m_waitingAssets.erase(thisAsset))
                 {
-                    AssetBus::MultiHandler::BusDisconnect(thisAsset);
-                    AssetLoadBus::MultiHandler::BusDisconnect(thisAsset);
+                    m_waitingCount -= 1;
+                    disconnectEbus = true;
+
+                }
+                if (m_waitingAssets.empty())
+                {
+                    allReady = true;
                 }
             }
 
-            // If there are no assets left to be loaded, trigger the final AssetContainer notification (ready or canceled).
-            // We guard against prematurely sending it (m_initComplete) because it's possible for assets to get removed from our waiting
-            // list *while* we're still building up the list, so the list would appear to be empty too soon.
-            // We also guard against sending it multiple times (m_finalNotificationSent), because in some error conditions, it may be
-            // possible to try to remove the same asset multiple times, which if it's the last asset, it could trigger multiple
-            // notifications.
-            if (allReady && m_initComplete && !m_finalNotificationSent)
+            if(disconnectEbus)
             {
-                m_finalNotificationSent = true;
-                if (m_rootAsset)
-                {
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetContainerReady, this);
-                }
-                else
-                {
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetContainerCanceled, this);
-                }
+                AssetBus::MultiHandler::BusDisconnect(thisAsset);
+                AssetLoadBus::MultiHandler::BusDisconnect(thisAsset);
             }
         }
 
-        AssetContainer::operator bool() const
+        // If there are no assets left to be loaded, trigger the final AssetContainer notification (ready or canceled).
+        // We guard against prematurely sending it (m_initComplete) because it's possible for assets to get removed from our waiting
+        // list *while* we're still building up the list, so the list would appear to be empty too soon.
+        // We also guard against sending it multiple times (m_finalNotificationSent), because in some error conditions, it may be
+        // possible to try to remove the same asset multiple times, which if it's the last asset, it could trigger multiple
+        // notifications.
+        if (allReady && m_initComplete && !m_finalNotificationSent)
         {
-            return m_rootAsset ? true : false;
-        }
-
-        const AssetContainer::DependencyList& AssetContainer::GetDependencies() const
-        {
-            return m_dependencies;
-        }
-
-        const AZStd::unordered_set<AssetId>& AssetContainer::GetUnloadedDependencies() const
-        {
-            return m_unloadedDependencies;
-        }
-
-        void AssetContainer::SetupPreloadLists(PreloadAssetListType&& preloadList, const AssetId& rootAssetId)
-        {
-            if (!preloadList.empty())
+            m_finalNotificationSent = true;
+            if (m_rootAsset)
             {
-                // This method can be entered as additional NoLoad dependency groups are loaded - the container could
-                // be in the middle of loading so we need to grab both mutexes.  
-                AZStd::scoped_lock<AZStd::recursive_mutex, AZStd::recursive_mutex> lock(m_readyMutex, m_preloadMutex);
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetContainerReady, this);
+            }
+            else
+            {
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetContainerCanceled, this);
+            }
+        }
+    }
 
-                for (auto thisListPair = preloadList.begin(); thisListPair != preloadList.end();)
+    AssetContainer::operator bool() const
+    {
+        return m_rootAsset ? true : false;
+    }
+
+    const AssetContainer::DependencyList& AssetContainer::GetDependencies() const
+    {
+        return m_dependencies;
+    }
+
+    const AZStd::unordered_set<AssetId>& AssetContainer::GetUnloadedDependencies() const
+    {
+        return m_unloadedDependencies;
+    }
+
+    void AssetContainer::SetupPreloadLists(PreloadAssetListType&& preloadList, const AssetId& rootAssetId)
+    {
+        if (!preloadList.empty())
+        {
+            // This method can be entered as additional NoLoad dependency groups are loaded - the container could
+            // be in the middle of loading so we need to grab both mutexes.
+            AZStd::scoped_lock<AZStd::recursive_mutex, AZStd::recursive_mutex> lock(m_readyMutex, m_preloadMutex);
+
+            for (auto thisListPair = preloadList.begin(); thisListPair != preloadList.end();)
+            {
+                // We only should add ourselves if we have another valid preload we're waiting on
+                bool foundAsset{ false };
+                // It's possible this set of preload dependencies was culled out by lack of asset handler
+                // Or filtering rules.  This is not an error, we should just remove it from the list of
+                // Preloads we're waiting on
+                if (!m_waitingAssets.count(thisListPair->first))
                 {
-                    // We only should add ourselves if we have another valid preload we're waiting on
-                    bool foundAsset{ false };
-                    // It's possible this set of preload dependencies was culled out by lack of asset handler
-                    // Or filtering rules.  This is not an error, we should just remove it from the list of
-                    // Preloads we're waiting on
-                    if (!m_waitingAssets.count(thisListPair->first))
+                    thisListPair = preloadList.erase(thisListPair);
+                    continue;
+                }
+                for (auto thisAsset = thisListPair->second.begin(); thisAsset != thisListPair->second.end();)
+                {
+                    // These are data errors.  We'll emit the error but carry on.  The container
+                    // will load the assets but won't/can't create a circular preload dependency chain
+                    if (*thisAsset == rootAssetId)
                     {
-                        thisListPair = preloadList.erase(thisListPair);
+                        AZ_Error("AssetContainer", false, "Circular preload dependency found - %s has a preload"
+                            "dependency back to root %s\n",
+                            thisListPair->first.ToString<AZStd::string>().c_str(),
+                            rootAssetId.ToString<AZStd::string>().c_str());
+                        thisAsset = thisListPair->second.erase(thisAsset);
                         continue;
                     }
-                    for (auto thisAsset = thisListPair->second.begin(); thisAsset != thisListPair->second.end();)
+                    else if (*thisAsset == thisListPair->first)
                     {
-                        // These are data errors.  We'll emit the error but carry on.  The container
-                        // will load the assets but won't/can't create a circular preload dependency chain
-                        if (*thisAsset == rootAssetId)
-                        {
-                            AZ_Error("AssetContainer", false, "Circular preload dependency found - %s has a preload" 
-                                "dependency back to root %s\n",
-                                thisListPair->first.ToString<AZStd::string>().c_str(),
-                                rootAssetId.ToString<AZStd::string>().c_str());
-                            thisAsset = thisListPair->second.erase(thisAsset);
-                            continue;
-                        }
-                        else if (*thisAsset == thisListPair->first)
-                        {
-                            AZ_Error("AssetContainer", false, "Circular preload dependency found - Root asset %s has a preload"
-                                "dependency on %s which depends back back to itself\n",
-                                rootAssetId.ToString<AZStd::string>().c_str(),
-                                thisListPair->first.ToString<AZStd::string>().c_str());
-                            thisAsset = thisListPair->second.erase(thisAsset);
-                            continue;
-                        }
-                        else if (m_preloadWaitList.count(thisListPair->first) && m_preloadWaitList[thisListPair->first].count(*thisAsset))
-                        {
-                            AZ_Error("AssetContainer", false, "Circular dependency found - Root asset %s has a preload"
-                                "dependency on %s which has a circular dependency with %s\n",
-                                rootAssetId.ToString<AZStd::string>().c_str(),
-                                thisListPair->first.ToString<AZStd::string>().c_str(),
-                                thisAsset->ToString<AZStd::string>().c_str());
-                            thisAsset = thisListPair->second.erase(thisAsset);
-                            continue;
-                        }
-                        else if (m_waitingAssets.count(*thisAsset))
-                        {
-                            foundAsset = true;
-                            m_preloadWaitList[*thisAsset].insert(thisListPair->first);
-                            ++thisAsset;
-                        }
-                        else
-                        {
-                            // This particular preload dependency of this asset was culled
-                            // similar to the case above this can be due to no established asset handler
-                            // or filtering rules.  We'll just erase the entry because we're not loading this
-                            thisAsset = thisListPair->second.erase(thisAsset);
-                            continue;
-                        }
+                        AZ_Error("AssetContainer", false, "Circular preload dependency found - Root asset %s has a preload"
+                            "dependency on %s which depends back back to itself\n",
+                            rootAssetId.ToString<AZStd::string>().c_str(),
+                            thisListPair->first.ToString<AZStd::string>().c_str());
+                        thisAsset = thisListPair->second.erase(thisAsset);
+                        continue;
                     }
-                    if (foundAsset)
+                    else if (m_preloadWaitList.count(thisListPair->first) && m_preloadWaitList[thisListPair->first].count(*thisAsset))
                     {
-                        // We've established that this asset has at least one preload dependency it needs to wait on
-                        // so we additionally add the waiting asset as its own preload so all of our "waiting assets"
-                        // are managed in the same list.  We can't consider this asset to be "ready" until all
-                        // of its preloads are ready and it has been loaded.  It will request an OnAssetDataLoaded
-                        // notification from AssetManager rather than an OnAssetReady because of these additional dependencies.
-                        thisListPair->second.insert(thisListPair->first);
-                        m_preloadWaitList[thisListPair->first].insert(thisListPair->first);
+                        AZ_Error("AssetContainer", false, "Circular dependency found - Root asset %s has a preload"
+                            "dependency on %s which has a circular dependency with %s\n",
+                            rootAssetId.ToString<AZStd::string>().c_str(),
+                            thisListPair->first.ToString<AZStd::string>().c_str(),
+                            thisAsset->ToString<AZStd::string>().c_str());
+                        thisAsset = thisListPair->second.erase(thisAsset);
+                        continue;
+                    }
+                    else if (m_waitingAssets.count(*thisAsset))
+                    {
+                        foundAsset = true;
+                        m_preloadWaitList[*thisAsset].insert(thisListPair->first);
+                        ++thisAsset;
+                    }
+                    else
+                    {
+                        // This particular preload dependency of this asset was culled
+                        // similar to the case above this can be due to no established asset handler
+                        // or filtering rules.  We'll just erase the entry because we're not loading this
+                        thisAsset = thisListPair->second.erase(thisAsset);
+                        continue;
                     }
-                    ++thisListPair;
                 }
-                for(auto& thisList : preloadList)
+                if (foundAsset)
                 {
-                    // Only save the entry to the final preload list if it has at least one dependent asset still remaining after
-                    // the checks above.
-                    if (!thisList.second.empty())
-                    {
-                        m_preloadList[thisList.first].insert(thisList.second.begin(), thisList.second.end());
-                    }
+                    // We've established that this asset has at least one preload dependency it needs to wait on
+                    // so we additionally add the waiting asset as its own preload so all of our "waiting assets"
+                    // are managed in the same list.  We can't consider this asset to be "ready" until all
+                    // of its preloads are ready and it has been loaded.  It will request an OnAssetDataLoaded
+                    // notification from AssetManager rather than an OnAssetReady because of these additional dependencies.
+                    thisListPair->second.insert(thisListPair->first);
+                    m_preloadWaitList[thisListPair->first].insert(thisListPair->first);
+                }
+                ++thisListPair;
+            }
+            for(auto& thisList : preloadList)
+            {
+                // Only save the entry to the final preload list if it has at least one dependent asset still remaining after
+                // the checks above.
+                if (!thisList.second.empty())
+                {
+                    m_preloadList[thisList.first].insert(thisList.second.begin(), thisList.second.end());
                 }
             }
         }
+    }
 
-        bool AssetContainer::HasPreloads(const AssetId& assetId) const
+    bool AssetContainer::HasPreloads(const AssetId& assetId) const
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
+        auto preloadEntry = m_preloadList.find(assetId);
+        if (preloadEntry != m_preloadList.end())
         {
-            AZStd::lock_guard<AZStd::recursive_mutex> preloadGuard(m_preloadMutex);
-            auto preloadEntry = m_preloadList.find(assetId);
-            if (preloadEntry != m_preloadList.end())
-            {
-                return !preloadEntry->second.empty();
-            }
-            return false;
+            return !preloadEntry->second.empty();
         }
+        return false;
+    }
 
-        Asset<AssetData> AssetContainer::GetAssetData(const AssetId& assetId) const
+    Asset<AssetData> AssetContainer::GetAssetData(const AssetId& assetId) const
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> dependenciesGuard(m_dependencyMutex);
+        if (auto rootAsset = m_rootAsset.GetStrongReference(); rootAsset.GetId() == assetId)
         {
-            AZStd::lock_guard<AZStd::recursive_mutex> dependenciesGuard(m_dependencyMutex);
-            if (auto rootAsset = m_rootAsset.GetStrongReference(); rootAsset.GetId() == assetId)
-            {
-                return rootAsset;
-            }
-            auto dependencyIter = m_dependencies.find(assetId);
-            if (dependencyIter != m_dependencies.end())
-            {
-                return dependencyIter->second;
-            }
-            AZ_Warning("AssetContainer", false, "Asset %s not found in container", assetId.ToString<AZStd::string>().c_str());
-            return {};
+            return rootAsset;
         }
+        auto dependencyIter = m_dependencies.find(assetId);
+        if (dependencyIter != m_dependencies.end())
+        {
+            return dependencyIter->second;
+        }
+        AZ_Warning("AssetContainer", false, "Asset %s not found in container", assetId.ToString<AZStd::string>().c_str());
+        return {};
+    }
 
-        int AssetContainer::GetNumWaitingDependencies() const
-        {
-            return m_waitingCount.load();
-        }
+    int AssetContainer::GetNumWaitingDependencies() const
+    {
+        return m_waitingCount.load();
+    }
 
-        int AssetContainer::GetInvalidDependencies() const
-        {
-            return m_invalidDependencies.load();
-        }
-    }   // namespace Data
-}   // namespace AZ
+    int AssetContainer::GetInvalidDependencies() const
+    {
+        return m_invalidDependencies.load();
+    }
+} // namespace AZ::Data
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h
index e0091d678f..a05343ed0b 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h
@@ -24,8 +24,8 @@ namespace AZ
 
         // AssetContainer loads an asset and all of its dependencies as a collection which is parallellized as much as possible.
         // With the container, the data will all load in parallel.  Dependent asset loads will still obey the expected rules
-        // where PreLoad assets will emit OnAssetReady before the parent does, and QueueLoad assets will emit OnAssetReady in 
-        // no guaranteed order.  However, the OnAssetContainerReady signals will not emit until all PreLoad and QueueLoad assets 
+        // where PreLoad assets will emit OnAssetReady before the parent does, and QueueLoad assets will emit OnAssetReady in
+        // no guaranteed order.  However, the OnAssetContainerReady signals will not emit until all PreLoad and QueueLoad assets
         // are ready.  NoLoad dependencies are not loaded by default but can be loaded along with their dependencies using the
         // same rules as above by using the LoadAll dependency rule.
         class AssetContainer :
@@ -36,7 +36,7 @@ namespace AZ
             AZ_CLASS_ALLOCATOR(AssetContainer, SystemAllocator, 0);
 
             AssetContainer() = default;
-            
+
             AssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams);
             ~AssetContainer();
 
@@ -81,6 +81,10 @@ namespace AZ
             // AssetLoadBus
             void OnAssetDataLoaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
         protected:
+
+            virtual AZStd::vector<AZStd::pair<AssetInfo, Asset<AssetData>>> CreateAndQueueDependentAssets(
+                const AZStd::vector<AssetInfo>& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter);
+
             // Waiting assets are those which have not yet signalled ready.  In the case of PreLoad dependencies the data may have completed the load cycle but
             // the Assets aren't considered "Ready" yet if there are PreLoad dependencies still loading and will still be in the list until the point that asset and
             // All of its preload dependencies have been loaded, when it signals OnAssetReady
@@ -97,7 +101,7 @@ namespace AZ
             void AddDependency(Asset<AssetData>&& addDependency);
 
             // Add a "graph section" to our list of dependencies.  This checks the catalog for all Pre and Queue load assets which are dependents of the requested asset and kicks off loads
-            // NoLoads which are encounted are placed in another list and can be loaded on demand with the LoadDependency call.  
+            // NoLoads which are encounted are placed in another list and can be loaded on demand with the LoadDependency call.
             void AddDependentAssets(Asset<AssetData> rootAsset, const AssetLoadParameters& loadParams);
 
             // If "PreLoad" assets are found in the graph these are cached and tracked with both OnAssetReady and OnAssetDataLoaded messages.
@@ -117,7 +121,7 @@ namespace AZ
             // duringInit if we're coming from the checkReady method - containers that start ready don't need to signal
             void HandleReadyAsset(AZ::Data::Asset<AZ::Data::AssetData> asset);
 
-            // Optimization to save the lookup in the dependencies map 
+            // Optimization to save the lookup in the dependencies map
             AssetInternal::WeakAsset<AssetData> m_rootAsset;
 
             // The root asset id is stored here semi-redundantly on initialization so that we can still refer to it even if the
@@ -136,7 +140,7 @@ namespace AZ
             AZStd::atomic_bool m_finalNotificationSent{false};
 
             mutable AZStd::recursive_mutex m_preloadMutex;
-            // AssetId -> List of assets it is still waiting on 
+            // AssetId -> List of assets it is still waiting on
             PreloadAssetListType m_preloadList;
 
             // AssetId -> List of assets waiting on it
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp
index 3fa3b39ca5..0d28036646 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp
@@ -12,207 +12,204 @@
 #include <AzCore/Serialization/Json/StackedString.h>
 #include <AzCore/Memory/SystemAllocator.h>
 
-namespace AZ
+namespace AZ::Data
 {
-    namespace Data
+    AZ_CLASS_ALLOCATOR_IMPL(AssetJsonSerializer, SystemAllocator, 0);
+
+    JsonSerializationResult::Result AssetJsonSerializer::Load(void* outputValue, const Uuid& /*outputValueTypeId*/,
+        const rapidjson::Value& inputValue, JsonDeserializerContext& context)
     {
-        AZ_CLASS_ALLOCATOR_IMPL(AssetJsonSerializer, SystemAllocator, 0);
+        namespace JSR = JsonSerializationResult;
 
-        JsonSerializationResult::Result AssetJsonSerializer::Load(void* outputValue, const Uuid& /*outputValueTypeId*/,
-            const rapidjson::Value& inputValue, JsonDeserializerContext& context)
+        switch (inputValue.GetType())
         {
-            namespace JSR = JsonSerializationResult;
+        case rapidjson::kObjectType:
+            return LoadAsset(outputValue, inputValue, context);
+        case rapidjson::kArrayType: // fall through
+        case rapidjson::kNullType: // fall through
+        case rapidjson::kStringType: // fall through
+        case rapidjson::kFalseType: // fall through
+        case rapidjson::kTrueType: // fall through
+        case rapidjson::kNumberType:
+            return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Unsupported,
+                "Unsupported type. Asset<T> can only be read from an object.");
 
-            switch (inputValue.GetType())
+        default:
+            return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Unknown, "Unknown json type encountered for Asset<T>.");
+        }
+    }
+
+    JsonSerializationResult::Result AssetJsonSerializer::Store(rapidjson::Value& outputValue, const void* inputValue,
+        const void* defaultValue, const Uuid& /*valueTypeId*/, JsonSerializerContext& context)
+    {
+        namespace JSR = JsonSerializationResult;
+
+        const Asset<AssetData>* instance = reinterpret_cast<const Asset<AssetData>*>(inputValue);
+        const Asset<AssetData>* defaultInstance = reinterpret_cast<const Asset<AssetData>*>(defaultValue);
+
+        JSR::ResultCode result(JSR::Tasks::WriteValue);
+        {
+            ScopedContextPath subPathId(context, "m_assetId");
+            const auto* id = &instance->GetId();
+            const auto* defaultId = defaultInstance ? &defaultInstance->GetId() : nullptr;
+            rapidjson::Value assetIdValue;
+            result = ContinueStoring(assetIdValue, id, defaultId, azrtti_typeid<AssetId>(), context);
+            if (result.GetOutcome() == JSR::Outcomes::Success || result.GetOutcome() == JSR::Outcomes::PartialDefaults)
             {
-            case rapidjson::kObjectType:
-                return LoadAsset(outputValue, inputValue, context);
-            case rapidjson::kArrayType: // fall through
-            case rapidjson::kNullType: // fall through
-            case rapidjson::kStringType: // fall through
-            case rapidjson::kFalseType: // fall through
-            case rapidjson::kTrueType: // fall through
-            case rapidjson::kNumberType:
-                return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Unsupported,
-                    "Unsupported type. Asset<T> can only be read from an object.");
-
-            default:
-                return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Unknown, "Unknown json type encountered for Asset<T>.");
+                if (!outputValue.IsObject())
+                {
+                    outputValue.SetObject();
+                }
+                outputValue.AddMember(rapidjson::StringRef("assetId"), AZStd::move(assetIdValue), context.GetJsonAllocator());
             }
         }
 
-        JsonSerializationResult::Result AssetJsonSerializer::Store(rapidjson::Value& outputValue, const void* inputValue,
-            const void* defaultValue, const Uuid& /*valueTypeId*/, JsonSerializerContext& context)
         {
-            namespace JSR = JsonSerializationResult;
+            const AZ::Data::AssetLoadBehavior autoLoadBehavior = instance->GetAutoLoadBehavior();
+            const AZ::Data::AssetLoadBehavior defaultAutoLoadBehavior = defaultInstance ?
+                defaultInstance->GetAutoLoadBehavior() : AZ::Data::AssetLoadBehavior::Default;
 
-            const Asset<AssetData>* instance = reinterpret_cast<const Asset<AssetData>*>(inputValue);
-            const Asset<AssetData>* defaultInstance = reinterpret_cast<const Asset<AssetData>*>(defaultValue);
-
-            JSR::ResultCode result(JSR::Tasks::WriteValue);
-            {
-                ScopedContextPath subPathId(context, "m_assetId");
-                const auto* id = &instance->GetId();
-                const auto* defaultId = defaultInstance ? &defaultInstance->GetId() : nullptr;
-                rapidjson::Value assetIdValue;
-                result = ContinueStoring(assetIdValue, id, defaultId, azrtti_typeid<AssetId>(), context);
-                if (result.GetOutcome() == JSR::Outcomes::Success || result.GetOutcome() == JSR::Outcomes::PartialDefaults)
-                {
-                    if (!outputValue.IsObject())
-                    {
-                        outputValue.SetObject();
-                    }
-                    outputValue.AddMember(rapidjson::StringRef("assetId"), AZStd::move(assetIdValue), context.GetJsonAllocator());
-                }
-            }
-
-            {
-                const AZ::Data::AssetLoadBehavior autoLoadBehavior = instance->GetAutoLoadBehavior();
-                const AZ::Data::AssetLoadBehavior defaultAutoLoadBehavior = defaultInstance ?
-                    defaultInstance->GetAutoLoadBehavior() : AZ::Data::AssetLoadBehavior::Default;
-
-                result.Combine(
-                    ContinueStoringToJsonObjectField(outputValue, "loadBehavior",
-                        &autoLoadBehavior, &defaultAutoLoadBehavior,
-                        azrtti_typeid<Data::AssetLoadBehavior>(), context));
-            }
-
-            {
-                ScopedContextPath subPathHint(context, "m_assetHint");
-                const AZStd::string* hint = &instance->GetHint();
-                const AZStd::string defaultHint;
-                rapidjson::Value assetHintValue;
-                JSR::ResultCode resultHint = ContinueStoring(assetHintValue, hint, &defaultHint, azrtti_typeid<AZStd::string>(), context);
-                if (resultHint.GetOutcome() == JSR::Outcomes::Success || resultHint.GetOutcome() == JSR::Outcomes::PartialDefaults)
-                {
-                    if (!outputValue.IsObject())
-                    {
-                        outputValue.SetObject();
-                    }
-                    outputValue.AddMember(rapidjson::StringRef("assetHint"), AZStd::move(assetHintValue), context.GetJsonAllocator());
-                }
-                result.Combine(resultHint);
-            }
-
-            return context.Report(result,
-                result.GetProcessing() == JSR::Processing::Completed ? "Successfully stored Asset<T>." : "Failed to store Asset<T>.");
+            result.Combine(
+                ContinueStoringToJsonObjectField(outputValue, "loadBehavior",
+                    &autoLoadBehavior, &defaultAutoLoadBehavior,
+                    azrtti_typeid<Data::AssetLoadBehavior>(), context));
         }
 
-        JsonSerializationResult::Result AssetJsonSerializer::LoadAsset(void* outputValue, const rapidjson::Value& inputValue,
-            JsonDeserializerContext& context)
         {
-            namespace JSR = JsonSerializationResult;
-
-            Asset<AssetData>* instance = reinterpret_cast<Asset<AssetData>*>(outputValue);
-            AssetId id;
-            JSR::ResultCode result(JSR::Tasks::ReadField);
-
-            SerializedAssetTracker* assetTracker =
-                context.GetMetadata().Find<SerializedAssetTracker>();
-
+            ScopedContextPath subPathHint(context, "m_assetHint");
+            const AZStd::string* hint = &instance->GetHint();
+            const AZStd::string defaultHint;
+            rapidjson::Value assetHintValue;
+            JSR::ResultCode resultHint = ContinueStoring(assetHintValue, hint, &defaultHint, azrtti_typeid<AZStd::string>(), context);
+            if (resultHint.GetOutcome() == JSR::Outcomes::Success || resultHint.GetOutcome() == JSR::Outcomes::PartialDefaults)
             {
-                Data::AssetLoadBehavior loadBehavior = instance->GetAutoLoadBehavior();
-
-                result =
-                    ContinueLoadingFromJsonObjectField(&loadBehavior,
-                        azrtti_typeid<Data::AssetLoadBehavior>(),
-                        inputValue, "loadBehavior", context);
-
-                instance->SetAutoLoadBehavior(loadBehavior);
+                if (!outputValue.IsObject())
+                {
+                    outputValue.SetObject();
+                }
+                outputValue.AddMember(rapidjson::StringRef("assetHint"), AZStd::move(assetHintValue), context.GetJsonAllocator());
             }
+            result.Combine(resultHint);
+        }
 
-            auto it = inputValue.FindMember("assetId");
-            if (it != inputValue.MemberEnd())
+        return context.Report(result,
+            result.GetProcessing() == JSR::Processing::Completed ? "Successfully stored Asset<T>." : "Failed to store Asset<T>.");
+    }
+
+    JsonSerializationResult::Result AssetJsonSerializer::LoadAsset(void* outputValue, const rapidjson::Value& inputValue,
+        JsonDeserializerContext& context)
+    {
+        namespace JSR = JsonSerializationResult;
+
+        Asset<AssetData>* instance = reinterpret_cast<Asset<AssetData>*>(outputValue);
+        AssetId id;
+        JSR::ResultCode result(JSR::Tasks::ReadField);
+
+        SerializedAssetTracker* assetTracker =
+            context.GetMetadata().Find<SerializedAssetTracker>();
+
+        {
+            Data::AssetLoadBehavior loadBehavior = instance->GetAutoLoadBehavior();
+
+            result =
+                ContinueLoadingFromJsonObjectField(&loadBehavior,
+                    azrtti_typeid<Data::AssetLoadBehavior>(),
+                    inputValue, "loadBehavior", context);
+
+            instance->SetAutoLoadBehavior(loadBehavior);
+        }
+
+        auto it = inputValue.FindMember("assetId");
+        if (it != inputValue.MemberEnd())
+        {
+            ScopedContextPath subPath(context, "assetId");
+            result.Combine(ContinueLoading(&id, azrtti_typeid<AssetId>(), it->value, context));
+            if (!id.m_guid.IsNull())
             {
-                ScopedContextPath subPath(context, "assetId");
-                result.Combine(ContinueLoading(&id, azrtti_typeid<AssetId>(), it->value, context));
-                if (!id.m_guid.IsNull())
+                *instance = AssetManager::Instance().FindOrCreateAsset(id, instance->GetType(), instance->GetAutoLoadBehavior());
+                if (!instance->GetId().IsValid())
                 {
-                    *instance = AssetManager::Instance().FindOrCreateAsset(id, instance->GetType(), instance->GetAutoLoadBehavior());
-                    if (!instance->GetId().IsValid())
-                    {
-                        // If the asset failed to be created, FindOrCreateAsset returns an asset instance with a null
-                        // id. To preserve the asset id in the source json, reset the asset to an empty one, but with
-                        // the right id.
-                        const auto loadBehavior = instance->GetAutoLoadBehavior();
-                        *instance = Asset<AssetData>(id, instance->GetType());
-                        instance->SetAutoLoadBehavior(loadBehavior);
-                    }
+                    // If the asset failed to be created, FindOrCreateAsset returns an asset instance with a null
+                    // id. To preserve the asset id in the source json, reset the asset to an empty one, but with
+                    // the right id.
+                    const auto loadBehavior = instance->GetAutoLoadBehavior();
+                    *instance = Asset<AssetData>(id, instance->GetType());
+                    instance->SetAutoLoadBehavior(loadBehavior);
+                }
 
-                    result.Combine(context.Report(result, "Successfully created Asset<T> with id."));
-                }
-                else if (result.GetProcessing() == JSR::Processing::Completed)
-                {
-                    result.Combine(context.Report(JSR::Tasks::ReadField, JSR::Outcomes::DefaultsUsed,
-                        "Null Asset<T> created."));
-                }
-                else
-                {
-                    result.Combine(context.Report(result, "Failed to retrieve asset id for Asset<T>."));
-                }
+                result.Combine(context.Report(result, "Successfully created Asset<T> with id."));
+            }
+            else if (result.GetProcessing() == JSR::Processing::Completed)
+            {
+                result.Combine(context.Report(JSR::Tasks::ReadField, JSR::Outcomes::DefaultsUsed,
+                    "Null Asset<T> created."));
             }
             else
             {
-                result.Combine(context.Report(JSR::Tasks::ReadField, JSR::Outcomes::DefaultsUsed,
-                    "The asset id is missing, so there's not enough information to create an Asset<T>."));
-            }
-
-            it = inputValue.FindMember("assetHint");
-            if (it != inputValue.MemberEnd())
-            {
-                ScopedContextPath subPath(context, "assetHint");
-                AZStd::string hint;
-                result.Combine(ContinueLoading(&hint, azrtti_typeid<AZStd::string>(), it->value, context));
-                instance->SetHint(AZStd::move(hint));
-            }
-            else
-            {
-                result.Combine(context.Report(JSR::Tasks::ReadField, JSR::Outcomes::DefaultsUsed,
-                    "The asset hint is missing for Asset<T>, so it will be left empty."));
-            }
-
-            if (assetTracker)
-            {
-                assetTracker->FixUpAsset(*instance);
-                assetTracker->AddAsset(*instance);
-            }
-
-            bool success = result.GetOutcome() <= JSR::Outcomes::PartialSkip;
-            bool defaulted = result.GetOutcome() == JSR::Outcomes::DefaultsUsed || result.GetOutcome() == JSR::Outcomes::PartialDefaults;
-            AZStd::string_view message =
-                success ? "Successfully loaded information and created instance of Asset<T>." :
-                defaulted ? "A default id was provided for Asset<T>, so no instance could be created." :
-                "Not enough information was available to create an instance of Asset<T> or data was corrupted.";
-            return context.Report(result, message);
-        }
-
-        void SerializedAssetTracker::SetAssetFixUp(AssetFixUp assetFixUpCallback)
-        {
-            m_assetFixUpCallback = AZStd::move(assetFixUpCallback);
-        }
-
-        void SerializedAssetTracker::FixUpAsset(Asset<AssetData>& asset)
-        {
-            if (m_assetFixUpCallback)
-            {
-                m_assetFixUpCallback(asset);
+                result.Combine(context.Report(result, "Failed to retrieve asset id for Asset<T>."));
             }
         }
-
-        void SerializedAssetTracker::AddAsset(Asset<AssetData> asset)
+        else
         {
-            m_serializedAssets.emplace_back(asset);
+            result.Combine(context.Report(JSR::Tasks::ReadField, JSR::Outcomes::DefaultsUsed,
+                "The asset id is missing, so there's not enough information to create an Asset<T>."));
         }
 
-        const AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets() const
+        it = inputValue.FindMember("assetHint");
+        if (it != inputValue.MemberEnd())
         {
-            return m_serializedAssets;
+            ScopedContextPath subPath(context, "assetHint");
+            AZStd::string hint;
+            result.Combine(ContinueLoading(&hint, azrtti_typeid<AZStd::string>(), it->value, context));
+            instance->SetHint(AZStd::move(hint));
+        }
+        else
+        {
+            result.Combine(context.Report(JSR::Tasks::ReadField, JSR::Outcomes::DefaultsUsed,
+                "The asset hint is missing for Asset<T>, so it will be left empty."));
         }
 
-        AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets()
+        if (assetTracker)
         {
-            return m_serializedAssets;
+            assetTracker->FixUpAsset(*instance);
+            assetTracker->AddAsset(*instance);
         }
 
-    } // namespace Data
-} // namespace AZ
+        bool success = result.GetOutcome() <= JSR::Outcomes::PartialSkip;
+        bool defaulted = result.GetOutcome() == JSR::Outcomes::DefaultsUsed || result.GetOutcome() == JSR::Outcomes::PartialDefaults;
+        AZStd::string_view message =
+            success ? "Successfully loaded information and created instance of Asset<T>." :
+            defaulted ? "A default id was provided for Asset<T>, so no instance could be created." :
+            "Not enough information was available to create an instance of Asset<T> or data was corrupted.";
+        return context.Report(result, message);
+    }
+
+    void SerializedAssetTracker::SetAssetFixUp(AssetFixUp assetFixUpCallback)
+    {
+        m_assetFixUpCallback = AZStd::move(assetFixUpCallback);
+    }
+
+    void SerializedAssetTracker::FixUpAsset(Asset<AssetData>& asset)
+    {
+        if (m_assetFixUpCallback)
+        {
+            m_assetFixUpCallback(asset);
+        }
+    }
+
+    void SerializedAssetTracker::AddAsset(Asset<AssetData> asset)
+    {
+        m_serializedAssets.emplace_back(asset);
+    }
+
+    const AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets() const
+    {
+        return m_serializedAssets;
+    }
+
+    AZStd::vector<Asset<AssetData>>& SerializedAssetTracker::GetTrackedAssets()
+    {
+        return m_serializedAssets;
+    }
+
+} // namespace AZ::Data
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
index 06bb0b0cac..e419666a32 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp
@@ -27,2165 +27,2166 @@
 #include <utility>
 #include <AzCore/Serialization/ObjectStream.h>
 
-namespace AZ
+namespace AZ::Data
 {
-    namespace Data
+    AZ_CVAR(bool, cl_assetLoadWarningEnable, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+        "Enable warnings that show when AssetHandler::LoadAssetData has exceeded the time set in cl_assetLoadWarningMsThreshold.");
+    AZ_CVAR(uint32_t, cl_assetLoadWarningMsThreshold, 100, nullptr, AZ::ConsoleFunctorFlags::Null,
+            "Number of milliseconds that AssetHandler::LoadAssetData can execute for before printing a warning.");
+    AZ_CVAR(int, cl_assetLoadDelay, 0, nullptr, AZ::ConsoleFunctorFlags::Null,
+        "Number of milliseconds to artifically delay an asset load.");
+    AZ_CVAR(bool, cl_assetLoadError, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+        "Enable failure of all asset loads.");
+
+    static constexpr char kAssetDBInstanceVarName[] = "AssetDatabaseInstance";
+
+    /*
+     * This is the base class for Async AssetDatabase jobs
+     */
+    class AssetDatabaseAsyncJob
+        : public AssetDatabaseJob
+        , public Job
     {
-        AZ_CVAR(bool, cl_assetLoadWarningEnable, false, nullptr, AZ::ConsoleFunctorFlags::Null,
-            "Enable warnings that show when AssetHandler::LoadAssetData has exceeded the time set in cl_assetLoadWarningMsThreshold.");
-        AZ_CVAR(uint32_t, cl_assetLoadWarningMsThreshold, 100, nullptr, AZ::ConsoleFunctorFlags::Null,
-                "Number of milliseconds that AssetHandler::LoadAssetData can execute for before printing a warning.");
-        AZ_CVAR(int, cl_assetLoadDelay, 0, nullptr, AZ::ConsoleFunctorFlags::Null,
-            "Number of milliseconds to artifically delay an asset load.");
-        AZ_CVAR(bool, cl_assetLoadError, false, nullptr, AZ::ConsoleFunctorFlags::Null,
-            "Enable failure of all asset loads.");
-
-        static constexpr char kAssetDBInstanceVarName[] = "AssetDatabaseInstance";
-
-        /*
-         * This is the base class for Async AssetDatabase jobs
-         */
-        class AssetDatabaseAsyncJob
-            : public AssetDatabaseJob
-            , public Job
+    public:
+        AssetDatabaseAsyncJob(JobContext* jobContext, bool deleteWhenDone, AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
+            : AssetDatabaseJob(owner, asset, assetHandler)
+            , Job(deleteWhenDone, jobContext)
         {
-        public:
-            AssetDatabaseAsyncJob(JobContext* jobContext, bool deleteWhenDone, AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
-                : AssetDatabaseJob(owner, asset, assetHandler)
-                , Job(deleteWhenDone, jobContext)
-            {
-            }
+        }
 
-            ~AssetDatabaseAsyncJob() override
-            {
-            }
-        };
-
-        /**
-         * Internally allows threads blocking on asset loads to be notified on load completion.
-         */
-        class BlockingAssetLoadEvents
-            : public EBusTraits
+        ~AssetDatabaseAsyncJob() override
         {
-        public:
-            //////////////////////////////////////////////////////////////////////////
-            // EBusTraits overrides
-            static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-            using BusIdType = AssetId;
-            using MutexType = AZStd::recursive_mutex;
-
-            template <class Bus>
-            struct AssetJobConnectionPolicy
-                : public EBusConnectionPolicy<Bus>
-            {
-                static void Connect(typename Bus::BusPtr& busPtr, typename Bus::Context& context, typename Bus::HandlerNode& handler, typename Bus::Context::ConnectLockGuard& connectLock, const typename Bus::BusIdType& id = 0)
-                {
-                    typename Bus::BusIdType actualId = AssetInternal::ResolveAssetId(id);
-                    EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, actualId);
-
-                    // If the asset is loaded or failed already, deliver the status update immediately
-                    // Note that we check IsReady here, ReadyPreNotify must be tested because there is
-                    // a small gap between ReadyPreNotify and Ready where the callback could be missed.
-                    // Also note because the Asset<> reference isn't passed around anywhere, it doesn't matter
-                    // what the AssetLoadBehavior is set to, as it will never make it back to any callers.
-                    Asset<AssetData> assetData(AssetInternal::GetAssetData(actualId, AssetLoadBehavior::Default));
-                    if (assetData)
-                    {
-                        if (assetData->IsReady() || assetData->IsError())
-                        {
-                            connectLock.unlock();
-                            handler->OnLoadComplete();
-                        }
-                    }
-                }
-            };
-
-            template <typename Bus>
-            using ConnectionPolicy = AssetJobConnectionPolicy<Bus>;
-
-            virtual void OnLoadComplete() = 0;
-            virtual void OnLoadCanceled(AssetId assetId) = 0;
-        };
-
-        using BlockingAssetLoadBus = EBus<BlockingAssetLoadEvents>;
-
-        /*
-         * This class processes async AssetDatabase load jobs
-         */
-        class LoadAssetJob
-            : public AssetDatabaseAsyncJob
-        {
-        public:
-            AZ_CLASS_ALLOCATOR(LoadAssetJob, ThreadPoolAllocator, 0);
-
-            LoadAssetJob(AssetManager* owner, const Asset<AssetData>& asset,
-                AZStd::shared_ptr<AssetDataStream> dataStream, bool isReload, AZ::IO::IStreamerTypes::RequestStatus requestState,
-                AssetHandler* handler, const AssetLoadParameters& loadParams, bool signalLoaded)
-                : AssetDatabaseAsyncJob(JobContext::GetGlobalContext(), true, owner, asset, handler)
-                , m_dataStream(dataStream)
-                , m_isReload(isReload)
-                , m_requestState(requestState)
-                , m_loadParams(loadParams)
-                , m_signalLoaded(signalLoaded)
-            {
-                AZ_Assert(m_dataStream, "Data stream pointer received through the callback from AZ::IO::Streamer is invalid.");
-
-                AZ_Assert((m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Completed)
-                    || (m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Canceled)
-                    || (m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Failed),
-                    "AssetManager::LoadAssetJob was called with an unexpected streamer state: %i", m_requestState);
-            }
-
-            ~LoadAssetJob() override
-            {
-            }
-
-            void Process() override
-            {
-                Asset<AssetData> asset = m_asset.GetStrongReference();
-                
-                // Verify that we didn't somehow get here after the Asset Manager has finished shutting down.
-                AZ_Assert(AssetManager::IsReady(), "Asset Manager shutdown didn't clean up pending asset loads properly.");
-                if (!AssetManager::IsReady())
-                {
-                    return;
-                }
-                
-                bool shouldCancel = m_owner->ShouldCancelAllActiveJobs()
-                    || !asset // No outstanding references, so cancel the load
-                    || m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Canceled;
-
-                if (shouldCancel)
-                {
-                    BlockingAssetLoadBus::Event(m_asset.GetId(), &BlockingAssetLoadBus::Events::OnLoadCanceled, m_asset.GetId());
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetCanceled, m_asset.GetId());
-                }
-                else
-                {
-
-                    AZ_PROFILE_SCOPE(AzCore, "AZ::Data::LoadAssetJob::Process: %s",
-                        asset.GetHint().c_str());
-
-                    AZ_ASSET_ATTACH_TO_SCOPE(this);
-
-                    if (m_owner->ValidateAndRegisterAssetLoading(asset))
-                    {
-                        LoadAndSignal(asset);
-                    }
-                }
-            }
-
-            void LoadAndSignal(Asset<AssetData>& asset)
-            {
-                const bool loadSucceeded = LoadData();
-
-                if (m_signalLoaded && loadSucceeded)
-                {
-                    AZ_Assert(!m_isReload, "OnAssetDataLoaded signal isn't supported for asset reloads.");
-                    // This asset has preload dependencies, we need to evaluate whether they're all ready before calling PostLoad
-                    AssetLoadBus::Event(asset.GetId(), &AssetLoadBus::Events::OnAssetDataLoaded, asset);
-                }
-                else
-                {
-                    // As long as we don't need to signal preload dependencies, just finish the load whether or not it was successful.
-                    m_owner->PostLoad(asset, loadSucceeded, m_isReload, m_assetHandler);
-                }
-            }
-
-            bool LoadData()
-            {
-                Asset<AssetData> asset = m_asset.GetStrongReference();
-
-                if(cl_assetLoadDelay > 0)
-                {
-                    AZ_PROFILE_SCOPE(AzCore, "LoadData suspended");
-                    AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(cl_assetLoadDelay));
-                }
-
-                AZ_ASSET_NAMED_SCOPE(asset.GetHint().c_str());
-                bool loadedSuccessfully = false;
-
-                if (!cl_assetLoadError && m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Completed)
-                {
-                    if (m_dataStream->IsFullyLoaded())
-                    {
-                        AssetHandler::LoadResult result =
-                            m_assetHandler->LoadAssetDataFromStream(asset, m_dataStream, m_loadParams.m_assetLoadFilterCB);
-                        loadedSuccessfully = (result == AssetHandler::LoadResult::LoadComplete);
-                    }
-                }
-
-                return loadedSuccessfully;
-            }
-
-        private:
-            AZStd::shared_ptr<AssetDataStream> m_dataStream;
-            AssetLoadParameters m_loadParams{};
-            AZ::IO::IStreamerTypes::RequestStatus m_requestState{ AZ::IO::IStreamerTypes::RequestStatus::Pending};
-            bool m_isReload{ false };
-            bool m_signalLoaded{ false };
-        };
-
-
-         /**
-          * Utility class to wait when a blocking load is requested for an asset that's already loading asynchronously.
-          * Uses the BlockingAssetLoadBus to detect completion, and a semaphore to signal it.
-          */
-
-        class WaitForAsset
-            : public BlockingAssetLoadBus::Handler
-        {
-        public:
-            AZ_CLASS_ALLOCATOR(WaitForAsset, ThreadPoolAllocator, 0);
-
-
-            WaitForAsset(const Asset<AssetData>& assetToWaitFor, bool shouldDispatchEvents)
-                : m_assetData(assetToWaitFor)
-                , m_shouldDispatchEvents(shouldDispatchEvents)
-            {
-                // Track all blocking requests with the AssetManager.  This enables load jobs to potentially get routed
-                // to the thread that's currently blocking waiting on the load job to complete.
-                AssetManager::Instance().AddBlockingRequest(m_assetData.GetId(), this);
-            }
-
-            ~WaitForAsset() override
-            {
-                // Stop tracking the blocking request, which will ensure that load jobs won't be provided to this instance
-                // for processing.
-                AssetManager::Instance().RemoveBlockingRequest(m_assetData.GetId(), this);
-
-                // It shouldn't be possible to destroy a blocking load request before the load job that it's blocked on
-                // has been processed, so assert if it ever happens, but make sure to process it just in case.
-                if (m_loadJob)
-                {
-                    // (If a valid case is ever found where this can occur, it should be safe to remove the assert)
-                    AZ_Assert(false, "Blocking load request is being deleted before it could process the blocking load.");
-                    ProcessLoadJob();
-                }
-            }
-
-            // Provides a blocked load with a LoadJob to process while it's blocking.
-            // Returns true if it can be queued, false if it can't.
-            bool QueueAssetLoadJob(LoadAssetJob* loadJob)
-            {
-                if(m_shouldDispatchEvents)
-                {
-                    // Any load job that is going to be dispatching events should not accept additional work since dispatching events
-                    // can lead to more code that's blocking on an asset load which prevents us from finishing the dispatch
-                    // and doing the assigned work.
-                    // Specifically, if dispatching leads to a second block call, the load job will be assigned to the first block call,
-                    // which will never be completed until the second block call is finished.  If both blocks are on the same asset,
-                    // we end up deadlocked.
-                    return false;
-                }
-
-                AZStd::scoped_lock<AZStd::mutex> mutexLock(m_loadJobMutex);
-
-                AZ_Assert(!m_loadJob, "Trying to process multiple load jobs for the same asset with the same blocking handler.");
-                if (!m_loadJob)
-                {
-                    m_loadJob = loadJob;
-                    m_waitEvent.release();
-                    return true;
-                }
-
-                return false;
-            }
-
-            void OnLoadComplete() override
-            {
-                Finish();
-            }
-
-            void OnLoadCanceled([[maybe_unused]] const AssetId assetId) override
-            {
-                Finish();
-            }
-
-            void WaitUntilReady()
-            {
-                BusConnect(m_assetData.GetId());
-
-                Wait();
-
-                BusDisconnect(m_assetData.GetId());
-            }
-
-        protected:
-            void Wait()
-            {
-                AZ_PROFILE_SCOPE(AzCore, "WaitForAsset - %s", m_assetData.GetHint().c_str());
-
-                // Continue to loop until the load completes.  (Most of the time in the loop will be spent in a thread-blocking state)
-                while (!m_loadCompleted)
-                {
-                    if (m_shouldDispatchEvents)
-                    {
-                        // The event will wake up either when the load finishes, a load job is queued for processing, or every
-                        // N milliseconds to see if it should dispatch events.
-                        constexpr int MaxWaitBetweenDispatchMs = 1;
-                        while (!m_waitEvent.try_acquire_for(AZStd::chrono::milliseconds(MaxWaitBetweenDispatchMs)))
-                        {
-                            AssetManager::Instance().DispatchEvents();
-                        }
-                    }
-                    else 
-                    {
-                        
-                        // Don't wake up until a load job is queued for processing or the load is entirely finished.
-                        m_waitEvent.acquire();
-                    }
-
-                    // Check to see if any load jobs have been provided for this thread to process.
-                    // (Load jobs will attempt to reuse blocked threads before spinning off new job threads)
-                    ProcessLoadJob();
-                }
-
-                // Pump the AssetBus function queue once more after the load has completed in case additional
-                // functions have been queued between the last call to DispatchEvents and the completion
-                // of the current load job
-                if (m_shouldDispatchEvents)
-                {
-                    AssetManager::Instance().DispatchEvents();
-                }
-            }
-
-            void Finish()
-            {
-                AZ_PROFILE_FUNCTION(AzCore);
-                m_loadCompleted = true;
-                m_waitEvent.release();
-            }
-
-            bool ProcessLoadJob()
-            {
-                AZStd::scoped_lock<AZStd::mutex> mutexLock(m_loadJobMutex);
-                bool jobProcessed = false;
-
-                if (m_loadJob)
-                {
-                    m_loadJob->Process();
-                    if (m_loadJob->IsAutoDelete())
-                    {
-                        delete m_loadJob;
-                    }
-                    m_loadJob = nullptr;
-                    jobProcessed = true;
-                }
-
-                return jobProcessed;
-            }
-
-            Asset<AssetData> m_assetData;
-            AZStd::binary_semaphore m_waitEvent;
-            const bool m_shouldDispatchEvents{ false };
-            LoadAssetJob* m_loadJob{ nullptr };
-            AZStd::mutex m_loadJobMutex;
-            AZStd::atomic_bool m_loadCompleted{ false };
-        };
-
-
-        /*
-         * This class processes async AssetDatabase save jobs
-         */
-        class SaveAssetJob
-            : public AssetDatabaseAsyncJob
-        {
-        public:
-            AZ_CLASS_ALLOCATOR(SaveAssetJob, ThreadPoolAllocator, 0);
-
-            SaveAssetJob(JobContext* jobContext, AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
-                : AssetDatabaseAsyncJob(jobContext, true, owner, asset, assetHandler)
-            {
-            }
-
-            ~SaveAssetJob() override
-            {
-            }
-
-            void Process() override
-            {
-                SaveAsset();
-            }
-
-            void SaveAsset()
-            {
-                auto asset = m_asset.GetStrongReference();
-                AZ_PROFILE_FUNCTION(AzCore);
-                bool isSaved = false;
-                AssetStreamInfo saveInfo = m_owner->GetSaveStreamInfoForAsset(asset.GetId(), asset.GetType());
-                if (saveInfo.IsValid())
-                {
-                    IO::FileIOStream stream(saveInfo.m_streamName.c_str(), saveInfo.m_streamFlags);
-                    stream.Seek(saveInfo.m_dataOffset, IO::GenericStream::SeekMode::ST_SEEK_BEGIN);
-                    isSaved = m_assetHandler->SaveAssetData(asset, &stream);
-                }
-                // queue broadcast message for delivery on game thread
-                AssetBus::QueueEvent(asset.GetId(), &AssetBus::Events::OnAssetSaved, asset, isSaved);
-            }
-        };
+        }
+    };
 
+    /**
+     * Internally allows threads blocking on asset loads to be notified on load completion.
+     */
+    class BlockingAssetLoadEvents
+        : public EBusTraits
+    {
+    public:
         //////////////////////////////////////////////////////////////////////////
-        // Globals
-        EnvironmentVariable<AssetManager*> AssetManager::s_assetDB = nullptr;
-        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        using BusIdType = AssetId;
+        using MutexType = AZStd::recursive_mutex;
 
-        //=========================================================================
-        // AssetDatabaseJob
-        // [4/3/2014]
-        //=========================================================================
-        AssetDatabaseJob::AssetDatabaseJob(AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
+        template <class Bus>
+        struct AssetJobConnectionPolicy
+            : public EBusConnectionPolicy<Bus>
         {
-            m_owner = owner;
-            m_asset = AssetInternal::WeakAsset<AssetData>(asset);
-            m_assetHandler = assetHandler;
-            owner->AddJob(this);
-        }
-
-        //=========================================================================
-        // ~AssetDatabaseJob
-        // [4/3/2014]
-        //=========================================================================
-        AssetDatabaseJob::~AssetDatabaseJob()
-        {
-            // Make sure that the asset reference is cleared out prior to removing the job registration.
-            // It's possible that clearing this reference will trigger the cleanup code for the asset, so if we wait for the
-            // destructor to clear it *after* the RemoveJob call, then HasActiveJobsOrStreamerRequests() will be able to return
-            // false even though the job is still executing asset-related code.
-            m_asset = {};
-            m_owner->RemoveJob(this);
-        }
-
-        //=========================================================================
-        // Create
-        // [6/12/2012]
-        //=========================================================================
-        bool AssetManager::Create(const Descriptor& desc)
-        {
-            AZ_Assert(!s_assetDB || !s_assetDB.Get(), "AssetManager already created!");
-
-            if (!s_assetDB)
+            static void Connect(typename Bus::BusPtr& busPtr, typename Bus::Context& context, typename Bus::HandlerNode& handler, typename Bus::Context::ConnectLockGuard& connectLock, const typename Bus::BusIdType& id = 0)
             {
-                s_assetDB = Environment::CreateVariable<AssetManager*>(kAssetDBInstanceVarName);
-            }
-            if (!s_assetDB.Get())
-            {
-                s_assetDB.Set(aznew AssetManager(desc));
-            }
+                typename Bus::BusIdType actualId = AssetInternal::ResolveAssetId(id);
+                EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, actualId);
 
-            return true;
-        }
-
-        //=========================================================================
-        // Destroy
-        // [6/12/2012]
-        //=========================================================================
-        void AssetManager::Destroy()
-        {
-            AZ_Assert(s_assetDB, "AssetManager not created!");
-            delete (*s_assetDB);
-            *s_assetDB = nullptr;
-        }
-
-        //=========================================================================
-        // IsReady
-        //=========================================================================
-        bool AssetManager::IsReady()
-        {
-            if (!s_assetDB)
-            {
-                s_assetDB = Environment::FindVariable<AssetManager*>(kAssetDBInstanceVarName);
-            }
-
-            return s_assetDB && *s_assetDB;
-        }
-
-        //=========================================================================
-        // Instance
-        //=========================================================================
-        AssetManager& AssetManager::Instance()
-        {
-            if (!s_assetDB)
-            {
-                s_assetDB = Environment::FindVariable<AssetManager*>(kAssetDBInstanceVarName);
-            }
-
-            AZ_Assert(s_assetDB && *s_assetDB, "AssetManager not created!");
-            return *(*s_assetDB);
-        }
-
-        bool AssetManager::SetInstance(AssetManager* assetManager)
-        {
-            if (!s_assetDB)
-            {
-                s_assetDB = Environment::CreateVariable<AssetManager*>(kAssetDBInstanceVarName);
-            }
-
-            // The old instance needs to be null or else it will leak on the assignment.
-            AZ_Assert(!(*s_assetDB),
-                "AssetManager::SetInstance was called without first destroying the old instance and setting it to nullptr.  "
-                "This will cause the previous AssetManager instance to leak." );
-
-            (*s_assetDB) = assetManager;
-            return true;
-        }
-
-        //=========================================================================
-        // AssetDatabase
-        // [6/12/2012]
-        //=========================================================================
-        AssetManager::AssetManager(const AssetManager::Descriptor& desc)
-            : m_mainThreadId(AZStd::this_thread::get_id())
-            , m_debugAssetEvents(AZ::Interface<IDebugAssetEvent>::Get())
-        {
-            (void)desc;
-
-            AssetManagerBus::Handler::BusConnect();
-        }
-
-        //=========================================================================
-        // ~AssetManager
-        // [6/12/2012]
-        //=========================================================================
-        AssetManager::~AssetManager()
-        {
-            PrepareShutDown();
-
-            // Acquire the asset lock to make sure nobody else is trying to do anything fancy with assets
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-
-            while (!m_handlers.empty())
-            {
-                AssetHandlerMap::iterator it = m_handlers.begin();
-                AssetHandler* handler = it->second;
-                UnregisterHandler(handler);
-                delete handler;
-            }
-
-            AssetManagerBus::Handler::BusDisconnect();
-        }
-
-        //=========================================================================
-        // DispatchEvents
-        // [04/02/2014]
-        //=========================================================================
-        void AssetManager::DispatchEvents()
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
-            AssetManagerNotificationBus::Broadcast(&AssetManagerNotificationBus::Events::OnAssetEventsDispatchBegin);
-            while (AssetBus::QueuedEventCount())
-            {
-                AssetBus::ExecuteQueuedEvents();
-            }
-            AssetManagerNotificationBus::Broadcast(&AssetManagerNotificationBus::Events::OnAssetEventsDispatchEnd);
-        }
-
-        //=========================================================================
-        void AssetManager::SetAssetInfoUpgradingEnabled(bool enable)
-        {
-            m_assetInfoUpgradingEnabled = enable;
-        }
-
-        bool AssetManager::GetAssetInfoUpgradingEnabled() const
-        {
-#if defined(_RELEASE)
-            // in release ("FINAL") builds, we never do this.
-            return false;
-#else
-            return m_assetInfoUpgradingEnabled;
-#endif
-        }
-
-        bool AssetManager::ShouldCancelAllActiveJobs() const
-        {
-            return m_cancelAllActiveJobs;
-        }
-
-        void AssetManager::SetParallelDependentLoadingEnabled(bool enable)
-        {
-            m_enableParallelDependentLoading = enable;
-        }
-
-        bool AssetManager::GetParallelDependentLoadingEnabled() const
-        {
-            return m_enableParallelDependentLoading;
-        }
-
-        void AssetManager::PrepareShutDown()
-        {
-            m_cancelAllActiveJobs = true;
-
-            // We want to ensure that no active load jobs are in flight and
-            // therefore we need to wait till all jobs have completed. Please note that jobs get deleted automatically once they complete. 
-            WaitForActiveJobsAndStreamerRequestsToFinish();
-
-            m_ownedAssetContainerLookup.clear();
-            m_ownedAssetContainers.clear();
-            m_assetContainers.clear();
-
-            // Ensure that there are no queued events on the AssetBus
-            DispatchEvents();
-        }
-
-        void AssetManager::WaitForActiveJobsAndStreamerRequestsToFinish()
-        {
-            while (HasActiveJobsOrStreamerRequests())
-            {
-                DispatchEvents();
-                AZStd::this_thread::yield();
-            }
-        }
-
-        //=========================================================================
-        // RegisterHandler
-        // [7/9/2014]
-        //=========================================================================
-        void AssetManager::RegisterHandler(AssetHandler* handler, const AssetType& assetType)
-        {
-            AZ_Error("AssetDatabase", handler != nullptr, "Attempting to register a null asset handler!");
-            if (handler)
-            {
-                if (m_handlers.insert(AZStd::make_pair(assetType, handler)).second)
+                // If the asset is loaded or failed already, deliver the status update immediately
+                // Note that we check IsReady here, ReadyPreNotify must be tested because there is
+                // a small gap between ReadyPreNotify and Ready where the callback could be missed.
+                // Also note because the Asset<> reference isn't passed around anywhere, it doesn't matter
+                // what the AssetLoadBehavior is set to, as it will never make it back to any callers.
+                Asset<AssetData> assetData(AssetInternal::GetAssetData(actualId, AssetLoadBehavior::Default));
+                if (assetData)
                 {
-                    handler->m_nHandledTypes++;
-                }
-                else
-                {
-                    AZ_Error("AssetDatabase", false, "Asset type %s already has a handler registered! New registration ignored!", assetType.ToString<AZStd::string>().c_str());
-                }
-            }
-        }
-
-        //=========================================================================
-        // UnregisterHandler
-        // [7/9/2014]
-        //=========================================================================
-        void AssetManager::UnregisterHandler(AssetHandler* handler)
-        {
-            AZ_Error("AssetDatabase", handler != nullptr, "Attempting to unregister a null asset handler!");
-            if (handler)
-            {
-                for (AssetHandlerMap::iterator it = m_handlers.begin(); it != m_handlers.end(); /*++it*/)
-                {
-                    if (it->second == handler)
+                    if (assetData->IsReady() || assetData->IsError())
                     {
-                        // When unregistering asset handlers, it's possible that there are still some load jobs that have "finished" but
-                        // haven't destroyed themselves yet by the time the asset handler gets unregistered.  LoadAssetJob contains a weak
-                        // asset reference that doesn't clear until the job is destroyed, which happens *after* the OnAssetReady
-                        // notification is triggered.  If the thread gets swapped out between the OnAssetReady and the job destruction, 
-                        // the job will still be holding onto an asset reference for this asset handler, and it will trigger the
-                        // error below.  To ensure that this case doesn't happen, we will instead call
-                        // WaitForActiveJobsAndStreamerRequestsToFinish() to make sure that any in-process jobs have completely cleaned
-                        // themselves up before proceeding forward.
-                        // One example of this pattern occurs in unit tests, where the test loads an asset, validates it, destroys the
-                        // asset, and unregisters the handler, all in rapid succession.  This would extremely infrequently
-                        // (~1 per 5000 runs) trigger the error case if we didn't wait for the jobs to finish here.
-                        WaitForActiveJobsAndStreamerRequestsToFinish();
-
-                        {
-                            // this scope is used to control the scope of the lock.
-                            AZStd::lock_guard<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                            for (const auto &assetEntry : m_assets)
-                            {
-                                // is the handler that handles this type, this handler we're removing?
-                                if (assetEntry.second->m_registeredHandler == handler)
-                                {
-                                    AZ_Error("AssetManager", false, "Asset handler for %s is being removed, when assetid %s is still loaded!\n",
-                                                assetEntry.second->GetType().ToString<AZ::OSString>().c_str(),
-                                                assetEntry.second->GetId().ToString<AZ::OSString>().c_str()); // this will write the name IF AVAILABLE
-                                    assetEntry.second->UnregisterWithHandler();
-                                }
-                            }
-                        }
-                        it = m_handlers.erase(it);
-                        handler->m_nHandledTypes--;
-                    }
-                    else
-                    {
-                        ++it;
+                        connectLock.unlock();
+                        handler->OnLoadComplete();
                     }
                 }
             }
+        };
+
+        template <typename Bus>
+        using ConnectionPolicy = AssetJobConnectionPolicy<Bus>;
+
+        virtual void OnLoadComplete() = 0;
+        virtual void OnLoadCanceled(AssetId assetId) = 0;
+    };
+
+    using BlockingAssetLoadBus = EBus<BlockingAssetLoadEvents>;
+
+    /*
+     * This class processes async AssetDatabase load jobs
+     */
+    class LoadAssetJob
+        : public AssetDatabaseAsyncJob
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(LoadAssetJob, ThreadPoolAllocator, 0);
+
+        LoadAssetJob(AssetManager* owner, const Asset<AssetData>& asset,
+            AZStd::shared_ptr<AssetDataStream> dataStream, bool isReload, AZ::IO::IStreamerTypes::RequestStatus requestState,
+            AssetHandler* handler, const AssetLoadParameters& loadParams, bool signalLoaded)
+            : AssetDatabaseAsyncJob(JobContext::GetGlobalContext(), true, owner, asset, handler)
+            , m_dataStream(dataStream)
+            , m_isReload(isReload)
+            , m_requestState(requestState)
+            , m_loadParams(loadParams)
+            , m_signalLoaded(signalLoaded)
+        {
+            AZ_Assert(m_dataStream, "Data stream pointer received through the callback from AZ::IO::Streamer is invalid.");
+
+            AZ_Assert((m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Completed)
+                || (m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Canceled)
+                || (m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Failed),
+                "AssetManager::LoadAssetJob was called with an unexpected streamer state: %i", m_requestState);
         }
 
-        //=========================================================================
-        // RegisterCatalog
-        // [8/27/2012]
-        //=========================================================================
-        void AssetManager::RegisterCatalog(AssetCatalog* catalog, const AssetType& assetType)
+        ~LoadAssetJob() override
         {
-            AZ_Error("AssetDatabase", catalog != nullptr, "Attempting to register a null catalog!");
-            if (catalog)
-            {
-                AZStd::scoped_lock<AZStd::recursive_mutex> l(m_catalogMutex);
-                if (m_catalogs.insert(AZStd::make_pair(assetType, catalog)).second == false)
-                {
-                    AZ_Error("AssetDatabase", false, "Asset type %s already has a catalog registered! New registration ignored!", assetType.ToString<AZStd::string>().c_str());
-                }
-            }
         }
 
-        //=========================================================================
-        // UnregisterCatalog
-        // [8/27/2012]
-        //=========================================================================
-        void AssetManager::UnregisterCatalog(AssetCatalog* catalog)
+        void Process() override
         {
-            AZ_Error("AssetDatabase", catalog != nullptr, "Attempting to unregister a null catalog!");
-            if (catalog)
-            {
-                AZStd::scoped_lock<AZStd::recursive_mutex> l(m_catalogMutex);
-                for (AssetCatalogMap::iterator iter = m_catalogs.begin(); iter != m_catalogs.end(); )
-                {
-                    if (iter->second == catalog)
-                    {
-                        iter = m_catalogs.erase(iter);
-                    }
-                    else
-                    {
-                        ++iter;
-                    }
+            Asset<AssetData> asset = m_asset.GetStrongReference();
 
-                }
-            }
-        }
-
-        //=========================================================================
-        // GetHandledAssetTypes
-        // [6/27/2016]
-        //=========================================================================
-        void AssetManager::GetHandledAssetTypes(AssetCatalog* catalog, AZStd::vector<AssetType>& assetTypes)
-        {
-            for (AssetCatalogMap::iterator iter = m_catalogs.begin(); iter != m_catalogs.end(); iter++)
-            {
-                if (iter->second == catalog)
-                {
-                    assetTypes.push_back(iter->first);
-                }
-            }
-        }
-
-        void AssetManager::SuspendAssetRelease()
-        {
-            ++m_suspendAssetRelease;
-        }
-
-        void AssetManager::ResumeAssetRelease()
-        {
-            if(--m_suspendAssetRelease != 0)
+            // Verify that we didn't somehow get here after the Asset Manager has finished shutting down.
+            AZ_Assert(AssetManager::IsReady(), "Asset Manager shutdown didn't clean up pending asset loads properly.");
+            if (!AssetManager::IsReady())
             {
                 return;
             }
 
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-            // First, release any containers that were loading this asset
-            for (auto asset = m_assets.begin();asset != m_assets.end();)
+            bool shouldCancel = m_owner->ShouldCancelAllActiveJobs()
+                || !asset // No outstanding references, so cancel the load
+                || m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Canceled;
+
+            if (shouldCancel)
             {
-                if (asset->second->m_useCount == 0)
+                BlockingAssetLoadBus::Event(m_asset.GetId(), &BlockingAssetLoadBus::Events::OnLoadCanceled, m_asset.GetId());
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetCanceled, m_asset.GetId());
+            }
+            else
+            {
+
+                AZ_PROFILE_SCOPE(AzCore, "AZ::Data::LoadAssetJob::Process: %s",
+                    asset.GetHint().c_str());
+
+                AZ_ASSET_ATTACH_TO_SCOPE(this);
+
+                if (m_owner->ValidateAndRegisterAssetLoading(asset))
                 {
-                    auto releaseAsset = asset->second;
-                    ++asset;
-                    ReleaseAssetContainersForAsset(releaseAsset);
+                    LoadAndSignal(asset);
+                }
+            }
+        }
+
+        void LoadAndSignal(Asset<AssetData>& asset)
+        {
+            const bool loadSucceeded = LoadData();
+
+            if (m_signalLoaded && loadSucceeded)
+            {
+                AZ_Assert(!m_isReload, "OnAssetDataLoaded signal isn't supported for asset reloads.");
+                // This asset has preload dependencies, we need to evaluate whether they're all ready before calling PostLoad
+                AssetLoadBus::Event(asset.GetId(), &AssetLoadBus::Events::OnAssetDataLoaded, asset);
+            }
+            else
+            {
+                // As long as we don't need to signal preload dependencies, just finish the load whether or not it was successful.
+                m_owner->PostLoad(asset, loadSucceeded, m_isReload, m_assetHandler);
+            }
+        }
+
+        bool LoadData()
+        {
+            Asset<AssetData> asset = m_asset.GetStrongReference();
+
+            if(cl_assetLoadDelay > 0)
+            {
+                AZ_PROFILE_SCOPE(AzCore, "LoadData suspended");
+                AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(cl_assetLoadDelay));
+            }
+
+            AZ_ASSET_NAMED_SCOPE(asset.GetHint().c_str());
+            bool loadedSuccessfully = false;
+
+            if (!cl_assetLoadError && m_requestState == AZ::IO::IStreamerTypes::RequestStatus::Completed)
+            {
+                if (m_dataStream->IsFullyLoaded())
+                {
+                    AssetHandler::LoadResult result =
+                        m_assetHandler->LoadAssetDataFromStream(asset, m_dataStream, m_loadParams.m_assetLoadFilterCB);
+                    loadedSuccessfully = (result == AssetHandler::LoadResult::LoadComplete);
+                }
+            }
+
+            return loadedSuccessfully;
+        }
+
+    private:
+        AZStd::shared_ptr<AssetDataStream> m_dataStream;
+        AssetLoadParameters m_loadParams{};
+        AZ::IO::IStreamerTypes::RequestStatus m_requestState{ AZ::IO::IStreamerTypes::RequestStatus::Pending};
+        bool m_isReload{ false };
+        bool m_signalLoaded{ false };
+    };
+
+
+     /**
+      * Utility class to wait when a blocking load is requested for an asset that's already loading asynchronously.
+      * Uses the BlockingAssetLoadBus to detect completion, and a semaphore to signal it.
+      */
+
+    class WaitForAsset
+        : public BlockingAssetLoadBus::Handler
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(WaitForAsset, ThreadPoolAllocator, 0);
+
+
+        WaitForAsset(const Asset<AssetData>& assetToWaitFor, bool shouldDispatchEvents)
+            : m_assetData(assetToWaitFor)
+            , m_shouldDispatchEvents(shouldDispatchEvents)
+        {
+            // Track all blocking requests with the AssetManager.  This enables load jobs to potentially get routed
+            // to the thread that's currently blocking waiting on the load job to complete.
+            AssetManager::Instance().AddBlockingRequest(m_assetData.GetId(), this);
+        }
+
+        ~WaitForAsset() override
+        {
+            // Stop tracking the blocking request, which will ensure that load jobs won't be provided to this instance
+            // for processing.
+            AssetManager::Instance().RemoveBlockingRequest(m_assetData.GetId(), this);
+
+            // It shouldn't be possible to destroy a blocking load request before the load job that it's blocked on
+            // has been processed, so assert if it ever happens, but make sure to process it just in case.
+            if (m_loadJob)
+            {
+                // (If a valid case is ever found where this can occur, it should be safe to remove the assert)
+                AZ_Assert(false, "Blocking load request is being deleted before it could process the blocking load.");
+                ProcessLoadJob();
+            }
+        }
+
+        // Provides a blocked load with a LoadJob to process while it's blocking.
+        // Returns true if it can be queued, false if it can't.
+        bool QueueAssetLoadJob(LoadAssetJob* loadJob)
+        {
+            if(m_shouldDispatchEvents)
+            {
+                // Any load job that is going to be dispatching events should not accept additional work since dispatching events
+                // can lead to more code that's blocking on an asset load which prevents us from finishing the dispatch
+                // and doing the assigned work.
+                // Specifically, if dispatching leads to a second block call, the load job will be assigned to the first block call,
+                // which will never be completed until the second block call is finished.  If both blocks are on the same asset,
+                // we end up deadlocked.
+                return false;
+            }
+
+            AZStd::scoped_lock<AZStd::mutex> mutexLock(m_loadJobMutex);
+
+            AZ_Assert(!m_loadJob, "Trying to process multiple load jobs for the same asset with the same blocking handler.");
+            if (!m_loadJob)
+            {
+                m_loadJob = loadJob;
+                m_waitEvent.release();
+                return true;
+            }
+
+            return false;
+        }
+
+        void OnLoadComplete() override
+        {
+            Finish();
+        }
+
+        void OnLoadCanceled([[maybe_unused]] const AssetId assetId) override
+        {
+            Finish();
+        }
+
+        void WaitUntilReady()
+        {
+            BusConnect(m_assetData.GetId());
+
+            Wait();
+
+            BusDisconnect(m_assetData.GetId());
+        }
+
+    protected:
+        void Wait()
+        {
+            AZ_PROFILE_SCOPE(AzCore, "WaitForAsset - %s", m_assetData.GetHint().c_str());
+
+            // Continue to loop until the load completes.  (Most of the time in the loop will be spent in a thread-blocking state)
+            while (!m_loadCompleted)
+            {
+                if (m_shouldDispatchEvents)
+                {
+                    // The event will wake up either when the load finishes, a load job is queued for processing, or every
+                    // N milliseconds to see if it should dispatch events.
+                    constexpr int MaxWaitBetweenDispatchMs = 1;
+                    while (!m_waitEvent.try_acquire_for(AZStd::chrono::milliseconds(MaxWaitBetweenDispatchMs)))
+                    {
+                        AssetManager::Instance().DispatchEvents();
+                    }
                 }
                 else
                 {
-                    ++asset;
+
+                    // Don't wake up until a load job is queued for processing or the load is entirely finished.
+                    m_waitEvent.acquire();
                 }
+
+                // Check to see if any load jobs have been provided for this thread to process.
+                // (Load jobs will attempt to reuse blocked threads before spinning off new job threads)
+                ProcessLoadJob();
             }
 
-            // Second, release the assets themselves
-
-            AZStd::vector<AssetData*> assetsToRelease;
-
-            for(auto&& asset : m_assets)
+            // Pump the AssetBus function queue once more after the load has completed in case additional
+            // functions have been queued between the last call to DispatchEvents and the completion
+            // of the current load job
+            if (m_shouldDispatchEvents)
             {
-                if(asset.second->m_weakUseCount == 0)
+                AssetManager::Instance().DispatchEvents();
+            }
+        }
+
+        void Finish()
+        {
+            AZ_PROFILE_FUNCTION(AzCore);
+            m_loadCompleted = true;
+            m_waitEvent.release();
+        }
+
+        bool ProcessLoadJob()
+        {
+            AZStd::scoped_lock<AZStd::mutex> mutexLock(m_loadJobMutex);
+            bool jobProcessed = false;
+
+            if (m_loadJob)
+            {
+                m_loadJob->Process();
+                if (m_loadJob->IsAutoDelete())
                 {
-                    // Keep a separate list of assets to release, because releasing them will modify the m_assets list that we're
-                    // currently looping on.
-                    assetsToRelease.push_back(asset.second);
+                    delete m_loadJob;
+                }
+                m_loadJob = nullptr;
+                jobProcessed = true;
+            }
+
+            return jobProcessed;
+        }
+
+        Asset<AssetData> m_assetData;
+        AZStd::binary_semaphore m_waitEvent;
+        const bool m_shouldDispatchEvents{ false };
+        LoadAssetJob* m_loadJob{ nullptr };
+        AZStd::mutex m_loadJobMutex;
+        AZStd::atomic_bool m_loadCompleted{ false };
+    };
+
+
+    /*
+     * This class processes async AssetDatabase save jobs
+     */
+    class SaveAssetJob
+        : public AssetDatabaseAsyncJob
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(SaveAssetJob, ThreadPoolAllocator, 0);
+
+        SaveAssetJob(JobContext* jobContext, AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
+            : AssetDatabaseAsyncJob(jobContext, true, owner, asset, assetHandler)
+        {
+        }
+
+        ~SaveAssetJob() override
+        {
+        }
+
+        void Process() override
+        {
+            SaveAsset();
+        }
+
+        void SaveAsset()
+        {
+            auto asset = m_asset.GetStrongReference();
+            AZ_PROFILE_FUNCTION(AzCore);
+            bool isSaved = false;
+            AssetStreamInfo saveInfo = m_owner->GetSaveStreamInfoForAsset(asset.GetId(), asset.GetType());
+            if (saveInfo.IsValid())
+            {
+                IO::FileIOStream stream(saveInfo.m_streamName.c_str(), saveInfo.m_streamFlags);
+                stream.Seek(saveInfo.m_dataOffset, IO::GenericStream::SeekMode::ST_SEEK_BEGIN);
+                isSaved = m_assetHandler->SaveAssetData(asset, &stream);
+            }
+            // queue broadcast message for delivery on game thread
+            AssetBus::QueueEvent(asset.GetId(), &AssetBus::Events::OnAssetSaved, asset, isSaved);
+        }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Globals
+    EnvironmentVariable<AssetManager*> AssetManager::s_assetDB = nullptr;
+    //////////////////////////////////////////////////////////////////////////
+
+    //=========================================================================
+    // AssetDatabaseJob
+    // [4/3/2014]
+    //=========================================================================
+    AssetDatabaseJob::AssetDatabaseJob(AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
+    {
+        m_owner = owner;
+        m_asset = AssetInternal::WeakAsset<AssetData>(asset);
+        m_assetHandler = assetHandler;
+        owner->AddJob(this);
+    }
+
+    //=========================================================================
+    // ~AssetDatabaseJob
+    // [4/3/2014]
+    //=========================================================================
+    AssetDatabaseJob::~AssetDatabaseJob()
+    {
+        // Make sure that the asset reference is cleared out prior to removing the job registration.
+        // It's possible that clearing this reference will trigger the cleanup code for the asset, so if we wait for the
+        // destructor to clear it *after* the RemoveJob call, then HasActiveJobsOrStreamerRequests() will be able to return
+        // false even though the job is still executing asset-related code.
+        m_asset = {};
+        m_owner->RemoveJob(this);
+    }
+
+    //=========================================================================
+    // Create
+    // [6/12/2012]
+    //=========================================================================
+    bool AssetManager::Create(const Descriptor& desc)
+    {
+        AZ_Assert(!s_assetDB || !s_assetDB.Get(), "AssetManager already created!");
+
+        if (!s_assetDB)
+        {
+            s_assetDB = Environment::CreateVariable<AssetManager*>(kAssetDBInstanceVarName);
+        }
+        if (!s_assetDB.Get())
+        {
+            s_assetDB.Set(aznew AssetManager(desc));
+        }
+
+        return true;
+    }
+
+    //=========================================================================
+    // Destroy
+    // [6/12/2012]
+    //=========================================================================
+    void AssetManager::Destroy()
+    {
+        AZ_Assert(s_assetDB, "AssetManager not created!");
+        delete (*s_assetDB);
+        *s_assetDB = nullptr;
+    }
+
+    //=========================================================================
+    // IsReady
+    //=========================================================================
+    bool AssetManager::IsReady()
+    {
+        if (!s_assetDB)
+        {
+            s_assetDB = Environment::FindVariable<AssetManager*>(kAssetDBInstanceVarName);
+        }
+
+        return s_assetDB && *s_assetDB;
+    }
+
+    //=========================================================================
+    // Instance
+    //=========================================================================
+    AssetManager& AssetManager::Instance()
+    {
+        if (!s_assetDB)
+        {
+            s_assetDB = Environment::FindVariable<AssetManager*>(kAssetDBInstanceVarName);
+        }
+
+        AZ_Assert(s_assetDB && *s_assetDB, "AssetManager not created!");
+        return *(*s_assetDB);
+    }
+
+    bool AssetManager::SetInstance(AssetManager* assetManager)
+    {
+        if (!s_assetDB)
+        {
+            s_assetDB = Environment::CreateVariable<AssetManager*>(kAssetDBInstanceVarName);
+        }
+
+        // The old instance needs to be null or else it will leak on the assignment.
+        AZ_Assert(!(*s_assetDB),
+            "AssetManager::SetInstance was called without first destroying the old instance and setting it to nullptr.  "
+            "This will cause the previous AssetManager instance to leak." );
+
+        (*s_assetDB) = assetManager;
+        return true;
+    }
+
+    //=========================================================================
+    // AssetDatabase
+    // [6/12/2012]
+    //=========================================================================
+    AssetManager::AssetManager(const AssetManager::Descriptor& desc)
+        : m_mainThreadId(AZStd::this_thread::get_id())
+        , m_debugAssetEvents(AZ::Interface<IDebugAssetEvent>::Get())
+    {
+        (void)desc;
+
+        AssetManagerBus::Handler::BusConnect();
+    }
+
+    //=========================================================================
+    // ~AssetManager
+    // [6/12/2012]
+    //=========================================================================
+    AssetManager::~AssetManager()
+    {
+        PrepareShutDown();
+
+        // Acquire the asset lock to make sure nobody else is trying to do anything fancy with assets
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+
+        while (!m_handlers.empty())
+        {
+            AssetHandlerMap::iterator it = m_handlers.begin();
+            AssetHandler* handler = it->second;
+            UnregisterHandler(handler);
+            delete handler;
+        }
+
+        AssetManagerBus::Handler::BusDisconnect();
+    }
+
+    //=========================================================================
+    // DispatchEvents
+    // [04/02/2014]
+    //=========================================================================
+    void AssetManager::DispatchEvents()
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+        AssetManagerNotificationBus::Broadcast(&AssetManagerNotificationBus::Events::OnAssetEventsDispatchBegin);
+        while (AssetBus::QueuedEventCount())
+        {
+            AssetBus::ExecuteQueuedEvents();
+        }
+        AssetManagerNotificationBus::Broadcast(&AssetManagerNotificationBus::Events::OnAssetEventsDispatchEnd);
+    }
+
+    //=========================================================================
+    void AssetManager::SetAssetInfoUpgradingEnabled(bool enable)
+    {
+        m_assetInfoUpgradingEnabled = enable;
+    }
+
+    bool AssetManager::GetAssetInfoUpgradingEnabled() const
+    {
+#if defined(_RELEASE)
+        // in release ("FINAL") builds, we never do this.
+        return false;
+#else
+        return m_assetInfoUpgradingEnabled;
+#endif
+    }
+
+    bool AssetManager::ShouldCancelAllActiveJobs() const
+    {
+        return m_cancelAllActiveJobs;
+    }
+
+    void AssetManager::SetParallelDependentLoadingEnabled(bool enable)
+    {
+        m_enableParallelDependentLoading = enable;
+    }
+
+    bool AssetManager::GetParallelDependentLoadingEnabled() const
+    {
+        return m_enableParallelDependentLoading;
+    }
+
+    void AssetManager::PrepareShutDown()
+    {
+        m_cancelAllActiveJobs = true;
+
+        // We want to ensure that no active load jobs are in flight and
+        // therefore we need to wait till all jobs have completed. Please note that jobs get deleted automatically once they complete.
+        WaitForActiveJobsAndStreamerRequestsToFinish();
+
+        m_ownedAssetContainerLookup.clear();
+        m_ownedAssetContainers.clear();
+        m_assetContainers.clear();
+
+        // Ensure that there are no queued events on the AssetBus
+        DispatchEvents();
+    }
+
+    void AssetManager::WaitForActiveJobsAndStreamerRequestsToFinish()
+    {
+        while (HasActiveJobsOrStreamerRequests())
+        {
+            DispatchEvents();
+            AZStd::this_thread::yield();
+        }
+    }
+
+    //=========================================================================
+    // RegisterHandler
+    // [7/9/2014]
+    //=========================================================================
+    void AssetManager::RegisterHandler(AssetHandler* handler, const AssetType& assetType)
+    {
+        AZ_Error("AssetDatabase", handler != nullptr, "Attempting to register a null asset handler!");
+        if (handler)
+        {
+            if (m_handlers.insert(AZStd::make_pair(assetType, handler)).second)
+            {
+                handler->m_nHandledTypes++;
+            }
+            else
+            {
+                AZ_Error("AssetDatabase", false, "Asset type %s already has a handler registered! New registration ignored!", assetType.ToString<AZStd::string>().c_str());
+            }
+        }
+    }
+
+    //=========================================================================
+    // UnregisterHandler
+    // [7/9/2014]
+    //=========================================================================
+    void AssetManager::UnregisterHandler(AssetHandler* handler)
+    {
+        AZ_Error("AssetDatabase", handler != nullptr, "Attempting to unregister a null asset handler!");
+        if (handler)
+        {
+            for (AssetHandlerMap::iterator it = m_handlers.begin(); it != m_handlers.end(); /*++it*/)
+            {
+                if (it->second == handler)
+                {
+                    // When unregistering asset handlers, it's possible that there are still some load jobs that have "finished" but
+                    // haven't destroyed themselves yet by the time the asset handler gets unregistered.  LoadAssetJob contains a weak
+                    // asset reference that doesn't clear until the job is destroyed, which happens *after* the OnAssetReady
+                    // notification is triggered.  If the thread gets swapped out between the OnAssetReady and the job destruction,
+                    // the job will still be holding onto an asset reference for this asset handler, and it will trigger the
+                    // error below.  To ensure that this case doesn't happen, we will instead call
+                    // WaitForActiveJobsAndStreamerRequestsToFinish() to make sure that any in-process jobs have completely cleaned
+                    // themselves up before proceeding forward.
+                    // One example of this pattern occurs in unit tests, where the test loads an asset, validates it, destroys the
+                    // asset, and unregisters the handler, all in rapid succession.  This would extremely infrequently
+                    // (~1 per 5000 runs) trigger the error case if we didn't wait for the jobs to finish here.
+                    WaitForActiveJobsAndStreamerRequestsToFinish();
+
+                    {
+                        // this scope is used to control the scope of the lock.
+                        AZStd::lock_guard<AZStd::recursive_mutex> assetLock(m_assetMutex);
+                        for (const auto &assetEntry : m_assets)
+                        {
+                            // is the handler that handles this type, this handler we're removing?
+                            if (assetEntry.second->m_registeredHandler == handler)
+                            {
+                                AZ_Error("AssetManager", false, "Asset handler for %s is being removed, when assetid %s is still loaded!\n",
+                                            assetEntry.second->GetType().ToString<AZ::OSString>().c_str(),
+                                            assetEntry.second->GetId().ToString<AZ::OSString>().c_str()); // this will write the name IF AVAILABLE
+                                assetEntry.second->UnregisterWithHandler();
+                            }
+                        }
+                    }
+                    it = m_handlers.erase(it);
+                    handler->m_nHandledTypes--;
+                }
+                else
+                {
+                    ++it;
                 }
             }
+        }
+    }
 
-            for(auto&& asset : assetsToRelease)
+    //=========================================================================
+    // RegisterCatalog
+    // [8/27/2012]
+    //=========================================================================
+    void AssetManager::RegisterCatalog(AssetCatalog* catalog, const AssetType& assetType)
+    {
+        AZ_Error("AssetDatabase", catalog != nullptr, "Attempting to register a null catalog!");
+        if (catalog)
+        {
+            AZStd::scoped_lock<AZStd::recursive_mutex> l(m_catalogMutex);
+            if (m_catalogs.insert(AZStd::make_pair(assetType, catalog)).second == false)
             {
-                bool removeFromHash = asset->IsRegisterReadonlyAndShareable();
-                // default creation token implies that the asset was not created by the asset manager and therefore it cannot be in the asset map. 
-                removeFromHash = asset->m_creationToken == s_defaultCreationToken ? false : removeFromHash;
+                AZ_Error("AssetDatabase", false, "Asset type %s already has a catalog registered! New registration ignored!", assetType.ToString<AZStd::string>().c_str());
+            }
+        }
+    }
 
-                ReleaseAsset(asset, asset->GetId(), asset->GetType(), removeFromHash, asset->m_creationToken);
+    //=========================================================================
+    // UnregisterCatalog
+    // [8/27/2012]
+    //=========================================================================
+    void AssetManager::UnregisterCatalog(AssetCatalog* catalog)
+    {
+        AZ_Error("AssetDatabase", catalog != nullptr, "Attempting to unregister a null catalog!");
+        if (catalog)
+        {
+            AZStd::scoped_lock<AZStd::recursive_mutex> l(m_catalogMutex);
+            for (AssetCatalogMap::iterator iter = m_catalogs.begin(); iter != m_catalogs.end(); )
+            {
+                if (iter->second == catalog)
+                {
+                    iter = m_catalogs.erase(iter);
+                }
+                else
+                {
+                    ++iter;
+                }
+
+            }
+        }
+    }
+
+    //=========================================================================
+    // GetHandledAssetTypes
+    // [6/27/2016]
+    //=========================================================================
+    void AssetManager::GetHandledAssetTypes(AssetCatalog* catalog, AZStd::vector<AssetType>& assetTypes)
+    {
+        for (AssetCatalogMap::iterator iter = m_catalogs.begin(); iter != m_catalogs.end(); iter++)
+        {
+            if (iter->second == catalog)
+            {
+                assetTypes.push_back(iter->first);
+            }
+        }
+    }
+
+    void AssetManager::SuspendAssetRelease()
+    {
+        ++m_suspendAssetRelease;
+    }
+
+    void AssetManager::ResumeAssetRelease()
+    {
+        if(--m_suspendAssetRelease != 0)
+        {
+            return;
+        }
+
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+        // First, release any containers that were loading this asset
+        for (auto asset = m_assets.begin();asset != m_assets.end();)
+        {
+            if (asset->second->m_useCount == 0)
+            {
+                auto releaseAsset = asset->second;
+                ++asset;
+                ReleaseAssetContainersForAsset(releaseAsset);
+            }
+            else
+            {
+                ++asset;
             }
         }
 
-        AssetData::AssetStatus AssetManager::BlockUntilLoadComplete(const Asset<AssetData>& asset)
+        // Second, release the assets themselves
+
+        AZStd::vector<AssetData*> assetsToRelease;
+
+        for(auto&& asset : m_assets)
         {
-            if(asset.GetStatus() == AssetData::AssetStatus::NotLoaded)
+            if(asset.second->m_weakUseCount == 0)
             {
-                AZ_Error("AssetManager", false, "BlockUntilLoadComplete must be called after an asset has been queued for load.  Asset %s (%s) is not queued for load",
-                    asset.GetHint().c_str(), asset.GetId().ToString<AZStd::string>().c_str());
+                // Keep a separate list of assets to release, because releasing them will modify the m_assets list that we're
+                // currently looping on.
+                assetsToRelease.push_back(asset.second);
             }
-            else if(!asset.IsReady())
-            {
-                // If this is the main thread we'll need to call DispatchEvents to make sure the events we're waiting on actually fire
-                // since the main thread is typically responsible for calling DispatchEvents elsewhere
-                const bool shouldDispatch = AZStd::this_thread::get_id() == m_mainThreadId;
-
-                // Wait for the asset and all queued dependencies to finish loading.
-                WaitForAsset blockingWait(asset, shouldDispatch);
-
-                blockingWait.WaitUntilReady();
-            }
-
-            return asset.GetStatus();
         }
 
-        //=========================================================================
-        // FindAsset
-        //=========================================================================
-        Asset<AssetData> AssetManager::FindAsset(const AssetId& assetId, AssetLoadBehavior assetReferenceLoadBehavior)
+        for(auto&& asset : assetsToRelease)
         {
-            // Look up the asset id in the catalog, and use the result of that instead.
-            // If assetId is a legacy id, assetInfo.m_assetId will be the canonical id. Otherwise, assetInfo.m_assetID == assetId.
-            // This is because only canonical ids are stored in m_assets (see below).
-            // Only do the look up if upgrading is enabled
-            AZ::Data::AssetInfo assetInfo;
-            if (GetAssetInfoUpgradingEnabled())
+            bool removeFromHash = asset->IsRegisterReadonlyAndShareable();
+            // default creation token implies that the asset was not created by the asset manager and therefore it cannot be in the asset map.
+            removeFromHash = asset->m_creationToken == s_defaultCreationToken ? false : removeFromHash;
+
+            ReleaseAsset(asset, asset->GetId(), asset->GetType(), removeFromHash, asset->m_creationToken);
+        }
+    }
+
+    AssetData::AssetStatus AssetManager::BlockUntilLoadComplete(const Asset<AssetData>& asset)
+    {
+        if(asset.GetStatus() == AssetData::AssetStatus::NotLoaded)
+        {
+            AZ_Error("AssetManager", false, "BlockUntilLoadComplete must be called after an asset has been queued for load.  Asset %s (%s) is not queued for load",
+                asset.GetHint().c_str(), asset.GetId().ToString<AZStd::string>().c_str());
+        }
+        else if(!asset.IsReady())
+        {
+            // If this is the main thread we'll need to call DispatchEvents to make sure the events we're waiting on actually fire
+            // since the main thread is typically responsible for calling DispatchEvents elsewhere
+            const bool shouldDispatch = AZStd::this_thread::get_id() == m_mainThreadId;
+
+            // Wait for the asset and all queued dependencies to finish loading.
+            WaitForAsset blockingWait(asset, shouldDispatch);
+
+            blockingWait.WaitUntilReady();
+        }
+
+        return asset.GetStatus();
+    }
+
+    //=========================================================================
+    // FindAsset
+    //=========================================================================
+    Asset<AssetData> AssetManager::FindAsset(const AssetId& assetId, AssetLoadBehavior assetReferenceLoadBehavior)
+    {
+        // Look up the asset id in the catalog, and use the result of that instead.
+        // If assetId is a legacy id, assetInfo.m_assetId will be the canonical id. Otherwise, assetInfo.m_assetID == assetId.
+        // This is because only canonical ids are stored in m_assets (see below).
+        // Only do the look up if upgrading is enabled
+        AZ::Data::AssetInfo assetInfo;
+        if (GetAssetInfoUpgradingEnabled())
+        {
+            AssetCatalogRequestBus::BroadcastResult(assetInfo, &AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
+        }
+
+        // If the catalog is not available, use the original assetId
+        const AssetId& assetToFind(assetInfo.m_assetId.IsValid() ? assetInfo.m_assetId : assetId);
+
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+        AssetMap::iterator it = m_assets.find(assetToFind);
+        if (it != m_assets.end())
+        {
+            Asset<AssetData> asset(assetReferenceLoadBehavior);
+            asset.SetData(it->second);
+
+            return asset;
+        }
+        return Asset<AssetData>(assetReferenceLoadBehavior);
+    }
+
+    AZStd::pair<AZStd::chrono::milliseconds, AZ::IO::IStreamerTypes::Priority> GetEffectiveDeadlineAndPriority(
+        const AssetHandler& handler, AssetType assetType, const AssetLoadParameters& loadParams)
+    {
+        AZStd::chrono::milliseconds deadline;
+        AZ::IO::IStreamerTypes::Priority priority;
+
+        handler.GetDefaultAssetLoadPriority(assetType, deadline, priority);
+
+        if (loadParams.m_deadline)
+        {
+            deadline = loadParams.m_deadline.value();
+        }
+
+        if (loadParams.m_priority)
+        {
+            priority = loadParams.m_priority.value();
+        }
+
+        return make_pair(deadline, priority);
+    }
+
+    //=========================================================================
+    // GetAsset
+    // [6/19/2012]
+    //=========================================================================
+    Asset<AssetData> AssetManager::GetAsset(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior, const AssetLoadParameters& loadParams)
+    {
+        // If parallel dependent loads are disabled, just try to load the requested asset directly, and let it trigger
+        // dependent loads as they're encountered.
+        // Parallel dependent loads are disabled during asset building because there is no guarantee that dependency information
+        // will be available and complete until after all assets are finished building.
+        if(!GetParallelDependentLoadingEnabled())
+        {
+            return GetAssetInternal(assetId, assetType, assetReferenceLoadBehavior, loadParams);
+        }
+
+        // Otherwise, use Asset Containers to load all dependent assets in parallel.
+
+        Asset<AssetData> asset = FindOrCreateAsset(assetId, assetType, assetReferenceLoadBehavior);
+
+        if(!asset || (!loadParams.m_reloadMissingDependencies && asset.IsReady()))
+        {
+            // If the asset is already ready, just return it and skip the container
+            return AZStd::move(asset);
+        }
+
+        auto container = GetAssetContainer(asset, loadParams);
+
+        AZStd::scoped_lock lock(m_assetContainerMutex);
+
+        m_ownedAssetContainers.insert({ container.get(), container });
+
+        // Only insert a new entry into m_ownedAssetContainerLookup if one doesn't already exist for this container.
+        // Because it's a multimap, it is possible to add duplicate entries by mistake.
+        bool entryExists = false;
+        auto rangeItr = m_ownedAssetContainerLookup.equal_range(assetId);
+        for (auto itr = rangeItr.first; itr != rangeItr.second; ++itr)
+        {
+            if (itr->second == container.get())
+            {
+                entryExists = true;
+                break;
+            }
+        }
+
+        // Entry for this container doesn't exist yet, so add it.
+        if (!entryExists)
+        {
+            m_ownedAssetContainerLookup.insert({ assetId, container.get() });
+        }
+
+        return asset;
+    }
+
+    Asset<AssetData> AssetManager::GetAssetInternal(const AssetId& assetId, [[maybe_unused]] const AssetType& assetType,
+        AssetLoadBehavior assetReferenceLoadBehavior, const AssetLoadParameters& loadParams, AssetInfo assetInfo /*= () */, bool signalLoaded /*= false */)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        AZ_Error("AssetDatabase", assetId.IsValid(), "GetAsset called with invalid asset Id.");
+        AZ_Error("AssetDatabase", !assetType.IsNull(), "GetAsset called with invalid asset type.");
+        bool assetMissing = false;
+
+        {
+            AZ_PROFILE_SCOPE(AzCore, "GetAsset: GetAssetInfo");
+
+            // Attempt to look up asset info from catalog
+            // This is so that when assetId is a legacy id, we're operating on the canonical id anyway
+            if (!assetInfo.m_assetId.IsValid())
             {
                 AssetCatalogRequestBus::BroadcastResult(assetInfo, &AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
             }
 
-            // If the catalog is not available, use the original assetId
-            const AssetId& assetToFind(assetInfo.m_assetId.IsValid() ? assetInfo.m_assetId : assetId);
+            // If the asset was found in the catalog, ensure the type infos match
+            if (assetInfo.m_assetId.IsValid())
+            {
+                AZ_Warning("AssetManager", assetInfo.m_assetType == assetType,
+                    "Requested asset id %s with type %s, but type is actually %s.",
+                    assetId.ToString<AZStd::string>().c_str(), assetType.ToString<AZStd::string>().c_str(),
+                    assetInfo.m_assetType.ToString<AZStd::string>().c_str());
+            }
+            else
+            {
+                AZ_Warning("AssetManager", false, "GetAsset called for asset which does not exist in asset catalog and cannot be loaded.  Asset may be missing, not processed or moved.  AssetId: %s",
+                    assetId.ToString<AZStd::string>().c_str());
 
+                // If asset not found, use the id and type given.  We will create a valid asset, but it will likely get an error
+                // status below if the asset handler doesn't reroute it to a default asset.
+                assetInfo.m_assetId = assetId;
+                assetInfo.m_assetType = assetType;
+                assetMissing = true;
+            }
+        }
+
+        AZ_PROFILE_SCOPE(AzCore, "GetAsset: %s", assetInfo.m_relativePath.c_str());
+        AZ_ASSET_NAMED_SCOPE("GetAsset: %s", assetInfo.m_relativePath.c_str());
+
+        AZStd::shared_ptr<AssetDataStream> dataStream;
+        AssetStreamInfo loadInfo;
+        bool triggerAssetErrorNotification = false;
+        bool wasUnloaded = false;
+        AssetHandler* handler = nullptr;
+        AssetData* assetData = nullptr;
+        Asset<AssetData> asset; // Used to hold a reference while job is dispatched and while outside of the assetMutex lock.
+
+        // Control the scope of the assetMutex lock
+        {
             AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-            AssetMap::iterator it = m_assets.find(assetToFind);
-            if (it != m_assets.end())
+            bool isNewEntry = false;
+
+            // check if asset already exists
             {
-                Asset<AssetData> asset(assetReferenceLoadBehavior);
-                asset.SetData(it->second);
+                AZ_PROFILE_SCOPE(AzCore, "GetAsset: FindAsset");
 
-                return asset;
-            }
-            return Asset<AssetData>(assetReferenceLoadBehavior);
-        }
-
-        AZStd::pair<AZStd::chrono::milliseconds, AZ::IO::IStreamerTypes::Priority> GetEffectiveDeadlineAndPriority(
-            const AssetHandler& handler, AssetType assetType, const AssetLoadParameters& loadParams)
-        {
-            AZStd::chrono::milliseconds deadline;
-            AZ::IO::IStreamerTypes::Priority priority;
-
-            handler.GetDefaultAssetLoadPriority(assetType, deadline, priority);
-
-            if (loadParams.m_deadline)
-            {
-                deadline = loadParams.m_deadline.value();
-            }
-
-            if (loadParams.m_priority)
-            {
-                priority = loadParams.m_priority.value();
-            }
-
-            return make_pair(deadline, priority);
-        }
-
-        //=========================================================================
-        // GetAsset
-        // [6/19/2012]
-        //=========================================================================
-        Asset<AssetData> AssetManager::GetAsset(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior, const AssetLoadParameters& loadParams)
-        {
-            // If parallel dependent loads are disabled, just try to load the requested asset directly, and let it trigger
-            // dependent loads as they're encountered.
-            // Parallel dependent loads are disabled during asset building because there is no guarantee that dependency information
-            // will be available and complete until after all assets are finished building.
-            if(!GetParallelDependentLoadingEnabled())
-            {
-                return GetAssetInternal(assetId, assetType, assetReferenceLoadBehavior, loadParams);
-            }
-
-            // Otherwise, use Asset Containers to load all dependent assets in parallel.
-
-            Asset<AssetData> asset = FindOrCreateAsset(assetId, assetType, assetReferenceLoadBehavior);
-
-            if(!asset || (!loadParams.m_reloadMissingDependencies && asset.IsReady()))
-            {
-                // If the asset is already ready, just return it and skip the container
-                return AZStd::move(asset);
-            }
-
-            auto container = GetAssetContainer(asset, loadParams);
-            
-            AZStd::scoped_lock lock(m_assetContainerMutex);
-
-            m_ownedAssetContainers.insert({ container.get(), container });
-
-            // Only insert a new entry into m_ownedAssetContainerLookup if one doesn't already exist for this container.
-            // Because it's a multimap, it is possible to add duplicate entries by mistake.
-            bool entryExists = false;
-            auto rangeItr = m_ownedAssetContainerLookup.equal_range(assetId);
-            for (auto itr = rangeItr.first; itr != rangeItr.second; ++itr)
-            {
-                if (itr->second == container.get())
+                AssetMap::iterator it = m_assets.find(assetInfo.m_assetId);
+                if (it != m_assets.end())
                 {
-                    entryExists = true;
-                    break;
-                }
-            }
-
-            // Entry for this container doesn't exist yet, so add it.
-            if (!entryExists)
-            {
-                m_ownedAssetContainerLookup.insert({ assetId, container.get() });
-            }
-
-            return asset;
-        }
-
-        Asset<AssetData> AssetManager::GetAssetInternal(const AssetId& assetId, [[maybe_unused]] const AssetType& assetType,
-            AssetLoadBehavior assetReferenceLoadBehavior, const AssetLoadParameters& loadParams, AssetInfo assetInfo /*= () */, bool signalLoaded /*= false */)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
-
-            AZ_Error("AssetDatabase", assetId.IsValid(), "GetAsset called with invalid asset Id.");
-            AZ_Error("AssetDatabase", !assetType.IsNull(), "GetAsset called with invalid asset type.");
-            bool assetMissing = false;
-
-            {
-                AZ_PROFILE_SCOPE(AzCore, "GetAsset: GetAssetInfo");
-
-                // Attempt to look up asset info from catalog
-                // This is so that when assetId is a legacy id, we're operating on the canonical id anyway
-                if (!assetInfo.m_assetId.IsValid())
-                {
-                    AssetCatalogRequestBus::BroadcastResult(assetInfo, &AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
-                }
-
-                // If the asset was found in the catalog, ensure the type infos match
-                if (assetInfo.m_assetId.IsValid())
-                {
-                    AZ_Warning("AssetManager", assetInfo.m_assetType == assetType,
-                        "Requested asset id %s with type %s, but type is actually %s.",
-                        assetId.ToString<AZStd::string>().c_str(), assetType.ToString<AZStd::string>().c_str(),
-                        assetInfo.m_assetType.ToString<AZStd::string>().c_str());
+                    assetData = it->second;
+                    asset.SetData(assetData);
                 }
                 else
                 {
-                    AZ_Warning("AssetManager", false, "GetAsset called for asset which does not exist in asset catalog and cannot be loaded.  Asset may be missing, not processed or moved.  AssetId: %s",
-                        assetId.ToString<AZStd::string>().c_str());
-
-                    // If asset not found, use the id and type given.  We will create a valid asset, but it will likely get an error
-                    // status below if the asset handler doesn't reroute it to a default asset.
-                    assetInfo.m_assetId = assetId;
-                    assetInfo.m_assetType = assetType;
-                    assetMissing = true;
+                    isNewEntry = true;
                 }
             }
 
-            AZ_PROFILE_SCOPE(AzCore, "GetAsset: %s", assetInfo.m_relativePath.c_str());
-            AZ_ASSET_NAMED_SCOPE("GetAsset: %s", assetInfo.m_relativePath.c_str());
-
-            AZStd::shared_ptr<AssetDataStream> dataStream;
-            AssetStreamInfo loadInfo;
-            bool triggerAssetErrorNotification = false;
-            bool wasUnloaded = false;
-            AssetHandler* handler = nullptr;
-            AssetData* assetData = nullptr;
-            Asset<AssetData> asset; // Used to hold a reference while job is dispatched and while outside of the assetMutex lock.
-
-            // Control the scope of the assetMutex lock
             {
-                AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                bool isNewEntry = false;
+                AZ_PROFILE_SCOPE(AzCore, "GetAsset: FindAssetHandler");
 
-                // check if asset already exists
+                // find the asset type handler
+                AssetHandlerMap::iterator handlerIt = m_handlers.find(assetInfo.m_assetType);
+                AZ_Error("AssetDatabase", handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
+                    assetInfo.m_assetType.ToString<AZ::OSString>().c_str(), assetInfo.m_assetId.ToString<AZ::OSString>().c_str());
+                if (handlerIt != m_handlers.end())
                 {
-                    AZ_PROFILE_SCOPE(AzCore, "GetAsset: FindAsset");
-
-                    AssetMap::iterator it = m_assets.find(assetInfo.m_assetId);
-                    if (it != m_assets.end())
+                    // Create the asset ptr and insert it into our asset map.
+                    handler = handlerIt->second;
+                    if (isNewEntry)
                     {
-                        assetData = it->second;
-                        asset.SetData(assetData);
-                    }
-                    else
-                    {
-                        isNewEntry = true;
-                    }
-                }
+                        AZ_PROFILE_SCOPE(AzCore, "GetAsset: CreateAsset");
 
-                {
-                    AZ_PROFILE_SCOPE(AzCore, "GetAsset: FindAssetHandler");
-
-                    // find the asset type handler
-                    AssetHandlerMap::iterator handlerIt = m_handlers.find(assetInfo.m_assetType);
-                    AZ_Error("AssetDatabase", handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
-                        assetInfo.m_assetType.ToString<AZ::OSString>().c_str(), assetInfo.m_assetId.ToString<AZ::OSString>().c_str());
-                    if (handlerIt != m_handlers.end())
-                    {
-                        // Create the asset ptr and insert it into our asset map.
-                        handler = handlerIt->second;
-                        if (isNewEntry)
+                        assetData = handler->CreateAsset(assetInfo.m_assetId, assetInfo.m_assetType);
+                        if (assetData)
                         {
-                            AZ_PROFILE_SCOPE(AzCore, "GetAsset: CreateAsset");
-
-                            assetData = handler->CreateAsset(assetInfo.m_assetId, assetInfo.m_assetType);
-                            if (assetData)
-                            {
-                                assetData->m_assetId = assetInfo.m_assetId;
-                                assetData->m_creationToken = ++m_creationTokenGenerator;
-                                assetData->RegisterWithHandler(handler);
-                                asset.SetData(assetData);
-                            }
-                            else
-                            {
-                                AZ_Error("AssetDatabase", false, "Failed to create asset with (id=%s, type=%s)",
-                                    assetInfo.m_assetId.ToString<AZ::OSString>().c_str(),
-                                    assetInfo.m_assetType.ToString<AZ::OSString>().c_str());
-                            }
-                        }
-                    }
-                }
-
-                if (assetData)
-                {
-                    if (isNewEntry && assetData->IsRegisterReadonlyAndShareable())
-                    {
-                        AZ_PROFILE_SCOPE(AzCore, "GetAsset: RegisterAsset");
-                        m_assets.insert(AZStd::make_pair(assetInfo.m_assetId, assetData));
-                    }
-                    if (assetData->GetStatus() == AssetData::AssetStatus::NotLoaded)
-                    {
-                        assetData->m_status = AssetData::AssetStatus::Queued;
-                        UpdateDebugStatus(asset);
-                        loadInfo = GetModifiedLoadStreamInfoForAsset(asset, handler);
-                        wasUnloaded = true;
-
-                        if (loadInfo.IsValid())
-                        {
-                            // Create the AssetDataStream instance here so it can claim an asset reference inside the lock (for a total
-                            // count of 2 before starting the load), otherwise the refcount will be 1, and the load could be canceled
-                            // before it is started, which creates state consistency issues.
-
-                            dataStream = AZStd::make_shared<AssetDataStream>(handler->GetAssetBufferAllocator());
+                            assetData->m_assetId = assetInfo.m_assetId;
+                            assetData->m_creationToken = ++m_creationTokenGenerator;
+                            assetData->RegisterWithHandler(handler);
+                            asset.SetData(assetData);
                         }
                         else
                         {
-                            // Asset creation was successful, but asset loading isn't, so trigger the OnAssetError notification
-                            triggerAssetErrorNotification = true;
+                            AZ_Error("AssetDatabase", false, "Failed to create asset with (id=%s, type=%s)",
+                                assetInfo.m_assetId.ToString<AZ::OSString>().c_str(),
+                                assetInfo.m_assetType.ToString<AZ::OSString>().c_str());
                         }
                     }
                 }
             }
 
-            if (!assetInfo.m_relativePath.empty())
+            if (assetData)
             {
-                asset.m_assetHint = assetInfo.m_relativePath;
-            }
-
-            asset.SetAutoLoadBehavior(assetReferenceLoadBehavior);
-
-            // We delay queueing the async file I/O until we release m_assetMutex
-            if (dataStream)
-            {
-                AZ_Assert(loadInfo.IsValid(), "Expected valid stream info when dataStream is valid.");
-                constexpr bool isReload = false;
-                QueueAsyncStreamLoad(asset, dataStream, loadInfo, isReload,
-                    handler, loadParams, signalLoaded);
-            }
-            else
-            {
-                AZ_Assert(!loadInfo.IsValid(), "Expected invalid stream info when dataStream is invalid.");
-
-                if(!wasUnloaded && assetData && assetData->GetStatus() == AssetData::AssetStatus::Queued)
+                if (isNewEntry && assetData->IsRegisterReadonlyAndShareable())
                 {
-                    auto&& [deadline, priority] = GetEffectiveDeadlineAndPriority(*handler, assetData->GetType(), loadParams);
-                    
-                    RescheduleStreamerRequest(assetData->GetId(), deadline, priority);
+                    AZ_PROFILE_SCOPE(AzCore, "GetAsset: RegisterAsset");
+                    m_assets.insert(AZStd::make_pair(assetInfo.m_assetId, assetData));
                 }
-
-                if (triggerAssetErrorNotification)
+                if (assetData->GetStatus() == AssetData::AssetStatus::NotLoaded)
                 {
-                    // If the asset was missing from the catalog, we already printed an error, so we can skip printing this one.
-                    if (!assetMissing)
+                    assetData->m_status = AssetData::AssetStatus::Queued;
+                    UpdateDebugStatus(asset);
+                    loadInfo = GetModifiedLoadStreamInfoForAsset(asset, handler);
+                    wasUnloaded = true;
+
+                    if (loadInfo.IsValid())
                     {
-                        AZ_Error("AssetDatabase", false, "Failed to retrieve required information for asset %s (%s)",
-                            assetInfo.m_assetId.ToString<AZ::OSString>().c_str(),
-                            assetInfo.m_relativePath.empty() ? "<unknown>" : assetInfo.m_relativePath.c_str());
-                    }
+                        // Create the AssetDataStream instance here so it can claim an asset reference inside the lock (for a total
+                        // count of 2 before starting the load), otherwise the refcount will be 1, and the load could be canceled
+                        // before it is started, which creates state consistency issues.
 
-                    PostLoad(asset, false, false, handler);
-                }
-            }
-
-            return asset;
-        }
-
-        void AssetManager::UpdateDebugStatus(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
-        {
-            if(!m_debugAssetEvents)
-            {
-                m_debugAssetEvents = AZ::Interface<IDebugAssetEvent>::Get();
-            }
-
-            if(m_debugAssetEvents)
-            {
-                m_debugAssetEvents->AssetStatusUpdate(asset.GetId(), asset.GetStatus());
-            }
-        }
-
-        Asset<AssetData> AssetManager::FindOrCreateAsset(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> asset_lock(m_assetMutex);
-
-            Asset<AssetData> asset = FindAsset(assetId, assetReferenceLoadBehavior);
-
-            if (!asset)
-            {
-                asset = CreateAsset(assetId, assetType, assetReferenceLoadBehavior);
-            }
-
-            return asset;
-        }
-
-        //=========================================================================
-        // CreateAsset
-        // [8/31/2012]
-        //=========================================================================
-        Asset<AssetData> AssetManager::CreateAsset(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> asset_lock(m_assetMutex);
-
-            // check if asset already exist
-            AssetMap::iterator it = m_assets.find(assetId);
-            if (it == m_assets.end())
-            {
-                // find the asset type handler
-                AssetHandlerMap::iterator handlerIt = m_handlers.find(assetType);
-                AZ_Error("AssetDatabase", handlerIt != m_handlers.end(), "No handler was registered for this asset (id=%s, type=%s)!", assetId.ToString<AZ::OSString>().c_str(), assetType.ToString<AZ::OSString>().c_str());
-                if (handlerIt != m_handlers.end())
-                {
-                    // Create the asset ptr
-                    AssetHandler* handler = handlerIt->second;
-                    auto assetData = handler->CreateAsset(assetId, assetType);
-                    AZ_Error("AssetDatabase", assetData, "Failed to create asset with (id=%s, type=%s)", assetId.ToString<AZ::OSString>().c_str(), assetType.ToString<AZ::OSString>().c_str());
-                    if (assetData)
-                    {
-                        assetData->m_assetId = assetId;
-                        assetData->m_creationToken = ++m_creationTokenGenerator;
-                        assetData->RegisterWithHandler(handler);
-                        if (assetData->IsRegisterReadonlyAndShareable())
-                        {
-                            m_assets.insert(AZStd::make_pair(assetId, assetData));
-                        }
-
-                        Asset<AssetData> asset(assetReferenceLoadBehavior);
-                        asset.SetData(assetData);
-
-                        return asset;
-                    }
-                }
-            }
-            else
-            {
-                AZ_Error("AssetDatabase", false, "Asset (id=%s, type=%s) already exists in the database! Asset not created!", assetId.ToString<AZ::OSString>().c_str(), assetType.ToString<AZ::OSString>().c_str());
-            }
-            return Asset<AssetData>(assetReferenceLoadBehavior);
-        }
-
-        //=========================================================================
-        // ReleaseAsset
-        //=========================================================================
-        void AssetManager::ReleaseAsset(AssetData* asset, AssetId assetId, AssetType assetType, bool removeAssetFromHash, int creationToken)
-        {
-            AZ_Assert(asset, "Cannot release NULL AssetPtr!");
-
-            if(m_suspendAssetRelease)
-            {
-                return;
-            }
-
-            bool wasInAssetsHash = false; // We do support assets that are not registered in the asset manager (with the same ID too).
-            bool destroyAsset = false;
-
-            if (removeAssetFromHash)
-            {
-                AZStd::scoped_lock<AZStd::recursive_mutex> asset_lock(m_assetMutex);
-                AssetMap::iterator it = m_assets.find(assetId);
-                // need to check the count again in here in case
-               // someone was trying to get the asset on another thread
-               // Set it to -1 so only this thread will attempt to clean up the cache and delete the asset
-                int expectedRefCount = 0;
-                // if the assetId is not in the map or if the identifierId
-                // do not match it implies that the asset has been already destroyed.
-                // if the usecount is non zero it implies that we cannot destroy this asset.
-                if (it != m_assets.end() && it->second->m_creationToken == creationToken && it->second->m_weakUseCount.compare_exchange_strong(expectedRefCount, -1))
-                {
-                    wasInAssetsHash = true;
-                    m_assets.erase(it);
-                    destroyAsset = true;
-                }
-            }
-            else
-            {
-                // if an asset is not shareable, it implies that that asset is not in the map 
-                // and therefore once its ref count goes to zero it cannot go back up again and therefore we can safely destroy it
-                destroyAsset = true;
-            }
-
-            // We have to separate the code which was removing the asset from the m_asset map while being locked, but then actually destroy the asset
-            // while the lock is not held since destroying the asset while holding the lock can cause a deadlock.
-            if (destroyAsset)
-            {
-                if(m_debugAssetEvents)
-                {
-                    m_debugAssetEvents->ReleaseAsset(assetId);
-                }
-
-                // find the asset type handler
-                AssetHandlerMap::iterator handlerIt = m_handlers.find(assetType);
-                if (handlerIt != m_handlers.end())
-                {
-                    AssetHandler* handler = handlerIt->second;
-                    if (asset)
-                    {
-                        handler->DestroyAsset(asset);
-
-                        if (wasInAssetsHash)
-                        {
-                            AssetBus::QueueEvent(assetId, &AssetBus::Events::OnAssetUnloaded, assetId, assetType);
-                        }
-                    }
-                }
-                else
-                {
-                    AZ_Assert(false, "No handler was registered for asset of type %s but it was still in the AssetManager as %s", assetType.ToString<AZ::OSString>().c_str(), asset->GetId().ToString<AZ::OSString>().c_str());
-                }
-            }
-        }
-
-        void AssetManager::OnAssetUnused(AssetData* asset)
-        {
-            // If we're currently suspending asset releases, don't get rid of the asset containers either.
-            if (m_suspendAssetRelease)
-            {
-                return;
-            }
-
-            ReleaseAssetContainersForAsset(asset);
-        }
-
-        void AssetManager::ReleaseAssetContainersForAsset(AssetData* asset)
-        {
-            // Release any containers that were loading this asset
-            AZStd::scoped_lock lock(m_assetContainerMutex);
-
-            AssetId assetId = asset->GetId();
-
-            auto rangeItr = m_ownedAssetContainerLookup.equal_range(assetId);
-
-            for (auto itr = rangeItr.first; itr != rangeItr.second;)
-            {
-                AZ_Assert(itr->second->GetContainerAssetId() == assetId,
-                    "Asset container is incorrectly associated with the asset being destroyed.");
-                itr->second->ClearRootAsset();
-
-                // Only remove owned asset containers if they aren't currently loading.
-                // If they *are* currently loading, removing them could cause dependent asset loads that were triggered to
-                // remain in a perpetual loading state.  Instead, leave the containers for now, they will get removed during
-                // the OnAssetContainerReady callback.
-                if (!itr->second->IsLoading())
-                {
-                    m_ownedAssetContainers.erase(itr->second);
-                    itr = m_ownedAssetContainerLookup.erase(itr);
-                }
-                else
-                {
-                    ++itr;
-                }
-            }
-        }
-
-        //=========================================================================
-        // SaveAsset
-        // [9/13/2012]
-        //=========================================================================
-        void AssetManager::SaveAsset(const Asset<AssetData>& asset)
-        {
-            AssetHandler* handler;
-            {
-                // find the asset type handler
-                AssetHandlerMap::iterator handlerIt = m_handlers.find(asset.GetType());
-                AZ_Assert(handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!", asset.GetType().ToString<AZ::OSString>().c_str(), asset.GetId().ToString<AZ::OSString>().c_str());
-                handler = handlerIt->second;
-            }
-
-            // start the data saving
-            SaveAssetJob* saveJob = aznew SaveAssetJob(JobContext::GetGlobalContext(), this, asset, handler);
-            saveJob->Start();
-        }
-
-        //=========================================================================
-        // ReloadAsset
-        //=========================================================================
-        void AssetManager::ReloadAsset(const AssetId& assetId, AssetLoadBehavior assetReferenceLoadBehavior, bool isAutoReload)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-            auto assetIter = m_assets.find(assetId);
-
-            if (assetIter == m_assets.end() || assetIter->second->IsLoading())
-            {
-                // Only existing assets can be reloaded.
-                return;
-            }
-
-            auto reloadIter = m_reloads.find(assetId);
-            if (reloadIter != m_reloads.end())
-            {
-                auto curStatus = reloadIter->second.GetData()->GetStatus();
-                // We don't need another reload if we're in "Queued" state because that reload has not actually begun yet.
-                // If it is in Loading state we want to pass by and allow the new assetData to be created and start the new reload
-                // As the current load could already be stale
-                if (curStatus == AssetData::AssetStatus::Queued)
-                {
-                    return;
-                }
-                else if (curStatus == AssetData::AssetStatus::Loading || curStatus == AssetData::AssetStatus::StreamReady)
-                {
-                    // Don't flood the tick bus - this value will be checked when the asset load completes
-                    reloadIter->second->SetRequeue(true);
-                    return;
-                }
-            }
-
-            AssetData* newAssetData = nullptr;
-            AssetHandler* handler = nullptr;
-
-            bool preventAutoReload = isAutoReload && assetIter->second && !assetIter->second->HandleAutoReload();
-
-            // when Asset<T>'s constructor is called (the one that takes an AssetData), it updates the AssetID
-            // of the Asset<T> to be the real latest canonical assetId of the asset, so we cache that here instead of have it happen
-            // implicitly and repeatedly for anything we call.
-            Asset<AssetData> currentAsset(assetIter->second, AZ::Data::AssetLoadBehavior::Default);
-
-            if (!assetIter->second->IsRegisterReadonlyAndShareable() && !preventAutoReload)
-            {
-                // Reloading an "instance asset" is basically a no-op.
-                // We'll simply notify users to reload the asset.
-                AssetBus::QueueFunction(&AssetManager::NotifyAssetReloaded, this, currentAsset);
-                return;
-            }
-            else
-            {
-                AssetBus::QueueFunction(&AssetManager::NotifyAssetPreReload, this, currentAsset);
-            }
-
-            // Current AssetData has requested not to be auto reloaded
-            if (preventAutoReload)
-            {
-                return;
-            }
-
-            // Resolve the asset handler and allocate new data for the reload.
-            {
-                AssetHandlerMap::iterator handlerIt = m_handlers.find(currentAsset.GetType());
-                AZ_Assert(handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
-                    currentAsset.GetType().ToString<AZ::OSString>().c_str(), currentAsset.GetId().ToString<AZ::OSString>().c_str());
-                handler = handlerIt->second;
-
-                newAssetData = handler->CreateAsset(currentAsset.GetId(), currentAsset.GetType());
-                if (newAssetData)
-                {
-                    newAssetData->m_assetId = currentAsset.GetId();
-                    newAssetData->RegisterWithHandler(handler);
-                }
-            }
-
-            if (newAssetData)
-            {
-                // For reloaded assets, we need to hold an internal reference to ensure the data
-                // isn't immediately destroyed. Since reloads are not a shipping feature, we'll
-                // hold this reference indefinitely, but we'll only hold the most recent one for
-                // a given asset Id.
-
-                newAssetData->m_status = AssetData::AssetStatus::Queued;
-                Asset<AssetData> newAsset(newAssetData, assetReferenceLoadBehavior);
-
-                m_reloads[newAsset.GetId()] = newAsset;
-
-                UpdateDebugStatus(newAsset);
-
-                AZStd::shared_ptr<AssetDataStream> dataStream;
-                AssetStreamInfo loadInfo = GetModifiedLoadStreamInfoForAsset(newAsset, handler);
-                constexpr bool isReload = true;
-                if (loadInfo.IsValid())
-                {
-                    // Create the AssetDataStream instance here so it can claim an asset reference inside the lock (for a total
-                    // count of 2 before starting the load), otherwise the refcount will be 1, and the load could be canceled
-                    // before it is started, which creates state consistency issues.
-
-                    dataStream = AZStd::make_shared<AssetDataStream>(handler->GetAssetBufferAllocator());
-                    if (dataStream)
-                    {
-                        // Currently there isn't a clear use case for needing to adjust priority for reloads so the default load priority is used
-                        constexpr bool signalLoaded = false;    // this is a reload, so don't signal dependent-asset loads
-                        QueueAsyncStreamLoad(newAsset, dataStream, loadInfo, isReload,
-                            handler, {}, signalLoaded);
+                        dataStream = AZStd::make_shared<AssetDataStream>(handler->GetAssetBufferAllocator());
                     }
                     else
                     {
-                        AZ_Assert(false, "Failed to create dataStream to reload asset %s (%s)",
-                            newAsset.GetId().ToString<AZ::OSString>().c_str(),
-                            newAsset.GetHint().c_str());
+                        // Asset creation was successful, but asset loading isn't, so trigger the OnAssetError notification
+                        triggerAssetErrorNotification = true;
                     }
                 }
-                else
+            }
+        }
+
+        if (!assetInfo.m_relativePath.empty())
+        {
+            asset.m_assetHint = assetInfo.m_relativePath;
+        }
+
+        asset.SetAutoLoadBehavior(assetReferenceLoadBehavior);
+
+        // We delay queueing the async file I/O until we release m_assetMutex
+        if (dataStream)
+        {
+            AZ_Assert(loadInfo.IsValid(), "Expected valid stream info when dataStream is valid.");
+            constexpr bool isReload = false;
+            QueueAsyncStreamLoad(asset, dataStream, loadInfo, isReload,
+                handler, loadParams, signalLoaded);
+        }
+        else
+        {
+            AZ_Assert(!loadInfo.IsValid(), "Expected invalid stream info when dataStream is invalid.");
+
+            if(!wasUnloaded && assetData && assetData->GetStatus() == AssetData::AssetStatus::Queued)
+            {
+                auto&& [deadline, priority] = GetEffectiveDeadlineAndPriority(*handler, assetData->GetType(), loadParams);
+
+                RescheduleStreamerRequest(assetData->GetId(), deadline, priority);
+            }
+
+            if (triggerAssetErrorNotification)
+            {
+                // If the asset was missing from the catalog, we already printed an error, so we can skip printing this one.
+                if (!assetMissing)
                 {
-                    // Asset creation was successful, but asset loading isn't, so trigger the OnAssetError notification
                     AZ_Error("AssetDatabase", false, "Failed to retrieve required information for asset %s (%s)",
-                        newAsset.GetId().ToString<AZ::OSString>().c_str(),
-                        newAsset.GetHint().c_str());
-
-                    constexpr bool loadSucceeded = false;
-                    AssetManager::Instance().PostLoad(newAsset, loadSucceeded, isReload, handler);
+                        assetInfo.m_assetId.ToString<AZ::OSString>().c_str(),
+                        assetInfo.m_relativePath.empty() ? "<unknown>" : assetInfo.m_relativePath.c_str());
                 }
 
+                PostLoad(asset, false, false, handler);
             }
         }
 
-        //=========================================================================
-        // ReloadAssetFromData
-        //=========================================================================
-        void AssetManager::ReloadAssetFromData(const Asset<AssetData>& asset)
+        return asset;
+    }
+
+    void AssetManager::UpdateDebugStatus(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
+    {
+        if(!m_debugAssetEvents)
         {
-            bool shouldAssignAssetData = false;
-
-            {
-                AZ_Assert(asset.Get(), "Asset data for reload is missing.");
-                AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                AZ_Assert(
-                    m_assets.find(asset.GetId()) != m_assets.end(),
-                    "Unable to reload asset %s because it's not in the AssetManager's asset list.", asset.ToString<AZStd::string>().c_str());
-                AZ_Assert(
-                    m_assets.find(asset.GetId()) == m_assets.end() ||
-                        asset->RTTI_GetType() == m_assets.find(asset.GetId())->second->RTTI_GetType(),
-                    "New and old data types are mismatched!");
-
-                auto found = m_assets.find(asset.GetId());
-                if ((found == m_assets.end()) || (asset->RTTI_GetType() != found->second->RTTI_GetType()))
-                {
-                    return; // this will just lead to crashes down the line and the above asserts cover this.
-                }
-
-                AssetData* newData = asset.Get();
-
-                if (found->second != newData)
-                {
-                    // Notify users that we are about to change asset
-                    AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetPreReload, asset);
-
-                    // Resolve the asset handler and account for the new asset instance.
-                    {
-                        [[maybe_unused]] AssetHandlerMap::iterator handlerIt = m_handlers.find(newData->GetType());
-                        AZ_Assert(
-                            handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
-                            newData->GetType().ToString<AZ::OSString>().c_str(), newData->GetId().ToString<AZ::OSString>().c_str());
-                    }
-
-                    shouldAssignAssetData = true;
-                }
-            }
-
-            // We specifically perform this outside of the m_assetMutex lock so that the lock isn't held at the point that
-            // OnAssetReload is triggered inside of AssignAssetData.  Otherwise, we open up a high potential for deadlocks.
-            if (shouldAssignAssetData)
-            {
-                AssignAssetData(asset);
-            }
+            m_debugAssetEvents = AZ::Interface<IDebugAssetEvent>::Get();
         }
 
-        //=========================================================================
-        // GetHandler
-        //=========================================================================
-        AssetHandler* AssetManager::GetHandler(const AssetType& assetType)
+        if(m_debugAssetEvents)
         {
-            auto handlerEntry = m_handlers.find(assetType);
-            if (handlerEntry != m_handlers.end())
-            {
-                return handlerEntry->second;
-            }
-            return nullptr;
+            m_debugAssetEvents->AssetStatusUpdate(asset.GetId(), asset.GetStatus());
+        }
+    }
+
+    Asset<AssetData> AssetManager::FindOrCreateAsset(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> asset_lock(m_assetMutex);
+
+        Asset<AssetData> asset = FindAsset(assetId, assetReferenceLoadBehavior);
+
+        if (!asset)
+        {
+            asset = CreateAsset(assetId, assetType, assetReferenceLoadBehavior);
         }
 
-        //=========================================================================
-        // AssignAssetData
-        //=========================================================================
-        void AssetManager::AssignAssetData(const Asset<AssetData>& asset)
+        return asset;
+    }
+
+    //=========================================================================
+    // CreateAsset
+    // [8/31/2012]
+    //=========================================================================
+    Asset<AssetData> AssetManager::CreateAsset(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> asset_lock(m_assetMutex);
+
+        // check if asset already exist
+        AssetMap::iterator it = m_assets.find(assetId);
+        if (it == m_assets.end())
         {
-            AZ_Assert(asset.Get(), "Reloaded data is missing!");
-
-            const AssetId& assetId = asset.GetId();
-
-            asset->m_status = AssetData::AssetStatus::Ready;
-            UpdateDebugStatus(asset);
-
-            if (asset->IsRegisterReadonlyAndShareable())
+            // find the asset type handler
+            AssetHandlerMap::iterator handlerIt = m_handlers.find(assetType);
+            AZ_Error("AssetDatabase", handlerIt != m_handlers.end(), "No handler was registered for this asset (id=%s, type=%s)!", assetId.ToString<AZ::OSString>().c_str(), assetType.ToString<AZ::OSString>().c_str());
+            if (handlerIt != m_handlers.end())
             {
-                bool requeue{ false };
+                // Create the asset ptr
+                AssetHandler* handler = handlerIt->second;
+                auto assetData = handler->CreateAsset(assetId, assetType);
+                AZ_Error("AssetDatabase", assetData, "Failed to create asset with (id=%s, type=%s)", assetId.ToString<AZ::OSString>().c_str(), assetType.ToString<AZ::OSString>().c_str());
+                if (assetData)
                 {
-                    AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                    auto found = m_assets.find(assetId);
-                    AZ_Assert(found == m_assets.end() || asset.Get()->RTTI_GetType() == found->second->RTTI_GetType(),
-                        "New and old data types are mismatched!");
-
-                    // if we are here it implies that we have two assets with the same asset id, and we are 
-                    // trying to replace the old asset with the new asset which was not created using the asset manager system.
-                    // In this scenario if any other system have cached the old asset then the asset wont be destroyed 
-                    // because of creation token mismatch when it's ref count finally goes to zero. Since the old asset is not shareable anymore 
-                    // manually setting the creationToken to default creation token will ensure that the asset is destroyed correctly.  
-                    asset.m_assetData->m_creationToken = ++m_creationTokenGenerator;
-                    if (found != m_assets.end())
+                    assetData->m_assetId = assetId;
+                    assetData->m_creationToken = ++m_creationTokenGenerator;
+                    assetData->RegisterWithHandler(handler);
+                    if (assetData->IsRegisterReadonlyAndShareable())
                     {
-                        found->second->m_creationToken = AZ::Data::s_defaultCreationToken;
+                        m_assets.insert(AZStd::make_pair(assetId, assetData));
                     }
 
-                    // Held references to old data are retained, but replace the entry in the DB for future requests.
-                    // Fire an OnAssetReloaded message so listeners can react to the new data.
-                    m_assets[assetId] = asset.Get();
+                    Asset<AssetData> asset(assetReferenceLoadBehavior);
+                    asset.SetData(assetData);
 
-                    // Release the reload reference.
-                    auto reloadInfo = m_reloads.find(assetId);
-                    if (reloadInfo != m_reloads.end())
-                    {
-                        requeue = reloadInfo->second->GetRequeue();
-                        m_reloads.erase(reloadInfo);
-                    }
+                    return asset;
                 }
-                // Call reloaded before we can call ReloadAsset below to preserve order
-                AssetBus::Event(assetId, &AssetBus::Events::OnAssetReloaded, asset);
-                // Release the lock before we call reload
-                if (requeue)
+            }
+        }
+        else
+        {
+            AZ_Error("AssetDatabase", false, "Asset (id=%s, type=%s) already exists in the database! Asset not created!", assetId.ToString<AZ::OSString>().c_str(), assetType.ToString<AZ::OSString>().c_str());
+        }
+        return Asset<AssetData>(assetReferenceLoadBehavior);
+    }
+
+    //=========================================================================
+    // ReleaseAsset
+    //=========================================================================
+    void AssetManager::ReleaseAsset(AssetData* asset, AssetId assetId, AssetType assetType, bool removeAssetFromHash, int creationToken)
+    {
+        AZ_Assert(asset, "Cannot release NULL AssetPtr!");
+
+        if(m_suspendAssetRelease)
+        {
+            return;
+        }
+
+        bool wasInAssetsHash = false; // We do support assets that are not registered in the asset manager (with the same ID too).
+        bool destroyAsset = false;
+
+        if (removeAssetFromHash)
+        {
+            AZStd::scoped_lock<AZStd::recursive_mutex> asset_lock(m_assetMutex);
+            AssetMap::iterator it = m_assets.find(assetId);
+            // need to check the count again in here in case
+           // someone was trying to get the asset on another thread
+           // Set it to -1 so only this thread will attempt to clean up the cache and delete the asset
+            int expectedRefCount = 0;
+            // if the assetId is not in the map or if the identifierId
+            // do not match it implies that the asset has been already destroyed.
+            // if the usecount is non zero it implies that we cannot destroy this asset.
+            if (it != m_assets.end() && it->second->m_creationToken == creationToken && it->second->m_weakUseCount.compare_exchange_strong(expectedRefCount, -1))
+            {
+                wasInAssetsHash = true;
+                m_assets.erase(it);
+                destroyAsset = true;
+            }
+        }
+        else
+        {
+            // if an asset is not shareable, it implies that that asset is not in the map
+            // and therefore once its ref count goes to zero it cannot go back up again and therefore we can safely destroy it
+            destroyAsset = true;
+        }
+
+        // We have to separate the code which was removing the asset from the m_asset map while being locked, but then actually destroy the asset
+        // while the lock is not held since destroying the asset while holding the lock can cause a deadlock.
+        if (destroyAsset)
+        {
+            if(m_debugAssetEvents)
+            {
+                m_debugAssetEvents->ReleaseAsset(assetId);
+            }
+
+            // find the asset type handler
+            AssetHandlerMap::iterator handlerIt = m_handlers.find(assetType);
+            if (handlerIt != m_handlers.end())
+            {
+                AssetHandler* handler = handlerIt->second;
+                if (asset)
                 {
-                    ReloadAsset(assetId, asset.GetAutoLoadBehavior());
+                    handler->DestroyAsset(asset);
+
+                    if (wasInAssetsHash)
+                    {
+                        AssetBus::QueueEvent(assetId, &AssetBus::Events::OnAssetUnloaded, assetId, assetType);
+                    }
                 }
             }
             else
             {
-                AssetBus::Event(assetId, &AssetBus::Events::OnAssetReloaded, asset);
+                AZ_Assert(false, "No handler was registered for asset of type %s but it was still in the AssetManager as %s", assetType.ToString<AZ::OSString>().c_str(), asset->GetId().ToString<AZ::OSString>().c_str());
+            }
+        }
+    }
+
+    void AssetManager::OnAssetUnused(AssetData* asset)
+    {
+        // If we're currently suspending asset releases, don't get rid of the asset containers either.
+        if (m_suspendAssetRelease)
+        {
+            return;
+        }
+
+        ReleaseAssetContainersForAsset(asset);
+    }
+
+    void AssetManager::ReleaseAssetContainersForAsset(AssetData* asset)
+    {
+        // Release any containers that were loading this asset
+        AZStd::scoped_lock lock(m_assetContainerMutex);
+
+        AssetId assetId = asset->GetId();
+
+        auto rangeItr = m_ownedAssetContainerLookup.equal_range(assetId);
+
+        for (auto itr = rangeItr.first; itr != rangeItr.second;)
+        {
+            AZ_Assert(itr->second->GetContainerAssetId() == assetId,
+                "Asset container is incorrectly associated with the asset being destroyed.");
+            itr->second->ClearRootAsset();
+
+            // Only remove owned asset containers if they aren't currently loading.
+            // If they *are* currently loading, removing them could cause dependent asset loads that were triggered to
+            // remain in a perpetual loading state.  Instead, leave the containers for now, they will get removed during
+            // the OnAssetContainerReady callback.
+            if (!itr->second->IsLoading())
+            {
+                m_ownedAssetContainers.erase(itr->second);
+                itr = m_ownedAssetContainerLookup.erase(itr);
+            }
+            else
+            {
+                ++itr;
+            }
+        }
+    }
+
+    //=========================================================================
+    // SaveAsset
+    // [9/13/2012]
+    //=========================================================================
+    void AssetManager::SaveAsset(const Asset<AssetData>& asset)
+    {
+        AssetHandler* handler;
+        {
+            // find the asset type handler
+            AssetHandlerMap::iterator handlerIt = m_handlers.find(asset.GetType());
+            AZ_Assert(handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!", asset.GetType().ToString<AZ::OSString>().c_str(), asset.GetId().ToString<AZ::OSString>().c_str());
+            handler = handlerIt->second;
+        }
+
+        // start the data saving
+        SaveAssetJob* saveJob = aznew SaveAssetJob(JobContext::GetGlobalContext(), this, asset, handler);
+        saveJob->Start();
+    }
+
+    //=========================================================================
+    // ReloadAsset
+    //=========================================================================
+    void AssetManager::ReloadAsset(const AssetId& assetId, AssetLoadBehavior assetReferenceLoadBehavior, bool isAutoReload)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+        auto assetIter = m_assets.find(assetId);
+
+        if (assetIter == m_assets.end() || assetIter->second->IsLoading())
+        {
+            // Only existing assets can be reloaded.
+            return;
+        }
+
+        auto reloadIter = m_reloads.find(assetId);
+        if (reloadIter != m_reloads.end())
+        {
+            auto curStatus = reloadIter->second.GetData()->GetStatus();
+            // We don't need another reload if we're in "Queued" state because that reload has not actually begun yet.
+            // If it is in Loading state we want to pass by and allow the new assetData to be created and start the new reload
+            // As the current load could already be stale
+            if (curStatus == AssetData::AssetStatus::Queued)
+            {
+                return;
+            }
+            else if (curStatus == AssetData::AssetStatus::Loading || curStatus == AssetData::AssetStatus::StreamReady)
+            {
+                // Don't flood the tick bus - this value will be checked when the asset load completes
+                reloadIter->second->SetRequeue(true);
+                return;
             }
         }
 
-        //=========================================================================
-        // GetModifiedLoadStreamInfoForAsset
-        //=========================================================================
-        AssetStreamInfo AssetManager::GetModifiedLoadStreamInfoForAsset(const Asset<AssetData>& asset, AssetHandler* handler)
+        AssetData* newAssetData = nullptr;
+        AssetHandler* handler = nullptr;
+
+        bool preventAutoReload = isAutoReload && assetIter->second && !assetIter->second->HandleAutoReload();
+
+        // when Asset<T>'s constructor is called (the one that takes an AssetData), it updates the AssetID
+        // of the Asset<T> to be the real latest canonical assetId of the asset, so we cache that here instead of have it happen
+        // implicitly and repeatedly for anything we call.
+        Asset<AssetData> currentAsset(assetIter->second, AZ::Data::AssetLoadBehavior::Default);
+
+        if (!assetIter->second->IsRegisterReadonlyAndShareable() && !preventAutoReload)
         {
-            AssetStreamInfo loadInfo = GetLoadStreamInfoForAsset(asset.GetId(), asset.GetType());
-            if (!loadInfo.IsValid())
-            {
-                // opportunity for handler to do default substitution:
-                AZ::Data::AssetId fallbackId = handler->AssetMissingInCatalog(asset);
-                if (fallbackId.IsValid())
-                {
-                    loadInfo = GetLoadStreamInfoForAsset(fallbackId, asset.GetType());
-                }
-            }
-
-            // Give the handler an opportunity to modify any of the load info before creating the dataStream.
-            handler->GetCustomAssetStreamInfoForLoad(loadInfo);
-
-            return loadInfo;
+            // Reloading an "instance asset" is basically a no-op.
+            // We'll simply notify users to reload the asset.
+            AssetBus::QueueFunction(&AssetManager::NotifyAssetReloaded, this, currentAsset);
+            return;
+        }
+        else
+        {
+            AssetBus::QueueFunction(&AssetManager::NotifyAssetPreReload, this, currentAsset);
         }
 
-        //=========================================================================
-        // QueueAsyncStreamLoad
-        //=========================================================================
-        void AssetManager::QueueAsyncStreamLoad(Asset<AssetData> asset, AZStd::shared_ptr<AssetDataStream> dataStream,
-            const AZ::Data::AssetStreamInfo& streamInfo, bool isReload,
-            AssetHandler* handler, const AssetLoadParameters& loadParams, bool signalLoaded)
+        // Current AssetData has requested not to be auto reloaded
+        if (preventAutoReload)
         {
-            AZ_PROFILE_FUNCTION(AzCore);
+            return;
+        }
 
-            // Set up the callback that will process the asset data once the raw file load is finished.
-            // The callback is declared as mutable so that we can clear weakAsset within the callback.  The refcount in weakAsset
-            // can trigger an AssetManager::ReleaseAsset call.  If this occurs during lambda cleanup, it could happen at any time
-            // on the file streamer thread as streamer requests get recycled, including during (or after) AssetManager shutdown.
-            // By controlling when the refcount is changed, we can ensure that it occurs while the AssetManager is still active.
-            auto assetDataStreamCallback = [this, loadParams, handler, dataStream, signalLoaded, isReload,
-                weakAsset = AssetInternal::WeakAsset<AssetData>(asset)]
-            (AZ::IO::IStreamerTypes::RequestStatus status) mutable
+        // Resolve the asset handler and allocate new data for the reload.
+        {
+            AssetHandlerMap::iterator handlerIt = m_handlers.find(currentAsset.GetType());
+            AZ_Assert(handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
+                currentAsset.GetType().ToString<AZ::OSString>().c_str(), currentAsset.GetId().ToString<AZ::OSString>().c_str());
+            handler = handlerIt->second;
+
+            newAssetData = handler->CreateAsset(currentAsset.GetId(), currentAsset.GetType());
+            if (newAssetData)
             {
-                auto assetId = weakAsset.GetId();
+                newAssetData->m_assetId = currentAsset.GetId();
+                newAssetData->RegisterWithHandler(handler);
+            }
+        }
 
-                Asset<AssetData> loadingAsset = weakAsset.GetStrongReference();
+        if (newAssetData)
+        {
+            // For reloaded assets, we need to hold an internal reference to ensure the data
+            // isn't immediately destroyed. Since reloads are not a shipping feature, we'll
+            // hold this reference indefinitely, but we'll only hold the most recent one for
+            // a given asset Id.
 
-                if (loadingAsset)
+            newAssetData->m_status = AssetData::AssetStatus::Queued;
+            Asset<AssetData> newAsset(newAssetData, assetReferenceLoadBehavior);
+
+            m_reloads[newAsset.GetId()] = newAsset;
+
+            UpdateDebugStatus(newAsset);
+
+            AZStd::shared_ptr<AssetDataStream> dataStream;
+            AssetStreamInfo loadInfo = GetModifiedLoadStreamInfoForAsset(newAsset, handler);
+            constexpr bool isReload = true;
+            if (loadInfo.IsValid())
+            {
+                // Create the AssetDataStream instance here so it can claim an asset reference inside the lock (for a total
+                // count of 2 before starting the load), otherwise the refcount will be 1, and the load could be canceled
+                // before it is started, which creates state consistency issues.
+
+                dataStream = AZStd::make_shared<AssetDataStream>(handler->GetAssetBufferAllocator());
+                if (dataStream)
                 {
-                    AZ_PROFILE_SCOPE(AzCore, "AZ::Data::LoadAssetStreamerCallback %s",
-                        loadingAsset.GetHint().c_str());
-                    {
-                        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                        AssetData* data = loadingAsset.Get();
-                        if (data->GetStatus() != AssetData::AssetStatus::Queued)
-                        {
-                            AZ_Warning("AssetManager", false, "Asset %s no longer in Queued state, abandoning load", loadingAsset.GetId().ToString<AZStd::string>().c_str());
-                            return;
-                        }
-                        data->m_status = AssetData::AssetStatus::StreamReady;
-                    }
-
-                    // The callback from AZ Streamer blocks the streaming thread until this function completes. To minimize the overhead, 
-                    // do the majority of the work in a separate job.
-                    auto loadJob = aznew LoadAssetJob(this, loadingAsset,
-                        dataStream, isReload, status, handler, loadParams, signalLoaded);
-
-                    bool jobQueued = false;
-
-                    // If there's already an active blocking request waiting for this load to complete, let that thread handle
-                    // the load itself instead of consuming a second thread.
-                    {
-                        AZStd::scoped_lock<AZStd::recursive_mutex> requestLock(m_activeBlockingRequestMutex);
-                        auto range = m_activeBlockingRequests.equal_range(assetId);
-                        for(auto blockingRequest = range.first; blockingRequest != range.second; ++blockingRequest)
-                        {
-                            if(blockingRequest->second->QueueAssetLoadJob(loadJob))
-                            {
-                                jobQueued = true;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (!jobQueued)
-                    {
-                        loadJob->Start();
-                    }
+                    // Currently there isn't a clear use case for needing to adjust priority for reloads so the default load priority is used
+                    constexpr bool signalLoaded = false;    // this is a reload, so don't signal dependent-asset loads
+                    QueueAsyncStreamLoad(newAsset, dataStream, loadInfo, isReload,
+                        handler, {}, signalLoaded);
                 }
                 else
                 {
-                    BlockingAssetLoadBus::Event(assetId, &BlockingAssetLoadBus::Events::OnLoadCanceled, assetId);
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetCanceled, assetId);
+                    AZ_Assert(false, "Failed to create dataStream to reload asset %s (%s)",
+                        newAsset.GetId().ToString<AZ::OSString>().c_str(),
+                        newAsset.GetHint().c_str());
+                }
+            }
+            else
+            {
+                // Asset creation was successful, but asset loading isn't, so trigger the OnAssetError notification
+                AZ_Error("AssetDatabase", false, "Failed to retrieve required information for asset %s (%s)",
+                    newAsset.GetId().ToString<AZ::OSString>().c_str(),
+                    newAsset.GetHint().c_str());
+
+                constexpr bool loadSucceeded = false;
+                AssetManager::Instance().PostLoad(newAsset, loadSucceeded, isReload, handler);
+            }
+
+        }
+    }
+
+    //=========================================================================
+    // ReloadAssetFromData
+    //=========================================================================
+    void AssetManager::ReloadAssetFromData(const Asset<AssetData>& asset)
+    {
+        bool shouldAssignAssetData = false;
+
+        {
+            AZ_Assert(asset.Get(), "Asset data for reload is missing.");
+            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+            AZ_Assert(
+                m_assets.find(asset.GetId()) != m_assets.end(),
+                "Unable to reload asset %s because it's not in the AssetManager's asset list.", asset.ToString<AZStd::string>().c_str());
+            AZ_Assert(
+                m_assets.find(asset.GetId()) == m_assets.end() ||
+                    asset->RTTI_GetType() == m_assets.find(asset.GetId())->second->RTTI_GetType(),
+                "New and old data types are mismatched!");
+
+            auto found = m_assets.find(asset.GetId());
+            if ((found == m_assets.end()) || (asset->RTTI_GetType() != found->second->RTTI_GetType()))
+            {
+                return; // this will just lead to crashes down the line and the above asserts cover this.
+            }
+
+            AssetData* newData = asset.Get();
+
+            if (found->second != newData)
+            {
+                // Notify users that we are about to change asset
+                AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetPreReload, asset);
+
+                // Resolve the asset handler and account for the new asset instance.
+                {
+                    [[maybe_unused]] AssetHandlerMap::iterator handlerIt = m_handlers.find(newData->GetType());
+                    AZ_Assert(
+                        handlerIt != m_handlers.end(), "No handler was registered for this asset [type:%s id:%s]!",
+                        newData->GetType().ToString<AZ::OSString>().c_str(), newData->GetId().ToString<AZ::OSString>().c_str());
                 }
 
-                // *After* the loadJob has been created, clear our asset references and remove the active streamer requests.
-                // This needs to happen after the loadJob creation to ensure that on AssetManager shutdown, there are no brief
-                // windows in which requests and/or jobs are still active after we've removed our tracking of the requests and jobs.
-
-                // Also, if the asset references don't get cleared until after the callback completes, or at some indeterminate later
-                // time when the File Streamer cleans up the file requests (for the weakAsset lambda parameter), then it's possible that
-                // they will trigger a ReleaseAsset call sometime after the AssetManager has begun to shut down, which can lead to
-                // race conditions.
-
-                weakAsset = {};
-                loadingAsset.Reset();
-                RemoveActiveStreamerRequest(assetId);
-            };
-
-            auto&& [deadline, priority] = GetEffectiveDeadlineAndPriority(*handler, asset.GetType(), loadParams);
-
-            // Track the load request and queue the asset data stream load.
-            AddActiveStreamerRequest(asset.GetId(), dataStream);
-            dataStream->Open(
-                streamInfo.m_streamName,
-                streamInfo.m_dataOffset,
-                streamInfo.m_dataLen,
-                deadline, priority, assetDataStreamCallback);
+                shouldAssignAssetData = true;
+            }
         }
 
-        //=========================================================================
-        // NotifyAssetReady
-        //=========================================================================
-        void AssetManager::NotifyAssetReady(Asset<AssetData> asset)
-        {
-            AssetData* data = asset.Get();
-            AZ_Assert(data, "NotifyAssetReady: asset is missing info!");
-            data->m_status = AssetData::AssetStatus::Ready;
-            
-            AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetReady, asset);
-        }
-
-        //=========================================================================
-        // NotifyAssetPreReload
-        //=========================================================================
-        void AssetManager::NotifyAssetPreReload(Asset<AssetData> asset)
-        {
-            AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetPreReload, asset);
-        }
-
-        //=========================================================================
-        // NotifyAssetReloaded
-        //=========================================================================
-        void AssetManager::NotifyAssetReloaded(Asset<AssetData> asset)
+        // We specifically perform this outside of the m_assetMutex lock so that the lock isn't held at the point that
+        // OnAssetReload is triggered inside of AssignAssetData.  Otherwise, we open up a high potential for deadlocks.
+        if (shouldAssignAssetData)
         {
             AssignAssetData(asset);
         }
+    }
 
-        //=========================================================================
-        // NotifyAssetReloaded
-        //=========================================================================
-        void AssetManager::NotifyAssetReloadError(Asset<AssetData> asset)
+    //=========================================================================
+    // GetHandler
+    //=========================================================================
+    AssetHandler* AssetManager::GetHandler(const AssetType& assetType)
+    {
+        auto handlerEntry = m_handlers.find(assetType);
+        if (handlerEntry != m_handlers.end())
         {
-            // Failed reloads have no side effects. Just notify observers (error reporting, etc).
+            return handlerEntry->second;
+        }
+        return nullptr;
+    }
+
+    //=========================================================================
+    // AssignAssetData
+    //=========================================================================
+    void AssetManager::AssignAssetData(const Asset<AssetData>& asset)
+    {
+        AZ_Assert(asset.Get(), "Reloaded data is missing!");
+
+        const AssetId& assetId = asset.GetId();
+
+        asset->m_status = AssetData::AssetStatus::Ready;
+        UpdateDebugStatus(asset);
+
+        if (asset->IsRegisterReadonlyAndShareable())
+        {
+            bool requeue{ false };
             {
-                AZStd::lock_guard<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                m_reloads.erase(asset.GetId());
-            }
-            AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetReloadError, asset);
-        }
-
-        //=========================================================================
-        // NotifyAssetError
-        //=========================================================================
-        void AssetManager::NotifyAssetError(Asset<AssetData> asset)
-        {
-            asset.Get()->m_status = AssetData::AssetStatus::Error;
-            AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetError, asset);
-        }
-
-        void AssetManager::NotifyAssetCanceled(AssetId assetId)
-        {
-            AssetBus::Event(assetId, &AssetBus::Events::OnAssetCanceled, assetId);
-        }
-
-        void AssetManager::NotifyAssetContainerReady(Asset<AssetData> asset)
-        {
-            AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetContainerReady, asset);
-        }
-
-        //=========================================================================
-        // AddJob
-        // [04/02/2014]
-        //=========================================================================
-        void AssetManager::AddJob(AssetDatabaseJob* job)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
-
-            m_activeJobs.push_back(*job);
-        }
-
-        //=========================================================================
-        // ValidateAndRegisterAssetLoading
-        //=========================================================================
-        bool AssetManager::ValidateAndRegisterAssetLoading(const Asset<AssetData>& asset)
-        {
-            AssetData* data = asset.Get();
-            {
-
                 AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                if (data)
+                auto found = m_assets.find(assetId);
+                AZ_Assert(found == m_assets.end() || asset.Get()->RTTI_GetType() == found->second->RTTI_GetType(),
+                    "New and old data types are mismatched!");
+
+                // if we are here it implies that we have two assets with the same asset id, and we are
+                // trying to replace the old asset with the new asset which was not created using the asset manager system.
+                // In this scenario if any other system have cached the old asset then the asset wont be destroyed
+                // because of creation token mismatch when it's ref count finally goes to zero. Since the old asset is not shareable anymore
+                // manually setting the creationToken to default creation token will ensure that the asset is destroyed correctly.
+                asset.m_assetData->m_creationToken = ++m_creationTokenGenerator;
+                if (found != m_assets.end())
                 {
-                    // The purpose of this function is to validate this asset is still in a StreamReady
-                    // and only then continue the load.  We change status to loading if everything
-                    // is expected which the blocking RegisterAssetLoading call does not do because it
-                    // is already in loading status
-                    if (data->GetStatus() != AssetData::AssetStatus::StreamReady)
-                    {
-                        // Something else has attempted to load this asset
-                        return false;
-                    }
-                    data->m_status = AssetData::AssetStatus::Loading;
-                    UpdateDebugStatus(asset);
+                    found->second->m_creationToken = AZ::Data::s_defaultCreationToken;
+                }
+
+                // Held references to old data are retained, but replace the entry in the DB for future requests.
+                // Fire an OnAssetReloaded message so listeners can react to the new data.
+                m_assets[assetId] = asset.Get();
+
+                // Release the reload reference.
+                auto reloadInfo = m_reloads.find(assetId);
+                if (reloadInfo != m_reloads.end())
+                {
+                    requeue = reloadInfo->second->GetRequeue();
+                    m_reloads.erase(reloadInfo);
                 }
             }
+            // Call reloaded before we can call ReloadAsset below to preserve order
+            AssetBus::Event(assetId, &AssetBus::Events::OnAssetReloaded, asset);
+            // Release the lock before we call reload
+            if (requeue)
+            {
+                ReloadAsset(assetId, asset.GetAutoLoadBehavior());
+            }
+        }
+        else
+        {
+            AssetBus::Event(assetId, &AssetBus::Events::OnAssetReloaded, asset);
+        }
+    }
 
-            return true;
+    //=========================================================================
+    // GetModifiedLoadStreamInfoForAsset
+    //=========================================================================
+    AssetStreamInfo AssetManager::GetModifiedLoadStreamInfoForAsset(const Asset<AssetData>& asset, AssetHandler* handler)
+    {
+        AssetStreamInfo loadInfo = GetLoadStreamInfoForAsset(asset.GetId(), asset.GetType());
+        if (!loadInfo.IsValid())
+        {
+            // opportunity for handler to do default substitution:
+            AZ::Data::AssetId fallbackId = handler->AssetMissingInCatalog(asset);
+            if (fallbackId.IsValid())
+            {
+                loadInfo = GetLoadStreamInfoForAsset(fallbackId, asset.GetType());
+            }
         }
 
-        //=========================================================================
-        // RegisterAssetLoading
-        //=========================================================================
-        void AssetManager::RegisterAssetLoading(const Asset<AssetData>& asset)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
+        // Give the handler an opportunity to modify any of the load info before creating the dataStream.
+        handler->GetCustomAssetStreamInfoForLoad(loadInfo);
 
-            AssetData* data = asset.Get();
+        return loadInfo;
+    }
+
+    //=========================================================================
+    // QueueAsyncStreamLoad
+    //=========================================================================
+    void AssetManager::QueueAsyncStreamLoad(Asset<AssetData> asset, AZStd::shared_ptr<AssetDataStream> dataStream,
+        const AZ::Data::AssetStreamInfo& streamInfo, bool isReload,
+        AssetHandler* handler, const AssetLoadParameters& loadParams, bool signalLoaded)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        // Set up the callback that will process the asset data once the raw file load is finished.
+        // The callback is declared as mutable so that we can clear weakAsset within the callback.  The refcount in weakAsset
+        // can trigger an AssetManager::ReleaseAsset call.  If this occurs during lambda cleanup, it could happen at any time
+        // on the file streamer thread as streamer requests get recycled, including during (or after) AssetManager shutdown.
+        // By controlling when the refcount is changed, we can ensure that it occurs while the AssetManager is still active.
+        auto assetDataStreamCallback = [this, loadParams, handler, dataStream, signalLoaded, isReload,
+            weakAsset = AssetInternal::WeakAsset<AssetData>(asset)]
+        (AZ::IO::IStreamerTypes::RequestStatus status) mutable
+        {
+            auto assetId = weakAsset.GetId();
+
+            Asset<AssetData> loadingAsset = weakAsset.GetStrongReference();
+
+            if (loadingAsset)
+            {
+                AZ_PROFILE_SCOPE(AzCore, "AZ::Data::LoadAssetStreamerCallback %s",
+                    loadingAsset.GetHint().c_str());
+                {
+                    AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+                    AssetData* data = loadingAsset.Get();
+                    if (data->GetStatus() != AssetData::AssetStatus::Queued)
+                    {
+                        AZ_Warning("AssetManager", false, "Asset %s no longer in Queued state, abandoning load", loadingAsset.GetId().ToString<AZStd::string>().c_str());
+                        return;
+                    }
+                    data->m_status = AssetData::AssetStatus::StreamReady;
+                }
+
+                // The callback from AZ Streamer blocks the streaming thread until this function completes. To minimize the overhead,
+                // do the majority of the work in a separate job.
+                auto loadJob = aznew LoadAssetJob(this, loadingAsset,
+                    dataStream, isReload, status, handler, loadParams, signalLoaded);
+
+                bool jobQueued = false;
+
+                // If there's already an active blocking request waiting for this load to complete, let that thread handle
+                // the load itself instead of consuming a second thread.
+                {
+                    AZStd::scoped_lock<AZStd::recursive_mutex> requestLock(m_activeBlockingRequestMutex);
+                    auto range = m_activeBlockingRequests.equal_range(assetId);
+                    for(auto blockingRequest = range.first; blockingRequest != range.second; ++blockingRequest)
+                    {
+                        if(blockingRequest->second->QueueAssetLoadJob(loadJob))
+                        {
+                            jobQueued = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!jobQueued)
+                {
+                    loadJob->Start();
+                }
+            }
+            else
+            {
+                BlockingAssetLoadBus::Event(assetId, &BlockingAssetLoadBus::Events::OnLoadCanceled, assetId);
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetCanceled, assetId);
+            }
+
+            // *After* the loadJob has been created, clear our asset references and remove the active streamer requests.
+            // This needs to happen after the loadJob creation to ensure that on AssetManager shutdown, there are no brief
+            // windows in which requests and/or jobs are still active after we've removed our tracking of the requests and jobs.
+
+            // Also, if the asset references don't get cleared until after the callback completes, or at some indeterminate later
+            // time when the File Streamer cleans up the file requests (for the weakAsset lambda parameter), then it's possible that
+            // they will trigger a ReleaseAsset call sometime after the AssetManager has begun to shut down, which can lead to
+            // race conditions.
+
+            // Make sure the streamer request is removed first before the asset is released
+            // If the asset is released first it could lead to a race condition where another thread starts loading the asset
+            // again and attempts to add a new streamer request with the same ID before the old one has been removed, causing
+            // that load request to fail
+            RemoveActiveStreamerRequest(assetId);
+            weakAsset = {};
+            loadingAsset.Reset();
+        };
+
+        auto&& [deadline, priority] = GetEffectiveDeadlineAndPriority(*handler, asset.GetType(), loadParams);
+
+        // Track the load request and queue the asset data stream load.
+        AddActiveStreamerRequest(asset.GetId(), dataStream);
+        dataStream->Open(
+            streamInfo.m_streamName,
+            streamInfo.m_dataOffset,
+            streamInfo.m_dataLen,
+            deadline, priority, assetDataStreamCallback);
+    }
+
+    //=========================================================================
+    // NotifyAssetReady
+    //=========================================================================
+    void AssetManager::NotifyAssetReady(Asset<AssetData> asset)
+    {
+        AssetData* data = asset.Get();
+        AZ_Assert(data, "NotifyAssetReady: asset is missing info!");
+        data->m_status = AssetData::AssetStatus::Ready;
+
+        AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetReady, asset);
+    }
+
+    //=========================================================================
+    // NotifyAssetPreReload
+    //=========================================================================
+    void AssetManager::NotifyAssetPreReload(Asset<AssetData> asset)
+    {
+        AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetPreReload, asset);
+    }
+
+    //=========================================================================
+    // NotifyAssetReloaded
+    //=========================================================================
+    void AssetManager::NotifyAssetReloaded(Asset<AssetData> asset)
+    {
+        AssignAssetData(asset);
+    }
+
+    //=========================================================================
+    // NotifyAssetReloaded
+    //=========================================================================
+    void AssetManager::NotifyAssetReloadError(Asset<AssetData> asset)
+    {
+        // Failed reloads have no side effects. Just notify observers (error reporting, etc).
+        {
+            AZStd::lock_guard<AZStd::recursive_mutex> assetLock(m_assetMutex);
+            m_reloads.erase(asset.GetId());
+        }
+        AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetReloadError, asset);
+    }
+
+    //=========================================================================
+    // NotifyAssetError
+    //=========================================================================
+    void AssetManager::NotifyAssetError(Asset<AssetData> asset)
+    {
+        asset.Get()->m_status = AssetData::AssetStatus::Error;
+        AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetError, asset);
+    }
+
+    void AssetManager::NotifyAssetCanceled(AssetId assetId)
+    {
+        AssetBus::Event(assetId, &AssetBus::Events::OnAssetCanceled, assetId);
+    }
+
+    void AssetManager::NotifyAssetContainerReady(Asset<AssetData> asset)
+    {
+        AssetBus::Event(asset.GetId(), &AssetBus::Events::OnAssetContainerReady, asset);
+    }
+
+    //=========================================================================
+    // AddJob
+    // [04/02/2014]
+    //=========================================================================
+    void AssetManager::AddJob(AssetDatabaseJob* job)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
+
+        m_activeJobs.push_back(*job);
+    }
+
+    //=========================================================================
+    // ValidateAndRegisterAssetLoading
+    //=========================================================================
+    bool AssetManager::ValidateAndRegisterAssetLoading(const Asset<AssetData>& asset)
+    {
+        AssetData* data = asset.Get();
+        {
+
+            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
             if (data)
             {
+                // The purpose of this function is to validate this asset is still in a StreamReady
+                // and only then continue the load.  We change status to loading if everything
+                // is expected which the blocking RegisterAssetLoading call does not do because it
+                // is already in loading status
+                if (data->GetStatus() != AssetData::AssetStatus::StreamReady)
+                {
+                    // Something else has attempted to load this asset
+                    return false;
+                }
                 data->m_status = AssetData::AssetStatus::Loading;
                 UpdateDebugStatus(asset);
             }
         }
 
-        //=========================================================================
-        // UnregisterAssetLoadingByThread
-        //=========================================================================
-        void AssetManager::UnregisterAssetLoading([[maybe_unused]] const Asset<AssetData>& asset)
+        return true;
+    }
+
+    //=========================================================================
+    // RegisterAssetLoading
+    //=========================================================================
+    void AssetManager::RegisterAssetLoading(const Asset<AssetData>& asset)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        AssetData* data = asset.Get();
+        if (data)
         {
-            AZ_PROFILE_FUNCTION(AzCore);
-        }
-
-        //=========================================================================
-        // RemoveJob
-        // [04/02/2014]
-        //=========================================================================
-        void AssetManager::RemoveJob(AssetDatabaseJob* job)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
-
-            m_activeJobs.erase(*job);
-        }
-
-        //=========================================================================
-        // AddActiveStreamerRequest
-        //=========================================================================
-        void AssetManager::AddActiveStreamerRequest(AssetId assetId, AZStd::shared_ptr<AssetDataStream> readRequest)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
-
-            // Track the request to allow for manual cancellation and for validating completion before AssetManager shutdown
-            [[maybe_unused]] auto inserted =
-                m_activeAssetDataStreamRequests.insert(AZStd::make_pair(assetId, readRequest));
-            AZ_Assert(inserted.second, "Failed to insert streaming request into map for later retrieval by asset.");
-
-        }
-
-        void AssetManager::RescheduleStreamerRequest(AssetId assetId, AZStd::chrono::milliseconds newDeadline, AZ::IO::IStreamerTypes::Priority newPriority)
-        {
-            AZStd::scoped_lock lock(m_activeJobOrRequestMutex);
-
-            auto iterator = m_activeAssetDataStreamRequests.find(assetId);
-
-            if (iterator != m_activeAssetDataStreamRequests.end())
-            {
-                iterator->second->Reschedule(newDeadline, newPriority);
-            }
-        }
-
-        //=========================================================================
-        // RemoveActiveStreamerRequest
-        //=========================================================================
-        void AssetManager::RemoveActiveStreamerRequest(AssetId assetData)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
-            m_activeAssetDataStreamRequests.erase(assetData);
-        }
-
-        //=========================================================================
-        // HasActiveJobsOrStreamerRequests
-        //=========================================================================
-        bool AssetManager::HasActiveJobsOrStreamerRequests()
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
-
-            return (!(m_activeJobs.empty() && m_activeAssetDataStreamRequests.empty()));
-        }
-
-        //=========================================================================
-        // AddBlockingRequest
-        //=========================================================================
-        void AssetManager::AddBlockingRequest(AssetId assetId, WaitForAsset* blockingRequest)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> requestLock(m_activeBlockingRequestMutex);
-
-            [[maybe_unused]] auto inserted = m_activeBlockingRequests.insert(AZStd::make_pair(assetId, blockingRequest));
-            AZ_Assert(inserted.second, "Failed to track blocking request for asset %s", assetId.ToString<AZStd::string>().c_str());
-        }
-
-        //=========================================================================
-        // RemoveBlockingRequest
-        //=========================================================================
-        void AssetManager::RemoveBlockingRequest(AssetId assetId, WaitForAsset* blockingRequest)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> requestLock(m_activeBlockingRequestMutex);
-            [[maybe_unused]] bool requestFound = false;
-            for (auto assetIdIterator = m_activeBlockingRequests.find(assetId); assetIdIterator != m_activeBlockingRequests.end(); )
-            {
-                if (assetIdIterator->second == blockingRequest)
-                {
-                    m_activeBlockingRequests.erase(assetIdIterator);
-                    requestFound = true;
-                    break;
-                }
-                else
-                {
-                    assetIdIterator++;
-                }
-            }
-
-            AZ_Assert(requestFound, "Failed to erase blocking request for asset %s", assetId.ToString<AZStd::string>().c_str());
-        }
-
-
-        //=========================================================================
-        // GetLoadStreamInfoForAsset()
-        // [04/04/2014]
-        //=========================================================================
-        AssetStreamInfo AssetManager::GetLoadStreamInfoForAsset(const AssetId& assetId, const AssetType& assetType)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> catalogLock(m_catalogMutex);
-            AssetCatalogMap::iterator catIt = m_catalogs.find(assetType);
-            if (catIt == m_catalogs.end())
-            {
-                AZ_Error("Asset", false, "Asset [type:%s id:%s] with this type doesn't have a catalog!", assetType.template ToString<AZStd::string>().c_str(), assetId.ToString<AZStd::string>().c_str());
-                return AssetStreamInfo();
-            }
-            return catIt->second->GetStreamInfoForLoad(assetId, assetType);
-        }
-
-        //=========================================================================
-        // GetSaveStreamInfoForAsset()
-        // [04/04/2014]
-        //=========================================================================
-        AssetStreamInfo AssetManager::GetSaveStreamInfoForAsset(const AssetId& assetId, const AssetType& assetType)
-        {
-            AZStd::scoped_lock<AZStd::recursive_mutex> catalogLock(m_catalogMutex);
-            AssetCatalogMap::iterator catIt = m_catalogs.find(assetType);
-            if (catIt == m_catalogs.end())
-            {
-                AZ_Error("Asset", false, "Asset [type:%s id:%s] with this type doesn't have a catalog!", assetType.template ToString<AZStd::string>().c_str(), assetId.ToString<AZStd::string>().c_str());
-                return AssetStreamInfo();
-            }
-            return catIt->second->GetStreamInfoForSave(assetId, assetType);
-        }
-
-        //=========================================================================
-        // OnAssetReady
-        // [04/02/2014]
-        //=========================================================================
-        void AssetManager::OnAssetReady(const Asset<AssetData>& asset)
-        {
-            AZ_Assert(asset.Get(), "OnAssetReady fired for an asset with no data.");
-
-            // Set status immediately from within the AssetManagerBus dispatch, so it's committed before anyone is notified (e.g. job to job, via AssetJobBus).
-            asset.Get()->m_status = AssetData::AssetStatus::ReadyPreNotify;
+            data->m_status = AssetData::AssetStatus::Loading;
             UpdateDebugStatus(asset);
-
-            // Queue broadcast message for delivery on game thread.
-            AssetBus::QueueFunction(&AssetManager::NotifyAssetReady, this, Asset<AssetData>(asset));
         }
+    }
 
-        //=========================================================================
-        // OnAssetError
-        //=========================================================================
-        void AssetManager::OnAssetError(const Asset<AssetData>& asset)
+    //=========================================================================
+    // UnregisterAssetLoadingByThread
+    //=========================================================================
+    void AssetManager::UnregisterAssetLoading([[maybe_unused]] const Asset<AssetData>& asset)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+    }
+
+    //=========================================================================
+    // RemoveJob
+    // [04/02/2014]
+    //=========================================================================
+    void AssetManager::RemoveJob(AssetDatabaseJob* job)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
+
+        m_activeJobs.erase(*job);
+    }
+
+    //=========================================================================
+    // AddActiveStreamerRequest
+    //=========================================================================
+    void AssetManager::AddActiveStreamerRequest(AssetId assetId, AZStd::shared_ptr<AssetDataStream> readRequest)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
+
+        // Track the request to allow for manual cancellation and for validating completion before AssetManager shutdown
+        [[maybe_unused]] auto inserted =
+            m_activeAssetDataStreamRequests.insert(AZStd::make_pair(assetId, readRequest));
+        AZ_Assert(inserted.second, "Failed to insert streaming request into map for later retrieval by asset.");
+
+    }
+
+    void AssetManager::RescheduleStreamerRequest(AssetId assetId, AZStd::chrono::milliseconds newDeadline, AZ::IO::IStreamerTypes::Priority newPriority)
+    {
+        AZStd::scoped_lock lock(m_activeJobOrRequestMutex);
+
+        auto iterator = m_activeAssetDataStreamRequests.find(assetId);
+
+        if (iterator != m_activeAssetDataStreamRequests.end())
         {
-            // Set status immediately from within the AssetManagerBus dispatch, so it's committed before anyone is notified (e.g. job to job, via AssetJobBus).
-            asset.Get()->m_status = AssetData::AssetStatus::Error;
-            UpdateDebugStatus(asset);
-
-            // Queue broadcast message for delivery on game thread.
-            AssetBus::QueueFunction(&AssetManager::NotifyAssetError, this, Asset<AssetData>(asset));
+            iterator->second->Reschedule(newDeadline, newPriority);
         }
+    }
 
-        void AssetManager::OnAssetCanceled(AssetId assetId)
+    //=========================================================================
+    // RemoveActiveStreamerRequest
+    //=========================================================================
+    void AssetManager::RemoveActiveStreamerRequest(AssetId assetData)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
+        m_activeAssetDataStreamRequests.erase(assetData);
+    }
+
+    //=========================================================================
+    // HasActiveJobsOrStreamerRequests
+    //=========================================================================
+    bool AssetManager::HasActiveJobsOrStreamerRequests()
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_activeJobOrRequestMutex);
+
+        return (!(m_activeJobs.empty() && m_activeAssetDataStreamRequests.empty()));
+    }
+
+    //=========================================================================
+    // AddBlockingRequest
+    //=========================================================================
+    void AssetManager::AddBlockingRequest(AssetId assetId, WaitForAsset* blockingRequest)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> requestLock(m_activeBlockingRequestMutex);
+
+        [[maybe_unused]] auto inserted = m_activeBlockingRequests.insert(AZStd::make_pair(assetId, blockingRequest));
+        AZ_Assert(inserted.second, "Failed to track blocking request for asset %s", assetId.ToString<AZStd::string>().c_str());
+    }
+
+    //=========================================================================
+    // RemoveBlockingRequest
+    //=========================================================================
+    void AssetManager::RemoveBlockingRequest(AssetId assetId, WaitForAsset* blockingRequest)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> requestLock(m_activeBlockingRequestMutex);
+        [[maybe_unused]] bool requestFound = false;
+        for (auto assetIdIterator = m_activeBlockingRequests.find(assetId); assetIdIterator != m_activeBlockingRequests.end(); )
         {
-            // Queue broadcast message for delivery on game thread.
-            AssetBus::QueueFunction(&AssetManager::NotifyAssetCanceled, this, assetId);
-        }
-
-        void AssetManager::ReleaseOwnedAssetContainer(AssetContainer* assetContainer)
-        {
-            AZ_Assert(assetContainer, "Trying to release a null assetContainer pointer!");
-            AZStd::scoped_lock lock(m_assetContainerMutex);
-            auto rangeItr = m_ownedAssetContainerLookup.equal_range(assetContainer->GetContainerAssetId());
-
-            for (auto itr = rangeItr.first; itr != rangeItr.second; ++itr)
+            if (assetIdIterator->second == blockingRequest)
             {
-                if (itr->second == assetContainer)
-                {
-                    m_ownedAssetContainerLookup.erase(itr);
-                    break;
-                }
-            }
-
-            m_ownedAssetContainers.erase(assetContainer);
-        }
-
-        void AssetManager::OnAssetContainerReady(AssetContainer* assetContainer)
-        {
-            AssetBus::QueueFunction([this, assetContainer, asset = assetContainer->GetRootAsset()]()
-            {
-                NotifyAssetContainerReady(asset);
-                ReleaseOwnedAssetContainer(assetContainer);
-            });
-        }
-
-        void AssetManager::OnAssetContainerCanceled(AssetContainer* assetContainer)
-        {
-            AssetBus::QueueFunction([this, assetContainer]()
-            {
-                ReleaseOwnedAssetContainer(assetContainer);
-            });
-        }
-
-        //=========================================================================
-        // OnAssetReloaded
-        //=========================================================================
-        void AssetManager::OnAssetReloaded(const Asset<AssetData>& asset)
-        {
-            // Queue broadcast message for delivery on game thread.
-            AssetBus::QueueFunction(&AssetManager::NotifyAssetReloaded, this, Asset<AssetData>(asset));
-        }
-
-        //=========================================================================
-        // OnAssetReloadError
-        //=========================================================================
-        void AssetManager::OnAssetReloadError(const Asset<AssetData>& asset)
-        {
-            // Queue broadcast message for delivery on game thread.
-            AssetBus::QueueFunction(&AssetManager::NotifyAssetReloadError, this, Asset<AssetData>(asset));
-        }
-
-
-        //=========================================================================
-        // AssetHandler
-        // [04/03/2014]
-        //=========================================================================
-        AssetHandler::AssetHandler()
-            : m_nHandledTypes(0)
-        {
-        }
-
-        //=========================================================================
-        // ~AssetHandler
-        // [04/03/2014]
-        //=========================================================================
-        AssetHandler::~AssetHandler()
-        {
-            if (m_nHandledTypes > 0)
-            {
-                AssetManager::Instance().UnregisterHandler(this);
-            }
-
-            AZ_Error("AssetDatabase", m_nHandledTypes == 0, "Asset handler is being destroyed but there are still %d asset types being handled by it!", (int)m_nHandledTypes);
-        }
-
-        //=========================================================================
-        // LoadAssetDataFromStream
-        //=========================================================================
-        AssetHandler::LoadResult AssetHandler::LoadAssetDataFromStream(
-            const Asset<AssetData>& asset,
-            AZStd::shared_ptr<AssetDataStream> stream,
-            const AssetFilterCB& assetLoadFilterCB)
-        {
-            AZ_PROFILE_SCOPE(AzCore, "AssetHandler::LoadAssetData - %s", asset.GetHint().c_str());
-
-#ifdef AZ_ENABLE_TRACING
-            auto start = AZStd::chrono::system_clock::now();
-#endif
-
-            LoadResult result = LoadAssetData(asset, stream, assetLoadFilterCB);
-
-#ifdef AZ_ENABLE_TRACING
-            auto loadMs = AZStd::chrono::duration_cast<AZStd::chrono::milliseconds>(
-                          AZStd::chrono::system_clock::now() - start);
-            AZ_Warning("AssetDatabase", (!cl_assetLoadWarningEnable) ||
-                       loadMs <= AZStd::chrono::milliseconds(cl_assetLoadWarningMsThreshold),
-                       "Load time threshold exceeded: LoadAssetData call for %s took %" PRId64 " ms",
-                       asset.GetHint().c_str(), loadMs.count());
-#endif
-
-            return result;
-        }
-
-        //=========================================================================
-        // InitAsset
-        // [04/03/2014]
-        //=========================================================================
-        void AssetHandler::InitAsset(const Asset<AssetData>& asset, bool loadStageSucceeded, bool isReload)
-        {
-            if (loadStageSucceeded)
-            {
-                if (isReload)
-                {
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetReloaded, asset);
-                }
-                else
-                {
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetReady, asset);
-                }
+                m_activeBlockingRequests.erase(assetIdIterator);
+                requestFound = true;
+                break;
             }
             else
             {
-                if (!isReload)
-                {
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetError, asset);
-                }
-                else
-                {
-                    AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetReloadError, asset);
-                }
+                assetIdIterator++;
             }
         }
 
-        void AssetManager::ValidateAndPostLoad(AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadSucceeded,
-                                               bool isReload, AZ::Data::AssetHandler* assetHandler)
+        AZ_Assert(requestFound, "Failed to erase blocking request for asset %s", assetId.ToString<AZStd::string>().c_str());
+    }
+
+
+    //=========================================================================
+    // GetLoadStreamInfoForAsset()
+    // [04/04/2014]
+    //=========================================================================
+    AssetStreamInfo AssetManager::GetLoadStreamInfoForAsset(const AssetId& assetId, const AssetType& assetType)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> catalogLock(m_catalogMutex);
+        AssetCatalogMap::iterator catIt = m_catalogs.find(assetType);
+        if (catIt == m_catalogs.end())
         {
+            AZ_Error("Asset", false, "Asset [type:%s id:%s] with this type doesn't have a catalog!", assetType.template ToString<AZStd::string>().c_str(), assetId.ToString<AZStd::string>().c_str());
+            return AssetStreamInfo();
+        }
+        return catIt->second->GetStreamInfoForLoad(assetId, assetType);
+    }
+
+    //=========================================================================
+    // GetSaveStreamInfoForAsset()
+    // [04/04/2014]
+    //=========================================================================
+    AssetStreamInfo AssetManager::GetSaveStreamInfoForAsset(const AssetId& assetId, const AssetType& assetType)
+    {
+        AZStd::scoped_lock<AZStd::recursive_mutex> catalogLock(m_catalogMutex);
+        AssetCatalogMap::iterator catIt = m_catalogs.find(assetType);
+        if (catIt == m_catalogs.end())
+        {
+            AZ_Error("Asset", false, "Asset [type:%s id:%s] with this type doesn't have a catalog!", assetType.template ToString<AZStd::string>().c_str(), assetId.ToString<AZStd::string>().c_str());
+            return AssetStreamInfo();
+        }
+        return catIt->second->GetStreamInfoForSave(assetId, assetType);
+    }
+
+    //=========================================================================
+    // OnAssetReady
+    // [04/02/2014]
+    //=========================================================================
+    void AssetManager::OnAssetReady(const Asset<AssetData>& asset)
+    {
+        AZ_Assert(asset.Get(), "OnAssetReady fired for an asset with no data.");
+
+        // Set status immediately from within the AssetManagerBus dispatch, so it's committed before anyone is notified (e.g. job to job, via AssetJobBus).
+        asset.Get()->m_status = AssetData::AssetStatus::ReadyPreNotify;
+        UpdateDebugStatus(asset);
+
+        // Queue broadcast message for delivery on game thread.
+        AssetBus::QueueFunction(&AssetManager::NotifyAssetReady, this, Asset<AssetData>(asset));
+    }
+
+    //=========================================================================
+    // OnAssetError
+    //=========================================================================
+    void AssetManager::OnAssetError(const Asset<AssetData>& asset)
+    {
+        // Set status immediately from within the AssetManagerBus dispatch, so it's committed before anyone is notified (e.g. job to job, via AssetJobBus).
+        asset.Get()->m_status = AssetData::AssetStatus::Error;
+        UpdateDebugStatus(asset);
+
+        // Queue broadcast message for delivery on game thread.
+        AssetBus::QueueFunction(&AssetManager::NotifyAssetError, this, Asset<AssetData>(asset));
+    }
+
+    void AssetManager::OnAssetCanceled(AssetId assetId)
+    {
+        // Queue broadcast message for delivery on game thread.
+        AssetBus::QueueFunction(&AssetManager::NotifyAssetCanceled, this, assetId);
+    }
+
+    void AssetManager::ReleaseOwnedAssetContainer(AssetContainer* assetContainer)
+    {
+        AZ_Assert(assetContainer, "Trying to release a null assetContainer pointer!");
+        AZStd::scoped_lock lock(m_assetContainerMutex);
+        auto rangeItr = m_ownedAssetContainerLookup.equal_range(assetContainer->GetContainerAssetId());
+
+        for (auto itr = rangeItr.first; itr != rangeItr.second; ++itr)
+        {
+            if (itr->second == assetContainer)
             {
-                // We may need to revalidate that this asset hasn't already passed through postLoad
-                AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
-                if (asset->IsReady() || asset->m_status == AssetData::AssetStatus::LoadedPreReady)
-                {
-                    return;
-                }
-                asset->m_status = AssetData::AssetStatus::LoadedPreReady;
-                UpdateDebugStatus(asset);
+                m_ownedAssetContainerLookup.erase(itr);
+                break;
             }
-            PostLoad(asset, loadSucceeded, isReload, assetHandler);
         }
 
-        void AssetManager::PostLoad(AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadSucceeded,
-                                    bool isReload, AZ::Data::AssetHandler* assetHandler)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
-            if (!assetHandler)
-            {
-                assetHandler = GetHandler(asset.GetType());
-            }
+        m_ownedAssetContainers.erase(assetContainer);
+    }
 
-            if (assetHandler)
+    void AssetManager::OnAssetContainerReady(AssetContainer* assetContainer)
+    {
+        AssetBus::QueueFunction([this, assetContainer, asset = assetContainer->GetRootAsset()]()
+        {
+            NotifyAssetContainerReady(asset);
+            ReleaseOwnedAssetContainer(assetContainer);
+        });
+    }
+
+    void AssetManager::OnAssetContainerCanceled(AssetContainer* assetContainer)
+    {
+        AssetBus::QueueFunction([this, assetContainer]()
+        {
+            ReleaseOwnedAssetContainer(assetContainer);
+        });
+    }
+
+    //=========================================================================
+    // OnAssetReloaded
+    //=========================================================================
+    void AssetManager::OnAssetReloaded(const Asset<AssetData>& asset)
+    {
+        // Queue broadcast message for delivery on game thread.
+        AssetBus::QueueFunction(&AssetManager::NotifyAssetReloaded, this, Asset<AssetData>(asset));
+    }
+
+    //=========================================================================
+    // OnAssetReloadError
+    //=========================================================================
+    void AssetManager::OnAssetReloadError(const Asset<AssetData>& asset)
+    {
+        // Queue broadcast message for delivery on game thread.
+        AssetBus::QueueFunction(&AssetManager::NotifyAssetReloadError, this, Asset<AssetData>(asset));
+    }
+
+
+    //=========================================================================
+    // AssetHandler
+    // [04/03/2014]
+    //=========================================================================
+    AssetHandler::AssetHandler()
+        : m_nHandledTypes(0)
+    {
+    }
+
+    //=========================================================================
+    // ~AssetHandler
+    // [04/03/2014]
+    //=========================================================================
+    AssetHandler::~AssetHandler()
+    {
+        if (m_nHandledTypes > 0)
+        {
+            AssetManager::Instance().UnregisterHandler(this);
+        }
+
+        AZ_Error("AssetDatabase", m_nHandledTypes == 0, "Asset handler is being destroyed but there are still %d asset types being handled by it!", (int)m_nHandledTypes);
+    }
+
+    //=========================================================================
+    // LoadAssetDataFromStream
+    //=========================================================================
+    AssetHandler::LoadResult AssetHandler::LoadAssetDataFromStream(
+        const Asset<AssetData>& asset,
+        AZStd::shared_ptr<AssetDataStream> stream,
+        const AssetFilterCB& assetLoadFilterCB)
+    {
+        AZ_PROFILE_SCOPE(AzCore, "AssetHandler::LoadAssetData - %s", asset.GetHint().c_str());
+
+#ifdef AZ_ENABLE_TRACING
+        auto start = AZStd::chrono::system_clock::now();
+#endif
+
+        LoadResult result = LoadAssetData(asset, stream, assetLoadFilterCB);
+
+#ifdef AZ_ENABLE_TRACING
+        auto loadMs = AZStd::chrono::duration_cast<AZStd::chrono::milliseconds>(
+                      AZStd::chrono::system_clock::now() - start);
+        AZ_Warning("AssetDatabase", (!cl_assetLoadWarningEnable) ||
+                   loadMs <= AZStd::chrono::milliseconds(cl_assetLoadWarningMsThreshold),
+                   "Load time threshold exceeded: LoadAssetData call for %s took %" PRId64 " ms",
+                   asset.GetHint().c_str(), loadMs.count());
+#endif
+
+        return result;
+    }
+
+    //=========================================================================
+    // InitAsset
+    // [04/03/2014]
+    //=========================================================================
+    void AssetHandler::InitAsset(const Asset<AssetData>& asset, bool loadStageSucceeded, bool isReload)
+    {
+        if (loadStageSucceeded)
+        {
+            if (isReload)
             {
-                // Queue the result for dispatch to main thread.
-                assetHandler->InitAsset(asset, loadSucceeded, isReload);
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetReloaded, asset);
             }
             else
             {
-                AZ_Warning("AssetManager", false, "Couldn't find handler for asset %s (%s)", asset.GetId().ToString<AZStd::string>().c_str(), asset.GetHint().c_str());
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetReady, asset);
             }
+        }
+        else
+        {
+            if (!isReload)
+            {
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetError, asset);
+            }
+            else
+            {
+                AssetManagerBus::Broadcast(&AssetManagerBus::Events::OnAssetReloadError, asset);
+            }
+        }
+    }
 
-            // Notify any dependent jobs.
-            BlockingAssetLoadBus::Event(asset.GetId(), &BlockingAssetLoadBus::Events::OnLoadComplete);
+    void AssetManager::ValidateAndPostLoad(AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadSucceeded,
+                                           bool isReload, AZ::Data::AssetHandler* assetHandler)
+    {
+        {
+            // We may need to revalidate that this asset hasn't already passed through postLoad
+            AZStd::scoped_lock<AZStd::recursive_mutex> assetLock(m_assetMutex);
+            if (asset->IsReady() || asset->m_status == AssetData::AssetStatus::LoadedPreReady)
+            {
+                return;
+            }
+            asset->m_status = AssetData::AssetStatus::LoadedPreReady;
+            UpdateDebugStatus(asset);
+        }
+        PostLoad(asset, loadSucceeded, isReload, assetHandler);
+    }
 
-            UnregisterAssetLoading(asset);
+    void AssetManager::PostLoad(AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadSucceeded,
+                                bool isReload, AZ::Data::AssetHandler* assetHandler)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+        if (!assetHandler)
+        {
+            assetHandler = GetHandler(asset.GetType());
         }
 
-        AZStd::shared_ptr<AssetContainer> AssetManager::GetAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams)
+        if (assetHandler)
         {
-            // If we're doing a custom load through a filter just hand back a one off container
-            if (loadParams.m_assetLoadFilterCB)
-            {
-                return CreateAssetContainer(asset, loadParams);
-            }
+            // Queue the result for dispatch to main thread.
+            assetHandler->InitAsset(asset, loadSucceeded, isReload);
+        }
+        else
+        {
+            AZ_Warning("AssetManager", false, "Couldn't find handler for asset %s (%s)", asset.GetId().ToString<AZStd::string>().c_str(), asset.GetHint().c_str());
+        }
 
-            AZStd::scoped_lock<AZStd::recursive_mutex> containerLock(m_assetContainerMutex);
-            AssetContainerKey containerKey{ asset.GetId(), loadParams };
+        // Notify any dependent jobs.
+        BlockingAssetLoadBus::Event(asset.GetId(), &BlockingAssetLoadBus::Events::OnLoadComplete);
 
-            auto curIter = m_assetContainers.find(containerKey);
-            if (curIter != m_assetContainers.end())
+        UnregisterAssetLoading(asset);
+    }
+
+    AZStd::shared_ptr<AssetContainer> AssetManager::GetAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams)
+    {
+        // If we're doing a custom load through a filter just hand back a one off container
+        if (loadParams.m_assetLoadFilterCB)
+        {
+            return CreateAssetContainer(asset, loadParams);
+        }
+
+        AZStd::scoped_lock<AZStd::recursive_mutex> containerLock(m_assetContainerMutex);
+        AssetContainerKey containerKey{ asset.GetId(), loadParams };
+
+        auto curIter = m_assetContainers.find(containerKey);
+        if (curIter != m_assetContainers.end())
+        {
+            auto newRef = curIter->second.lock();
+            if (newRef && newRef->IsValid())
             {
-                auto newRef = curIter->second.lock();
-                if (newRef && newRef->IsValid())
-                {
-                    return newRef;
-                }
-                auto newContainer = CreateAssetContainer(asset, loadParams);
-                curIter->second = newContainer;
-                return newContainer;
+                return newRef;
             }
             auto newContainer = CreateAssetContainer(asset, loadParams);
-
-            m_assetContainers.insert({ containerKey, newContainer });
-
+            curIter->second = newContainer;
             return newContainer;
         }
+        auto newContainer = CreateAssetContainer(asset, loadParams);
 
-        AZStd::shared_ptr<AssetContainer> AssetManager::CreateAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams) const
-        {
-            return AZStd::shared_ptr<AssetContainer>( aznew AssetContainer(AZStd::move(asset), loadParams));
-        }
-    } // namespace Data
-}   // namespace AZ
+        m_assetContainers.insert({ containerKey, newContainer });
+
+        return newContainer;
+    }
+
+    AZStd::shared_ptr<AssetContainer> AssetManager::CreateAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams) const
+    {
+        return AZStd::shared_ptr<AssetContainer>( aznew AssetContainer(AZStd::move(asset), loadParams));
+    }
+} // namespace AZ::Data
 
 size_t AZStd::hash<AZ::Data::AssetContainerKey>::operator()(const AZ::Data::AssetContainerKey& obj) const
 {
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h
index f109bb278c..9666d434c1 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h
@@ -169,14 +169,14 @@ namespace AZ
             /// Register handler with the system for a particular asset type.
             /// A handler should be registered for each asset type it handles.
             /// Please note that all the handlers are registered just once during app startup from the main thread
-            /// and therefore this is not a thread safe method and should not be invoked from different threads. 
+            /// and therefore this is not a thread safe method and should not be invoked from different threads.
             void RegisterHandler(AssetHandler* handler, const AssetType& assetType);
             /// Unregister handler from the asset system.
             /// Please note that all the handlers are unregistered just once during app shutdown from the main thread
             /// and therefore this is not a thread safe method and should not be invoked from different threads.
             void UnregisterHandler(AssetHandler* handler);
             // @}
-            
+
             // @{ Asset catalog management
             /// Register a catalog with the system for a particular asset type.
             /// A catalog should be registered for each asset type it is responsible for.
@@ -295,7 +295,7 @@ namespace AZ
             /**
             * Old 'legacy' assetIds and asset hints can be automatically replaced  with new ones during deserialize / assignment.
             * This operation can be somewhat costly, and its only useful if the program subsequently re-saves the files its loading so that
-            * the asset hints and assetIds actually persist.  Thus, it can be disabled in situations where you know you are not going to be 
+            * the asset hints and assetIds actually persist.  Thus, it can be disabled in situations where you know you are not going to be
             * saving over or creating new source files (for example builders/background apps)
             * By default, it is enabled.
             */
@@ -316,7 +316,7 @@ namespace AZ
             * This method must be invoked before you start unregistering handlers manually and shutting down the asset manager.
             * This method ensures that all jobs in flight are either canceled or completed.
             * This method is automatically called in the destructor but if you are unregistering handlers manually,
-            * you must invoke it yourself. 
+            * you must invoke it yourself.
             */
             void        PrepareShutDown();
 
@@ -366,7 +366,7 @@ namespace AZ
             /**
             * Creates a new shared AssetContainer with an optional loadFilter
             * **/
-            AZStd::shared_ptr<AssetContainer> CreateAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams = AssetLoadParameters{}) const;
+            virtual AZStd::shared_ptr<AssetContainer> CreateAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams = AssetLoadParameters{}) const;
 
 
             /**
@@ -452,7 +452,7 @@ namespace AZ
 
 
             // Variant of RegisterAssetLoading used for jobs which have been queued and need to verify the status of the asset
-            // before loading in order to prevent cases where a load is queued, then a blocking load goes through, then the queued 
+            // before loading in order to prevent cases where a load is queued, then a blocking load goes through, then the queued
             // load is processed.  This validation step leaves the loaded (And potentially modified) data as is in that case.
             bool ValidateAndRegisterAssetLoading(const Asset<AssetData>& asset);
 
@@ -482,7 +482,7 @@ namespace AZ
          * the blocking. That will result in a single thread deadlock.
          *
          * If you need to queue work, the logic needs to be similar to this:
-         * 
+         *
          AssetHandler::LoadResult MyAssetHandler::LoadAssetData(const Asset<AssetData>& asset, AZStd::shared_ptr<AssetDataStream> stream,
                                                                 const AZ::Data::AssetFilterCB& assetLoadFilterCB)
          {
@@ -496,13 +496,13 @@ namespace AZ
             }
             else
             {
-                // queue job to load asset in thread identified by m_loadingThreadId 
+                // queue job to load asset in thread identified by m_loadingThreadId
                 auto* queuedJob = QueueLoadingOnOtherThread(...);
 
                 // block waiting for queued job to complete
                 queuedJob->BlockUntilComplete();
             }
-            
+
             .
             .
             .
@@ -525,7 +525,7 @@ namespace AZ
             //! Result from LoadAssetData - it either finished loading, didn't finish and is waiting for more data, or had an error.
             enum class LoadResult : u8
             {
-                
+
                 Error,              // The provided data failed to load correctly
                 MoreDataRequired,   // The provided data loaded correctly, but more data is required to finish the asset load
                 LoadComplete        // The provided data loaded correctly, and the asset has been created
diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h b/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h
index f76ea19589..44707645d0 100644
--- a/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h
+++ b/Code/Framework/AzCore/AzCore/Asset/AssetManagerBus.h
@@ -10,6 +10,7 @@
 
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/IO/Path/Path_fwd.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/bitset.h>
 #include <AzCore/Outcome/Outcome.h>
@@ -129,7 +130,8 @@ namespace AZ
             /// Remove a catalog from our delta list and rebuild the catalog from remaining items
             virtual bool RemoveDeltaCatalog(AZStd::shared_ptr<AzFramework::AssetRegistry> /*deltaCatalog*/) { return true; }
             /// Creates a manifest with the given DeltaCatalog name
-            virtual bool CreateBundleManifest(const AZStd::string& /*deltaCatalogPath*/, const AZStd::vector<AZStd::string>& /*dependentBundleNames*/, const AZStd::string& /*fileDirectory*/, int /*bundleVersion*/, const AZStd::vector<AZStd::string>& /*levelDirs*/) { return false; }
+            virtual bool CreateBundleManifest(const AZStd::string& /*deltaCatalogPath*/, const AZStd::vector<AZStd::string>& /*dependentBundleNames*/,
+                const AZStd::string& /*fileDirectory*/, int /*bundleVersion*/, const AZStd::vector<AZ::IO::Path>& /*levelDirs*/) { return false; }
             /// Creates an instance of a registry containing info for just the specified files, and writes it out to a file at the specified path
             virtual bool CreateDeltaCatalog(const AZStd::vector<AZStd::string>& /*files*/, const AZStd::string& /*filePath*/) { return false; }
 
diff --git a/Code/Framework/AzCore/AzCore/AzCoreModule.cpp b/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
index 67123ed826..e7e87559b0 100644
--- a/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
+++ b/Code/Framework/AzCore/AzCore/AzCoreModule.cpp
@@ -19,7 +19,6 @@
 #include <AzCore/Slice/SliceSystemComponent.h>
 #include <AzCore/Slice/SliceMetadataInfoComponent.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzCore/Time/TimeSystemComponent.h>
 #include <AzCore/Console/LoggerSystemComponent.h>
 #include <AzCore/EBus/EventSchedulerSystemComponent.h>
 #include <AzCore/Task/TaskGraphSystemComponent.h>
@@ -40,7 +39,6 @@ namespace AZ
             SliceComponent::CreateDescriptor(),
             SliceSystemComponent::CreateDescriptor(),
             SliceMetadataInfoComponent::CreateDescriptor(),
-            TimeSystemComponent::CreateDescriptor(),
             LoggerSystemComponent::CreateDescriptor(),
             EventSchedulerSystemComponent::CreateDescriptor(),
             TaskGraphSystemComponent::CreateDescriptor(),
@@ -59,7 +57,6 @@ namespace AZ
     {
         return AZ::ComponentTypeList
         {
-            azrtti_typeid<TimeSystemComponent>(),
             azrtti_typeid<LoggerSystemComponent>(),
             azrtti_typeid<EventSchedulerSystemComponent>(),
             azrtti_typeid<TaskGraphSystemComponent>(),
diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
index ad7e44c2ae..fb0e4b82b8 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
@@ -45,6 +45,7 @@
 #include <AzCore/Module/Module.h>
 #include <AzCore/Module/ModuleManager.h>
 
+#include <AzCore/IO/Path/PathReflect.h>
 #include <AzCore/IO/SystemFile.h>
 
 #include <AzCore/Driller/Driller.h>
@@ -72,6 +73,7 @@
 
 #include <AzCore/Module/Environment.h>
 #include <AzCore/std/string/conversions.h>
+#include <AzCore/Time/TimeSystem.h>
 
 static void PrintEntityName(const AZ::ConsoleCommandContainer& arguments)
 {
@@ -416,6 +418,7 @@ namespace AZ
 
     ComponentApplication::ComponentApplication(int argC, char** argV)
         : m_eventLogger{}
+        , m_timeSystem(AZStd::make_unique<TimeSystem>())
     {
         if (Interface<ComponentApplicationRequests>::Get() == nullptr)
         {
@@ -485,16 +488,6 @@ namespace AZ
         constexpr bool executeRegDumpCommands = false;
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_settingsRegistry, m_commandLine, executeRegDumpCommands);
 
-        // Query for the Executable Path using OS specific functions
-        CalculateExecutablePath();
-
-        // Determine the path to the engine
-        CalculateEngineRoot();
-
-        // If the current platform returns an engaged optional from Utils::GetDefaultAppRootPath(), that is used
-        // for the application root.
-        CalculateAppRoot();
-
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(*m_settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_settingsRegistry, m_commandLine, executeRegDumpCommands);
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*m_settingsRegistry);
@@ -584,7 +577,6 @@ namespace AZ
         DestroyAllocator();
     }
 
-
     void ReportBadEngineRoot()
     {
         AZStd::string errorMessage = {"Unable to determine a valid path to the engine.\n"
@@ -614,7 +606,8 @@ namespace AZ
     {
         AZ_Assert(!m_isStarted, "Component application already started!");
 
-        if (m_engineRoot.empty())
+        using Type = AZ::SettingsRegistryInterface::Type;
+        if (m_settingsRegistry->GetType(SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder) == Type::NoType)
         {
             ReportBadEngineRoot();
             return nullptr;
@@ -686,7 +679,6 @@ namespace AZ
 
         ComponentApplicationBus::Handler::BusConnect();
 
-        m_currentTime = AZStd::chrono::system_clock::now();
         TickRequestBus::Handler::BusConnect();
 
 #if defined(AZ_ENABLE_DEBUG_TOOLS)
@@ -1180,6 +1172,24 @@ namespace AZ
         return ReflectionEnvironment::GetReflectionManager() ? ReflectionEnvironment::GetReflectionManager()->GetReflectContext<JsonRegistrationContext>() : nullptr;
     }
 
+    /// Returns the path to the engine.
+
+    const char* ComponentApplication::GetEngineRoot() const
+    {
+        static IO::FixedMaxPathString engineRoot;
+        engineRoot.clear();
+        m_settingsRegistry->Get(engineRoot, SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        return engineRoot.c_str();
+    }
+
+    const char* ComponentApplication::GetExecutableFolder() const
+    {
+        static IO::FixedMaxPathString exeFolder;
+        exeFolder.clear();
+        m_settingsRegistry->Get(exeFolder, SettingsRegistryMergeUtils::FilePathKey_BinaryFolder);
+        return exeFolder.c_str();
+    }
+
     //=========================================================================
     // CreateReflectionManager
     //=========================================================================
@@ -1404,31 +1414,23 @@ namespace AZ
 #endif
     }
 
-    void ComponentApplication::Tick(float deltaOverride /*= -1.f*/)
+    void ComponentApplication::Tick()
     {
+        AZ_PROFILE_SCOPE(System, "Component application simulation tick");
+
         {
-            AZ_PROFILE_SCOPE(System, "Component application simulation tick");
-
-            AZStd::chrono::system_clock::time_point now = AZStd::chrono::system_clock::now();
-
-            m_deltaTime = 0.0f;
-
-            if (now >= m_currentTime)
-            {
-                AZStd::chrono::duration<float> delta = now - m_currentTime;
-                m_deltaTime = deltaOverride >= 0.f ? deltaOverride : delta.count();
-            }
-
-            {
-                AZ_PROFILE_SCOPE(AzCore, "ComponentApplication::Tick:ExecuteQueuedEvents");
-                TickBus::ExecuteQueuedEvents();
-            }
-            m_currentTime = now;
-            {
-                AZ_PROFILE_SCOPE(AzCore, "ComponentApplication::Tick:OnTick");
-                EBUS_EVENT(TickBus, OnTick, m_deltaTime, ScriptTimePoint(now));
-            }
+            AZ_PROFILE_SCOPE(AzCore, "ComponentApplication::Tick:ExecuteQueuedEvents");
+            TickBus::ExecuteQueuedEvents();
         }
+
+        {
+            AZ_PROFILE_SCOPE(AzCore, "ComponentApplication::Tick:OnTick");
+            const AZ::TimeUs deltaTimeUs = m_timeSystem->AdvanceTickDeltaTimes();
+            const float deltaTimeSeconds = AZ::TimeUsToSeconds(deltaTimeUs);
+            AZ::TickBus::Broadcast(&TickEvents::OnTick, deltaTimeSeconds, GetTimeAtCurrentTick());
+        }
+
+        m_timeSystem->ApplyTickRateLimiterIfNeeded();
     }
 
     void ComponentApplication::TickSystem()
@@ -1485,27 +1487,6 @@ namespace AZ
         }
     }
 
-    //=========================================================================
-    // CalculateExecutablePath
-    //=========================================================================
-    void ComponentApplication::CalculateExecutablePath()
-    {
-        m_exeDirectory = Utils::GetExecutableDirectory();
-    }
-
-    void ComponentApplication::CalculateAppRoot()
-    {
-        if (AZStd::optional<AZ::StringFunc::Path::FixedString> appRootPath = Utils::GetDefaultAppRootPath(); appRootPath)
-        {
-            m_appRoot = AZStd::move(*appRootPath);
-        }
-    }
-
-    void ComponentApplication::CalculateEngineRoot()
-    {
-        m_engineRoot = AZ::SettingsRegistryMergeUtils::FindEngineRoot(*m_settingsRegistry).Native();
-    }
-
     void ComponentApplication::ResolveModulePath([[maybe_unused]] AZ::OSString& modulePath)
     {
         // No special parsing of the Module Path is done by the Component Application anymore
@@ -1531,13 +1512,10 @@ namespace AZ
         appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Invalid;
     }
 
-    //=========================================================================
-    // GetFrameTime
-    // [1/22/2016]
-    //=========================================================================
     float ComponentApplication::GetTickDeltaTime()
     {
-        return m_deltaTime;
+        const AZ::TimeUs gameTickTime = m_timeSystem->GetSimulationTickDeltaTimeUs();
+        return AZ::TimeUsToSeconds(gameTickTime);
     }
 
     //=========================================================================
@@ -1546,7 +1524,8 @@ namespace AZ
     //=========================================================================
     ScriptTimePoint ComponentApplication::GetTimeAtCurrentTick()
     {
-        return ScriptTimePoint(m_currentTime);
+        const AZ::TimeUs lastGameTickTime = m_timeSystem->GetLastSimulationTickTime();
+        return ScriptTimePoint(AZ::TimeUsToChrono(lastGameTickTime));
     }
 
     //=========================================================================
@@ -1569,7 +1548,7 @@ namespace AZ
         // reflect name dictionary.
         Name::Reflect(context);
         // reflect path
-        IO::PathReflection::Reflect(context);
+        IO::PathReflect(context);
 
         // reflect the SettingsRegistryInterface, SettignsRegistryImpl and the global Settings Registry
         // instance (AZ::SettingsRegistry::Get()) into the Behavior Context
diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
index 6df93aff4e..f245b5f5da 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
@@ -30,12 +30,14 @@
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/std/string/osstring.h>
 
+
 namespace AZ
 {
     class BehaviorContext;
     class IConsole;
     class Module;
     class ModuleManager;
+    class TimeSystem;
 }
 namespace AZ::Debug
 {
@@ -221,13 +223,10 @@ namespace AZ
         BehaviorContext* GetBehaviorContext() override;
         /// Returns the json registration context that has been registered with the app, if there is one.
         JsonRegistrationContext* GetJsonRegistrationContext() override;
-        /// Returns the working root folder that has been registered with the app, if there is one.
-        /// It's expected that derived applications will implement an application root.
-        const char* GetAppRoot() const override { return m_appRoot.c_str(); }
         /// Returns the path to the engine.
-        const char* GetEngineRoot() const override { return m_engineRoot.c_str(); }
+        const char* GetEngineRoot() const override;
         /// Returns the path to the folder the executable is in.
-        const char* GetExecutableFolder() const override { return m_exeDirectory.c_str(); }
+        const char* GetExecutableFolder() const override;
 
         //////////////////////////////////////////////////////////////////////////
         /// TickRequestBus
@@ -240,7 +239,7 @@ namespace AZ
         /**
          * Ticks all components using the \ref AZ::TickBus during simulation time. May not tick if the application is not active (i.e. not in focus)
          */
-        virtual void Tick(float deltaOverride = -1.f);
+        virtual void Tick();
 
         /**
         * Ticks all using the \ref AZ::SystemTickBus at all times. Should always tick even if the application is not active.
@@ -352,15 +351,6 @@ namespace AZ
         /// Adds system components requested by modules and the application to the system entity.
         void AddRequiredSystemComponents(AZ::Entity* systemEntity);
 
-        /// Calculates the directory the application executable comes from.
-        void CalculateExecutablePath();
-
-        /// Calculates the root directory of the engine.
-        void CalculateEngineRoot();
-
-        /// Deprecated: The term "AppRoot" has no meaning
-        void CalculateAppRoot();
-
         template<typename Iterator>
         static void NormalizePath(Iterator begin, Iterator end, bool doLowercase = true)
         {
@@ -371,8 +361,6 @@ namespace AZ
             }
         }
 
-        AZStd::chrono::system_clock::time_point     m_currentTime{ AZStd::chrono::system_clock::time_point::max() };
-        float                                       m_deltaTime{ 0.0f };
         AZStd::unique_ptr<ModuleManager>            m_moduleManager;
         AZStd::unique_ptr<SettingsRegistryInterface> m_settingsRegistry;
         EntityAddedEvent                            m_entityAddedEvent;
@@ -388,14 +376,13 @@ namespace AZ
         void*                                       m_fixedMemoryBlock{ nullptr }; //!< Pointer to the memory block allocator, so we can free it OnDestroy.
         IAllocatorAllocate*                         m_osAllocator{ nullptr };
         EntitySetType                               m_entities;
-        AZ::IO::FixedMaxPath                        m_exeDirectory;
-        AZ::IO::FixedMaxPath                        m_engineRoot;
-        AZ::IO::FixedMaxPath                        m_appRoot;
 
         AZ::SettingsRegistryInterface::NotifyEventHandler m_projectPathChangedHandler;
         AZ::SettingsRegistryInterface::NotifyEventHandler m_projectNameChangedHandler;
         AZ::SettingsRegistryInterface::NotifyEventHandler m_commandLineUpdatedHandler;
 
+        AZStd::unique_ptr<AZ::TimeSystem> m_timeSystem;
+
         // ConsoleFunctorHandle is responsible for unregistering the Settings Registry Console
         // from the m_console member when it goes out of scope
         AZ::SettingsRegistryConsoleUtils::ConsoleFunctorHandle m_settingsRegistryConsoleFunctors;
diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h
index 0c0977384a..feefa95973 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplicationBus.h
@@ -175,10 +175,6 @@ namespace AZ
         //! the serializers used by the best-effort json serialization.
         virtual class JsonRegistrationContext* GetJsonRegistrationContext() = 0;
 
-        //! Gets the name of the working root folder that was registered with the app.
-        //! @return a pointer to the name of the app's root folder, if a root folder was registered.
-        virtual const char* GetAppRoot() const = 0;
-
         //! Gets the path of the working engine folder that the app is a part of.
         //! @return a pointer to the engine path.
         virtual const char* GetEngineRoot() const = 0;
diff --git a/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp b/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp
index fcc8cd6424..54e40c1fc0 100644
--- a/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/EntityUtils.cpp
@@ -10,292 +10,289 @@
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/std/containers/fixed_vector.h>
 
-namespace AZ
+namespace AZ::EntityUtils
 {
-    namespace EntityUtils
+    //=========================================================================
+    // Reflect
+    //=========================================================================
+    void Reflect(ReflectContext* context)
     {
-        //=========================================================================
-        // Reflect
-        //=========================================================================
-        void Reflect(ReflectContext* context)
+        if (auto serializeContext = azrtti_cast<SerializeContext*>(context))
         {
-            if (auto serializeContext = azrtti_cast<SerializeContext*>(context))
+            serializeContext->Class<SerializableEntityContainer>()->
+                Version(1)->
+                Field("Entities", &SerializableEntityContainer::m_entities);
+        }
+    }
+
+    struct StackDataType
+    {
+        const SerializeContext::ClassData* m_classData;
+        const SerializeContext::ClassElement* m_elementData;
+        void* m_dataPtr;
+        bool m_isModifiedContainer;
+    };
+
+    //=========================================================================
+    // EnumerateEntityIds
+    //=========================================================================
+    void EnumerateEntityIds(const void* classPtr, const Uuid& classUuid, const EntityIdVisitor& visitor, SerializeContext* context)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        if (!context)
+        {
+            context = GetApplicationSerializeContext();
+            if (!context)
             {
-                serializeContext->Class<SerializableEntityContainer>()->
-                    Version(1)->
-                    Field("Entities", &SerializableEntityContainer::m_entities);
+                AZ_Error("Serialization", false, "No serialize context provided! Failed to get component application default serialize context! ComponentApp is not started or input serialize context should not be null!");
+                return;
             }
         }
+        AZStd::vector<const SerializeContext::ClassData*> parentStack;
+        parentStack.reserve(30);
+        auto beginCB = [ &](void* ptr, const SerializeContext::ClassData* classData, const SerializeContext::ClassElement* elementData) -> bool
+            {
+                (void)elementData;
 
-        struct StackDataType
+                if (classData->m_typeId == SerializeTypeInfo<EntityId>::GetUuid())
+                {
+                    // determine if this is entity ref or just entityId (please refer to the function documentation for more info)
+                    bool isEntityId = false;
+                    if (!parentStack.empty() && parentStack.back()->m_typeId == SerializeTypeInfo<Entity>::GetUuid())
+                    {
+                        // our parent in the entity (currently entity has only one EntityId member, but we can check the offset for future proof
+                        AZ_Assert(elementData && strcmp(elementData->m_name, "Id") == 0, "class Entity, should have only ONE EntityId member, the actual entity id!");
+                        isEntityId = true;
+                    }
+
+                    EntityId* entityIdPtr = (elementData->m_flags & SerializeContext::ClassElement::FLG_POINTER) ?
+                        *reinterpret_cast<EntityId**>(ptr) : reinterpret_cast<EntityId*>(ptr);
+                    visitor(*entityIdPtr, isEntityId, elementData);
+                }
+
+                parentStack.push_back(classData);
+                return true;
+            };
+
+        auto endCB = [ &]() -> bool
+            {
+                parentStack.pop_back();
+                return true;
+            };
+
+        SerializeContext::EnumerateInstanceCallContext callContext(
+            beginCB,
+            endCB,
+            context,
+            SerializeContext::ENUM_ACCESS_FOR_READ,
+            nullptr
+        );
+
+        context->EnumerateInstanceConst(
+            &callContext,
+            classPtr,
+            classUuid,
+            nullptr,
+            nullptr
+            );
+    }
+
+    //=========================================================================
+    // GetApplicationSerializeContext
+    //=========================================================================
+    SerializeContext* GetApplicationSerializeContext()
+    {
+        SerializeContext* context = nullptr;
+        EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
+        return context;
+    }
+
+    //=========================================================================
+    // FindFirstDerivedComponent
+    //=========================================================================
+    Component* FindFirstDerivedComponent(const Entity* entity, const Uuid& typeId)
+    {
+        for (AZ::Component* component : entity->GetComponents())
         {
-            const SerializeContext::ClassData* m_classData;
-            const SerializeContext::ClassElement* m_elementData;
-            void* m_dataPtr;
-            bool m_isModifiedContainer;
+            if (azrtti_istypeof(typeId, component))
+            {
+                return component;
+            }
+        }
+        return nullptr;
+    }
+
+    Component* FindFirstDerivedComponent(EntityId entityId, const Uuid& typeId)
+    {
+        Entity* entity{};
+        ComponentApplicationBus::BroadcastResult(entity, &ComponentApplicationRequests::FindEntity, entityId);
+        return entity ? FindFirstDerivedComponent(entity, typeId) : nullptr;
+    }
+
+    //=========================================================================
+    // FindDerivedComponents
+    //=========================================================================
+    Entity::ComponentArrayType FindDerivedComponents(const Entity* entity, const Uuid& typeId)
+    {
+        Entity::ComponentArrayType result;
+        for (AZ::Component* component : entity->GetComponents())
+        {
+            if (azrtti_istypeof(typeId, component))
+            {
+                result.push_back(component);
+            }
+        }
+        return result;
+    }
+
+    Entity::ComponentArrayType FindDerivedComponents(EntityId entityId, const Uuid& typeId)
+    {
+        Entity* entity{};
+        ComponentApplicationBus::BroadcastResult(entity, &ComponentApplicationRequests::FindEntity, entityId);
+        return entity ? FindDerivedComponents(entity, typeId) : Entity::ComponentArrayType();
+    }
+
+    bool EnumerateBaseRecursive(SerializeContext* context, const EnumerateBaseRecursiveVisitor& baseClassVisitor, const TypeId& typeToExamine)
+    {
+        AZ_Assert(context, "CheckDeclaresSerializeBaseClass called with no serialize context.");
+        if (!context)
+        {
+            return false;
+        }
+
+        AZStd::fixed_vector<TypeId, 64> knownBaseClasses = { typeToExamine };  // avoid allocating heap here if possible.  64 types are 64*sizeof(Uuid) which is only 1k.
+        bool foundBaseClass = false;
+        auto enumerateBaseVisitor = [&baseClassVisitor, &knownBaseClasses](const AZ::SerializeContext::ClassData* classData, const TypeId& examineTypeId)
+        {
+            if (!classData)
+            {
+                return false;
+            }
+
+            if (AZStd::find(knownBaseClasses.begin(), knownBaseClasses.end(), classData->m_typeId) == knownBaseClasses.end())
+            {
+                if (knownBaseClasses.size() == 64)
+                {
+                    // this should be pretty unlikely since a single class would have to have many other classes in its heirarchy
+                    // and it'd all have to be basically in one layer, as we are popping as we explore.
+                    AZ_WarningOnce("EntityUtils", false, "While trying to find a base class, all available slots were consumed.  consider increasing the size of knownBaseClasses.\n");
+                    // we cannot continue any further, assume we did not find it.
+                    return false;
+                }
+                knownBaseClasses.push_back(classData->m_typeId);
+            }
+
+            return baseClassVisitor(classData, examineTypeId);
         };
 
-        //=========================================================================
-        // EnumerateEntityIds
-        //=========================================================================
-        void EnumerateEntityIds(const void* classPtr, const Uuid& classUuid, const EntityIdVisitor& visitor, SerializeContext* context)
+        while (!knownBaseClasses.empty() && !foundBaseClass)
         {
-            AZ_PROFILE_FUNCTION(AzCore);
+            TypeId toExamine = knownBaseClasses.back();
+            knownBaseClasses.pop_back();
 
-            if (!context)
-            {
-                context = GetApplicationSerializeContext();
-                if (!context)
-                {
-                    AZ_Error("Serialization", false, "No serialize context provided! Failed to get component application default serialize context! ComponentApp is not started or input serialize context should not be null!");
-                    return;
-                }
-            }
-            AZStd::vector<const SerializeContext::ClassData*> parentStack;
-            parentStack.reserve(30);
-            auto beginCB = [ &](void* ptr, const SerializeContext::ClassData* classData, const SerializeContext::ClassElement* elementData) -> bool
-                {
-                    (void)elementData;
-
-                    if (classData->m_typeId == SerializeTypeInfo<EntityId>::GetUuid())
-                    {
-                        // determine if this is entity ref or just entityId (please refer to the function documentation for more info)
-                        bool isEntityId = false;
-                        if (!parentStack.empty() && parentStack.back()->m_typeId == SerializeTypeInfo<Entity>::GetUuid())
-                        {
-                            // our parent in the entity (currently entity has only one EntityId member, but we can check the offset for future proof
-                            AZ_Assert(elementData && strcmp(elementData->m_name, "Id") == 0, "class Entity, should have only ONE EntityId member, the actual entity id!");
-                            isEntityId = true;
-                        }
-
-                        EntityId* entityIdPtr = (elementData->m_flags & SerializeContext::ClassElement::FLG_POINTER) ?
-                            *reinterpret_cast<EntityId**>(ptr) : reinterpret_cast<EntityId*>(ptr);
-                        visitor(*entityIdPtr, isEntityId, elementData);
-                    }
-
-                    parentStack.push_back(classData);
-                    return true;
-                };
-
-            auto endCB = [ &]() -> bool
-                {
-                    parentStack.pop_back();
-                    return true;
-                };
-
-            SerializeContext::EnumerateInstanceCallContext callContext(
-                beginCB,
-                endCB,
-                context,
-                SerializeContext::ENUM_ACCESS_FOR_READ,
-                nullptr
-            );
-
-            context->EnumerateInstanceConst(
-                &callContext,
-                classPtr,
-                classUuid,
-                nullptr,
-                nullptr
-                );
+            context->EnumerateBase(enumerateBaseVisitor, toExamine);
         }
 
-        //=========================================================================
-        // GetApplicationSerializeContext
-        //=========================================================================
-        SerializeContext* GetApplicationSerializeContext()
-        {
-            SerializeContext* context = nullptr;
-            EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
-            return context;
-        }
+        return foundBaseClass;
+    }
 
-        //=========================================================================
-        // FindFirstDerivedComponent
-        //=========================================================================
-        Component* FindFirstDerivedComponent(const Entity* entity, const Uuid& typeId)
+    bool CheckIfClassIsDeprecated(SerializeContext* context, const TypeId& typeToExamine)
+    {
+        bool isDeprecated = false;
+        auto classVisitorFn = [&isDeprecated](const AZ::SerializeContext::ClassData* classData, const TypeId& /*rttiBase*/)
         {
-            for (AZ::Component* component : entity->GetComponents())
-            {
-                if (azrtti_istypeof(typeId, component))
-                {
-                    return component;
-                }
-            }
-            return nullptr;
-        }
-
-        Component* FindFirstDerivedComponent(EntityId entityId, const Uuid& typeId)
-        {
-            Entity* entity{};
-            ComponentApplicationBus::BroadcastResult(entity, &ComponentApplicationRequests::FindEntity, entityId);
-            return entity ? FindFirstDerivedComponent(entity, typeId) : nullptr;
-        }
-
-        //=========================================================================
-        // FindDerivedComponents
-        //=========================================================================
-        Entity::ComponentArrayType FindDerivedComponents(const Entity* entity, const Uuid& typeId)
-        {
-            Entity::ComponentArrayType result;
-            for (AZ::Component* component : entity->GetComponents())
-            {
-                if (azrtti_istypeof(typeId, component))
-                {
-                    result.push_back(component);
-                }
-            }
-            return result;
-        }
-
-        Entity::ComponentArrayType FindDerivedComponents(EntityId entityId, const Uuid& typeId)
-        {
-            Entity* entity{};
-            ComponentApplicationBus::BroadcastResult(entity, &ComponentApplicationRequests::FindEntity, entityId);
-            return entity ? FindDerivedComponents(entity, typeId) : Entity::ComponentArrayType();
-        }
-
-        bool EnumerateBaseRecursive(SerializeContext* context, const EnumerateBaseRecursiveVisitor& baseClassVisitor, const TypeId& typeToExamine)
-        {
-            AZ_Assert(context, "CheckDeclaresSerializeBaseClass called with no serialize context.");
-            if (!context)
+            // Stop iterating once we stop receiving SerializeContext::ClassData*.
+            if (!classData)
             {
                 return false;
             }
 
-            AZStd::fixed_vector<TypeId, 64> knownBaseClasses = { typeToExamine };  // avoid allocating heap here if possible.  64 types are 64*sizeof(Uuid) which is only 1k.
-            bool foundBaseClass = false;
-            auto enumerateBaseVisitor = [&baseClassVisitor, &knownBaseClasses](const AZ::SerializeContext::ClassData* classData, const TypeId& examineTypeId)
-            {
-                if (!classData)
-                {
-                    return false;
-                }
-
-                if (AZStd::find(knownBaseClasses.begin(), knownBaseClasses.end(), classData->m_typeId) == knownBaseClasses.end())
-                {
-                    if (knownBaseClasses.size() == 64)
-                    {
-                        // this should be pretty unlikely since a single class would have to have many other classes in its heirarchy
-                        // and it'd all have to be basically in one layer, as we are popping as we explore.
-                        AZ_WarningOnce("EntityUtils", false, "While trying to find a base class, all available slots were consumed.  consider increasing the size of knownBaseClasses.\n");
-                        // we cannot continue any further, assume we did not find it.
-                        return false;
-                    }
-                    knownBaseClasses.push_back(classData->m_typeId);
-                }
-
-                return baseClassVisitor(classData, examineTypeId);
-            };
-
-            while (!knownBaseClasses.empty() && !foundBaseClass)
-            {
-                TypeId toExamine = knownBaseClasses.back();
-                knownBaseClasses.pop_back();
-
-                context->EnumerateBase(enumerateBaseVisitor, toExamine);
-            }
-
-            return foundBaseClass;
-        }
-
-        bool CheckIfClassIsDeprecated(SerializeContext* context, const TypeId& typeToExamine)
-        {
-            bool isDeprecated = false;
-            auto classVisitorFn = [&isDeprecated](const AZ::SerializeContext::ClassData* classData, const TypeId& /*rttiBase*/)
-            {
-                // Stop iterating once we stop receiving SerializeContext::ClassData*.
-                if (!classData)
-                {
-                    return false;
-                }
-
-                // Stop iterating if we've found that the class is deprecated
-                if (classData->IsDeprecated())
-                {
-                    isDeprecated = true;
-                    return false;
-                }
-
-                return true; // keep iterating
-            };
-
-            // Check if the type is deprecated
-            const AZ::SerializeContext::ClassData* classData = context->FindClassData(typeToExamine);
+            // Stop iterating if we've found that the class is deprecated
             if (classData->IsDeprecated())
             {
-                return true;
-            }
-
-            // Check if any of its bases are deprecated
-            EnumerateBaseRecursive(context, classVisitorFn, typeToExamine);
-
-            return isDeprecated;
-        }
-       
-        bool CheckDeclaresSerializeBaseClass(SerializeContext* context, const TypeId& typeToFind, const TypeId& typeToExamine)
-        {
-            AZ_Assert(context, "CheckDeclaresSerializeBaseClass called with no serialize context.");
-            if (!context)
-            {
+                isDeprecated = true;
                 return false;
             }
 
-            bool foundBaseClass = false;
-            auto baseClassVisitorFn = [&typeToFind, &foundBaseClass](const AZ::SerializeContext::ClassData* reflectedBase, const TypeId& /*rttiBase*/)
-            {
-                if (!reflectedBase)
-                {
-                    foundBaseClass = false;
-                    return false; // stop iterating
-                }
+            return true; // keep iterating
+        };
 
-                foundBaseClass = (reflectedBase->m_typeId == typeToFind);
-                if (foundBaseClass)
-                {
-                    return false; // we have a base, stop iterating
-                }
-
-                return true; // keep iterating
-            };
-
-            EnumerateBaseRecursive(context, baseClassVisitorFn, typeToExamine);
-
-            return foundBaseClass;
-        }
-
-        bool RemoveDuplicateServicesOfAndAfterIterator(
-            const ComponentDescriptor::DependencyArrayType::iterator& iterator,
-            ComponentDescriptor::DependencyArrayType& providedServiceArray,
-            const Entity* entity)
+        // Check if the type is deprecated
+        const AZ::SerializeContext::ClassData* classData = context->FindClassData(typeToExamine);
+        if (classData->IsDeprecated())
         {
-            // Build types that strip out AZ_Warnings will complain that entity is unused without this.
-            (void)entity;
-            if (iterator == providedServiceArray.end())
-            {
-                return false;
-            }
-
-            bool duplicateFound = false;
-
-            for (ComponentDescriptor::DependencyArrayType::iterator duplicateCheckIter = AZStd::next(iterator);
-                duplicateCheckIter != providedServiceArray.end();)
-            {
-                if (*iterator == *duplicateCheckIter)
-                {
-                    AZ_Warning("Entity", false, "Duplicate service %d found on entity %s [%s]",
-                        *duplicateCheckIter,
-                        entity ? entity->GetName().c_str() : "Entity not provided",
-                        entity ? entity->GetId().ToString().c_str() : "");
-                    duplicateCheckIter = providedServiceArray.erase(duplicateCheckIter);
-                    duplicateFound = true;
-                }
-                else
-                {
-                    ++duplicateCheckIter;
-                }
-            }
-            return duplicateFound;
+            return true;
         }
-    } // namespace EntityUtils
-}   // namespace AZ
+
+        // Check if any of its bases are deprecated
+        EnumerateBaseRecursive(context, classVisitorFn, typeToExamine);
+
+        return isDeprecated;
+    }
+
+    bool CheckDeclaresSerializeBaseClass(SerializeContext* context, const TypeId& typeToFind, const TypeId& typeToExamine)
+    {
+        AZ_Assert(context, "CheckDeclaresSerializeBaseClass called with no serialize context.");
+        if (!context)
+        {
+            return false;
+        }
+
+        bool foundBaseClass = false;
+        auto baseClassVisitorFn = [&typeToFind, &foundBaseClass](const AZ::SerializeContext::ClassData* reflectedBase, const TypeId& /*rttiBase*/)
+        {
+            if (!reflectedBase)
+            {
+                foundBaseClass = false;
+                return false; // stop iterating
+            }
+
+            foundBaseClass = (reflectedBase->m_typeId == typeToFind);
+            if (foundBaseClass)
+            {
+                return false; // we have a base, stop iterating
+            }
+
+            return true; // keep iterating
+        };
+
+        EnumerateBaseRecursive(context, baseClassVisitorFn, typeToExamine);
+
+        return foundBaseClass;
+    }
+
+    bool RemoveDuplicateServicesOfAndAfterIterator(
+        const ComponentDescriptor::DependencyArrayType::iterator& iterator,
+        ComponentDescriptor::DependencyArrayType& providedServiceArray,
+        const Entity* entity)
+    {
+        // Build types that strip out AZ_Warnings will complain that entity is unused without this.
+        (void)entity;
+        if (iterator == providedServiceArray.end())
+        {
+            return false;
+        }
+
+        bool duplicateFound = false;
+
+        for (ComponentDescriptor::DependencyArrayType::iterator duplicateCheckIter = AZStd::next(iterator);
+            duplicateCheckIter != providedServiceArray.end();)
+        {
+            if (*iterator == *duplicateCheckIter)
+            {
+                AZ_Warning("Entity", false, "Duplicate service %d found on entity %s [%s]",
+                    *duplicateCheckIter,
+                    entity ? entity->GetName().c_str() : "Entity not provided",
+                    entity ? entity->GetId().ToString().c_str() : "");
+                duplicateCheckIter = providedServiceArray.erase(duplicateCheckIter);
+                duplicateFound = true;
+            }
+            else
+            {
+                ++duplicateCheckIter;
+            }
+        }
+        return duplicateFound;
+    }
+} // namespace AZ::EntityUtils
diff --git a/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp b/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp
index 9db59bc781..ecab62d123 100644
--- a/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp
+++ b/Code/Framework/AzCore/AzCore/Compression/zstd_compression.cpp
@@ -57,6 +57,7 @@ void ZStd::StartCompressor(unsigned int compressionLevel)
     ZSTD_customMem customAlloc;
     customAlloc.customAlloc = reinterpret_cast<ZSTD_allocFunction>(&AllocateMem);
     customAlloc.customFree = &FreeMem;
+    customAlloc.opaque = nullptr;
 
     AZ_UNUSED(compressionLevel);
     m_streamCompression = (ZSTD_createCStream_advanced(customAlloc));
diff --git a/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl
index 46774f23b2..b3a59d287d 100644
--- a/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl
+++ b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl
@@ -32,7 +32,16 @@ namespace AZ
     template <typename BASE_TYPE, ThreadSafety THREAD_SAFETY>
     inline void ConsoleDataWrapper<BASE_TYPE, THREAD_SAFETY>::operator =(const BASE_TYPE& rhs)
     {
+        const BASE_TYPE currentValue = this->m_value;
+        // Do the value assignment outside new value check.
+        // Client code can supply a type for m_value that overrides the operator= function and trigger side effects
+        // in the operator= function body. Doing the assignment outside the value change check avoids those side
+        // effects not being triggered because AzCore believes the value wouldn't change.
         this->m_value = rhs;
+        if (currentValue != rhs)
+        {
+            InvokeCallback();
+        }
     }
 
     template <typename BASE_TYPE, ThreadSafety THREAD_SAFETY>
diff --git a/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp b/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp
index 3cb895c992..c03b75d118 100644
--- a/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/AssetTracking.cpp
@@ -14,323 +14,313 @@
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    namespace
     {
-        namespace
+        struct AssetTreeNode;
+
+        // Per-thread data that needs to be stored.
+        struct ThreadData
         {
-            struct AssetTreeNode;
-            
-            // Per-thread data that needs to be stored.
-            struct ThreadData
-            {
-                AZStd::vector<AssetTreeNodeBase*, AZStdAssetTrackingAllocator> m_currentAssetStack;
-            };
-
-            // Access thread data through a virtual function to ensure that the same thread-local data is being shared across DLLs.
-            // Otherwise, the thread_local variables are replicated across DLLs that link the AzCore library, and you'll get a
-            // different version in each module.
-            class ThreadDataProvider
-            {
-            public:
-                virtual ThreadData& GetThreadData() = 0;
-            };
-        }
-
-        class AssetTrackingImpl final :
-            public ThreadDataProvider
-        {
-        public:
-            AZ_TYPE_INFO(AssetTrackingImpl, "{01E2A099-3523-40BE-80E0-E0ADD861BEE1}");
-            AZ_CLASS_ALLOCATOR(AssetTrackingImpl, OSAllocator, 0);
-
-            AssetTrackingImpl(AssetTreeBase* assetTree, AssetAllocationTableBase* allocationTable);
-            ~AssetTrackingImpl();
-
-            void AssetBegin(const char* id, const char* file, int line);
-            void AssetAttach(void* otherAllocation, const char* file, int line);
-            void AssetEnd();
-
-            ThreadData& GetThreadData() override;
-
-        private:
-            static EnvironmentVariable<AssetTrackingImpl*>& GetEnvironmentVariable();
-            static AssetTrackingImpl* GetSharedInstance();
-            static ThreadData& GetSharedThreadData();
-
-            using PrimaryAssets = AZStd::unordered_map<AssetTrackingId, AssetPrimaryInfo, AZStd::hash<AssetTrackingId>, AZStd::equal_to<AssetTrackingId>, AZStdAssetTrackingAllocator>;
-            using ThreadData = ThreadData;
-            using mutex_type = AZStd::mutex;
-            using lock_type = AZStd::lock_guard<mutex_type>;
-
-            mutex_type m_mutex;
-            PrimaryAssets m_primaryAssets;
-            AssetTreeNodeBase* m_assetRoot = nullptr;
-            AssetAllocationTableBase* m_allocationTable = nullptr;
-            bool m_performingAnalysis = false;
-
-            friend class AssetTracking;
-            friend class AssetTracking::Scope;
+            AZStd::vector<AssetTreeNodeBase*, AZStdAssetTrackingAllocator> m_currentAssetStack;
         };
 
+        // Access thread data through a virtual function to ensure that the same thread-local data is being shared across DLLs.
+        // Otherwise, the thread_local variables are replicated across DLLs that link the AzCore library, and you'll get a
+        // different version in each module.
+        class ThreadDataProvider
+        {
+        public:
+            virtual ThreadData& GetThreadData() = 0;
+        };
     }
-}
+
+    class AssetTrackingImpl final :
+        public ThreadDataProvider
+    {
+    public:
+        AZ_TYPE_INFO(AssetTrackingImpl, "{01E2A099-3523-40BE-80E0-E0ADD861BEE1}");
+        AZ_CLASS_ALLOCATOR(AssetTrackingImpl, OSAllocator, 0);
+
+        AssetTrackingImpl(AssetTreeBase* assetTree, AssetAllocationTableBase* allocationTable);
+        ~AssetTrackingImpl();
+
+        void AssetBegin(const char* id, const char* file, int line);
+        void AssetAttach(void* otherAllocation, const char* file, int line);
+        void AssetEnd();
+
+        ThreadData& GetThreadData() override;
+
+    private:
+        static EnvironmentVariable<AssetTrackingImpl*>& GetEnvironmentVariable();
+        static AssetTrackingImpl* GetSharedInstance();
+        static ThreadData& GetSharedThreadData();
+
+        using PrimaryAssets = AZStd::unordered_map<AssetTrackingId, AssetPrimaryInfo, AZStd::hash<AssetTrackingId>, AZStd::equal_to<AssetTrackingId>, AZStdAssetTrackingAllocator>;
+        using ThreadData = ThreadData;
+        using mutex_type = AZStd::mutex;
+        using lock_type = AZStd::lock_guard<mutex_type>;
+
+        mutex_type m_mutex;
+        PrimaryAssets m_primaryAssets;
+        AssetTreeNodeBase* m_assetRoot = nullptr;
+        AssetAllocationTableBase* m_allocationTable = nullptr;
+        bool m_performingAnalysis = false;
+
+        friend class AssetTracking;
+        friend class AssetTracking::Scope;
+    };
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // AssetTrackingImpl methods
 ///////////////////////////////////////////////////////////////////////////////
 
-namespace AZ
-{
-    namespace Debug
+    AssetTrackingImpl::AssetTrackingImpl(AssetTreeBase* assetTree, AssetAllocationTableBase* allocationTable) :
+        m_assetRoot(&assetTree->GetRoot()),
+        m_allocationTable(allocationTable)
     {
-        AssetTrackingImpl::AssetTrackingImpl(AssetTreeBase* assetTree, AssetAllocationTableBase* allocationTable) :
-            m_assetRoot(&assetTree->GetRoot()),
-            m_allocationTable(allocationTable)
-        {
-            AZ_Assert(!GetSharedInstance(), "Only one AssetTrackingImpl can exist!");
+        AZ_Assert(!GetSharedInstance(), "Only one AssetTrackingImpl can exist!");
 
-            GetEnvironmentVariable().Set(this);
-            AllocatorManager::Instance().EnterProfilingMode();
+        GetEnvironmentVariable().Set(this);
+        AllocatorManager::Instance().EnterProfilingMode();
+    }
+
+    AssetTrackingImpl::~AssetTrackingImpl()
+    {
+        AllocatorManager::Instance().ExitProfilingMode();
+        GetEnvironmentVariable().Reset();
+    }
+
+    void AssetTrackingImpl::AssetBegin(const char* id, const char* file, int line)
+    {
+        // In the future it may be desirable to organize assets based on where in code the asset was entered into.
+        // For now these are ignored.
+        AZ_UNUSED(file);
+        AZ_UNUSED(line);
+
+        using namespace Internal;
+
+        AssetTrackingId assetId(id);
+        auto& threadData = GetSharedThreadData();
+        AssetTreeNodeBase* parentAsset = threadData.m_currentAssetStack.empty() ? nullptr : threadData.m_currentAssetStack.back();
+        AssetTreeNodeBase* childAsset;
+        AssetPrimaryInfo* assetPrimaryInfo;
+
+        if (!parentAsset)
+        {
+            parentAsset = m_assetRoot;
         }
 
-        AssetTrackingImpl::~AssetTrackingImpl()
         {
-            AllocatorManager::Instance().ExitProfilingMode();
-            GetEnvironmentVariable().Reset();
-        }
+            lock_type lock(m_mutex);
 
-        void AssetTrackingImpl::AssetBegin(const char* id, const char* file, int line)
-        {
-            // In the future it may be desirable to organize assets based on where in code the asset was entered into.
-            // For now these are ignored.
-            AZ_UNUSED(file);
-            AZ_UNUSED(line);
+            // Locate or create the primary record for this asset
+            auto primaryItr = m_primaryAssets.find(assetId);
 
-            using namespace Internal;
-
-            AssetTrackingId assetId(id);
-            auto& threadData = GetSharedThreadData();
-            AssetTreeNodeBase* parentAsset = threadData.m_currentAssetStack.empty() ? nullptr : threadData.m_currentAssetStack.back();
-            AssetTreeNodeBase* childAsset;
-            AssetPrimaryInfo* assetPrimaryInfo;
-
-            if (!parentAsset)
+            if (primaryItr != m_primaryAssets.end())
             {
-                parentAsset = m_assetRoot;
-            }
-
-            {
-                lock_type lock(m_mutex);
-
-                // Locate or create the primary record for this asset
-                auto primaryItr = m_primaryAssets.find(assetId);
-
-                if (primaryItr != m_primaryAssets.end())
-                {
-                    assetPrimaryInfo = &primaryItr->second;
-                }
-                else
-                {
-                    auto insertResult = m_primaryAssets.emplace(assetId, AssetPrimaryInfo());
-                    assetPrimaryInfo = &insertResult.first->second;
-                    assetPrimaryInfo->m_id = &insertResult.first->first;
-                }
-
-                // Add this asset to the stack for this thread's context
-                childAsset = parentAsset->FindOrAddChild(assetId, assetPrimaryInfo);
-            }
-
-            threadData.m_currentAssetStack.push_back(childAsset);
-        }
-
-        void AssetTrackingImpl::AssetAttach(void* otherAllocation, const char* file, int line)
-        {
-            AZ_UNUSED(file);
-            AZ_UNUSED(line);
-
-            using namespace Internal;
-            
-            AssetTreeNodeBase* assetInfo = m_allocationTable->FindAllocation(otherAllocation);
-
-            // We will push back a nullptr if there is no asset, this is necessary to balance the call to AssetEnd()
-            GetSharedThreadData().m_currentAssetStack.push_back(assetInfo);
-        }
-
-        void AssetTrackingImpl::AssetEnd()
-        {
-            AZ_Assert(!GetSharedThreadData().m_currentAssetStack.empty(), "AssetEnd() called without matching AssetBegin() or AssetAttach. Use the AZ_ASSET_NAMED_SCOPE and AZ_ASSET_ATTACH_TO_SCOPE macros to avoid this!");
-            GetSharedThreadData().m_currentAssetStack.pop_back();
-        }
-
-        AssetTrackingImpl* AssetTrackingImpl::GetSharedInstance()
-        {
-            auto environmentVariable = GetEnvironmentVariable();
-
-            if(environmentVariable)
-            {
-                return *environmentVariable;
-            }
-
-            return nullptr;
-        }
-
-        ThreadData& AssetTrackingImpl::GetSharedThreadData()
-        {
-            // Cast to the base type so our virtual call doesn't get optimized away. We require GetThreadData() to be executed in the same DLL every time.
-            return static_cast<ThreadDataProvider*>(GetSharedInstance())->GetThreadData();
-        }
-
-        AssetTrackingImpl::ThreadData& AssetTrackingImpl::GetThreadData()
-        {
-            static thread_local ThreadData* data = nullptr;
-            static thread_local typename AZStd::aligned_storage_t<sizeof(ThreadData), alignof(ThreadData)> storage;
-
-            if (!data)
-            {
-                data = new (&storage) ThreadData;
-            }
-
-            return *data;
-        }
-
-        EnvironmentVariable<AssetTrackingImpl*>& AssetTrackingImpl::GetEnvironmentVariable()
-        {
-            static EnvironmentVariable<AssetTrackingImpl*> assetTrackingImpl = Environment::CreateVariable<AssetTrackingImpl*>(AzTypeInfo<AssetTrackingImpl*>::Name());
-
-            return assetTrackingImpl;
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////
-        // AssetTracking::Scope functions
-        ///////////////////////////////////////////////////////////////////////////////
-
-        AssetTracking::Scope AssetTracking::Scope::ScopeFromAssetId(const char* file, int line, const char* fmt, ...)
-        {
-            if (auto impl = AssetTrackingImpl::GetSharedInstance())
-            {
-                static const int BUFFER_SIZE = 1024;
-
-                char buffer[BUFFER_SIZE];
-                va_list args;
-                va_start(args, fmt);
-                azvsnprintf(buffer, BUFFER_SIZE, fmt, args);
-                va_end(args);
-
-                impl->AssetBegin(buffer, file, line);
-            }
-
-            return Scope();
-        }
-
-        AssetTracking::Scope AssetTracking::Scope::ScopeFromAttachment(void* attachTo, const char* file, int line)
-        {
-            if (auto impl = AssetTrackingImpl::GetSharedInstance())
-            {
-                impl->AssetAttach(attachTo, file, line);
-            }
-
-            return Scope();
-        }
-
-        AssetTracking::Scope::~Scope()
-        {
-            if (auto impl = AssetTrackingImpl::GetSharedInstance())
-            {
-                impl->AssetEnd();
-            }
-        }
-
-        AssetTracking::Scope::Scope()
-        {
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////
-        // AssetTracking functions
-        ///////////////////////////////////////////////////////////////////////////////
-
-        void AssetTracking::EnterScopeByAssetId(const char* file, int line, const char* fmt, ...)
-        {
-            if (auto impl = AssetTrackingImpl::GetSharedInstance())
-            {
-                static const int BUFFER_SIZE = 1024;
-
-                char buffer[BUFFER_SIZE];
-                va_list args;
-                va_start(args, fmt);
-                azvsnprintf(buffer, BUFFER_SIZE, fmt, args);
-                va_end(args);
-
-                impl->AssetBegin(buffer, file, line);
-            }
-        }
-
-        void AssetTracking::EnterScopeByAttachment(void* attachTo, const char* file, int line)
-        {
-            if (auto impl = AssetTrackingImpl::GetSharedInstance())
-            {
-                impl->AssetAttach(attachTo, file, line);
-            }
-        }
-
-        void AssetTracking::ExitScope()
-        {
-            if (auto impl = AssetTrackingImpl::GetSharedInstance())
-            {
-                impl->AssetEnd();
-            }
-        }
-
-        const char* AssetTracking::GetDebugScope()
-        {
-            // Output debug information about the current asset scope in the current thread.
-            // Do not use in production code.
-#ifndef RELEASE
-            static const int BUFFER_SIZE = 1024;
-            static char buffer[BUFFER_SIZE];
-            const auto& assetStack = AssetTrackingImpl::GetSharedInstance()->GetThreadData().m_currentAssetStack;
-
-            if (assetStack.empty())
-            {
-                azsnprintf(buffer, BUFFER_SIZE, "<none>");
+                assetPrimaryInfo = &primaryItr->second;
             }
             else
             {
-                char* pos = buffer;
-                for (auto itr = assetStack.rbegin(); itr != assetStack.rend(); ++itr)
-                {
-                    pos += azsnprintf(pos, BUFFER_SIZE - (pos - buffer), "%s\n", (*itr)->GetAssetPrimaryInfo()->m_id->m_id.c_str());
-
-                    if (pos >= buffer + BUFFER_SIZE)
-                    {
-                        break;
-                    }
-                }
+                auto insertResult = m_primaryAssets.emplace(assetId, AssetPrimaryInfo());
+                assetPrimaryInfo = &insertResult.first->second;
+                assetPrimaryInfo->m_id = &insertResult.first->first;
             }
 
-            return buffer;
-#else
-            return "";
-#endif
+            // Add this asset to the stack for this thread's context
+            childAsset = parentAsset->FindOrAddChild(assetId, assetPrimaryInfo);
         }
 
-        AssetTracking::AssetTracking(AssetTreeBase* assetTree, AssetAllocationTableBase* allocationTable)
+        threadData.m_currentAssetStack.push_back(childAsset);
+    }
+
+    void AssetTrackingImpl::AssetAttach(void* otherAllocation, const char* file, int line)
+    {
+        AZ_UNUSED(file);
+        AZ_UNUSED(line);
+
+        using namespace Internal;
+
+        AssetTreeNodeBase* assetInfo = m_allocationTable->FindAllocation(otherAllocation);
+
+        // We will push back a nullptr if there is no asset, this is necessary to balance the call to AssetEnd()
+        GetSharedThreadData().m_currentAssetStack.push_back(assetInfo);
+    }
+
+    void AssetTrackingImpl::AssetEnd()
+    {
+        AZ_Assert(!GetSharedThreadData().m_currentAssetStack.empty(), "AssetEnd() called without matching AssetBegin() or AssetAttach. Use the AZ_ASSET_NAMED_SCOPE and AZ_ASSET_ATTACH_TO_SCOPE macros to avoid this!");
+        GetSharedThreadData().m_currentAssetStack.pop_back();
+    }
+
+    AssetTrackingImpl* AssetTrackingImpl::GetSharedInstance()
+    {
+        auto environmentVariable = GetEnvironmentVariable();
+
+        if(environmentVariable)
         {
-            m_impl.reset(aznew AssetTrackingImpl(assetTree, allocationTable));
+            return *environmentVariable;
         }
 
-        AssetTracking::~AssetTracking()
+        return nullptr;
+    }
+
+    ThreadData& AssetTrackingImpl::GetSharedThreadData()
+    {
+        // Cast to the base type so our virtual call doesn't get optimized away. We require GetThreadData() to be executed in the same DLL every time.
+        return static_cast<ThreadDataProvider*>(GetSharedInstance())->GetThreadData();
+    }
+
+    AssetTrackingImpl::ThreadData& AssetTrackingImpl::GetThreadData()
+    {
+        static thread_local ThreadData* data = nullptr;
+        static thread_local typename AZStd::aligned_storage_t<sizeof(ThreadData), alignof(ThreadData)> storage;
+
+        if (!data)
         {
+            data = new (&storage) ThreadData;
         }
 
-        AssetTreeNodeBase* AssetTracking::GetCurrentThreadAsset() const
-        {
-            const auto& assetStack = m_impl->GetThreadData().m_currentAssetStack;
-            AssetTreeNodeBase* result = assetStack.empty() ? nullptr : assetStack.back();
+        return *data;
+    }
 
-            return result;
+    EnvironmentVariable<AssetTrackingImpl*>& AssetTrackingImpl::GetEnvironmentVariable()
+    {
+        static EnvironmentVariable<AssetTrackingImpl*> assetTrackingImpl = Environment::CreateVariable<AssetTrackingImpl*>(AzTypeInfo<AssetTrackingImpl*>::Name());
+
+        return assetTrackingImpl;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // AssetTracking::Scope functions
+    ///////////////////////////////////////////////////////////////////////////////
+
+    AssetTracking::Scope AssetTracking::Scope::ScopeFromAssetId(const char* file, int line, const char* fmt, ...)
+    {
+        if (auto impl = AssetTrackingImpl::GetSharedInstance())
+        {
+            static const int BUFFER_SIZE = 1024;
+
+            char buffer[BUFFER_SIZE];
+            va_list args;
+            va_start(args, fmt);
+            azvsnprintf(buffer, BUFFER_SIZE, fmt, args);
+            va_end(args);
+
+            impl->AssetBegin(buffer, file, line);
+        }
+
+        return Scope();
+    }
+
+    AssetTracking::Scope AssetTracking::Scope::ScopeFromAttachment(void* attachTo, const char* file, int line)
+    {
+        if (auto impl = AssetTrackingImpl::GetSharedInstance())
+        {
+            impl->AssetAttach(attachTo, file, line);
+        }
+
+        return Scope();
+    }
+
+    AssetTracking::Scope::~Scope()
+    {
+        if (auto impl = AssetTrackingImpl::GetSharedInstance())
+        {
+            impl->AssetEnd();
         }
     }
 
+    AssetTracking::Scope::Scope()
+    {
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // AssetTracking functions
+    ///////////////////////////////////////////////////////////////////////////////
+
+    void AssetTracking::EnterScopeByAssetId(const char* file, int line, const char* fmt, ...)
+    {
+        if (auto impl = AssetTrackingImpl::GetSharedInstance())
+        {
+            static const int BUFFER_SIZE = 1024;
+
+            char buffer[BUFFER_SIZE];
+            va_list args;
+            va_start(args, fmt);
+            azvsnprintf(buffer, BUFFER_SIZE, fmt, args);
+            va_end(args);
+
+            impl->AssetBegin(buffer, file, line);
+        }
+    }
+
+    void AssetTracking::EnterScopeByAttachment(void* attachTo, const char* file, int line)
+    {
+        if (auto impl = AssetTrackingImpl::GetSharedInstance())
+        {
+            impl->AssetAttach(attachTo, file, line);
+        }
+    }
+
+    void AssetTracking::ExitScope()
+    {
+        if (auto impl = AssetTrackingImpl::GetSharedInstance())
+        {
+            impl->AssetEnd();
+        }
+    }
+
+    const char* AssetTracking::GetDebugScope()
+    {
+        // Output debug information about the current asset scope in the current thread.
+        // Do not use in production code.
+#ifndef RELEASE
+        static const int BUFFER_SIZE = 1024;
+        static char buffer[BUFFER_SIZE];
+        const auto& assetStack = AssetTrackingImpl::GetSharedInstance()->GetThreadData().m_currentAssetStack;
+
+        if (assetStack.empty())
+        {
+            azsnprintf(buffer, BUFFER_SIZE, "<none>");
+        }
+        else
+        {
+            char* pos = buffer;
+            for (auto itr = assetStack.rbegin(); itr != assetStack.rend(); ++itr)
+            {
+                pos += azsnprintf(pos, BUFFER_SIZE - (pos - buffer), "%s\n", (*itr)->GetAssetPrimaryInfo()->m_id->m_id.c_str());
+
+                if (pos >= buffer + BUFFER_SIZE)
+                {
+                    break;
+                }
+            }
+        }
+
+        return buffer;
+#else
+        return "";
+#endif
+    }
+
+    AssetTracking::AssetTracking(AssetTreeBase* assetTree, AssetAllocationTableBase* allocationTable)
+    {
+        m_impl.reset(aznew AssetTrackingImpl(assetTree, allocationTable));
+    }
+
+    AssetTracking::~AssetTracking()
+    {
+    }
+
+    AssetTreeNodeBase* AssetTracking::GetCurrentThreadAsset() const
+    {
+        const auto& assetStack = m_impl->GetThreadData().m_currentAssetStack;
+        AssetTreeNodeBase* result = assetStack.empty() ? nullptr : assetStack.back();
+
+        return result;
+    }
 } // namespace AzFramework
diff --git a/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp b/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp
index 88a78de031..58fa1f6cca 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTrace.cpp
@@ -11,19 +11,19 @@
 #include <AzCore/std/time.h>
 #include <AzCore/std/parallel/thread.h>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    EventTrace::ScopedSlice::ScopedSlice(const char* name, const char* category)
+        : m_Name(name)
+        , m_Category(category)
+        , m_Time(AZStd::GetTimeNowMicroSecond())
     {
-        EventTrace::ScopedSlice::ScopedSlice(const char* name, const char* category)
-            : m_Name(name)
-            , m_Category(category)
-            , m_Time(AZStd::GetTimeNowMicroSecond())
-        {}
-
-        EventTrace::ScopedSlice::~ScopedSlice()
-        {
-            EventTraceDrillerBus::TryQueueBroadcast(&EventTraceDrillerInterface::RecordSlice, m_Name, m_Category, AZStd::this_thread::get_id(), m_Time, (uint32_t)(AZStd::GetTimeNowMicroSecond() - m_Time));
-        }
     }
-}
+
+    EventTrace::ScopedSlice::~ScopedSlice()
+    {
+        EventTraceDrillerBus::TryQueueBroadcast(
+            &EventTraceDrillerInterface::RecordSlice, m_Name, m_Category, AZStd::this_thread::get_id(), m_Time,
+            (uint32_t)(AZStd::GetTimeNowMicroSecond() - m_Time));
+    }
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp
index 658021b018..d0722616f3 100644
--- a/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp
@@ -11,151 +11,149 @@
 #include <AzCore/std/containers/array.h>
 #include <algorithm>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    namespace Crc
     {
-        namespace Crc
+        constexpr u32 EventTraceDriller = AZ_CRC_CE("EventTraceDriller");
+        constexpr u32 Slice = AZ_CRC_CE("Slice");
+        constexpr u32 ThreadInfo = AZ_CRC_CE("ThreadInfo");
+        constexpr u32 Name = AZ_CRC_CE("Name");
+        constexpr u32 Category = AZ_CRC_CE("Category");
+        constexpr u32 ThreadId = AZ_CRC_CE("ThreadId");
+        constexpr u32 Timestamp = AZ_CRC_CE("Timestamp");
+        constexpr u32 Duration = AZ_CRC_CE("Duration");
+        constexpr u32 Instant = AZ_CRC_CE("Instant");
+    }
+
+    EventTraceDriller::EventTraceDriller()
+    {
+        EventTraceDrillerSetupBus::Handler::BusConnect();
+        AZStd::ThreadDrillerEventBus::Handler::BusConnect();
+    }
+
+    EventTraceDriller::~EventTraceDriller()
+    {
+        AZStd::ThreadDrillerEventBus::Handler::BusDisconnect();
+        EventTraceDrillerSetupBus::Handler::BusDisconnect();
+    }
+
+    void EventTraceDriller::Start(const Param* params, int numParams)
+    {
+        (void)params;
+        (void)numParams;
+
+        EventTraceDrillerBus::Handler::BusConnect();
+        TickBus::Handler::BusConnect();
+
+        EventTraceDrillerBus::AllowFunctionQueuing(true);
+    }
+
+    void EventTraceDriller::Stop()
+    {
+        EventTraceDrillerBus::AllowFunctionQueuing(false);
+        EventTraceDrillerBus::ClearQueuedEvents();
+
+        EventTraceDrillerBus::Handler::BusDisconnect();
+        TickBus::Handler::BusDisconnect();
+    }
+
+    void EventTraceDriller::OnTick(float deltaTime, ScriptTimePoint time)
+    {
+        (void)deltaTime;
+        (void)time;
+
+        AZ_TRACE_METHOD();
+        RecordThreads();
+        EventTraceDrillerBus::ExecuteQueuedEvents();
+    }
+
+    void EventTraceDriller::SetThreadName(const AZStd::thread_id& id, const char* name)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_ThreadMutex);
+        m_Threads[(size_t)id.m_id] = ThreadData{ name };
+    }
+
+    void EventTraceDriller::OnThreadEnter(const AZStd::thread::id& id, const AZStd::thread_desc* desc)
+    {
+        if (desc && desc->m_name)
         {
-            const u32 EventTraceDriller = AZ_CRC("EventTraceDriller", 0xf7aeae55);
-            const u32 Slice = AZ_CRC("Slice", 0x3dae78a5);
-            const u32 ThreadInfo = AZ_CRC("ThreadInfo", 0x89bf78be);
-            const u32 Name = AZ_CRC("Name", 0x5e237e06);
-            const u32 Category = AZ_CRC("Category", 0x064c19c1);
-            const u32 ThreadId = AZ_CRC("ThreadId", 0xd0fd9043);
-            const u32 Timestamp = AZ_CRC("Timestamp", 0xa5d6e63e);
-            const u32 Duration = AZ_CRC("Duration", 0x865f80c0);
-            const u32 Instant = AZ_CRC("Instant", 0x0e9047ad);
+            SetThreadName(id, desc->m_name);
         }
+    }
 
-        EventTraceDriller::EventTraceDriller()
+    void EventTraceDriller::OnThreadExit(const AZStd::thread::id& id)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_ThreadMutex);
+        m_Threads.erase((size_t)id.m_id);
+    }
+
+    void EventTraceDriller::RecordThreads()
+    {
+        if (!m_output || m_Threads.empty())
         {
-            EventTraceDrillerSetupBus::Handler::BusConnect();
-            AZStd::ThreadDrillerEventBus::Handler::BusConnect();
+            return;
         }
+        // Main bus mutex guards m_output.
+        auto& context = EventTraceDrillerBus::GetOrCreateContext();
 
-        EventTraceDriller::~EventTraceDriller()
-        {
-            AZStd::ThreadDrillerEventBus::Handler::BusDisconnect();
-            EventTraceDrillerSetupBus::Handler::BusDisconnect();
-        }
-
-        void EventTraceDriller::Start(const Param* params, int numParams)
-        {
-            (void)params;
-            (void)numParams;
-
-            EventTraceDrillerBus::Handler::BusConnect();
-            TickBus::Handler::BusConnect();
-
-            EventTraceDrillerBus::AllowFunctionQueuing(true);
-        }
-
-        void EventTraceDriller::Stop()
-        {
-            EventTraceDrillerBus::AllowFunctionQueuing(false);
-            EventTraceDrillerBus::ClearQueuedEvents();
-
-            EventTraceDrillerBus::Handler::BusDisconnect();
-            TickBus::Handler::BusDisconnect();
-        }
-
-        void EventTraceDriller::OnTick(float deltaTime, ScriptTimePoint time)
-        {
-            (void)deltaTime;
-            (void)time;
-
-            AZ_TRACE_METHOD();
-            RecordThreads();
-            EventTraceDrillerBus::ExecuteQueuedEvents();
-        }
-
-        void EventTraceDriller::SetThreadName(const AZStd::thread_id& id, const char* name)
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_ThreadMutex);
-            m_Threads[(size_t)id.m_id] = ThreadData{ name };
-        }
-
-        void EventTraceDriller::OnThreadEnter(const AZStd::thread::id& id, const AZStd::thread_desc* desc)
-        {
-            if (desc && desc->m_name)
-            {
-                SetThreadName(id, desc->m_name);
-            }
-        }
-
-        void EventTraceDriller::OnThreadExit(const AZStd::thread::id& id)
-        {
-            AZStd::lock_guard<AZStd::recursive_mutex> lock(m_ThreadMutex);
-            m_Threads.erase((size_t)id.m_id);
-        }
-
-        void EventTraceDriller::RecordThreads()
-        {
-            if (m_output && m_Threads.size())
-            {
-                // Main bus mutex guards m_output.
-                auto& context = EventTraceDrillerBus::GetOrCreateContext();
-
-                AZStd::scoped_lock<decltype(context.m_contextMutex), decltype(m_ThreadMutex)> lock(context.m_contextMutex, m_ThreadMutex);
-                for (const auto& keyValue : m_Threads)
-                {
-                    m_output->BeginTag(Crc::EventTraceDriller);
-                    m_output->BeginTag(Crc::ThreadInfo);
-                    m_output->Write(Crc::ThreadId, keyValue.first);
-                    m_output->Write(Crc::Name, keyValue.second.name);
-                    m_output->EndTag(Crc::ThreadInfo);
-                    m_output->EndTag(Crc::EventTraceDriller);
-                }
-            }
-        }
-
-        void EventTraceDriller::RecordSlice(
-            const char* name,
-            const char* category,
-            const AZStd::thread_id threadId,
-            AZ::u64 timestamp,
-            AZ::u32 duration)
+        AZStd::scoped_lock<decltype(context.m_contextMutex), decltype(m_ThreadMutex)> lock(context.m_contextMutex, m_ThreadMutex);
+        for (const auto& keyValue : m_Threads)
         {
             m_output->BeginTag(Crc::EventTraceDriller);
-            m_output->BeginTag(Crc::Slice);
-            m_output->Write(Crc::Name, name);
-            m_output->Write(Crc::Category, category);
-            m_output->Write(Crc::ThreadId, (size_t)threadId.m_id);
-            m_output->Write(Crc::Timestamp, timestamp);
-            m_output->Write(Crc::Duration, std::max(duration, 1u));
-            m_output->EndTag(Crc::Slice);
-            m_output->EndTag(Crc::EventTraceDriller);
-        }
-
-        void EventTraceDriller::RecordInstantGlobal(
-            const char* name,
-            const char* category,
-            AZ::u64 timestamp)
-        {
-            m_output->BeginTag(Crc::EventTraceDriller);
-            m_output->BeginTag(Crc::Instant);
-            m_output->Write(Crc::Name, name);
-            m_output->Write(Crc::Category, category);
-            m_output->Write(Crc::Timestamp, timestamp);
-            m_output->EndTag(Crc::Instant);
-            m_output->EndTag(Crc::EventTraceDriller);
-        }
-
-        void EventTraceDriller::RecordInstantThread(
-            const char* name,
-            const char* category,
-            const AZStd::thread_id threadId,
-            AZ::u64 timestamp)
-        {
-            m_output->BeginTag(Crc::EventTraceDriller);
-            m_output->BeginTag(Crc::Instant);
-            m_output->Write(Crc::Name, name);
-            m_output->Write(Crc::Category, category);
-            m_output->Write(Crc::ThreadId, (size_t)threadId.m_id);
-            m_output->Write(Crc::Timestamp, timestamp);
-            m_output->EndTag(Crc::Instant);
+            m_output->BeginTag(Crc::ThreadInfo);
+            m_output->Write(Crc::ThreadId, keyValue.first);
+            m_output->Write(Crc::Name, keyValue.second.name);
+            m_output->EndTag(Crc::ThreadInfo);
             m_output->EndTag(Crc::EventTraceDriller);
         }
     }
-}
+
+    void EventTraceDriller::RecordSlice(
+        const char* name,
+        const char* category,
+        const AZStd::thread_id threadId,
+        AZ::u64 timestamp,
+        AZ::u32 duration)
+    {
+        m_output->BeginTag(Crc::EventTraceDriller);
+        m_output->BeginTag(Crc::Slice);
+        m_output->Write(Crc::Name, name);
+        m_output->Write(Crc::Category, category);
+        m_output->Write(Crc::ThreadId, (size_t)threadId.m_id);
+        m_output->Write(Crc::Timestamp, timestamp);
+        m_output->Write(Crc::Duration, std::max(duration, 1u));
+        m_output->EndTag(Crc::Slice);
+        m_output->EndTag(Crc::EventTraceDriller);
+    }
+
+    void EventTraceDriller::RecordInstantGlobal(
+        const char* name,
+        const char* category,
+        AZ::u64 timestamp)
+    {
+        m_output->BeginTag(Crc::EventTraceDriller);
+        m_output->BeginTag(Crc::Instant);
+        m_output->Write(Crc::Name, name);
+        m_output->Write(Crc::Category, category);
+        m_output->Write(Crc::Timestamp, timestamp);
+        m_output->EndTag(Crc::Instant);
+        m_output->EndTag(Crc::EventTraceDriller);
+    }
+
+    void EventTraceDriller::RecordInstantThread(
+        const char* name,
+        const char* category,
+        const AZStd::thread_id threadId,
+        AZ::u64 timestamp)
+    {
+        m_output->BeginTag(Crc::EventTraceDriller);
+        m_output->BeginTag(Crc::Instant);
+        m_output->Write(Crc::Name, name);
+        m_output->Write(Crc::Category, category);
+        m_output->Write(Crc::ThreadId, (size_t)threadId.m_id);
+        m_output->Write(Crc::Timestamp, timestamp);
+        m_output->EndTag(Crc::Instant);
+        m_output->EndTag(Crc::EventTraceDriller);
+    }
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
index b9e4003500..2c2b8215c0 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
@@ -78,6 +78,7 @@ namespace AZ::Debug
     constexpr LogLevel DefaultLogLevel = LogLevel::Info;
 
     AZ_CVAR_SCOPED(int, bg_traceLogLevel, DefaultLogLevel, nullptr, ConsoleFunctorFlags::Null, "Enable trace message logging in release mode.  0=disabled, 1=errors, 2=warnings, 3=info.");
+    AZ_CVAR_SCOPED(bool, bg_alwaysShowCallstack, false, nullptr, ConsoleFunctorFlags::Null, "Force stack trace output without allowing ebus interception.");
 
     /**
      * If any listener returns true, store the result so we don't outputs detailed information.
@@ -279,6 +280,13 @@ namespace AZ::Debug
 
         TraceMessageResult result;
         EBUS_EVENT_RESULT(result, TraceMessageBus, OnPreAssert, fileName, line, funcName, message);
+
+        if (bg_alwaysShowCallstack)
+        {
+            // If we're always showing the callstack, print it now before there's any chance of an ebus handler interrupting
+            PrintCallstack(g_dbgSystemWnd, 1);
+        }
+
         if (result.m_value)
         {
             g_alreadyHandlingAssertOrFatal = false;
@@ -304,7 +312,10 @@ namespace AZ::Debug
             }
 
             Output(g_dbgSystemWnd, "------------------------------------------------\n");
-            PrintCallstack(g_dbgSystemWnd, 1);
+            if (!bg_alwaysShowCallstack)
+            {
+                PrintCallstack(g_dbgSystemWnd, 1);
+            }
             Output(g_dbgSystemWnd, "==================================================================\n");
 
             char dialogBoxText[g_maxMessageLength];
@@ -529,6 +540,16 @@ namespace AZ::Debug
             }
         }
 
+        RawOutput(window, message);
+    }
+
+    void Trace::RawOutput(const char* window, const char* message)
+    {
+        if (!window)
+        {
+            window = g_dbgSystemWnd;
+        }
+        
         // printf on Windows platforms seem to have a buffer length limit of 4096 characters
         // Therefore fwrite is used directly to write the window and message to stdout
         AZStd::string_view windowView{ window };
@@ -572,9 +593,19 @@ namespace AZ::Debug
                 }
 
                 azstrcat(lines[i], AZ_ARRAY_SIZE(lines[i]), "\n");
+
                 // Use Output instead of AZ_Printf to be consistent with the exception output code and avoid
                 // this accidentally being suppressed as a normal message
-                Output(window, lines[i]);
+
+                if (bg_alwaysShowCallstack)
+                {
+                    // Use Raw Output as this cannot be suppressed
+                    RawOutput(window, lines[i]);
+                }
+                else
+                {
+                    Output(window, lines[i]);
+                }
             }
         }
     }
diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.h b/Code/Framework/AzCore/AzCore/Debug/Trace.h
index 507ba48e53..fe33bf1b9c 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Trace.h
+++ b/Code/Framework/AzCore/AzCore/Debug/Trace.h
@@ -73,6 +73,9 @@ namespace AZ
 
             static void Output(const char* window, const char* message);
 
+            /// Called by output to handle the actual output, does not interact with ebus or allow interception
+            static void RawOutput(const char* window, const char* message);
+
             static void PrintCallstack(const char* window, unsigned int suppressCount = 0, void* nativeContext = 0);
 
             /// PEXCEPTION_POINTERS on Windows, always NULL on other platforms
diff --git a/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
index 7e9e5b146e..dbe66838a4 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
@@ -9,94 +9,91 @@
 #include <AzCore/Debug/TraceMessagesDriller.h>
 #include <AzCore/Math/Crc.h>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    //=========================================================================
+    // Start
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::Start(const Param* params, int numParams)
     {
-        //=========================================================================
-        // Start
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::Start(const Param* params, int numParams)
-        {
-            (void)params;
-            (void)numParams;
-            BusConnect();
-        }
+        (void)params;
+        (void)numParams;
+        BusConnect();
+    }
 
-        //=========================================================================
-        // Stop
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::Stop()
-        {
-            BusDisconnect();
-        }
+    //=========================================================================
+    // Stop
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::Stop()
+    {
+        BusDisconnect();
+    }
 
-        //=========================================================================
-        // OnAssert
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::OnAssert(const char* message)
-        {
-            // Not sure if we can really capture assert since the code will stop executing very soon.
-            m_output->BeginTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-            m_output->Write(AZ_CRC("OnAssert", 0xb74db4ce), message);
-            m_output->EndTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-        }
+    //=========================================================================
+    // OnAssert
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::OnAssert(const char* message)
+    {
+        // Not sure if we can really capture assert since the code will stop executing very soon.
+        m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
+        m_output->Write(AZ_CRC_CE("OnAssert"), message);
+        m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
+    }
 
-        //=========================================================================
-        // OnException
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::OnException(const char* message)
-        {
-            // Not sure if we can really capture exception since the code will stop executing very soon.
-            m_output->BeginTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-            m_output->Write(AZ_CRC("OnException", 0xfe457d12), message);
-            m_output->EndTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-        }
+    //=========================================================================
+    // OnException
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::OnException(const char* message)
+    {
+        // Not sure if we can really capture exception since the code will stop executing very soon.
+        m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
+        m_output->Write(AZ_CRC_CE("OnException"), message);
+        m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
+    }
 
-        //=========================================================================
-        // OnError
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::OnError(const char* window, const char* message)
-        {
-            m_output->BeginTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-            m_output->BeginTag(AZ_CRC("OnError", 0x4993c634));
-            m_output->Write(AZ_CRC("Window", 0x8be4f9dd), window);
-            m_output->Write(AZ_CRC("Message", 0xb6bd307f), message);
-            m_output->EndTag(AZ_CRC("OnError", 0x4993c634));
-            m_output->EndTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-        }
+    //=========================================================================
+    // OnError
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::OnError(const char* window, const char* message)
+    {
+        m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
+        m_output->BeginTag(AZ_CRC_CE("OnError"));
+        m_output->Write(AZ_CRC_CE("Window"), window);
+        m_output->Write(AZ_CRC_CE("Message"), message);
+        m_output->EndTag(AZ_CRC_CE("OnError"));
+        m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
+    }
 
-        //=========================================================================
-        // OnWarning
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::OnWarning(const char* window, const char* message)
-        {
-            m_output->BeginTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-            m_output->BeginTag(AZ_CRC("OnWarning", 0x7d90abea));
-            m_output->Write(AZ_CRC("Window", 0x8be4f9dd), window);
-            m_output->Write(AZ_CRC("Message", 0xb6bd307f), message);
-            m_output->EndTag(AZ_CRC("OnWarning", 0x7d90abea));
-            m_output->EndTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-        }
+    //=========================================================================
+    // OnWarning
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::OnWarning(const char* window, const char* message)
+    {
+        m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
+        m_output->BeginTag(AZ_CRC_CE("OnWarning"));
+        m_output->Write(AZ_CRC_CE("Window"), window);
+        m_output->Write(AZ_CRC_CE("Message"), message);
+        m_output->EndTag(AZ_CRC_CE("OnWarning"));
+        m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
+    }
 
-        //=========================================================================
-        // OnPrintf
-        // [2/6/2013]
-        //=========================================================================
-        void TraceMessagesDriller::OnPrintf(const char* window, const char* message)
-        {
-            m_output->BeginTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-            m_output->BeginTag(AZ_CRC("OnPrintf", 0xd4b5c294));
-            m_output->Write(AZ_CRC("Window", 0x8be4f9dd), window);
-            m_output->Write(AZ_CRC("Message", 0xb6bd307f), message);
-            m_output->EndTag(AZ_CRC("OnPrintf", 0xd4b5c294));
-            m_output->EndTag(AZ_CRC("TraceMessagesDriller", 0xa61d1b00));
-        }
-    } // namespace Debug
+    //=========================================================================
+    // OnPrintf
+    // [2/6/2013]
+    //=========================================================================
+    void TraceMessagesDriller::OnPrintf(const char* window, const char* message)
+    {
+        m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
+        m_output->BeginTag(AZ_CRC_CE("OnPrintf"));
+        m_output->Write(AZ_CRC_CE("Window"), window);
+        m_output->Write(AZ_CRC_CE("Message"), message);
+        m_output->EndTag(AZ_CRC_CE("OnPrintf"));
+        m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
+    }
 } // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp b/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp
index debbea5235..329a709994 100644
--- a/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp
@@ -12,283 +12,280 @@
 #include <AzCore/Script/ScriptContext.h>
 #include <AzCore/Component/TickBus.h>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    //! Trace Message Event Handler for Automation.
+    //! Since TraceMessageBus will be called from multiple threads and
+    //! python interpreter is single threaded, all the bus calls are
+    //! queued into a list and called at the end of the frame in the main thread.
+    //! @note this class is not using the usual AZ_EBUS_BEHAVIOR_BINDER
+    //! macro as the signature needs to be changed to connect to Tick bus.
+    class TraceMessageBusHandler
+        : public AZ::Debug::TraceMessageBus::Handler
+        , public AZ::BehaviorEBusHandler
+        , public AZ::TickBus::Handler
     {
-        //! Trace Message Event Handler for Automation.
-        //! Since TraceMessageBus will be called from multiple threads and
-        //! python interpreter is single threaded, all the bus calls are
-        //! queued into a list and called at the end of the frame in the main thread.
-        //! @note this class is not using the usual AZ_EBUS_BEHAVIOR_BINDER
-        //! macro as the signature needs to be changed to connect to Tick bus.
-        class TraceMessageBusHandler
-            : public AZ::Debug::TraceMessageBus::Handler
-            , public AZ::BehaviorEBusHandler
-            , public AZ::TickBus::Handler
+    public:
+        AZ_CLASS_ALLOCATOR(TraceMessageBusHandler, AZ::SystemAllocator, 0);
+        AZ_RTTI(TraceMessageBusHandler, "{5CDBAF09-5EB0-48AC-B327-2AF8601BB550}", AZ::BehaviorEBusHandler);
+
+        TraceMessageBusHandler();
+
+        using EventFunctionsParameterPack = AZStd::Internal::pack_traits_arg_sequence<
+            decltype(&TraceMessageBusHandler::OnPreAssert),
+            decltype(&TraceMessageBusHandler::OnPreError),
+            decltype(&TraceMessageBusHandler::OnPreWarning),
+            decltype(&TraceMessageBusHandler::OnAssert),
+            decltype(&TraceMessageBusHandler::OnError),
+            decltype(&TraceMessageBusHandler::OnWarning),
+            decltype(&TraceMessageBusHandler::OnException),
+            decltype(&TraceMessageBusHandler::OnPrintf),
+            decltype(&TraceMessageBusHandler::OnOutput)
+        >;
+
+        enum
         {
-        public:
-            AZ_CLASS_ALLOCATOR(TraceMessageBusHandler, AZ::SystemAllocator, 0);
-            AZ_RTTI(TraceMessageBusHandler, "{5CDBAF09-5EB0-48AC-B327-2AF8601BB550}", AZ::BehaviorEBusHandler);
-
-            TraceMessageBusHandler();
-
-            using EventFunctionsParameterPack = AZStd::Internal::pack_traits_arg_sequence<
-                decltype(&TraceMessageBusHandler::OnPreAssert),
-                decltype(&TraceMessageBusHandler::OnPreError),
-                decltype(&TraceMessageBusHandler::OnPreWarning),
-                decltype(&TraceMessageBusHandler::OnAssert),
-                decltype(&TraceMessageBusHandler::OnError),
-                decltype(&TraceMessageBusHandler::OnWarning),
-                decltype(&TraceMessageBusHandler::OnException),
-                decltype(&TraceMessageBusHandler::OnPrintf),
-                decltype(&TraceMessageBusHandler::OnOutput)
-            >;
-
-            enum
-            {
-                FN_OnPreAssert = 0,
-                FN_OnPreError,
-                FN_OnPreWarning,
-                FN_OnAssert,
-                FN_OnError,
-                FN_OnWarning,
-                FN_OnException,
-                FN_OnPrintf,
-                FN_OnOutput,
-                FN_MAX
-            };
-
-            static inline constexpr const char* m_functionNames[FN_MAX] =
-            {
-                "OnPreAssert",
-                "OnPreError",
-                "OnPreWarning",
-                "OnAssert",
-                "OnError",
-                "OnWarning",
-                "OnException",
-                "OnPrintf",
-                "OnOutput"
-            };
-
-            // AZ::BehaviorEBusHandler overrides...
-            int GetFunctionIndex(const char* functionName) const override;
-            void Disconnect() override;
-            bool Connect(AZ::BehaviorValueParameter* id = nullptr) override;
-            bool IsConnected() override;
-            bool IsConnectedId(AZ::BehaviorValueParameter* id) override;
-
-            // TraceMessageBus
-            /*
-             *  Note: Since at editor runtime there is already have a handler, for automation (OnPreAssert, OnPreWarning, OnPreWarning)
-             *  must be used instead of (OnAssert, OnWarning, OnError)
-            */
-            bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override;
-            bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override;
-            bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
-            bool OnAssert(const char* message) override;
-            bool OnError(const char* window, const char* message) override;
-            bool OnWarning(const char* window, const char* message) override;
-            bool OnException(const char* message) override;
-            bool OnPrintf(const char* window, const char* message) override;
-            bool OnOutput(const char* window, const char* message) override;
-
-            // AZ::TickBus::Handler overrides ...
-            void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-            int GetTickOrder() override;
-
-        private:
-            void QueueMessageCall(AZStd::function<void()> messageCall);
-            void FlushMessageCalls();
-
-            AZStd::list<AZStd::function<void()>> m_messageCalls;
-            AZStd::mutex m_messageCallsLock;
+            FN_OnPreAssert = 0,
+            FN_OnPreError,
+            FN_OnPreWarning,
+            FN_OnAssert,
+            FN_OnError,
+            FN_OnWarning,
+            FN_OnException,
+            FN_OnPrintf,
+            FN_OnOutput,
+            FN_MAX
         };
 
-        TraceMessageBusHandler::TraceMessageBusHandler()
+        static inline constexpr const char* m_functionNames[FN_MAX] =
         {
-            m_events.resize(FN_MAX);
+            "OnPreAssert",
+            "OnPreError",
+            "OnPreWarning",
+            "OnAssert",
+            "OnError",
+            "OnWarning",
+            "OnException",
+            "OnPrintf",
+            "OnOutput"
+        };
 
-            SetEvent(&TraceMessageBusHandler::OnPreAssert, m_functionNames[FN_OnPreAssert]);
-            SetEvent(&TraceMessageBusHandler::OnPreError, m_functionNames[FN_OnPreError]);
-            SetEvent(&TraceMessageBusHandler::OnPreWarning, m_functionNames[FN_OnPreWarning]);
-            SetEvent(&TraceMessageBusHandler::OnAssert, m_functionNames[FN_OnAssert]);
-            SetEvent(&TraceMessageBusHandler::OnError, m_functionNames[FN_OnError]);
-            SetEvent(&TraceMessageBusHandler::OnWarning, m_functionNames[FN_OnWarning]);
-            SetEvent(&TraceMessageBusHandler::OnException, m_functionNames[FN_OnException]);
-            SetEvent(&TraceMessageBusHandler::OnPrintf, m_functionNames[FN_OnPrintf]);
-            SetEvent(&TraceMessageBusHandler::OnOutput, m_functionNames[FN_OnOutput]);
-        }
+        // AZ::BehaviorEBusHandler overrides...
+        int GetFunctionIndex(const char* functionName) const override;
+        void Disconnect() override;
+        bool Connect(AZ::BehaviorValueParameter* id = nullptr) override;
+        bool IsConnected() override;
+        bool IsConnectedId(AZ::BehaviorValueParameter* id) override;
 
-        int TraceMessageBusHandler::GetFunctionIndex(const char* functionName) const
+        // TraceMessageBus
+        /*
+         *  Note: Since at editor runtime there is already have a handler, for automation (OnPreAssert, OnPreWarning, OnPreWarning)
+         *  must be used instead of (OnAssert, OnWarning, OnError)
+        */
+        bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override;
+        bool OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+        bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override;
+        bool OnAssert(const char* message) override;
+        bool OnError(const char* window, const char* message) override;
+        bool OnWarning(const char* window, const char* message) override;
+        bool OnException(const char* message) override;
+        bool OnPrintf(const char* window, const char* message) override;
+        bool OnOutput(const char* window, const char* message) override;
+
+        // AZ::TickBus::Handler overrides ...
+        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
+        int GetTickOrder() override;
+
+    private:
+        void QueueMessageCall(AZStd::function<void()> messageCall);
+        void FlushMessageCalls();
+
+        AZStd::list<AZStd::function<void()>> m_messageCalls;
+        AZStd::mutex m_messageCallsLock;
+    };
+
+    TraceMessageBusHandler::TraceMessageBusHandler()
+    {
+        m_events.resize(FN_MAX);
+
+        SetEvent(&TraceMessageBusHandler::OnPreAssert, m_functionNames[FN_OnPreAssert]);
+        SetEvent(&TraceMessageBusHandler::OnPreError, m_functionNames[FN_OnPreError]);
+        SetEvent(&TraceMessageBusHandler::OnPreWarning, m_functionNames[FN_OnPreWarning]);
+        SetEvent(&TraceMessageBusHandler::OnAssert, m_functionNames[FN_OnAssert]);
+        SetEvent(&TraceMessageBusHandler::OnError, m_functionNames[FN_OnError]);
+        SetEvent(&TraceMessageBusHandler::OnWarning, m_functionNames[FN_OnWarning]);
+        SetEvent(&TraceMessageBusHandler::OnException, m_functionNames[FN_OnException]);
+        SetEvent(&TraceMessageBusHandler::OnPrintf, m_functionNames[FN_OnPrintf]);
+        SetEvent(&TraceMessageBusHandler::OnOutput, m_functionNames[FN_OnOutput]);
+    }
+
+    int TraceMessageBusHandler::GetFunctionIndex(const char* functionName) const
+    {
+        for (int i = 0; i < FN_MAX; ++i)
         {
-            for (int i = 0; i < FN_MAX; ++i)
+            if (azstricmp(functionName, m_functionNames[i]) == 0)
             {
-                if (azstricmp(functionName, m_functionNames[i]) == 0)
-                {
-                    return i;
-                }
+                return i;
             }
-            return -1;
         }
+        return -1;
+    }
 
-        void TraceMessageBusHandler::Disconnect()
+    void TraceMessageBusHandler::Disconnect()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+        AZ::TickBus::Handler::BusDisconnect();
+    }
+
+    bool TraceMessageBusHandler::Connect(AZ::BehaviorValueParameter* id)
+    {
+        AZ::TickBus::Handler::BusConnect();
+        return AZ::Internal::EBusConnector<AZ::Debug::TraceMessageBus::Handler>::Connect(this, id);
+    }
+
+    bool TraceMessageBusHandler::IsConnected()
+    {
+        return AZ::Internal::EBusConnector<AZ::Debug::TraceMessageBus::Handler>::IsConnected(this);
+    }
+
+    bool TraceMessageBusHandler::IsConnectedId(AZ::BehaviorValueParameter* id)
+    {
+        return AZ::Internal::EBusConnector<AZ::Debug::TraceMessageBus::Handler>::IsConnectedId(this, id);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // TraceMessageBusHandler Implementation
+    inline bool TraceMessageBusHandler::OnPreAssert(const char* fileName, int line, const char* func, const char* message)
+    {
+        QueueMessageCall(
+            [this, fileNameString = AZStd::string(fileName), line, funcString = AZStd::string(func), messageString = AZStd::string(message)]()
         {
-            AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-            AZ::TickBus::Handler::BusDisconnect();
-        }
+            Call(FN_OnPreAssert, fileNameString.c_str(), line, funcString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        bool TraceMessageBusHandler::Connect(AZ::BehaviorValueParameter* id)
+    inline bool TraceMessageBusHandler::OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message)
+    {
+        QueueMessageCall(
+            [this, windowString = AZStd::string(window), fileNameString = AZStd::string(fileName), line, funcString = AZStd::string(func), messageString = AZStd::string(message)]()
         {
-            AZ::TickBus::Handler::BusConnect();
-            return AZ::Internal::EBusConnector<AZ::Debug::TraceMessageBus::Handler>::Connect(this, id);
-        }
+            Call(FN_OnPreError, windowString.c_str(), fileNameString.c_str(), line, funcString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        bool TraceMessageBusHandler::IsConnected()
+    inline bool TraceMessageBusHandler::OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message)
+    {
+        QueueMessageCall(
+            [this, windowString = AZStd::string(window), fileNameString = AZStd::string(fileName), line, funcString = AZStd::string(func), messageString = AZStd::string(message)]()
         {
-            return AZ::Internal::EBusConnector<AZ::Debug::TraceMessageBus::Handler>::IsConnected(this);
-        }
+            return Call(FN_OnPreWarning, windowString.c_str(), fileNameString.c_str(), line, funcString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        bool TraceMessageBusHandler::IsConnectedId(AZ::BehaviorValueParameter* id)
+    inline bool TraceMessageBusHandler::OnAssert(const char* message)
+    {
+        QueueMessageCall(
+            [this, messageString = AZStd::string(message)]()
         {
-            return AZ::Internal::EBusConnector<AZ::Debug::TraceMessageBus::Handler>::IsConnectedId(this, id);
-        }
+            return Call(FN_OnAssert, messageString.c_str());
+        });
+        return false;
+    }
 
-        //////////////////////////////////////////////////////////////////////////
-        // TraceMessageBusHandler Implementation
-        inline bool TraceMessageBusHandler::OnPreAssert(const char* fileName, int line, const char* func, const char* message)
+    inline bool TraceMessageBusHandler::OnError(const char* window, const char* message)
+    {
+        QueueMessageCall(
+            [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
         {
-            QueueMessageCall(
-                [this, fileNameString = AZStd::string(fileName), line, funcString = AZStd::string(func), messageString = AZStd::string(message)]()
-            {
-                Call(FN_OnPreAssert, fileNameString.c_str(), line, funcString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
+            return Call(FN_OnError, windowString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        inline bool TraceMessageBusHandler::OnPreError(const char* window, const char* fileName, int line, const char* func, const char* message)
+    inline bool TraceMessageBusHandler::OnWarning(const char* window, const char* message)
+    {
+        QueueMessageCall(
+            [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
         {
-            QueueMessageCall(
-                [this, windowString = AZStd::string(window), fileNameString = AZStd::string(fileName), line, funcString = AZStd::string(func), messageString = AZStd::string(message)]()
-            {
-                Call(FN_OnPreError, windowString.c_str(), fileNameString.c_str(), line, funcString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
+            return Call(FN_OnWarning, windowString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        inline bool TraceMessageBusHandler::OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message)
+    inline bool TraceMessageBusHandler::OnException(const char* message)
+    {
+        QueueMessageCall(
+            [this, messageString = AZStd::string(message)]()
         {
-            QueueMessageCall(
-                [this, windowString = AZStd::string(window), fileNameString = AZStd::string(fileName), line, funcString = AZStd::string(func), messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnPreWarning, windowString.c_str(), fileNameString.c_str(), line, funcString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
+            return Call(FN_OnException, messageString.c_str());
+        });
+        return false;
+    }
 
-        inline bool TraceMessageBusHandler::OnAssert(const char* message)
+    inline bool TraceMessageBusHandler::OnPrintf(const char* window, const char* message)
+    {
+        QueueMessageCall(
+            [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
         {
-            QueueMessageCall(
-                [this, messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnAssert, messageString.c_str());
-            });
-            return false;
-        }
+            return Call(FN_OnPrintf, windowString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        inline bool TraceMessageBusHandler::OnError(const char* window, const char* message)
+    inline bool TraceMessageBusHandler::OnOutput(const char* window, const char* message)
+    {
+        QueueMessageCall(
+            [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
         {
-            QueueMessageCall(
-                [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnError, windowString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
+            return Call(FN_OnOutput, windowString.c_str(), messageString.c_str());
+        });
+        return false;
+    }
 
-        inline bool TraceMessageBusHandler::OnWarning(const char* window, const char* message)
-        {
-            QueueMessageCall(
-                [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnWarning, windowString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
+    void TraceMessageBusHandler::OnTick(
+        [[maybe_unused]] float deltaTime,
+        [[maybe_unused]] AZ::ScriptTimePoint time)
+    {
+        FlushMessageCalls();
+    }
 
-        inline bool TraceMessageBusHandler::OnException(const char* message)
-        {
-            QueueMessageCall(
-                [this, messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnException, messageString.c_str());
-            });
-            return false;
-        }
+    int TraceMessageBusHandler::GetTickOrder()
+    {
+        return AZ::TICK_LAST;
+    }
 
-        inline bool TraceMessageBusHandler::OnPrintf(const char* window, const char* message)
-        {
-            QueueMessageCall(
-                [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnPrintf, windowString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
+    void TraceMessageBusHandler::QueueMessageCall(AZStd::function<void()> messageCall)
+    {
+        AZStd::lock_guard<decltype(m_messageCallsLock)> lock(m_messageCallsLock);
+        m_messageCalls.emplace_back(messageCall);
+    }
 
-        inline bool TraceMessageBusHandler::OnOutput(const char* window, const char* message)
-        {
-            QueueMessageCall(
-                [this, windowString = AZStd::string(window), messageString = AZStd::string(message)]()
-            {
-                return Call(FN_OnOutput, windowString.c_str(), messageString.c_str());
-            });
-            return false;
-        }
-
-        void TraceMessageBusHandler::OnTick(
-            [[maybe_unused]] float deltaTime,
-            [[maybe_unused]] AZ::ScriptTimePoint time)
-        {
-            FlushMessageCalls();
-        }
-
-        int TraceMessageBusHandler::GetTickOrder()
-        {
-            return AZ::TICK_LAST;
-        }
-
-        void TraceMessageBusHandler::QueueMessageCall(AZStd::function<void()> messageCall)
+    void TraceMessageBusHandler::FlushMessageCalls()
+    {
+        AZStd::list<AZStd::function<void()>> messageCalls;
         {
             AZStd::lock_guard<decltype(m_messageCallsLock)> lock(m_messageCallsLock);
-            m_messageCalls.push_back(messageCall);
+            m_messageCalls.swap(messageCalls); // Move calls to a new list to release the lock as soon as possible
         }
 
-        void TraceMessageBusHandler::FlushMessageCalls()
+        for (auto& messageCall : messageCalls)
         {
-            AZStd::list<AZStd::function<void()>> messageCalls;
-            {
-                AZStd::lock_guard<decltype(m_messageCallsLock)> lock(m_messageCallsLock);
-                m_messageCalls.swap(messageCalls); // Move calls to a new list to release the lock as soon as possible
-            }
-
-            for (auto& messageCall : messageCalls)
-            {
-                messageCall();
-            }
-        }
-
-        void TraceReflect(ReflectContext* context)
-        {
-            if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
-            {
-                behaviorContext->EBus<AZ::Debug::TraceMessageBus>("TraceMessageBus")
-                    ->Attribute(AZ::Script::Attributes::Module, "debug")
-                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                    ->Handler<TraceMessageBusHandler>()
-                    ;
-            }
+            messageCall();
         }
     }
-}
+
+    void TraceReflect(ReflectContext* context)
+    {
+        if (BehaviorContext* behaviorContext = azrtti_cast<BehaviorContext*>(context))
+        {
+            behaviorContext->EBus<AZ::Debug::TraceMessageBus>("TraceMessageBus")
+                ->Attribute(AZ::Script::Attributes::Module, "debug")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Handler<TraceMessageBusHandler>()
+                ;
+        }
+    }
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/Driller/Driller.cpp b/Code/Framework/AzCore/AzCore/Driller/Driller.cpp
index 41abd7793e..7e986be81e 100644
--- a/Code/Framework/AzCore/AzCore/Driller/Driller.cpp
+++ b/Code/Framework/AzCore/AzCore/Driller/Driller.cpp
@@ -14,291 +14,288 @@
 #include <AzCore/Math/Crc.h>
 
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    class DrillerManagerImpl
+        : public DrillerManager
     {
-        class DrillerManagerImpl
-            : public DrillerManager
+    public:
+        AZ_CLASS_ALLOCATOR(DrillerManagerImpl, OSAllocator, 0);
+
+        using SessionListType = forward_list<DrillerSession>::type;
+        SessionListType m_sessions;
+        using DrillerArrayType = vector<Driller*>::type;
+        DrillerArrayType m_drillers;
+
+        ~DrillerManagerImpl() override;
+
+        void Register(Driller* factory) override;
+        void Unregister(Driller* factory) override;
+
+        void FrameUpdate() override;
+
+        DrillerSession*     Start(DrillerOutputStream& output, const DrillerListType& drillerList, int numFrames = -1) override;
+        void                Stop(DrillerSession* session) override;
+
+        int                 GetNumDrillers() const override  { return static_cast<int>(m_drillers.size()); }
+        Driller*            GetDriller(int index) override   { return m_drillers[index]; }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Driller
+
+    //=========================================================================
+    // Register
+    // [3/17/2011]
+    //=========================================================================
+    AZ::u32 Driller::GetId() const
+    {
+        return AZ::Crc32(GetName());
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // Driller Manager
+
+    //=========================================================================
+    // Register
+    // [3/17/2011]
+    //=========================================================================
+    DrillerManager* DrillerManager::Create(/*const Descriptor& desc*/)
+    {
+        const bool createAllocator = !AZ::AllocatorInstance<OSAllocator>::IsReady();
+        if (createAllocator)
         {
-        public:
-            AZ_CLASS_ALLOCATOR(DrillerManagerImpl, OSAllocator, 0);
-
-            typedef forward_list<DrillerSession>::type SessionListType;
-            SessionListType m_sessions;
-            typedef vector<Driller*>::type DrillerArrayType;
-            DrillerArrayType m_drillers;
-
-            ~DrillerManagerImpl() override;
-
-            void Register(Driller* factory) override;
-            void Unregister(Driller* factory) override;
-
-            void FrameUpdate() override;
-
-            DrillerSession*     Start(DrillerOutputStream& output, const DrillerListType& drillerList, int numFrames = -1) override;
-            void                Stop(DrillerSession* session) override;
-
-            int                 GetNumDrillers() const override  { return static_cast<int>(m_drillers.size()); }
-            Driller*            GetDriller(int index) override   { return m_drillers[index]; }
-        };
-
-        //////////////////////////////////////////////////////////////////////////
-        // Driller
-
-        //=========================================================================
-        // Register
-        // [3/17/2011]
-        //=========================================================================
-        AZ::u32 Driller::GetId() const
-        {
-            return AZ::Crc32(GetName());
+            AZ::AllocatorInstance<OSAllocator>::Create();
         }
 
-        //////////////////////////////////////////////////////////////////////////
+        DrillerManagerImpl* impl = aznew DrillerManagerImpl;
+        impl->m_ownsOSAllocator = createAllocator;
+        return impl;
+    }
 
-        //////////////////////////////////////////////////////////////////////////
-        // Driller Manager
-
-        //=========================================================================
-        // Register
-        // [3/17/2011]
-        //=========================================================================
-        DrillerManager* DrillerManager::Create(/*const Descriptor& desc*/)
+    //=========================================================================
+    // Register
+    // [3/17/2011]
+    //=========================================================================
+    void DrillerManager::Destroy(DrillerManager* manager)
+    {
+        const bool allocatorCreated = manager->m_ownsOSAllocator;
+        delete manager;
+        if (allocatorCreated)
         {
-            const bool createAllocator = !AZ::AllocatorInstance<OSAllocator>::IsReady();
-            if (createAllocator)
-            {
-                AZ::AllocatorInstance<OSAllocator>::Create();
-            }
+            AZ::AllocatorInstance<OSAllocator>::Destroy();
+        }
+    }
 
-            DrillerManagerImpl* impl = aznew DrillerManagerImpl;
-            impl->m_ownsOSAllocator = createAllocator;
-            return impl;
+    //////////////////////////////////////////////////////////////////////////
+
+    //////////////////////////////////////////////////////////////////////////
+    // DrillerManagerImpl
+
+    //=========================================================================
+    // ~DrillerManagerImpl
+    // [3/17/2011]
+    //=========================================================================
+    DrillerManagerImpl::~DrillerManagerImpl()
+    {
+        while (!m_sessions.empty())
+        {
+            Stop(&m_sessions.front());
         }
 
-        //=========================================================================
-        // Register
-        // [3/17/2011]
-        //=========================================================================
-        void DrillerManager::Destroy(DrillerManager* manager)
+        while (!m_drillers.empty())
         {
-            const bool allocatorCreated = manager->m_ownsOSAllocator;
-            delete manager;
-            if (allocatorCreated)
-            {
-                AZ::AllocatorInstance<OSAllocator>::Destroy();
-            }
+            Driller* driller = m_drillers[0];
+            Unregister(driller);
+            delete driller;
         }
+    }
 
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // DrillerManagerImpl
-
-        //=========================================================================
-        // ~DrillerManagerImpl
-        // [3/17/2011]
-        //=========================================================================
-        DrillerManagerImpl::~DrillerManagerImpl()
+    //=========================================================================
+    // Register
+    // [3/17/2011]
+    //=========================================================================
+    void
+    DrillerManagerImpl::Register(Driller* driller)
+    {
+        AZ_Assert(driller, "You must provide a valid factory!");
+        for (size_t i = 0; i < m_drillers.size(); ++i)
         {
-            while (!m_sessions.empty())
-            {
-                Stop(&m_sessions.front());
-            }
-
-            while (!m_drillers.empty())
-            {
-                Driller* driller = m_drillers[0];
-                Unregister(driller);
-                delete driller;
-            }
-        }
-
-        //=========================================================================
-        // Register
-        // [3/17/2011]
-        //=========================================================================
-        void
-        DrillerManagerImpl::Register(Driller* driller)
-        {
-            AZ_Assert(driller, "You must provide a valid factory!");
-            for (size_t i = 0; i < m_drillers.size(); ++i)
-            {
-                if (m_drillers[i]->GetId() == driller->GetId())
-                {
-                    AZ_Error("Debug", false, "Driller with id %08x has already been registered! You can't have two factory instances for the same driller type", driller->GetId());
-                    return;
-                }
-            }
-            m_drillers.push_back(driller);
-        }
-
-        //=========================================================================
-        // Unregister
-        // [3/17/2011]
-        //=========================================================================
-        void
-        DrillerManagerImpl::Unregister(Driller* driller)
-        {
-            AZ_Assert(driller, "You must provide a valid factory!");
-            for (DrillerArrayType::iterator iter = m_drillers.begin(); iter != m_drillers.end(); ++iter)
-            {
-                if ((*iter)->GetId() == driller->GetId())
-                {
-                    m_drillers.erase(iter);
-                    return;
-                }
-            }
-
-            AZ_Error("Debug", false, "Failed to find driller factory with id %08x", driller->GetId());
-        }
-
-        //=========================================================================
-        // FrameUpdate
-        // [3/17/2011]
-        //=========================================================================
-        void
-        DrillerManagerImpl::FrameUpdate()
-        {
-            if (m_sessions.empty())
+            if (m_drillers[i]->GetId() == driller->GetId())
             {
+                AZ_Error("Debug", false, "Driller with id %08x has already been registered! You can't have two factory instances for the same driller type", driller->GetId());
                 return;
             }
+        }
+        m_drillers.push_back(driller);
+    }
 
-            AZStd::lock_guard<DrillerEBusMutex::MutexType> lock(DrillerEBusMutex::GetMutex());  ///< Make sure no driller is writing to the stream
-            for (SessionListType::iterator sessionIter = m_sessions.begin(); sessionIter != m_sessions.end(); )
+    //=========================================================================
+    // Unregister
+    // [3/17/2011]
+    //=========================================================================
+    void
+    DrillerManagerImpl::Unregister(Driller* driller)
+    {
+        AZ_Assert(driller, "You must provide a valid factory!");
+        for (DrillerArrayType::iterator iter = m_drillers.begin(); iter != m_drillers.end(); ++iter)
+        {
+            if ((*iter)->GetId() == driller->GetId())
             {
-                DrillerSession& s = *sessionIter;
-
-                // tick the drillers directly if they care.
-                for (size_t i = 0; i < s.drillers.size(); ++i)
-                {
-                    s.drillers[i]->Update();
-                }
-
-                s.output->EndTag(AZ_CRC("Frame", 0xb5f83ccd));
-
-                s.output->OnEndOfFrame();
-
-                s.curFrame++;
-
-                if (s.numFrames != -1)
-                {
-                    if (s.curFrame == s.numFrames)
-                    {
-                        Stop(&s);
-                        continue;
-                    }
-                }
-
-                s.output->BeginTag(AZ_CRC("Frame", 0xb5f83ccd));
-                s.output->Write(AZ_CRC("FrameNum", 0x85a1a919), s.curFrame);
-
-                ++sessionIter;
+                m_drillers.erase(iter);
+                return;
             }
         }
 
-        //=========================================================================
-        // Start
-        // [3/17/2011]
-        //=========================================================================
-        DrillerSession*
-        DrillerManagerImpl::Start(DrillerOutputStream& output, const DrillerListType& drillerList, int numFrames)
+        AZ_Error("Debug", false, "Failed to find driller factory with id %08x", driller->GetId());
+    }
+
+    //=========================================================================
+    // FrameUpdate
+    // [3/17/2011]
+    //=========================================================================
+    void
+    DrillerManagerImpl::FrameUpdate()
+    {
+        if (m_sessions.empty())
         {
-            if (drillerList.empty())
+            return;
+        }
+
+        AZStd::lock_guard<DrillerEBusMutex::MutexType> lock(DrillerEBusMutex::GetMutex());  ///< Make sure no driller is writing to the stream
+        for (SessionListType::iterator sessionIter = m_sessions.begin(); sessionIter != m_sessions.end(); )
+        {
+            DrillerSession& s = *sessionIter;
+
+            // tick the drillers directly if they care.
+            for (size_t i = 0; i < s.drillers.size(); ++i)
             {
-                return nullptr;
+                s.drillers[i]->Update();
             }
 
-            m_sessions.push_back();
-            DrillerSession& s = m_sessions.back();
-            s.curFrame = 0;
-            s.numFrames = numFrames;
-            s.output = &output;
+            s.output->EndTag(AZ_CRC("Frame", 0xb5f83ccd));
 
-            s.output->WriteHeader(); // first write the header in the stream
+            s.output->OnEndOfFrame();
 
-            s.output->BeginTag(AZ_CRC("StartData", 0xecf3f53f));
-            s.output->Write(AZ_CRC("Platform", 0x3952d0cb), (unsigned int)g_currentPlatform);
-            for (DrillerListType::const_iterator iDriller = drillerList.begin(); iDriller != drillerList.end(); ++iDriller)
+            s.curFrame++;
+
+            if (s.numFrames != -1)
             {
-                const DrillerInfo& di = *iDriller;
-                s.output->BeginTag(AZ_CRC("Driller", 0xa6e1fb73));
-                s.output->Write(AZ_CRC("Name", 0x5e237e06), di.id);
-                for (int iParam = 0; iParam < (int)di.params.size(); ++iParam)
+                if (s.curFrame == s.numFrames)
                 {
-                    s.output->BeginTag(AZ_CRC("Param", 0xa4fa7c89));
-                    s.output->Write(AZ_CRC("Name", 0x5e237e06), di.params[iParam].name);
-                    s.output->Write(AZ_CRC("Description", 0x6de44026), di.params[iParam].desc);
-                    s.output->Write(AZ_CRC("Type", 0x8cde5729), di.params[iParam].type);
-                    s.output->Write(AZ_CRC("Value", 0x1d775834), di.params[iParam].value);
-                    s.output->EndTag(AZ_CRC("Param", 0xa4fa7c89));
+                    Stop(&s);
+                    continue;
                 }
-                s.output->EndTag(AZ_CRC("Driller", 0xa6e1fb73));
             }
-            s.output->EndTag(AZ_CRC("StartData", 0xecf3f53f));
 
             s.output->BeginTag(AZ_CRC("Frame", 0xb5f83ccd));
             s.output->Write(AZ_CRC("FrameNum", 0x85a1a919), s.curFrame);
 
-            {
-                AZStd::lock_guard<DrillerEBusMutex::MutexType> lock(DrillerEBusMutex::GetMutex());  ///< Make sure no driller is writing to the stream
-                for (DrillerListType::const_iterator iDriller = drillerList.begin(); iDriller != drillerList.end(); ++iDriller)
-                {
-                    Driller* driller = nullptr;
-                    const DrillerInfo& di = *iDriller;
-                    for (size_t iDesc = 0; iDesc < m_drillers.size(); ++iDesc)
-                    {
-                        if (m_drillers[iDesc]->GetId() == di.id)
-                        {
-                            driller = m_drillers[iDesc];
-                            AZ_Assert(driller->m_output == nullptr, "Driller with id %08x is already have an output stream %p (currently we support only 1 at a time)", di.id, driller->m_output);
-                            driller->m_output = &output;
-                            driller->Start(di.params.data(), static_cast<unsigned int>(di.params.size()));
-                            s.drillers.push_back(driller);
-                            break;
-                        }
-                    }
-                    AZ_Warning("Driller", driller != nullptr, "We can't start a driller with id %d!", di.id);
-                }
-            }
-            return &s;
+            ++sessionIter;
         }
+    }
 
-
-        //=========================================================================
-        // Stop
-        // [3/17/2011]
-        //=========================================================================
-        void
-        DrillerManagerImpl::Stop(DrillerSession* session)
+    //=========================================================================
+    // Start
+    // [3/17/2011]
+    //=========================================================================
+    DrillerSession*
+    DrillerManagerImpl::Start(DrillerOutputStream& output, const DrillerListType& drillerList, int numFrames)
+    {
+        if (drillerList.empty())
         {
-            SessionListType::iterator iter;
-            for (iter = m_sessions.begin(); iter != m_sessions.end(); ++iter)
+            return nullptr;
+        }
+
+        m_sessions.push_back();
+        DrillerSession& s = m_sessions.back();
+        s.curFrame = 0;
+        s.numFrames = numFrames;
+        s.output = &output;
+
+        s.output->WriteHeader(); // first write the header in the stream
+
+        s.output->BeginTag(AZ_CRC("StartData", 0xecf3f53f));
+        s.output->Write(AZ_CRC("Platform", 0x3952d0cb), (unsigned int)g_currentPlatform);
+        for (DrillerListType::const_iterator iDriller = drillerList.begin(); iDriller != drillerList.end(); ++iDriller)
+        {
+            const DrillerInfo& di = *iDriller;
+            s.output->BeginTag(AZ_CRC("Driller", 0xa6e1fb73));
+            s.output->Write(AZ_CRC("Name", 0x5e237e06), di.id);
+            for (int iParam = 0; iParam < (int)di.params.size(); ++iParam)
             {
-                if (&*iter == session)
-                {
-                    break;
-                }
+                s.output->BeginTag(AZ_CRC("Param", 0xa4fa7c89));
+                s.output->Write(AZ_CRC("Name", 0x5e237e06), di.params[iParam].name);
+                s.output->Write(AZ_CRC("Description", 0x6de44026), di.params[iParam].desc);
+                s.output->Write(AZ_CRC("Type", 0x8cde5729), di.params[iParam].type);
+                s.output->Write(AZ_CRC("Value", 0x1d775834), di.params[iParam].value);
+                s.output->EndTag(AZ_CRC("Param", 0xa4fa7c89));
             }
+            s.output->EndTag(AZ_CRC("Driller", 0xa6e1fb73));
+        }
+        s.output->EndTag(AZ_CRC("StartData", 0xecf3f53f));
 
-            AZ_Assert(iter != m_sessions.end(), "We did not find session ID 0x%08x in the list!", session);
-            if (iter != m_sessions.end())
+        s.output->BeginTag(AZ_CRC("Frame", 0xb5f83ccd));
+        s.output->Write(AZ_CRC("FrameNum", 0x85a1a919), s.curFrame);
+
+        {
+            AZStd::lock_guard<DrillerEBusMutex::MutexType> lock(DrillerEBusMutex::GetMutex());  ///< Make sure no driller is writing to the stream
+            for (DrillerListType::const_iterator iDriller = drillerList.begin(); iDriller != drillerList.end(); ++iDriller)
             {
-                DrillerSession& s = *session;
-
+                Driller* driller = nullptr;
+                const DrillerInfo& di = *iDriller;
+                for (size_t iDesc = 0; iDesc < m_drillers.size(); ++iDesc)
                 {
-                    AZStd::lock_guard<DrillerEBusMutex::MutexType> lock(DrillerEBusMutex::GetMutex());
-                    for (size_t i = 0; i < s.drillers.size(); ++i)
+                    if (m_drillers[iDesc]->GetId() == di.id)
                     {
-                        s.drillers[i]->Stop();
-                        s.drillers[i]->m_output = nullptr;
+                        driller = m_drillers[iDesc];
+                        AZ_Assert(driller->m_output == nullptr, "Driller with id %08x is already have an output stream %p (currently we support only 1 at a time)", di.id, driller->m_output);
+                        driller->m_output = &output;
+                        driller->Start(di.params.data(), static_cast<unsigned int>(di.params.size()));
+                        s.drillers.push_back(driller);
+                        break;
                     }
                 }
-                s.output->EndTag(AZ_CRC("Frame", 0xb5f83ccd));
-                m_sessions.erase(iter);
+                AZ_Warning("Driller", driller != nullptr, "We can't start a driller with id %d!", di.id);
             }
         }
-    } // namespace Debug
-} // namespace AZ
+        return &s;
+    }
+
+
+    //=========================================================================
+    // Stop
+    // [3/17/2011]
+    //=========================================================================
+    void
+    DrillerManagerImpl::Stop(DrillerSession* session)
+    {
+        SessionListType::iterator iter;
+        for (iter = m_sessions.begin(); iter != m_sessions.end(); ++iter)
+        {
+            if (&*iter == session)
+            {
+                break;
+            }
+        }
+
+        AZ_Assert(iter != m_sessions.end(), "We did not find session ID 0x%08x in the list!", session);
+        if (iter != m_sessions.end())
+        {
+            DrillerSession& s = *session;
+
+            {
+                AZStd::lock_guard<DrillerEBusMutex::MutexType> lock(DrillerEBusMutex::GetMutex());
+                for (size_t i = 0; i < s.drillers.size(); ++i)
+                {
+                    s.drillers[i]->Stop();
+                    s.drillers[i]->m_output = nullptr;
+                }
+            }
+            s.output->EndTag(AZ_CRC("Frame", 0xb5f83ccd));
+            m_sessions.erase(iter);
+        }
+    }
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp b/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp
index 163db8a68b..a46736aa87 100644
--- a/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp
+++ b/Code/Framework/AzCore/AzCore/Driller/DrillerBus.cpp
@@ -12,57 +12,54 @@
 #include <AzCore/Module/Environment.h>
 #include <AzCore/std/parallel/mutex.h>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    //////////////////////////////////////////////////////////////////////////
+    // Globals
+    // We need to synchronize all driller evens, so we have proper order, and access to the data
+    // We use a global mutex which should be used for all driller operations.
+    // The mutex is held in an environment variable so it works across DLLs.
+    EnvironmentVariable<AZStd::recursive_mutex> s_drillerGlobalMutex;
+    //////////////////////////////////////////////////////////////////////////
+
+
+    //=========================================================================
+    // lock
+    // [4/11/2011]
+    //=========================================================================
+    void DrillerEBusMutex::lock()
     {
-        //////////////////////////////////////////////////////////////////////////
-        // Globals
-        // We need to synchronize all driller evens, so we have proper order, and access to the data
-        // We use a global mutex which should be used for all driller operations.
-        // The mutex is held in an environment variable so it works across DLLs.
-        EnvironmentVariable<AZStd::recursive_mutex> s_drillerGlobalMutex;
-        //////////////////////////////////////////////////////////////////////////
+        GetMutex().lock();
+    }
 
-        
-        //=========================================================================
-        // lock
-        // [4/11/2011]
-        //=========================================================================
-        void DrillerEBusMutex::lock()
-        {
-            GetMutex().lock();
-        }
+    //=========================================================================
+    // try_lock
+    // [4/11/2011]
+    //=========================================================================
+    bool DrillerEBusMutex::try_lock()
+    {
+        return GetMutex().try_lock();
+    }
 
-        //=========================================================================
-        // try_lock
-        // [4/11/2011]
-        //=========================================================================
-        bool DrillerEBusMutex::try_lock()
-        {
-            return GetMutex().try_lock();
-        }
+    //=========================================================================
+    // unlock
+    // [4/11/2011]
+    //=========================================================================
+    void DrillerEBusMutex::unlock()
+    {
+        GetMutex().unlock();
+    }
 
-        //=========================================================================
-        // unlock
-        // [4/11/2011]
-        //=========================================================================
-        void DrillerEBusMutex::unlock()
+    //=========================================================================
+    // unlock
+    // [4/11/2011]
+    //=========================================================================
+    AZStd::recursive_mutex& DrillerEBusMutex::GetMutex()
+    {
+        if (!s_drillerGlobalMutex)
         {
-            GetMutex().unlock();
+            s_drillerGlobalMutex = Environment::CreateVariable<AZStd::recursive_mutex>(AZ_FUNCTION_SIGNATURE);
         }
-
-        //=========================================================================
-        // unlock
-        // [4/11/2011]
-        //=========================================================================
-        AZStd::recursive_mutex& DrillerEBusMutex::GetMutex()
-        {
-            if (!s_drillerGlobalMutex)
-            {
-                s_drillerGlobalMutex = Environment::CreateVariable<AZStd::recursive_mutex>(AZ_FUNCTION_SIGNATURE);
-            }
-            return *s_drillerGlobalMutex;
-        }
-    } // namespace Debug
-} // namespace AZ
+        return *s_drillerGlobalMutex;
+    }
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/Driller/Stream.cpp b/Code/Framework/AzCore/AzCore/Driller/Stream.cpp
index 14e983b09c..c86755149c 100644
--- a/Code/Framework/AzCore/AzCore/Driller/Stream.cpp
+++ b/Code/Framework/AzCore/AzCore/Driller/Stream.cpp
@@ -24,873 +24,870 @@
 #   include <AzCore/Compression/Compression.h>
 #endif // AZ_FILE_STREAM_COMPRESSION
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Driller output stream
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    void DrillerOutputStream::Write(u32 name, const AZ::Vector3& v)
     {
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // Driller output stream
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        void DrillerOutputStream::Write(u32 name, const AZ::Vector3& v)
-        {
-            float data[4];
-            unsigned int dataSize = 3 * sizeof(float);
-            v.StoreToFloat4(data);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Vector4& v)
-        {
-            float data[4];
-            unsigned int dataSize = 4 * sizeof(float);
-            v.StoreToFloat4(data);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Aabb& aabb)
-        {
-            float data[7];
-            unsigned int dataSize = 6 * sizeof(float);
-            aabb.GetMin().StoreToFloat4(data);
-            aabb.GetMax().StoreToFloat4(&data[3]);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Obb& obb)
-        {
-            float data[10];
-            unsigned int dataSize = 10 * sizeof(float); // position (Vector3), rotation (Quaternion) and halfLengths (Vector3)
-            obb.GetPosition().StoreToFloat3(data);
-            obb.GetRotation().StoreToFloat4(&data[3]);
-            obb.GetHalfLengths().StoreToFloat3(&data[7]);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Transform& tm)
-        {
-            float data[12];
-            unsigned int dataSize = 12 * sizeof(float);
-            const Matrix3x4 matrix3x4 = Matrix3x4::CreateFromTransform(tm);
-            matrix3x4.StoreToRowMajorFloat12(data);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Matrix3x3& tm)
-        {
-            float data[9];
-            unsigned int dataSize = 9 * sizeof(float);
-            tm.StoreToRowMajorFloat9(data);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Matrix4x4& tm)
-        {
-            float data[16];
-            unsigned int dataSize = 16 * sizeof(float);
-            tm.StoreToRowMajorFloat16(data);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Quaternion& tm)
-        {
-            float data[4];
-            unsigned int dataSize = 4 * sizeof(float);
-            tm.StoreToFloat4(data);
-            StreamEntry de;
-            de.name = name;
-            de.sizeAndFlags = dataSize;
-            WriteBinary(de);
-            WriteBinary(data, dataSize);
-        }
-        void DrillerOutputStream::Write(u32 name, const AZ::Plane& plane)
-        {
-            Write(name, plane.GetPlaneEquationCoefficients());
-        }
-        void DrillerOutputStream::WriteHeader()
-        {
-            StreamHeader sh; // StreamHeader should be endianess independent.
-            WriteBinary(&sh, sizeof(sh));
-        }
+        float data[4];
+        unsigned int dataSize = 3 * sizeof(float);
+        v.StoreToFloat4(data);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Vector4& v)
+    {
+        float data[4];
+        unsigned int dataSize = 4 * sizeof(float);
+        v.StoreToFloat4(data);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Aabb& aabb)
+    {
+        float data[7];
+        unsigned int dataSize = 6 * sizeof(float);
+        aabb.GetMin().StoreToFloat4(data);
+        aabb.GetMax().StoreToFloat4(&data[3]);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Obb& obb)
+    {
+        float data[10];
+        unsigned int dataSize = 10 * sizeof(float); // position (Vector3), rotation (Quaternion) and halfLengths (Vector3)
+        obb.GetPosition().StoreToFloat3(data);
+        obb.GetRotation().StoreToFloat4(&data[3]);
+        obb.GetHalfLengths().StoreToFloat3(&data[7]);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Transform& tm)
+    {
+        float data[12];
+        unsigned int dataSize = 12 * sizeof(float);
+        const Matrix3x4 matrix3x4 = Matrix3x4::CreateFromTransform(tm);
+        matrix3x4.StoreToRowMajorFloat12(data);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Matrix3x3& tm)
+    {
+        float data[9];
+        unsigned int dataSize = 9 * sizeof(float);
+        tm.StoreToRowMajorFloat9(data);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Matrix4x4& tm)
+    {
+        float data[16];
+        unsigned int dataSize = 16 * sizeof(float);
+        tm.StoreToRowMajorFloat16(data);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Quaternion& tm)
+    {
+        float data[4];
+        unsigned int dataSize = 4 * sizeof(float);
+        tm.StoreToFloat4(data);
+        StreamEntry de;
+        de.name = name;
+        de.sizeAndFlags = dataSize;
+        WriteBinary(de);
+        WriteBinary(data, dataSize);
+    }
+    void DrillerOutputStream::Write(u32 name, const AZ::Plane& plane)
+    {
+        Write(name, plane.GetPlaneEquationCoefficients());
+    }
+    void DrillerOutputStream::WriteHeader()
+    {
+        StreamHeader sh; // StreamHeader should be endianess independent.
+        WriteBinary(&sh, sizeof(sh));
+    }
 
-        void DrillerOutputStream::WriteTimeUTC(u32 name)
-        {
-            AZStd::sys_time_t now = AZStd::GetTimeUTCMilliSecond();
-            Write(name, now);
-        }
+    void DrillerOutputStream::WriteTimeUTC(u32 name)
+    {
+        AZStd::sys_time_t now = AZStd::GetTimeUTCMilliSecond();
+        Write(name, now);
+    }
 
-        void DrillerOutputStream::WriteTimeMicrosecond(u32 name)
-        {
-            AZStd::sys_time_t now = AZStd::GetTimeNowMicroSecond();
-            Write(name, now);
-        }
+    void DrillerOutputStream::WriteTimeMicrosecond(u32 name)
+    {
+        AZStd::sys_time_t now = AZStd::GetTimeNowMicroSecond();
+        Write(name, now);
+    }
 
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // Driller Input Stream
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        bool DrillerInputStream::ReadHeader()
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Driller Input Stream
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    bool DrillerInputStream::ReadHeader()
+    {
+        DrillerOutputStream::StreamHeader sh; // StreamHeader should be endianess independent.
+        unsigned int numRead = ReadBinary(&sh, sizeof(sh));
+        (void)numRead;
+        AZ_Error("IO", numRead == sizeof(sh), "We should have atleast %d bytes in the stream to read the header!", sizeof(sh));
+        if (numRead != sizeof(sh))
         {
-            DrillerOutputStream::StreamHeader sh; // StreamHeader should be endianess independent.
-            unsigned int numRead = ReadBinary(&sh, sizeof(sh));
-            (void)numRead;
-            AZ_Error("IO", numRead == sizeof(sh), "We should have atleast %d bytes in the stream to read the header!", sizeof(sh));
-            if (numRead != sizeof(sh))
-            {
-                return false;
-            }
-            m_isEndianSwap = AZ::IsBigEndian(static_cast<AZ::PlatformID>(sh.platform)) != AZ::IsBigEndian(AZ::g_currentPlatform);
-            return true;
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // Driller file stream
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        //=========================================================================
-        // DrillerOutputFileStream::DrillerOutputFileStream
-        // [3/23/2011]
-        //=========================================================================
-        DrillerOutputFileStream::DrillerOutputFileStream()
-        {
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-            m_zlib = azcreate(ZLib, (&AllocatorInstance<OSAllocator>::GetAllocator()), OSAllocator);
-            m_zlib->StartCompressor(2);
-#endif
-        }
-
-        //=========================================================================
-        // DrillerOutputFileStream::~DrillerOutputFileStream
-        // [3/23/2011]
-        //=========================================================================
-        DrillerOutputFileStream::~DrillerOutputFileStream()
-        {
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-            azdestroy(m_zlib, OSAllocator);
-#endif
-        }
-
-        //=========================================================================
-        // DrillerOutputFileStream::Open
-        // [3/23/2011]
-        //=========================================================================
-        bool DrillerOutputFileStream::Open(const char* fileName, int mode, int platformFlags)
-        {
-            if (IO::SystemFile::Open(fileName, mode, platformFlags))
-            {
-                m_dataBuffer.reserve(100 * 1024);
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-                //              // Enable optional: encode the file in the same format as the streamer so they are interchangeable
-                //              IO::CompressorHeader ch;
-                //              ch.SetAZCS();
-                //              ch.m_compressorId = IO::CompressorZLib::TypeId();
-                //              ch.m_uncompressedSize = 0; // will be updated later
-                //              AZStd::endian_swap(ch.m_compressorId);
-                //              AZStd::endian_swap(ch.m_uncompressedSize);
-                //              IO::SystemFile::Write(&ch,sizeof(ch));
-                //              IO::CompressorZLibHeader zlibHdr;
-                //              zlibHdr.m_numSeekPoints = 0;
-                //              IO::SystemFile::Write(&zlibHdr,sizeof(zlibHdr));
-#endif
-                return true;
-            }
             return false;
         }
+        m_isEndianSwap = AZ::IsBigEndian(static_cast<AZ::PlatformID>(sh.platform)) != AZ::IsBigEndian(AZ::g_currentPlatform);
+        return true;
+    }
 
-        //=========================================================================
-        // DrillerOutputFileStream::Close
-        // [3/23/2011]
-        //=========================================================================
-        void DrillerOutputFileStream::Close()
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Driller file stream
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    //=========================================================================
+    // DrillerOutputFileStream::DrillerOutputFileStream
+    // [3/23/2011]
+    //=========================================================================
+    DrillerOutputFileStream::DrillerOutputFileStream()
+    {
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+        m_zlib = azcreate(ZLib, (&AllocatorInstance<OSAllocator>::GetAllocator()), OSAllocator);
+        m_zlib->StartCompressor(2);
+#endif
+    }
+
+    //=========================================================================
+    // DrillerOutputFileStream::~DrillerOutputFileStream
+    // [3/23/2011]
+    //=========================================================================
+    DrillerOutputFileStream::~DrillerOutputFileStream()
+    {
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+        azdestroy(m_zlib, OSAllocator);
+#endif
+    }
+
+    //=========================================================================
+    // DrillerOutputFileStream::Open
+    // [3/23/2011]
+    //=========================================================================
+    bool DrillerOutputFileStream::Open(const char* fileName, int mode, int platformFlags)
+    {
+        if (IO::SystemFile::Open(fileName, mode, platformFlags))
         {
-            unsigned int dataSizeInBuffer = static_cast<unsigned int>(m_dataBuffer.size());
+            m_dataBuffer.reserve(100 * 1024);
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+            //              // Enable optional: encode the file in the same format as the streamer so they are interchangeable
+            //              IO::CompressorHeader ch;
+            //              ch.SetAZCS();
+            //              ch.m_compressorId = IO::CompressorZLib::TypeId();
+            //              ch.m_uncompressedSize = 0; // will be updated later
+            //              AZStd::endian_swap(ch.m_compressorId);
+            //              AZStd::endian_swap(ch.m_uncompressedSize);
+            //              IO::SystemFile::Write(&ch,sizeof(ch));
+            //              IO::CompressorZLibHeader zlibHdr;
+            //              zlibHdr.m_numSeekPoints = 0;
+            //              IO::SystemFile::Write(&zlibHdr,sizeof(zlibHdr));
+#endif
+            return true;
+        }
+        return false;
+    }
+
+    //=========================================================================
+    // DrillerOutputFileStream::Close
+    // [3/23/2011]
+    //=========================================================================
+    void DrillerOutputFileStream::Close()
+    {
+        unsigned int dataSizeInBuffer = static_cast<unsigned int>(m_dataBuffer.size());
+        {
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+            unsigned int minCompressBufferSize = m_zlib->GetMinCompressedBufferSize(dataSizeInBuffer);
+            if (m_compressionBuffer.size() < minCompressBufferSize) // grow compression buffer if needed
+            {
+                m_compressionBuffer.clear();
+                m_compressionBuffer.resize(minCompressBufferSize);
+            }
+            unsigned int compressedSize;
+            do
+            {
+                compressedSize = m_zlib->Compress(m_dataBuffer.data(), dataSizeInBuffer, m_compressionBuffer.data(), (unsigned)m_compressionBuffer.size(), ZLib::FT_FINISH);
+                if (compressedSize)
+                {
+                    IO::SystemFile::Write(m_compressionBuffer.data(), compressedSize);
+                }
+            } while (compressedSize > 0);
+            m_zlib->ResetCompressor();
+#else
+            if (dataSizeInBuffer)
+            {
+                IO::SystemFile::Write(m_dataBuffer.data(), m_dataBuffer.size());
+            }
+#endif
+            m_dataBuffer.clear();
+        }
+        IO::SystemFile::Close();
+    }
+    //=========================================================================
+    // DrillerOutputFileStream::WriteBinary
+    // [3/23/2011]
+    //=========================================================================
+    void DrillerOutputFileStream::WriteBinary(const void* data, unsigned int dataSize)
+    {
+        size_t dataSizeInBuffer = m_dataBuffer.size();
+        if (dataSizeInBuffer + dataSize > m_dataBuffer.capacity())
+        {
+            if (dataSizeInBuffer > 0)
             {
 #if defined(AZ_FILE_STREAM_COMPRESSION)
-                unsigned int minCompressBufferSize = m_zlib->GetMinCompressedBufferSize(dataSizeInBuffer);
+                // we need to flush the data
+                unsigned int dataToCompress = static_cast<unsigned int>(dataSizeInBuffer);
+                unsigned int minCompressBufferSize = m_zlib->GetMinCompressedBufferSize(dataToCompress);
                 if (m_compressionBuffer.size() < minCompressBufferSize) // grow compression buffer if needed
                 {
                     m_compressionBuffer.clear();
                     m_compressionBuffer.resize(minCompressBufferSize);
                 }
-                unsigned int compressedSize;
-                do
+                while (dataToCompress > 0)
                 {
-                    compressedSize = m_zlib->Compress(m_dataBuffer.data(), dataSizeInBuffer, m_compressionBuffer.data(), (unsigned)m_compressionBuffer.size(), ZLib::FT_FINISH);
+                    unsigned int compressedSize = m_zlib->Compress(m_dataBuffer.data(), dataToCompress, m_compressionBuffer.data(), (unsigned)m_compressionBuffer.size());
                     if (compressedSize)
                     {
                         IO::SystemFile::Write(m_compressionBuffer.data(), compressedSize);
                     }
-                } while (compressedSize > 0);
-                m_zlib->ResetCompressor();
-#else
-                if (dataSizeInBuffer)
-                {
-                    IO::SystemFile::Write(m_dataBuffer.data(), m_dataBuffer.size());
                 }
+#else
+                IO::SystemFile::Write(m_dataBuffer.data(), m_dataBuffer.size());
 #endif
                 m_dataBuffer.clear();
             }
-            IO::SystemFile::Close();
         }
-        //=========================================================================
-        // DrillerOutputFileStream::WriteBinary
-        // [3/23/2011]
-        //=========================================================================
-        void DrillerOutputFileStream::WriteBinary(const void* data, unsigned int dataSize)
-        {
-            size_t dataSizeInBuffer = m_dataBuffer.size();
-            if (dataSizeInBuffer + dataSize > m_dataBuffer.capacity())
-            {
-                if (dataSizeInBuffer > 0)
-                {
+        m_dataBuffer.insert(m_dataBuffer.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + dataSize);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // Driller file input stream
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+
+    //=========================================================================
+    // DrillerInputFileStream::DrillerInputFileStream
+    // [3/23/2011]
+    //=========================================================================
+    DrillerInputFileStream::DrillerInputFileStream()
+    {
 #if defined(AZ_FILE_STREAM_COMPRESSION)
-                    // we need to flush the data
-                    unsigned int dataToCompress = static_cast<unsigned int>(dataSizeInBuffer);
-                    unsigned int minCompressBufferSize = m_zlib->GetMinCompressedBufferSize(dataToCompress);
-                    if (m_compressionBuffer.size() < minCompressBufferSize) // grow compression buffer if needed
-                    {
-                        m_compressionBuffer.clear();
-                        m_compressionBuffer.resize(minCompressBufferSize);
-                    }
-                    while (dataToCompress > 0)
-                    {
-                        unsigned int compressedSize = m_zlib->Compress(m_dataBuffer.data(), dataToCompress, m_compressionBuffer.data(), (unsigned)m_compressionBuffer.size());
-                        if (compressedSize)
-                        {
-                            IO::SystemFile::Write(m_compressionBuffer.data(), compressedSize);
-                        }
-                    }
+        m_zlib = azcreate(ZLib, (&AllocatorInstance<OSAllocator>::GetAllocator()), OSAllocator);
+        m_zlib->StartDecompressor();
+#endif
+    }
+
+    //=========================================================================
+    // DrillerInputFileStream::DrillerInputFileStream
+    // [3/23/2011]
+    //=========================================================================
+    DrillerInputFileStream::~DrillerInputFileStream()
+    {
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+        azdestroy(m_zlib, OSAllocator);
+#endif
+    }
+
+    //=========================================================================
+    // DrillerInputFileStream::Open
+    // [3/23/2011]
+    //=========================================================================
+    bool DrillerInputFileStream::Open(const char* fileName, int mode, int platformFlags)
+    {
+        if (IO::SystemFile::Open(fileName, mode, platformFlags))
+        {
+            DrillerOutputStream::StreamHeader sh;
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+            // TODO: optional encode the file in the same format as the streamer so they are interchangeable
+#endif
+            // first read the header of the stream file.
+            return ReadHeader();
+        }
+        return false;
+    }
+    //=========================================================================
+    // DrillerInputFileStream::ReadBinary
+    // [3/23/2011]
+    //=========================================================================
+    unsigned int DrillerInputFileStream::ReadBinary(void* data, unsigned int maxDataSize)
+    {
+        // make sure the compressed buffer if full enough...
+        size_t dataToLoad = maxDataSize * 2;
+        m_compressedData.reserve(dataToLoad);
+        while (m_compressedData.size() < dataToLoad)
+        {
+            unsigned char buffer[10 * 1024];
+            IO::SystemFile::SizeType bytesRead = Read(AZ_ARRAY_SIZE(buffer), buffer);
+            if (bytesRead > 0)
+            {
+                m_compressedData.insert(m_compressedData.end(), (unsigned char*)buffer, buffer + bytesRead);
+            }
+            if (bytesRead < AZ_ARRAY_SIZE(buffer))
+            {
+                break;
+            }
+        }
+#if defined(AZ_FILE_STREAM_COMPRESSION)
+        unsigned int dataSize = maxDataSize;
+        unsigned int bytesProcessed = m_zlib->Decompress(m_compressedData.data(), (unsigned)m_compressedData.size(), data, dataSize);
+        unsigned int readSize = maxDataSize - dataSize; // Zlib::Decompress decrements the dataSize parameter by the amount uncompressed
 #else
-                    IO::SystemFile::Write(m_dataBuffer.data(), m_dataBuffer.size());
+        unsigned int bytesProcessed = AZStd::GetMin((unsigned int)m_compressedData.size(), maxDataSize);
+        unsigned int readSize = bytesProcessed;
+        memcpy(data, m_compressedData.data(), readSize);
 #endif
-                    m_dataBuffer.clear();
-                }
-            }
-            m_dataBuffer.insert(m_dataBuffer.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + dataSize);
-        }
+        m_compressedData.erase(m_compressedData.begin(), m_compressedData.begin() + bytesProcessed);
+        return readSize;
+    }
 
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // Driller file input stream
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-
-        //=========================================================================
-        // DrillerInputFileStream::DrillerInputFileStream
-        // [3/23/2011]
-        //=========================================================================
-        DrillerInputFileStream::DrillerInputFileStream()
-        {
+    //=========================================================================
+    // DrillerInputFileStream::Close
+    // [3/23/2011]
+    //=========================================================================
+    void DrillerInputFileStream::Close()
+    {
 #if defined(AZ_FILE_STREAM_COMPRESSION)
-            m_zlib = azcreate(ZLib, (&AllocatorInstance<OSAllocator>::GetAllocator()), OSAllocator);
-            m_zlib->StartDecompressor();
-#endif
-        }
-
-        //=========================================================================
-        // DrillerInputFileStream::DrillerInputFileStream
-        // [3/23/2011]
-        //=========================================================================
-        DrillerInputFileStream::~DrillerInputFileStream()
+        if (m_zlib)
         {
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-            azdestroy(m_zlib, OSAllocator);
-#endif
+            m_zlib->ResetDecompressor();
         }
+#endif // AZ_FILE_STREAM_COMPRESSION
+        AZ::IO::SystemFile::Close();
+    }
 
-        //=========================================================================
-        // DrillerInputFileStream::Open
-        // [3/23/2011]
-        //=========================================================================
-        bool DrillerInputFileStream::Open(const char* fileName, int mode, int platformFlags)
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // DrillerSAXParser
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    //=========================================================================
+    // DrillerSAXParser
+    // [3/23/2011]
+    //=========================================================================
+    DrillerSAXParser::DrillerSAXParser(const TagCallbackType& tcb, const DataCallbackType& dcb)
+        : m_tagCallback(tcb)
+        , m_dataCallback(dcb)
+    {
+    }
+
+    //=========================================================================
+    // ProcessStream
+    // [3/23/2011]
+    //=========================================================================
+    void
+    DrillerSAXParser::ProcessStream(DrillerInputStream& stream)
+    {
+        static const int processChunkSize = 15 * 1024;
+        char buffer[processChunkSize];
+        unsigned int dataSize;
+        bool isEndianSwap = stream.IsEndianSwap();
+        while ((dataSize = stream.ReadBinary(buffer, processChunkSize)) > 0)
         {
-            if (IO::SystemFile::Open(fileName, mode, platformFlags))
+            char* dataStart = buffer;
+            char* dataEnd = dataStart + dataSize;
+            bool dataInBuffer = false;
+            if (!m_buffer.empty())
             {
-                DrillerOutputStream::StreamHeader sh;
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-                // TODO: optional encode the file in the same format as the streamer so they are interchangeable
-#endif
-                // first read the header of the stream file.
-                return ReadHeader();
+                m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
+                dataStart = m_buffer.data();
+                dataEnd = dataStart + m_buffer.size();
+                dataInBuffer = true;
             }
-            return false;
-        }
-        //=========================================================================
-        // DrillerInputFileStream::ReadBinary
-        // [3/23/2011]
-        //=========================================================================
-        unsigned int DrillerInputFileStream::ReadBinary(void* data, unsigned int maxDataSize)
-        {
-            // make sure the compressed buffer if full enough...
-            size_t dataToLoad = maxDataSize * 2;
-            m_compressedData.reserve(dataToLoad);
-            while (m_compressedData.size() < dataToLoad)
+            const int entrySize = sizeof(DrillerOutputStream::StreamEntry);
+            while (dataStart != dataEnd)
             {
-                unsigned char buffer[10 * 1024];
-                IO::SystemFile::SizeType bytesRead = Read(AZ_ARRAY_SIZE(buffer), buffer);
-                if (bytesRead > 0)
-                {
-                    m_compressedData.insert(m_compressedData.end(), (unsigned char*)buffer, buffer + bytesRead);
-                }
-                if (bytesRead < AZ_ARRAY_SIZE(buffer))
+                if ((dataEnd - dataStart) < entrySize) // we need at least one entry to proceed
                 {
+                    // not enough data to process, buffer it.
+                    if (!dataInBuffer)
+                    {
+                        m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
+                    }
                     break;
                 }
-            }
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-            unsigned int dataSize = maxDataSize;
-            unsigned int bytesProcessed = m_zlib->Decompress(m_compressedData.data(), (unsigned)m_compressedData.size(), data, dataSize);
-            unsigned int readSize = maxDataSize - dataSize; // Zlib::Decompress decrements the dataSize parameter by the amount uncompressed
-#else
-            unsigned int bytesProcessed = AZStd::GetMin((unsigned int)m_compressedData.size(), maxDataSize);
-            unsigned int readSize = bytesProcessed;
-            memcpy(data, m_compressedData.data(), readSize);
-#endif
-            m_compressedData.erase(m_compressedData.begin(), m_compressedData.begin() + bytesProcessed);
-            return readSize;
-        }
 
-        //=========================================================================
-        // DrillerInputFileStream::Close
-        // [3/23/2011]
-        //=========================================================================
-        void DrillerInputFileStream::Close()
-        {
-#if defined(AZ_FILE_STREAM_COMPRESSION)
-            if (m_zlib)
-            {
-                m_zlib->ResetDecompressor();
-            }
-#endif // AZ_FILE_STREAM_COMPRESSION
-            AZ::IO::SystemFile::Close();
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // DrillerSAXParser
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        //=========================================================================
-        // DrillerSAXParser
-        // [3/23/2011]
-        //=========================================================================
-        DrillerSAXParser::DrillerSAXParser(const TagCallbackType& tcb, const DataCallbackType& dcb)
-            : m_tagCallback(tcb)
-            , m_dataCallback(dcb)
-        {
-        }
-
-        //=========================================================================
-        // ProcessStream
-        // [3/23/2011]
-        //=========================================================================
-        void
-        DrillerSAXParser::ProcessStream(DrillerInputStream& stream)
-        {
-            static const int processChunkSize = 15 * 1024;
-            char buffer[processChunkSize];
-            unsigned int dataSize;
-            bool isEndianSwap = stream.IsEndianSwap();
-            while ((dataSize = stream.ReadBinary(buffer, processChunkSize)) > 0)
-            {
-                char* dataStart = buffer;
-                char* dataEnd = dataStart + dataSize;
-                bool dataInBuffer = false;
-                if (!m_buffer.empty())
+                DrillerOutputStream::StreamEntry* se = reinterpret_cast<DrillerOutputStream::StreamEntry*>(dataStart);
+                if (isEndianSwap)
                 {
-                    m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
-                    dataStart = m_buffer.data();
-                    dataEnd = dataStart + m_buffer.size();
-                    dataInBuffer = true;
+                    // endian swap
+                    AZStd::endian_swap(se->name);
+                    AZStd::endian_swap(se->sizeAndFlags);
                 }
-                const int entrySize = sizeof(DrillerOutputStream::StreamEntry);
-                while (dataStart != dataEnd)
+
+                u32 dataType = (se->sizeAndFlags & DrillerOutputStream::StreamEntry::dataInternalMask) >> DrillerOutputStream::StreamEntry::dataInternalShift;
+                u32 value = se->sizeAndFlags & DrillerOutputStream::StreamEntry::dataSizeMask;
+                Data de;
+                de.m_name = se->name;
+                de.m_stringPool = stream.GetStringPool();
+                de.m_isPooledString = false;
+                de.m_isPooledStringCrc32 = false;
+                switch (dataType)
                 {
-                    if ((dataEnd - dataStart) < entrySize) // we need at least one entry to proceed
+                case DrillerOutputStream::StreamEntry::INT_TAG:
+                {
+                    bool isStart = (value != 0);
+                    m_tagCallback(se->name, isStart);
+                    dataStart += entrySize;
+                } break;
+                case DrillerOutputStream::StreamEntry::INT_DATA_U8:
+                {
+                    u8 value8 = static_cast<u8>(value);
+                    de.m_data = &value8;
+                    de.m_dataSize = 1;
+                    de.m_isEndianSwap = false;
+                    m_dataCallback(de);
+                    dataStart += entrySize;
+                } break;
+                case DrillerOutputStream::StreamEntry::INT_DATA_U16:
+                {
+                    u16 value16 = static_cast<u16>(value);
+                    de.m_data = &value16;
+                    de.m_dataSize = 2;
+                    de.m_isEndianSwap = false;
+                    m_dataCallback(de);
+                    dataStart += entrySize;
+                } break;
+                case DrillerOutputStream::StreamEntry::INT_DATA_U29:
+                {
+                    de.m_data = &value;
+                    de.m_dataSize = 4;
+                    de.m_isEndianSwap = false;
+                    m_dataCallback(de);
+                    dataStart += entrySize;
+                } break;
+                case DrillerOutputStream::StreamEntry::INT_POOLED_STRING:
+                {
+                    unsigned int userDataSize = value;
+                    if ((userDataSize + entrySize) <= (unsigned)(dataEnd - dataStart))
                     {
-                        // not enough data to process, buffer it.
+                        // Add string to the pool
+                        AZ_Assert(de.m_stringPool != nullptr, "We require a string pool to parse this stream");
+                        AZ::u32 crc32;
+                        const char* stringPtr;
+                        dataStart += entrySize;
+                        de.m_stringPool->InsertCopy(reinterpret_cast<const char*>(dataStart), userDataSize, crc32, &stringPtr);
+                        de.m_dataSize = userDataSize;
+                        de.m_isEndianSwap = isEndianSwap;
+                        de.m_isPooledString = true;
+                        de.m_data = const_cast<void*>(static_cast<const void*>(stringPtr));
+                        m_dataCallback(de);
+                        dataStart += userDataSize;
+                    }
+                    else
+                    {
+                        // we can't process data right now add it to the buffer (if we have not done that already)
                         if (!dataInBuffer)
                         {
                             m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
                         }
-                        break;
+                        dataEnd = dataStart;     // exit the loop
                     }
-
-                    DrillerOutputStream::StreamEntry* se = reinterpret_cast<DrillerOutputStream::StreamEntry*>(dataStart);
-                    if (isEndianSwap)
+                } break;
+                case DrillerOutputStream::StreamEntry::INT_POOLED_STRING_CRC32:
+                {
+                    de.m_isPooledStringCrc32 = true;
+                    AZ_Assert(value == 4, "The data size for a pooled string crc32 should be 4 bytes!");
+                }     // continue to INT_SIZE
+                case DrillerOutputStream::StreamEntry::INT_SIZE:
+                {
+                    unsigned int userDataSize = value;
+                    if ((userDataSize + entrySize) <= (unsigned)(dataEnd - dataStart)) // do we have all the date we need to process...
                     {
-                        // endian swap
-                        AZStd::endian_swap(se->name);
-                        AZStd::endian_swap(se->sizeAndFlags);
-                    }
-
-                    u32 dataType = (se->sizeAndFlags & DrillerOutputStream::StreamEntry::dataInternalMask) >> DrillerOutputStream::StreamEntry::dataInternalShift;
-                    u32 value = se->sizeAndFlags & DrillerOutputStream::StreamEntry::dataSizeMask;
-                    Data de;
-                    de.m_name = se->name;
-                    de.m_stringPool = stream.GetStringPool();
-                    de.m_isPooledString = false;
-                    de.m_isPooledStringCrc32 = false;
-                    switch (dataType)
-                    {
-                    case DrillerOutputStream::StreamEntry::INT_TAG:
-                    {
-                        bool isStart = (value != 0);
-                        m_tagCallback(se->name, isStart);
                         dataStart += entrySize;
-                    } break;
-                    case DrillerOutputStream::StreamEntry::INT_DATA_U8:
-                    {
-                        u8 value8 = static_cast<u8>(value);
-                        de.m_data = &value8;
-                        de.m_dataSize = 1;
-                        de.m_isEndianSwap = false;
+                        de.m_data = dataStart;
+                        de.m_dataSize = userDataSize;
+                        de.m_isEndianSwap = isEndianSwap;
                         m_dataCallback(de);
-                        dataStart += entrySize;
-                    } break;
-                    case DrillerOutputStream::StreamEntry::INT_DATA_U16:
-                    {
-                        u16 value16 = static_cast<u16>(value);
-                        de.m_data = &value16;
-                        de.m_dataSize = 2;
-                        de.m_isEndianSwap = false;
-                        m_dataCallback(de);
-                        dataStart += entrySize;
-                    } break;
-                    case DrillerOutputStream::StreamEntry::INT_DATA_U29:
-                    {
-                        de.m_data = &value;
-                        de.m_dataSize = 4;
-                        de.m_isEndianSwap = false;
-                        m_dataCallback(de);
-                        dataStart += entrySize;
-                    } break;
-                    case DrillerOutputStream::StreamEntry::INT_POOLED_STRING:
-                    {
-                        unsigned int userDataSize = value;
-                        if ((userDataSize + entrySize) <= (unsigned)(dataEnd - dataStart))
-                        {
-                            // Add string to the pool
-                            AZ_Assert(de.m_stringPool != nullptr, "We require a string pool to parse this stream");
-                            AZ::u32 crc32;
-                            const char* stringPtr;
-                            dataStart += entrySize;
-                            de.m_stringPool->InsertCopy(reinterpret_cast<const char*>(dataStart), userDataSize, crc32, &stringPtr);
-                            de.m_dataSize = userDataSize;
-                            de.m_isEndianSwap = isEndianSwap;
-                            de.m_isPooledString = true;
-                            de.m_data = const_cast<void*>(static_cast<const void*>(stringPtr));
-                            m_dataCallback(de);
-                            dataStart += userDataSize;
-                        }
-                        else
-                        {
-                            // we can't process data right now add it to the buffer (if we have not done that already)
-                            if (!dataInBuffer)
-                            {
-                                m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
-                            }
-                            dataEnd = dataStart;     // exit the loop
-                        }
-                    } break;
-                    case DrillerOutputStream::StreamEntry::INT_POOLED_STRING_CRC32:
-                    {
-                        de.m_isPooledStringCrc32 = true;
-                        AZ_Assert(value == 4, "The data size for a pooled string crc32 should be 4 bytes!");
-                    }     // continue to INT_SIZE
-                    case DrillerOutputStream::StreamEntry::INT_SIZE:
-                    {
-                        unsigned int userDataSize = value;
-                        if ((userDataSize + entrySize) <= (unsigned)(dataEnd - dataStart)) // do we have all the date we need to process...
-                        {
-                            dataStart += entrySize;
-                            de.m_data = dataStart;
-                            de.m_dataSize = userDataSize;
-                            de.m_isEndianSwap = isEndianSwap;
-                            m_dataCallback(de);
-                            dataStart += userDataSize;
-                        }
-                        else
-                        {
-                            // we can't process data right now add it to the buffer (if we have not done that already)
-                            if (!dataInBuffer)
-                            {
-                                m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
-                            }
-                            dataEnd = dataStart;     // exit the loop
-                        }
-                    } break;
-                    default:
-                    {                        
-                        AZ_Error("DrillerSAXParser",false,"Encounted unknown symbol (%i) while processing stream (%s). Aborting stream.\n",dataType, stream.GetIdentifier());
-
-                        // If we can't process anything, we want to just escape the loop, to avoid spinning infinitely
-                        dataEnd = dataStart;                        
-                    } break;
+                        dataStart += userDataSize;
                     }
-                }
-                if (dataInBuffer) // if the data was in the buffer remove the processed data!
-                {
-                    m_buffer.erase(m_buffer.begin(), m_buffer.begin() + (dataStart - m_buffer.data()));
-                }
-            }
-        }
-
-        void DrillerSAXParser::Data::Read(AZ::Vector3& v) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 3, "We are expecting 3 floats for Vector3 element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 3);
-                m_isEndianSwap = false;
-            }
-            v = Vector3::CreateFromFloat3(data);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Vector4& v) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 4, "We are expecting 4 floats for Vector4 element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 4);
-                m_isEndianSwap = false;
-            }
-            v = Vector4::CreateFromFloat4(data);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Aabb& aabb) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 6, "We are expecting 6 floats for Aabb element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 6);
-                m_isEndianSwap = false;
-            }
-            Vector3 min = Vector3::CreateFromFloat3(data);
-            Vector3 max = Vector3::CreateFromFloat3(&data[3]);
-            aabb = Aabb::CreateFromMinMax(min, max);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Obb& obb) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 10, "We are expecting 10 floats for Obb element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 10);
-                m_isEndianSwap = false;
-            }
-            Vector3 position = Vector3::CreateFromFloat3(data);
-            Quaternion rotation = Quaternion::CreateFromFloat4(&data[3]);
-            Vector3 halfLengths = Vector3::CreateFromFloat3(&data[7]);
-            obb = Obb::CreateFromPositionRotationAndHalfLengths(position, rotation, halfLengths);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Transform& tm) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 12, "We are expecting 12 floats for Transform element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 12);
-                m_isEndianSwap = false;
-            }
-            const Matrix3x4 matrix3x4 = Matrix3x4::CreateFromRowMajorFloat12(data);
-            tm = Transform::CreateFromMatrix3x4(matrix3x4);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Matrix3x3& tm) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 9, "We are expecting 9 floats for Matrix3x3 element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 9);
-                m_isEndianSwap = false;
-            }
-            tm = Matrix3x3::CreateFromRowMajorFloat9(data);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Matrix4x4& tm) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 16, "We are expecting 16 floats for Matrix4x4 element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 16);
-                m_isEndianSwap = false;
-            }
-            tm = Matrix4x4::CreateFromRowMajorFloat16(data);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Quaternion& tm) const
-        {
-            AZ_Assert(m_dataSize == sizeof(float) * 4, "We are expecting 4 floats for Quaternion element 0x%08x with size %d bytes", m_name, m_dataSize);
-            float* data = reinterpret_cast<float*>(m_data);
-            if (m_isEndianSwap)
-            {
-                AZStd::endian_swap(data, data + 4);
-                m_isEndianSwap = false;
-            }
-            tm = Quaternion::CreateFromFloat4(data);
-        }
-        void DrillerSAXParser::Data::Read(AZ::Plane& plane) const
-        {
-            AZ::Vector4 coeff;
-            Read(coeff);
-            plane = Plane::CreateFromCoefficients(coeff.GetX(), coeff.GetY(), coeff.GetZ(), coeff.GetW());
-        }
-
-        const char*  DrillerSAXParser::Data::PrepareString(unsigned int& stringLength) const
-        {
-            const char* srcData = reinterpret_cast<const char*>(m_data);
-            stringLength = m_dataSize;
-            if (m_stringPool)
-            {
-                AZ::u32 crc32;
-                const char* stringPtr;
-                if (m_isPooledStringCrc32)
-                {
-                    crc32 = *reinterpret_cast<AZ::u32*>(m_data);
-                    if (m_isEndianSwap)
+                    else
                     {
-                        AZStd::endian_swap(crc32);
+                        // we can't process data right now add it to the buffer (if we have not done that already)
+                        if (!dataInBuffer)
+                        {
+                            m_buffer.insert(m_buffer.end(), dataStart, dataEnd);
+                        }
+                        dataEnd = dataStart;     // exit the loop
                     }
-                    stringPtr = m_stringPool->Find(crc32);
-                    AZ_Assert(stringPtr != nullptr, "Failed to find string with id 0x%08x in the string pool, proper stream read is impossible!", crc32);
-                    stringLength = static_cast<unsigned int>(strlen(stringPtr));
-                }
-                else if (m_isPooledString)
+                } break;
+                default:
                 {
-                    stringPtr = srcData; // already stored in the pool just transfer the pointer
+                    AZ_Error("DrillerSAXParser",false,"Encounted unknown symbol (%i) while processing stream (%s). Aborting stream.\n",dataType, stream.GetIdentifier());
+
+                    // If we can't process anything, we want to just escape the loop, to avoid spinning infinitely
+                    dataEnd = dataStart;
+                } break;
                 }
-                else
+            }
+            if (dataInBuffer) // if the data was in the buffer remove the processed data!
+            {
+                m_buffer.erase(m_buffer.begin(), m_buffer.begin() + (dataStart - m_buffer.data()));
+            }
+        }
+    }
+
+    void DrillerSAXParser::Data::Read(AZ::Vector3& v) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 3, "We are expecting 3 floats for Vector3 element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 3);
+            m_isEndianSwap = false;
+        }
+        v = Vector3::CreateFromFloat3(data);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Vector4& v) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 4, "We are expecting 4 floats for Vector4 element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 4);
+            m_isEndianSwap = false;
+        }
+        v = Vector4::CreateFromFloat4(data);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Aabb& aabb) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 6, "We are expecting 6 floats for Aabb element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 6);
+            m_isEndianSwap = false;
+        }
+        Vector3 min = Vector3::CreateFromFloat3(data);
+        Vector3 max = Vector3::CreateFromFloat3(&data[3]);
+        aabb = Aabb::CreateFromMinMax(min, max);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Obb& obb) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 10, "We are expecting 10 floats for Obb element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 10);
+            m_isEndianSwap = false;
+        }
+        Vector3 position = Vector3::CreateFromFloat3(data);
+        Quaternion rotation = Quaternion::CreateFromFloat4(&data[3]);
+        Vector3 halfLengths = Vector3::CreateFromFloat3(&data[7]);
+        obb = Obb::CreateFromPositionRotationAndHalfLengths(position, rotation, halfLengths);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Transform& tm) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 12, "We are expecting 12 floats for Transform element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 12);
+            m_isEndianSwap = false;
+        }
+        const Matrix3x4 matrix3x4 = Matrix3x4::CreateFromRowMajorFloat12(data);
+        tm = Transform::CreateFromMatrix3x4(matrix3x4);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Matrix3x3& tm) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 9, "We are expecting 9 floats for Matrix3x3 element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 9);
+            m_isEndianSwap = false;
+        }
+        tm = Matrix3x3::CreateFromRowMajorFloat9(data);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Matrix4x4& tm) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 16, "We are expecting 16 floats for Matrix4x4 element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 16);
+            m_isEndianSwap = false;
+        }
+        tm = Matrix4x4::CreateFromRowMajorFloat16(data);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Quaternion& tm) const
+    {
+        AZ_Assert(m_dataSize == sizeof(float) * 4, "We are expecting 4 floats for Quaternion element 0x%08x with size %d bytes", m_name, m_dataSize);
+        float* data = reinterpret_cast<float*>(m_data);
+        if (m_isEndianSwap)
+        {
+            AZStd::endian_swap(data, data + 4);
+            m_isEndianSwap = false;
+        }
+        tm = Quaternion::CreateFromFloat4(data);
+    }
+    void DrillerSAXParser::Data::Read(AZ::Plane& plane) const
+    {
+        AZ::Vector4 coeff;
+        Read(coeff);
+        plane = Plane::CreateFromCoefficients(coeff.GetX(), coeff.GetY(), coeff.GetZ(), coeff.GetW());
+    }
+
+    const char*  DrillerSAXParser::Data::PrepareString(unsigned int& stringLength) const
+    {
+        const char* srcData = reinterpret_cast<const char*>(m_data);
+        stringLength = m_dataSize;
+        if (m_stringPool)
+        {
+            AZ::u32 crc32;
+            const char* stringPtr;
+            if (m_isPooledStringCrc32)
+            {
+                crc32 = *reinterpret_cast<AZ::u32*>(m_data);
+                if (m_isEndianSwap)
                 {
-                    // Store copy of the string in the pool to save memory (keep only one reference of the string).
-                    m_stringPool->InsertCopy(reinterpret_cast<const char*>(srcData), stringLength, crc32, &stringPtr);
+                    AZStd::endian_swap(crc32);
                 }
-                srcData = stringPtr;
+                stringPtr = m_stringPool->Find(crc32);
+                AZ_Assert(stringPtr != nullptr, "Failed to find string with id 0x%08x in the string pool, proper stream read is impossible!", crc32);
+                stringLength = static_cast<unsigned int>(strlen(stringPtr));
+            }
+            else if (m_isPooledString)
+            {
+                stringPtr = srcData; // already stored in the pool just transfer the pointer
             }
             else
             {
-                AZ_Assert(m_isPooledString == false && m_isPooledStringCrc32 == false, "This stream requires using of a string pool as the string is send only once and afterwards only the Crc32 is used!");
+                // Store copy of the string in the pool to save memory (keep only one reference of the string).
+                m_stringPool->InsertCopy(reinterpret_cast<const char*>(srcData), stringLength, crc32, &stringPtr);
             }
-            return srcData;
+            srcData = stringPtr;
+        }
+        else
+        {
+            AZ_Assert(m_isPooledString == false && m_isPooledStringCrc32 == false, "This stream requires using of a string pool as the string is send only once and afterwards only the Crc32 is used!");
+        }
+        return srcData;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // DrillerDOMParser
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+
+    //=========================================================================
+    // Node::GetTag
+    // [1/23/2013]
+    //=========================================================================
+    const DrillerDOMParser::Node* DrillerDOMParser::Node::GetTag(u32 tagName) const
+    {
+        const Node* tagNode = nullptr;
+        for (Node::NodeListType::const_iterator i = m_tags.begin(); i != m_tags.end(); ++i)
+        {
+            if ((*i).m_name == tagName)
+            {
+                tagNode = &*i;
+                break;
+            }
+        }
+        return tagNode;
+    }
+
+    //=========================================================================
+    // Node::GetData
+    // [3/23/2011]
+    //=========================================================================
+    const DrillerDOMParser::Data* DrillerDOMParser::Node::GetData(u32 dataName) const
+    {
+        const Data* dataNode = nullptr;
+        for (Node::DataListType::const_iterator i = m_data.begin(); i != m_data.end(); ++i)
+        {
+            if (i->m_name == dataName)
+            {
+                dataNode = &*i;
+                break;
+            }
+        }
+        return dataNode;
+    }
+
+    //=========================================================================
+    // DrillerDOMParser
+    // [3/23/2011]
+    //=========================================================================
+    DrillerDOMParser::DrillerDOMParser(bool isPersistentInputData)
+        : DrillerSAXParser(TagCallbackType(this, &DrillerDOMParser::OnTag), DataCallbackType(this, &DrillerDOMParser::OnData))
+        , m_isPersistentInputData(isPersistentInputData)
+    {
+        m_root.m_name = 0;
+        m_root.m_parent = nullptr;
+        m_topNode = &m_root;
+    }
+    static int g_numFree = 0;
+    //=========================================================================
+    // ~DrillerDOMParser
+    // [3/23/2011]
+    //=========================================================================
+    DrillerDOMParser::~DrillerDOMParser()
+    {
+        DeleteNode(m_root);
+    }
+
+    //=========================================================================
+    // OnTag
+    // [3/23/2011]
+    //=========================================================================
+    void
+    DrillerDOMParser::OnTag(AZ::u32 name, bool isOpen)
+    {
+        if (isOpen)
+        {
+            m_topNode->m_tags.push_back();
+            Node& node = m_topNode->m_tags.back();
+            node.m_name = name;
+            node.m_parent = m_topNode;
+
+            m_topNode = &node;
+        }
+        else
+        {
+            AZ_Assert(m_topNode->m_name == name, "We have opened tag with name 0x%08x and closing with name 0x%08x", m_topNode->m_name, name);
+            m_topNode = m_topNode->m_parent;
+        }
+    }
+    //=========================================================================
+    // OnData
+    // [3/23/2011]
+    //=========================================================================
+    void
+    DrillerDOMParser::OnData(const Data& data)
+    {
+        Data de = data;
+        if (!m_isPersistentInputData)
+        {
+            de.m_data = azmalloc(data.m_dataSize, 1, OSAllocator);
+            memcpy(const_cast<void*>(de.m_data), data.m_data, data.m_dataSize);
+        }
+        m_topNode->m_data.push_back(de);
+    }
+    //=========================================================================
+    // DeleteNode
+    // [3/23/2011]
+    //=========================================================================
+    void
+    DrillerDOMParser::DeleteNode(Node& node)
+    {
+        if (!m_isPersistentInputData)
+        {
+            for (Node::DataListType::iterator iter = node.m_data.begin(); iter != node.m_data.end(); ++iter)
+            {
+                azfree(iter->m_data, OSAllocator, iter->m_dataSize);
+                ++g_numFree;
+            }
+            node.m_data.clear();
+        }
+        for (Node::NodeListType::iterator iter = node.m_tags.begin(); iter != node.m_tags.end(); ++iter)
+        {
+            DeleteNode(*iter);
+        }
+        node.m_tags.clear();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+    // DrillerSAXParserHandler
+    //////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////
+
+    //=========================================================================
+    // DrillerSAXParserHandler
+    // [3/14/2013]
+    //=========================================================================
+    DrillerSAXParserHandler::DrillerSAXParserHandler(DrillerHandlerParser* rootHandler)
+        : DrillerSAXParser(TagCallbackType(this, &DrillerSAXParserHandler::OnTag), DataCallbackType(this, &DrillerSAXParserHandler::OnData))
+    {
+        // Push the root element
+        m_stack.push_back(rootHandler);
+    }
+
+    //=========================================================================
+    // OnTag
+    // [3/14/2013]
+    //=========================================================================
+    void DrillerSAXParserHandler::OnTag(u32 name, bool isOpen)
+    {
+        if (m_stack.empty())
+        {
+            return;
         }
 
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // DrillerDOMParser
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-
-        //=========================================================================
-        // Node::GetTag
-        // [1/23/2013]
-        //=========================================================================
-        const DrillerDOMParser::Node* DrillerDOMParser::Node::GetTag(u32 tagName) const
+        DrillerHandlerParser* childHandler = nullptr;
+        DrillerHandlerParser* currentHandler = m_stack.back();
+        if (isOpen)
         {
-            const Node* tagNode = nullptr;
-            for (Node::NodeListType::const_iterator i = m_tags.begin(); i != m_tags.end(); ++i)
+            if (currentHandler != nullptr)
             {
-                if ((*i).m_name == tagName)
+                childHandler = currentHandler->OnEnterTag(name);
+                AZ_Warning("Driller", !currentHandler->IsWarnOnUnsupportedTags() || childHandler != nullptr, "Could not find handler for tag 0x%08x", name);
+            }
+            m_stack.push_back(childHandler);
+        }
+        else
+        {
+            m_stack.pop_back();
+            if (!m_stack.empty())
+            {
+                DrillerHandlerParser* parentHandler = m_stack.back();
+                if (parentHandler)
                 {
-                    tagNode = &*i;
-                    break;
-                }
-            }
-            return tagNode;
-        }
-
-        //=========================================================================
-        // Node::GetData
-        // [3/23/2011]
-        //=========================================================================
-        const DrillerDOMParser::Data* DrillerDOMParser::Node::GetData(u32 dataName) const
-        {
-            const Data* dataNode = nullptr;
-            for (Node::DataListType::const_iterator i = m_data.begin(); i != m_data.end(); ++i)
-            {
-                if (i->m_name == dataName)
-                {
-                    dataNode = &*i;
-                    break;
-                }
-            }
-            return dataNode;
-        }
-
-        //=========================================================================
-        // DrillerDOMParser
-        // [3/23/2011]
-        //=========================================================================
-        DrillerDOMParser::DrillerDOMParser(bool isPersistentInputData)
-            : DrillerSAXParser(TagCallbackType(this, &DrillerDOMParser::OnTag), DataCallbackType(this, &DrillerDOMParser::OnData))
-            , m_isPersistentInputData(isPersistentInputData)
-        {
-            m_root.m_name = 0;
-            m_root.m_parent = nullptr;
-            m_topNode = &m_root;
-        }
-        static int g_numFree = 0;
-        //=========================================================================
-        // ~DrillerDOMParser
-        // [3/23/2011]
-        //=========================================================================
-        DrillerDOMParser::~DrillerDOMParser()
-        {
-            DeleteNode(m_root);
-        }
-
-        //=========================================================================
-        // OnTag
-        // [3/23/2011]
-        //=========================================================================
-        void
-        DrillerDOMParser::OnTag(AZ::u32 name, bool isOpen)
-        {
-            if (isOpen)
-            {
-                m_topNode->m_tags.push_back();
-                Node& node = m_topNode->m_tags.back();
-                node.m_name = name;
-                node.m_parent = m_topNode;
-
-                m_topNode = &node;
-            }
-            else
-            {
-                AZ_Assert(m_topNode->m_name == name, "We have opened tag with name 0x%08x and closing with name 0x%08x", m_topNode->m_name, name);
-                m_topNode = m_topNode->m_parent;
-            }
-        }
-        //=========================================================================
-        // OnData
-        // [3/23/2011]
-        //=========================================================================
-        void
-        DrillerDOMParser::OnData(const Data& data)
-        {
-            Data de = data;
-            if (!m_isPersistentInputData)
-            {
-                de.m_data = azmalloc(data.m_dataSize, 1, OSAllocator);
-                memcpy(const_cast<void*>(de.m_data), data.m_data, data.m_dataSize);
-            }
-            m_topNode->m_data.push_back(de);
-        }
-        //=========================================================================
-        // DeleteNode
-        // [3/23/2011]
-        //=========================================================================
-        void
-        DrillerDOMParser::DeleteNode(Node& node)
-        {
-            if (!m_isPersistentInputData)
-            {
-                for (Node::DataListType::iterator iter = node.m_data.begin(); iter != node.m_data.end(); ++iter)
-                {
-                    azfree(iter->m_data, OSAllocator, iter->m_dataSize);
-                    ++g_numFree;
-                }
-                node.m_data.clear();
-            }
-            for (Node::NodeListType::iterator iter = node.m_tags.begin(); iter != node.m_tags.end(); ++iter)
-            {
-                DeleteNode(*iter);
-            }
-            node.m_tags.clear();
-        }
-
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-        // DrillerSAXParserHandler
-        //////////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////////
-
-        //=========================================================================
-        // DrillerSAXParserHandler
-        // [3/14/2013]
-        //=========================================================================
-        DrillerSAXParserHandler::DrillerSAXParserHandler(DrillerHandlerParser* rootHandler)
-            : DrillerSAXParser(TagCallbackType(this, &DrillerSAXParserHandler::OnTag), DataCallbackType(this, &DrillerSAXParserHandler::OnData))
-        {
-            // Push the root element
-            m_stack.push_back(rootHandler);
-        }
-
-        //=========================================================================
-        // OnTag
-        // [3/14/2013]
-        //=========================================================================
-        void DrillerSAXParserHandler::OnTag(u32 name, bool isOpen)
-        {
-            if (m_stack.size() == 0)
-            {
-                return;
-            }
-
-            DrillerHandlerParser* childHandler = nullptr;
-            DrillerHandlerParser* currentHandler = m_stack.back();
-            if (isOpen)
-            {
-                if (currentHandler != nullptr)
-                {
-                    childHandler = currentHandler->OnEnterTag(name);
-                    AZ_Warning("Driller", !currentHandler->IsWarnOnUnsupportedTags() || childHandler != nullptr, "Could not find handler for tag 0x%08x", name);
-                }
-                m_stack.push_back(childHandler);
-            }
-            else
-            {
-                m_stack.pop_back();
-                if (m_stack.size() > 0)
-                {
-                    DrillerHandlerParser* parentHandler = m_stack.back();
-                    if (parentHandler)
-                    {
-                        parentHandler->OnExitTag(currentHandler, name);
-                    }
+                    parentHandler->OnExitTag(currentHandler, name);
                 }
             }
         }
+    }
 
-        //=========================================================================
-        // OnData
-        // [3/14/2013]
-        //=========================================================================
-        void DrillerSAXParserHandler::OnData(const DrillerSAXParser::Data& data)
+    //=========================================================================
+    // OnData
+    // [3/14/2013]
+    //=========================================================================
+    void DrillerSAXParserHandler::OnData(const DrillerSAXParser::Data& data)
+    {
+        if (m_stack.empty())
         {
-            if (m_stack.size() == 0)
-            {
-                return;
-            }
-
-            DrillerHandlerParser* currentHandler = m_stack.back();
-            if (currentHandler)
-            {
-                currentHandler->OnData(data);
-            }
+            return;
         }
-    } // namespace Debug
-} // namespace AZ
+
+        DrillerHandlerParser* currentHandler = m_stack.back();
+        if (currentHandler)
+        {
+            currentHandler->OnData(data);
+        }
+    }
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp b/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp
index 3cdc3fc461..dd92b340c5 100644
--- a/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/EBus/EventSchedulerSystemComponent.cpp
@@ -60,7 +60,7 @@ namespace AZ
 
     void EventSchedulerSystemComponent::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
     {
-        TimeMs startTime = GetElapsedTimeMs();
+        TimeMs startTime = AZ::GetElapsedTimeMs();
         bool usingTimeslice = bg_maxScheduledEventProcessTimeMs != TimeMs{ 0 };
 
         while (!m_queue.empty())
@@ -76,7 +76,7 @@ namespace AZ
 
         while (!m_pendingQueue.empty())
         {
-            if (usingTimeslice && (GetElapsedTimeMs() - startTime > bg_maxScheduledEventProcessTimeMs))
+            if (usingTimeslice && (AZ::GetElapsedTimeMs() - startTime > bg_maxScheduledEventProcessTimeMs))
             {
                 AZLOG_WARN("Failed to trigger all pending scheduled events, %u events remain on the pending queue", aznumeric_cast<uint32_t>(m_pendingQueue.size()));
                 break;
@@ -103,7 +103,7 @@ namespace AZ
             durationMs = TimeMs{ 0 };
         }
 
-        TimeMs currentMilliseconds = GetElapsedTimeMs();
+        TimeMs currentMilliseconds = AZ::GetElapsedTimeMs();
         if (timedEvent->m_handle == nullptr)
         {
             timedEvent->m_handle = AllocateHandle();
@@ -122,7 +122,7 @@ namespace AZ
             durationMs = TimeMs{ 0 };
         }
 
-        TimeMs currentMilliseconds = GetElapsedTimeMs();
+        TimeMs currentMilliseconds = AZ::GetElapsedTimeMs();
         ScheduledEvent* timedEvent = AllocateManagedEvent(callback, eventName);
         const bool ownsScheduledEvent = true;
         *(timedEvent->m_handle) = ScheduledEventHandle(TimeMs(currentMilliseconds + durationMs), durationMs, timedEvent, ownsScheduledEvent);
diff --git a/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp b/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp
index 8e496c3dbc..41230958e4 100644
--- a/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp
+++ b/Code/Framework/AzCore/AzCore/EBus/ScheduledEvent.cpp
@@ -76,7 +76,7 @@ namespace AZ
 
     TimeMs ScheduledEvent::TimeInQueueMs() const
     {
-        return GetElapsedTimeMs() - m_timeInserted;
+        return AZ::GetElapsedTimeMs() - m_timeInserted;
     }
 
     TimeMs ScheduledEvent::RemainingTimeInQueueMs() const
diff --git a/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp b/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp
index fb9f8841a2..7878ec6e9e 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressionBus.cpp
@@ -8,38 +8,35 @@
 
 #include <AzCore/IO/CompressionBus.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    CompressionInfo::CompressionInfo(CompressionInfo&& rhs)
     {
-        CompressionInfo::CompressionInfo(CompressionInfo&& rhs)
-        {
-            *this = AZStd::move(rhs);
-        }
+        *this = AZStd::move(rhs);
+    }
 
-        CompressionInfo& CompressionInfo::operator=(CompressionInfo&& rhs)
-        {
-            m_decompressor = AZStd::move(rhs.m_decompressor);
-            m_archiveFilename = AZStd::move(rhs.m_archiveFilename);
-            m_compressionTag = rhs.m_compressionTag;
-            m_offset = rhs.m_offset;
-            m_compressedSize = rhs.m_compressedSize;
-            m_uncompressedSize = rhs.m_uncompressedSize;
-            m_conflictResolution = rhs.m_conflictResolution;
-            m_isCompressed = rhs.m_isCompressed;
-            m_isSharedPak = rhs.m_isSharedPak;
+    CompressionInfo& CompressionInfo::operator=(CompressionInfo&& rhs)
+    {
+        m_decompressor = AZStd::move(rhs.m_decompressor);
+        m_archiveFilename = AZStd::move(rhs.m_archiveFilename);
+        m_compressionTag = rhs.m_compressionTag;
+        m_offset = rhs.m_offset;
+        m_compressedSize = rhs.m_compressedSize;
+        m_uncompressedSize = rhs.m_uncompressedSize;
+        m_conflictResolution = rhs.m_conflictResolution;
+        m_isCompressed = rhs.m_isCompressed;
+        m_isSharedPak = rhs.m_isSharedPak;
 
-            return *this;
-        }
+        return *this;
+    }
 
-        namespace CompressionUtils
+    namespace CompressionUtils
+    {
+        bool FindCompressionInfo(CompressionInfo& info, const AZStd::string_view filename)
         {
-            bool FindCompressionInfo(CompressionInfo& info, const AZStd::string_view filename)
-            {
-                bool result = false;
-                CompressionBus::Broadcast(&CompressionBus::Events::FindCompressionInfo, result, info, filename);
-                return result;
-            }
+            bool result = false;
+            CompressionBus::Broadcast(&CompressionBus::Events::FindCompressionInfo, result, info, filename);
+            return result;
         }
     }
-}
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Compressor.cpp b/Code/Framework/AzCore/AzCore/IO/Compressor.cpp
index e223730ce8..16527422ad 100644
--- a/Code/Framework/AzCore/AzCore/IO/Compressor.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Compressor.cpp
@@ -10,32 +10,29 @@
 #include <AzCore/IO/Compressor.h>
 #include <AzCore/IO/CompressorStream.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    //=========================================================================
+    // WriteHeaderAndData
+    // [12/13/2012]
+    //=========================================================================
+    bool Compressor::WriteHeaderAndData(CompressorStream* compressorStream)
     {
-        //=========================================================================
-        // WriteHeaderAndData
-        // [12/13/2012]
-        //=========================================================================
-        bool Compressor::WriteHeaderAndData(CompressorStream* compressorStream)
+        AZ_Assert(compressorStream->CanWrite(), "Stream is not open for write!");
+        AZ_Assert(compressorStream->GetCompressorData(), "Stream doesn't have attached compressor, call WriteCompressed first!");
+        AZ_Assert(compressorStream->GetCompressorData()->m_compressor == this, "Invalid compressor data! Data belongs to a different compressor");
+        CompressorHeader header;
+        header.SetAZCS();
+        header.m_compressorId = GetTypeId();
+        header.m_uncompressedSize = compressorStream->GetCompressorData()->m_uncompressedSize;
+        AZStd::endian_swap(header.m_compressorId);
+        AZStd::endian_swap(header.m_uncompressedSize);
+        GenericStream* baseStream = compressorStream->GetWrappedStream();
+        if (baseStream->WriteAtOffset(sizeof(CompressorHeader), &header, 0U) == sizeof(CompressorHeader))
         {
-            AZ_Assert(compressorStream->CanWrite(), "Stream is not open for write!");
-            AZ_Assert(compressorStream->GetCompressorData(), "Stream doesn't have attached compressor, call WriteCompressed first!");
-            AZ_Assert(compressorStream->GetCompressorData()->m_compressor == this, "Invalid compressor data! Data belongs to a different compressor");
-            CompressorHeader header;
-            header.SetAZCS();
-            header.m_compressorId = GetTypeId();
-            header.m_uncompressedSize = compressorStream->GetCompressorData()->m_uncompressedSize;
-            AZStd::endian_swap(header.m_compressorId);
-            AZStd::endian_swap(header.m_uncompressedSize);
-            GenericStream* baseStream = compressorStream->GetWrappedStream();
-            if (baseStream->WriteAtOffset(sizeof(CompressorHeader), &header, 0U) == sizeof(CompressorHeader))
-            {
-                return true;
-            }
-
-            return false;
+            return true;
         }
-    } // namespace IO
-} // namespace AZ
+
+        return false;
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Compressor.h b/Code/Framework/AzCore/AzCore/IO/Compressor.h
index 9b910a0ea4..340366d82f 100644
--- a/Code/Framework/AzCore/AzCore/IO/Compressor.h
+++ b/Code/Framework/AzCore/AzCore/IO/Compressor.h
@@ -5,74 +5,67 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#ifndef AZCORE_IO_COMPRESSOR_H
-#define AZCORE_IO_COMPRESSOR_H
+#pragma once
 
 #include <AzCore/base.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    class CompressorStream;
+
+    /**
+     * Compressor/Decompressor base interface.
+     * Used for all stream compressors.
+     */
+    class Compressor
     {
-        class CompressorStream;
+    public:
+        typedef AZ::u64 SizeType;
+        static const int m_maxHeaderSize = 4096; /// When we open a stream to check if it's compressed we read the first m_maxHeaderSize bytes.
 
-        /**
-         * Compressor/Decompressor base interface.
-         * Used for all stream compressors.
-         */
-        class Compressor
-        {
-        public:
-            typedef AZ::u64 SizeType;
-            static const int m_maxHeaderSize = 4096; /// When we open a stream to check if it's compressed we read the first m_maxHeaderSize bytes.
+        virtual ~Compressor() {}
+        /// Return compressor type id.
+        virtual AZ::u32     GetTypeId() const = 0;
+        /// Called when we open a stream to Read for the first time. Data contains the first. dataSize <= m_maxHeaderSize.
+        virtual bool        ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize) = 0;
+        /// Called when we are about to start writing to a compressed stream. (Must be called first to write compressor header)
+        virtual bool        WriteHeaderAndData(CompressorStream* stream);
+        /// Forwarded function from the Device when we from a compressed stream.
+        virtual SizeType    Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer) = 0;
+        /// Forwarded function from the Device when we write to a compressed stream.
+        virtual SizeType    Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset = SizeType(-1)) = 0;
+        /// Write a seek point.
+        virtual bool        WriteSeekPoint(CompressorStream* stream)                                                          { (void)stream; return false; }
+        /// Initializes Compressor for writing data.
+        virtual bool        StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize)        { (void)stream; (void)compressionLevel; (void)autoSeekDataSize; return false; }
+        /// Called just before we close the stream. All compression data will be flushed and finalized. (You can't add data afterwards).
+        virtual bool        Close(CompressorStream* stream) = 0;
+    };
 
-            virtual ~Compressor() {}
-            /// Return compressor type id.
-            virtual AZ::u32     GetTypeId() const = 0;
-            /// Called when we open a stream to Read for the first time. Data contains the first. dataSize <= m_maxHeaderSize.
-            virtual bool        ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize) = 0;
-            /// Called when we are about to start writing to a compressed stream. (Must be called first to write compressor header)
-            virtual bool        WriteHeaderAndData(CompressorStream* stream);
-            /// Forwarded function from the Device when we from a compressed stream.
-            virtual SizeType    Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer) = 0;
-            /// Forwarded function from the Device when we write to a compressed stream.
-            virtual SizeType    Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset = SizeType(-1)) = 0;
-            /// Write a seek point.
-            virtual bool        WriteSeekPoint(CompressorStream* stream)                                                          { (void)stream; return false; }
-            /// Initializes Compressor for writing data.
-            virtual bool        StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize)        { (void)stream; (void)compressionLevel; (void)autoSeekDataSize; return false; }
-            /// Called just before we close the stream. All compression data will be flushed and finalized. (You can't add data afterwards).
-            virtual bool        Close(CompressorStream* stream) = 0;
-        };
+    /**
+     * Base compressor data assigned for all compressors.
+     */
+    class CompressorData
+    {
+    public:
+        virtual ~CompressorData() {}
 
-        /**
-         * Base compressor data assigned for all compressors.
-         */
-        class CompressorData
-        {
-        public:
-            virtual ~CompressorData() {}
+        Compressor*     m_compressor;
+        AZ::u64         m_uncompressedSize;
+    };
 
-            Compressor*     m_compressor;
-            AZ::u64         m_uncompressedSize;
-        };
+    /**
+     * All data is stored in network order (big endian).
+     */
+    struct  CompressorHeader
+    {
+        CompressorHeader()      { m_azcs[0] = 0; m_azcs[1] = 0; m_azcs[2] = 0; m_azcs[3] = 0; }
 
-        /**
-         * All data is stored in network order (big endian).
-         */
-        struct  CompressorHeader
-        {
-            CompressorHeader()                              { m_azcs[0] = 0; m_azcs[1] = 0; m_azcs[2] = 0; m_azcs[3] = 0; }
+        bool IsValid() const    { return (m_azcs[0] == 'A' && m_azcs[1] == 'Z' && m_azcs[2] == 'C' && m_azcs[3] == 'S'); }
+        void SetAZCS()          { m_azcs[0] = 'A'; m_azcs[1] = 'Z'; m_azcs[2] = 'C'; m_azcs[3] = 'S'; }
 
-            inline bool IsValid() const                     { return (m_azcs[0] == 'A' && m_azcs[1] == 'Z' && m_azcs[2] == 'C' && m_azcs[3] == 'S'); }
-            void SetAZCS()                                  { m_azcs[0] = 'A'; m_azcs[1] = 'Z'; m_azcs[2] = 'C'; m_azcs[3] = 'S'; }
-
-            char        m_azcs[4];          ///< String contains 'AZCS' AmaZon Compressed Stream
-            AZ::u32     m_compressorId;     ///< Compression method.
-            AZ::u64     m_uncompressedSize; ///< Uncompressed file size.
-        };
-    } // namespace IO
-} // namespace AZ
-
-#endif // AZCORE_IO_COMPRESSOR_H
-#pragma once
+        char        m_azcs[4];          ///< String contains 'AZCS' AmaZon Compressed Stream
+        AZ::u32     m_compressorId;     ///< Compression method.
+        AZ::u64     m_uncompressedSize; ///< Uncompressed file size.
+    };
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp b/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp
index 6f82cc428d..a1012ee404 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorStream.cpp
@@ -15,9 +15,7 @@
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/Memory/Memory.h>
 
-namespace AZ
-{
-namespace IO
+namespace AZ::IO
 {
 /*!
 \brief Constructs a compressor stream using the supplied filename and OpenFlags to open a file on disk
@@ -300,7 +298,4 @@ Compressor* CompressorStream::CreateCompressor(AZ::u32 compressorId)
     return m_compressor.get();
 }
 
-} // namespace IO
-} // namespace AZ
-
-
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp b/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp
index f973c0e95a..03a218dbfe 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp
@@ -13,543 +13,540 @@
 #include <AzCore/Math/Crc.h>
 #include <AzCore/Math/MathUtils.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    //=========================================================================
+    // CompressorZLib
+    // [12/13/2012]
+    //=========================================================================
+    CompressorZLib::CompressorZLib(unsigned int decompressionCachePerStream, unsigned int dataBufferSize)
+        : m_lastReadStream(nullptr)
+        , m_lastReadStreamOffset(0)
+        , m_lastReadStreamSize(0)
+        , m_compressedDataBuffer(nullptr)
+        , m_compressedDataBufferSize(dataBufferSize)
+        , m_compressedDataBufferUseCount(0)
+        , m_decompressionCachePerStream(decompressionCachePerStream)
+
     {
-        //=========================================================================
-        // CompressorZLib
-        // [12/13/2012]
-        //=========================================================================
-        CompressorZLib::CompressorZLib(unsigned int decompressionCachePerStream, unsigned int dataBufferSize)
-            : m_lastReadStream(nullptr)
-            , m_lastReadStreamOffset(0)
-            , m_lastReadStreamSize(0)
-            , m_compressedDataBuffer(nullptr)
-            , m_compressedDataBufferSize(dataBufferSize)
-            , m_compressedDataBufferUseCount(0)
-            , m_decompressionCachePerStream(decompressionCachePerStream)
+        AZ_Assert((dataBufferSize % (32 * 1024)) == 0, "Data buffer size %d must be multiple of 32 KB!", dataBufferSize);
+        AZ_Assert((decompressionCachePerStream % (32 * 1024)) == 0, "Decompress cache size %d must be multiple of 32 KB!", decompressionCachePerStream);
+    }
 
+    //=========================================================================
+    // !CompressorZLib
+    // [12/13/2012]
+    //=========================================================================
+    CompressorZLib::~CompressorZLib()
+    {
+        AZ_Warning("IO", m_compressedDataBufferUseCount == 0, "CompressorZLib has it's data buffer still referenced, it means that %d compressed streams have NOT closed! Freeing data...", m_compressedDataBufferUseCount);
+        while (m_compressedDataBufferUseCount)
         {
-            AZ_Assert((dataBufferSize % (32 * 1024)) == 0, "Data buffer size %d must be multiple of 32 KB!", dataBufferSize);
-            AZ_Assert((decompressionCachePerStream % (32 * 1024)) == 0, "Decompress cache size %d must be multiple of 32 KB!", decompressionCachePerStream);
+            ReleaseDataBuffer();
         }
+    }
 
-        //=========================================================================
-        // !CompressorZLib
-        // [12/13/2012]
-        //=========================================================================
-        CompressorZLib::~CompressorZLib()
+    //=========================================================================
+    // GetTypeId
+    // [12/13/2012]
+    //=========================================================================
+    AZ::u32     CompressorZLib::TypeId()
+    {
+        return AZ_CRC("ZLib", 0x73887d3a);
+    }
+
+    //=========================================================================
+    // ReadHeaderAndData
+    // [12/13/2012]
+    //=========================================================================
+    bool        CompressorZLib::ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize)
+    {
+        if (stream->GetCompressorData() != nullptr)  // we already have compressor data
         {
-            AZ_Warning("IO", m_compressedDataBufferUseCount == 0, "CompressorZLib has it's data buffer still referenced, it means that %d compressed streams have NOT closed! Freeing data...", m_compressedDataBufferUseCount);
-            while (m_compressedDataBufferUseCount)
-            {
-                ReleaseDataBuffer();
-            }
-        }
-
-        //=========================================================================
-        // GetTypeId
-        // [12/13/2012]
-        //=========================================================================
-        AZ::u32     CompressorZLib::TypeId()
-        {
-            return AZ_CRC("ZLib", 0x73887d3a);
-        }
-
-        //=========================================================================
-        // ReadHeaderAndData
-        // [12/13/2012]
-        //=========================================================================
-        bool        CompressorZLib::ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize)
-        {
-            if (stream->GetCompressorData() != nullptr)  // we already have compressor data
-            {
-                return false;
-            }
-
-            // Read the ZLib header should be after the default compression header...
-            // We should not be in this function otherwise.
-            if (dataSize < sizeof(CompressorZLibHeader) + sizeof(ZLib::Header))
-            {
-                AZ_Assert(false, "We did not read enough data, we have only %d bytes left in the buffer and we need %d!", dataSize, sizeof(CompressorZLibHeader) + sizeof(ZLib::Header));
-                return false;
-            }
-
-            AcquireDataBuffer();
-
-            CompressorZLibHeader* hdr = reinterpret_cast<CompressorZLibHeader*>(data);
-            AZStd::endian_swap(hdr->m_numSeekPoints);
-            dataSize -= sizeof(CompressorZLibHeader);
-            data += sizeof(CompressorZLibHeader);
-
-            CompressorZLibData* zlibData = aznew CompressorZLibData;
-            zlibData->m_compressor = this;
-            zlibData->m_uncompressedSize = 0;
-            zlibData->m_zlibHeader = *reinterpret_cast<ZLib::Header*>(data);
-            dataSize -= sizeof(zlibData->m_zlibHeader);
-            data += sizeof(zlibData->m_zlibHeader);
-            zlibData->m_decompressNextOffset = sizeof(CompressorHeader) + sizeof(CompressorZLibHeader) + sizeof(ZLib::Header); // start after the headers
-
-            AZ_Assert(hdr->m_numSeekPoints > 0, "We should have at least one seek point for the entire stream!");
-
-            // go the end of the file and read all sync points.
-            SizeType compressedFileEnd = stream->GetLength();
-            if (compressedFileEnd == 0)
-            {
-                delete zlibData;
-                return false;
-            }
-
-            zlibData->m_seekPoints.resize(hdr->m_numSeekPoints);
-            SizeType dataToRead = sizeof(CompressorZLibSeekPoint) * static_cast<SizeType>(hdr->m_numSeekPoints);
-            SizeType seekPointOffset = compressedFileEnd - dataToRead;
-            AZ_Assert(seekPointOffset <= compressedFileEnd, "We have an invalid archive, this is impossible!");
-            GenericStream* baseStream = stream->GetWrappedStream();
-            if (baseStream->ReadAtOffset(dataToRead, zlibData->m_seekPoints.data(), seekPointOffset) != dataToRead)
-            {
-                delete zlibData;
-                return false;
-            }
-            for (size_t i = 0; i < zlibData->m_seekPoints.size(); ++i)
-            {
-                AZStd::endian_swap(zlibData->m_seekPoints[i].m_compressedOffset);
-                AZStd::endian_swap(zlibData->m_seekPoints[i].m_uncompressedOffset);
-            }
-
-            if (m_decompressionCachePerStream)
-            {
-                zlibData->m_decompressedCache = reinterpret_cast<unsigned char*>(azmalloc(m_decompressionCachePerStream, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZLib"));
-            }
-
-            zlibData->m_decompressLastOffset = seekPointOffset; // set the start address of the seek points as the last valid read address for the compressed stream.
-
-            zlibData->m_zlib.StartDecompressor(&zlibData->m_zlibHeader);
-
-            stream->SetCompressorData(zlibData);
-
-            return true;
-        }
-
-        //=========================================================================
-        // WriteHeaderAndData
-        // [12/13/2012]
-        //=========================================================================
-        bool CompressorZLib::WriteHeaderAndData(CompressorStream* stream)
-        {
-            if (!Compressor::WriteHeaderAndData(stream))
-            {
-                return false;
-            }
-
-            CompressorZLibData* compressorData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
-            CompressorZLibHeader header;
-            header.m_numSeekPoints = static_cast<AZ::u32>(compressorData->m_seekPoints.size());
-            AZStd::endian_swap(header.m_numSeekPoints);
-            GenericStream* baseStream = stream->GetWrappedStream();
-            if (baseStream->WriteAtOffset(sizeof(header), &header, sizeof(CompressorHeader)) == sizeof(header))
-            {
-                return true;
-            }
-
             return false;
         }
 
-        //=========================================================================
-        // FillFromDecompressCache
-        // [12/14/2012]
-        //=========================================================================
-        inline CompressorZLib::SizeType CompressorZLib::FillFromDecompressCache(CompressorZLibData* zlibData, void*& buffer, SizeType& byteSize, SizeType& offset)
+        // Read the ZLib header should be after the default compression header...
+        // We should not be in this function otherwise.
+        if (dataSize < sizeof(CompressorZLibHeader) + sizeof(ZLib::Header))
         {
-            SizeType firstOffsetInCache = zlibData->m_decompressedCacheOffset;
-            SizeType lastOffsetInCache = firstOffsetInCache + zlibData->m_decompressedCacheDataSize;
-            SizeType firstDataOffset = offset;
-            SizeType lastDataOffset = offset + byteSize;
-            SizeType numCopied = 0;
-            if (firstOffsetInCache < lastDataOffset && lastOffsetInCache > firstDataOffset)  // check if there is data in the cache
-            {
-                size_t copyOffsetStart = 0;
-                size_t copyOffsetEnd = zlibData->m_decompressedCacheDataSize;
-
-                size_t bufferCopyOffset = 0;
-
-                if (firstOffsetInCache < firstDataOffset)
-                {
-                    copyOffsetStart = static_cast<size_t>(firstDataOffset - firstOffsetInCache);
-                }
-                else
-                {
-                    bufferCopyOffset = static_cast<size_t>(firstOffsetInCache - firstDataOffset);
-                }
-
-                if (lastOffsetInCache >= lastDataOffset)
-                {
-                    copyOffsetEnd -= static_cast<size_t>(lastOffsetInCache - lastDataOffset);
-                }
-                else if (bufferCopyOffset > 0)  // the cache block is in the middle of the data, we can't use it (since we need to split buffer request into 2)
-                {
-                    return 0;
-                }
-
-                numCopied = copyOffsetEnd - copyOffsetStart;
-                memcpy(static_cast<char*>(buffer) + bufferCopyOffset, zlibData->m_decompressedCache + copyOffsetStart, static_cast<size_t>(numCopied));
-
-                // adjust pointers and sizes
-                byteSize -= numCopied;
-                if (bufferCopyOffset == 0)
-                {
-                    // copied in the start
-                    buffer = reinterpret_cast<char*>(buffer) + numCopied;
-                    offset += numCopied;
-                }
-            }
-
-            return numCopied;
+            AZ_Assert(false, "We did not read enough data, we have only %d bytes left in the buffer and we need %d!", dataSize, sizeof(CompressorZLibHeader) + sizeof(ZLib::Header));
+            return false;
         }
 
-        //=========================================================================
-        // FillFromCompressedCache
-        // [12/17/2012]
-        //=========================================================================
-        inline CompressorZLib::SizeType CompressorZLib::FillCompressedBuffer(CompressorStream* stream)
+        AcquireDataBuffer();
+
+        CompressorZLibHeader* hdr = reinterpret_cast<CompressorZLibHeader*>(data);
+        AZStd::endian_swap(hdr->m_numSeekPoints);
+        dataSize -= sizeof(CompressorZLibHeader);
+        data += sizeof(CompressorZLibHeader);
+
+        CompressorZLibData* zlibData = aznew CompressorZLibData;
+        zlibData->m_compressor = this;
+        zlibData->m_uncompressedSize = 0;
+        zlibData->m_zlibHeader = *reinterpret_cast<ZLib::Header*>(data);
+        dataSize -= sizeof(zlibData->m_zlibHeader);
+        data += sizeof(zlibData->m_zlibHeader);
+        zlibData->m_decompressNextOffset = sizeof(CompressorHeader) + sizeof(CompressorZLibHeader) + sizeof(ZLib::Header); // start after the headers
+
+        AZ_Assert(hdr->m_numSeekPoints > 0, "We should have at least one seek point for the entire stream!");
+
+        // go the end of the file and read all sync points.
+        SizeType compressedFileEnd = stream->GetLength();
+        if (compressedFileEnd == 0)
         {
-            CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
-            SizeType dataFromBuffer = 0;
-            if (stream == m_lastReadStream)  // if the buffer is filled with data from the current stream, try to reuse
-            {
-                if (zlibData->m_decompressNextOffset > m_lastReadStreamOffset)
-                {
-                    SizeType offsetInCache = zlibData->m_decompressNextOffset - m_lastReadStreamOffset;
-                    if (offsetInCache < m_lastReadStreamSize)  // last check if there is data overlap
-                    {
-                        // copy the usable part at the start of the
-                        SizeType toMove = m_lastReadStreamSize - offsetInCache;
-                        memmove(m_compressedDataBuffer, &m_compressedDataBuffer[static_cast<size_t>(offsetInCache)], static_cast<size_t>(toMove));
-                        dataFromBuffer += toMove;
-                    }
-                }
-            }
-
-            SizeType toReadFromStream = m_compressedDataBufferSize - dataFromBuffer;
-            SizeType readOffset = zlibData->m_decompressNextOffset + dataFromBuffer;
-            if (readOffset + toReadFromStream > zlibData->m_decompressLastOffset)
-            {
-                // don't read pass the end
-                AZ_Assert(readOffset <= zlibData->m_decompressLastOffset, "Read offset should always be before the end of stream!");
-                toReadFromStream = zlibData->m_decompressLastOffset - readOffset;
-            }
-
-            SizeType numReadFromStream = 0;
-            if (toReadFromStream)  // if we did not reuse the whole buffer, read some data from the stream
-            {
-                GenericStream* baseStream = stream->GetWrappedStream();
-                numReadFromStream = baseStream->ReadAtOffset(toReadFromStream, &m_compressedDataBuffer[static_cast<size_t>(dataFromBuffer)], readOffset);
-            }
-
-            // update what's actually in the read data buffer.
-            m_lastReadStream = stream;
-            m_lastReadStreamOffset = zlibData->m_decompressNextOffset;
-            m_lastReadStreamSize = dataFromBuffer + numReadFromStream;
-            return m_lastReadStreamSize;
+            delete zlibData;
+            return false;
         }
 
-        /**
-         * Helper class to find the best seek point for a specific offset.
-         */
-        struct CompareUpper
+        zlibData->m_seekPoints.resize(hdr->m_numSeekPoints);
+        SizeType dataToRead = sizeof(CompressorZLibSeekPoint) * static_cast<SizeType>(hdr->m_numSeekPoints);
+        SizeType seekPointOffset = compressedFileEnd - dataToRead;
+        AZ_Assert(seekPointOffset <= compressedFileEnd, "We have an invalid archive, this is impossible!");
+        GenericStream* baseStream = stream->GetWrappedStream();
+        if (baseStream->ReadAtOffset(dataToRead, zlibData->m_seekPoints.data(), seekPointOffset) != dataToRead)
         {
-            inline bool operator()(const AZ::u64& offset, const CompressorZLibSeekPoint& sp) const {return offset < sp.m_uncompressedOffset; }
-        };
-
-        //=========================================================================
-        // Read
-        // [12/13/2012]
-        //=========================================================================
-        CompressorZLib::SizeType    CompressorZLib::Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer)
+            delete zlibData;
+            return false;
+        }
+        for (size_t i = 0; i < zlibData->m_seekPoints.size(); ++i)
         {
-            AZ_Assert(stream->GetCompressorData(), "This stream doesn't have decompression enabled!");
-            CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
-            AZ_Assert(!zlibData->m_zlib.IsCompressorStarted(), "You can't read/decompress while writing a compressed stream %s!");
+            AZStd::endian_swap(zlibData->m_seekPoints[i].m_compressedOffset);
+            AZStd::endian_swap(zlibData->m_seekPoints[i].m_uncompressedOffset);
+        }
 
-            // check if the request can be finished from the decompressed cache
-            SizeType numRead = FillFromDecompressCache(zlibData, buffer, byteSize, offset);
-            if (byteSize == 0)  // are we done
+        if (m_decompressionCachePerStream)
+        {
+            zlibData->m_decompressedCache = reinterpret_cast<unsigned char*>(azmalloc(m_decompressionCachePerStream, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZLib"));
+        }
+
+        zlibData->m_decompressLastOffset = seekPointOffset; // set the start address of the seek points as the last valid read address for the compressed stream.
+
+        zlibData->m_zlib.StartDecompressor(&zlibData->m_zlibHeader);
+
+        stream->SetCompressorData(zlibData);
+
+        return true;
+    }
+
+    //=========================================================================
+    // WriteHeaderAndData
+    // [12/13/2012]
+    //=========================================================================
+    bool CompressorZLib::WriteHeaderAndData(CompressorStream* stream)
+    {
+        if (!Compressor::WriteHeaderAndData(stream))
+        {
+            return false;
+        }
+
+        CompressorZLibData* compressorData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+        CompressorZLibHeader header;
+        header.m_numSeekPoints = static_cast<AZ::u32>(compressorData->m_seekPoints.size());
+        AZStd::endian_swap(header.m_numSeekPoints);
+        GenericStream* baseStream = stream->GetWrappedStream();
+        if (baseStream->WriteAtOffset(sizeof(header), &header, sizeof(CompressorHeader)) == sizeof(header))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    //=========================================================================
+    // FillFromDecompressCache
+    // [12/14/2012]
+    //=========================================================================
+    inline CompressorZLib::SizeType CompressorZLib::FillFromDecompressCache(CompressorZLibData* zlibData, void*& buffer, SizeType& byteSize, SizeType& offset)
+    {
+        SizeType firstOffsetInCache = zlibData->m_decompressedCacheOffset;
+        SizeType lastOffsetInCache = firstOffsetInCache + zlibData->m_decompressedCacheDataSize;
+        SizeType firstDataOffset = offset;
+        SizeType lastDataOffset = offset + byteSize;
+        SizeType numCopied = 0;
+        if (firstOffsetInCache < lastDataOffset && lastOffsetInCache > firstDataOffset)  // check if there is data in the cache
+        {
+            size_t copyOffsetStart = 0;
+            size_t copyOffsetEnd = zlibData->m_decompressedCacheDataSize;
+
+            size_t bufferCopyOffset = 0;
+
+            if (firstOffsetInCache < firstDataOffset)
             {
-                return numRead;
+                copyOffsetStart = static_cast<size_t>(firstDataOffset - firstOffsetInCache);
+            }
+            else
+            {
+                bufferCopyOffset = static_cast<size_t>(firstOffsetInCache - firstDataOffset);
             }
 
-            // find the best seek point for current offset
-            CompressorZLibData::SeekPointArray::iterator it = AZStd::upper_bound(zlibData->m_seekPoints.begin(), zlibData->m_seekPoints.end(), offset, CompareUpper());
-            AZ_Assert(it != zlibData->m_seekPoints.begin(), "This should be impossible, we should always have a valid seek point at 0 offset!");
-            const CompressorZLibSeekPoint& bestSeekPoint = *(--it);  // get the previous (so it includes the current offset)
-
-            // if read is continuous continue with decompression
-            bool isJumpToSeekPoint = false;
-            SizeType lastOffsetInCache = zlibData->m_decompressedCacheOffset + zlibData->m_decompressedCacheDataSize;
-            if (bestSeekPoint.m_uncompressedOffset > lastOffsetInCache)     // if the best seek point is forward, jump forward to it.
+            if (lastOffsetInCache >= lastDataOffset)
             {
-                isJumpToSeekPoint = true;
+                copyOffsetEnd -= static_cast<size_t>(lastOffsetInCache - lastDataOffset);
             }
-            else if (offset < lastOffsetInCache)    // if the seek point is in the past and the requested offset is not in the cache jump back to it.
+            else if (bufferCopyOffset > 0)  // the cache block is in the middle of the data, we can't use it (since we need to split buffer request into 2)
             {
-                isJumpToSeekPoint = true;
+                return 0;
             }
 
-            if (isJumpToSeekPoint)
-            {
-                zlibData->m_decompressNextOffset = bestSeekPoint.m_compressedOffset;  // set next read point
-                zlibData->m_decompressedCacheOffset = bestSeekPoint.m_uncompressedOffset; // set uncompressed offset
-                zlibData->m_decompressedCacheDataSize = 0; // invalidate the cache
-                zlibData->m_zlib.ResetDecompressor(&zlibData->m_zlibHeader); // reset decompressor and setup the header.
-            }
+            numCopied = copyOffsetEnd - copyOffsetStart;
+            memcpy(static_cast<char*>(buffer) + bufferCopyOffset, zlibData->m_decompressedCache + copyOffsetStart, static_cast<size_t>(numCopied));
 
-            // decompress and move forward until the request is done
-            while (byteSize > 0)
+            // adjust pointers and sizes
+            byteSize -= numCopied;
+            if (bufferCopyOffset == 0)
             {
-                // fill buffer with compressed data
-                SizeType compressedDataSize = FillCompressedBuffer(stream);
-                if (compressedDataSize == 0)
+                // copied in the start
+                buffer = reinterpret_cast<char*>(buffer) + numCopied;
+                offset += numCopied;
+            }
+        }
+
+        return numCopied;
+    }
+
+    //=========================================================================
+    // FillFromCompressedCache
+    // [12/17/2012]
+    //=========================================================================
+    inline CompressorZLib::SizeType CompressorZLib::FillCompressedBuffer(CompressorStream* stream)
+    {
+        CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+        SizeType dataFromBuffer = 0;
+        if (stream == m_lastReadStream)  // if the buffer is filled with data from the current stream, try to reuse
+        {
+            if (zlibData->m_decompressNextOffset > m_lastReadStreamOffset)
+            {
+                SizeType offsetInCache = zlibData->m_decompressNextOffset - m_lastReadStreamOffset;
+                if (offsetInCache < m_lastReadStreamSize)  // last check if there is data overlap
                 {
-                    return numRead; // we are done reading and obviously we did not managed to read all data
+                    // copy the usable part at the start of the
+                    SizeType toMove = m_lastReadStreamSize - offsetInCache;
+                    memmove(m_compressedDataBuffer, &m_compressedDataBuffer[static_cast<size_t>(offsetInCache)], static_cast<size_t>(toMove));
+                    dataFromBuffer += toMove;
                 }
-                unsigned int processedCompressedData = 0;
-                while (byteSize > 0 && processedCompressedData < compressedDataSize) // decompressed data either until we are done with the request (byteSize == 0) or we need to fill the compression buffer again.
-                {
-                    // if we have data in the cache move to the next offset, we always move forward by default.
-                    zlibData->m_decompressedCacheOffset += zlibData->m_decompressedCacheDataSize;
-
-                    // decompress in the cache buffer
-                    u32 availDecompressedCacheSize = m_decompressionCachePerStream; // reset buffer size
-                    unsigned int processed = zlibData->m_zlib.Decompress(&m_compressedDataBuffer[processedCompressedData], static_cast<unsigned int>(compressedDataSize) - processedCompressedData, zlibData->m_decompressedCache, availDecompressedCacheSize);
-                    zlibData->m_decompressedCacheDataSize = m_decompressionCachePerStream - availDecompressedCacheSize;
-                    if (processed == 0)
-                    {
-                        break; // we processed everything we could, load more compressed data.
-                    }
-                    processedCompressedData += processed;
-                    // fill what we can from the cache
-                    numRead += FillFromDecompressCache(zlibData, buffer, byteSize, offset);
-                }
-                // update next read position the the compressed stream
-                zlibData->m_decompressNextOffset +=  processedCompressedData;
             }
+        }
+
+        SizeType toReadFromStream = m_compressedDataBufferSize - dataFromBuffer;
+        SizeType readOffset = zlibData->m_decompressNextOffset + dataFromBuffer;
+        if (readOffset + toReadFromStream > zlibData->m_decompressLastOffset)
+        {
+            // don't read pass the end
+            AZ_Assert(readOffset <= zlibData->m_decompressLastOffset, "Read offset should always be before the end of stream!");
+            toReadFromStream = zlibData->m_decompressLastOffset - readOffset;
+        }
+
+        SizeType numReadFromStream = 0;
+        if (toReadFromStream)  // if we did not reuse the whole buffer, read some data from the stream
+        {
+            GenericStream* baseStream = stream->GetWrappedStream();
+            numReadFromStream = baseStream->ReadAtOffset(toReadFromStream, &m_compressedDataBuffer[static_cast<size_t>(dataFromBuffer)], readOffset);
+        }
+
+        // update what's actually in the read data buffer.
+        m_lastReadStream = stream;
+        m_lastReadStreamOffset = zlibData->m_decompressNextOffset;
+        m_lastReadStreamSize = dataFromBuffer + numReadFromStream;
+        return m_lastReadStreamSize;
+    }
+
+    /**
+     * Helper class to find the best seek point for a specific offset.
+     */
+    struct CompareUpper
+    {
+        inline bool operator()(const AZ::u64& offset, const CompressorZLibSeekPoint& sp) const {return offset < sp.m_uncompressedOffset; }
+    };
+
+    //=========================================================================
+    // Read
+    // [12/13/2012]
+    //=========================================================================
+    CompressorZLib::SizeType    CompressorZLib::Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer)
+    {
+        AZ_Assert(stream->GetCompressorData(), "This stream doesn't have decompression enabled!");
+        CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+        AZ_Assert(!zlibData->m_zlib.IsCompressorStarted(), "You can't read/decompress while writing a compressed stream %s!");
+
+        // check if the request can be finished from the decompressed cache
+        SizeType numRead = FillFromDecompressCache(zlibData, buffer, byteSize, offset);
+        if (byteSize == 0)  // are we done
+        {
             return numRead;
         }
 
-        //=========================================================================
-        // Write
-        // [12/13/2012]
-        //=========================================================================
-        CompressorZLib::SizeType    CompressorZLib::Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset)
+        // find the best seek point for current offset
+        CompressorZLibData::SeekPointArray::iterator it = AZStd::upper_bound(zlibData->m_seekPoints.begin(), zlibData->m_seekPoints.end(), offset, CompareUpper());
+        AZ_Assert(it != zlibData->m_seekPoints.begin(), "This should be impossible, we should always have a valid seek point at 0 offset!");
+        const CompressorZLibSeekPoint& bestSeekPoint = *(--it);  // get the previous (so it includes the current offset)
+
+        // if read is continuous continue with decompression
+        bool isJumpToSeekPoint = false;
+        SizeType lastOffsetInCache = zlibData->m_decompressedCacheOffset + zlibData->m_decompressedCacheDataSize;
+        if (bestSeekPoint.m_uncompressedOffset > lastOffsetInCache)     // if the best seek point is forward, jump forward to it.
         {
-            (void)offset;
+            isJumpToSeekPoint = true;
+        }
+        else if (offset < lastOffsetInCache)    // if the seek point is in the past and the requested offset is not in the cache jump back to it.
+        {
+            isJumpToSeekPoint = true;
+        }
 
-            AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled! Call Stream::WriteCompressed after you create the file!");
-            AZ_Assert(offset == SizeType(-1) || offset == stream->GetCurPos(), "We can write compressed data only at the end of the stream!");
+        if (isJumpToSeekPoint)
+        {
+            zlibData->m_decompressNextOffset = bestSeekPoint.m_compressedOffset;  // set next read point
+            zlibData->m_decompressedCacheOffset = bestSeekPoint.m_uncompressedOffset; // set uncompressed offset
+            zlibData->m_decompressedCacheDataSize = 0; // invalidate the cache
+            zlibData->m_zlib.ResetDecompressor(&zlibData->m_zlibHeader); // reset decompressor and setup the header.
+        }
 
-            m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
-
-            CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
-            AZ_Assert(!zlibData->m_zlib.IsDecompressorStarted(), "You can't write while reading/decompressing a compressed stream!");
-
-            const u8* bytes = reinterpret_cast<const u8*>(data);
-            unsigned int dataToCompress = static_cast<unsigned int>(byteSize);
-            while (dataToCompress != 0)
+        // decompress and move forward until the request is done
+        while (byteSize > 0)
+        {
+            // fill buffer with compressed data
+            SizeType compressedDataSize = FillCompressedBuffer(stream);
+            if (compressedDataSize == 0)
             {
-                unsigned int oldDataToCompress = dataToCompress;
-                unsigned int compressedSize = zlibData->m_zlib.Compress(bytes, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize);
-                if (compressedSize)
-                {
-                    GenericStream* baseStream = stream->GetWrappedStream();
-                    SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
-                    if (numWritten != compressedSize)
-                    {
-                        return numWritten; // error we could not write all data
-                    }
-                }
-                bytes += oldDataToCompress - dataToCompress;
+                return numRead; // we are done reading and obviously we did not managed to read all data
             }
-            zlibData->m_uncompressedSize += byteSize;
-
-            if (zlibData->m_autoSeekSize > 0)
+            unsigned int processedCompressedData = 0;
+            while (byteSize > 0 && processedCompressedData < compressedDataSize) // decompressed data either until we are done with the request (byteSize == 0) or we need to fill the compression buffer again.
             {
-                // insert a seek point if needed.
-                if (zlibData->m_seekPoints.empty())
+                // if we have data in the cache move to the next offset, we always move forward by default.
+                zlibData->m_decompressedCacheOffset += zlibData->m_decompressedCacheDataSize;
+
+                // decompress in the cache buffer
+                u32 availDecompressedCacheSize = m_decompressionCachePerStream; // reset buffer size
+                unsigned int processed = zlibData->m_zlib.Decompress(&m_compressedDataBuffer[processedCompressedData], static_cast<unsigned int>(compressedDataSize) - processedCompressedData, zlibData->m_decompressedCache, availDecompressedCacheSize);
+                zlibData->m_decompressedCacheDataSize = m_decompressionCachePerStream - availDecompressedCacheSize;
+                if (processed == 0)
                 {
-                    if (zlibData->m_uncompressedSize >=  zlibData->m_autoSeekSize)
-                    {
-                        WriteSeekPoint(stream);
-                    }
+                    break; // we processed everything we could, load more compressed data.
                 }
-                else if ((zlibData->m_uncompressedSize - zlibData->m_seekPoints.back().m_uncompressedOffset) > zlibData->m_autoSeekSize)
+                processedCompressedData += processed;
+                // fill what we can from the cache
+                numRead += FillFromDecompressCache(zlibData, buffer, byteSize, offset);
+            }
+            // update next read position the the compressed stream
+            zlibData->m_decompressNextOffset +=  processedCompressedData;
+        }
+        return numRead;
+    }
+
+    //=========================================================================
+    // Write
+    // [12/13/2012]
+    //=========================================================================
+    CompressorZLib::SizeType    CompressorZLib::Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset)
+    {
+        (void)offset;
+
+        AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled! Call Stream::WriteCompressed after you create the file!");
+        AZ_Assert(offset == SizeType(-1) || offset == stream->GetCurPos(), "We can write compressed data only at the end of the stream!");
+
+        m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
+
+        CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+        AZ_Assert(!zlibData->m_zlib.IsDecompressorStarted(), "You can't write while reading/decompressing a compressed stream!");
+
+        const u8* bytes = reinterpret_cast<const u8*>(data);
+        unsigned int dataToCompress = static_cast<unsigned int>(byteSize);
+        while (dataToCompress != 0)
+        {
+            unsigned int oldDataToCompress = dataToCompress;
+            unsigned int compressedSize = zlibData->m_zlib.Compress(bytes, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize);
+            if (compressedSize)
+            {
+                GenericStream* baseStream = stream->GetWrappedStream();
+                SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
+                if (numWritten != compressedSize)
+                {
+                    return numWritten; // error we could not write all data
+                }
+            }
+            bytes += oldDataToCompress - dataToCompress;
+        }
+        zlibData->m_uncompressedSize += byteSize;
+
+        if (zlibData->m_autoSeekSize > 0)
+        {
+            // insert a seek point if needed.
+            if (zlibData->m_seekPoints.empty())
+            {
+                if (zlibData->m_uncompressedSize >=  zlibData->m_autoSeekSize)
                 {
                     WriteSeekPoint(stream);
                 }
             }
-            return byteSize;
+            else if ((zlibData->m_uncompressedSize - zlibData->m_seekPoints.back().m_uncompressedOffset) > zlibData->m_autoSeekSize)
+            {
+                WriteSeekPoint(stream);
+            }
         }
+        return byteSize;
+    }
 
-        //=========================================================================
-        // WriteSeekPoint
-        // [12/13/2012]
-        //=========================================================================
-        bool        CompressorZLib::WriteSeekPoint(CompressorStream* stream)
+    //=========================================================================
+    // WriteSeekPoint
+    // [12/13/2012]
+    //=========================================================================
+    bool        CompressorZLib::WriteSeekPoint(CompressorStream* stream)
+    {
+        AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled! Call Stream::WriteCompressed after you create the file!");
+        CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+
+        m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
+
+        unsigned int compressedSize;
+        unsigned int dataToCompress = 0;
+        do
         {
-            AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled! Call Stream::WriteCompressed after you create the file!");
-            CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+            compressedSize = zlibData->m_zlib.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZLib::FT_FULL_FLUSH);
+            if (compressedSize)
+            {
+                GenericStream* baseStream = stream->GetWrappedStream();
+                SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
+                if (numWritten != compressedSize)
+                {
+                    return false; // error we wrote less than than requested!
+                }
+            }
+        } while (dataToCompress != 0);
 
+        CompressorZLibSeekPoint sp;
+        sp.m_compressedOffset = stream->GetLength();
+        sp.m_uncompressedOffset = zlibData->m_uncompressedSize;
+        zlibData->m_seekPoints.push_back(sp);
+        return true;
+    }
+
+    //=========================================================================
+    // StartCompressor
+    // [12/13/2012]
+    //=========================================================================
+    bool        CompressorZLib::StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize)
+    {
+        AZ_Assert(stream && stream->GetCompressorData() == nullptr, "Stream has compressor already enabled!");
+
+        AcquireDataBuffer();
+
+        CompressorZLibData* zlibData = aznew CompressorZLibData;
+        zlibData->m_compressor = this;
+        zlibData->m_zlibHeader = 0; // not used for compression
+        zlibData->m_uncompressedSize = 0;
+        zlibData->m_autoSeekSize = autoSeekDataSize;
+        compressionLevel = AZ::GetClamp(compressionLevel, 1, 9); // remap to zlib levels
+
+        zlibData->m_zlib.StartCompressor(compressionLevel);
+
+        stream->SetCompressorData(zlibData);
+
+        if (WriteHeaderAndData(stream))
+        {
+            // add the first and always present seek point at the start of the compressed stream
+            CompressorZLibSeekPoint sp;
+            sp.m_compressedOffset = sizeof(CompressorHeader) + sizeof(CompressorZLibHeader) + sizeof(zlibData->m_zlibHeader);
+            sp.m_uncompressedOffset = 0;
+            zlibData->m_seekPoints.push_back(sp);
+            return true;
+        }
+        return false;
+    }
+
+    //=========================================================================
+    // Close
+    // [12/13/2012]
+    //=========================================================================
+    bool CompressorZLib::Close(CompressorStream* stream)
+    {
+        AZ_Assert(stream->IsOpen(), "Stream is not open to be closed!");
+
+        CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
+        GenericStream* baseStream = stream->GetWrappedStream();
+
+        bool result = true;
+        if (zlibData->m_zlib.IsCompressorStarted())
+        {
             m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
 
+            // flush all compressed data
             unsigned int compressedSize;
             unsigned int dataToCompress = 0;
             do
             {
-                compressedSize = zlibData->m_zlib.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZLib::FT_FULL_FLUSH);
+                compressedSize = zlibData->m_zlib.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZLib::FT_FINISH);
                 if (compressedSize)
                 {
-                    GenericStream* baseStream = stream->GetWrappedStream();
-                    SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
-                    if (numWritten != compressedSize)
-                    {
-                        return false; // error we wrote less than than requested!
-                    }
+                    baseStream->Write(compressedSize, m_compressedDataBuffer);
                 }
             } while (dataToCompress != 0);
 
-            CompressorZLibSeekPoint sp;
-            sp.m_compressedOffset = stream->GetLength();
-            sp.m_uncompressedOffset = zlibData->m_uncompressedSize;
-            zlibData->m_seekPoints.push_back(sp);
-            return true;
-        }
-
-        //=========================================================================
-        // StartCompressor
-        // [12/13/2012]
-        //=========================================================================
-        bool        CompressorZLib::StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize)
-        {
-            AZ_Assert(stream && stream->GetCompressorData() == nullptr, "Stream has compressor already enabled!");
-
-            AcquireDataBuffer();
-
-            CompressorZLibData* zlibData = aznew CompressorZLibData;
-            zlibData->m_compressor = this;
-            zlibData->m_zlibHeader = 0; // not used for compression
-            zlibData->m_uncompressedSize = 0;
-            zlibData->m_autoSeekSize = autoSeekDataSize;
-            compressionLevel = AZ::GetClamp(compressionLevel, 1, 9); // remap to zlib levels
-
-            zlibData->m_zlib.StartCompressor(compressionLevel);
-
-            stream->SetCompressorData(zlibData);
-
-            if (WriteHeaderAndData(stream))
+            result = WriteHeaderAndData(stream);
+            if (result)
             {
-                // add the first and always present seek point at the start of the compressed stream
-                CompressorZLibSeekPoint sp;
-                sp.m_compressedOffset = sizeof(CompressorHeader) + sizeof(CompressorZLibHeader) + sizeof(zlibData->m_zlibHeader);
-                sp.m_uncompressedOffset = 0;
-                zlibData->m_seekPoints.push_back(sp);
-                return true;
-            }
-            return false;
-        }
-
-        //=========================================================================
-        // Close
-        // [12/13/2012]
-        //=========================================================================
-        bool CompressorZLib::Close(CompressorStream* stream)
-        {
-            AZ_Assert(stream->IsOpen(), "Stream is not open to be closed!");
-
-            CompressorZLibData* zlibData = static_cast<CompressorZLibData*>(stream->GetCompressorData());
-            GenericStream* baseStream = stream->GetWrappedStream();
-
-            bool result = true;
-            if (zlibData->m_zlib.IsCompressorStarted())
-            {
-                m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
-
-                // flush all compressed data
-                unsigned int compressedSize;
-                unsigned int dataToCompress = 0;
-                do
+                // now write the seek points and the end of the file
+                for (size_t i = 0; i < zlibData->m_seekPoints.size(); ++i)
                 {
-                    compressedSize = zlibData->m_zlib.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZLib::FT_FINISH);
-                    if (compressedSize)
-                    {
-                        baseStream->Write(compressedSize, m_compressedDataBuffer);
-                    }
-                } while (dataToCompress != 0);
-
-                result = WriteHeaderAndData(stream);
-                if (result)
-                {
-                    // now write the seek points and the end of the file
-                    for (size_t i = 0; i < zlibData->m_seekPoints.size(); ++i)
-                    {
-                        AZStd::endian_swap(zlibData->m_seekPoints[i].m_compressedOffset);
-                        AZStd::endian_swap(zlibData->m_seekPoints[i].m_uncompressedOffset);
-                    }
-                    SizeType dataToWrite = zlibData->m_seekPoints.size() * sizeof(CompressorZLibSeekPoint);
-                    baseStream->Seek(0U, GenericStream::SeekMode::ST_SEEK_END);
-                    result = (baseStream->Write(dataToWrite, zlibData->m_seekPoints.data()) == dataToWrite);
+                    AZStd::endian_swap(zlibData->m_seekPoints[i].m_compressedOffset);
+                    AZStd::endian_swap(zlibData->m_seekPoints[i].m_uncompressedOffset);
                 }
+                SizeType dataToWrite = zlibData->m_seekPoints.size() * sizeof(CompressorZLibSeekPoint);
+                baseStream->Seek(0U, GenericStream::SeekMode::ST_SEEK_END);
+                result = (baseStream->Write(dataToWrite, zlibData->m_seekPoints.data()) == dataToWrite);
             }
-            else
-            {
-                if (m_lastReadStream == stream)
-                {
-                    m_lastReadStream = nullptr; // invalidate the data in m_dataBuffer if it was from the current stream.
-                }
-            }
-
-            // if we have decompressor cache delete it
-            if (zlibData->m_decompressedCache)
-            {
-                azfree(zlibData->m_decompressedCache, AZ::SystemAllocator, m_decompressionCachePerStream, m_CompressedDataBufferAlignment);
-            }
-
-            ReleaseDataBuffer();
-
-            // last step reset strream compressor data.
-            stream->SetCompressorData(nullptr);
-            return result;
         }
-
-        //=========================================================================
-        // AcquireDataBuffer
-        // [2/27/2013]
-        //=========================================================================
-        void CompressorZLib::AcquireDataBuffer()
+        else
         {
-            if (m_compressedDataBuffer == nullptr)
+            if (m_lastReadStream == stream)
             {
-                AZ_Assert(m_compressedDataBufferUseCount == 0, "Buffer usecount should be 0 if the buffer is NULL");
-                m_compressedDataBuffer = reinterpret_cast<unsigned char*>(azmalloc(m_compressedDataBufferSize, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZLib"));
-                m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
+                m_lastReadStream = nullptr; // invalidate the data in m_dataBuffer if it was from the current stream.
             }
-            ++m_compressedDataBufferUseCount;
         }
 
-        //=========================================================================
-        // ReleaseDataBuffer
-        // [2/27/2013]
-        //=========================================================================
-        void CompressorZLib::ReleaseDataBuffer()
+        // if we have decompressor cache delete it
+        if (zlibData->m_decompressedCache)
         {
-            --m_compressedDataBufferUseCount;
-            if (m_compressedDataBufferUseCount == 0)
-            {
-                AZ_Assert(m_compressedDataBuffer != nullptr, "Invalid data buffer! We should have a non null pointer!");
-                azfree(m_compressedDataBuffer, AZ::SystemAllocator, m_compressedDataBufferSize, m_CompressedDataBufferAlignment);
-                m_compressedDataBuffer = nullptr;
-                m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
-            }
+            azfree(zlibData->m_decompressedCache, AZ::SystemAllocator, m_decompressionCachePerStream, m_CompressedDataBufferAlignment);
         }
-    }   // namespace IO
-}   // namespace AZ
+
+        ReleaseDataBuffer();
+
+        // last step reset strream compressor data.
+        stream->SetCompressorData(nullptr);
+        return result;
+    }
+
+    //=========================================================================
+    // AcquireDataBuffer
+    // [2/27/2013]
+    //=========================================================================
+    void CompressorZLib::AcquireDataBuffer()
+    {
+        if (m_compressedDataBuffer == nullptr)
+        {
+            AZ_Assert(m_compressedDataBufferUseCount == 0, "Buffer usecount should be 0 if the buffer is NULL");
+            m_compressedDataBuffer = reinterpret_cast<unsigned char*>(azmalloc(m_compressedDataBufferSize, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZLib"));
+            m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
+        }
+        ++m_compressedDataBufferUseCount;
+    }
+
+    //=========================================================================
+    // ReleaseDataBuffer
+    // [2/27/2013]
+    //=========================================================================
+    void CompressorZLib::ReleaseDataBuffer()
+    {
+        --m_compressedDataBufferUseCount;
+        if (m_compressedDataBufferUseCount == 0)
+        {
+            AZ_Assert(m_compressedDataBuffer != nullptr, "Invalid data buffer! We should have a non null pointer!");
+            azfree(m_compressedDataBuffer, AZ::SystemAllocator, m_compressedDataBufferSize, m_CompressedDataBufferAlignment);
+            m_compressedDataBuffer = nullptr;
+            m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
+        }
+    }
+} // namespace AZ::IO
 
 #endif // #if !defined(AZCORE_EXCLUDE_ZLIB)
diff --git a/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp b/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp
index b1631d2d22..91f380d73b 100644
--- a/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp
@@ -14,478 +14,475 @@
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Casting/numeric_cast.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    CompressorZStd::CompressorZStd(unsigned int decompressionCachePerStream, unsigned int dataBufferSize)
+        : m_compressedDataBufferSize(dataBufferSize)
+        , m_decompressionCachePerStream(decompressionCachePerStream)
+
     {
-        CompressorZStd::CompressorZStd(unsigned int decompressionCachePerStream, unsigned int dataBufferSize)
-            : m_compressedDataBufferSize(dataBufferSize)
-            , m_decompressionCachePerStream(decompressionCachePerStream)
+        AZ_Assert((dataBufferSize % (32 * 1024)) == 0, "Data buffer size %d must be multiple of 32 KB.", dataBufferSize);
+        AZ_Assert((decompressionCachePerStream % (32 * 1024)) == 0, "Decompress cache size %d must be multiple of 32 KB.", decompressionCachePerStream);
+    }
 
+    CompressorZStd::~CompressorZStd()
+    {
+        AZ_Warning("IO", m_compressedDataBufferUseCount == 0, "CompressorZStd has it's data buffer still referenced, it means that %d compressed streams have NOT closed. Freeing data...", m_compressedDataBufferUseCount);
+        while (m_compressedDataBufferUseCount)
         {
-            AZ_Assert((dataBufferSize % (32 * 1024)) == 0, "Data buffer size %d must be multiple of 32 KB.", dataBufferSize);
-            AZ_Assert((decompressionCachePerStream % (32 * 1024)) == 0, "Decompress cache size %d must be multiple of 32 KB.", decompressionCachePerStream);
+            ReleaseDataBuffer();
         }
+    }
 
-        CompressorZStd::~CompressorZStd()
+    AZ::u32 CompressorZStd::TypeId()
+    {
+        return AZ_CRC("ZStd", 0x72fd505e);
+    }
+
+    bool CompressorZStd::ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize)
+    {
+        if (stream->GetCompressorData() != nullptr)  // we already have compressor data
         {
-            AZ_Warning("IO", m_compressedDataBufferUseCount == 0, "CompressorZStd has it's data buffer still referenced, it means that %d compressed streams have NOT closed. Freeing data...", m_compressedDataBufferUseCount);
-            while (m_compressedDataBufferUseCount)
-            {
-                ReleaseDataBuffer();
-            }
-        }
-
-        AZ::u32 CompressorZStd::TypeId()
-        {
-            return AZ_CRC("ZStd", 0x72fd505e);
-        }
-
-        bool CompressorZStd::ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize)
-        {
-            if (stream->GetCompressorData() != nullptr)  // we already have compressor data
-            {
-                return false;
-            }
-
-            // Read the ZStd header should be after the default compression header...
-            // We should not be in this function otherwise.
-            if (dataSize < sizeof(CompressorZStdHeader) + sizeof(ZStd::Header))
-            {
-                AZ_Error("CompressorZStd", false, "We did not read enough data, we have only %d bytes left in the buffer and we need %d.", dataSize, sizeof(CompressorZStdHeader) + sizeof(ZStd::Header));
-                return false;
-            }
-
-            AcquireDataBuffer();
-
-            CompressorZStdHeader* hdr = reinterpret_cast<CompressorZStdHeader*>(data);
-            dataSize -= sizeof(CompressorZStdHeader);
-            data += sizeof(CompressorZStdHeader);
-
-            AZStd::unique_ptr<CompressorZStdData> zstdData = AZStd::make_unique<CompressorZStdData>();
-            zstdData->m_compressor = this;
-            zstdData->m_uncompressedSize = 0;
-            zstdData->m_zstdHeader = *reinterpret_cast<ZStd::Header*>(data);
-            dataSize -= sizeof(zstdData->m_zstdHeader);
-            data += sizeof(zstdData->m_zstdHeader);
-            zstdData->m_decompressNextOffset = sizeof(CompressorHeader) + sizeof(CompressorZStdHeader) + sizeof(ZStd::Header); // start after the headers
-
-            AZ_Error("CompressorZStd", hdr->m_numSeekPoints > 0, "We should have at least one seek point for the entire stream.");
-
-            // go the end of the file and read all sync points.
-            SizeType compressedFileEnd = stream->GetLength();
-            if (compressedFileEnd == 0)
-            {
-                return false;
-            }
-
-            zstdData->m_seekPoints.resize(hdr->m_numSeekPoints);
-            SizeType dataToRead = sizeof(CompressorZStdSeekPoint) * static_cast<SizeType>(hdr->m_numSeekPoints);
-            SizeType seekPointOffset = compressedFileEnd - dataToRead;
-
-            if (seekPointOffset > compressedFileEnd)
-            {
-                AZ_Error("CompressorZStd", false, "We have an invalid archive, this is impossible.");
-                return false;
-            }
-
-            GenericStream* baseStream = stream->GetWrappedStream();
-            if (baseStream->ReadAtOffset(dataToRead, zstdData->m_seekPoints.data(), seekPointOffset) != dataToRead)
-            {
-                return false;
-            }
-
-            if (m_decompressionCachePerStream)
-            {
-                zstdData->m_decompressedCache = reinterpret_cast<unsigned char*>(azmalloc(m_decompressionCachePerStream, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZStd"));
-            }
-
-            zstdData->m_decompressLastOffset = seekPointOffset; // set the start address of the seek points as the last valid read address for the compressed stream.
-
-            zstdData->m_zstd.StartDecompressor();
-
-            stream->SetCompressorData(zstdData.release());
-
-            return true;
-        }
-
-        bool CompressorZStd::WriteHeaderAndData(CompressorStream* stream)
-        {
-            if (!Compressor::WriteHeaderAndData(stream))
-            {
-                return false;
-            }
-
-            CompressorZStdData* compressorData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
-            CompressorZStdHeader header;
-            header.m_numSeekPoints = aznumeric_caster(compressorData->m_seekPoints.size());
-            GenericStream* baseStream = stream->GetWrappedStream();
-            if (baseStream->WriteAtOffset(sizeof(header), &header, sizeof(CompressorHeader)) == sizeof(header))
-            {
-                return true;
-            }
-
             return false;
         }
 
-        inline CompressorZStd::SizeType CompressorZStd::FillFromDecompressCache(CompressorZStdData* zstdData, void*& buffer, SizeType& byteSize, SizeType& offset)
+        // Read the ZStd header should be after the default compression header...
+        // We should not be in this function otherwise.
+        if (dataSize < sizeof(CompressorZStdHeader) + sizeof(ZStd::Header))
         {
-            SizeType firstOffsetInCache = zstdData->m_decompressedCacheOffset;
-            SizeType lastOffsetInCache = firstOffsetInCache + zstdData->m_decompressedCacheDataSize;
-            SizeType firstDataOffset = offset;
-            SizeType lastDataOffset = offset + byteSize;
-            SizeType numCopied = 0;
-            if (firstOffsetInCache < lastDataOffset && lastOffsetInCache >= firstDataOffset)  // check if there is data in the cache
-            {
-                size_t copyOffsetStart = 0;
-                size_t copyOffsetEnd = zstdData->m_decompressedCacheDataSize;
-
-                size_t bufferCopyOffset = 0;
-
-                if (firstOffsetInCache < firstDataOffset)
-                {
-                    copyOffsetStart = aznumeric_caster(firstDataOffset - firstOffsetInCache);
-                }
-                else
-                {
-                    bufferCopyOffset = aznumeric_caster(firstOffsetInCache - firstDataOffset);
-                }
-
-                if (lastOffsetInCache >= lastDataOffset)
-                {
-                    copyOffsetEnd -= static_cast<size_t>(lastOffsetInCache - lastDataOffset);
-                }
-                else if (bufferCopyOffset > 0)  // the cache block is in the middle of the data, we can't use it (since we need to split buffer request into 2)
-                {
-                    return 0;
-                }
-
-                numCopied = copyOffsetEnd - copyOffsetStart;
-                memcpy(static_cast<char*>(buffer) + bufferCopyOffset, zstdData->m_decompressedCache + copyOffsetStart, static_cast<size_t>(numCopied));
-
-                // adjust pointers and sizes
-                byteSize -= numCopied;
-                if (bufferCopyOffset == 0)
-                {
-                    // copied in the start
-                    buffer = reinterpret_cast<char*>(buffer) + numCopied;
-                    offset += numCopied;
-                }
-            }
-
-            return numCopied;
+            AZ_Error("CompressorZStd", false, "We did not read enough data, we have only %d bytes left in the buffer and we need %d.", dataSize, sizeof(CompressorZStdHeader) + sizeof(ZStd::Header));
+            return false;
         }
 
-        inline CompressorZStd::SizeType CompressorZStd::FillCompressedBuffer(CompressorStream* stream)
+        AcquireDataBuffer();
+
+        CompressorZStdHeader* hdr = reinterpret_cast<CompressorZStdHeader*>(data);
+        dataSize -= sizeof(CompressorZStdHeader);
+        data += sizeof(CompressorZStdHeader);
+
+        AZStd::unique_ptr<CompressorZStdData> zstdData = AZStd::make_unique<CompressorZStdData>();
+        zstdData->m_compressor = this;
+        zstdData->m_uncompressedSize = 0;
+        zstdData->m_zstdHeader = *reinterpret_cast<ZStd::Header*>(data);
+        dataSize -= sizeof(zstdData->m_zstdHeader);
+        data += sizeof(zstdData->m_zstdHeader);
+        zstdData->m_decompressNextOffset = sizeof(CompressorHeader) + sizeof(CompressorZStdHeader) + sizeof(ZStd::Header); // start after the headers
+
+        AZ_Error("CompressorZStd", hdr->m_numSeekPoints > 0, "We should have at least one seek point for the entire stream.");
+
+        // go the end of the file and read all sync points.
+        SizeType compressedFileEnd = stream->GetLength();
+        if (compressedFileEnd == 0)
         {
-            CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
-            SizeType dataFromBuffer = 0;
-            if (stream == m_lastReadStream)  // if the buffer is filled with data from the current stream, try to reuse
-            {
-                if (zstdData->m_decompressNextOffset > m_lastReadStreamOffset)
-                {
-                    SizeType offsetInCache = zstdData->m_decompressNextOffset - m_lastReadStreamOffset;
-                    if (offsetInCache < m_lastReadStreamSize)  // last check if there is data overlap
-                    {
-                        // copy the usable part at the start of the buffer
-                        SizeType toMove = m_lastReadStreamSize - offsetInCache;
-                        memcpy(m_compressedDataBuffer, &m_compressedDataBuffer[static_cast<size_t>(offsetInCache)], static_cast<size_t>(toMove));
-                        dataFromBuffer += toMove;
-                    }
-                }
-            }
-
-            SizeType toReadFromStream = m_compressedDataBufferSize - dataFromBuffer;
-            SizeType readOffset = zstdData->m_decompressNextOffset + dataFromBuffer;
-            if (readOffset + toReadFromStream > zstdData->m_decompressLastOffset)
-            {
-                // don't read past the end
-                AZ_Assert(readOffset <= zstdData->m_decompressLastOffset, "Read offset should always be before the end of stream.");
-                toReadFromStream = zstdData->m_decompressLastOffset - readOffset;
-            }
-
-            SizeType numReadFromStream = 0;
-            if (toReadFromStream)  // if we did not reuse the whole buffer, read some data from the stream
-            {
-                GenericStream* baseStream = stream->GetWrappedStream();
-                numReadFromStream = baseStream->ReadAtOffset(toReadFromStream, &m_compressedDataBuffer[static_cast<size_t>(dataFromBuffer)], readOffset);
-            }
-
-            // update what's actually in the read data buffer.
-            m_lastReadStream = stream;
-            m_lastReadStreamOffset = zstdData->m_decompressNextOffset;
-            m_lastReadStreamSize = dataFromBuffer + numReadFromStream;
-            return m_lastReadStreamSize;
+            return false;
         }
 
-        struct ZStdCompareUpper
+        zstdData->m_seekPoints.resize(hdr->m_numSeekPoints);
+        SizeType dataToRead = sizeof(CompressorZStdSeekPoint) * static_cast<SizeType>(hdr->m_numSeekPoints);
+        SizeType seekPointOffset = compressedFileEnd - dataToRead;
+
+        if (seekPointOffset > compressedFileEnd)
         {
-            bool operator()(const AZ::u64& offset, const CompressorZStdSeekPoint& sp) const 
-            {
-                return offset < sp.m_uncompressedOffset; 
-            }
-        };
+            AZ_Error("CompressorZStd", false, "We have an invalid archive, this is impossible.");
+            return false;
+        }
 
-        CompressorZStd::SizeType CompressorZStd::Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer)
+        GenericStream* baseStream = stream->GetWrappedStream();
+        if (baseStream->ReadAtOffset(dataToRead, zstdData->m_seekPoints.data(), seekPointOffset) != dataToRead)
         {
-            AZ_Assert(stream->GetCompressorData(), "This stream doesn't have decompression enabled.");
-            CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
-            AZ_Assert(!zstdData->m_zstd.IsCompressorStarted(), "You can't read/decompress while writing a compressed stream %s.");
+            return false;
+        }
 
-            // check if the request can be finished from the decompressed cache
-            SizeType numRead = FillFromDecompressCache(zstdData, buffer, byteSize, offset);
-            if (byteSize == 0)  // are we done
+        if (m_decompressionCachePerStream)
+        {
+            zstdData->m_decompressedCache = reinterpret_cast<unsigned char*>(azmalloc(m_decompressionCachePerStream, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZStd"));
+        }
+
+        zstdData->m_decompressLastOffset = seekPointOffset; // set the start address of the seek points as the last valid read address for the compressed stream.
+
+        zstdData->m_zstd.StartDecompressor();
+
+        stream->SetCompressorData(zstdData.release());
+
+        return true;
+    }
+
+    bool CompressorZStd::WriteHeaderAndData(CompressorStream* stream)
+    {
+        if (!Compressor::WriteHeaderAndData(stream))
+        {
+            return false;
+        }
+
+        CompressorZStdData* compressorData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+        CompressorZStdHeader header;
+        header.m_numSeekPoints = aznumeric_caster(compressorData->m_seekPoints.size());
+        GenericStream* baseStream = stream->GetWrappedStream();
+        if (baseStream->WriteAtOffset(sizeof(header), &header, sizeof(CompressorHeader)) == sizeof(header))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    inline CompressorZStd::SizeType CompressorZStd::FillFromDecompressCache(CompressorZStdData* zstdData, void*& buffer, SizeType& byteSize, SizeType& offset)
+    {
+        SizeType firstOffsetInCache = zstdData->m_decompressedCacheOffset;
+        SizeType lastOffsetInCache = firstOffsetInCache + zstdData->m_decompressedCacheDataSize;
+        SizeType firstDataOffset = offset;
+        SizeType lastDataOffset = offset + byteSize;
+        SizeType numCopied = 0;
+        if (firstOffsetInCache < lastDataOffset && lastOffsetInCache >= firstDataOffset)  // check if there is data in the cache
+        {
+            size_t copyOffsetStart = 0;
+            size_t copyOffsetEnd = zstdData->m_decompressedCacheDataSize;
+
+            size_t bufferCopyOffset = 0;
+
+            if (firstOffsetInCache < firstDataOffset)
             {
-                return numRead;
+                copyOffsetStart = aznumeric_caster(firstDataOffset - firstOffsetInCache);
+            }
+            else
+            {
+                bufferCopyOffset = aznumeric_caster(firstOffsetInCache - firstDataOffset);
             }
 
-            // find the best seek point for current offset
-            CompressorZStdData::SeekPointArray::iterator it = AZStd::upper_bound(zstdData->m_seekPoints.begin(), zstdData->m_seekPoints.end(), offset, ZStdCompareUpper());
-            AZ_Assert(it != zstdData->m_seekPoints.begin(), "This should be impossible, we should always have a valid seek point at 0 offset.");
-            const CompressorZStdSeekPoint& bestSeekPoint = *(--it);  // get the previous (so it includes the current offset)
-
-            // if read is continuous continue with decompression
-            bool isJumpToSeekPoint = false;
-            SizeType lastOffsetInCache = zstdData->m_decompressedCacheOffset + zstdData->m_decompressedCacheDataSize;
-            if (bestSeekPoint.m_uncompressedOffset > lastOffsetInCache)     // if the best seek point is forward, jump forward to it.
+            if (lastOffsetInCache >= lastDataOffset)
             {
-                isJumpToSeekPoint = true;
+                copyOffsetEnd -= static_cast<size_t>(lastOffsetInCache - lastDataOffset);
             }
-            else if (offset < lastOffsetInCache)    // if the seek point is in the past and the requested offset is not in the cache jump back to it.
+            else if (bufferCopyOffset > 0)  // the cache block is in the middle of the data, we can't use it (since we need to split buffer request into 2)
             {
-                isJumpToSeekPoint = true;
+                return 0;
             }
 
-            if (isJumpToSeekPoint)
-            {
-                zstdData->m_decompressNextOffset = bestSeekPoint.m_compressedOffset;  // set next read point
-                zstdData->m_decompressedCacheOffset = bestSeekPoint.m_uncompressedOffset; // set uncompressed offset
-                zstdData->m_decompressedCacheDataSize = 0; // invalidate the cache
-                zstdData->m_zstd.ResetDecompressor(&zstdData->m_zstdHeader); // reset decompressor and setup the header.
-            }
+            numCopied = copyOffsetEnd - copyOffsetStart;
+            memcpy(static_cast<char*>(buffer) + bufferCopyOffset, zstdData->m_decompressedCache + copyOffsetStart, static_cast<size_t>(numCopied));
 
-            // decompress and move forward until the request is done
-            while (byteSize > 0)
+            // adjust pointers and sizes
+            byteSize -= numCopied;
+            if (bufferCopyOffset == 0)
             {
-                // fill buffer with compressed data
-                SizeType compressedDataSize = FillCompressedBuffer(stream);
-                if (compressedDataSize == 0)
+                // copied in the start
+                buffer = reinterpret_cast<char*>(buffer) + numCopied;
+                offset += numCopied;
+            }
+        }
+
+        return numCopied;
+    }
+
+    inline CompressorZStd::SizeType CompressorZStd::FillCompressedBuffer(CompressorStream* stream)
+    {
+        CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+        SizeType dataFromBuffer = 0;
+        if (stream == m_lastReadStream)  // if the buffer is filled with data from the current stream, try to reuse
+        {
+            if (zstdData->m_decompressNextOffset > m_lastReadStreamOffset)
+            {
+                SizeType offsetInCache = zstdData->m_decompressNextOffset - m_lastReadStreamOffset;
+                if (offsetInCache < m_lastReadStreamSize)  // last check if there is data overlap
                 {
-                    return numRead; // we are done reading and obviously we did not managed to read all data
+                    // copy the usable part at the start of the buffer
+                    SizeType toMove = m_lastReadStreamSize - offsetInCache;
+                    memcpy(m_compressedDataBuffer, &m_compressedDataBuffer[static_cast<size_t>(offsetInCache)], static_cast<size_t>(toMove));
+                    dataFromBuffer += toMove;
                 }
-                unsigned int processedCompressedData = 0;
-                while (byteSize > 0 && processedCompressedData < compressedDataSize) // decompressed data either until we are done with the request (byteSize == 0) or we need to fill the compression buffer again.
-                {
-                    // if we have data in the cache move to the next offset, we always move forward by default.
-                    zstdData->m_decompressedCacheOffset += zstdData->m_decompressedCacheDataSize;
-
-                    // decompress in the cache buffer
-                    u32 availDecompressedCacheSize = m_decompressionCachePerStream; // reset buffer size
-                    size_t nextBlockSize;
-                    unsigned int processed = zstdData->m_zstd.Decompress(&m_compressedDataBuffer[processedCompressedData], 
-                                                                        static_cast<unsigned int>(compressedDataSize) - processedCompressedData,
-                                                                        zstdData->m_decompressedCache, 
-                                                                        availDecompressedCacheSize, 
-                                                                        &nextBlockSize);
-                    zstdData->m_decompressedCacheDataSize = m_decompressionCachePerStream - availDecompressedCacheSize;
-                    if (processed == 0)
-                    {
-                        break; // we processed everything we could, load more compressed data.
-                    }
-                    processedCompressedData += processed;
-                    // fill what we can from the cache
-                    numRead += FillFromDecompressCache(zstdData, buffer, byteSize, offset);
-                }
-                // update next read position the the compressed stream
-                zstdData->m_decompressNextOffset +=  processedCompressedData;
             }
+        }
+
+        SizeType toReadFromStream = m_compressedDataBufferSize - dataFromBuffer;
+        SizeType readOffset = zstdData->m_decompressNextOffset + dataFromBuffer;
+        if (readOffset + toReadFromStream > zstdData->m_decompressLastOffset)
+        {
+            // don't read past the end
+            AZ_Assert(readOffset <= zstdData->m_decompressLastOffset, "Read offset should always be before the end of stream.");
+            toReadFromStream = zstdData->m_decompressLastOffset - readOffset;
+        }
+
+        SizeType numReadFromStream = 0;
+        if (toReadFromStream)  // if we did not reuse the whole buffer, read some data from the stream
+        {
+            GenericStream* baseStream = stream->GetWrappedStream();
+            numReadFromStream = baseStream->ReadAtOffset(toReadFromStream, &m_compressedDataBuffer[static_cast<size_t>(dataFromBuffer)], readOffset);
+        }
+
+        // update what's actually in the read data buffer.
+        m_lastReadStream = stream;
+        m_lastReadStreamOffset = zstdData->m_decompressNextOffset;
+        m_lastReadStreamSize = dataFromBuffer + numReadFromStream;
+        return m_lastReadStreamSize;
+    }
+
+    struct ZStdCompareUpper
+    {
+        bool operator()(const AZ::u64& offset, const CompressorZStdSeekPoint& sp) const
+        {
+            return offset < sp.m_uncompressedOffset;
+        }
+    };
+
+    CompressorZStd::SizeType CompressorZStd::Read(CompressorStream* stream, SizeType byteSize, SizeType offset, void* buffer)
+    {
+        AZ_Assert(stream->GetCompressorData(), "This stream doesn't have decompression enabled.");
+        CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+        AZ_Assert(!zstdData->m_zstd.IsCompressorStarted(), "You can't read/decompress while writing a compressed stream %s.");
+
+        // check if the request can be finished from the decompressed cache
+        SizeType numRead = FillFromDecompressCache(zstdData, buffer, byteSize, offset);
+        if (byteSize == 0)  // are we done
+        {
             return numRead;
         }
 
-        CompressorZStd::SizeType CompressorZStd::Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset)
+        // find the best seek point for current offset
+        CompressorZStdData::SeekPointArray::iterator it = AZStd::upper_bound(zstdData->m_seekPoints.begin(), zstdData->m_seekPoints.end(), offset, ZStdCompareUpper());
+        AZ_Assert(it != zstdData->m_seekPoints.begin(), "This should be impossible, we should always have a valid seek point at 0 offset.");
+        const CompressorZStdSeekPoint& bestSeekPoint = *(--it);  // get the previous (so it includes the current offset)
+
+        // if read is continuous continue with decompression
+        bool isJumpToSeekPoint = false;
+        SizeType lastOffsetInCache = zstdData->m_decompressedCacheOffset + zstdData->m_decompressedCacheDataSize;
+        if (bestSeekPoint.m_uncompressedOffset > lastOffsetInCache)     // if the best seek point is forward, jump forward to it.
         {
-            AZ_UNUSED(offset);
+            isJumpToSeekPoint = true;
+        }
+        else if (offset < lastOffsetInCache)    // if the seek point is in the past and the requested offset is not in the cache jump back to it.
+        {
+            isJumpToSeekPoint = true;
+        }
 
-            AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled. Call Stream::WriteCompressed after you create the file.");
-            AZ_Assert(offset == SizeType(-1) || offset == stream->GetCurPos(), "We can write compressed data only at the end of the stream.");
+        if (isJumpToSeekPoint)
+        {
+            zstdData->m_decompressNextOffset = bestSeekPoint.m_compressedOffset;  // set next read point
+            zstdData->m_decompressedCacheOffset = bestSeekPoint.m_uncompressedOffset; // set uncompressed offset
+            zstdData->m_decompressedCacheDataSize = 0; // invalidate the cache
+            zstdData->m_zstd.ResetDecompressor(&zstdData->m_zstdHeader); // reset decompressor and setup the header.
+        }
 
-            m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
-
-            CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
-            AZ_Assert(!zstdData->m_zstd.IsDecompressorStarted(), "You can't write while reading/decompressing a compressed stream.");
-
-            const u8* bytes = reinterpret_cast<const u8*>(data);
-            unsigned int dataToCompress = aznumeric_caster(byteSize);
-            while (dataToCompress != 0)
+        // decompress and move forward until the request is done
+        while (byteSize > 0)
+        {
+            // fill buffer with compressed data
+            SizeType compressedDataSize = FillCompressedBuffer(stream);
+            if (compressedDataSize == 0)
             {
-                unsigned int oldDataToCompress = dataToCompress;
-                unsigned int compressedSize = zstdData->m_zstd.Compress(bytes, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize);
-                if (compressedSize)
-                {
-                    GenericStream* baseStream = stream->GetWrappedStream();
-                    SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
-                    if (numWritten != compressedSize)
-                    {
-                        return numWritten; // error we could not write all data
-                    }
-                }
-                bytes += oldDataToCompress - dataToCompress;
+                return numRead; // we are done reading and obviously we did not managed to read all data
             }
-            zstdData->m_uncompressedSize += byteSize;
-
-            if (zstdData->m_autoSeekSize > 0)
+            unsigned int processedCompressedData = 0;
+            while (byteSize > 0 && processedCompressedData < compressedDataSize) // decompressed data either until we are done with the request (byteSize == 0) or we need to fill the compression buffer again.
             {
-                // insert a seek point if needed.
-                if (zstdData->m_seekPoints.empty())
+                // if we have data in the cache move to the next offset, we always move forward by default.
+                zstdData->m_decompressedCacheOffset += zstdData->m_decompressedCacheDataSize;
+
+                // decompress in the cache buffer
+                u32 availDecompressedCacheSize = m_decompressionCachePerStream; // reset buffer size
+                size_t nextBlockSize;
+                unsigned int processed = zstdData->m_zstd.Decompress(&m_compressedDataBuffer[processedCompressedData],
+                                                                    static_cast<unsigned int>(compressedDataSize) - processedCompressedData,
+                                                                    zstdData->m_decompressedCache,
+                                                                    availDecompressedCacheSize,
+                                                                    &nextBlockSize);
+                zstdData->m_decompressedCacheDataSize = m_decompressionCachePerStream - availDecompressedCacheSize;
+                if (processed == 0)
                 {
-                    if (zstdData->m_uncompressedSize >=  zstdData->m_autoSeekSize)
-                    {
-                        WriteSeekPoint(stream);
-                    }
+                    break; // we processed everything we could, load more compressed data.
                 }
-                else if ((zstdData->m_uncompressedSize - zstdData->m_seekPoints.back().m_uncompressedOffset) > zstdData->m_autoSeekSize)
+                processedCompressedData += processed;
+                // fill what we can from the cache
+                numRead += FillFromDecompressCache(zstdData, buffer, byteSize, offset);
+            }
+            // update next read position the the compressed stream
+            zstdData->m_decompressNextOffset +=  processedCompressedData;
+        }
+        return numRead;
+    }
+
+    CompressorZStd::SizeType CompressorZStd::Write(CompressorStream* stream, SizeType byteSize, const void* data, SizeType offset)
+    {
+        AZ_UNUSED(offset);
+
+        AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled. Call Stream::WriteCompressed after you create the file.");
+        AZ_Assert(offset == SizeType(-1) || offset == stream->GetCurPos(), "We can write compressed data only at the end of the stream.");
+
+        m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
+
+        CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+        AZ_Assert(!zstdData->m_zstd.IsDecompressorStarted(), "You can't write while reading/decompressing a compressed stream.");
+
+        const u8* bytes = reinterpret_cast<const u8*>(data);
+        unsigned int dataToCompress = aznumeric_caster(byteSize);
+        while (dataToCompress != 0)
+        {
+            unsigned int oldDataToCompress = dataToCompress;
+            unsigned int compressedSize = zstdData->m_zstd.Compress(bytes, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize);
+            if (compressedSize)
+            {
+                GenericStream* baseStream = stream->GetWrappedStream();
+                SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
+                if (numWritten != compressedSize)
+                {
+                    return numWritten; // error we could not write all data
+                }
+            }
+            bytes += oldDataToCompress - dataToCompress;
+        }
+        zstdData->m_uncompressedSize += byteSize;
+
+        if (zstdData->m_autoSeekSize > 0)
+        {
+            // insert a seek point if needed.
+            if (zstdData->m_seekPoints.empty())
+            {
+                if (zstdData->m_uncompressedSize >=  zstdData->m_autoSeekSize)
                 {
                     WriteSeekPoint(stream);
                 }
             }
-            return byteSize;
+            else if ((zstdData->m_uncompressedSize - zstdData->m_seekPoints.back().m_uncompressedOffset) > zstdData->m_autoSeekSize)
+            {
+                WriteSeekPoint(stream);
+            }
         }
+        return byteSize;
+    }
 
-        bool CompressorZStd::WriteSeekPoint(CompressorStream* stream)
+    bool CompressorZStd::WriteSeekPoint(CompressorStream* stream)
+    {
+        AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled. Call Stream::WriteCompressed after you create the file.");
+        CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+
+        m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
+
+        unsigned int compressedSize;
+        unsigned int dataToCompress = 0;
+        do
         {
-            AZ_Assert(stream && stream->GetCompressorData(), "This stream doesn't have compression enabled. Call Stream::WriteCompressed after you create the file.");
-            CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+            compressedSize = zstdData->m_zstd.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZStd::FT_FULL_FLUSH);
+            if (compressedSize)
+            {
+                GenericStream* baseStream = stream->GetWrappedStream();
+                SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
+                if (numWritten != compressedSize)
+                {
+                    return false; // error we wrote less than than requested!
+                }
+            }
+        } while (dataToCompress != 0);
 
+        CompressorZStdSeekPoint sp;
+        sp.m_compressedOffset = stream->GetLength();
+        sp.m_uncompressedOffset = zstdData->m_uncompressedSize;
+        zstdData->m_seekPoints.push_back(sp);
+        return true;
+    }
+
+    bool CompressorZStd::StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize)
+    {
+        AZ_Assert(stream && !stream->GetCompressorData(), "Stream has compressor already enabled.");
+
+        AcquireDataBuffer();
+
+        CompressorZStdData* zstdData = aznew CompressorZStdData;
+        zstdData->m_compressor = this;
+        zstdData->m_zstdHeader = 0; // not used for compression
+        zstdData->m_uncompressedSize = 0;
+        zstdData->m_autoSeekSize = autoSeekDataSize;
+        compressionLevel = AZ::GetClamp(compressionLevel, 1, 9); // remap to zlib levels
+
+        zstdData->m_zstd.StartCompressor(compressionLevel);
+
+        stream->SetCompressorData(zstdData);
+
+        if (WriteHeaderAndData(stream))
+        {
+            // add the first and always present seek point at the start of the compressed stream
+            CompressorZStdSeekPoint sp;
+            sp.m_compressedOffset = sizeof(CompressorHeader) + sizeof(CompressorZStdHeader) + sizeof(zstdData->m_zstdHeader);
+            sp.m_uncompressedOffset = 0;
+            zstdData->m_seekPoints.push_back(sp);
+            return true;
+        }
+        return false;
+    }
+
+    bool CompressorZStd::Close(CompressorStream* stream)
+    {
+        AZ_Assert(stream->IsOpen(), "Stream is not open to be closed.");
+
+        CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
+        GenericStream* baseStream = stream->GetWrappedStream();
+
+        bool result = true;
+        if (zstdData->m_zstd.IsCompressorStarted())
+        {
             m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
 
+            // flush all compressed data
             unsigned int compressedSize;
             unsigned int dataToCompress = 0;
             do
             {
-                compressedSize = zstdData->m_zstd.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZStd::FT_FULL_FLUSH);
+                compressedSize = zstdData->m_zstd.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZStd::FT_FINISH);
                 if (compressedSize)
                 {
-                    GenericStream* baseStream = stream->GetWrappedStream();
-                    SizeType numWritten = baseStream->Write(compressedSize, m_compressedDataBuffer);
-                    if (numWritten != compressedSize)
-                    {
-                        return false; // error we wrote less than than requested!
-                    }
+                    baseStream->Write(compressedSize, m_compressedDataBuffer);
                 }
             } while (dataToCompress != 0);
 
-            CompressorZStdSeekPoint sp;
-            sp.m_compressedOffset = stream->GetLength();
-            sp.m_uncompressedOffset = zstdData->m_uncompressedSize;
-            zstdData->m_seekPoints.push_back(sp);
-            return true;
+            result = WriteHeaderAndData(stream);
+            if (result)
+            {
+                SizeType dataToWrite = zstdData->m_seekPoints.size() * sizeof(CompressorZStdSeekPoint);
+                baseStream->Seek(0U, GenericStream::SeekMode::ST_SEEK_END);
+                result = (baseStream->Write(dataToWrite, zstdData->m_seekPoints.data()) == dataToWrite);
+            }
         }
-
-        bool CompressorZStd::StartCompressor(CompressorStream* stream, int compressionLevel, SizeType autoSeekDataSize)
+        else
         {
-            AZ_Assert(stream && !stream->GetCompressorData(), "Stream has compressor already enabled.");
-
-            AcquireDataBuffer();
-
-            CompressorZStdData* zstdData = aznew CompressorZStdData;
-            zstdData->m_compressor = this;
-            zstdData->m_zstdHeader = 0; // not used for compression
-            zstdData->m_uncompressedSize = 0;
-            zstdData->m_autoSeekSize = autoSeekDataSize;
-            compressionLevel = AZ::GetClamp(compressionLevel, 1, 9); // remap to zlib levels
-
-            zstdData->m_zstd.StartCompressor(compressionLevel);
-
-            stream->SetCompressorData(zstdData);
-
-            if (WriteHeaderAndData(stream))
+            if (m_lastReadStream == stream)
             {
-                // add the first and always present seek point at the start of the compressed stream
-                CompressorZStdSeekPoint sp;
-                sp.m_compressedOffset = sizeof(CompressorHeader) + sizeof(CompressorZStdHeader) + sizeof(zstdData->m_zstdHeader);
-                sp.m_uncompressedOffset = 0;
-                zstdData->m_seekPoints.push_back(sp);
-                return true;
+                m_lastReadStream = nullptr; // invalidate the data in m_dataBuffer if it was from the current stream.
             }
-            return false;
         }
 
-        bool CompressorZStd::Close(CompressorStream* stream)
+        // if we have decompressor cache delete it
+        if (zstdData->m_decompressedCache)
         {
-            AZ_Assert(stream->IsOpen(), "Stream is not open to be closed.");
-
-            CompressorZStdData* zstdData = static_cast<CompressorZStdData*>(stream->GetCompressorData());
-            GenericStream* baseStream = stream->GetWrappedStream();
-
-            bool result = true;
-            if (zstdData->m_zstd.IsCompressorStarted())
-            {
-                m_lastReadStream = nullptr; // invalidate last read position, otherwise m_dataBuffer will be corrupted (as we are about to write in it).
-
-                // flush all compressed data
-                unsigned int compressedSize;
-                unsigned int dataToCompress = 0;
-                do
-                {
-                    compressedSize = zstdData->m_zstd.Compress(nullptr, dataToCompress, m_compressedDataBuffer, m_compressedDataBufferSize, ZStd::FT_FINISH);
-                    if (compressedSize)
-                    {
-                        baseStream->Write(compressedSize, m_compressedDataBuffer);
-                    }
-                } while (dataToCompress != 0);
-
-                result = WriteHeaderAndData(stream);
-                if (result)
-                {
-                    SizeType dataToWrite = zstdData->m_seekPoints.size() * sizeof(CompressorZStdSeekPoint);
-                    baseStream->Seek(0U, GenericStream::SeekMode::ST_SEEK_END);
-                    result = (baseStream->Write(dataToWrite, zstdData->m_seekPoints.data()) == dataToWrite);
-                }
-            }
-            else
-            {
-                if (m_lastReadStream == stream)
-                {
-                    m_lastReadStream = nullptr; // invalidate the data in m_dataBuffer if it was from the current stream.
-                }
-            }
-
-            // if we have decompressor cache delete it
-            if (zstdData->m_decompressedCache)
-            {
-                azfree(zstdData->m_decompressedCache, AZ::SystemAllocator, m_decompressionCachePerStream, m_CompressedDataBufferAlignment);
-            }
-
-            ReleaseDataBuffer();
-
-            // last step reset strream compressor data.
-            stream->SetCompressorData(nullptr);
-            return result;
+            azfree(zstdData->m_decompressedCache, AZ::SystemAllocator, m_decompressionCachePerStream, m_CompressedDataBufferAlignment);
         }
 
-        void CompressorZStd::AcquireDataBuffer()
+        ReleaseDataBuffer();
+
+        // last step reset strream compressor data.
+        stream->SetCompressorData(nullptr);
+        return result;
+    }
+
+    void CompressorZStd::AcquireDataBuffer()
+    {
+        if (m_compressedDataBuffer == nullptr)
         {
-            if (m_compressedDataBuffer == nullptr)
-            {
-                AZ_Assert(m_compressedDataBufferUseCount == 0, "Buffer usecount should be 0 if the buffer is NULL");
-                m_compressedDataBuffer = reinterpret_cast<unsigned char*>(azmalloc(m_compressedDataBufferSize, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZStd"));
-                m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
-            }
-            ++m_compressedDataBufferUseCount;
+            AZ_Assert(m_compressedDataBufferUseCount == 0, "Buffer usecount should be 0 if the buffer is NULL");
+            m_compressedDataBuffer = reinterpret_cast<unsigned char*>(azmalloc(m_compressedDataBufferSize, m_CompressedDataBufferAlignment, AZ::SystemAllocator, "CompressorZStd"));
+            m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
         }
+        ++m_compressedDataBufferUseCount;
+    }
 
-        void CompressorZStd::ReleaseDataBuffer()
+    void CompressorZStd::ReleaseDataBuffer()
+    {
+        --m_compressedDataBufferUseCount;
+        if (m_compressedDataBufferUseCount == 0)
         {
-            --m_compressedDataBufferUseCount;
-            if (m_compressedDataBufferUseCount == 0)
-            {
-                AZ_Assert(m_compressedDataBuffer, "Invalid data buffer. We should have a non null pointer.");
-                azfree(m_compressedDataBuffer, AZ::SystemAllocator, m_compressedDataBufferSize, m_CompressedDataBufferAlignment);
-                m_compressedDataBuffer = nullptr;
-                m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
-            }
+            AZ_Assert(m_compressedDataBuffer, "Invalid data buffer. We should have a non null pointer.");
+            azfree(m_compressedDataBuffer, AZ::SystemAllocator, m_compressedDataBufferSize, m_CompressedDataBufferAlignment);
+            m_compressedDataBuffer = nullptr;
+            m_lastReadStream = nullptr; // reset the cache info in the m_dataBuffer
         }
-    }   // namespace IO
-}   // namespace AZ
+    }
+} // namespace AZ::IO
 
 #endif // #if !defined(AZCORE_EXCLUDE_ZSTD)
diff --git a/Code/Framework/AzCore/AzCore/IO/FileIO.cpp b/Code/Framework/AzCore/AzCore/IO/FileIO.cpp
index 837aca8d84..3522187131 100644
--- a/Code/Framework/AzCore/AzCore/IO/FileIO.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/FileIO.cpp
@@ -21,485 +21,482 @@
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    static EnvironmentVariable<FileIOBase*> g_fileIOInstance;
+    static EnvironmentVariable<FileIOBase*> g_directFileIOInstance;
+    static const char* s_EngineFileIOName = "EngineFileIO";
+    static const char* s_DirectFileIOName = "DirectFileIO";
+
+    FileIOBase* FileIOBase::GetInstance()
     {
-        static EnvironmentVariable<FileIOBase*> g_fileIOInstance;
-        static EnvironmentVariable<FileIOBase*> g_directFileIOInstance;
-        static const char* s_EngineFileIOName = "EngineFileIO";
-        static const char* s_DirectFileIOName = "DirectFileIO";
-
-        FileIOBase* FileIOBase::GetInstance()
+        if (!g_fileIOInstance)
         {
-            if (!g_fileIOInstance)
-            {
-                g_fileIOInstance = Environment::FindVariable<FileIOBase*>(s_EngineFileIOName);
-            }
-
-            return g_fileIOInstance ? (*g_fileIOInstance) : nullptr;
+            g_fileIOInstance = Environment::FindVariable<FileIOBase*>(s_EngineFileIOName);
         }
 
-        void FileIOBase::SetInstance(FileIOBase* instance)
+        return g_fileIOInstance ? (*g_fileIOInstance) : nullptr;
+    }
+
+    void FileIOBase::SetInstance(FileIOBase* instance)
+    {
+        if (!g_fileIOInstance)
         {
-            if (!g_fileIOInstance)
-            {
-                g_fileIOInstance = Environment::CreateVariable<FileIOBase*>(s_EngineFileIOName);
-                (*g_fileIOInstance) = nullptr;
-            }
-
-            // at this point we're guaranteed to have g_fileIOInstance.  Its value might be null.
-
-            if ((instance) && (g_fileIOInstance) && (*g_fileIOInstance))
-            {
-                AZ_Error("FileIO", false, "FileIOBase::SetInstance was called without first destroying the old instance and setting it to nullptr");
-            }
-
-            (*g_fileIOInstance) = instance;
+            g_fileIOInstance = Environment::CreateVariable<FileIOBase*>(s_EngineFileIOName);
+            (*g_fileIOInstance) = nullptr;
         }
 
-        FileIOBase* FileIOBase::GetDirectInstance()
+        // at this point we're guaranteed to have g_fileIOInstance.  Its value might be null.
+
+        if ((instance) && (g_fileIOInstance) && (*g_fileIOInstance))
         {
-            if (!g_directFileIOInstance)
-            {
-                g_directFileIOInstance = Environment::FindVariable<FileIOBase*>(s_DirectFileIOName);
-            }
-
-            // for backwards compatibilty, return the regular instance if this is not attached
-            if (!g_directFileIOInstance)
-            {
-                return GetInstance();
-            }
-
-            return g_directFileIOInstance ? (*g_directFileIOInstance) : nullptr;
+            AZ_Error("FileIO", false, "FileIOBase::SetInstance was called without first destroying the old instance and setting it to nullptr");
         }
 
-        void FileIOBase::SetDirectInstance(FileIOBase* instance)
+        (*g_fileIOInstance) = instance;
+    }
+
+    FileIOBase* FileIOBase::GetDirectInstance()
+    {
+        if (!g_directFileIOInstance)
         {
-            if (!g_directFileIOInstance)
-            {
-                g_directFileIOInstance = Environment::CreateVariable<FileIOBase*>(s_DirectFileIOName);
-                (*g_directFileIOInstance) = nullptr;
-            }
-
-            // at this point we're guaranteed to have g_directFileIOInstance.  Its value might be null.
-
-            if ((instance) && (g_directFileIOInstance) && (*g_directFileIOInstance))
-            {
-                AZ_Error("FileIO", false, "FileIOBase::SetDirectInstance was called without first destroying the old instance and setting it to nullptr");
-            }
-
-            (*g_directFileIOInstance) = instance;
+            g_directFileIOInstance = Environment::FindVariable<FileIOBase*>(s_DirectFileIOName);
         }
 
-        AZStd::optional<AZ::IO::FixedMaxPath> FileIOBase::ConvertToAlias(const AZ::IO::PathView& path) const
+        // for backwards compatibilty, return the regular instance if this is not attached
+        if (!g_directFileIOInstance)
         {
-            AZ::IO::FixedMaxPath convertedPath;
-            if (ConvertToAlias(convertedPath, path))
-            {
-                return convertedPath;
-            }
-
-            return AZStd::nullopt;
+            return GetInstance();
         }
 
-        AZStd::optional<AZ::IO::FixedMaxPath> FileIOBase::ResolvePath(const AZ::IO::PathView& path) const
-        {
-            AZ::IO::FixedMaxPath resolvedPath;
-            if (ResolvePath(resolvedPath, path))
-            {
-                return resolvedPath;
-            }
+        return g_directFileIOInstance ? (*g_directFileIOInstance) : nullptr;
+    }
 
-            return AZStd::nullopt;
+    void FileIOBase::SetDirectInstance(FileIOBase* instance)
+    {
+        if (!g_directFileIOInstance)
+        {
+            g_directFileIOInstance = Environment::CreateVariable<FileIOBase*>(s_DirectFileIOName);
+            (*g_directFileIOInstance) = nullptr;
         }
 
-        SeekType GetSeekTypeFromFSeekMode(int mode)
-        {
-            switch (mode)
-            {
-            case SEEK_SET:
-                return SeekType::SeekFromStart;
-            case SEEK_CUR:
-                return SeekType::SeekFromCurrent;
-            case SEEK_END:
-                return SeekType::SeekFromEnd;
-            }
+        // at this point we're guaranteed to have g_directFileIOInstance.  Its value might be null.
 
-            // Must have some default, hitting here means some random int mode
+        if ((instance) && (g_directFileIOInstance) && (*g_directFileIOInstance))
+        {
+            AZ_Error("FileIO", false, "FileIOBase::SetDirectInstance was called without first destroying the old instance and setting it to nullptr");
+        }
+
+        (*g_directFileIOInstance) = instance;
+    }
+
+    AZStd::optional<AZ::IO::FixedMaxPath> FileIOBase::ConvertToAlias(const AZ::IO::PathView& path) const
+    {
+        AZ::IO::FixedMaxPath convertedPath;
+        if (ConvertToAlias(convertedPath, path))
+        {
+            return convertedPath;
+        }
+
+        return AZStd::nullopt;
+    }
+
+    AZStd::optional<AZ::IO::FixedMaxPath> FileIOBase::ResolvePath(const AZ::IO::PathView& path) const
+    {
+        AZ::IO::FixedMaxPath resolvedPath;
+        if (ResolvePath(resolvedPath, path))
+        {
+            return resolvedPath;
+        }
+
+        return AZStd::nullopt;
+    }
+
+    SeekType GetSeekTypeFromFSeekMode(int mode)
+    {
+        switch (mode)
+        {
+        case SEEK_SET:
             return SeekType::SeekFromStart;
+        case SEEK_CUR:
+            return SeekType::SeekFromCurrent;
+        case SEEK_END:
+            return SeekType::SeekFromEnd;
         }
 
-        int GetFSeekModeFromSeekType(SeekType type)
-        {
-            switch (type)
-            {
-            case SeekType::SeekFromStart:
-                return SEEK_SET;
-            case SeekType::SeekFromCurrent:
-                return SEEK_CUR;
-            case SeekType::SeekFromEnd:
-                return SEEK_END;
-            }
+        // Must have some default, hitting here means some random int mode
+        return SeekType::SeekFromStart;
+    }
 
+    int GetFSeekModeFromSeekType(SeekType type)
+    {
+        switch (type)
+        {
+        case SeekType::SeekFromStart:
             return SEEK_SET;
+        case SeekType::SeekFromCurrent:
+            return SEEK_CUR;
+        case SeekType::SeekFromEnd:
+            return SEEK_END;
         }
 
-        void UpdateOpenModeForReading(OpenMode& openMode)
+        return SEEK_SET;
+    }
+
+    void UpdateOpenModeForReading(OpenMode& openMode)
+    {
+        if (AnyFlag(openMode & OpenMode::ModeRead))
         {
-            if (AnyFlag(openMode & OpenMode::ModeRead))
+            if (AnyFlag(openMode & OpenMode::ModeText))
             {
-                if (AnyFlag(openMode & OpenMode::ModeText))
-                {
-                    OpenMode extraModes = openMode & (OpenMode::ModeUpdate | OpenMode::ModeAppend);
-                    openMode = OpenMode::ModeRead | OpenMode::ModeBinary | extraModes;
-                }
-                else if (!AnyFlag(openMode & OpenMode::ModeBinary))
-                {
-                    // if you haven't supplied any flag, supply binary
-                    openMode = openMode | OpenMode::ModeBinary;
-                }
+                OpenMode extraModes = openMode & (OpenMode::ModeUpdate | OpenMode::ModeAppend);
+                openMode = OpenMode::ModeRead | OpenMode::ModeBinary | extraModes;
+            }
+            else if (!AnyFlag(openMode & OpenMode::ModeBinary))
+            {
+                // if you haven't supplied any flag, supply binary
+                openMode = openMode | OpenMode::ModeBinary;
             }
         }
+    }
 
-        OpenMode GetOpenModeFromStringMode(const char* mode)
+    OpenMode GetOpenModeFromStringMode(const char* mode)
+    {
+        OpenMode openMode = OpenMode::Invalid;
+
+        if (strstr(mode, "w"))
         {
-            OpenMode openMode = OpenMode::Invalid;
-
-            if (strstr(mode, "w"))
-            {
-                openMode |= OpenMode::ModeWrite;
-            }
-
-            if (strstr(mode, "r"))
-            {
-                openMode |= OpenMode::ModeRead;
-            }
-
-            if (strstr(mode, "a"))
-            {
-                openMode |= OpenMode::ModeAppend;
-            }
-
-            if (strstr(mode, "b"))
-            {
-                openMode |= OpenMode::ModeBinary;
-            }
-
-            if (strstr(mode, "t"))
-            {
-                openMode |= OpenMode::ModeText;
-            }
-
-            if (strstr(mode, "+"))
-            {
-                openMode |= OpenMode::ModeUpdate;
-            }
-
-            UpdateOpenModeForReading(openMode);
-
-            return openMode;
+            openMode |= OpenMode::ModeWrite;
         }
 
-        const char* GetStringModeFromOpenMode(OpenMode mode)
+        if (strstr(mode, "r"))
         {
-            UpdateOpenModeForReading(mode);
-            // Append is highest priority, followed by write and then read
-            // APPEND
-            if (AnyFlag(mode & OpenMode::ModeAppend))
+            openMode |= OpenMode::ModeRead;
+        }
+
+        if (strstr(mode, "a"))
+        {
+            openMode |= OpenMode::ModeAppend;
+        }
+
+        if (strstr(mode, "b"))
+        {
+            openMode |= OpenMode::ModeBinary;
+        }
+
+        if (strstr(mode, "t"))
+        {
+            openMode |= OpenMode::ModeText;
+        }
+
+        if (strstr(mode, "+"))
+        {
+            openMode |= OpenMode::ModeUpdate;
+        }
+
+        UpdateOpenModeForReading(openMode);
+
+        return openMode;
+    }
+
+    const char* GetStringModeFromOpenMode(OpenMode mode)
+    {
+        UpdateOpenModeForReading(mode);
+        // Append is highest priority, followed by write and then read
+        // APPEND
+        if (AnyFlag(mode & OpenMode::ModeAppend))
+        {
+            if (AnyFlag(mode & OpenMode::ModeUpdate))
             {
-                if (AnyFlag(mode & OpenMode::ModeUpdate))
-                {
-                    if (AnyFlag(mode & OpenMode::ModeBinary))
-                    {
-                        return "a+b";
-                    }
-                    if (AnyFlag(mode & OpenMode::ModeText))
-                    {
-                        return "a+t";
-                    }
-                    return "a+";
-                }
                 if (AnyFlag(mode & OpenMode::ModeBinary))
                 {
-                    return "ab";
+                    return "a+b";
                 }
                 if (AnyFlag(mode & OpenMode::ModeText))
                 {
-                    return "at";
+                    return "a+t";
                 }
-                return "a";
+                return "a+";
             }
-
-            // WRITE
-            if (AnyFlag(mode & OpenMode::ModeWrite))
+            if (AnyFlag(mode & OpenMode::ModeBinary))
+            {
+                return "ab";
+            }
+            if (AnyFlag(mode & OpenMode::ModeText))
+            {
+                return "at";
+            }
+            return "a";
+        }
+
+        // WRITE
+        if (AnyFlag(mode & OpenMode::ModeWrite))
+        {
+            if (AnyFlag(mode & OpenMode::ModeUpdate))
             {
-                if (AnyFlag(mode & OpenMode::ModeUpdate))
-                {
-                    if (AnyFlag(mode & OpenMode::ModeBinary))
-                    {
-                        return "w+b";
-                    }
-                    if (AnyFlag(mode & OpenMode::ModeText))
-                    {
-                        return "w+t";
-                    }
-                    return "w+";
-                }
                 if (AnyFlag(mode & OpenMode::ModeBinary))
                 {
-                    return "wb";
+                    return "w+b";
                 }
                 if (AnyFlag(mode & OpenMode::ModeText))
                 {
-                    return "wt";
+                    return "w+t";
                 }
-                return "w";
+                return "w+";
             }
-
-            // READ
-            if (AnyFlag(mode & OpenMode::ModeRead))
+            if (AnyFlag(mode & OpenMode::ModeBinary))
+            {
+                return "wb";
+            }
+            if (AnyFlag(mode & OpenMode::ModeText))
+            {
+                return "wt";
+            }
+            return "w";
+        }
+
+        // READ
+        if (AnyFlag(mode & OpenMode::ModeRead))
+        {
+            if (AnyFlag(mode & OpenMode::ModeUpdate))
             {
-                if (AnyFlag(mode & OpenMode::ModeUpdate))
-                {
-                    if (AnyFlag(mode & OpenMode::ModeBinary))
-                    {
-                        return "r+b";
-                    }
-                    if (AnyFlag(mode & OpenMode::ModeText))
-                    {
-                        return "r+t";
-                    }
-                    return "r+";
-                }
                 if (AnyFlag(mode & OpenMode::ModeBinary))
                 {
-                    return "rb";
+                    return "r+b";
                 }
                 if (AnyFlag(mode & OpenMode::ModeText))
                 {
-                    return "rt";
+                    return "r+t";
                 }
-                return "r";
+                return "r+";
             }
-
-            // Bad open mode passed in
-            AZ_Error("FileIO", false, "A bad open mode was sent to GetStringModeFromOpenMode()");
-            return "";
+            if (AnyFlag(mode & OpenMode::ModeBinary))
+            {
+                return "rb";
+            }
+            if (AnyFlag(mode & OpenMode::ModeText))
+            {
+                return "rt";
+            }
+            return "r";
         }
 
-        bool NameMatchesFilter(const char* name, const char* filter)
+        // Bad open mode passed in
+        AZ_Error("FileIO", false, "A bad open mode was sent to GetStringModeFromOpenMode()");
+        return "";
+    }
+
+    bool NameMatchesFilter(const char* name, const char* filter)
+    {
+        return AZStd::wildcard_match(filter, name);
+    }
+
+    FileIOStream::FileIOStream()
+        : m_handle(InvalidHandle)
+        , m_mode(OpenMode::Invalid)
+        , m_ownsHandle(true)
+    {
+
+    }
+
+    FileIOStream::FileIOStream(HandleType fileHandle, AZ::IO::OpenMode mode, bool ownsHandle)
+        : m_handle(fileHandle)
+        , m_mode(mode)
+        , m_ownsHandle(ownsHandle)
+    {
+
+        FileIOBase* fileIO = FileIOBase::GetInstance();
+        AZ_Assert(fileIO, "FileIO is not initialized.");
+        AZStd::array<char, MaxPathLength> resolvedPath{ {0} };
+        fileIO->GetFilename(m_handle, resolvedPath.data(), resolvedPath.size() - 1);
+        m_filename = resolvedPath.data();
+    }
+
+    FileIOStream::FileIOStream(const char* path, AZ::IO::OpenMode mode, bool errorOnFailure)
+        : m_handle(InvalidHandle)
+        , m_mode(mode)
+        , m_errorOnFailure(errorOnFailure)
+    {
+        Open(path, mode);
+    }
+
+    FileIOStream::~FileIOStream()
+    {
+        if (m_ownsHandle)
         {
-            return AZStd::wildcard_match(filter, name);
+            Close();
         }
+    }
 
-        FileIOStream::FileIOStream()
-            : m_handle(InvalidHandle)
-            , m_mode(OpenMode::Invalid)
-            , m_ownsHandle(true)
+    bool FileIOStream::Open(const char* path, OpenMode mode)
+    {
+        AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
+        FileIOBase* fileIO = FileIOBase::GetInstance();
+
+        Close();
+
+        const Result result = fileIO->Open(path, mode, m_handle);
+        m_ownsHandle = IsOpen();
+        m_mode = mode;
+
+        if (IsOpen())
         {
-
-        }
-
-        FileIOStream::FileIOStream(HandleType fileHandle, AZ::IO::OpenMode mode, bool ownsHandle)
-            : m_handle(fileHandle)
-            , m_mode(mode)
-            , m_ownsHandle(ownsHandle)
-        {
-            
-            FileIOBase* fileIO = FileIOBase::GetInstance();
-            AZ_Assert(fileIO, "FileIO is not initialized.");
+            // Not using supplied path parameter as it may be unresolved
             AZStd::array<char, MaxPathLength> resolvedPath{ {0} };
             fileIO->GetFilename(m_handle, resolvedPath.data(), resolvedPath.size() - 1);
             m_filename = resolvedPath.data();
         }
-
-        FileIOStream::FileIOStream(const char* path, AZ::IO::OpenMode mode, bool errorOnFailure)
-            : m_handle(InvalidHandle)
-            , m_mode(mode)
-            , m_errorOnFailure(errorOnFailure)
+        else
         {
-            Open(path, mode);
+            // remember the file name so you can try again with ReOpen
+            m_filename = path;
         }
 
-        FileIOStream::~FileIOStream()
-        {
-            if (m_ownsHandle)
-            {
-                Close();
-            }
-        }
+        AZ_PROFILE_INTERVAL_START_COLORED(AzCore, &m_filename, 0xff0000ff, "FileIO: %s", m_filename.c_str());
+        return result;
+    }
 
-        bool FileIOStream::Open(const char* path, OpenMode mode)
+    bool FileIOStream::ReOpen()
+    {
+        Close();
+        return (m_mode != OpenMode::Invalid) ? Open(m_filename.data(), m_mode) : false;
+    }
+
+    void FileIOStream::Close()
+    {
+        if (m_handle != InvalidHandle)
         {
             AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-            FileIOBase* fileIO = FileIOBase::GetInstance();
 
-            Close();
-
-            const Result result = fileIO->Open(path, mode, m_handle);
-            m_ownsHandle = IsOpen();
-            m_mode = mode;
-            
-            if (IsOpen())
-            {
-                // Not using supplied path parameter as it may be unresolved
-                AZStd::array<char, MaxPathLength> resolvedPath{ {0} };
-                fileIO->GetFilename(m_handle, resolvedPath.data(), resolvedPath.size() - 1);
-                m_filename = resolvedPath.data();
-            }
-            else
-            {
-                // remember the file name so you can try again with ReOpen
-                m_filename = path;
-            }
-
-            AZ_PROFILE_INTERVAL_START_COLORED(AzCore, &m_filename, 0xff0000ff, "FileIO: %s", m_filename.c_str());
-            return result;
+            FileIOBase::GetInstance()->Close(m_handle);
+            m_handle = InvalidHandle;
+            m_ownsHandle = false;
+            AZ_PROFILE_INTERVAL_END(AzCore, &m_filename);
         }
+    }
 
-        bool FileIOStream::ReOpen()
+    bool FileIOStream::IsOpen() const
+    {
+        return (m_handle != InvalidHandle);
+    }
+
+    /*!
+    \brief Retrieves underlying FileIO Handle from file stream
+    \return HandleType
+    */
+    HandleType FileIOStream::GetHandle() const
+    {
+        return m_handle;
+    }
+
+    /*!
+    \brief Retrieves filename
+    \return const char*
+    */
+    const char* FileIOStream::GetFilename() const
+    {
+        return m_filename.data();
+    }
+
+    /*!
+    \brief Retrieves OpenMode flags used to open this file
+    \return OpenMode
+    */
+    AZ::IO::OpenMode FileIOStream::GetModeFlags() const
+    {
+        return m_mode;
+    }
+
+    bool FileIOStream::CanSeek() const
+    {
+        return true;
+    }
+
+    bool FileIOStream::CanRead() const
+    {
+        return (m_mode & (OpenMode::ModeRead | OpenMode::ModeUpdate)) != OpenMode::Invalid;
+    }
+
+    bool FileIOStream::CanWrite() const
+    {
+        return (m_mode & (OpenMode::ModeWrite | OpenMode::ModeAppend | OpenMode::ModeUpdate)) != OpenMode::Invalid;
+    }
+
+    void FileIOStream::Seek(OffsetType bytes, SeekMode mode)
+    {
+        AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
+        AZ_Assert(IsOpen(), "Cannot seek on a FileIOStream that is not open.");
+
+        SeekType seekType = SeekType::SeekFromCurrent;
+        switch (mode)
         {
-            Close();
-            return (m_mode != OpenMode::Invalid) ? Open(m_filename.data(), m_mode) : false;
+        case GenericStream::ST_SEEK_BEGIN:
+            seekType = SeekType::SeekFromStart;
+            break;
+        case GenericStream::ST_SEEK_CUR:
+            seekType = SeekType::SeekFromCurrent;
+            break;
+        case GenericStream::ST_SEEK_END:
+            seekType = SeekType::SeekFromEnd;
+            break;
+        default:
+            seekType = SeekType::SeekFromCurrent;
+            break;
         }
 
-        void FileIOStream::Close()
+        const Result result = FileIOBase::GetInstance()->Seek(m_handle, static_cast<AZ::s64>(bytes), seekType);
+        (void)result;
+        AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "Seek failed.");
+    }
+
+    SizeType FileIOStream::Read(SizeType bytes, void* oBuffer)
+    {
+        AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
+        AZ_Assert(IsOpen(), "Cannot read from a FileIOStream that is not open.");
+
+        AZ::u64 bytesRead = 0;
+        const Result result = FileIOBase::GetInstance()->Read(m_handle, oBuffer, bytes, m_errorOnFailure, &bytesRead);
+        (void)result;
+        AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "Read failed in file %s.", m_filename.empty() ? "NULL" : m_filename.c_str());
+        return static_cast<SizeType>(bytesRead);
+    }
+
+    SizeType FileIOStream::Write(SizeType bytes, const void* iBuffer)
+    {
+        AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
+        AZ_Assert(IsOpen(), "Cannot write to a FileIOStream that is not open.");
+
+        AZ::u64 bytesWritten = 0;
+        const Result result = FileIOBase::GetInstance()->Write(m_handle, iBuffer, bytes, &bytesWritten);
+        (void)result;
+        AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "Write failed.");
+        return static_cast<SizeType>(bytesWritten);
+    }
+
+    SizeType FileIOStream::GetCurPos() const
+    {
+        AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
+        AZ_Assert(IsOpen(), "Cannot use a FileIOStream that is not open.");
+
+        AZ::u64 currentPosition = 0;
+        const Result result = FileIOBase::GetInstance()->Tell(m_handle, currentPosition);
+        (void)result;
+        AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "GetCurPos failed.");
+        return static_cast<SizeType>(currentPosition);
+    }
+
+    SizeType FileIOStream::GetLength() const
+    {
+        AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
+        AZ_Assert(IsOpen(), "Cannot use a FileIOStream that is not open.");
+
+        SizeType fileLengthBytes = 0;
+        if (!FileIOBase::GetInstance()->Size(m_handle, fileLengthBytes))
         {
-            if (m_handle != InvalidHandle)
-            {
-                AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-
-                FileIOBase::GetInstance()->Close(m_handle);
-                m_handle = InvalidHandle;
-                m_ownsHandle = false;
-                AZ_PROFILE_INTERVAL_END(AzCore, &m_filename);
-            }
+            AZ_Error("FileIOStream", false, "GetLength failed.");
         }
 
-        bool FileIOStream::IsOpen() const
-        {
-            return (m_handle != InvalidHandle);
-        }
+        return fileLengthBytes;
+    }
 
-        /*!
-        \brief Retrieves underlying FileIO Handle from file stream
-        \return HandleType
-        */
-        HandleType FileIOStream::GetHandle() const
-        {
-            return m_handle;
-        }
-
-        /*!
-        \brief Retrieves filename
-        \return const char*
-        */
-        const char* FileIOStream::GetFilename() const
-        {
-            return m_filename.data();
-        }
-
-        /*!
-        \brief Retrieves OpenMode flags used to open this file
-        \return OpenMode
-        */
-        AZ::IO::OpenMode FileIOStream::GetModeFlags() const
-        {
-            return m_mode;
-        }
-
-        bool FileIOStream::CanSeek() const
-        {
-            return true;
-        }
-
-        bool FileIOStream::CanRead() const
-        {
-            return (m_mode & (OpenMode::ModeRead | OpenMode::ModeUpdate)) != OpenMode::Invalid;
-        }
-
-        bool FileIOStream::CanWrite() const
-        {
-            return (m_mode & (OpenMode::ModeWrite | OpenMode::ModeAppend | OpenMode::ModeUpdate)) != OpenMode::Invalid;
-        }
-
-        void FileIOStream::Seek(OffsetType bytes, SeekMode mode)
-        {
-            AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-            AZ_Assert(IsOpen(), "Cannot seek on a FileIOStream that is not open.");
-
-            SeekType seekType = SeekType::SeekFromCurrent;
-            switch (mode)
-            {
-            case GenericStream::ST_SEEK_BEGIN:
-                seekType = SeekType::SeekFromStart;
-                break;
-            case GenericStream::ST_SEEK_CUR:
-                seekType = SeekType::SeekFromCurrent;
-                break;
-            case GenericStream::ST_SEEK_END:
-                seekType = SeekType::SeekFromEnd;
-                break;
-            default:
-                seekType = SeekType::SeekFromCurrent;
-                break;
-            }
-
-            const Result result = FileIOBase::GetInstance()->Seek(m_handle, static_cast<AZ::s64>(bytes), seekType);
-            (void)result;
-            AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "Seek failed.");
-        }
-
-        SizeType FileIOStream::Read(SizeType bytes, void* oBuffer)
-        {
-            AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-            AZ_Assert(IsOpen(), "Cannot read from a FileIOStream that is not open.");
-
-            AZ::u64 bytesRead = 0;
-            const Result result = FileIOBase::GetInstance()->Read(m_handle, oBuffer, bytes, m_errorOnFailure, &bytesRead);
-            (void)result;
-            AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "Read failed in file %s.", m_filename.empty() ? "NULL" : m_filename.c_str());
-            return static_cast<SizeType>(bytesRead);
-        }
-
-        SizeType FileIOStream::Write(SizeType bytes, const void* iBuffer)
-        {
-            AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-            AZ_Assert(IsOpen(), "Cannot write to a FileIOStream that is not open.");
-
-            AZ::u64 bytesWritten = 0;
-            const Result result = FileIOBase::GetInstance()->Write(m_handle, iBuffer, bytes, &bytesWritten);
-            (void)result;
-            AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "Write failed.");
-            return static_cast<SizeType>(bytesWritten);
-        }
-
-        SizeType FileIOStream::GetCurPos() const
-        {
-            AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-            AZ_Assert(IsOpen(), "Cannot use a FileIOStream that is not open.");
-
-            AZ::u64 currentPosition = 0;
-            const Result result = FileIOBase::GetInstance()->Tell(m_handle, currentPosition);
-            (void)result;
-            AZ_Error("FileIOStream", result.GetResultCode() == ResultCode::Success, "GetCurPos failed.");
-            return static_cast<SizeType>(currentPosition);
-        }
-
-        SizeType FileIOStream::GetLength() const
-        {
-            AZ_Assert(FileIOBase::GetInstance(), "FileIO is not initialized.");
-            AZ_Assert(IsOpen(), "Cannot use a FileIOStream that is not open.");
-
-            SizeType fileLengthBytes = 0;
-            if (!FileIOBase::GetInstance()->Size(m_handle, fileLengthBytes))
-            {
-                AZ_Error("FileIOStream", false, "GetLength failed.");
-            }
-
-            return fileLengthBytes;
-        }
-
-    } // namespace IO
-} // namespace AZ
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp b/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp
index 1e3a31f8ab..222a36ef70 100644
--- a/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/IOUtils.cpp
@@ -10,69 +10,64 @@
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/parallel/thread.h> /// this_thread sleep_for.
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
-    {      
-        int TranslateOpenModeToSystemFileMode(const char* path, OpenMode mode)
+    int TranslateOpenModeToSystemFileMode(const char* path, OpenMode mode)
+    {
+        int systemFileMode = 0;
+        bool read = AnyFlag(mode & OpenMode::ModeRead) || AnyFlag(mode & OpenMode::ModeUpdate);
+        bool write = AnyFlag(mode & OpenMode::ModeWrite) || AnyFlag(mode & OpenMode::ModeUpdate) || AnyFlag(mode & OpenMode::ModeAppend);
+        if (write)
         {
-            int systemFileMode = 0;
-            bool read = AnyFlag(mode & OpenMode::ModeRead) || AnyFlag(mode & OpenMode::ModeUpdate);
-            bool write = AnyFlag(mode & OpenMode::ModeWrite) || AnyFlag(mode & OpenMode::ModeUpdate) || AnyFlag(mode & OpenMode::ModeAppend);
-            if (write)
+            // If writing the file, create the file in all cases (except r+)
+            if (!SystemFile::Exists(path) && !(AnyFlag(mode & OpenMode::ModeRead) && AnyFlag(mode & OpenMode::ModeUpdate)))
             {
-                // If writing the file, create the file in all cases (except r+)
-                if (!SystemFile::Exists(path) && !(AnyFlag(mode & OpenMode::ModeRead) && AnyFlag(mode & OpenMode::ModeUpdate)))
-                {
-                    // LocalFileIO creates by default
-                    systemFileMode |= SystemFile::SF_OPEN_CREATE;
-                }
-
-                if (AnyFlag(mode & OpenMode::ModeCreatePath))
-                {
-                    systemFileMode |= SystemFile::SF_OPEN_CREATE_PATH;
-                }
-
-                // If appending, append.
-                if (AnyFlag(mode & OpenMode::ModeAppend))
-                {
-                    systemFileMode |= SystemFile::SF_OPEN_APPEND;
-                }
-                // If writing and not appending, empty the file
-                else if (AnyFlag(mode & OpenMode::ModeWrite))
-                {
-                    systemFileMode |= SystemFile::SF_OPEN_TRUNCATE;
-                }
-
-                // If reading, set read/write, otherwise just write
-                if (read)
-                {
-                    systemFileMode |= SystemFile::SF_OPEN_READ_WRITE;
-                }
-                else
-                {
-                    systemFileMode |= SystemFile::SF_OPEN_WRITE_ONLY;
-                }
-            }
-            else if (read)
-            {
-                systemFileMode |= SystemFile::SF_OPEN_READ_ONLY;
+                // LocalFileIO creates by default
+                systemFileMode |= SystemFile::SF_OPEN_CREATE;
             }
 
-            return systemFileMode;
+            if (AnyFlag(mode & OpenMode::ModeCreatePath))
+            {
+                systemFileMode |= SystemFile::SF_OPEN_CREATE_PATH;
+            }
+
+            // If appending, append.
+            if (AnyFlag(mode & OpenMode::ModeAppend))
+            {
+                systemFileMode |= SystemFile::SF_OPEN_APPEND;
+            }
+            // If writing and not appending, empty the file
+            else if (AnyFlag(mode & OpenMode::ModeWrite))
+            {
+                systemFileMode |= SystemFile::SF_OPEN_TRUNCATE;
+            }
+
+            // If reading, set read/write, otherwise just write
+            if (read)
+            {
+                systemFileMode |= SystemFile::SF_OPEN_READ_WRITE;
+            }
+            else
+            {
+                systemFileMode |= SystemFile::SF_OPEN_WRITE_ONLY;
+            }
+        }
+        else if (read)
+        {
+            systemFileMode |= SystemFile::SF_OPEN_READ_ONLY;
         }
 
-        bool RetryOpenStream(FileIOStream& stream, int numRetries, int delayBetweenRetry)
+        return systemFileMode;
+    }
+
+    bool RetryOpenStream(FileIOStream& stream, int numRetries, int delayBetweenRetry)
+    {
+        while ((!stream.IsOpen()) && (numRetries > 0))
         {
-            while ((!stream.IsOpen()) && (numRetries > 0))
-            {
-                numRetries--;
-                AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(delayBetweenRetry));
-                stream.ReOpen();
-            }
-            return stream.IsOpen();
+            numRetries--;
+            AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(delayBetweenRetry));
+            stream.ReOpen();
         }
-    }   // namespace IO
-}   // namespace AZ
-
-
+        return stream.IsOpen();
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp b/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp
index 637945db35..6e4dfdaa63 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp
@@ -50,13 +50,4 @@ namespace AZ::IO
         const PathIterator<Path>& rhs);
     template bool operator!=<FixedMaxPath>(const PathIterator<FixedMaxPath>& lhs,
         const PathIterator<FixedMaxPath>& rhs);
-
-    void PathReflection::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<AZ::IO::Path>()
-                ->Field("m_path", &AZ::IO::Path::m_path);
-        }
-    }
 }
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.h b/Code/Framework/AzCore/AzCore/IO/Path/Path.h
index 3b5c224957..094dee16f2 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.h
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.h
@@ -78,7 +78,8 @@ namespace AZ::IO
 
         // native format observers
         //! Returns string_view stored within the PathView
-        constexpr AZStd::string_view Native() const noexcept;
+        constexpr const AZStd::string_view& Native() const noexcept;
+        constexpr AZStd::string_view& Native() noexcept;
         //! Conversion operator to retrieve string_view stored within the PathView
         constexpr explicit operator AZStd::string_view() const noexcept;
 
@@ -321,7 +322,6 @@ namespace AZ::IO
         using const_iterator = const PathIterator<BasicPath>;
         using iterator = const_iterator;
         friend PathIterator<BasicPath>;
-        friend struct PathReflection;
 
         // constructors and destructor
         constexpr BasicPath() = default;
@@ -665,6 +665,7 @@ namespace AZ::IO
 namespace AZ
 {
     AZ_TYPE_INFO_SPECIALIZE(AZ::IO::Path, "{88E0A40F-3085-4CAB-8B11-EF5A2659C71A}");
+    AZ_TYPE_INFO_SPECIALIZE(AZ::IO::FixedMaxPath, "{FA6CA49F-376A-417C-9767-DD50744DF203}");
 }
 
 namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
index 1d654c1502..5ac15fc728 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
@@ -101,7 +101,11 @@ namespace AZ::IO
     }
 
     // native format observers
-    constexpr auto PathView::Native() const noexcept -> AZStd::string_view
+    constexpr auto PathView::Native() const noexcept -> const AZStd::string_view&
+    {
+        return m_path;
+    }
+    constexpr auto PathView::Native() noexcept -> AZStd::string_view&
     {
         return m_path;
     }
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp
new file mode 100644
index 0000000000..55a991f19f
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/functional.h>
+
+namespace AZ::IO
+{
+    template <typename PathType>
+    struct PathSerializer
+        : public SerializeContext::IDataSerializer
+    {
+    public:
+        /// Convert binary data to text
+        size_t DataToText(IO::GenericStream& in, IO::GenericStream& out, bool) override
+        {
+            PathType outPath;
+            outPath.Native().resize_no_construct(in.GetLength());
+            in.Read(outPath.Native().size(), outPath.Native().data());
+
+            return static_cast<size_t>(out.Write(outPath.Native().size(), outPath.Native().c_str()));
+        }
+
+        size_t TextToData(const char* text, unsigned int, IO::GenericStream& stream, bool) override
+        {
+            return static_cast<size_t>(stream.Write(strlen(text), reinterpret_cast<const void*>(text)));
+        }
+
+        size_t Save(const void* classPtr, IO::GenericStream& stream, bool) override
+        {
+            /// Save paths out using the PosixPathSeparator
+            PathType path(reinterpret_cast<const PathType*>(classPtr)->Native(), AZ::IO::PosixPathSeparator);
+            path.MakePreferred();
+
+            return static_cast<size_t>(stream.Write(path.Native().size(), path.c_str()));
+        }
+
+        bool Load(void* classPtr, IO::GenericStream& stream, unsigned int, bool) override
+        {
+            // Normalize the path load
+            auto path = reinterpret_cast<PathType*>(classPtr);
+
+            path->Native().resize_no_construct(stream.GetLength());
+            stream.Read(path->Native().size(), path->Native().data());
+            *path = path->LexicallyNormal();
+
+            return true;
+        }
+
+        bool CompareValueData(const void* lhs, const void* rhs) override
+        {
+            return SerializeContext::EqualityCompareHelper<Path>::CompareValues(lhs, rhs);
+        }
+    };
+
+    void PathReflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<SerializeContext*>(context); serializeContext != nullptr)
+        {
+            serializeContext->Class<Path>()
+                ->Serializer(AZ::SerializeContext::IDataSerializerPtr{ new PathSerializer<Path>{},
+                AZ::SerializeContext::IDataSerializer::CreateDefaultDeleteDeleter() })
+                ;
+
+            serializeContext->Class<FixedMaxPath>()
+                ->Serializer(AZ::SerializeContext::IDataSerializerPtr{ new PathSerializer<FixedMaxPath>{},
+                AZ::SerializeContext::IDataSerializer::CreateDefaultDeleteDeleter() })
+                ;
+        }
+    }
+}
diff --git a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h
similarity index 67%
rename from Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h
rename to Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h
index 5a80afe271..3076895026 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h
+++ b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h
@@ -8,4 +8,12 @@
 
 #pragma once
 
-#define STREAM_CACHE_DEFAULT 0
+namespace AZ
+{
+    class ReflectContext;
+}
+
+namespace AZ::IO
+{
+    void PathReflect(AZ::ReflectContext* context);
+}
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h b/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h
index cb61bd5887..c4fce5e1b7 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h
@@ -57,11 +57,6 @@ namespace AZ::IO
     // It depends on the path type
     template <typename PathType>
     class PathIterator;
-
-    struct PathReflection
-    {
-        static void Reflect(AZ::ReflectContext* context);
-    };
 }
 
 namespace AZStd
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
index e838324408..6c873f3050 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
@@ -15,736 +15,733 @@
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    AZStd::shared_ptr<StreamStackEntry> BlockCacheConfig::AddStreamStackEntry(
+        const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
     {
-        AZStd::shared_ptr<StreamStackEntry> BlockCacheConfig::AddStreamStackEntry(
-            const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
+        size_t blockSize;
+        switch (m_blockSize)
         {
-            size_t blockSize;
-            switch (m_blockSize)
-            {
-            case BlockSize::MaxTransfer:
-                blockSize = hardware.m_maxTransfer;
-                break;
-            case BlockSize::MemoryAlignment:
-                blockSize = hardware.m_maxPhysicalSectorSize;
-                break;
-            case BlockSize::SizeAlignment:
-                blockSize = hardware.m_maxLogicalSectorSize;
-                break;
-            default:
-                blockSize = m_blockSize;
-                break;
-            }
-
-            u32 cacheSize = static_cast<AZ::u32>(m_cacheSizeMib * 1_mib);
-            if (blockSize * 2 > cacheSize)
-            {
-                AZ_Warning("Streamer", false, "Size (%u) for BlockCache isn't big enough to hold at least two cache blocks of size (%zu). "
-                    "The cache size will be increased to fit 2 cache blocks.", cacheSize, blockSize);
-                cacheSize = aznumeric_caster(blockSize * 2);
-            }
-
-            auto stackEntry = AZStd::make_shared<BlockCache>(
-                cacheSize, aznumeric_cast<AZ::u32>(blockSize), aznumeric_cast<AZ::u32>(hardware.m_maxPhysicalSectorSize), false);
-            stackEntry->SetNext(AZStd::move(parent));
-            return stackEntry;
+        case BlockSize::MaxTransfer:
+            blockSize = hardware.m_maxTransfer;
+            break;
+        case BlockSize::MemoryAlignment:
+            blockSize = hardware.m_maxPhysicalSectorSize;
+            break;
+        case BlockSize::SizeAlignment:
+            blockSize = hardware.m_maxLogicalSectorSize;
+            break;
+        default:
+            blockSize = m_blockSize;
+            break;
         }
 
-        void BlockCacheConfig::Reflect(AZ::ReflectContext* context)
+        u32 cacheSize = static_cast<AZ::u32>(m_cacheSizeMib * 1_mib);
+        if (blockSize * 2 > cacheSize)
         {
-            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
-            {
-                serializeContext->Enum<BlockSize>()
-                    ->Version(1)
-                    ->Value("MaxTransfer", BlockSize::MaxTransfer)
-                    ->Value("MemoryAlignment", BlockSize::MemoryAlignment)
-                    ->Value("SizeAlignment", BlockSize::SizeAlignment);
-
-                serializeContext->Class<BlockCacheConfig, IStreamerStackConfig>()
-                    ->Version(1)
-                    ->Field("CacheSizeMib", &BlockCacheConfig::m_cacheSizeMib)
-                    ->Field("BlockSize", &BlockCacheConfig::m_blockSize);
-            }
+            AZ_Warning("Streamer", false, "Size (%u) for BlockCache isn't big enough to hold at least two cache blocks of size (%zu). "
+                "The cache size will be increased to fit 2 cache blocks.", cacheSize, blockSize);
+            cacheSize = aznumeric_caster(blockSize * 2);
         }
 
-        static constexpr char CacheHitRateName[] = "Cache hit rate";
-        static constexpr char CacheableName[] = "Cacheable";
+        auto stackEntry = AZStd::make_shared<BlockCache>(
+            cacheSize, aznumeric_cast<AZ::u32>(blockSize), aznumeric_cast<AZ::u32>(hardware.m_maxPhysicalSectorSize), false);
+        stackEntry->SetNext(AZStd::move(parent));
+        return stackEntry;
+    }
 
-        void BlockCache::Section::Prefix(const Section& section)
+    void BlockCacheConfig::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
         {
-            AZ_Assert(section.m_used, "Trying to prefix an unused section");
-            AZ_Assert(!m_wait && !section.m_wait, "Can't merge two section that are already waiting for data to be loaded.");
+            serializeContext->Enum<BlockSize>()
+                ->Version(1)
+                ->Value("MaxTransfer", BlockSize::MaxTransfer)
+                ->Value("MemoryAlignment", BlockSize::MemoryAlignment)
+                ->Value("SizeAlignment", BlockSize::SizeAlignment);
 
-            if (m_used)
+            serializeContext->Class<BlockCacheConfig, IStreamerStackConfig>()
+                ->Version(1)
+                ->Field("CacheSizeMib", &BlockCacheConfig::m_cacheSizeMib)
+                ->Field("BlockSize", &BlockCacheConfig::m_blockSize);
+        }
+    }
+
+    static constexpr char CacheHitRateName[] = "Cache hit rate";
+    static constexpr char CacheableName[] = "Cacheable";
+
+    void BlockCache::Section::Prefix(const Section& section)
+    {
+        AZ_Assert(section.m_used, "Trying to prefix an unused section");
+        AZ_Assert(!m_wait && !section.m_wait, "Can't merge two section that are already waiting for data to be loaded.");
+
+        if (m_used)
+        {
+            AZ_Assert(m_blockOffset == 0, "Unable to add a block cache to this one as this block requires an offset upon completion.");
+
+            AZ_Assert(section.m_readOffset < m_readOffset, "The block that's being merged needs to come before this block.");
+            m_readOffset = section.m_readOffset + section.m_blockOffset; // Remove any alignment that might have been added.
+            m_readSize += section.m_readSize - section.m_blockOffset;
+
+            AZ_Assert(section.m_output < m_output, "The block that's being merged needs to come before this block.");
+            m_output = section.m_output;
+            m_copySize += section.m_copySize;
+        }
+        else
+        {
+            m_used = true;
+            m_readOffset = section.m_readOffset + section.m_blockOffset;
+            m_readSize = section.m_readSize - section.m_blockOffset;
+            m_output = section.m_output;
+            m_copySize = section.m_copySize;
+        }
+        m_blockOffset = 0; // Two merged sections do not support caching.
+    }
+
+    BlockCache::BlockCache(u64 cacheSize, u32 blockSize, u32 alignment, bool onlyEpilogWrites)
+        : StreamStackEntry("Block cache")
+        , m_alignment(alignment)
+        , m_onlyEpilogWrites(onlyEpilogWrites)
+    {
+        AZ_Assert(IStreamerTypes::IsPowerOf2(alignment), "Alignment needs to be a power of 2.");
+        AZ_Assert(IStreamerTypes::IsAlignedTo(blockSize, alignment), "Block size needs to be a multiple of the alignment.");
+
+        m_numBlocks = aznumeric_caster(cacheSize / blockSize);
+        m_cacheSize = cacheSize - (cacheSize % blockSize); // Only use the amount needed for the cache.
+        m_blockSize = blockSize;
+        if (m_numBlocks == 1)
+        {
+            m_onlyEpilogWrites = true;
+        }
+
+        m_cache = reinterpret_cast<u8*>(AZ::AllocatorInstance<AZ::SystemAllocator>::Get().Allocate(
+            m_cacheSize, alignment, 0, "AZ::IO::Streamer BlockCache", __FILE__, __LINE__));
+        m_cachedPaths = AZStd::unique_ptr<RequestPath[]>(new RequestPath[m_numBlocks]);
+        m_cachedOffsets = AZStd::unique_ptr<u64[]>(new u64[m_numBlocks]);
+        m_blockLastTouched = AZStd::unique_ptr<TimePoint[]>(new TimePoint[m_numBlocks]);
+        m_inFlightRequests = AZStd::unique_ptr<FileRequest*[]>(new FileRequest*[m_numBlocks]);
+
+        ResetCache();
+    }
+
+    BlockCache::~BlockCache()
+    {
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(m_cache, m_cacheSize, m_alignment);
+    }
+
+    void BlockCache::QueueRequest(FileRequest* request)
+    {
+        AZ_Assert(request, "QueueRequest was provided a null request.");
+
+        AZStd::visit([this, request](auto&& args)
+        {
+            using Command = AZStd::decay_t<decltype(args)>;
+            if constexpr (AZStd::is_same_v<Command, FileRequest::ReadData>)
             {
-                AZ_Assert(m_blockOffset == 0, "Unable to add a block cache to this one as this block requires an offset upon completion.");
-                
-                AZ_Assert(section.m_readOffset < m_readOffset, "The block that's being merged needs to come before this block.");
-                m_readOffset = section.m_readOffset + section.m_blockOffset; // Remove any alignment that might have been added.
-                m_readSize += section.m_readSize - section.m_blockOffset;
-                
-                AZ_Assert(section.m_output < m_output, "The block that's being merged needs to come before this block.");
-                m_output = section.m_output;
-                m_copySize += section.m_copySize;
+                ReadFile(request, args);
+                return;
             }
             else
             {
-                m_used = true;
-                m_readOffset = section.m_readOffset + section.m_blockOffset;
-                m_readSize = section.m_readSize - section.m_blockOffset;
-                m_output = section.m_output;
-                m_copySize = section.m_copySize;
-            }
-            m_blockOffset = 0; // Two merged sections do not support caching.
-        }
-        
-        BlockCache::BlockCache(u64 cacheSize, u32 blockSize, u32 alignment, bool onlyEpilogWrites)
-            : StreamStackEntry("Block cache")
-            , m_alignment(alignment)
-            , m_onlyEpilogWrites(onlyEpilogWrites)
-        {
-            AZ_Assert(IStreamerTypes::IsPowerOf2(alignment), "Alignment needs to be a power of 2.");
-            AZ_Assert(IStreamerTypes::IsAlignedTo(blockSize, alignment), "Block size needs to be a multiple of the alignment.");
-            
-            m_numBlocks = aznumeric_caster(cacheSize / blockSize);
-            m_cacheSize = cacheSize - (cacheSize % blockSize); // Only use the amount needed for the cache.
-            m_blockSize = blockSize;
-            if (m_numBlocks == 1)
-            {
-                m_onlyEpilogWrites = true;
-            }
-            
-            m_cache = reinterpret_cast<u8*>(AZ::AllocatorInstance<AZ::SystemAllocator>::Get().Allocate(
-                m_cacheSize, alignment, 0, "AZ::IO::Streamer BlockCache", __FILE__, __LINE__));
-            m_cachedPaths = AZStd::unique_ptr<RequestPath[]>(new RequestPath[m_numBlocks]);
-            m_cachedOffsets = AZStd::unique_ptr<u64[]>(new u64[m_numBlocks]);
-            m_blockLastTouched = AZStd::unique_ptr<TimePoint[]>(new TimePoint[m_numBlocks]);
-            m_inFlightRequests = AZStd::unique_ptr<FileRequest*[]>(new FileRequest*[m_numBlocks]);
-            
-            ResetCache();
-        }
-
-        BlockCache::~BlockCache()
-        {
-            AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(m_cache, m_cacheSize, m_alignment);
-        }
-
-        void BlockCache::QueueRequest(FileRequest* request)
-        {
-            AZ_Assert(request, "QueueRequest was provided a null request.");
-
-            AZStd::visit([this, request](auto&& args)
-            {
-                using Command = AZStd::decay_t<decltype(args)>;
-                if constexpr (AZStd::is_same_v<Command, FileRequest::ReadData>)
+                if constexpr (AZStd::is_same_v<Command, FileRequest::FlushData>)
                 {
-                    ReadFile(request, args);
+                    FlushCache(args.m_path);
+                }
+                else if constexpr (AZStd::is_same_v<Command, FileRequest::FlushAllData>)
+                {
+                    FlushEntireCache();
+                }
+                StreamStackEntry::QueueRequest(request);
+            }
+        }, request->GetCommand());
+    }
+
+    bool BlockCache::ExecuteRequests()
+    {
+        size_t delayedCount = m_delayedSections.size();
+
+        bool delayedRequestProcessed = false;
+        for (size_t i = 0; i < delayedCount; ++i)
+        {
+            Section& delayed = m_delayedSections.front();
+            AZ_Assert(delayed.m_parent, "Delayed section doesn't have a reference to the original request.");
+            auto data = AZStd::get_if<FileRequest::ReadData>(&delayed.m_parent->GetCommand());
+            AZ_Assert(data, "A request in the delayed queue of the BlockCache didn't have a parent with read data.");
+            // This call can add the same section to the back of the queue if there's not
+            // enough space. Because of this the entry needs to be removed from the delayed
+            // list no matter what the result is of ServiceFromCache.
+            if (ServiceFromCache(delayed.m_parent, delayed, data->m_path, data->m_sharedRead) != CacheResult::Delayed)
+            {
+                delayedRequestProcessed = true;
+            }
+            m_delayedSections.pop_front();
+        }
+        bool nextResult = StreamStackEntry::ExecuteRequests();
+        return nextResult || delayedRequestProcessed;
+    }
+
+    void BlockCache::UpdateStatus(Status& status) const
+    {
+        StreamStackEntry::UpdateStatus(status);
+        s32 numAvailableSlots = CalculateAvailableRequestSlots();
+        status.m_numAvailableSlots = AZStd::min(status.m_numAvailableSlots, numAvailableSlots);
+        status.m_isIdle = status.m_isIdle &&
+            static_cast<u32>(numAvailableSlots) == m_numBlocks &&
+            m_delayedSections.empty();
+    }
+
+    void BlockCache::UpdateCompletionEstimates(AZStd::chrono::system_clock::time_point now, AZStd::vector<FileRequest*>& internalPending,
+        StreamerContext::PreparedQueue::iterator pendingBegin, StreamerContext::PreparedQueue::iterator pendingEnd)
+    {
+        // Have the stack downstream estimate the completion time for the requests that are waiting for a slot to execute in.
+        AddDelayedRequests(internalPending);
+
+        StreamStackEntry::UpdateCompletionEstimates(now, internalPending, pendingBegin, pendingEnd);
+
+        // The in-flight requests don't have to be updated because the subdivided request will bubble up in order so the final
+        // write will be the latest completion time. Requests that have a wait on another request though will need to be update
+        // as the estimation of the in-flight request needs to be copied to the wait request to get an accurate prediction.
+        UpdatePendingRequestEstimations();
+
+        // Technically here the wait commands for the delayed sections should be updated as well, but it's the parent that's interesting,
+        // not the wait so don't waste cycles updating the wait.
+    }
+
+    void BlockCache::AddDelayedRequests(AZStd::vector<FileRequest*>& internalPending)
+    {
+        for (auto& section : m_delayedSections)
+        {
+            internalPending.push_back(section.m_parent);
+        }
+    }
+
+    void BlockCache::UpdatePendingRequestEstimations()
+    {
+        for (auto it : m_pendingRequests)
+        {
+            Section& section = it.second;
+            AZ_Assert(section.m_cacheBlockIndex != s_fileNotCached, "An in-flight cache section doesn't have a cache block associated with it.");
+            AZ_Assert(m_inFlightRequests[section.m_cacheBlockIndex],
+                "Cache block %i is reported as being in-flight but has no request.", section.m_cacheBlockIndex);
+            if (section.m_wait)
+            {
+                AZ_Assert(section.m_parent, "A cache section with a wait request pending is missing a parent to wait on.");
+                auto largestTime = AZStd::max(section.m_parent->GetEstimatedCompletion(), it.first->GetEstimatedCompletion());
+                section.m_wait->SetEstimatedCompletion(largestTime);
+            }
+        }
+    }
+
+    void BlockCache::ReadFile(FileRequest* request, FileRequest::ReadData& data)
+    {
+        if (!m_next)
+        {
+            request->SetStatus(IStreamerTypes::RequestStatus::Failed);
+            m_context->MarkRequestAsCompleted(request);
+            return;
+        }
+
+        auto continueReadFile = [this, request](FileRequest& fileSizeRequest)
+        {
+            AZ_PROFILE_FUNCTION(AzCore);
+            AZ_Assert(m_numMetaDataRetrievalInProgress > 0,
+                "More requests have completed meta data retrieval in the Block Cache than were requested.");
+            m_numMetaDataRetrievalInProgress--;
+            if (fileSizeRequest.GetStatus() == IStreamerTypes::RequestStatus::Completed)
+            {
+                auto& requestInfo = AZStd::get<FileRequest::FileMetaDataRetrievalData>(fileSizeRequest.GetCommand());
+                if (requestInfo.m_found)
+                {
+                    ContinueReadFile(request, requestInfo.m_fileSize);
                     return;
                 }
-                else
+            }
+            // Couldn't find the file size so don't try to split and pass the request to the next entry in the stack.
+            StreamStackEntry::QueueRequest(request);
+        };
+        m_numMetaDataRetrievalInProgress++;
+        FileRequest* fileSizeRequest = m_context->GetNewInternalRequest();
+        fileSizeRequest->CreateFileMetaDataRetrieval(data.m_path);
+        fileSizeRequest->SetCompletionCallback(AZStd::move(continueReadFile));
+        StreamStackEntry::QueueRequest(fileSizeRequest);
+    }
+    void BlockCache::ContinueReadFile(FileRequest* request, u64 fileLength)
+    {
+        Section prolog;
+        Section main;
+        Section epilog;
+
+        auto& data = AZStd::get<FileRequest::ReadData>(request->GetCommand());
+
+        if (!SplitRequest(prolog, main, epilog, data.m_path, fileLength, data.m_offset, data.m_size,
+            reinterpret_cast<u8*>(data.m_output)))
+        {
+            m_context->MarkRequestAsCompleted(request);
+            return;
+        }
+
+        if (prolog.m_used || epilog.m_used)
+        {
+            m_cacheableStat.PushSample(1.0);
+            Statistic::PlotImmediate(m_name, CacheableName, m_cacheableStat.GetMostRecentSample());
+        }
+        else
+        {
+            // Nothing to cache so simply forward the call to the next entry in the stack for direct reading.
+            m_cacheableStat.PushSample(0.0);
+            Statistic::PlotImmediate(m_name, CacheableName, m_cacheableStat.GetMostRecentSample());
+            m_next->QueueRequest(request);
+            return;
+        }
+
+        bool fullyCached = true;
+        if (prolog.m_used)
+        {
+            if (m_onlyEpilogWrites && (main.m_used || epilog.m_used))
+            {
+                // Only the epilog is allowed to write to the cache, but a previous read could
+                // still have cached the prolog, so check the cache and use the data if it's there
+                // otherwise merge the section with the main section to have the data read.
+                if (ReadFromCache(request, prolog, data.m_path) == CacheResult::CacheMiss)
                 {
-                    if constexpr (AZStd::is_same_v<Command, FileRequest::FlushData>)
-                    {
-                        FlushCache(args.m_path);
-                    }
-                    else if constexpr (AZStd::is_same_v<Command, FileRequest::FlushAllData>)
-                    {
-                        FlushEntireCache();
-                    }
-                    StreamStackEntry::QueueRequest(request);
-                }
-            }, request->GetCommand());
-        }
-
-        bool BlockCache::ExecuteRequests()
-        {
-            size_t delayedCount = m_delayedSections.size();
-            
-            bool delayedRequestProcessed = false;
-            for (size_t i = 0; i < delayedCount; ++i)
-            {
-                Section& delayed = m_delayedSections.front();
-                AZ_Assert(delayed.m_parent, "Delayed section doesn't have a reference to the original request.");
-                auto data = AZStd::get_if<FileRequest::ReadData>(&delayed.m_parent->GetCommand());
-                AZ_Assert(data, "A request in the delayed queue of the BlockCache didn't have a parent with read data.");
-                // This call can add the same section to the back of the queue if there's not
-                // enough space. Because of this the entry needs to be removed from the delayed
-                // list no matter what the result is of ServiceFromCache.
-                if (ServiceFromCache(delayed.m_parent, delayed, data->m_path, data->m_sharedRead) != CacheResult::Delayed)
-                {
-                    delayedRequestProcessed = true;
-                }
-                m_delayedSections.pop_front();
-            }
-            bool nextResult = StreamStackEntry::ExecuteRequests();
-            return nextResult || delayedRequestProcessed;
-        }
-
-        void BlockCache::UpdateStatus(Status& status) const
-        {
-            StreamStackEntry::UpdateStatus(status);
-            s32 numAvailableSlots = CalculateAvailableRequestSlots();
-            status.m_numAvailableSlots = AZStd::min(status.m_numAvailableSlots, numAvailableSlots);
-            status.m_isIdle = status.m_isIdle &&
-                static_cast<u32>(numAvailableSlots) == m_numBlocks &&
-                m_delayedSections.empty();
-        }
-
-        void BlockCache::UpdateCompletionEstimates(AZStd::chrono::system_clock::time_point now, AZStd::vector<FileRequest*>& internalPending,
-            StreamerContext::PreparedQueue::iterator pendingBegin, StreamerContext::PreparedQueue::iterator pendingEnd)
-        {
-            // Have the stack downstream estimate the completion time for the requests that are waiting for a slot to execute in.
-            AddDelayedRequests(internalPending);
-
-            StreamStackEntry::UpdateCompletionEstimates(now, internalPending, pendingBegin, pendingEnd);
-
-            // The in-flight requests don't have to be updated because the subdivided request will bubble up in order so the final
-            // write will be the latest completion time. Requests that have a wait on another request though will need to be update
-            // as the estimation of the in-flight request needs to be copied to the wait request to get an accurate prediction.
-            UpdatePendingRequestEstimations();
-
-            // Technically here the wait commands for the delayed sections should be updated as well, but it's the parent that's interesting,
-            // not the wait so don't waste cycles updating the wait.
-        }
-
-        void BlockCache::AddDelayedRequests(AZStd::vector<FileRequest*>& internalPending)
-        {
-            for (auto& section : m_delayedSections)
-            {
-                internalPending.push_back(section.m_parent);
-            }
-        }
-
-        void BlockCache::UpdatePendingRequestEstimations()
-        {
-            for (auto it : m_pendingRequests)
-            {
-                Section& section = it.second;
-                AZ_Assert(section.m_cacheBlockIndex != s_fileNotCached, "An in-flight cache section doesn't have a cache block associated with it.");
-                AZ_Assert(m_inFlightRequests[section.m_cacheBlockIndex],
-                    "Cache block %i is reported as being in-flight but has no request.", section.m_cacheBlockIndex);
-                if (section.m_wait)
-                {
-                    AZ_Assert(section.m_parent, "A cache section with a wait request pending is missing a parent to wait on.");
-                    auto largestTime = AZStd::max(section.m_parent->GetEstimatedCompletion(), it.first->GetEstimatedCompletion());
-                    section.m_wait->SetEstimatedCompletion(largestTime);
-                }
-            }
-        }
-
-        void BlockCache::ReadFile(FileRequest* request, FileRequest::ReadData& data)
-        {
-            if (!m_next)
-            {
-                request->SetStatus(IStreamerTypes::RequestStatus::Failed);
-                m_context->MarkRequestAsCompleted(request);
-                return;
-            }
-
-            auto continueReadFile = [this, request](FileRequest& fileSizeRequest)
-            {
-                AZ_PROFILE_FUNCTION(AzCore);
-                AZ_Assert(m_numMetaDataRetrievalInProgress > 0,
-                    "More requests have completed meta data retrieval in the Block Cache than were requested.");
-                m_numMetaDataRetrievalInProgress--;
-                if (fileSizeRequest.GetStatus() == IStreamerTypes::RequestStatus::Completed)
-                {
-                    auto& requestInfo = AZStd::get<FileRequest::FileMetaDataRetrievalData>(fileSizeRequest.GetCommand());
-                    if (requestInfo.m_found)
-                    {
-                        ContinueReadFile(request, requestInfo.m_fileSize);
-                        return;
-                    }
-                }
-                // Couldn't find the file size so don't try to split and pass the request to the next entry in the stack.
-                StreamStackEntry::QueueRequest(request);
-            };
-            m_numMetaDataRetrievalInProgress++;
-            FileRequest* fileSizeRequest = m_context->GetNewInternalRequest();
-            fileSizeRequest->CreateFileMetaDataRetrieval(data.m_path);
-            fileSizeRequest->SetCompletionCallback(AZStd::move(continueReadFile));
-            StreamStackEntry::QueueRequest(fileSizeRequest);
-        }
-        void BlockCache::ContinueReadFile(FileRequest* request, u64 fileLength)
-        {
-            Section prolog;
-            Section main;
-            Section epilog;
-
-            auto& data = AZStd::get<FileRequest::ReadData>(request->GetCommand());
-
-            if (!SplitRequest(prolog, main, epilog, data.m_path, fileLength, data.m_offset, data.m_size,
-                reinterpret_cast<u8*>(data.m_output)))
-            {
-                m_context->MarkRequestAsCompleted(request);
-                return;
-            }
-
-            if (prolog.m_used || epilog.m_used)
-            {
-                m_cacheableStat.PushSample(1.0);
-                Statistic::PlotImmediate(m_name, CacheableName, m_cacheableStat.GetMostRecentSample());
-            }
-            else
-            {
-                // Nothing to cache so simply forward the call to the next entry in the stack for direct reading.
-                m_cacheableStat.PushSample(0.0);
-                Statistic::PlotImmediate(m_name, CacheableName, m_cacheableStat.GetMostRecentSample());
-                m_next->QueueRequest(request);
-                return;
-            }
-
-            bool fullyCached = true;
-            if (prolog.m_used)
-            {
-                if (m_onlyEpilogWrites && (main.m_used || epilog.m_used))
-                {
-                    // Only the epilog is allowed to write to the cache, but a previous read could
-                    // still have cached the prolog, so check the cache and use the data if it's there
-                    // otherwise merge the section with the main section to have the data read.
-                    if (ReadFromCache(request, prolog, data.m_path) == CacheResult::CacheMiss)
-                    {
-                        // The data isn't cached so put the prolog in front of the main section
-                        // so it's read in one read request. If main wasn't used, prefixing the prolog 
-                        // will cause it to be filled in and used.
-                        main.Prefix(prolog);
-                        m_hitRateStat.PushSample(0.0);
-                        Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
-                    }
-                    else
-                    {
-                        m_hitRateStat.PushSample(1.0);
-                        Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
-                    }
+                    // The data isn't cached so put the prolog in front of the main section
+                    // so it's read in one read request. If main wasn't used, prefixing the prolog
+                    // will cause it to be filled in and used.
+                    main.Prefix(prolog);
+                    m_hitRateStat.PushSample(0.0);
+                    Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
                 }
                 else
                 {
-                    // If m_onlyEpilogWrites is set but main and epilog are not filled in, it means that 
-                    // the request was so small it fits in one cache block, in which case the prolog and
-                    // epilog are practically the same. Or this code is reached because both prolog and
-                    // epilog are allowed to write.
-                    bool readFromCache = (ServiceFromCache(request, prolog, data.m_path, data.m_sharedRead) == CacheResult::ReadFromCache);
-                    fullyCached = readFromCache && fullyCached;
-
-                    m_hitRateStat.PushSample(readFromCache ? 1.0 : 0.0);
+                    m_hitRateStat.PushSample(1.0);
                     Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
                 }
             }
-
-            if (main.m_used)
+            else
             {
-                FileRequest* mainRequest = m_context->GetNewInternalRequest();
-                // No need for a callback as there's nothing to do after the read has been completed.
-                mainRequest->CreateRead(request, main.m_output, main.m_readSize, data.m_path,
-                    main.m_readOffset, main.m_readSize, data.m_sharedRead);
-                m_next->QueueRequest(mainRequest);
-                fullyCached = false;
-            }
-
-            if (epilog.m_used)
-            {
-                bool readFromCache = (ServiceFromCache(request, epilog, data.m_path, data.m_sharedRead) == CacheResult::ReadFromCache);
+                // If m_onlyEpilogWrites is set but main and epilog are not filled in, it means that
+                // the request was so small it fits in one cache block, in which case the prolog and
+                // epilog are practically the same. Or this code is reached because both prolog and
+                // epilog are allowed to write.
+                bool readFromCache = (ServiceFromCache(request, prolog, data.m_path, data.m_sharedRead) == CacheResult::ReadFromCache);
                 fullyCached = readFromCache && fullyCached;
 
                 m_hitRateStat.PushSample(readFromCache ? 1.0 : 0.0);
                 Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
             }
+        }
 
-            if (fullyCached)
+        if (main.m_used)
+        {
+            FileRequest* mainRequest = m_context->GetNewInternalRequest();
+            // No need for a callback as there's nothing to do after the read has been completed.
+            mainRequest->CreateRead(request, main.m_output, main.m_readSize, data.m_path,
+                main.m_readOffset, main.m_readSize, data.m_sharedRead);
+            m_next->QueueRequest(mainRequest);
+            fullyCached = false;
+        }
+
+        if (epilog.m_used)
+        {
+            bool readFromCache = (ServiceFromCache(request, epilog, data.m_path, data.m_sharedRead) == CacheResult::ReadFromCache);
+            fullyCached = readFromCache && fullyCached;
+
+            m_hitRateStat.PushSample(readFromCache ? 1.0 : 0.0);
+            Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
+        }
+
+        if (fullyCached)
+        {
+            request->SetStatus(IStreamerTypes::RequestStatus::Completed);
+            m_context->MarkRequestAsCompleted(request);
+        }
+    }
+
+    void BlockCache::FlushCache(const RequestPath& filePath)
+    {
+        for (u32 i = 0; i < m_numBlocks; ++i)
+        {
+            if (m_cachedPaths[i] == filePath)
             {
-                request->SetStatus(IStreamerTypes::RequestStatus::Completed);
-                m_context->MarkRequestAsCompleted(request);
+                ResetCacheEntry(i);
             }
         }
+    }
 
-        void BlockCache::FlushCache(const RequestPath& filePath)
+    void BlockCache::FlushEntireCache()
+    {
+        ResetCache();
+    }
+
+    void BlockCache::CollectStatistics(AZStd::vector<Statistic>& statistics) const
+    {
+        statistics.push_back(Statistic::CreatePercentage(m_name, CacheHitRateName, CalculateHitRatePercentage()));
+        statistics.push_back(Statistic::CreatePercentage(m_name, CacheableName, CalculateCacheableRatePercentage()));
+        statistics.push_back(Statistic::CreateInteger(m_name, "Available slots", CalculateAvailableRequestSlots()));
+
+        StreamStackEntry::CollectStatistics(statistics);
+    }
+
+    double BlockCache::CalculateHitRatePercentage() const
+    {
+        return m_hitRateStat.GetAverage();
+    }
+
+    double BlockCache::CalculateCacheableRatePercentage() const
+    {
+        return m_cacheableStat.GetAverage();
+    }
+
+    s32 BlockCache::CalculateAvailableRequestSlots() const
+    {
+        return  aznumeric_cast<s32>(m_numBlocks) - m_numInFlightRequests - m_numMetaDataRetrievalInProgress -
+            aznumeric_cast<s32>(m_delayedSections.size());
+    }
+
+    BlockCache::CacheResult BlockCache::ReadFromCache(FileRequest* request, Section& section, const RequestPath& filePath)
+    {
+        u32 cacheLocation = FindInCache(filePath, section.m_readOffset);
+        if (cacheLocation != s_fileNotCached)
         {
-            for (u32 i = 0; i < m_numBlocks; ++i)
-            {
-                if (m_cachedPaths[i] == filePath)
-                {
-                    ResetCacheEntry(i);
-                }
-            }
+            return ReadFromCache(request, section, cacheLocation);
         }
-
-        void BlockCache::FlushEntireCache()
+        else
         {
-            ResetCache();
+            return CacheResult::CacheMiss;
         }
+    }
 
-        void BlockCache::CollectStatistics(AZStd::vector<Statistic>& statistics) const
+    BlockCache::CacheResult BlockCache::ReadFromCache(FileRequest* request, Section& section, u32 cacheBlock)
+    {
+        if (!IsCacheBlockInFlight(cacheBlock))
         {
-            statistics.push_back(Statistic::CreatePercentage(m_name, CacheHitRateName, CalculateHitRatePercentage()));
-            statistics.push_back(Statistic::CreatePercentage(m_name, CacheableName, CalculateCacheableRatePercentage()));
-            statistics.push_back(Statistic::CreateInteger(m_name, "Available slots", CalculateAvailableRequestSlots()));
-
-            StreamStackEntry::CollectStatistics(statistics);
+            TouchBlock(cacheBlock);
+            memcpy(section.m_output, GetCacheBlockData(cacheBlock) + section.m_blockOffset, section.m_copySize);
+            return CacheResult::ReadFromCache;
         }
-
-        double BlockCache::CalculateHitRatePercentage() const
+        else
         {
-            return m_hitRateStat.GetAverage();
+            AZ_Assert(section.m_wait == nullptr, "A wait request has to be set on a block cache section, but one has already been assigned.");
+            FileRequest* wait = m_context->GetNewInternalRequest();
+            wait->CreateWait(request);
+            section.m_cacheBlockIndex = cacheBlock;
+            section.m_parent = request;
+            section.m_wait = wait;
+            m_pendingRequests.emplace(m_inFlightRequests[cacheBlock], section);
+            return CacheResult::Queued;
         }
+    }
 
-        double BlockCache::CalculateCacheableRatePercentage() const
-        {
-            return m_cacheableStat.GetAverage();
-        }
+    BlockCache::CacheResult BlockCache::ServiceFromCache(
+        FileRequest* request, Section& section, const RequestPath& filePath, bool sharedRead)
+    {
+        AZ_Assert(m_next, "ServiceFromCache in BlockCache was called when the cache doesn't have a way to read files.");
 
-        s32 BlockCache::CalculateAvailableRequestSlots() const
+        u32 cacheLocation = FindInCache(filePath, section.m_readOffset);
+        if (cacheLocation == s_fileNotCached)
         {
-            return  aznumeric_cast<s32>(m_numBlocks) - m_numInFlightRequests - m_numMetaDataRetrievalInProgress -
-                aznumeric_cast<s32>(m_delayedSections.size());
-        }
+            m_hitRateStat.PushSample(0.0);
+            Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
 
-        BlockCache::CacheResult BlockCache::ReadFromCache(FileRequest* request, Section& section, const RequestPath& filePath)
-        {
-            u32 cacheLocation = FindInCache(filePath, section.m_readOffset);
+            section.m_parent = request;
+            cacheLocation = RecycleOldestBlock(filePath, section.m_readOffset);
             if (cacheLocation != s_fileNotCached)
             {
-                return ReadFromCache(request, section, cacheLocation);
-            }
-            else
-            {
-                return CacheResult::CacheMiss;
-            }
-        }
+                FileRequest* readRequest = m_context->GetNewInternalRequest();
+                readRequest->CreateRead(request, GetCacheBlockData(cacheLocation), m_blockSize, filePath, section.m_readOffset,
+                    section.m_readSize, sharedRead);
+                readRequest->SetCompletionCallback([this](FileRequest& request)
+                    {
+                        AZ_PROFILE_FUNCTION(AzCore);
+                        CompleteRead(request);
+                    });
+                section.m_cacheBlockIndex = cacheLocation;
+                m_inFlightRequests[cacheLocation] = readRequest;
+                m_numInFlightRequests++;
 
-        BlockCache::CacheResult BlockCache::ReadFromCache(FileRequest* request, Section& section, u32 cacheBlock)
-        {
-            if (!IsCacheBlockInFlight(cacheBlock))
-            {
-                TouchBlock(cacheBlock);
-                memcpy(section.m_output, GetCacheBlockData(cacheBlock) + section.m_blockOffset, section.m_copySize);
-                return CacheResult::ReadFromCache;
-            }
-            else
-            {
-                AZ_Assert(section.m_wait == nullptr, "A wait request has to be set on a block cache section, but one has already been assigned.");
-                FileRequest* wait = m_context->GetNewInternalRequest();
-                wait->CreateWait(request);
-                section.m_cacheBlockIndex = cacheBlock;
-                section.m_parent = request;
-                section.m_wait = wait;
-                m_pendingRequests.emplace(m_inFlightRequests[cacheBlock], section);
+                // If set, this is the wait added by the delay.
+                if (section.m_wait)
+                {
+                    m_context->MarkRequestAsCompleted(section.m_wait);
+                    section.m_wait = nullptr;
+                }
+
+                m_pendingRequests.emplace(readRequest, section);
+                m_next->QueueRequest(readRequest);
                 return CacheResult::Queued;
             }
-        }
-
-        BlockCache::CacheResult BlockCache::ServiceFromCache(
-            FileRequest* request, Section& section, const RequestPath& filePath, bool sharedRead)
-        {
-            AZ_Assert(m_next, "ServiceFromCache in BlockCache was called when the cache doesn't have a way to read files.");
-
-            u32 cacheLocation = FindInCache(filePath, section.m_readOffset);
-            if (cacheLocation == s_fileNotCached)
-            {
-                m_hitRateStat.PushSample(0.0);
-                Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
-
-                section.m_parent = request;
-                cacheLocation = RecycleOldestBlock(filePath, section.m_readOffset);
-                if (cacheLocation != s_fileNotCached)
-                {
-                    FileRequest* readRequest = m_context->GetNewInternalRequest();
-                    readRequest->CreateRead(request, GetCacheBlockData(cacheLocation), m_blockSize, filePath, section.m_readOffset,
-                        section.m_readSize, sharedRead);
-                    readRequest->SetCompletionCallback([this](FileRequest& request)
-                        {
-                            AZ_PROFILE_FUNCTION(AzCore);
-                            CompleteRead(request);
-                        });
-                    section.m_cacheBlockIndex = cacheLocation;
-                    m_inFlightRequests[cacheLocation] = readRequest;
-                    m_numInFlightRequests++;
-                    
-                    // If set, this is the wait added by the delay.
-                    if (section.m_wait)
-                    {
-                        m_context->MarkRequestAsCompleted(section.m_wait);
-                        section.m_wait = nullptr;
-                    }
-
-                    m_pendingRequests.emplace(readRequest, section);
-                    m_next->QueueRequest(readRequest);
-                    return CacheResult::Queued;
-                }
-                else
-                {
-                    // There's no more space in the cache to store this request to. This is because there are more in-flight requests than 
-                    // there are slots in the cache. Delay the request until there's a slot available but add a wait for the section to
-                    // make sure the request can't complete if some parts are read.
-                    if (!section.m_wait)
-                    {
-                        section.m_wait = m_context->GetNewInternalRequest();
-                        section.m_wait->CreateWait(request);
-                    }
-                    m_delayedSections.push_back(section);
-                    return CacheResult::Delayed;
-                }
-            }
             else
             {
-                // If set, this is the wait added by the delay when the cache was full.
-                if (section.m_wait)
+                // There's no more space in the cache to store this request to. This is because there are more in-flight requests than
+                // there are slots in the cache. Delay the request until there's a slot available but add a wait for the section to
+                // make sure the request can't complete if some parts are read.
+                if (!section.m_wait)
                 {
-                    m_context->MarkRequestAsCompleted(section.m_wait);
-                    section.m_wait = nullptr;
+                    section.m_wait = m_context->GetNewInternalRequest();
+                    section.m_wait->CreateWait(request);
                 }
-
-                m_hitRateStat.PushSample(1.0);
-                Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
-
-                return ReadFromCache(request, section, cacheLocation);
+                m_delayedSections.push_back(section);
+                return CacheResult::Delayed;
             }
         }
-
-        void BlockCache::CompleteRead(FileRequest& request)
+        else
         {
-            auto requestInfo = m_pendingRequests.equal_range(&request);
-            AZ_Assert(requestInfo.first != requestInfo.second, "Block cache was asked to complete a file request it never queued.");
-
-            IStreamerTypes::RequestStatus requestStatus = request.GetStatus();
-            bool requestWasSuccessful = requestStatus == IStreamerTypes::RequestStatus::Completed;
-            u32 cacheBlockIndex = requestInfo.first->second.m_cacheBlockIndex;
-
-            for (auto it = requestInfo.first; it != requestInfo.second; ++it)
+            // If set, this is the wait added by the delay when the cache was full.
+            if (section.m_wait)
             {
-                Section& section = it->second;
-                AZ_Assert(section.m_cacheBlockIndex == cacheBlockIndex,
-                    "Section associated with the file request is referencing the incorrect cache block (%u vs %u).", cacheBlockIndex, section.m_cacheBlockIndex);
-                if (section.m_wait)
-                {
-                    section.m_wait->SetStatus(requestStatus);
-                    m_context->MarkRequestAsCompleted(section.m_wait);
-                    section.m_wait = nullptr;
-                }
+                m_context->MarkRequestAsCompleted(section.m_wait);
+                section.m_wait = nullptr;
+            }
 
-                if (requestWasSuccessful)
-                {
-                    memcpy(section.m_output, GetCacheBlockData(cacheBlockIndex) + section.m_blockOffset, section.m_copySize);
-                }
+            m_hitRateStat.PushSample(1.0);
+            Statistic::PlotImmediate(m_name, CacheHitRateName, m_hitRateStat.GetMostRecentSample());
+
+            return ReadFromCache(request, section, cacheLocation);
+        }
+    }
+
+    void BlockCache::CompleteRead(FileRequest& request)
+    {
+        auto requestInfo = m_pendingRequests.equal_range(&request);
+        AZ_Assert(requestInfo.first != requestInfo.second, "Block cache was asked to complete a file request it never queued.");
+
+        IStreamerTypes::RequestStatus requestStatus = request.GetStatus();
+        bool requestWasSuccessful = requestStatus == IStreamerTypes::RequestStatus::Completed;
+        u32 cacheBlockIndex = requestInfo.first->second.m_cacheBlockIndex;
+
+        for (auto it = requestInfo.first; it != requestInfo.second; ++it)
+        {
+            Section& section = it->second;
+            AZ_Assert(section.m_cacheBlockIndex == cacheBlockIndex,
+                "Section associated with the file request is referencing the incorrect cache block (%u vs %u).", cacheBlockIndex, section.m_cacheBlockIndex);
+            if (section.m_wait)
+            {
+                section.m_wait->SetStatus(requestStatus);
+                m_context->MarkRequestAsCompleted(section.m_wait);
+                section.m_wait = nullptr;
             }
 
             if (requestWasSuccessful)
             {
-                TouchBlock(cacheBlockIndex);
-                m_inFlightRequests[cacheBlockIndex] = nullptr;
+                memcpy(section.m_output, GetCacheBlockData(cacheBlockIndex) + section.m_blockOffset, section.m_copySize);
             }
-            else
-            {
-                ResetCacheEntry(cacheBlockIndex);
-            }
-            AZ_Assert(m_numInFlightRequests > 0, "Clearing out an in-flight request, but there shouldn't be any in flight according to records.");
-            m_numInFlightRequests--;
-            m_pendingRequests.erase(&request);
         }
 
-        bool BlockCache::SplitRequest(Section& prolog, Section& main, Section& epilog,
-            [[maybe_unused]] const RequestPath& filePath, u64 fileLength,
-            u64 offset, u64 size, u8* buffer) const
+        if (requestWasSuccessful)
         {
-            AZ_Assert(offset + size <= fileLength, "File at path '%s' is being read past the end of the file.", filePath.GetRelativePath());
+            TouchBlock(cacheBlockIndex);
+            m_inFlightRequests[cacheBlockIndex] = nullptr;
+        }
+        else
+        {
+            ResetCacheEntry(cacheBlockIndex);
+        }
+        AZ_Assert(m_numInFlightRequests > 0, "Clearing out an in-flight request, but there shouldn't be any in flight according to records.");
+        m_numInFlightRequests--;
+        m_pendingRequests.erase(&request);
+    }
 
-            //
-            // Prolog
-            // This looks at the request and sees if there's anything in front of the file that should be cached. This also
-            // deals with the situation where the entire file request fits inside the cache which could mean there's data
-            // left after the file as well that could be cached.
-            //
-            u64 roundedOffsetStart = AZ_SIZE_ALIGN_DOWN(offset, aznumeric_cast<u64>(m_blockSize));
-            
-            u64 blockReadSizeStart = AZStd::min(fileLength - roundedOffsetStart, aznumeric_cast<u64>(m_blockSize));
-            // Check if the request is on the left edge of the cache block, which means there's nothing in front of it
-            // that could be cached.
-            if (roundedOffsetStart == offset)
-            {
-                if (offset + size >= fileLength)
-                {
-                    // The entire (remainder) of the file is read so there's nothing to cache
-                    main.m_readOffset = offset;
-                    main.m_readSize = size;
-                    main.m_output = buffer;
-                    main.m_used = true;
-                    return true;
-                }
-                else if (size < blockReadSizeStart)
-                {
-                    // The entire request fits inside a single cache block, but there's more file to read.
-                    prolog.m_readOffset = offset;
-                    prolog.m_readSize = blockReadSizeStart;
-                    prolog.m_blockOffset = 0;
-                    prolog.m_output = buffer;
-                    prolog.m_copySize = size;
-                    prolog.m_used = true;
-                    return true;
-                }
-                // In any other case it means that the entire block would be read so caching has no effect.
-            }
-            else
-            {
-                // There is a portion of the file before that's not requested so always cache this block.
-                const u64 blockOffset = offset - roundedOffsetStart;
-                prolog.m_readOffset = roundedOffsetStart;
-                prolog.m_blockOffset = blockOffset;
-                prolog.m_output = buffer;
-                prolog.m_used = true;
+    bool BlockCache::SplitRequest(Section& prolog, Section& main, Section& epilog,
+        [[maybe_unused]] const RequestPath& filePath, u64 fileLength,
+        u64 offset, u64 size, u8* buffer) const
+    {
+        AZ_Assert(offset + size <= fileLength, "File at path '%s' is being read past the end of the file.", filePath.GetRelativePath());
 
-                const bool isEntirelyInCache = blockOffset + size <= blockReadSizeStart;
-                if (isEntirelyInCache)
-                {
-                    // The read size is already clamped to the file size above when blockReadSizeStart is set.
-                    AZ_Assert(roundedOffsetStart + blockReadSizeStart <= fileLength,
-                        "Read size in block cache was set to %llu but this is beyond the file length of %llu.",
-                        roundedOffsetStart + blockReadSizeStart, fileLength);
-                    prolog.m_readSize = blockReadSizeStart;
-                    prolog.m_copySize = size;
+        //
+        // Prolog
+        // This looks at the request and sees if there's anything in front of the file that should be cached. This also
+        // deals with the situation where the entire file request fits inside the cache which could mean there's data
+        // left after the file as well that could be cached.
+        //
+        u64 roundedOffsetStart = AZ_SIZE_ALIGN_DOWN(offset, aznumeric_cast<u64>(m_blockSize));
 
-                    // There won't be anything else coming after this so continue reading.
-                    return true;
-                }
-                else
-                {
-                    prolog.m_readSize = blockReadSizeStart;
-                    prolog.m_copySize = blockReadSizeStart - blockOffset;
-                }
-            }
-
-
-            //
-            // Epilog
-            // Since the prolog already takes care of the situation where the file fits entirely in the cache the epilog is
-            // much simpler as it only has to look at the case where there is more file after the request to read for caching.
-            //
-            u64 roundedOffsetEnd = AZ_SIZE_ALIGN_DOWN(offset + size, aznumeric_cast<u64>(m_blockSize));
-            u64 copySize = offset + size - roundedOffsetEnd;
-            u64 blockReadSizeEnd = m_blockSize;
-            if ((roundedOffsetEnd + blockReadSizeEnd) > fileLength)
+        u64 blockReadSizeStart = AZStd::min(fileLength - roundedOffsetStart, aznumeric_cast<u64>(m_blockSize));
+        // Check if the request is on the left edge of the cache block, which means there's nothing in front of it
+        // that could be cached.
+        if (roundedOffsetStart == offset)
+        {
+            if (offset + size >= fileLength)
             {
-                blockReadSizeEnd = fileLength - roundedOffsetEnd;
-            }
-
-            // If the read doesn't align with the edge of the cache
-            if (copySize != 0 && copySize < blockReadSizeEnd)
-            {
-                epilog.m_readOffset = roundedOffsetEnd;
-                epilog.m_readSize = blockReadSizeEnd;
-                epilog.m_blockOffset = 0;
-                epilog.m_output = buffer + (roundedOffsetEnd - offset);
-                epilog.m_copySize = copySize;
-                epilog.m_used = true;
-            }
-
-            //
-            // Main
-            // If this point is reached there's potentially a block between the prolog and epilog that can be directly read.
-            //
-            u64 adjustedOffset = offset;
-            if (prolog.m_used)
-            {
-                adjustedOffset += prolog.m_copySize;
-                size -= prolog.m_copySize;
-            }
-            if (epilog.m_used)
-            {
-                size -= epilog.m_copySize;
-            }
-            AZ_Assert(IStreamerTypes::IsAlignedTo(adjustedOffset, m_blockSize),
-                "The adjustments made by the prolog should guarantee the offset is aligned to a cache block.");
-            if (size != 0)
-            {
-                main.m_readOffset = adjustedOffset;
+                // The entire (remainder) of the file is read so there's nothing to cache
+                main.m_readOffset = offset;
                 main.m_readSize = size;
-                main.m_output = buffer + (adjustedOffset - offset);
+                main.m_output = buffer;
                 main.m_used = true;
+                return true;
             }
-
-            return true;
-        }
-
-        u8* BlockCache::GetCacheBlockData(u32 index)
-        {
-            AZ_Assert(index < m_numBlocks, "Index for touch a cache entry in the BlockCache is out of bounds.");
-            return m_cache + (index * m_blockSize);
-        }
-
-        void BlockCache::TouchBlock(u32 index)
-        {
-            AZ_Assert(index < m_numBlocks, "Index for touch a cache entry in the BlockCache is out of bounds.");
-            m_blockLastTouched[index] = AZStd::chrono::high_resolution_clock::now();
-        }
-
-        u32 BlockCache::RecycleOldestBlock(const RequestPath& filePath, u64 offset)
-        {
-            AZ_Assert((offset & (m_blockSize - 1)) == 0, "The offset used to recycle a block cache needs to be a multiple of the block size.");
-
-            // Find the oldest cache block.
-            TimePoint oldest = m_blockLastTouched[0];
-            u32 oldestIndex = 0;
-            for (u32 i = 1; i < m_numBlocks; ++i)
+            else if (size < blockReadSizeStart)
             {
-                if (m_blockLastTouched[i] < oldest && !m_inFlightRequests[i])
-                {
-                    oldest = m_blockLastTouched[i];
-                    oldestIndex = i;
-                }
+                // The entire request fits inside a single cache block, but there's more file to read.
+                prolog.m_readOffset = offset;
+                prolog.m_readSize = blockReadSizeStart;
+                prolog.m_blockOffset = 0;
+                prolog.m_output = buffer;
+                prolog.m_copySize = size;
+                prolog.m_used = true;
+                return true;
             }
+            // In any other case it means that the entire block would be read so caching has no effect.
+        }
+        else
+        {
+            // There is a portion of the file before that's not requested so always cache this block.
+            const u64 blockOffset = offset - roundedOffsetStart;
+            prolog.m_readOffset = roundedOffsetStart;
+            prolog.m_blockOffset = blockOffset;
+            prolog.m_output = buffer;
+            prolog.m_used = true;
 
-            if (!IsCacheBlockInFlight(oldestIndex))
+            const bool isEntirelyInCache = blockOffset + size <= blockReadSizeStart;
+            if (isEntirelyInCache)
             {
-                // Recycle the block.
-                m_cachedPaths[oldestIndex] = filePath;
-                m_cachedOffsets[oldestIndex] = offset;
-                TouchBlock(oldestIndex);
-                return oldestIndex;
+                // The read size is already clamped to the file size above when blockReadSizeStart is set.
+                AZ_Assert(roundedOffsetStart + blockReadSizeStart <= fileLength,
+                    "Read size in block cache was set to %llu but this is beyond the file length of %llu.",
+                    roundedOffsetStart + blockReadSizeStart, fileLength);
+                prolog.m_readSize = blockReadSizeStart;
+                prolog.m_copySize = size;
+
+                // There won't be anything else coming after this so continue reading.
+                return true;
             }
             else
             {
-                return s_fileNotCached;
+                prolog.m_readSize = blockReadSizeStart;
+                prolog.m_copySize = blockReadSizeStart - blockOffset;
             }
         }
 
-        u32 BlockCache::FindInCache(const RequestPath& filePath, u64 offset) const
-        {
-            AZ_Assert((offset & (m_blockSize - 1)) == 0, "The offset used to find a block in the block cache needs to be a multiple of the block size.");
-            for (u32 i = 0; i < m_numBlocks; ++i)
-            {
-                if (m_cachedPaths[i] == filePath && m_cachedOffsets[i] == offset)
-                {
-                    return i;
-                }
-            }
 
+        //
+        // Epilog
+        // Since the prolog already takes care of the situation where the file fits entirely in the cache the epilog is
+        // much simpler as it only has to look at the case where there is more file after the request to read for caching.
+        //
+        u64 roundedOffsetEnd = AZ_SIZE_ALIGN_DOWN(offset + size, aznumeric_cast<u64>(m_blockSize));
+        u64 copySize = offset + size - roundedOffsetEnd;
+        u64 blockReadSizeEnd = m_blockSize;
+        if ((roundedOffsetEnd + blockReadSizeEnd) > fileLength)
+        {
+            blockReadSizeEnd = fileLength - roundedOffsetEnd;
+        }
+
+        // If the read doesn't align with the edge of the cache
+        if (copySize != 0 && copySize < blockReadSizeEnd)
+        {
+            epilog.m_readOffset = roundedOffsetEnd;
+            epilog.m_readSize = blockReadSizeEnd;
+            epilog.m_blockOffset = 0;
+            epilog.m_output = buffer + (roundedOffsetEnd - offset);
+            epilog.m_copySize = copySize;
+            epilog.m_used = true;
+        }
+
+        //
+        // Main
+        // If this point is reached there's potentially a block between the prolog and epilog that can be directly read.
+        //
+        u64 adjustedOffset = offset;
+        if (prolog.m_used)
+        {
+            adjustedOffset += prolog.m_copySize;
+            size -= prolog.m_copySize;
+        }
+        if (epilog.m_used)
+        {
+            size -= epilog.m_copySize;
+        }
+        AZ_Assert(IStreamerTypes::IsAlignedTo(adjustedOffset, m_blockSize),
+            "The adjustments made by the prolog should guarantee the offset is aligned to a cache block.");
+        if (size != 0)
+        {
+            main.m_readOffset = adjustedOffset;
+            main.m_readSize = size;
+            main.m_output = buffer + (adjustedOffset - offset);
+            main.m_used = true;
+        }
+
+        return true;
+    }
+
+    u8* BlockCache::GetCacheBlockData(u32 index)
+    {
+        AZ_Assert(index < m_numBlocks, "Index for touch a cache entry in the BlockCache is out of bounds.");
+        return m_cache + (index * m_blockSize);
+    }
+
+    void BlockCache::TouchBlock(u32 index)
+    {
+        AZ_Assert(index < m_numBlocks, "Index for touch a cache entry in the BlockCache is out of bounds.");
+        m_blockLastTouched[index] = AZStd::chrono::high_resolution_clock::now();
+    }
+
+    u32 BlockCache::RecycleOldestBlock(const RequestPath& filePath, u64 offset)
+    {
+        AZ_Assert((offset & (m_blockSize - 1)) == 0, "The offset used to recycle a block cache needs to be a multiple of the block size.");
+
+        // Find the oldest cache block.
+        TimePoint oldest = m_blockLastTouched[0];
+        u32 oldestIndex = 0;
+        for (u32 i = 1; i < m_numBlocks; ++i)
+        {
+            if (m_blockLastTouched[i] < oldest && !m_inFlightRequests[i])
+            {
+                oldest = m_blockLastTouched[i];
+                oldestIndex = i;
+            }
+        }
+
+        if (!IsCacheBlockInFlight(oldestIndex))
+        {
+            // Recycle the block.
+            m_cachedPaths[oldestIndex] = filePath;
+            m_cachedOffsets[oldestIndex] = offset;
+            TouchBlock(oldestIndex);
+            return oldestIndex;
+        }
+        else
+        {
             return s_fileNotCached;
         }
+    }
 
-        bool BlockCache::IsCacheBlockInFlight(u32 index) const
+    u32 BlockCache::FindInCache(const RequestPath& filePath, u64 offset) const
+    {
+        AZ_Assert((offset & (m_blockSize - 1)) == 0, "The offset used to find a block in the block cache needs to be a multiple of the block size.");
+        for (u32 i = 0; i < m_numBlocks; ++i)
         {
-            AZ_Assert(index < m_numBlocks, "Index for checking if a cache block is in flight is out of bounds.");
-            return m_inFlightRequests[index] != nullptr;
-        }
-
-        void BlockCache::ResetCacheEntry(u32 index)
-        {
-            AZ_Assert(index < m_numBlocks, "Index for resetting a cache entry in the BlockCache is out of bounds.");
-
-            m_cachedPaths[index].Clear();
-            m_cachedOffsets[index] = 0;
-            m_blockLastTouched[index] = TimePoint::min();
-            m_inFlightRequests[index] = nullptr;
-        }
-
-        void BlockCache::ResetCache()
-        {
-            for (u32 i = 0; i < m_numBlocks; ++i)
+            if (m_cachedPaths[i] == filePath && m_cachedOffsets[i] == offset)
             {
-                ResetCacheEntry(i);
+                return i;
             }
-            m_numInFlightRequests = 0;
         }
-    } // namespace IO
-} // namespace AZ
+
+        return s_fileNotCached;
+    }
+
+    bool BlockCache::IsCacheBlockInFlight(u32 index) const
+    {
+        AZ_Assert(index < m_numBlocks, "Index for checking if a cache block is in flight is out of bounds.");
+        return m_inFlightRequests[index] != nullptr;
+    }
+
+    void BlockCache::ResetCacheEntry(u32 index)
+    {
+        AZ_Assert(index < m_numBlocks, "Index for resetting a cache entry in the BlockCache is out of bounds.");
+
+        m_cachedPaths[index].Clear();
+        m_cachedOffsets[index] = 0;
+        m_blockLastTouched[index] = TimePoint::min();
+        m_inFlightRequests[index] = nullptr;
+    }
+
+    void BlockCache::ResetCache()
+    {
+        for (u32 i = 0; i < m_numBlocks; ++i)
+        {
+            ResetCacheEntry(i);
+        }
+        m_numInFlightRequests = 0;
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
index e0e512e21f..b80a1ea724 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
@@ -12,320 +12,317 @@
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    AZStd::shared_ptr<StreamStackEntry> DedicatedCacheConfig::AddStreamStackEntry(
+        const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
     {
-        AZStd::shared_ptr<StreamStackEntry> DedicatedCacheConfig::AddStreamStackEntry(
-            const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
+        size_t blockSize;
+        switch (m_blockSize)
         {
-            size_t blockSize;
-            switch (m_blockSize)
+        case BlockCacheConfig::BlockSize::MaxTransfer:
+            blockSize = hardware.m_maxTransfer;
+            break;
+        case BlockCacheConfig::BlockSize::MemoryAlignment:
+            blockSize = hardware.m_maxPhysicalSectorSize;
+            break;
+        case BlockCacheConfig::BlockSize::SizeAlignment:
+            blockSize = hardware.m_maxLogicalSectorSize;
+            break;
+        default:
+            blockSize = m_blockSize;
+            break;
+        }
+
+        u32 cacheSize = static_cast<AZ::u32>(m_cacheSizeMib * 1_mib);
+        if (blockSize > cacheSize)
+        {
+            AZ_Warning("Streamer", false, "Size (%u) for DedicatedCache isn't big enough to hold at least one cache blocks of size (%zu). "
+                "The cache size will be increased to fit one cache block.", cacheSize, blockSize);
+            cacheSize = aznumeric_caster(blockSize);
+        }
+
+        auto stackEntry = AZStd::make_shared<DedicatedCache>(
+            cacheSize, aznumeric_cast<AZ::u32>(blockSize), aznumeric_cast<AZ::u32>(hardware.m_maxPhysicalSectorSize), m_writeOnlyEpilog);
+        stackEntry->SetNext(AZStd::move(parent));
+        return stackEntry;
+    }
+
+    void DedicatedCacheConfig::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
+        {
+            serializeContext->Class<DedicatedCacheConfig, IStreamerStackConfig>()
+                ->Version(1)
+                ->Field("CacheSizeMib", &DedicatedCacheConfig::m_cacheSizeMib)
+                ->Field("BlockSize", &DedicatedCacheConfig::m_blockSize)
+                ->Field("WriteOnlyEpilog", &DedicatedCacheConfig::m_writeOnlyEpilog);
+        }
+    }
+
+
+
+    //
+    // DedicatedCache
+    //
+
+    DedicatedCache::DedicatedCache(u64 cacheSize, u32 blockSize, u32 alignment, bool onlyEpilogWrites)
+        : StreamStackEntry("Dedicated cache")
+        , m_cacheSize(cacheSize)
+        , m_alignment(alignment)
+        , m_blockSize(blockSize)
+        , m_onlyEpilogWrites(onlyEpilogWrites)
+    {
+    }
+
+    void DedicatedCache::SetNext(AZStd::shared_ptr<StreamStackEntry> next)
+    {
+        m_next = AZStd::move(next);
+        for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
+        {
+            cache->SetNext(m_next);
+        }
+    }
+
+    void DedicatedCache::SetContext(StreamerContext& context)
+    {
+        StreamStackEntry::SetContext(context);
+        for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
+        {
+            cache->SetContext(context);
+        }
+    }
+
+    void DedicatedCache::PrepareRequest(FileRequest* request)
+    {
+        AZ_Assert(request, "PrepareRequest was provided a null request.");
+
+        // Claim the requests so other entries can't claim it and make updates.
+        AZStd::visit([this, request](auto&& args)
+        {
+            using Command = AZStd::decay_t<decltype(args)>;
+            if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData>)
             {
-            case BlockCacheConfig::BlockSize::MaxTransfer:
-                blockSize = hardware.m_maxTransfer;
-                break;
-            case BlockCacheConfig::BlockSize::MemoryAlignment:
-                blockSize = hardware.m_maxPhysicalSectorSize;
-                break;
-            case BlockCacheConfig::BlockSize::SizeAlignment:
-                blockSize = hardware.m_maxLogicalSectorSize;
-                break;
-            default:
-                blockSize = m_blockSize;
-                break;
+                args.m_range = FileRange::CreateRangeForEntireFile();
+                m_context->PushPreparedRequest(request);
             }
-
-            u32 cacheSize = static_cast<AZ::u32>(m_cacheSizeMib * 1_mib);
-            if (blockSize > cacheSize)
+            else if constexpr (AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
             {
-                AZ_Warning("Streamer", false, "Size (%u) for DedicatedCache isn't big enough to hold at least one cache blocks of size (%zu). "
-                    "The cache size will be increased to fit one cache block.", cacheSize, blockSize);
-                cacheSize = aznumeric_caster(blockSize);
-            }
-
-            auto stackEntry = AZStd::make_shared<DedicatedCache>(
-                cacheSize, aznumeric_cast<AZ::u32>(blockSize), aznumeric_cast<AZ::u32>(hardware.m_maxPhysicalSectorSize), m_writeOnlyEpilog);
-            stackEntry->SetNext(AZStd::move(parent));
-            return stackEntry;
-        }
-
-        void DedicatedCacheConfig::Reflect(AZ::ReflectContext* context)
-        {
-            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
-            {
-                serializeContext->Class<DedicatedCacheConfig, IStreamerStackConfig>()
-                    ->Version(1)
-                    ->Field("CacheSizeMib", &DedicatedCacheConfig::m_cacheSizeMib)
-                    ->Field("BlockSize", &DedicatedCacheConfig::m_blockSize)
-                    ->Field("WriteOnlyEpilog", &DedicatedCacheConfig::m_writeOnlyEpilog);
-            }
-        }
-
-
-
-        //
-        // DedicatedCache
-        //
-
-        DedicatedCache::DedicatedCache(u64 cacheSize, u32 blockSize, u32 alignment, bool onlyEpilogWrites)
-            : StreamStackEntry("Dedicated cache")
-            , m_cacheSize(cacheSize)
-            , m_alignment(alignment)
-            , m_blockSize(blockSize)
-            , m_onlyEpilogWrites(onlyEpilogWrites)
-        {
-        }
-
-        void DedicatedCache::SetNext(AZStd::shared_ptr<StreamStackEntry> next)
-        {
-            m_next = AZStd::move(next);
-            for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
-            {
-                cache->SetNext(m_next);
-            }
-        }
-
-        void DedicatedCache::SetContext(StreamerContext& context)
-        {
-            StreamStackEntry::SetContext(context);
-            for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
-            {
-                cache->SetContext(context);
-            }
-        }
-
-        void DedicatedCache::PrepareRequest(FileRequest* request)
-        {
-            AZ_Assert(request, "PrepareRequest was provided a null request.");
-
-            // Claim the requests so other entries can't claim it and make updates.
-            AZStd::visit([this, request](auto&& args)
-            {
-                using Command = AZStd::decay_t<decltype(args)>;
-                if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData>)
-                {
-                    args.m_range = FileRange::CreateRangeForEntireFile();
-                    m_context->PushPreparedRequest(request);
-                }
-                else if constexpr (AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
-                {
-                    args.m_range = FileRange::CreateRangeForEntireFile();
-                    m_context->PushPreparedRequest(request);
-                }
-                else
-                {
-                    StreamStackEntry::PrepareRequest(request);
-                }
-            }, request->GetCommand());
-        }
-
-        void DedicatedCache::QueueRequest(FileRequest* request)
-        {
-            AZ_Assert(request, "QueueRequest was provided a null request.");
-
-            AZStd::visit([this, request](auto&& args)
-            {
-                using Command = AZStd::decay_t<decltype(args)>;
-                if constexpr (AZStd::is_same_v<Command, FileRequest::ReadData>)
-                {
-                    ReadFile(request, args);
-                    return;
-                }
-                else if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData>)
-                {
-                    CreateDedicatedCache(request, args);
-                    return;
-                }
-                else if constexpr (AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
-                {
-                    DestroyDedicatedCache(request, args);
-                    return;
-                }
-                else
-                {
-                    if constexpr (AZStd::is_same_v<Command, FileRequest::FlushData>)
-                    {
-                        FlushCache(args.m_path);
-                    }
-                    else if constexpr (AZStd::is_same_v<Command, FileRequest::FlushAllData>)
-                    {
-                        FlushEntireCache();
-                    }
-                    StreamStackEntry::QueueRequest(request);
-                }
-            }, request->GetCommand());
-        }
-
-        bool DedicatedCache::ExecuteRequests()
-        {
-            bool hasProcessedRequest = false;
-            for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
-            {
-                hasProcessedRequest = cache->ExecuteRequests() || hasProcessedRequest;
-            }
-            return StreamStackEntry::ExecuteRequests() || hasProcessedRequest;
-        }
-
-        void DedicatedCache::UpdateStatus(Status& status) const
-        {
-            // Available slots are not updated because the dedicated caches are often
-            // small and specific to a tiny subset of files that are loaded. It would therefore
-            // return a small number of slots that would needlessly hamper streaming as it doesn't
-            // apply to the majority of files.
-
-            bool isIdle = true;
-            for (auto& cache : m_cachedFileCaches)
-            {
-                Status blockStatus;
-                cache->UpdateStatus(blockStatus);
-                isIdle = isIdle && blockStatus.m_isIdle;
-            }
-            status.m_isIdle = status.m_isIdle && isIdle;
-            StreamStackEntry::UpdateStatus(status);
-        }
-
-        void DedicatedCache::UpdateCompletionEstimates(AZStd::chrono::system_clock::time_point now,
-            AZStd::vector<FileRequest*>& internalPending, StreamerContext::PreparedQueue::iterator pendingBegin,
-            StreamerContext::PreparedQueue::iterator pendingEnd)
-        {
-            for (auto& cache : m_cachedFileCaches)
-            {
-                cache->AddDelayedRequests(internalPending);
-            }
-
-            StreamStackEntry::UpdateCompletionEstimates(now, internalPending, pendingBegin, pendingEnd);
-
-            for (auto& cache : m_cachedFileCaches)
-            {
-                cache->UpdatePendingRequestEstimations();
-            }
-        }
-
-        void DedicatedCache::ReadFile(FileRequest* request, FileRequest::ReadData& data)
-        {
-            size_t index = FindCache(data.m_path, data.m_offset);
-            if (index == s_fileNotFound)
-            {
-                m_usagePercentageStat.PushSample(0.0);
-                if (m_next)
-                {
-                    m_next->QueueRequest(request);
-                }
+                args.m_range = FileRange::CreateRangeForEntireFile();
+                m_context->PushPreparedRequest(request);
             }
             else
             {
-                m_usagePercentageStat.PushSample(1.0);
-                BlockCache& cache = *m_cachedFileCaches[index];
-                cache.QueueRequest(request);
-#if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
-                m_overallHitRateStat.PushSample(cache.CalculateHitRatePercentage());
-                m_overallCacheableRateStat.PushSample(cache.CalculateCacheableRatePercentage());
-#endif
+                StreamStackEntry::PrepareRequest(request);
             }
-        }
+        }, request->GetCommand());
+    }
 
-        void DedicatedCache::FlushCache(const RequestPath& filePath)
+    void DedicatedCache::QueueRequest(FileRequest* request)
+    {
+        AZ_Assert(request, "QueueRequest was provided a null request.");
+
+        AZStd::visit([this, request](auto&& args)
         {
-            size_t count = m_cachedFileNames.size();
-            for (size_t i = 0; i < count; ++i)
+            using Command = AZStd::decay_t<decltype(args)>;
+            if constexpr (AZStd::is_same_v<Command, FileRequest::ReadData>)
             {
-                if (m_cachedFileNames[i] == filePath)
-                {
-                    // Flush the entire block cache as it's entirely dedicated to the found file.
-                    m_cachedFileCaches[i]->FlushEntireCache();
-                }
+                ReadFile(request, args);
+                return;
             }
-        }
-
-        void DedicatedCache::FlushEntireCache()
-        {
-            for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
+            else if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData>)
             {
-                cache->FlushEntireCache();
+                CreateDedicatedCache(request, args);
+                return;
             }
-        }
-
-        void DedicatedCache::CollectStatistics(AZStd::vector<Statistic>& statistics) const
-        {
-            statistics.push_back(Statistic::CreatePercentage(m_name, "Reads from dedicated cache", m_usagePercentageStat.GetAverage()));
-#if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
-            statistics.push_back(Statistic::CreatePercentage(m_name, "Overall cacheable rate", m_overallCacheableRateStat.GetAverage()));
-            statistics.push_back(Statistic::CreatePercentage(m_name, "Overall hit rate", m_overallHitRateStat.GetAverage()));
-#endif
-            statistics.push_back(Statistic::CreateInteger(m_name, "Num dedicated caches", aznumeric_caster(m_cachedFileNames.size())));
-            StreamStackEntry::CollectStatistics(statistics);
-        }
-
-        void DedicatedCache::CreateDedicatedCache(FileRequest* request, FileRequest::CreateDedicatedCacheData& data)
-        {
-            size_t index = FindCache(data.m_path, data.m_range);
-            if (index == s_fileNotFound)
+            else if constexpr (AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
             {
-                index = m_cachedFileCaches.size();
-                m_cachedFileNames.push_back(data.m_path);
-                m_cachedFileRanges.push_back(data.m_range);
-                m_cachedFileCaches.push_back(AZStd::make_unique<BlockCache>(m_cacheSize, m_blockSize, m_alignment, m_onlyEpilogWrites));
-                m_cachedFileCaches[index]->SetNext(m_next);
-                m_cachedFileCaches[index]->SetContext(*m_context);
-                m_cachedFileRefCounts.push_back(1);
+                DestroyDedicatedCache(request, args);
+                return;
             }
             else
             {
-                ++m_cachedFileRefCounts[index];
+                if constexpr (AZStd::is_same_v<Command, FileRequest::FlushData>)
+                {
+                    FlushCache(args.m_path);
+                }
+                else if constexpr (AZStd::is_same_v<Command, FileRequest::FlushAllData>)
+                {
+                    FlushEntireCache();
+                }
+                StreamStackEntry::QueueRequest(request);
             }
-            request->SetStatus(IStreamerTypes::RequestStatus::Completed);
-            m_context->MarkRequestAsCompleted(request);
+        }, request->GetCommand());
+    }
+
+    bool DedicatedCache::ExecuteRequests()
+    {
+        bool hasProcessedRequest = false;
+        for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
+        {
+            hasProcessedRequest = cache->ExecuteRequests() || hasProcessedRequest;
+        }
+        return StreamStackEntry::ExecuteRequests() || hasProcessedRequest;
+    }
+
+    void DedicatedCache::UpdateStatus(Status& status) const
+    {
+        // Available slots are not updated because the dedicated caches are often
+        // small and specific to a tiny subset of files that are loaded. It would therefore
+        // return a small number of slots that would needlessly hamper streaming as it doesn't
+        // apply to the majority of files.
+
+        bool isIdle = true;
+        for (auto& cache : m_cachedFileCaches)
+        {
+            Status blockStatus;
+            cache->UpdateStatus(blockStatus);
+            isIdle = isIdle && blockStatus.m_isIdle;
+        }
+        status.m_isIdle = status.m_isIdle && isIdle;
+        StreamStackEntry::UpdateStatus(status);
+    }
+
+    void DedicatedCache::UpdateCompletionEstimates(AZStd::chrono::system_clock::time_point now,
+        AZStd::vector<FileRequest*>& internalPending, StreamerContext::PreparedQueue::iterator pendingBegin,
+        StreamerContext::PreparedQueue::iterator pendingEnd)
+    {
+        for (auto& cache : m_cachedFileCaches)
+        {
+            cache->AddDelayedRequests(internalPending);
         }
 
-        void DedicatedCache::DestroyDedicatedCache(FileRequest* request, FileRequest::DestroyDedicatedCacheData& data)
-        {
-            size_t index = FindCache(data.m_path, data.m_range);
-            if (index != s_fileNotFound)
-            {
-                if (m_cachedFileRefCounts[index] > 0)
-                {
-                    --m_cachedFileRefCounts[index];
-                    if (m_cachedFileRefCounts[index] == 0)
-                    {
-                        m_cachedFileNames.erase(m_cachedFileNames.begin() + index);
-                        m_cachedFileRanges.erase(m_cachedFileRanges.begin() + index);
-                        m_cachedFileCaches.erase(m_cachedFileCaches.begin() + index);
-                        m_cachedFileRefCounts.erase(m_cachedFileRefCounts.begin() + index);
-                    }
-                    request->SetStatus(IStreamerTypes::RequestStatus::Completed);
-                    m_context->MarkRequestAsCompleted(request);
-                    return;
-                }
-            }
-            request->SetStatus(IStreamerTypes::RequestStatus::Failed);
-            m_context->MarkRequestAsCompleted(request);
-        }
+        StreamStackEntry::UpdateCompletionEstimates(now, internalPending, pendingBegin, pendingEnd);
 
-        size_t DedicatedCache::FindCache(const RequestPath& filename, FileRange range)
+        for (auto& cache : m_cachedFileCaches)
         {
-            size_t count = m_cachedFileNames.size();
-            for (size_t i = 0; i < count; ++i)
-            {
-                if (m_cachedFileNames[i] == filename && m_cachedFileRanges[i] == range)
-                {
-                    return i;
-                }
-            }
-            return s_fileNotFound;
+            cache->UpdatePendingRequestEstimations();
         }
+    }
 
-        size_t DedicatedCache::FindCache(const RequestPath& filename, u64 offset)
+    void DedicatedCache::ReadFile(FileRequest* request, FileRequest::ReadData& data)
+    {
+        size_t index = FindCache(data.m_path, data.m_offset);
+        if (index == s_fileNotFound)
         {
-            size_t count = m_cachedFileNames.size();
-            for (size_t i = 0; i < count; ++i)
+            m_usagePercentageStat.PushSample(0.0);
+            if (m_next)
             {
-                if (m_cachedFileNames[i] == filename && m_cachedFileRanges[i].IsInRange(offset))
-                {
-                    return i;
-                }
+                m_next->QueueRequest(request);
             }
-            return s_fileNotFound;
         }
-    } // namespace IO
-} // namespace AZ
+        else
+        {
+            m_usagePercentageStat.PushSample(1.0);
+            BlockCache& cache = *m_cachedFileCaches[index];
+            cache.QueueRequest(request);
+#if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
+            m_overallHitRateStat.PushSample(cache.CalculateHitRatePercentage());
+            m_overallCacheableRateStat.PushSample(cache.CalculateCacheableRatePercentage());
+#endif
+        }
+    }
+
+    void DedicatedCache::FlushCache(const RequestPath& filePath)
+    {
+        size_t count = m_cachedFileNames.size();
+        for (size_t i = 0; i < count; ++i)
+        {
+            if (m_cachedFileNames[i] == filePath)
+            {
+                // Flush the entire block cache as it's entirely dedicated to the found file.
+                m_cachedFileCaches[i]->FlushEntireCache();
+            }
+        }
+    }
+
+    void DedicatedCache::FlushEntireCache()
+    {
+        for (AZStd::unique_ptr<BlockCache>& cache : m_cachedFileCaches)
+        {
+            cache->FlushEntireCache();
+        }
+    }
+
+    void DedicatedCache::CollectStatistics(AZStd::vector<Statistic>& statistics) const
+    {
+        statistics.push_back(Statistic::CreatePercentage(m_name, "Reads from dedicated cache", m_usagePercentageStat.GetAverage()));
+#if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
+        statistics.push_back(Statistic::CreatePercentage(m_name, "Overall cacheable rate", m_overallCacheableRateStat.GetAverage()));
+        statistics.push_back(Statistic::CreatePercentage(m_name, "Overall hit rate", m_overallHitRateStat.GetAverage()));
+#endif
+        statistics.push_back(Statistic::CreateInteger(m_name, "Num dedicated caches", aznumeric_caster(m_cachedFileNames.size())));
+        StreamStackEntry::CollectStatistics(statistics);
+    }
+
+    void DedicatedCache::CreateDedicatedCache(FileRequest* request, FileRequest::CreateDedicatedCacheData& data)
+    {
+        size_t index = FindCache(data.m_path, data.m_range);
+        if (index == s_fileNotFound)
+        {
+            index = m_cachedFileCaches.size();
+            m_cachedFileNames.push_back(data.m_path);
+            m_cachedFileRanges.push_back(data.m_range);
+            m_cachedFileCaches.push_back(AZStd::make_unique<BlockCache>(m_cacheSize, m_blockSize, m_alignment, m_onlyEpilogWrites));
+            m_cachedFileCaches[index]->SetNext(m_next);
+            m_cachedFileCaches[index]->SetContext(*m_context);
+            m_cachedFileRefCounts.push_back(1);
+        }
+        else
+        {
+            ++m_cachedFileRefCounts[index];
+        }
+        request->SetStatus(IStreamerTypes::RequestStatus::Completed);
+        m_context->MarkRequestAsCompleted(request);
+    }
+
+    void DedicatedCache::DestroyDedicatedCache(FileRequest* request, FileRequest::DestroyDedicatedCacheData& data)
+    {
+        size_t index = FindCache(data.m_path, data.m_range);
+        if (index != s_fileNotFound)
+        {
+            if (m_cachedFileRefCounts[index] > 0)
+            {
+                --m_cachedFileRefCounts[index];
+                if (m_cachedFileRefCounts[index] == 0)
+                {
+                    m_cachedFileNames.erase(m_cachedFileNames.begin() + index);
+                    m_cachedFileRanges.erase(m_cachedFileRanges.begin() + index);
+                    m_cachedFileCaches.erase(m_cachedFileCaches.begin() + index);
+                    m_cachedFileRefCounts.erase(m_cachedFileRefCounts.begin() + index);
+                }
+                request->SetStatus(IStreamerTypes::RequestStatus::Completed);
+                m_context->MarkRequestAsCompleted(request);
+                return;
+            }
+        }
+        request->SetStatus(IStreamerTypes::RequestStatus::Failed);
+        m_context->MarkRequestAsCompleted(request);
+    }
+
+    size_t DedicatedCache::FindCache(const RequestPath& filename, FileRange range)
+    {
+        size_t count = m_cachedFileNames.size();
+        for (size_t i = 0; i < count; ++i)
+        {
+            if (m_cachedFileNames[i] == filename && m_cachedFileRanges[i] == range)
+            {
+                return i;
+            }
+        }
+        return s_fileNotFound;
+    }
+
+    size_t DedicatedCache::FindCache(const RequestPath& filename, u64 offset)
+    {
+        size_t count = m_cachedFileNames.size();
+        for (size_t i = 0; i < count; ++i)
+        {
+            if (m_cachedFileNames[i] == filename && m_cachedFileRanges[i].IsInRange(offset))
+            {
+                return i;
+            }
+        }
+        return s_fileNotFound;
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp
index df4f77b722..3a568d3f47 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRange.cpp
@@ -8,104 +8,101 @@
 
 #include <AzCore/IO/Streamer/FileRange.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    FileRange FileRange::CreateRange(u64 offset, u64 size)
     {
-        FileRange FileRange::CreateRange(u64 offset, u64 size)
-        {
-            FileRange result;
-            result.m_hasOffsetEndSet = true;
-            result.m_isEntireFile = false;
-            result.m_offsetBegin = offset;
-            result.m_offsetEnd = offset + size;
-            return result;
-        }
+        FileRange result;
+        result.m_hasOffsetEndSet = true;
+        result.m_isEntireFile = false;
+        result.m_offsetBegin = offset;
+        result.m_offsetEnd = offset + size;
+        return result;
+    }
 
-        FileRange FileRange::CreateRangeForEntireFile()
-        {
-            FileRange result;
-            result.m_hasOffsetEndSet = false;
-            result.m_isEntireFile = true;
-            result.m_offsetBegin = 0;
-            result.m_offsetEnd = (static_cast<u64>(1) << 63) - 1;
-            return result;
-        }
+    FileRange FileRange::CreateRangeForEntireFile()
+    {
+        FileRange result;
+        result.m_hasOffsetEndSet = false;
+        result.m_isEntireFile = true;
+        result.m_offsetBegin = 0;
+        result.m_offsetEnd = (static_cast<u64>(1) << 63) - 1;
+        return result;
+    }
 
-        FileRange FileRange::CreateRangeForEntireFile(u64 fileSize)
-        {
-            FileRange result;
-            result.m_hasOffsetEndSet = true;
-            result.m_isEntireFile = true;
-            result.m_offsetBegin = 0;
-            result.m_offsetEnd = fileSize;
-            return result;
-        }
+    FileRange FileRange::CreateRangeForEntireFile(u64 fileSize)
+    {
+        FileRange result;
+        result.m_hasOffsetEndSet = true;
+        result.m_isEntireFile = true;
+        result.m_offsetBegin = 0;
+        result.m_offsetEnd = fileSize;
+        return result;
+    }
 
-        FileRange::FileRange()
-            : m_isEntireFile(false)
-            , m_offsetBegin(0)
-            , m_hasOffsetEndSet(false)
-            , m_offsetEnd(0)
-        {
-        }
+    FileRange::FileRange()
+        : m_isEntireFile(false)
+        , m_offsetBegin(0)
+        , m_hasOffsetEndSet(false)
+        , m_offsetEnd(0)
+    {
+    }
 
-        bool FileRange::operator==(const FileRange& rhs) const
+    bool FileRange::operator==(const FileRange& rhs) const
+    {
+        if (m_isEntireFile)
         {
-            if (m_isEntireFile)
-            {
-                return rhs.m_isEntireFile && m_offsetBegin == rhs.m_offsetBegin;
-            }
-            else
-            {
-                return m_offsetBegin == rhs.m_offsetBegin && m_offsetEnd == rhs.m_offsetEnd;
-            }
+            return rhs.m_isEntireFile && m_offsetBegin == rhs.m_offsetBegin;
         }
+        else
+        {
+            return m_offsetBegin == rhs.m_offsetBegin && m_offsetEnd == rhs.m_offsetEnd;
+        }
+    }
 
-        bool FileRange::operator!=(const FileRange& rhs) const
+    bool FileRange::operator!=(const FileRange& rhs) const
+    {
+        if (m_isEntireFile)
         {
-            if (m_isEntireFile)
-            {
-                return !rhs.m_isEntireFile || m_offsetBegin != rhs.m_offsetBegin;
-            }
-            else
-            {
-                return m_offsetBegin != rhs.m_offsetBegin || m_offsetEnd != rhs.m_offsetEnd;
-            }
+            return !rhs.m_isEntireFile || m_offsetBegin != rhs.m_offsetBegin;
         }
+        else
+        {
+            return m_offsetBegin != rhs.m_offsetBegin || m_offsetEnd != rhs.m_offsetEnd;
+        }
+    }
 
-        bool FileRange::IsEntireFile() const
-        {
-            return m_isEntireFile != 0;
-        }
+    bool FileRange::IsEntireFile() const
+    {
+        return m_isEntireFile != 0;
+    }
 
-        bool FileRange::IsSizeKnown() const
-        {
-            // m_hasOffsetEndSet being zero has the special meaning that the file size has not
-            // specifically been set yet.
-            return m_hasOffsetEndSet != 0;
-        }
+    bool FileRange::IsSizeKnown() const
+    {
+        // m_hasOffsetEndSet being zero has the special meaning that the file size has not
+        // specifically been set yet.
+        return m_hasOffsetEndSet != 0;
+    }
 
-        bool FileRange::IsInRange(u64 offset) const
-        {
-            return m_offsetBegin <= offset && offset < m_offsetEnd;
-        }
+    bool FileRange::IsInRange(u64 offset) const
+    {
+        return m_offsetBegin <= offset && offset < m_offsetEnd;
+    }
 
-        u64 FileRange::GetOffset() const
-        {
-            return m_offsetBegin;
-        }
+    u64 FileRange::GetOffset() const
+    {
+        return m_offsetBegin;
+    }
 
-        u64 FileRange::GetSize() const
-        {
-            AZ_Assert(m_hasOffsetEndSet, "Calling GetSize on a FileRange that doesn't have a size specified.");
-            return m_offsetEnd - m_offsetBegin;
-        }
+    u64 FileRange::GetSize() const
+    {
+        AZ_Assert(m_hasOffsetEndSet, "Calling GetSize on a FileRange that doesn't have a size specified.");
+        return m_offsetEnd - m_offsetBegin;
+    }
 
-        u64 FileRange::GetEndPoint() const
-        {
-            AZ_Assert(m_hasOffsetEndSet, "Calling GetEndPoint on a FileRange that doesn't have an end offset specified.");
-            return m_offsetEnd;
-        }
-    } // namespace IO
-} // namesapce AZ
+    u64 FileRange::GetEndPoint() const
+    {
+        AZ_Assert(m_hasOffsetEndSet, "Calling GetEndPoint on a FileRange that doesn't have an end offset specified.");
+        return m_offsetEnd;
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp
index 7b9cde76d3..fc05b77b36 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.cpp
@@ -12,469 +12,466 @@
 #include <AzCore/IO/Streamer/FileRequest.h>
 #include <AzCore/IO/Streamer/StreamerContext.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    //
+    // Command structures.
+    //
+
+    FileRequest::ExternalRequestData::ExternalRequestData(FileRequestPtr&& request)
+        : m_request(AZStd::move(request))
+    {}
+
+    FileRequest::RequestPathStoreData::RequestPathStoreData(RequestPath path)
+        : m_path(AZStd::move(path))
+    {}
+
+    FileRequest::ReadRequestData::ReadRequestData(RequestPath path, void* output, u64 outputSize, u64 offset, u64 size,
+        AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
+        : m_path(AZStd::move(path))
+        , m_allocator(nullptr)
+        , m_deadline(deadline)
+        , m_output(output)
+        , m_outputSize(outputSize)
+        , m_offset(offset)
+        , m_size(size)
+        , m_priority(priority)
+        , m_memoryType(IStreamerTypes::MemoryType::ReadWrite) // Only generic memory can be assigned externally.
+    {}
+
+    FileRequest::ReadRequestData::ReadRequestData(RequestPath path, IStreamerTypes::RequestMemoryAllocator* allocator,
+        u64 offset, u64 size, AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
+        : m_path(AZStd::move(path))
+        , m_allocator(allocator)
+        , m_deadline(deadline)
+        , m_output(nullptr)
+        , m_outputSize(0)
+        , m_offset(offset)
+        , m_size(size)
+        , m_priority(priority)
+        , m_memoryType(IStreamerTypes::MemoryType::ReadWrite) // Only generic memory can be assigned externally.
+    {}
+
+    FileRequest::ReadRequestData::~ReadRequestData()
     {
-        //
-        // Command structures.
-        //
-
-        FileRequest::ExternalRequestData::ExternalRequestData(FileRequestPtr&& request)
-            : m_request(AZStd::move(request))
-        {}
-
-        FileRequest::RequestPathStoreData::RequestPathStoreData(RequestPath path)
-            : m_path(AZStd::move(path))
-        {}
-
-        FileRequest::ReadRequestData::ReadRequestData(RequestPath path, void* output, u64 outputSize, u64 offset, u64 size,
-            AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
-            : m_path(AZStd::move(path))
-            , m_allocator(nullptr)
-            , m_deadline(deadline)
-            , m_output(output)
-            , m_outputSize(outputSize)
-            , m_offset(offset)
-            , m_size(size)
-            , m_priority(priority)
-            , m_memoryType(IStreamerTypes::MemoryType::ReadWrite) // Only generic memory can be assigned externally.
-        {}
-
-        FileRequest::ReadRequestData::ReadRequestData(RequestPath path, IStreamerTypes::RequestMemoryAllocator* allocator,
-            u64 offset, u64 size, AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
-            : m_path(AZStd::move(path))
-            , m_allocator(allocator)
-            , m_deadline(deadline)
-            , m_output(nullptr)
-            , m_outputSize(0)
-            , m_offset(offset)
-            , m_size(size)
-            , m_priority(priority)
-            , m_memoryType(IStreamerTypes::MemoryType::ReadWrite) // Only generic memory can be assigned externally.
-        {}
-
-        FileRequest::ReadRequestData::~ReadRequestData()
+        if (m_allocator != nullptr)
         {
-            if (m_allocator != nullptr)
+            if (m_output != nullptr)
             {
-                if (m_output != nullptr)
-                {
-                    m_allocator->Release(m_output);
-                }
-                m_allocator->UnlockAllocator();
+                m_allocator->Release(m_output);
             }
+            m_allocator->UnlockAllocator();
         }
+    }
 
-        FileRequest::ReadData::ReadData(void* output, u64 outputSize, const RequestPath& path, u64 offset, u64 size, bool sharedRead)
-            : m_output(output)
-            , m_outputSize(outputSize)
-            , m_path(path)
-            , m_offset(offset)
-            , m_size(size)
-            , m_sharedRead(sharedRead)
-        {}
+    FileRequest::ReadData::ReadData(void* output, u64 outputSize, const RequestPath& path, u64 offset, u64 size, bool sharedRead)
+        : m_output(output)
+        , m_outputSize(outputSize)
+        , m_path(path)
+        , m_offset(offset)
+        , m_size(size)
+        , m_sharedRead(sharedRead)
+    {}
 
-        FileRequest::CompressedReadData::CompressedReadData(CompressionInfo&& compressionInfo, void* output, u64 readOffset, u64 readSize)
-            : m_compressionInfo(AZStd::move(compressionInfo))
-            , m_output(output)
-            , m_readOffset(readOffset)
-            , m_readSize(readSize)
-        {}
+    FileRequest::CompressedReadData::CompressedReadData(CompressionInfo&& compressionInfo, void* output, u64 readOffset, u64 readSize)
+        : m_compressionInfo(AZStd::move(compressionInfo))
+        , m_output(output)
+        , m_readOffset(readOffset)
+        , m_readSize(readSize)
+    {}
 
-        FileRequest::FileExistsCheckData::FileExistsCheckData(const RequestPath& path)
-            : m_path(path)
-        {}
+    FileRequest::FileExistsCheckData::FileExistsCheckData(const RequestPath& path)
+        : m_path(path)
+    {}
 
-        FileRequest::FileMetaDataRetrievalData::FileMetaDataRetrievalData(const RequestPath& path)
-            : m_path(path)
-        {}
+    FileRequest::FileMetaDataRetrievalData::FileMetaDataRetrievalData(const RequestPath& path)
+        : m_path(path)
+    {}
 
-        FileRequest::CancelData::CancelData(FileRequestPtr target)
-            : m_target(AZStd::move(target))
-        {}
+    FileRequest::CancelData::CancelData(FileRequestPtr target)
+        : m_target(AZStd::move(target))
+    {}
 
-        FileRequest::FlushData::FlushData(RequestPath path)
-            : m_path(AZStd::move(path))
-        {}
+    FileRequest::FlushData::FlushData(RequestPath path)
+        : m_path(AZStd::move(path))
+    {}
 
-        FileRequest::RescheduleData::RescheduleData(FileRequestPtr target, AZStd::chrono::system_clock::time_point newDeadline,
-            IStreamerTypes::Priority newPriority)
-            : m_target(AZStd::move(target))
-            , m_newDeadline(newDeadline)
-            , m_newPriority(newPriority)
-        {}
+    FileRequest::RescheduleData::RescheduleData(FileRequestPtr target, AZStd::chrono::system_clock::time_point newDeadline,
+        IStreamerTypes::Priority newPriority)
+        : m_target(AZStd::move(target))
+        , m_newDeadline(newDeadline)
+        , m_newPriority(newPriority)
+    {}
 
-        FileRequest::CreateDedicatedCacheData::CreateDedicatedCacheData(RequestPath path, const FileRange& range)
-            : m_path(AZStd::move(path))
-            , m_range(range)
-        {}
+    FileRequest::CreateDedicatedCacheData::CreateDedicatedCacheData(RequestPath path, const FileRange& range)
+        : m_path(AZStd::move(path))
+        , m_range(range)
+    {}
 
-        FileRequest::DestroyDedicatedCacheData::DestroyDedicatedCacheData(RequestPath path, const FileRange& range)
-            : m_path(AZStd::move(path))
-            , m_range(range)
-        {}
+    FileRequest::DestroyDedicatedCacheData::DestroyDedicatedCacheData(RequestPath path, const FileRange& range)
+        : m_path(AZStd::move(path))
+        , m_range(range)
+    {}
 
-        FileRequest::ReportData::ReportData(ReportType reportType)
-            : m_reportType(reportType)
-        {}
+    FileRequest::ReportData::ReportData(ReportType reportType)
+        : m_reportType(reportType)
+    {}
 
-        FileRequest::CustomData::CustomData(AZStd::any data, bool failWhenUnhandled)
-            : m_data(AZStd::move(data))
-            , m_failWhenUnhandled(failWhenUnhandled)
-        {}
+    FileRequest::CustomData::CustomData(AZStd::any data, bool failWhenUnhandled)
+        : m_data(AZStd::move(data))
+        , m_failWhenUnhandled(failWhenUnhandled)
+    {}
 
 
-        //
-        // FileRequest
-        //
+    //
+    // FileRequest
+    //
 
-        FileRequest::FileRequest(Usage usage)
-            : m_usage(usage)
+    FileRequest::FileRequest(Usage usage)
+        : m_usage(usage)
+    {
+        Reset();
+    }
+
+    FileRequest::~FileRequest()
+    {
+        Reset();
+    }
+
+    void FileRequest::CreateRequestLink(FileRequestPtr&& request)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'RequestLink', but another task was already assigned.");
+        m_parent = request->m_request.m_parent;
+        request->m_request.m_parent = this;
+        m_dependencies++;
+        m_command.emplace<ExternalRequestData>(AZStd::move(request));
+    }
+
+    void FileRequest::CreateRequestPathStore(FileRequest* parent, RequestPath path)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'CreateRequestPathStore', but another task was already assigned.");
+        m_command.emplace<RequestPathStoreData>(AZStd::move(path));
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::CreateReadRequest(RequestPath path, void* output, u64 outputSize, u64 offset, u64 size,
+        AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'ReadRequest', but another task was already assigned.");
+        m_command.emplace<ReadRequestData>(AZStd::move(path), output, outputSize, offset, size, deadline, priority);
+    }
+
+    void FileRequest::CreateReadRequest(RequestPath path, IStreamerTypes::RequestMemoryAllocator* allocator, u64 offset, u64 size,
+        AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'ReadRequest', but another task was already assigned.");
+        m_command.emplace<ReadRequestData>(AZStd::move(path), allocator, offset, size, deadline, priority);
+    }
+
+    void FileRequest::CreateRead(FileRequest* parent, void* output, u64 outputSize, const RequestPath& path,
+        u64 offset, u64 size, bool sharedRead)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Read', but another task was already assigned.");
+        m_command.emplace<ReadData>(output, outputSize, AZStd::move(path), offset, size, sharedRead);
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::CreateCompressedRead(FileRequest* parent, const CompressionInfo& compressionInfo,
+        void* output, u64 readOffset, u64 readSize)
+    {
+        CreateCompressedRead(parent, CompressionInfo(compressionInfo), output, readOffset, readSize);
+    }
+
+    void FileRequest::CreateCompressedRead(FileRequest* parent, CompressionInfo&& compressionInfo,
+        void* output, u64 readOffset, u64 readSize)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'CompressedRead', but another task was already assigned.");
+        m_command.emplace<CompressedReadData>(AZStd::move(compressionInfo), output, readOffset, readSize);
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::CreateWait(FileRequest* parent)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Wait', but another task was already assigned.");
+        m_command.emplace<WaitData>();
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::CreateFileExistsCheck(const RequestPath& path)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'FileExistsCheck', but another task was already assigned.");
+        m_command.emplace<FileExistsCheckData>(path);
+    }
+
+    void FileRequest::CreateFileMetaDataRetrieval(const RequestPath& path)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'FileMetaDataRetrieval', but another task was already assigned.");
+        m_command.emplace<FileMetaDataRetrievalData>(path);
+    }
+
+    void FileRequest::CreateCancel(FileRequestPtr target)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Cancel', but another task was already assigned.");
+        m_command.emplace<CancelData>(AZStd::move(target));
+    }
+
+    void FileRequest::CreateReschedule(FileRequestPtr target, AZStd::chrono::system_clock::time_point newDeadline,
+        IStreamerTypes::Priority newPriority)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Reschedule', but another task was already assigned.");
+        m_command.emplace<RescheduleData>(AZStd::move(target), newDeadline, newPriority);
+    }
+
+    void FileRequest::CreateFlush(RequestPath path)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Flush', but another task was already assigned.");
+        m_command.emplace<FlushData>(AZStd::move(path));
+    }
+
+    void FileRequest::CreateFlushAll()
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'FlushAll', but another task was already assigned.");
+        m_command.emplace<FlushAllData>();
+    }
+
+    void FileRequest::CreateDedicatedCacheCreation(RequestPath path, const FileRange& range, FileRequest* parent)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'CreateDedicateCache', but another task was already assigned.");
+        m_command.emplace<CreateDedicatedCacheData>(AZStd::move(path), range);
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::CreateDedicatedCacheDestruction(RequestPath path, const FileRange& range, FileRequest* parent)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'DestroyDedicateCache', but another task was already assigned.");
+        m_command.emplace<DestroyDedicatedCacheData>(AZStd::move(path), range);
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::CreateReport(ReportData::ReportType reportType)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Report', but another task was already assigned.");
+        m_command.emplace<ReportData>(reportType);
+    }
+
+    void FileRequest::CreateCustom(AZStd::any data, bool failWhenUnhandled, FileRequest* parent)
+    {
+        AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
+            "Attempting to set FileRequest to 'Custom', but another task was already assigned.");
+        m_command.emplace<CustomData>(AZStd::move(data), failWhenUnhandled);
+        SetOptionalParent(parent);
+    }
+
+    void FileRequest::SetCompletionCallback(OnCompletionCallback callback)
+    {
+        m_onCompletion = AZStd::move(callback);
+    }
+
+    FileRequest::CommandVariant& FileRequest::GetCommand()
+    {
+        return m_command;
+    }
+
+    const FileRequest::CommandVariant& FileRequest::GetCommand() const
+    {
+        return m_command;
+    }
+
+    IStreamerTypes::RequestStatus FileRequest::GetStatus() const
+    {
+        return m_status;
+    }
+
+    void FileRequest::SetStatus(IStreamerTypes::RequestStatus newStatus)
+    {
+        IStreamerTypes::RequestStatus currentStatus = m_status;
+        switch (newStatus)
         {
-            Reset();
-        }
-        
-        FileRequest::~FileRequest()
-        {
-            Reset();
-        }
-
-        void FileRequest::CreateRequestLink(FileRequestPtr&& request)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'RequestLink', but another task was already assigned.");
-            m_parent = request->m_request.m_parent;
-            request->m_request.m_parent = this;
-            m_dependencies++;
-            m_command.emplace<ExternalRequestData>(AZStd::move(request));
-        }
-
-        void FileRequest::CreateRequestPathStore(FileRequest* parent, RequestPath path)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'CreateRequestPathStore', but another task was already assigned.");
-            m_command.emplace<RequestPathStoreData>(AZStd::move(path));
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::CreateReadRequest(RequestPath path, void* output, u64 outputSize, u64 offset, u64 size,
-            AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'ReadRequest', but another task was already assigned.");
-            m_command.emplace<ReadRequestData>(AZStd::move(path), output, outputSize, offset, size, deadline, priority);
-        }
-
-        void FileRequest::CreateReadRequest(RequestPath path, IStreamerTypes::RequestMemoryAllocator* allocator, u64 offset, u64 size,
-            AZStd::chrono::system_clock::time_point deadline, IStreamerTypes::Priority priority)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'ReadRequest', but another task was already assigned.");
-            m_command.emplace<ReadRequestData>(AZStd::move(path), allocator, offset, size, deadline, priority);
-        }
-
-        void FileRequest::CreateRead(FileRequest* parent, void* output, u64 outputSize, const RequestPath& path,
-            u64 offset, u64 size, bool sharedRead)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Read', but another task was already assigned.");
-            m_command.emplace<ReadData>(output, outputSize, AZStd::move(path), offset, size, sharedRead);
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::CreateCompressedRead(FileRequest* parent, const CompressionInfo& compressionInfo,
-            void* output, u64 readOffset, u64 readSize)
-        {
-            CreateCompressedRead(parent, CompressionInfo(compressionInfo), output, readOffset, readSize);
-        }
-
-        void FileRequest::CreateCompressedRead(FileRequest* parent, CompressionInfo&& compressionInfo,
-            void* output, u64 readOffset, u64 readSize)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'CompressedRead', but another task was already assigned.");
-            m_command.emplace<CompressedReadData>(AZStd::move(compressionInfo), output, readOffset, readSize);
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::CreateWait(FileRequest* parent)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Wait', but another task was already assigned.");
-            m_command.emplace<WaitData>();
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::CreateFileExistsCheck(const RequestPath& path)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'FileExistsCheck', but another task was already assigned.");
-            m_command.emplace<FileExistsCheckData>(path);
-        }
-
-        void FileRequest::CreateFileMetaDataRetrieval(const RequestPath& path)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'FileMetaDataRetrieval', but another task was already assigned.");
-            m_command.emplace<FileMetaDataRetrievalData>(path);
-        }
-
-        void FileRequest::CreateCancel(FileRequestPtr target)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Cancel', but another task was already assigned.");
-            m_command.emplace<CancelData>(AZStd::move(target));
-        }
-
-        void FileRequest::CreateReschedule(FileRequestPtr target, AZStd::chrono::system_clock::time_point newDeadline,
-            IStreamerTypes::Priority newPriority)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Reschedule', but another task was already assigned.");
-            m_command.emplace<RescheduleData>(AZStd::move(target), newDeadline, newPriority);
-        }
-
-        void FileRequest::CreateFlush(RequestPath path)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Flush', but another task was already assigned.");
-            m_command.emplace<FlushData>(AZStd::move(path));
-        }
-
-        void FileRequest::CreateFlushAll()
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'FlushAll', but another task was already assigned.");
-            m_command.emplace<FlushAllData>();
-        }
-
-        void FileRequest::CreateDedicatedCacheCreation(RequestPath path, const FileRange& range, FileRequest* parent)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'CreateDedicateCache', but another task was already assigned.");
-            m_command.emplace<CreateDedicatedCacheData>(AZStd::move(path), range);
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::CreateDedicatedCacheDestruction(RequestPath path, const FileRange& range, FileRequest* parent)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'DestroyDedicateCache', but another task was already assigned.");
-            m_command.emplace<DestroyDedicatedCacheData>(AZStd::move(path), range);
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::CreateReport(ReportData::ReportType reportType)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Report', but another task was already assigned.");
-            m_command.emplace<ReportData>(reportType);
-        }
-
-        void FileRequest::CreateCustom(AZStd::any data, bool failWhenUnhandled, FileRequest* parent)
-        {
-            AZ_Assert(AZStd::holds_alternative<AZStd::monostate>(m_command),
-                "Attempting to set FileRequest to 'Custom', but another task was already assigned.");
-            m_command.emplace<CustomData>(AZStd::move(data), failWhenUnhandled);
-            SetOptionalParent(parent);
-        }
-
-        void FileRequest::SetCompletionCallback(OnCompletionCallback callback)
-        {
-            m_onCompletion = AZStd::move(callback);
-        }
-
-        FileRequest::CommandVariant& FileRequest::GetCommand()
-        {
-            return m_command;
-        }
-
-        const FileRequest::CommandVariant& FileRequest::GetCommand() const
-        {
-            return m_command;
-        }
-
-        IStreamerTypes::RequestStatus FileRequest::GetStatus() const
-        {
-            return m_status;
-        }
-
-        void FileRequest::SetStatus(IStreamerTypes::RequestStatus newStatus)
-        {
-            IStreamerTypes::RequestStatus currentStatus = m_status;
-            switch (newStatus)
+        case IStreamerTypes::RequestStatus::Pending:
+            [[fallthrough]];
+        case IStreamerTypes::RequestStatus::Queued:
+            [[fallthrough]];
+        case IStreamerTypes::RequestStatus::Processing:
+            if (currentStatus == IStreamerTypes::RequestStatus::Failed ||
+                currentStatus == IStreamerTypes::RequestStatus::Canceled ||
+                currentStatus == IStreamerTypes::RequestStatus::Completed)
             {
-            case IStreamerTypes::RequestStatus::Pending:
-                [[fallthrough]];
-            case IStreamerTypes::RequestStatus::Queued:
-                [[fallthrough]];
-            case IStreamerTypes::RequestStatus::Processing:
-                if (currentStatus == IStreamerTypes::RequestStatus::Failed ||
-                    currentStatus == IStreamerTypes::RequestStatus::Canceled ||
-                    currentStatus == IStreamerTypes::RequestStatus::Completed)
-                {
-                    return;
-                }
-                break;
-            case IStreamerTypes::RequestStatus::Completed:
-                if (currentStatus == IStreamerTypes::RequestStatus::Failed || currentStatus == IStreamerTypes::RequestStatus::Canceled)
-                {
-                    return;
-                }
-                break;
-            case IStreamerTypes::RequestStatus::Canceled:
-                if (currentStatus == IStreamerTypes::RequestStatus::Failed || currentStatus == IStreamerTypes::RequestStatus::Completed)
-                {
-                    return;
-                }
-                break;
-            case IStreamerTypes::RequestStatus::Failed:
-                [[fallthrough]];
-            default:
-                break;
+                return;
             }
-            m_status = newStatus;
-        }
-
-        FileRequest* FileRequest::GetParent()
-        {
-            return m_parent;
-        }
-
-        const FileRequest* FileRequest::GetParent() const
-        {
-            return m_parent;
-        }
-
-        size_t FileRequest::GetNumDependencies() const
-        {
-            return m_dependencies;
-        }
-
-        bool FileRequest::FailsWhenUnhandled() const
-        {
-            return AZStd::visit([](auto&& args)
+            break;
+        case IStreamerTypes::RequestStatus::Completed:
+            if (currentStatus == IStreamerTypes::RequestStatus::Failed || currentStatus == IStreamerTypes::RequestStatus::Canceled)
             {
-                using Command = AZStd::decay_t<decltype(args)>;
-                if constexpr (AZStd::is_same_v<Command, AZStd::monostate>)
-                {
-                    AZ_Assert(false,
-                        "Request does not contain a valid command. It may have been reset already or was never assigned a command.");
-                    return true;
-                }
-                else if constexpr (AZStd::is_same_v<Command, FileRequest::CustomData>)
-                {
-                    return args.m_failWhenUnhandled;
-                }
-                else
-                {
-                    return Command::s_failWhenUnhandled;
-                }
-            }, m_command);
-        }
-
-        void FileRequest::Reset()
-        {
-            m_command = AZStd::monostate{};
-            m_onCompletion = &OnCompletionPlaceholder;
-            m_estimatedCompletion = AZStd::chrono::system_clock::time_point();
-            m_parent = nullptr;
-            m_status = IStreamerTypes::RequestStatus::Pending;
-            m_dependencies = 0;
-        }
-
-        void FileRequest::SetOptionalParent(FileRequest* parent)
-        {
-            if (parent)
-            {
-                m_parent = parent;
-                AZ_Assert(parent->m_dependencies < std::numeric_limits<decltype(parent->m_dependencies)>::max(),
-                    "A file request dependency was added, but the parent can't have any more dependencies.");
-                ++parent->m_dependencies;
+                return;
             }
-        }
-
-        bool FileRequest::WorksOn(FileRequestPtr& request) const
-        {
-            const FileRequest* current = this;
-            while (current)
+            break;
+        case IStreamerTypes::RequestStatus::Canceled:
+            if (currentStatus == IStreamerTypes::RequestStatus::Failed || currentStatus == IStreamerTypes::RequestStatus::Completed)
             {
-                auto* link = AZStd::get_if<ExternalRequestData>(&current->m_command);
-                if (!link)
-                {
-                    current = current->m_parent;
-                }
-                else
-                {
-                    return link->m_request == request;
-                }
+                return;
             }
-            return false;
+            break;
+        case IStreamerTypes::RequestStatus::Failed:
+            [[fallthrough]];
+        default:
+            break;
         }
+        m_status = newStatus;
+    }
 
-        size_t FileRequest::GetPendingId() const
-        {
-            return m_pendingId;
-        }
+    FileRequest* FileRequest::GetParent()
+    {
+        return m_parent;
+    }
 
-        void FileRequest::SetEstimatedCompletion(AZStd::chrono::system_clock::time_point time)
+    const FileRequest* FileRequest::GetParent() const
+    {
+        return m_parent;
+    }
+
+    size_t FileRequest::GetNumDependencies() const
+    {
+        return m_dependencies;
+    }
+
+    bool FileRequest::FailsWhenUnhandled() const
+    {
+        return AZStd::visit([](auto&& args)
         {
-            FileRequest* current = this;
-            do
+            using Command = AZStd::decay_t<decltype(args)>;
+            if constexpr (AZStd::is_same_v<Command, AZStd::monostate>)
+            {
+                AZ_Assert(false,
+                    "Request does not contain a valid command. It may have been reset already or was never assigned a command.");
+                return true;
+            }
+            else if constexpr (AZStd::is_same_v<Command, FileRequest::CustomData>)
+            {
+                return args.m_failWhenUnhandled;
+            }
+            else
+            {
+                return Command::s_failWhenUnhandled;
+            }
+        }, m_command);
+    }
+
+    void FileRequest::Reset()
+    {
+        m_command = AZStd::monostate{};
+        m_onCompletion = &OnCompletionPlaceholder;
+        m_estimatedCompletion = AZStd::chrono::system_clock::time_point();
+        m_parent = nullptr;
+        m_status = IStreamerTypes::RequestStatus::Pending;
+        m_dependencies = 0;
+    }
+
+    void FileRequest::SetOptionalParent(FileRequest* parent)
+    {
+        if (parent)
+        {
+            m_parent = parent;
+            AZ_Assert(parent->m_dependencies < std::numeric_limits<decltype(parent->m_dependencies)>::max(),
+                "A file request dependency was added, but the parent can't have any more dependencies.");
+            ++parent->m_dependencies;
+        }
+    }
+
+    bool FileRequest::WorksOn(FileRequestPtr& request) const
+    {
+        const FileRequest* current = this;
+        while (current)
+        {
+            auto* link = AZStd::get_if<ExternalRequestData>(&current->m_command);
+            if (!link)
             {
-                current->m_estimatedCompletion = time;
                 current = current->m_parent;
-            } while (current);
-        }
-
-        AZStd::chrono::system_clock::time_point FileRequest::GetEstimatedCompletion() const
-        {
-            return m_estimatedCompletion;
-        }
-
-        //
-        // ExternalFileRequest
-        //
-
-        ExternalFileRequest::ExternalFileRequest(StreamerContext* owner)
-            : m_request(FileRequest::Usage::External)
-            , m_owner(owner)
-        {
-        }
-
-        void ExternalFileRequest::add_ref()
-        {
-            m_refCount++;
-        }
-
-        void ExternalFileRequest::release()
-        {
-            if (--m_refCount == 0)
+            }
+            else
             {
-                AZ_Assert(m_owner, "No owning context set for the file request.");
-                m_owner->RecycleRequest(this);
+                return link->m_request == request;
             }
         }
+        return false;
+    }
 
-        bool operator==(const FileRequestHandle& lhs, const FileRequestPtr& rhs)
-        {
-            return lhs.m_request == &rhs->m_request;
-        }
+    size_t FileRequest::GetPendingId() const
+    {
+        return m_pendingId;
+    }
 
-        bool operator==(const FileRequestPtr& lhs, const FileRequestHandle& rhs)
+    void FileRequest::SetEstimatedCompletion(AZStd::chrono::system_clock::time_point time)
+    {
+        FileRequest* current = this;
+        do
         {
-            return rhs == lhs;
-        }
+            current->m_estimatedCompletion = time;
+            current = current->m_parent;
+        } while (current);
+    }
 
-        bool operator!=(const FileRequestHandle& lhs, const FileRequestPtr& rhs)
-        {
-            return !(lhs == rhs);
-        }
+    AZStd::chrono::system_clock::time_point FileRequest::GetEstimatedCompletion() const
+    {
+        return m_estimatedCompletion;
+    }
 
-        bool operator!=(const FileRequestPtr& lhs, const FileRequestHandle& rhs)
+    //
+    // ExternalFileRequest
+    //
+
+    ExternalFileRequest::ExternalFileRequest(StreamerContext* owner)
+        : m_request(FileRequest::Usage::External)
+        , m_owner(owner)
+    {
+    }
+
+    void ExternalFileRequest::add_ref()
+    {
+        m_refCount++;
+    }
+
+    void ExternalFileRequest::release()
+    {
+        if (--m_refCount == 0)
         {
-            return !(rhs == lhs);
+            AZ_Assert(m_owner, "No owning context set for the file request.");
+            m_owner->RecycleRequest(this);
         }
-    } // namespace IO
-} // namespace AZ
+    }
+
+    bool operator==(const FileRequestHandle& lhs, const FileRequestPtr& rhs)
+    {
+        return lhs.m_request == &rhs->m_request;
+    }
+
+    bool operator==(const FileRequestPtr& lhs, const FileRequestHandle& rhs)
+    {
+        return rhs == lhs;
+    }
+
+    bool operator!=(const FileRequestHandle& lhs, const FileRequestPtr& rhs)
+    {
+        return !(lhs == rhs);
+    }
+
+    bool operator!=(const FileRequestPtr& lhs, const FileRequestHandle& rhs)
+    {
+        return !(rhs == lhs);
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp
index 6427571f10..723a5d62c8 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.cpp
@@ -21,719 +21,717 @@
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/std/typetraits/decay.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    AZStd::shared_ptr<StreamStackEntry> FullFileDecompressorConfig::AddStreamStackEntry(
+        const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
     {
-        AZStd::shared_ptr<StreamStackEntry> FullFileDecompressorConfig::AddStreamStackEntry(
-            const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
-        {
-            auto stackEntry = AZStd::make_shared<FullFileDecompressor>(
-                m_maxNumReads, m_maxNumJobs, aznumeric_caster(hardware.m_maxPhysicalSectorSize));
-            stackEntry->SetNext(AZStd::move(parent));
-            return stackEntry;
-        }
+        auto stackEntry = AZStd::make_shared<FullFileDecompressor>(
+            m_maxNumReads, m_maxNumJobs, aznumeric_caster(hardware.m_maxPhysicalSectorSize));
+        stackEntry->SetNext(AZStd::move(parent));
+        return stackEntry;
+    }
 
-        void FullFileDecompressorConfig::Reflect(AZ::ReflectContext* context)
+    void FullFileDecompressorConfig::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
         {
-            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
-            {
-                serializeContext->Class<FullFileDecompressorConfig, IStreamerStackConfig>()
-                    ->Version(1)
-                    ->Field("MaxNumReads", &FullFileDecompressorConfig::m_maxNumReads)
-                    ->Field("MaxNumJobs", &FullFileDecompressorConfig::m_maxNumJobs);
-            }
+            serializeContext->Class<FullFileDecompressorConfig, IStreamerStackConfig>()
+                ->Version(1)
+                ->Field("MaxNumReads", &FullFileDecompressorConfig::m_maxNumReads)
+                ->Field("MaxNumJobs", &FullFileDecompressorConfig::m_maxNumJobs);
         }
+    }
 
 #if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
-        static constexpr char DecompBoundName[] = "Decompression bound";
-        static constexpr char ReadBoundName[] = "Read bound";
+    static constexpr char DecompBoundName[] = "Decompression bound";
+    static constexpr char ReadBoundName[] = "Read bound";
 #endif // AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
 
-        bool FullFileDecompressor::DecompressionInformation::IsProcessing() const
+    bool FullFileDecompressor::DecompressionInformation::IsProcessing() const
+    {
+        return !!m_compressedData;
+    }
+
+    FullFileDecompressor::FullFileDecompressor(u32 maxNumReads, u32 maxNumJobs, u32 alignment)
+        : StreamStackEntry("Full file decompressor")
+        , m_maxNumReads(maxNumReads)
+        , m_maxNumJobs(maxNumJobs)
+        , m_alignment(alignment)
+    {
+        JobManagerDesc jobDesc;
+            jobDesc.m_jobManagerName = "Full File Decompressor";
+        u32 numThreads = AZ::GetMin(maxNumJobs, AZStd::thread::hardware_concurrency());
+        for (u32 i = 0; i < numThreads; ++i)
         {
-            return !!m_compressedData;
+            jobDesc.m_workerThreads.push_back(JobManagerThreadDesc());
         }
-        
-        FullFileDecompressor::FullFileDecompressor(u32 maxNumReads, u32 maxNumJobs, u32 alignment)
-            : StreamStackEntry("Full file decompressor")
-            , m_maxNumReads(maxNumReads)
-            , m_maxNumJobs(maxNumJobs)
-            , m_alignment(alignment)
+        m_decompressionJobManager = AZStd::make_unique<JobManager>(jobDesc);
+        m_decompressionjobContext = AZStd::make_unique<JobContext>(*m_decompressionJobManager);
+
+        m_processingJobs = AZStd::make_unique<DecompressionInformation[]>(maxNumJobs);
+
+        m_readBuffers = AZStd::make_unique<Buffer[]>(maxNumReads);
+        m_readRequests = AZStd::make_unique<FileRequest*[]>(maxNumReads);
+        m_readBufferStatus = AZStd::make_unique<ReadBufferStatus[]>(maxNumReads);
+        for (u32 i = 0; i < maxNumReads; ++i)
         {
-            JobManagerDesc jobDesc;
-            u32 numThreads = AZ::GetMin(maxNumJobs, AZStd::thread::hardware_concurrency());
-            for (u32 i = 0; i < numThreads; ++i)
-            {
-                jobDesc.m_workerThreads.push_back(JobManagerThreadDesc());
-            }
-            m_decompressionJobManager = AZStd::make_unique<JobManager>(jobDesc);
-            m_decompressionjobContext = AZStd::make_unique<JobContext>(*m_decompressionJobManager);
-
-            m_processingJobs = AZStd::make_unique<DecompressionInformation[]>(maxNumJobs);
-
-            m_readBuffers = AZStd::make_unique<Buffer[]>(maxNumReads);
-            m_readRequests = AZStd::make_unique<FileRequest*[]>(maxNumReads);
-            m_readBufferStatus = AZStd::make_unique<ReadBufferStatus[]>(maxNumReads);
-            for (u32 i = 0; i < maxNumReads; ++i)
-            {
-                m_readBufferStatus[i] = ReadBufferStatus::Unused;
-            }
-
-            // Add initial dummy values to the stats to avoid division by zero later on and avoid needing branches.
-            m_bytesDecompressed.PushEntry(1);
-            m_decompressionDurationMicroSec.PushEntry(1);
+            m_readBufferStatus[i] = ReadBufferStatus::Unused;
         }
 
-        void FullFileDecompressor::PrepareRequest(FileRequest* request)
-        {
-            AZ_Assert(request, "PrepareRequest was provided a null request.");
+        // Add initial dummy values to the stats to avoid division by zero later on and avoid needing branches.
+        m_bytesDecompressed.PushEntry(1);
+        m_decompressionDurationMicroSec.PushEntry(1);
+    }
 
-            AZStd::visit([this, request](auto&& args)
+    void FullFileDecompressor::PrepareRequest(FileRequest* request)
+    {
+        AZ_Assert(request, "PrepareRequest was provided a null request.");
+
+        AZStd::visit([this, request](auto&& args)
+        {
+            using Command = AZStd::decay_t<decltype(args)>;
+            if constexpr (AZStd::is_same_v<Command, FileRequest::ReadRequestData>)
             {
-                using Command = AZStd::decay_t<decltype(args)>;
-                if constexpr (AZStd::is_same_v<Command, FileRequest::ReadRequestData>)
-                {
-                    PrepareReadRequest(request, args);
-                }
-                else if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData> ||
-                    AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
-                {
-                    PrepareDedicatedCache(request, args.m_path);
-                }
-                else
-                {
-                    StreamStackEntry::PrepareRequest(request);
-                }
-            }, request->GetCommand());
+                PrepareReadRequest(request, args);
+            }
+            else if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData> ||
+                AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
+            {
+                PrepareDedicatedCache(request, args.m_path);
+            }
+            else
+            {
+                StreamStackEntry::PrepareRequest(request);
+            }
+        }, request->GetCommand());
+    }
+
+    void FullFileDecompressor::QueueRequest(FileRequest* request)
+    {
+        AZ_Assert(request, "QueueRequest was provided a null request.");
+
+        AZStd::visit([this, request](auto&& args)
+        {
+            using Command = AZStd::decay_t<decltype(args)>;
+            if constexpr (AZStd::is_same_v<Command, FileRequest::CompressedReadData>)
+            {
+                m_pendingReads.push_back(request);
+            }
+            else if constexpr (AZStd::is_same_v<Command, FileRequest::FileExistsCheckData>)
+            {
+                m_pendingFileExistChecks.push_back(request);
+            }
+            else
+            {
+                StreamStackEntry::QueueRequest(request);
+            }
+        }, request->GetCommand());
+    }
+
+    bool FullFileDecompressor::ExecuteRequests()
+    {
+        bool result = false;
+        // First queue jobs as this might open up new read slots.
+        if (m_numInFlightReads > 0 && m_numRunningJobs < m_maxNumJobs)
+        {
+            result = StartDecompressions();
         }
 
-        void FullFileDecompressor::QueueRequest(FileRequest* request)
+        // Queue as many new reads as possible.
+        while (!m_pendingReads.empty() && m_numInFlightReads < m_maxNumReads)
         {
-            AZ_Assert(request, "QueueRequest was provided a null request.");
-
-            AZStd::visit([this, request](auto&& args)
-            {
-                using Command = AZStd::decay_t<decltype(args)>;
-                if constexpr (AZStd::is_same_v<Command, FileRequest::CompressedReadData>)
-                {
-                    m_pendingReads.push_back(request);
-                }
-                else if constexpr (AZStd::is_same_v<Command, FileRequest::FileExistsCheckData>)
-                {
-                    m_pendingFileExistChecks.push_back(request);
-                }
-                else
-                {
-                    StreamStackEntry::QueueRequest(request);
-                }
-            }, request->GetCommand());
+            StartArchiveRead(m_pendingReads.front());
+            m_pendingReads.pop_front();
+            result = true;
         }
 
-        bool FullFileDecompressor::ExecuteRequests()
+        // If nothing else happened and there is at least one pending file exist check request, run one of those.
+        if (!result && !m_pendingFileExistChecks.empty())
         {
-            bool result = false;
-            // First queue jobs as this might open up new read slots.
-            if (m_numInFlightReads > 0 && m_numRunningJobs < m_maxNumJobs)
-            {
-                result = StartDecompressions();
-            }
-
-            // Queue as many new reads as possible.
-            while (!m_pendingReads.empty() && m_numInFlightReads < m_maxNumReads)
-            {
-                StartArchiveRead(m_pendingReads.front());
-                m_pendingReads.pop_front();
-                result = true;
-            }
-
-            // If nothing else happened and there is at least one pending file exist check request, run one of those.
-            if (!result && !m_pendingFileExistChecks.empty())
-            {
-                FileExistsCheck(m_pendingFileExistChecks.front());
-                m_pendingFileExistChecks.pop_front();
-                result = true;
-            }
+            FileExistsCheck(m_pendingFileExistChecks.front());
+            m_pendingFileExistChecks.pop_front();
+            result = true;
+        }
 
 #if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
-            bool allPendingDecompression = true;
-            bool allReading = true;
-            for (u32 i = 0; i < m_maxNumReads; ++i)
-            {
-                allPendingDecompression =
-                    allPendingDecompression && (m_readBufferStatus[i] == ReadBufferStatus::PendingDecompression);
-                allReading =
-                    allReading && (m_readBufferStatus[i] == ReadBufferStatus::ReadInFlight);
-            }
+        bool allPendingDecompression = true;
+        bool allReading = true;
+        for (u32 i = 0; i < m_maxNumReads; ++i)
+        {
+            allPendingDecompression =
+                allPendingDecompression && (m_readBufferStatus[i] == ReadBufferStatus::PendingDecompression);
+            allReading =
+                allReading && (m_readBufferStatus[i] == ReadBufferStatus::ReadInFlight);
+        }
 
-            m_decompressionBoundStat.PushSample(allPendingDecompression ? 1.0 : 0.0);
-            Statistic::PlotImmediate(m_name, DecompBoundName, m_decompressionBoundStat.GetMostRecentSample());
+        m_decompressionBoundStat.PushSample(allPendingDecompression ? 1.0 : 0.0);
+        Statistic::PlotImmediate(m_name, DecompBoundName, m_decompressionBoundStat.GetMostRecentSample());
 
-            m_readBoundStat.PushSample(allReading && (m_numRunningJobs < m_maxNumJobs) ? 1.0 : 0.0);
-            Statistic::PlotImmediate(m_name, ReadBoundName, m_readBoundStat.GetMostRecentSample());
+        m_readBoundStat.PushSample(allReading && (m_numRunningJobs < m_maxNumJobs) ? 1.0 : 0.0);
+        Statistic::PlotImmediate(m_name, ReadBoundName, m_readBoundStat.GetMostRecentSample());
 #endif
 
-            return StreamStackEntry::ExecuteRequests() || result;
-        }
+        return StreamStackEntry::ExecuteRequests() || result;
+    }
 
-        void FullFileDecompressor::UpdateStatus(Status& status) const
+    void FullFileDecompressor::UpdateStatus(Status& status) const
+    {
+        StreamStackEntry::UpdateStatus(status);
+        s32 numAvailableSlots = aznumeric_cast<s32>(m_maxNumReads - m_numInFlightReads);
+        status.m_numAvailableSlots = AZStd::min(status.m_numAvailableSlots, numAvailableSlots);
+        status.m_isIdle = status.m_isIdle && IsIdle();
+    }
+
+    void FullFileDecompressor::UpdateCompletionEstimates(AZStd::chrono::system_clock::time_point now, AZStd::vector<FileRequest*>& internalPending,
+        StreamerContext::PreparedQueue::iterator pendingBegin, StreamerContext::PreparedQueue::iterator pendingEnd)
+    {
+        // Create predictions for all pending requests. Some will be further processed after this.
+        AZStd::reverse_copy(m_pendingFileExistChecks.begin(), m_pendingFileExistChecks.end(), AZStd::back_inserter(internalPending));
+        AZStd::reverse_copy(m_pendingReads.begin(), m_pendingReads.end(), AZStd::back_inserter(internalPending));
+
+        StreamStackEntry::UpdateCompletionEstimates(now, internalPending, pendingBegin, pendingEnd);
+
+        double totalBytesDecompressed = aznumeric_caster(m_bytesDecompressed.GetTotal());
+        double totalDecompressionDuration = aznumeric_caster(m_decompressionDurationMicroSec.GetTotal());
+        AZStd::chrono::microseconds cumulativeDelay = AZStd::chrono::microseconds::max();
+
+        // Check the number of jobs that are processing.
+        for (u32 i = 0; i < m_maxNumJobs; ++i)
         {
-            StreamStackEntry::UpdateStatus(status);
-            s32 numAvailableSlots = aznumeric_cast<s32>(m_maxNumReads - m_numInFlightReads);
-            status.m_numAvailableSlots = AZStd::min(status.m_numAvailableSlots, numAvailableSlots);
-            status.m_isIdle = status.m_isIdle && IsIdle();    
-        }
-
-        void FullFileDecompressor::UpdateCompletionEstimates(AZStd::chrono::system_clock::time_point now, AZStd::vector<FileRequest*>& internalPending,
-            StreamerContext::PreparedQueue::iterator pendingBegin, StreamerContext::PreparedQueue::iterator pendingEnd)
-        {
-            // Create predictions for all pending requests. Some will be further processed after this.
-            AZStd::reverse_copy(m_pendingFileExistChecks.begin(), m_pendingFileExistChecks.end(), AZStd::back_inserter(internalPending));
-            AZStd::reverse_copy(m_pendingReads.begin(), m_pendingReads.end(), AZStd::back_inserter(internalPending));
-
-            StreamStackEntry::UpdateCompletionEstimates(now, internalPending, pendingBegin, pendingEnd);
-
-            double totalBytesDecompressed = aznumeric_caster(m_bytesDecompressed.GetTotal());
-            double totalDecompressionDuration = aznumeric_caster(m_decompressionDurationMicroSec.GetTotal());
-            AZStd::chrono::microseconds cumulativeDelay = AZStd::chrono::microseconds::max();
-
-            // Check the number of jobs that are processing.
-            for (u32 i = 0; i < m_maxNumJobs; ++i)
+            if (m_processingJobs[i].IsProcessing())
             {
-                if (m_processingJobs[i].IsProcessing())
-                {
-                    FileRequest* compressedRequest = m_processingJobs[i].m_waitRequest->GetParent();
-                    AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
-                    auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-                    AZ_Assert(data, "Compressed request in the decompression queue in FullFileDecompressor didn't contain compression read data.");
-
-                    size_t bytesToDecompress = data->m_compressionInfo.m_compressedSize;
-                    auto decompressionDuration = AZStd::chrono::microseconds(
-                        aznumeric_cast<u64>((bytesToDecompress * totalDecompressionDuration) / totalBytesDecompressed));
-                    auto timeInProcessing = now - m_processingJobs[i].m_jobStartTime;
-                    auto timeLeft = decompressionDuration > timeInProcessing ? decompressionDuration - timeInProcessing : AZStd::chrono::microseconds(0);
-                    // Get the shortest time as this indicates the next decompression to become available.
-                    cumulativeDelay = AZStd::min(timeLeft, cumulativeDelay);
-                    m_processingJobs[i].m_waitRequest->SetEstimatedCompletion(now + timeLeft);
-                }
-            }
-            if (cumulativeDelay == AZStd::chrono::microseconds::max())
-            {
-                cumulativeDelay = AZStd::chrono::microseconds(0);
-            }
-
-            // Next update all reads that are in flight. These will have an estimation for the read to complete, but will then be queued
-            // for decompression, so add the time needed decompression. Assume that decompression happens in parallel.
-            AZStd::chrono::microseconds decompressionDelay =
-                AZStd::chrono::microseconds(aznumeric_cast<u64>(m_decompressionJobDelayMicroSec.CalculateAverage()));
-            AZStd::chrono::microseconds smallestDecompressionDuration = AZStd::chrono::microseconds::max();
-            for (u32 i = 0; i < m_maxNumReads; ++i)
-            {
-                AZStd::chrono::system_clock::time_point baseTime;
-                switch (m_readBufferStatus[i])
-                {
-                case ReadBufferStatus::Unused:
-                    continue;
-                case ReadBufferStatus::ReadInFlight:
-                    // Internal read requests can start and complete but pending finalization before they're ever scheduled in which case
-                    // the estimated time is not set.
-                    baseTime = m_readRequests[i]->GetEstimatedCompletion();
-                    if (baseTime == AZStd::chrono::system_clock::time_point())
-                    {
-                        baseTime = now;
-                    }
-                    break;
-                case ReadBufferStatus::PendingDecompression:
-                    baseTime = now;
-                    break;
-                default:
-                    AZ_Assert(false, "Unsupported buffer type: %i.", m_readBufferStatus[i]);
-                    continue;
-                }
-
-                baseTime += cumulativeDelay; // Delay until the first decompression slot becomes available.
-                baseTime += decompressionDelay; // The average time it takes for the job system to pick up the decompression job.
-                
-                // Calculate the amount of time it will take to decompress the data.
-                FileRequest* compressedRequest = m_readRequests[i]->GetParent();
+                FileRequest* compressedRequest = m_processingJobs[i].m_waitRequest->GetParent();
+                AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
                 auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-                
+                AZ_Assert(data, "Compressed request in the decompression queue in FullFileDecompressor didn't contain compression read data.");
+
                 size_t bytesToDecompress = data->m_compressionInfo.m_compressedSize;
                 auto decompressionDuration = AZStd::chrono::microseconds(
                     aznumeric_cast<u64>((bytesToDecompress * totalDecompressionDuration) / totalBytesDecompressed));
-                smallestDecompressionDuration = AZStd::min(smallestDecompressionDuration, decompressionDuration);
-                baseTime += decompressionDuration;
-                
-                m_readRequests[i]->SetEstimatedCompletion(baseTime);
-            }
-            if (smallestDecompressionDuration != AZStd::chrono::microseconds::max())
-            {
-                cumulativeDelay += smallestDecompressionDuration; // Time after which the decompression jobs and pending reads have completed.
-            }
-
-            // For all internally pending compressed reads add the decompression time. The read time will have already been added downstream.
-            // Because this call will go from the top of the stack to the bottom, but estimation is calculated from the bottom to the top, this
-            // list should be processed in reverse order.
-            for (auto pendingIt = internalPending.rbegin(); pendingIt != internalPending.rend(); ++pendingIt)
-            {
-                EstimateCompressedReadRequest(*pendingIt, cumulativeDelay, decompressionDelay,
-                    totalDecompressionDuration, totalBytesDecompressed);
-            }
-
-            // Finally add a prediction for all the requests that are waiting to be queued.
-            for (auto requestIt = pendingBegin; requestIt != pendingEnd; ++requestIt)
-            {
-                EstimateCompressedReadRequest(*requestIt, cumulativeDelay, decompressionDelay,
-                    totalDecompressionDuration, totalBytesDecompressed);
+                auto timeInProcessing = now - m_processingJobs[i].m_jobStartTime;
+                auto timeLeft = decompressionDuration > timeInProcessing ? decompressionDuration - timeInProcessing : AZStd::chrono::microseconds(0);
+                // Get the shortest time as this indicates the next decompression to become available.
+                cumulativeDelay = AZStd::min(timeLeft, cumulativeDelay);
+                m_processingJobs[i].m_waitRequest->SetEstimatedCompletion(now + timeLeft);
             }
         }
-
-        void FullFileDecompressor::EstimateCompressedReadRequest(FileRequest* request, AZStd::chrono::microseconds& cumulativeDelay,
-            AZStd::chrono::microseconds decompressionDelay, double totalDecompressionDurationUs, double totalBytesDecompressed) const
+        if (cumulativeDelay == AZStd::chrono::microseconds::max())
         {
-            auto data = AZStd::get_if<FileRequest::CompressedReadData>(&request->GetCommand());
-            if (data)
-            {
-                AZStd::chrono::microseconds processingTime = decompressionDelay;
-                size_t bytesToDecompress = data->m_compressionInfo.m_compressedSize;
-                processingTime += AZStd::chrono::microseconds(
-                    aznumeric_cast<u64>((bytesToDecompress * totalDecompressionDurationUs) / totalBytesDecompressed));
-                
-                cumulativeDelay += processingTime;
-                request->SetEstimatedCompletion(request->GetEstimatedCompletion() + processingTime);
-            }
+            cumulativeDelay = AZStd::chrono::microseconds(0);
         }
 
-        void FullFileDecompressor::CollectStatistics(AZStd::vector<Statistic>& statistics) const
+        // Next update all reads that are in flight. These will have an estimation for the read to complete, but will then be queued
+        // for decompression, so add the time needed decompression. Assume that decompression happens in parallel.
+        AZStd::chrono::microseconds decompressionDelay =
+            AZStd::chrono::microseconds(aznumeric_cast<u64>(m_decompressionJobDelayMicroSec.CalculateAverage()));
+        AZStd::chrono::microseconds smallestDecompressionDuration = AZStd::chrono::microseconds::max();
+        for (u32 i = 0; i < m_maxNumReads; ++i)
         {
-            constexpr double bytesToMB = 1.0 / (1024.0 * 1024.0);
-            constexpr double usToSec = 1.0 / (1000.0 * 1000.0);
-            constexpr double usToMs = 1.0 / 1000.0;
-
-            if (m_bytesDecompressed.GetNumRecorded() > 1) // There's always a default added.
+            AZStd::chrono::system_clock::time_point baseTime;
+            switch (m_readBufferStatus[i])
             {
-                //It only makes sense to add decompression statistics when reading from PAK files.
-                statistics.push_back(Statistic::CreateInteger(m_name, "Available decompression slots", m_maxNumJobs - m_numRunningJobs));
-                statistics.push_back(Statistic::CreateInteger(m_name, "Available read slots", m_maxNumReads - m_numInFlightReads));
-                statistics.push_back(Statistic::CreateInteger(m_name, "Pending decompression", m_numPendingDecompression));
-                statistics.push_back(Statistic::CreateFloat(m_name, "Buffer memory (MB)", m_memoryUsage * bytesToMB));
+            case ReadBufferStatus::Unused:
+                continue;
+            case ReadBufferStatus::ReadInFlight:
+                // Internal read requests can start and complete but pending finalization before they're ever scheduled in which case
+                // the estimated time is not set.
+                baseTime = m_readRequests[i]->GetEstimatedCompletion();
+                if (baseTime == AZStd::chrono::system_clock::time_point())
+                {
+                    baseTime = now;
+                }
+                break;
+            case ReadBufferStatus::PendingDecompression:
+                baseTime = now;
+                break;
+            default:
+                AZ_Assert(false, "Unsupported buffer type: %i.", m_readBufferStatus[i]);
+                continue;
+            }
 
-                double averageJobStartDelay = m_decompressionJobDelayMicroSec.CalculateAverage() * usToMs;
-                statistics.push_back(Statistic::CreateFloat(m_name, "Decompression job delay (avg. ms)", averageJobStartDelay));
+            baseTime += cumulativeDelay; // Delay until the first decompression slot becomes available.
+            baseTime += decompressionDelay; // The average time it takes for the job system to pick up the decompression job.
 
-                double totalBytesDecompressedMB = m_bytesDecompressed.GetTotal() * bytesToMB;
-                double totalDecompressionTimeSec = m_decompressionDurationMicroSec.GetTotal() * usToSec;
-                statistics.push_back(Statistic::CreateFloat(m_name, "Decompression Speed per job (avg. mbps)", totalBytesDecompressedMB / totalDecompressionTimeSec));
+            // Calculate the amount of time it will take to decompress the data.
+            FileRequest* compressedRequest = m_readRequests[i]->GetParent();
+            auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
+
+            size_t bytesToDecompress = data->m_compressionInfo.m_compressedSize;
+            auto decompressionDuration = AZStd::chrono::microseconds(
+                aznumeric_cast<u64>((bytesToDecompress * totalDecompressionDuration) / totalBytesDecompressed));
+            smallestDecompressionDuration = AZStd::min(smallestDecompressionDuration, decompressionDuration);
+            baseTime += decompressionDuration;
+
+            m_readRequests[i]->SetEstimatedCompletion(baseTime);
+        }
+        if (smallestDecompressionDuration != AZStd::chrono::microseconds::max())
+        {
+            cumulativeDelay += smallestDecompressionDuration; // Time after which the decompression jobs and pending reads have completed.
+        }
+
+        // For all internally pending compressed reads add the decompression time. The read time will have already been added downstream.
+        // Because this call will go from the top of the stack to the bottom, but estimation is calculated from the bottom to the top, this
+        // list should be processed in reverse order.
+        for (auto pendingIt = internalPending.rbegin(); pendingIt != internalPending.rend(); ++pendingIt)
+        {
+            EstimateCompressedReadRequest(*pendingIt, cumulativeDelay, decompressionDelay,
+                totalDecompressionDuration, totalBytesDecompressed);
+        }
+
+        // Finally add a prediction for all the requests that are waiting to be queued.
+        for (auto requestIt = pendingBegin; requestIt != pendingEnd; ++requestIt)
+        {
+            EstimateCompressedReadRequest(*requestIt, cumulativeDelay, decompressionDelay,
+                totalDecompressionDuration, totalBytesDecompressed);
+        }
+    }
+
+    void FullFileDecompressor::EstimateCompressedReadRequest(FileRequest* request, AZStd::chrono::microseconds& cumulativeDelay,
+        AZStd::chrono::microseconds decompressionDelay, double totalDecompressionDurationUs, double totalBytesDecompressed) const
+    {
+        auto data = AZStd::get_if<FileRequest::CompressedReadData>(&request->GetCommand());
+        if (data)
+        {
+            AZStd::chrono::microseconds processingTime = decompressionDelay;
+            size_t bytesToDecompress = data->m_compressionInfo.m_compressedSize;
+            processingTime += AZStd::chrono::microseconds(
+                aznumeric_cast<u64>((bytesToDecompress * totalDecompressionDurationUs) / totalBytesDecompressed));
+
+            cumulativeDelay += processingTime;
+            request->SetEstimatedCompletion(request->GetEstimatedCompletion() + processingTime);
+        }
+    }
+
+    void FullFileDecompressor::CollectStatistics(AZStd::vector<Statistic>& statistics) const
+    {
+        constexpr double bytesToMB = 1.0 / (1024.0 * 1024.0);
+        constexpr double usToSec = 1.0 / (1000.0 * 1000.0);
+        constexpr double usToMs = 1.0 / 1000.0;
+
+        if (m_bytesDecompressed.GetNumRecorded() > 1) // There's always a default added.
+        {
+            //It only makes sense to add decompression statistics when reading from PAK files.
+            statistics.push_back(Statistic::CreateInteger(m_name, "Available decompression slots", m_maxNumJobs - m_numRunningJobs));
+            statistics.push_back(Statistic::CreateInteger(m_name, "Available read slots", m_maxNumReads - m_numInFlightReads));
+            statistics.push_back(Statistic::CreateInteger(m_name, "Pending decompression", m_numPendingDecompression));
+            statistics.push_back(Statistic::CreateFloat(m_name, "Buffer memory (MB)", m_memoryUsage * bytesToMB));
+
+            double averageJobStartDelay = m_decompressionJobDelayMicroSec.CalculateAverage() * usToMs;
+            statistics.push_back(Statistic::CreateFloat(m_name, "Decompression job delay (avg. ms)", averageJobStartDelay));
+
+            double totalBytesDecompressedMB = m_bytesDecompressed.GetTotal() * bytesToMB;
+            double totalDecompressionTimeSec = m_decompressionDurationMicroSec.GetTotal() * usToSec;
+            statistics.push_back(Statistic::CreateFloat(m_name, "Decompression Speed per job (avg. mbps)", totalBytesDecompressedMB / totalDecompressionTimeSec));
 
 #if AZ_STREAMER_ADD_EXTRA_PROFILING_INFO
-                statistics.push_back(Statistic::CreatePercentage(m_name, DecompBoundName, m_decompressionBoundStat.GetAverage()));
-                statistics.push_back(Statistic::CreatePercentage(m_name, ReadBoundName, m_readBoundStat.GetAverage()));
+            statistics.push_back(Statistic::CreatePercentage(m_name, DecompBoundName, m_decompressionBoundStat.GetAverage()));
+            statistics.push_back(Statistic::CreatePercentage(m_name, ReadBoundName, m_readBoundStat.GetAverage()));
 #endif
-            }
-
-            StreamStackEntry::CollectStatistics(statistics);
         }
 
-        bool FullFileDecompressor::IsIdle() const
-        {
-            return
-                m_pendingReads.empty() &&
-                m_pendingFileExistChecks.empty() &&
-                m_numInFlightReads == 0 &&
-                m_numPendingDecompression == 0 &&
-                m_numRunningJobs == 0;
-        }
+        StreamStackEntry::CollectStatistics(statistics);
+    }
 
-        void FullFileDecompressor::PrepareReadRequest(FileRequest* request, FileRequest::ReadRequestData& data)
+    bool FullFileDecompressor::IsIdle() const
+    {
+        return
+            m_pendingReads.empty() &&
+            m_pendingFileExistChecks.empty() &&
+            m_numInFlightReads == 0 &&
+            m_numPendingDecompression == 0 &&
+            m_numRunningJobs == 0;
+    }
+
+    void FullFileDecompressor::PrepareReadRequest(FileRequest* request, FileRequest::ReadRequestData& data)
+    {
+        CompressionInfo info;
+        if (CompressionUtils::FindCompressionInfo(info, data.m_path.GetRelativePath()))
         {
-            CompressionInfo info;
-            if (CompressionUtils::FindCompressionInfo(info, data.m_path.GetRelativePath()))
+            FileRequest* nextRequest = m_context->GetNewInternalRequest();
+            if (info.m_isCompressed)
             {
-                FileRequest* nextRequest = m_context->GetNewInternalRequest();
-                if (info.m_isCompressed)
-                {
-                    AZ_Assert(info.m_decompressor,
-                        "FullFileDecompressor::PrepareRequest found a compressed file, but no decompressor to decompress with.");
-                    nextRequest->CreateCompressedRead(request, AZStd::move(info), data.m_output, data.m_offset, data.m_size);
-                }
-                else
-                {
-                    FileRequest* pathStorageRequest = m_context->GetNewInternalRequest();
-                    pathStorageRequest->CreateRequestPathStore(request, AZStd::move(info.m_archiveFilename));
-                    auto& pathStorage = AZStd::get<FileRequest::RequestPathStoreData>(pathStorageRequest->GetCommand());
-
-                    nextRequest->CreateRead(pathStorageRequest, data.m_output, data.m_outputSize, pathStorage.m_path,
-                        info.m_offset + data.m_offset, data.m_size, info.m_isSharedPak);
-                }
-
-                if (info.m_conflictResolution == ConflictResolution::PreferFile)
-                {
-                    auto callback = [this, nextRequest](const FileRequest& checkRequest)
-                    {
-                        AZ_PROFILE_FUNCTION(AzCore);
-                        auto check = AZStd::get_if<FileRequest::FileExistsCheckData>(&checkRequest.GetCommand());
-                        AZ_Assert(check,
-                            "Callback in FullFileDecompressor::PrepareReadRequest expected FileExistsCheck but got another command.");
-                        if (check->m_found)
-                        {
-                            FileRequest* originalRequest = m_context->RejectRequest(nextRequest);
-                            if (AZStd::holds_alternative<FileRequest::RequestPathStoreData>(originalRequest->GetCommand()))
-                            {
-                                originalRequest = m_context->RejectRequest(originalRequest);
-                            }
-                            StreamStackEntry::PrepareRequest(originalRequest);
-                        }
-                        else
-                        {
-                            m_context->PushPreparedRequest(nextRequest);
-                        }
-                    };
-                    FileRequest* fileCheckRequest = m_context->GetNewInternalRequest();
-                    fileCheckRequest->CreateFileExistsCheck(data.m_path);
-                    fileCheckRequest->SetCompletionCallback(AZStd::move(callback));
-                    StreamStackEntry::QueueRequest(fileCheckRequest);
-                }
-                else
-                {
-                    m_context->PushPreparedRequest(nextRequest);
-                }
+                AZ_Assert(info.m_decompressor,
+                    "FullFileDecompressor::PrepareRequest found a compressed file, but no decompressor to decompress with.");
+                nextRequest->CreateCompressedRead(request, AZStd::move(info), data.m_output, data.m_offset, data.m_size);
             }
             else
             {
-                StreamStackEntry::PrepareRequest(request);
-            }
-        }
+                FileRequest* pathStorageRequest = m_context->GetNewInternalRequest();
+                pathStorageRequest->CreateRequestPathStore(request, AZStd::move(info.m_archiveFilename));
+                auto& pathStorage = AZStd::get<FileRequest::RequestPathStoreData>(pathStorageRequest->GetCommand());
 
-        void FullFileDecompressor::PrepareDedicatedCache(FileRequest* request, const RequestPath& path)
-        {
-            CompressionInfo info;
-            if (CompressionUtils::FindCompressionInfo(info, path.GetRelativePath()))
+                nextRequest->CreateRead(pathStorageRequest, data.m_output, data.m_outputSize, pathStorage.m_path,
+                    info.m_offset + data.m_offset, data.m_size, info.m_isSharedPak);
+            }
+
+            if (info.m_conflictResolution == ConflictResolution::PreferFile)
             {
-                FileRequest* nextRequest = m_context->GetNewInternalRequest();
-                AZStd::visit([request, &info, nextRequest](auto&& args)
+                auto callback = [this, nextRequest](const FileRequest& checkRequest)
                 {
-                    using Command = AZStd::decay_t<decltype(args)>;
-                    if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData>)
+                    AZ_PROFILE_FUNCTION(AzCore);
+                    auto check = AZStd::get_if<FileRequest::FileExistsCheckData>(&checkRequest.GetCommand());
+                    AZ_Assert(check,
+                        "Callback in FullFileDecompressor::PrepareReadRequest expected FileExistsCheck but got another command.");
+                    if (check->m_found)
                     {
-                        nextRequest->CreateDedicatedCacheCreation(AZStd::move(info.m_archiveFilename),
-                            FileRange::CreateRange(info.m_offset, info.m_compressedSize), request);
-                    }
-                    else if constexpr (AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
-                    {
-                        nextRequest->CreateDedicatedCacheDestruction(AZStd::move(info.m_archiveFilename),
-                            FileRange::CreateRange(info.m_offset, info.m_compressedSize), request);
-                    }
-                }, request->GetCommand());
-                
-                if (info.m_conflictResolution == ConflictResolution::PreferFile)
-                {
-                    auto callback = [this, nextRequest](const FileRequest& checkRequest)
-                    {
-                        AZ_PROFILE_FUNCTION(AzCore);
-                        auto check = AZStd::get_if<FileRequest::FileExistsCheckData>(&checkRequest.GetCommand());
-                        AZ_Assert(check,
-                            "Callback in FullFileDecompressor::PrepareDedicatedCache expected FileExistsCheck but got another command.");
-                        if (check->m_found)
+                        FileRequest* originalRequest = m_context->RejectRequest(nextRequest);
+                        if (AZStd::holds_alternative<FileRequest::RequestPathStoreData>(originalRequest->GetCommand()))
                         {
-                            FileRequest* originalRequest = nextRequest->GetParent();
-                            m_context->RejectRequest(nextRequest);
-                            StreamStackEntry::PrepareRequest(originalRequest);
+                            originalRequest = m_context->RejectRequest(originalRequest);
                         }
-                        else
-                        {
-                            m_context->PushPreparedRequest(nextRequest);
-                        }
-                    };
-                    FileRequest* fileCheckRequest = m_context->GetNewInternalRequest();
-                    fileCheckRequest->CreateFileExistsCheck(path);
-                    fileCheckRequest->SetCompletionCallback(AZStd::move(callback));
-                    StreamStackEntry::QueueRequest(fileCheckRequest);
-                }
-                else
-                {
-                    m_context->PushPreparedRequest(nextRequest);
-                }
-            }
-            else
-            {
-                StreamStackEntry::PrepareRequest(request);
-            }
-        }
-
-        void FullFileDecompressor::FileExistsCheck(FileRequest* checkRequest)
-        {
-            auto& fileCheckRequest = AZStd::get<FileRequest::FileExistsCheckData>(checkRequest->GetCommand());
-            CompressionInfo info;
-            if (CompressionUtils::FindCompressionInfo(info, fileCheckRequest.m_path.GetRelativePath()))
-            {
-                fileCheckRequest.m_found = true;
-            }
-            else
-            {
-                // The file isn't in the archive but might still exist as a loose file, so let the next node have a shot.
-                StreamStackEntry::QueueRequest(checkRequest);
-            }
-        }
-
-        void FullFileDecompressor::StartArchiveRead(FileRequest* compressedReadRequest)
-        {
-            if (!m_next)
-            {
-                compressedReadRequest->SetStatus(IStreamerTypes::RequestStatus::Failed);
-                m_context->MarkRequestAsCompleted(compressedReadRequest);
-                return;
-            }
-
-            for (u32 i = 0; i < m_maxNumReads; ++i)
-            {
-                if (m_readBufferStatus[i] == ReadBufferStatus::Unused)
-                {
-                    auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedReadRequest->GetCommand());
-                    AZ_Assert(data, "Compressed request that's starting a read in FullFileDecompressor didn't contain compression read data.");
-                    AZ_Assert(data->m_compressionInfo.m_decompressor,
-                        "FileRequest for FullFileDecompressor is missing a decompression callback.");
-
-                    CompressionInfo& info = data->m_compressionInfo;
-                    AZ_Assert(info.m_decompressor, "FullFileDecompressor is planning to a queue a request for reading but couldn't find a decompressor.");
-
-                    // The buffer is aligned down but the offset is not corrected. If the offset was adjusted it would mean the same data is read
-                    // multiple times and negates the block cache's ability to detect these cases. By still adjusting it means that the reads between
-                    // the BlockCache's prolog and epilog are read into aligned buffers.
-                    size_t offsetAdjustment = info.m_offset - AZ_SIZE_ALIGN_DOWN(info.m_offset, aznumeric_cast<size_t>(m_alignment));
-                    size_t bufferSize = AZ_SIZE_ALIGN_UP((info.m_compressedSize + offsetAdjustment), aznumeric_cast<size_t>(m_alignment));
-                    m_readBuffers[i] = reinterpret_cast<Buffer>(AZ::AllocatorInstance<AZ::SystemAllocator>::Get().Allocate(
-                        bufferSize, m_alignment, 0, "AZ::IO::Streamer FullFileDecompressor", __FILE__, __LINE__));
-                    m_memoryUsage += bufferSize;
-
-                    FileRequest* archiveReadRequest = m_context->GetNewInternalRequest();
-                    archiveReadRequest->CreateRead(compressedReadRequest, m_readBuffers[i] + offsetAdjustment, bufferSize, info.m_archiveFilename,
-                        info.m_offset, info.m_compressedSize, info.m_isSharedPak);
-                    archiveReadRequest->SetCompletionCallback(
-                        [this, readSlot = i](FileRequest& request)
-                        {
-                            AZ_PROFILE_FUNCTION(AzCore);
-                            FinishArchiveRead(&request, readSlot);
-                        });
-                    m_next->QueueRequest(archiveReadRequest);
-                    
-                    m_readRequests[i] = archiveReadRequest;
-                    m_readBufferStatus[i] = ReadBufferStatus::ReadInFlight;
-
-                    AZ_Assert(m_numInFlightReads < m_maxNumReads,
-                        "A FileRequest was queued for reading in FullFileDecompressor, but there's no slots available.");
-                    m_numInFlightReads++;
-
-                    return;
-                }
-            }
-            AZ_Assert(false, "%u of %u read slots are use in the FullFileDecompressor, but no empty slot was found.", m_numInFlightReads, m_maxNumReads);
-        }
-
-        void FullFileDecompressor::FinishArchiveRead(FileRequest* readRequest, u32 readSlot)
-        {
-            AZ_Assert(m_readRequests[readSlot] == readRequest,
-                "Request in the archive read slot isn't the same as request that's being completed.");
-
-            FileRequest* compressedRequest = readRequest->GetParent();
-            AZ_Assert(compressedRequest, "Read requests started by FullFileDecompressor is missing a parent request.");
-            
-            if (readRequest->GetStatus() == IStreamerTypes::RequestStatus::Completed)
-            {
-                m_readBufferStatus[readSlot] = ReadBufferStatus::PendingDecompression;
-                ++m_numPendingDecompression;
-
-                // Add this wait so the compressed request isn't fully completed yet as only the read part is done. The
-                // job thread will finish this wait, which in turn will trigger this function again on the main streaming thread.
-                FileRequest* waitRequest = m_context->GetNewInternalRequest();
-                waitRequest->CreateWait(compressedRequest);
-                m_readRequests[readSlot] = waitRequest;
-            }
-            else
-            {
-                auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-                AZ_Assert(data, "Compressed request in FullFileDecompressor that finished unsuccessfully didn't contain compression read data.");
-                CompressionInfo& info = data->m_compressionInfo;
-                size_t offsetAdjustment = info.m_offset - AZ_SIZE_ALIGN_DOWN(info.m_offset, aznumeric_cast<size_t>(m_alignment));
-                size_t bufferSize = AZ_SIZE_ALIGN_UP((info.m_compressedSize + offsetAdjustment), aznumeric_cast<size_t>(m_alignment));
-                m_memoryUsage -= bufferSize;
-
-                if (m_readBuffers[readSlot] != nullptr)
-                {
-                    AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(m_readBuffers[readSlot], bufferSize, m_alignment);
-                    m_readBuffers[readSlot] = nullptr;
-                }
-                m_readRequests[readSlot] = nullptr;
-                m_readBufferStatus[readSlot] = ReadBufferStatus::Unused;
-                AZ_Assert(m_numInFlightReads > 0,
-                    "Trying to decrement a read request after it was canceled or failed in FullFileDecompressor, "
-                    "but no read requests are supposed to be queued.");
-                m_numInFlightReads--;
-            }
-        }
-
-        bool FullFileDecompressor::StartDecompressions()
-        {
-            bool queuedJobs = false;
-            u32 jobSlot = 0;
-            for (u32 readSlot = 0; readSlot < m_maxNumReads; ++readSlot)
-            {
-                // Find completed read.
-                if (m_readBufferStatus[readSlot] != ReadBufferStatus::PendingDecompression)
-                {
-                    continue;
-                }
-
-                // Find decompression slot
-                for (; jobSlot < m_maxNumJobs; ++jobSlot)
-                {
-                    if (m_processingJobs[jobSlot].IsProcessing())
-                    {
-                        continue;
-                    }
-                    
-                    FileRequest* waitRequest = m_readRequests[readSlot];
-                    AZ_Assert(AZStd::holds_alternative<FileRequest::WaitData>(waitRequest->GetCommand()),
-                        "File request waiting for decompression wasn't marked as being a wait operation.");
-                    FileRequest* compressedRequest = waitRequest->GetParent();
-                    AZ_Assert(compressedRequest, "Read requests started by FullFileDecompressor is missing a parent request.");
-
-                    waitRequest->SetCompletionCallback([this, jobSlot](FileRequest& request)
-                        {
-                            AZ_PROFILE_FUNCTION(AzCore);
-                            FinishDecompression(&request, jobSlot);
-                        });
-
-                    DecompressionInformation& info = m_processingJobs[jobSlot];
-                    info.m_waitRequest = waitRequest;
-                    info.m_queueStartTime = AZStd::chrono::high_resolution_clock::now();
-                    info.m_jobStartTime = info.m_queueStartTime; // Set these to the same in case the scheduler requests an update before the job has started.
-                    info.m_compressedData = m_readBuffers[readSlot]; // Transfer ownership of the pointer.
-                    m_readBuffers[readSlot] = nullptr;
-
-                    AZ::Job* decompressionJob;
-                    auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-                    AZ_Assert(data, "Compressed request in FullFileDecompressor that's starting decompression didn't contain compression read data.");
-                    AZ_Assert(data->m_compressionInfo.m_decompressor, "FullFileDecompressor is queuing a decompression job but couldn't find a decompressor.");
-
-                    info.m_alignmentOffset = aznumeric_caster(data->m_compressionInfo.m_offset -
-                        AZ_SIZE_ALIGN_DOWN(data->m_compressionInfo.m_offset, aznumeric_cast<size_t>(m_alignment)));
-
-                    if (data->m_readOffset == 0 && data->m_readSize == data->m_compressionInfo.m_uncompressedSize)
-                    {
-                        auto job = [this, &info]()
-                        {
-                            FullDecompression(m_context, info);
-                        };
-                        decompressionJob = AZ::CreateJobFunction(job, true, m_decompressionjobContext.get());
+                        StreamStackEntry::PrepareRequest(originalRequest);
                     }
                     else
                     {
-                        m_memoryUsage += data->m_compressionInfo.m_uncompressedSize;
-                        auto job = [this, &info]()
-                        {
-                            PartialDecompression(m_context, info);
-                        };
-                        decompressionJob = AZ::CreateJobFunction(job, true, m_decompressionjobContext.get());
+                        m_context->PushPreparedRequest(nextRequest);
                     }
-                    --m_numPendingDecompression;
-                    ++m_numRunningJobs;
-                    decompressionJob->Start();
-
-                    m_readRequests[readSlot] = nullptr;
-                    m_readBufferStatus[readSlot] = ReadBufferStatus::Unused;
-                    AZ_Assert(m_numInFlightReads > 0, "Trying to decrement a read request after it's queued for decompression in FullFileDecompressor, but no read requests are supposed to be queued.");
-                    m_numInFlightReads--;
-
-                    queuedJobs = true;
-                    break;
-                }
-
-                if (m_numInFlightReads == 0 || m_numRunningJobs == m_maxNumJobs)
-                {
-                    return queuedJobs;
-                }
+                };
+                FileRequest* fileCheckRequest = m_context->GetNewInternalRequest();
+                fileCheckRequest->CreateFileExistsCheck(data.m_path);
+                fileCheckRequest->SetCompletionCallback(AZStd::move(callback));
+                StreamStackEntry::QueueRequest(fileCheckRequest);
             }
-            return queuedJobs;
+            else
+            {
+                m_context->PushPreparedRequest(nextRequest);
+            }
+        }
+        else
+        {
+            StreamStackEntry::PrepareRequest(request);
+        }
+    }
+
+    void FullFileDecompressor::PrepareDedicatedCache(FileRequest* request, const RequestPath& path)
+    {
+        CompressionInfo info;
+        if (CompressionUtils::FindCompressionInfo(info, path.GetRelativePath()))
+        {
+            FileRequest* nextRequest = m_context->GetNewInternalRequest();
+            AZStd::visit([request, &info, nextRequest](auto&& args)
+            {
+                using Command = AZStd::decay_t<decltype(args)>;
+                if constexpr (AZStd::is_same_v<Command, FileRequest::CreateDedicatedCacheData>)
+                {
+                    nextRequest->CreateDedicatedCacheCreation(AZStd::move(info.m_archiveFilename),
+                        FileRange::CreateRange(info.m_offset, info.m_compressedSize), request);
+                }
+                else if constexpr (AZStd::is_same_v<Command, FileRequest::DestroyDedicatedCacheData>)
+                {
+                    nextRequest->CreateDedicatedCacheDestruction(AZStd::move(info.m_archiveFilename),
+                        FileRange::CreateRange(info.m_offset, info.m_compressedSize), request);
+                }
+            }, request->GetCommand());
+
+            if (info.m_conflictResolution == ConflictResolution::PreferFile)
+            {
+                auto callback = [this, nextRequest](const FileRequest& checkRequest)
+                {
+                    AZ_PROFILE_FUNCTION(AzCore);
+                    auto check = AZStd::get_if<FileRequest::FileExistsCheckData>(&checkRequest.GetCommand());
+                    AZ_Assert(check,
+                        "Callback in FullFileDecompressor::PrepareDedicatedCache expected FileExistsCheck but got another command.");
+                    if (check->m_found)
+                    {
+                        FileRequest* originalRequest = nextRequest->GetParent();
+                        m_context->RejectRequest(nextRequest);
+                        StreamStackEntry::PrepareRequest(originalRequest);
+                    }
+                    else
+                    {
+                        m_context->PushPreparedRequest(nextRequest);
+                    }
+                };
+                FileRequest* fileCheckRequest = m_context->GetNewInternalRequest();
+                fileCheckRequest->CreateFileExistsCheck(path);
+                fileCheckRequest->SetCompletionCallback(AZStd::move(callback));
+                StreamStackEntry::QueueRequest(fileCheckRequest);
+            }
+            else
+            {
+                m_context->PushPreparedRequest(nextRequest);
+            }
+        }
+        else
+        {
+            StreamStackEntry::PrepareRequest(request);
+        }
+    }
+
+    void FullFileDecompressor::FileExistsCheck(FileRequest* checkRequest)
+    {
+        auto& fileCheckRequest = AZStd::get<FileRequest::FileExistsCheckData>(checkRequest->GetCommand());
+        CompressionInfo info;
+        if (CompressionUtils::FindCompressionInfo(info, fileCheckRequest.m_path.GetRelativePath()))
+        {
+            fileCheckRequest.m_found = true;
+        }
+        else
+        {
+            // The file isn't in the archive but might still exist as a loose file, so let the next node have a shot.
+            StreamStackEntry::QueueRequest(checkRequest);
+        }
+    }
+
+    void FullFileDecompressor::StartArchiveRead(FileRequest* compressedReadRequest)
+    {
+        if (!m_next)
+        {
+            compressedReadRequest->SetStatus(IStreamerTypes::RequestStatus::Failed);
+            m_context->MarkRequestAsCompleted(compressedReadRequest);
+            return;
         }
 
-        void FullFileDecompressor::FinishDecompression([[maybe_unused]] FileRequest* waitRequest, u32 jobSlot)
+        for (u32 i = 0; i < m_maxNumReads; ++i)
         {
-            DecompressionInformation& jobInfo = m_processingJobs[jobSlot];
-            AZ_Assert(jobInfo.m_waitRequest == waitRequest, "Job slot didn't contain the expected wait request.");
+            if (m_readBufferStatus[i] == ReadBufferStatus::Unused)
+            {
+                auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedReadRequest->GetCommand());
+                AZ_Assert(data, "Compressed request that's starting a read in FullFileDecompressor didn't contain compression read data.");
+                AZ_Assert(data->m_compressionInfo.m_decompressor,
+                    "FileRequest for FullFileDecompressor is missing a decompression callback.");
 
-            auto endTime = AZStd::chrono::high_resolution_clock::now();
+                CompressionInfo& info = data->m_compressionInfo;
+                AZ_Assert(info.m_decompressor, "FullFileDecompressor is planning to a queue a request for reading but couldn't find a decompressor.");
 
-            FileRequest* compressedRequest = jobInfo.m_waitRequest->GetParent();
-            AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
+                // The buffer is aligned down but the offset is not corrected. If the offset was adjusted it would mean the same data is read
+                // multiple times and negates the block cache's ability to detect these cases. By still adjusting it means that the reads between
+                // the BlockCache's prolog and epilog are read into aligned buffers.
+                size_t offsetAdjustment = info.m_offset - AZ_SIZE_ALIGN_DOWN(info.m_offset, aznumeric_cast<size_t>(m_alignment));
+                size_t bufferSize = AZ_SIZE_ALIGN_UP((info.m_compressedSize + offsetAdjustment), aznumeric_cast<size_t>(m_alignment));
+                m_readBuffers[i] = reinterpret_cast<Buffer>(AZ::AllocatorInstance<AZ::SystemAllocator>::Get().Allocate(
+                    bufferSize, m_alignment, 0, "AZ::IO::Streamer FullFileDecompressor", __FILE__, __LINE__));
+                m_memoryUsage += bufferSize;
+
+                FileRequest* archiveReadRequest = m_context->GetNewInternalRequest();
+                archiveReadRequest->CreateRead(compressedReadRequest, m_readBuffers[i] + offsetAdjustment, bufferSize, info.m_archiveFilename,
+                    info.m_offset, info.m_compressedSize, info.m_isSharedPak);
+                archiveReadRequest->SetCompletionCallback(
+                    [this, readSlot = i](FileRequest& request)
+                    {
+                        AZ_PROFILE_FUNCTION(AzCore);
+                        FinishArchiveRead(&request, readSlot);
+                    });
+                m_next->QueueRequest(archiveReadRequest);
+
+                m_readRequests[i] = archiveReadRequest;
+                m_readBufferStatus[i] = ReadBufferStatus::ReadInFlight;
+
+                AZ_Assert(m_numInFlightReads < m_maxNumReads,
+                    "A FileRequest was queued for reading in FullFileDecompressor, but there's no slots available.");
+                m_numInFlightReads++;
+
+                return;
+            }
+        }
+        AZ_Assert(false, "%u of %u read slots are use in the FullFileDecompressor, but no empty slot was found.", m_numInFlightReads, m_maxNumReads);
+    }
+
+    void FullFileDecompressor::FinishArchiveRead(FileRequest* readRequest, u32 readSlot)
+    {
+        AZ_Assert(m_readRequests[readSlot] == readRequest,
+            "Request in the archive read slot isn't the same as request that's being completed.");
+
+        FileRequest* compressedRequest = readRequest->GetParent();
+        AZ_Assert(compressedRequest, "Read requests started by FullFileDecompressor is missing a parent request.");
+
+        if (readRequest->GetStatus() == IStreamerTypes::RequestStatus::Completed)
+        {
+            m_readBufferStatus[readSlot] = ReadBufferStatus::PendingDecompression;
+            ++m_numPendingDecompression;
+
+            // Add this wait so the compressed request isn't fully completed yet as only the read part is done. The
+            // job thread will finish this wait, which in turn will trigger this function again on the main streaming thread.
+            FileRequest* waitRequest = m_context->GetNewInternalRequest();
+            waitRequest->CreateWait(compressedRequest);
+            m_readRequests[readSlot] = waitRequest;
+        }
+        else
+        {
             auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-            AZ_Assert(data, "Compressed request in FullFileDecompressor that completed decompression didn't contain compression read data.");
+            AZ_Assert(data, "Compressed request in FullFileDecompressor that finished unsuccessfully didn't contain compression read data.");
             CompressionInfo& info = data->m_compressionInfo;
             size_t offsetAdjustment = info.m_offset - AZ_SIZE_ALIGN_DOWN(info.m_offset, aznumeric_cast<size_t>(m_alignment));
             size_t bufferSize = AZ_SIZE_ALIGN_UP((info.m_compressedSize + offsetAdjustment), aznumeric_cast<size_t>(m_alignment));
             m_memoryUsage -= bufferSize;
-            if (data->m_readOffset != 0 || data->m_readSize != data->m_compressionInfo.m_uncompressedSize)
+
+            if (m_readBuffers[readSlot] != nullptr)
             {
-                m_memoryUsage -= data->m_compressionInfo.m_uncompressedSize;
+                AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(m_readBuffers[readSlot], bufferSize, m_alignment);
+                m_readBuffers[readSlot] = nullptr;
+            }
+            m_readRequests[readSlot] = nullptr;
+            m_readBufferStatus[readSlot] = ReadBufferStatus::Unused;
+            AZ_Assert(m_numInFlightReads > 0,
+                "Trying to decrement a read request after it was canceled or failed in FullFileDecompressor, "
+                "but no read requests are supposed to be queued.");
+            m_numInFlightReads--;
+        }
+    }
+
+    bool FullFileDecompressor::StartDecompressions()
+    {
+        bool queuedJobs = false;
+        u32 jobSlot = 0;
+        for (u32 readSlot = 0; readSlot < m_maxNumReads; ++readSlot)
+        {
+            // Find completed read.
+            if (m_readBufferStatus[readSlot] != ReadBufferStatus::PendingDecompression)
+            {
+                continue;
             }
 
-            m_decompressionJobDelayMicroSec.PushEntry(AZStd::chrono::duration_cast<AZStd::chrono::microseconds>(
-                jobInfo.m_jobStartTime - jobInfo.m_queueStartTime).count());
-            m_decompressionDurationMicroSec.PushEntry(AZStd::chrono::duration_cast<AZStd::chrono::microseconds>(
-                endTime - jobInfo.m_jobStartTime).count());
-            m_bytesDecompressed.PushEntry(data->m_compressionInfo.m_compressedSize);
+            // Find decompression slot
+            for (; jobSlot < m_maxNumJobs; ++jobSlot)
+            {
+                if (m_processingJobs[jobSlot].IsProcessing())
+                {
+                    continue;
+                }
 
-            AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(jobInfo.m_compressedData, bufferSize, m_alignment);
-            jobInfo.m_compressedData = nullptr;
-            AZ_Assert(m_numRunningJobs > 0, "About to complete a decompression job, but the internal count doesn't see a running job.");
-            --m_numRunningJobs;
-            return;
+                FileRequest* waitRequest = m_readRequests[readSlot];
+                AZ_Assert(AZStd::holds_alternative<FileRequest::WaitData>(waitRequest->GetCommand()),
+                    "File request waiting for decompression wasn't marked as being a wait operation.");
+                FileRequest* compressedRequest = waitRequest->GetParent();
+                AZ_Assert(compressedRequest, "Read requests started by FullFileDecompressor is missing a parent request.");
+
+                waitRequest->SetCompletionCallback([this, jobSlot](FileRequest& request)
+                    {
+                        AZ_PROFILE_FUNCTION(AzCore);
+                        FinishDecompression(&request, jobSlot);
+                    });
+
+                DecompressionInformation& info = m_processingJobs[jobSlot];
+                info.m_waitRequest = waitRequest;
+                info.m_queueStartTime = AZStd::chrono::high_resolution_clock::now();
+                info.m_jobStartTime = info.m_queueStartTime; // Set these to the same in case the scheduler requests an update before the job has started.
+                info.m_compressedData = m_readBuffers[readSlot]; // Transfer ownership of the pointer.
+                m_readBuffers[readSlot] = nullptr;
+
+                AZ::Job* decompressionJob;
+                auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
+                AZ_Assert(data, "Compressed request in FullFileDecompressor that's starting decompression didn't contain compression read data.");
+                AZ_Assert(data->m_compressionInfo.m_decompressor, "FullFileDecompressor is queuing a decompression job but couldn't find a decompressor.");
+
+                info.m_alignmentOffset = aznumeric_caster(data->m_compressionInfo.m_offset -
+                    AZ_SIZE_ALIGN_DOWN(data->m_compressionInfo.m_offset, aznumeric_cast<size_t>(m_alignment)));
+
+                if (data->m_readOffset == 0 && data->m_readSize == data->m_compressionInfo.m_uncompressedSize)
+                {
+                    auto job = [this, &info]()
+                    {
+                        FullDecompression(m_context, info);
+                    };
+                    decompressionJob = AZ::CreateJobFunction(job, true, m_decompressionjobContext.get());
+                }
+                else
+                {
+                    m_memoryUsage += data->m_compressionInfo.m_uncompressedSize;
+                    auto job = [this, &info]()
+                    {
+                        PartialDecompression(m_context, info);
+                    };
+                    decompressionJob = AZ::CreateJobFunction(job, true, m_decompressionjobContext.get());
+                }
+                --m_numPendingDecompression;
+                ++m_numRunningJobs;
+                decompressionJob->Start();
+
+                m_readRequests[readSlot] = nullptr;
+                m_readBufferStatus[readSlot] = ReadBufferStatus::Unused;
+                AZ_Assert(m_numInFlightReads > 0, "Trying to decrement a read request after it's queued for decompression in FullFileDecompressor, but no read requests are supposed to be queued.");
+                m_numInFlightReads--;
+
+                queuedJobs = true;
+                break;
+            }
+
+            if (m_numInFlightReads == 0 || m_numRunningJobs == m_maxNumJobs)
+            {
+                return queuedJobs;
+            }
         }
+        return queuedJobs;
+    }
 
-        void FullFileDecompressor::FullDecompression(StreamerContext* context, DecompressionInformation& info)
+    void FullFileDecompressor::FinishDecompression([[maybe_unused]] FileRequest* waitRequest, u32 jobSlot)
+    {
+        DecompressionInformation& jobInfo = m_processingJobs[jobSlot];
+        AZ_Assert(jobInfo.m_waitRequest == waitRequest, "Job slot didn't contain the expected wait request.");
+
+        auto endTime = AZStd::chrono::high_resolution_clock::now();
+
+        FileRequest* compressedRequest = jobInfo.m_waitRequest->GetParent();
+        AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
+        auto data = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
+        AZ_Assert(data, "Compressed request in FullFileDecompressor that completed decompression didn't contain compression read data.");
+        CompressionInfo& info = data->m_compressionInfo;
+        size_t offsetAdjustment = info.m_offset - AZ_SIZE_ALIGN_DOWN(info.m_offset, aznumeric_cast<size_t>(m_alignment));
+        size_t bufferSize = AZ_SIZE_ALIGN_UP((info.m_compressedSize + offsetAdjustment), aznumeric_cast<size_t>(m_alignment));
+        m_memoryUsage -= bufferSize;
+        if (data->m_readOffset != 0 || data->m_readSize != data->m_compressionInfo.m_uncompressedSize)
         {
-            info.m_jobStartTime = AZStd::chrono::high_resolution_clock::now();
-
-            FileRequest* compressedRequest = info.m_waitRequest->GetParent();
-            AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
-            auto request = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-            AZ_Assert(request, "Compressed request in FullFileDecompressor that's running full decompression didn't contain compression read data.");
-            CompressionInfo& compressionInfo = request->m_compressionInfo;
-            AZ_Assert(compressionInfo.m_decompressor, "Full decompressor job started, but there's no decompressor callback assigned.");
-
-            AZ_Assert(request->m_readOffset == 0, "FullFileDecompressor is doing a full decompression on a file request with an offset (%zu).", 
-                request->m_readOffset);
-            AZ_Assert(compressionInfo.m_uncompressedSize == request->m_readSize,
-                "FullFileDecompressor is doing a full decompression, but the target buffer size (%llu) doesn't match the decompressed size (%zu).",
-                request->m_readSize, compressionInfo.m_uncompressedSize);
-            
-            bool success = compressionInfo.m_decompressor(compressionInfo, info.m_compressedData + info.m_alignmentOffset,
-                compressionInfo.m_compressedSize, request->m_output, compressionInfo.m_uncompressedSize);
-            info.m_waitRequest->SetStatus(success ? IStreamerTypes::RequestStatus::Completed : IStreamerTypes::RequestStatus::Failed);
-            
-            context->MarkRequestAsCompleted(info.m_waitRequest);
-            context->WakeUpSchedulingThread();
+            m_memoryUsage -= data->m_compressionInfo.m_uncompressedSize;
         }
 
-        void FullFileDecompressor::PartialDecompression(StreamerContext* context, DecompressionInformation& info)
-        {
-            info.m_jobStartTime = AZStd::chrono::high_resolution_clock::now();
+        m_decompressionJobDelayMicroSec.PushEntry(AZStd::chrono::duration_cast<AZStd::chrono::microseconds>(
+            jobInfo.m_jobStartTime - jobInfo.m_queueStartTime).count());
+        m_decompressionDurationMicroSec.PushEntry(AZStd::chrono::duration_cast<AZStd::chrono::microseconds>(
+            endTime - jobInfo.m_jobStartTime).count());
+        m_bytesDecompressed.PushEntry(data->m_compressionInfo.m_compressedSize);
 
-            FileRequest* compressedRequest = info.m_waitRequest->GetParent();
-            AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
-            auto request = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
-            AZ_Assert(request, "Compressed request in FullFileDecompressor that's running partial decompression didn't contain compression read data.");
-            CompressionInfo& compressionInfo = request->m_compressionInfo;
-            AZ_Assert(compressionInfo.m_decompressor, "Partial decompressor job started, but there's no decompressor callback assigned.");
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(jobInfo.m_compressedData, bufferSize, m_alignment);
+        jobInfo.m_compressedData = nullptr;
+        AZ_Assert(m_numRunningJobs > 0, "About to complete a decompression job, but the internal count doesn't see a running job.");
+        --m_numRunningJobs;
+        return;
+    }
 
-            AZStd::unique_ptr<u8[]> decompressionBuffer = AZStd::unique_ptr<u8[]>(new u8[compressionInfo.m_uncompressedSize]);
-            bool success = compressionInfo.m_decompressor(compressionInfo, info.m_compressedData + info.m_alignmentOffset,
-                compressionInfo.m_compressedSize, decompressionBuffer.get(), compressionInfo.m_uncompressedSize);
-            info.m_waitRequest->SetStatus(success ? IStreamerTypes::RequestStatus::Completed : IStreamerTypes::RequestStatus::Failed);
-            
-            memcpy(request->m_output, decompressionBuffer.get() + request->m_readOffset, request->m_readSize);
+    void FullFileDecompressor::FullDecompression(StreamerContext* context, DecompressionInformation& info)
+    {
+        info.m_jobStartTime = AZStd::chrono::high_resolution_clock::now();
 
-            context->MarkRequestAsCompleted(info.m_waitRequest);
-            context->WakeUpSchedulingThread();
-        }
-    } // namespace IO
-} // namespace AZ
+        FileRequest* compressedRequest = info.m_waitRequest->GetParent();
+        AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
+        auto request = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
+        AZ_Assert(request, "Compressed request in FullFileDecompressor that's running full decompression didn't contain compression read data.");
+        CompressionInfo& compressionInfo = request->m_compressionInfo;
+        AZ_Assert(compressionInfo.m_decompressor, "Full decompressor job started, but there's no decompressor callback assigned.");
+
+        AZ_Assert(request->m_readOffset == 0, "FullFileDecompressor is doing a full decompression on a file request with an offset (%zu).",
+            request->m_readOffset);
+        AZ_Assert(compressionInfo.m_uncompressedSize == request->m_readSize,
+            "FullFileDecompressor is doing a full decompression, but the target buffer size (%llu) doesn't match the decompressed size (%zu).",
+            request->m_readSize, compressionInfo.m_uncompressedSize);
+
+        bool success = compressionInfo.m_decompressor(compressionInfo, info.m_compressedData + info.m_alignmentOffset,
+            compressionInfo.m_compressedSize, request->m_output, compressionInfo.m_uncompressedSize);
+        info.m_waitRequest->SetStatus(success ? IStreamerTypes::RequestStatus::Completed : IStreamerTypes::RequestStatus::Failed);
+
+        context->MarkRequestAsCompleted(info.m_waitRequest);
+        context->WakeUpSchedulingThread();
+    }
+
+    void FullFileDecompressor::PartialDecompression(StreamerContext* context, DecompressionInformation& info)
+    {
+        info.m_jobStartTime = AZStd::chrono::high_resolution_clock::now();
+
+        FileRequest* compressedRequest = info.m_waitRequest->GetParent();
+        AZ_Assert(compressedRequest, "A wait request attached to FullFileDecompressor was completed but didn't have a parent compressed request.");
+        auto request = AZStd::get_if<FileRequest::CompressedReadData>(&compressedRequest->GetCommand());
+        AZ_Assert(request, "Compressed request in FullFileDecompressor that's running partial decompression didn't contain compression read data.");
+        CompressionInfo& compressionInfo = request->m_compressionInfo;
+        AZ_Assert(compressionInfo.m_decompressor, "Partial decompressor job started, but there's no decompressor callback assigned.");
+
+        AZStd::unique_ptr<u8[]> decompressionBuffer = AZStd::unique_ptr<u8[]>(new u8[compressionInfo.m_uncompressedSize]);
+        bool success = compressionInfo.m_decompressor(compressionInfo, info.m_compressedData + info.m_alignmentOffset,
+            compressionInfo.m_compressedSize, decompressionBuffer.get(), compressionInfo.m_uncompressedSize);
+        info.m_waitRequest->SetStatus(success ? IStreamerTypes::RequestStatus::Completed : IStreamerTypes::RequestStatus::Failed);
+
+        memcpy(request->m_output, decompressionBuffer.get() + request->m_readOffset, request->m_readSize);
+
+        context->MarkRequestAsCompleted(info.m_waitRequest);
+        context->WakeUpSchedulingThread();
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp
index 00c1c63933..a952e31a93 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.cpp
@@ -14,376 +14,373 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-namespace AZ
+namespace AZ::IO
 {
-    namespace IO
+    AZStd::shared_ptr<StreamStackEntry> ReadSplitterConfig::AddStreamStackEntry(
+        const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
     {
-        AZStd::shared_ptr<StreamStackEntry> ReadSplitterConfig::AddStreamStackEntry(
-            const HardwareInformation& hardware, AZStd::shared_ptr<StreamStackEntry> parent)
+        size_t splitSize;
+        switch (m_splitSize)
         {
-            size_t splitSize;
-            switch (m_splitSize)
-            {
-            case SplitSize::MaxTransfer:
-                splitSize = hardware.m_maxTransfer;
-                break;
-            case SplitSize::MemoryAlignment:
-                splitSize = hardware.m_maxPhysicalSectorSize;
-                break;
-            default:
-                splitSize = m_splitSize;
-                break;
-            }
-
-            size_t bufferSize = m_bufferSizeMib * 1_mib;
-            if (bufferSize < splitSize)
-            {
-                AZ_Warning("Streamer", false, "The buffer size for the Read Splitter is smaller than the individual split size. "
-                    "It will be increased to fit at least one split.");
-                bufferSize = splitSize;
-            }
-
-            auto stackEntry = AZStd::make_shared<ReadSplitter>(
-                splitSize,
-                aznumeric_caster(hardware.m_maxPhysicalSectorSize),
-                aznumeric_caster(hardware.m_maxLogicalSectorSize),
-                bufferSize, m_adjustOffset, m_splitAlignedRequests);
-            stackEntry->SetNext(AZStd::move(parent));
-            return stackEntry;
+        case SplitSize::MaxTransfer:
+            splitSize = hardware.m_maxTransfer;
+            break;
+        case SplitSize::MemoryAlignment:
+            splitSize = hardware.m_maxPhysicalSectorSize;
+            break;
+        default:
+            splitSize = m_splitSize;
+            break;
         }
 
-        void ReadSplitterConfig::Reflect(AZ::ReflectContext* context)
+        size_t bufferSize = m_bufferSizeMib * 1_mib;
+        if (bufferSize < splitSize)
         {
-            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
-            {
-                serializeContext->Enum<SplitSize>()
-                    ->Version(1)
-                    ->Value("MaxTransfer", SplitSize::MaxTransfer)
-                    ->Value("MemoryAlignment", SplitSize::MemoryAlignment);
-
-                serializeContext->Class<ReadSplitterConfig, IStreamerStackConfig>()
-                    ->Version(1)
-                    ->Field("BufferSizeMib", &ReadSplitterConfig::m_bufferSizeMib)
-                    ->Field("SplitSize", &ReadSplitterConfig::m_splitSize)
-                    ->Field("AdjustOffset", &ReadSplitterConfig::m_adjustOffset)
-                    ->Field("SplitAlignedRequests", &ReadSplitterConfig::m_splitAlignedRequests);
-            }
+            AZ_Warning("Streamer", false, "The buffer size for the Read Splitter is smaller than the individual split size. "
+                "It will be increased to fit at least one split.");
+            bufferSize = splitSize;
         }
 
-        static constexpr char AvgNumSubReadsName[] = "Avg. num sub reads";
-        static constexpr char AlignedReadsName[] = "Aligned reads";
-        static constexpr char NumAvailableBufferSlotsName[] = "Num available buffer slots";
-        static constexpr char NumPendingReadsName[] = "Num pending reads";
+        auto stackEntry = AZStd::make_shared<ReadSplitter>(
+            splitSize,
+            aznumeric_caster(hardware.m_maxPhysicalSectorSize),
+            aznumeric_caster(hardware.m_maxLogicalSectorSize),
+            bufferSize, m_adjustOffset, m_splitAlignedRequests);
+        stackEntry->SetNext(AZStd::move(parent));
+        return stackEntry;
+    }
 
-        ReadSplitter::ReadSplitter(u64 maxReadSize, u32 memoryAlignment, u32 sizeAlignment, size_t bufferSize,
-            bool adjustOffset, bool splitAlignedRequests)
-            : StreamStackEntry("Read splitter")
-            , m_buffer(nullptr)
-            , m_bufferSize(bufferSize)
-            , m_maxReadSize(maxReadSize)
-            , m_memoryAlignment(memoryAlignment)
-            , m_sizeAlignment(sizeAlignment)
-            , m_adjustOffset(adjustOffset)
-            , m_splitAlignedRequests(splitAlignedRequests)
+    void ReadSplitterConfig::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
         {
-            AZ_Assert(IStreamerTypes::IsPowerOf2(memoryAlignment), "Memory alignment needs to be a power of 2");
-            AZ_Assert(IStreamerTypes::IsPowerOf2(sizeAlignment), "Size alignment needs to be a power of 2");
-            AZ_Assert(IStreamerTypes::IsAlignedTo(maxReadSize, sizeAlignment),
-                "Maximum read size isn't aligned to a multiple of the size alignment.");
+            serializeContext->Enum<SplitSize>()
+                ->Version(1)
+                ->Value("MaxTransfer", SplitSize::MaxTransfer)
+                ->Value("MemoryAlignment", SplitSize::MemoryAlignment);
 
-            size_t numBufferSlots = bufferSize / maxReadSize;
-            // Don't divide the reads up in more sub-reads than there are dependencies available.
-            numBufferSlots = AZStd::min(numBufferSlots, FileRequest::GetMaxNumDependencies());
-            m_bufferCopyInformation = AZStd::unique_ptr<BufferCopyInformation[]>(new BufferCopyInformation[numBufferSlots]);
-            m_availableBufferSlots.reserve(numBufferSlots);
-            for (u32 i = aznumeric_caster(numBufferSlots); i > 0; --i)
-            {
-                m_availableBufferSlots.push_back(i - 1);
-            }
+            serializeContext->Class<ReadSplitterConfig, IStreamerStackConfig>()
+                ->Version(1)
+                ->Field("BufferSizeMib", &ReadSplitterConfig::m_bufferSizeMib)
+                ->Field("SplitSize", &ReadSplitterConfig::m_splitSize)
+                ->Field("AdjustOffset", &ReadSplitterConfig::m_adjustOffset)
+                ->Field("SplitAlignedRequests", &ReadSplitterConfig::m_splitAlignedRequests);
+        }
+    }
+
+    static constexpr char AvgNumSubReadsName[] = "Avg. num sub reads";
+    static constexpr char AlignedReadsName[] = "Aligned reads";
+    static constexpr char NumAvailableBufferSlotsName[] = "Num available buffer slots";
+    static constexpr char NumPendingReadsName[] = "Num pending reads";
+
+    ReadSplitter::ReadSplitter(u64 maxReadSize, u32 memoryAlignment, u32 sizeAlignment, size_t bufferSize,
+        bool adjustOffset, bool splitAlignedRequests)
+        : StreamStackEntry("Read splitter")
+        , m_buffer(nullptr)
+        , m_bufferSize(bufferSize)
+        , m_maxReadSize(maxReadSize)
+        , m_memoryAlignment(memoryAlignment)
+        , m_sizeAlignment(sizeAlignment)
+        , m_adjustOffset(adjustOffset)
+        , m_splitAlignedRequests(splitAlignedRequests)
+    {
+        AZ_Assert(IStreamerTypes::IsPowerOf2(memoryAlignment), "Memory alignment needs to be a power of 2");
+        AZ_Assert(IStreamerTypes::IsPowerOf2(sizeAlignment), "Size alignment needs to be a power of 2");
+        AZ_Assert(IStreamerTypes::IsAlignedTo(maxReadSize, sizeAlignment),
+            "Maximum read size isn't aligned to a multiple of the size alignment.");
+
+        size_t numBufferSlots = bufferSize / maxReadSize;
+        // Don't divide the reads up in more sub-reads than there are dependencies available.
+        numBufferSlots = AZStd::min(numBufferSlots, FileRequest::GetMaxNumDependencies());
+        m_bufferCopyInformation = AZStd::unique_ptr<BufferCopyInformation[]>(new BufferCopyInformation[numBufferSlots]);
+        m_availableBufferSlots.reserve(numBufferSlots);
+        for (u32 i = aznumeric_caster(numBufferSlots); i > 0; --i)
+        {
+            m_availableBufferSlots.push_back(i - 1);
+        }
+    }
+
+    ReadSplitter::~ReadSplitter()
+    {
+        if (m_buffer)
+        {
+            AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(m_buffer, m_bufferSize, m_memoryAlignment);
+        }
+    }
+
+    void ReadSplitter::QueueRequest(FileRequest* request)
+    {
+        AZ_Assert(request, "QueueRequest was provided a null request.");
+        if (!m_next)
+        {
+            request->SetStatus(IStreamerTypes::RequestStatus::Failed);
+            m_context->MarkRequestAsCompleted(request);
+            return;
         }
 
-        ReadSplitter::~ReadSplitter()
+        auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
+        if (data == nullptr)
         {
-            if (m_buffer)
-            {
-                AZ::AllocatorInstance<AZ::SystemAllocator>::Get().DeAllocate(m_buffer, m_bufferSize, m_memoryAlignment);
-            }
+            StreamStackEntry::QueueRequest(request);
+            return;
         }
 
-        void ReadSplitter::QueueRequest(FileRequest* request)
-        {
-            AZ_Assert(request, "QueueRequest was provided a null request.");
-            if (!m_next)
-            {
-                request->SetStatus(IStreamerTypes::RequestStatus::Failed);
-                m_context->MarkRequestAsCompleted(request);
-                return;
-            }
+        m_averageNumSubReadsStat.PushSample(aznumeric_cast<double>((data->m_size / m_maxReadSize) + 1));
+        Statistic::PlotImmediate(m_name, AvgNumSubReadsName, m_averageNumSubReadsStat.GetMostRecentSample());
 
-            auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
-            if (data == nullptr)
+        bool isAligned = IStreamerTypes::IsAlignedTo(data->m_output, m_memoryAlignment);
+        if (m_adjustOffset)
+        {
+            isAligned = isAligned && IStreamerTypes::IsAlignedTo(data->m_offset, m_sizeAlignment);
+        }
+
+        if (isAligned || m_bufferSize == 0)
+        {
+            m_alignedReadsStat.PushSample(isAligned ? 1.0 : 0.0);
+            if (!m_splitAlignedRequests)
             {
                 StreamStackEntry::QueueRequest(request);
-                return;
-            }
-
-            m_averageNumSubReadsStat.PushSample(aznumeric_cast<double>((data->m_size / m_maxReadSize) + 1));
-            Statistic::PlotImmediate(m_name, AvgNumSubReadsName, m_averageNumSubReadsStat.GetMostRecentSample());
-
-            bool isAligned = IStreamerTypes::IsAlignedTo(data->m_output, m_memoryAlignment);
-            if (m_adjustOffset)
-            {
-                isAligned = isAligned && IStreamerTypes::IsAlignedTo(data->m_offset, m_sizeAlignment);
-            }
-
-            if (isAligned || m_bufferSize == 0)
-            {
-                m_alignedReadsStat.PushSample(isAligned ? 1.0 : 0.0);
-                if (!m_splitAlignedRequests)
-                {
-                    StreamStackEntry::QueueRequest(request);
-                }
-                else
-                {
-                    QueueAlignedRead(request);
-                }
             }
             else
             {
-                m_alignedReadsStat.PushSample(0.0);
-                InitializeBuffer();
-                QueueBufferedRead(request);
+                QueueAlignedRead(request);
             }
         }
-
-        void ReadSplitter::QueueAlignedRead(FileRequest* request)
+        else
         {
-            auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
-            AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
+            m_alignedReadsStat.PushSample(0.0);
+            InitializeBuffer();
+            QueueBufferedRead(request);
+        }
+    }
 
-            if (data->m_size <= m_maxReadSize)
-            {
-                StreamStackEntry::QueueRequest(request);
-                return;
-            }
+    void ReadSplitter::QueueAlignedRead(FileRequest* request)
+    {
+        auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
+        AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
 
-            PendingRead pendingRead;
-            pendingRead.m_request = request;
-            pendingRead.m_output = reinterpret_cast<u8*>(data->m_output);
-            pendingRead.m_outputSize = data->m_outputSize;
-            pendingRead.m_readSize = data->m_size;
-            pendingRead.m_offset = data->m_offset;
-            pendingRead.m_isBuffered = false;
-
-            if (!m_pendingReads.empty())
-            {
-                m_pendingReads.push_back(pendingRead);
-                return;
-            }
-
-            if (!QueueAlignedRead(pendingRead))
-            {
-                m_pendingReads.push_back(pendingRead);
-            }
+        if (data->m_size <= m_maxReadSize)
+        {
+            StreamStackEntry::QueueRequest(request);
+            return;
         }
 
-        bool ReadSplitter::QueueAlignedRead(PendingRead& pending)
+        PendingRead pendingRead;
+        pendingRead.m_request = request;
+        pendingRead.m_output = reinterpret_cast<u8*>(data->m_output);
+        pendingRead.m_outputSize = data->m_outputSize;
+        pendingRead.m_readSize = data->m_size;
+        pendingRead.m_offset = data->m_offset;
+        pendingRead.m_isBuffered = false;
+
+        if (!m_pendingReads.empty())
         {
-            auto data = AZStd::get_if<FileRequest::ReadData>(&pending.m_request->GetCommand());
-            AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
+            m_pendingReads.push_back(pendingRead);
+            return;
+        }
 
-            while (pending.m_readSize > 0)
+        if (!QueueAlignedRead(pendingRead))
+        {
+            m_pendingReads.push_back(pendingRead);
+        }
+    }
+
+    bool ReadSplitter::QueueAlignedRead(PendingRead& pending)
+    {
+        auto data = AZStd::get_if<FileRequest::ReadData>(&pending.m_request->GetCommand());
+        AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
+
+        while (pending.m_readSize > 0)
+        {
+            if (pending.m_request->GetNumDependencies() >= FileRequest::GetMaxNumDependencies())
             {
-                if (pending.m_request->GetNumDependencies() >= FileRequest::GetMaxNumDependencies())
+                // Add a wait to make sure the read request isn't completed if all sub-reads completed before
+                // the ReadSplitter has had a chance to add new sub-reads to complete the read.
+                if (pending.m_wait == nullptr)
                 {
-                    // Add a wait to make sure the read request isn't completed if all sub-reads completed before
-                    // the ReadSplitter has had a chance to add new sub-reads to complete the read.
-                    if (pending.m_wait == nullptr)
-                    {
-                        pending.m_wait = m_context->GetNewInternalRequest();
-                        pending.m_wait->CreateWait(pending.m_request);
-                    }
-                    return false;
+                    pending.m_wait = m_context->GetNewInternalRequest();
+                    pending.m_wait->CreateWait(pending.m_request);
                 }
+                return false;
+            }
 
-                u64 readSize = m_maxReadSize;
-                size_t bufferSize = m_maxReadSize;
-                if (pending.m_readSize < m_maxReadSize)
+            u64 readSize = m_maxReadSize;
+            size_t bufferSize = m_maxReadSize;
+            if (pending.m_readSize < m_maxReadSize)
+            {
+                readSize = pending.m_readSize;
+                // This will be the last read so give the remainder of the output buffer to the final request.
+                bufferSize = pending.m_outputSize;
+            }
+
+            FileRequest* subRequest = m_context->GetNewInternalRequest();
+            subRequest->CreateRead(pending.m_request, pending.m_output, bufferSize, data->m_path, pending.m_offset, readSize, data->m_sharedRead);
+            subRequest->SetCompletionCallback([this](FileRequest&)
                 {
-                    readSize = pending.m_readSize;
-                    // This will be the last read so give the remainder of the output buffer to the final request.
-                    bufferSize = pending.m_outputSize;
+                    AZ_PROFILE_FUNCTION(AzCore);
+                    QueuePendingRequest();
+                });
+            m_next->QueueRequest(subRequest);
+
+            pending.m_offset += readSize;
+            pending.m_readSize -= readSize;
+            pending.m_outputSize -= bufferSize;
+            pending.m_output += readSize;
+        }
+        if (pending.m_wait != nullptr)
+        {
+            m_context->MarkRequestAsCompleted(pending.m_wait);
+            pending.m_wait = nullptr;
+        }
+        return true;
+    }
+
+    void ReadSplitter::QueueBufferedRead(FileRequest* request)
+    {
+        auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
+        AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
+
+        PendingRead pendingRead;
+        pendingRead.m_request = request;
+        pendingRead.m_output = reinterpret_cast<u8*>(data->m_output);
+        pendingRead.m_outputSize = data->m_outputSize;
+        pendingRead.m_readSize = data->m_size;
+        pendingRead.m_offset = data->m_offset;
+        pendingRead.m_isBuffered = true;
+
+        if (!m_pendingReads.empty())
+        {
+            m_pendingReads.push_back(pendingRead);
+            return;
+        }
+
+        if (!QueueBufferedRead(pendingRead))
+        {
+            m_pendingReads.push_back(pendingRead);
+        }
+    }
+
+    bool ReadSplitter::QueueBufferedRead(PendingRead& pending)
+    {
+        auto data = AZStd::get_if<FileRequest::ReadData>(&pending.m_request->GetCommand());
+        AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
+
+        while (pending.m_readSize > 0)
+        {
+            if (!m_availableBufferSlots.empty())
+            {
+                u32 bufferSlot = m_availableBufferSlots.back();
+                m_availableBufferSlots.pop_back();
+
+                u64 readSize;
+                u64 copySize;
+                u64 offset;
+                BufferCopyInformation& copyInfo = m_bufferCopyInformation[bufferSlot];
+                copyInfo.m_target = pending.m_output;
+
+                if (m_adjustOffset)
+                {
+                    offset = AZ_SIZE_ALIGN_DOWN(pending.m_offset, aznumeric_cast<u64>(m_sizeAlignment));
+                    size_t bufferOffset = pending.m_offset - offset;
+                    copyInfo.m_bufferOffset = bufferOffset;
+                    readSize = AZStd::min(pending.m_readSize + bufferOffset, m_maxReadSize);
+                    copySize = readSize - bufferOffset;
                 }
-                
+                else
+                {
+                    offset = pending.m_offset;
+                    readSize = AZStd::min(pending.m_readSize, m_maxReadSize);
+                    copySize = readSize;
+                }
+                AZ_Assert(readSize <= m_maxReadSize, "Read size %llu in read splitter exceeds the maximum split size of %llu.",
+                    readSize, m_maxReadSize);
+                copyInfo.m_size = copySize;
+
                 FileRequest* subRequest = m_context->GetNewInternalRequest();
-                subRequest->CreateRead(pending.m_request, pending.m_output, bufferSize, data->m_path, pending.m_offset, readSize, data->m_sharedRead);
-                subRequest->SetCompletionCallback([this](FileRequest&)
+                subRequest->CreateRead(pending.m_request, GetBufferSlot(bufferSlot), m_maxReadSize, data->m_path,
+                    offset, readSize, data->m_sharedRead);
+                subRequest->SetCompletionCallback([this, bufferSlot]([[maybe_unused]] FileRequest& request)
                     {
                         AZ_PROFILE_FUNCTION(AzCore);
+
+                        BufferCopyInformation& copyInfo = m_bufferCopyInformation[bufferSlot];
+                        memcpy(copyInfo.m_target, GetBufferSlot(bufferSlot) + copyInfo.m_bufferOffset, copyInfo.m_size);
+                        m_availableBufferSlots.push_back(bufferSlot);
+
                         QueuePendingRequest();
                     });
                 m_next->QueueRequest(subRequest);
 
-                pending.m_offset += readSize;
-                pending.m_readSize -= readSize;
-                pending.m_outputSize -= bufferSize;
-                pending.m_output += readSize;
+                pending.m_offset += copySize;
+                pending.m_readSize -= copySize;
+                pending.m_outputSize -= copySize;
+                pending.m_output += copySize;
             }
-            if (pending.m_wait != nullptr)
+            else
             {
-                m_context->MarkRequestAsCompleted(pending.m_wait);
-                pending.m_wait = nullptr;
-            }
-            return true;
-        }
-
-        void ReadSplitter::QueueBufferedRead(FileRequest* request)
-        {
-            auto data = AZStd::get_if<FileRequest::ReadData>(&request->GetCommand());
-            AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
-
-            PendingRead pendingRead;
-            pendingRead.m_request = request;
-            pendingRead.m_output = reinterpret_cast<u8*>(data->m_output);
-            pendingRead.m_outputSize = data->m_outputSize;
-            pendingRead.m_readSize = data->m_size;
-            pendingRead.m_offset = data->m_offset;
-            pendingRead.m_isBuffered = true;
-
-            if (!m_pendingReads.empty())
-            {
-                m_pendingReads.push_back(pendingRead);
-                return;
-            }
-
-            if (!QueueBufferedRead(pendingRead))
-            {
-                m_pendingReads.push_back(pendingRead);
-            }
-        }
-
-        bool ReadSplitter::QueueBufferedRead(PendingRead& pending)
-        {
-            auto data = AZStd::get_if<FileRequest::ReadData>(&pending.m_request->GetCommand());
-            AZ_Assert(data != nullptr, "Provided request to queue by the Read Splitter did not contain a read command.");
-
-            while (pending.m_readSize > 0)
-            {
-                if (!m_availableBufferSlots.empty())
+                // Add a wait to make sure the read request isn't completed if all sub-reads completed before
+                // the ReadSplitter has had a chance to add new sub-reads to complete the read.
+                if (pending.m_wait == nullptr)
                 {
-                    u32 bufferSlot = m_availableBufferSlots.back();
-                    m_availableBufferSlots.pop_back();
-
-                    u64 readSize;
-                    u64 copySize;
-                    u64 offset;
-                    BufferCopyInformation& copyInfo = m_bufferCopyInformation[bufferSlot];
-                    copyInfo.m_target = pending.m_output;
-
-                    if (m_adjustOffset)
-                    {
-                        offset = AZ_SIZE_ALIGN_DOWN(pending.m_offset, aznumeric_cast<u64>(m_sizeAlignment));
-                        size_t bufferOffset = pending.m_offset - offset;
-                        copyInfo.m_bufferOffset = bufferOffset;
-                        readSize = AZStd::min(pending.m_readSize + bufferOffset, m_maxReadSize);
-                        copySize = readSize - bufferOffset;
-                    }
-                    else
-                    {
-                        offset = pending.m_offset;
-                        readSize = AZStd::min(pending.m_readSize, m_maxReadSize);
-                        copySize = readSize;
-                    }
-                    AZ_Assert(readSize <= m_maxReadSize, "Read size %llu in read splitter exceeds the maximum split size of %llu.",
-                        readSize, m_maxReadSize);
-                    copyInfo.m_size = copySize;
-
-                    FileRequest* subRequest = m_context->GetNewInternalRequest();
-                    subRequest->CreateRead(pending.m_request, GetBufferSlot(bufferSlot), m_maxReadSize, data->m_path,
-                        offset, readSize, data->m_sharedRead);
-                    subRequest->SetCompletionCallback([this, bufferSlot]([[maybe_unused]] FileRequest& request)
-                        {
-                            AZ_PROFILE_FUNCTION(AzCore);
-
-                            BufferCopyInformation& copyInfo = m_bufferCopyInformation[bufferSlot];
-                            memcpy(copyInfo.m_target, GetBufferSlot(bufferSlot) + copyInfo.m_bufferOffset, copyInfo.m_size);
-                            m_availableBufferSlots.push_back(bufferSlot);
-
-                            QueuePendingRequest();
-                        });
-                    m_next->QueueRequest(subRequest);
-
-                    pending.m_offset += copySize;
-                    pending.m_readSize -= copySize;
-                    pending.m_outputSize -= copySize;
-                    pending.m_output += copySize;
-                }
-                else
-                {
-                    // Add a wait to make sure the read request isn't completed if all sub-reads completed before
-                    // the ReadSplitter has had a chance to add new sub-reads to complete the read.
-                    if (pending.m_wait == nullptr)
-                    {
-                        pending.m_wait = m_context->GetNewInternalRequest();
-                        pending.m_wait->CreateWait(pending.m_request);
-                    }
-                    return false;
+                    pending.m_wait = m_context->GetNewInternalRequest();
+                    pending.m_wait->CreateWait(pending.m_request);
                 }
+                return false;
             }
-            if (pending.m_wait != nullptr)
+        }
+        if (pending.m_wait != nullptr)
+        {
+            m_context->MarkRequestAsCompleted(pending.m_wait);
+            pending.m_wait = nullptr;
+        }
+        return true;
+    }
+
+    void ReadSplitter::QueuePendingRequest()
+    {
+        if (!m_pendingReads.empty())
+        {
+            PendingRead& pendingRead = m_pendingReads.front();
+            if (pendingRead.m_isBuffered ? QueueBufferedRead(pendingRead) : QueueAlignedRead(pendingRead))
             {
-                m_context->MarkRequestAsCompleted(pending.m_wait);
-                pending.m_wait = nullptr;
-            }
-            return true;
-        }
-
-        void ReadSplitter::QueuePendingRequest()
-        {
-            if (!m_pendingReads.empty())
-            {
-                PendingRead& pendingRead = m_pendingReads.front();
-                if (pendingRead.m_isBuffered ? QueueBufferedRead(pendingRead) : QueueAlignedRead(pendingRead))
-                {
-                    m_pendingReads.pop_front();
-                }
+                m_pendingReads.pop_front();
             }
         }
+    }
 
-        void ReadSplitter::UpdateStatus(Status& status) const
+    void ReadSplitter::UpdateStatus(Status& status) const
+    {
+        StreamStackEntry::UpdateStatus(status);
+        if (m_bufferSize > 0)
         {
-            StreamStackEntry::UpdateStatus(status);
-            if (m_bufferSize > 0)
-            {
-                s32 numAvailableSlots = aznumeric_cast<s32>(m_availableBufferSlots.size());
-                status.m_numAvailableSlots = AZStd::min(status.m_numAvailableSlots, numAvailableSlots);
-                status.m_isIdle = status.m_isIdle && m_pendingReads.empty();
-            }
+            s32 numAvailableSlots = aznumeric_cast<s32>(m_availableBufferSlots.size());
+            status.m_numAvailableSlots = AZStd::min(status.m_numAvailableSlots, numAvailableSlots);
+            status.m_isIdle = status.m_isIdle && m_pendingReads.empty();
         }
+    }
 
-        void ReadSplitter::CollectStatistics(AZStd::vector<Statistic>& statistics) const
-        {
-            statistics.push_back(Statistic::CreateFloat(m_name, AvgNumSubReadsName, m_averageNumSubReadsStat.GetAverage()));
-            statistics.push_back(Statistic::CreatePercentage(m_name, AlignedReadsName, m_alignedReadsStat.GetAverage()));
-            statistics.push_back(Statistic::CreateInteger(m_name, NumAvailableBufferSlotsName, aznumeric_caster(m_availableBufferSlots.size())));
-            statistics.push_back(Statistic::CreateInteger(m_name, NumPendingReadsName, aznumeric_caster(m_pendingReads.size())));
-            StreamStackEntry::CollectStatistics(statistics);
-        }
+    void ReadSplitter::CollectStatistics(AZStd::vector<Statistic>& statistics) const
+    {
+        statistics.push_back(Statistic::CreateFloat(m_name, AvgNumSubReadsName, m_averageNumSubReadsStat.GetAverage()));
+        statistics.push_back(Statistic::CreatePercentage(m_name, AlignedReadsName, m_alignedReadsStat.GetAverage()));
+        statistics.push_back(Statistic::CreateInteger(m_name, NumAvailableBufferSlotsName, aznumeric_caster(m_availableBufferSlots.size())));
+        statistics.push_back(Statistic::CreateInteger(m_name, NumPendingReadsName, aznumeric_caster(m_pendingReads.size())));
+        StreamStackEntry::CollectStatistics(statistics);
+    }
 
-        void ReadSplitter::InitializeBuffer()
+    void ReadSplitter::InitializeBuffer()
+    {
+        // Lazy initialization to avoid allocating memory if it's not needed.
+        if (m_bufferSize != 0 && m_buffer == nullptr)
         {
-            // Lazy initialization to avoid allocating memory if it's not needed.
-            if (m_bufferSize != 0 && m_buffer == nullptr)
-            {
-                m_buffer = reinterpret_cast<u8*>(AZ::AllocatorInstance<AZ::SystemAllocator>::Get().Allocate(
-                    m_bufferSize, m_memoryAlignment, 0, "AZ::IO::Streamer ReadSplitter", __FILE__, __LINE__));
-            }
+            m_buffer = reinterpret_cast<u8*>(AZ::AllocatorInstance<AZ::SystemAllocator>::Get().Allocate(
+                m_bufferSize, m_memoryAlignment, 0, "AZ::IO::Streamer ReadSplitter", __FILE__, __LINE__));
         }
+    }
 
-        u8* ReadSplitter::GetBufferSlot(size_t index)
-        {
-            AZ_Assert(m_buffer != nullptr, "A buffer slot was requested by the Read Splitter before the buffer was initialized.");
-            return m_buffer + (index * m_maxReadSize);
-        }
-    } // namespace IO
-} // namesapce AZ
+    u8* ReadSplitter::GetBufferSlot(size_t index)
+    {
+        AZ_Assert(m_buffer != nullptr, "A buffer slot was requested by the Read Splitter before the buffer was initialized.");
+        return m_buffer + (index * m_maxReadSize);
+    }
+} // namespace AZ::IO
diff --git a/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp b/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp
index af73ab4936..c3fa69a205 100644
--- a/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp
+++ b/Code/Framework/AzCore/AzCore/IPC/SharedMemory.cpp
@@ -13,23 +13,18 @@
 
 #include <AzCore/std/parallel/spin_mutex.h>
 
-namespace AZ
+namespace AZ::Internal
 {
-    namespace Internal
+    struct RingData
     {
-        struct RingData
-        {
-            AZ::u32 m_readOffset;
-            AZ::u32 m_writeOffset;
-            AZ::u32 m_startOffset;
-            AZ::u32 m_endOffset;
-            AZ::u32 m_dataToRead;
-            AZ::u8 m_pad[32 - sizeof(AZStd::spin_mutex)];
-        };
-    } // namespace Internal
-} // namespace AZ
-
-
+        AZ::u32 m_readOffset;
+        AZ::u32 m_writeOffset;
+        AZ::u32 m_startOffset;
+        AZ::u32 m_endOffset;
+        AZ::u32 m_dataToRead;
+        AZ::u8 m_pad[32 - sizeof(AZStd::spin_mutex)];
+    };
+} // namespace AZ::Internal
 
 using namespace AZ;
 
diff --git a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp
index c05590ca91..ce8455d9a1 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.cpp
@@ -14,6 +14,7 @@
 #include <AzCore/std/parallel/thread.h>
 #include <AzCore/std/parallel/lock.h>
 #include <AzCore/std/functional.h>
+#include <AzCore/std/string/fixed_string.h>
 
 #include <AzCore/Debug/Profiler.h>
 
@@ -83,7 +84,7 @@ AZ_THREAD_LOCAL JobManagerWorkStealing::ThreadInfo* JobManagerWorkStealing::m_cu
 
 JobManagerWorkStealing::JobManagerWorkStealing(const JobManagerDesc& desc)
     : m_isAsynchronous(!desc.m_workerThreads.empty())
-    , m_workerThreads(AZStd::move(CreateWorkerThreads(desc.m_workerThreads)))
+    , m_workerThreads(AZStd::move(CreateWorkerThreads(desc)))
 {
     //allow workers to begin processing after they have all been created, needed to wait since they may access each others queues
     m_initSemaphore.release(static_cast<unsigned int>(desc.m_workerThreads.size()));
@@ -618,8 +619,9 @@ JobManagerWorkStealing::ThreadInfo* JobManagerWorkStealing::FindCurrentThreadInf
     return info;
 }
 
-JobManagerWorkStealing::ThreadList JobManagerWorkStealing::CreateWorkerThreads(const JobManagerDesc::DescList& workerDescList)
+JobManagerWorkStealing::ThreadList JobManagerWorkStealing::CreateWorkerThreads(const JobManagerDesc& jmDesc)
 {
+    const JobManagerDesc::DescList& workerDescList = jmDesc.m_workerThreads;
     ThreadList workerThreads(workerDescList.size());
     m_threads.reserve(workerDescList.size());
 
@@ -632,8 +634,12 @@ JobManagerWorkStealing::ThreadList JobManagerWorkStealing::CreateWorkerThreads(c
         info->m_owningManager = this;
         info->m_workerId = iThread;
 
+        AZStd::fixed_string<128> threadName = AZStd::fixed_string<128>::format(
+            "%s worker thread %d", 
+            jmDesc.m_jobManagerName[0] != '\0' ? jmDesc.m_jobManagerName : "AZ JobManager", 
+            iThread);
         AZStd::thread_desc threadDesc;
-        threadDesc.m_name = "AZ JobManager worker thread";
+        threadDesc.m_name = threadName.c_str();
         threadDesc.m_cpuId = desc.m_cpuId;
         threadDesc.m_priority = desc.m_priority;
         if (desc.m_stackSize != 0)
diff --git a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h
index 55de872d86..734c166d6a 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h
@@ -115,7 +115,7 @@ namespace AZ
             void ProcessJobsAssist(ThreadInfo* info, Job* suspendedJob, AZStd::atomic<bool>* notifyFlag);
             void ProcessJobsSynchronous(ThreadInfo* info, Job* suspendedJob, AZStd::atomic<bool>* notifyFlag);
             void ProcessJobsInternal(ThreadInfo* info, Job* suspendedJob, AZStd::atomic<bool>* notifyFlag);
-            ThreadList CreateWorkerThreads(const JobManagerDesc::DescList& workerDescList);
+            ThreadList CreateWorkerThreads(const JobManagerDesc& jmDesc);
 #ifndef AZ_MONOLITHIC_BUILD
             ThreadInfo* CrossModuleFindAndSetWorkerThreadInfo() const;
 #endif
diff --git a/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp
index 6f5ccc93e4..009b6b19dc 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp
@@ -24,7 +24,7 @@
 
 AZ_CVAR(float, cl_jobThreadsConcurrencyRatio, 0.6f, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system multiplier on the number of hw threads the machine creates at initialization");
 AZ_CVAR(uint32_t, cl_jobThreadsNumReserved, 2, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system number of hardware threads that are reserved for O3DE system threads");
-AZ_CVAR(uint32_t, cl_jobThreadsMinNumber, 2, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system minimum number of worker threads to create after scaling the number of hw threads");
+AZ_CVAR(uint32_t, cl_jobThreadsMinNumber, 3, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system minimum number of worker threads to create after scaling the number of hw threads");
 
 namespace AZ
 {
@@ -51,16 +51,18 @@ namespace AZ
         JobManagerBus::Handler::BusConnect();
 
         JobManagerDesc desc;
+        desc.m_jobManagerName = "Default JobManager";
         JobManagerThreadDesc threadDesc;
 
         int numberOfWorkerThreads = m_numberOfWorkerThreads;
         if (numberOfWorkerThreads <= 0) // spawn default number of threads
         {
+        #if (AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS)
+            numberOfWorkerThreads = AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS;
+        #else
             uint32_t scaledHardwareThreads = Threading::CalcNumWorkerThreads(cl_jobThreadsConcurrencyRatio, cl_jobThreadsMinNumber, cl_jobThreadsNumReserved);
             numberOfWorkerThreads = AZ::GetMin(static_cast<unsigned int>(desc.m_workerThreads.capacity()), scaledHardwareThreads);
-        #if (AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS)
-            numberOfWorkerThreads = AZ::GetMin(numberOfWorkerThreads, AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS);
-        #endif // (AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS)
+        #endif // (AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS)
         }
 
         threadDesc.m_cpuId = AFFINITY_MASK_USERTHREADS;
diff --git a/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h b/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h
index 94f84f27b3..b2156291bc 100644
--- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h
+++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerDesc.h
@@ -51,6 +51,8 @@ namespace AZ
     {
         JobManagerDesc() {}
 
+        const char* m_jobManagerName = "";
+
         using DescList = AZStd::fixed_vector<JobManagerThreadDesc, 64>;
         DescList m_workerThreads; ///< List of worker threads to create
     };
diff --git a/Code/Framework/AzCore/AzCore/Math/Crc.h b/Code/Framework/AzCore/AzCore/Math/Crc.h
index 9ba2a83139..c71339e92e 100644
--- a/Code/Framework/AzCore/AzCore/Math/Crc.h
+++ b/Code/Framework/AzCore/AzCore/Math/Crc.h
@@ -16,7 +16,7 @@
 //
 // When AZ_CRC("My string") is used by default it will map to AZ::Crc32("My string").
 // We do have a pro-processor program which will precompute the crc for you and
-// transform that macro to AZ_CRC("My string",0xabcdef00) this will expand to just 0xabcdef00.
+// transform that macro to AZ_CRC("My string", 0x18fbd270) this will expand to just 0x18fbd270.
 // This will remove completely the "My string" from your executable, it will add it to a database and so on.
 // WHen you want to update the string, just change the string.
 // If you don't run the precompile step the code should still run fine, except it will be slower,
@@ -24,7 +24,7 @@
 // a constant expression.
 // For example
 // switch(id) {
-//  case AZ_CRC("My string",0xabcdef00): {} break; // this will compile fine
+//  case AZ_CRC("My string",0x18fbd270): {} break; // this will compile fine
 //  case AZ_CRC("My string"): {} break; // this will cause "error C2051: case expression not constant"
 // }
 // So it's you choice what you do, depending on your needs.
diff --git a/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp b/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp
index 47a7e0a2db..912794a518 100644
--- a/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Geometry2DUtils.cpp
@@ -8,138 +8,135 @@
 
 #include <AzCore/Math/Geometry2DUtils.h>
 
-namespace AZ
+namespace AZ::Geometry2DUtils
 {
-    namespace Geometry2DUtils
+    float ShortestDistanceSqPointSegment(const Vector2& point, const Vector2& segmentStart, const Vector2& segmentEnd,
+        float epsilon)
     {
-        float ShortestDistanceSqPointSegment(const Vector2& point, const Vector2& segmentStart, const Vector2& segmentEnd,
-            float epsilon)
+        const AZ::Vector2 segmentVector = segmentEnd - segmentStart;
+
+        // check if the line degenerates to a point
+        const float segmentLengthSq = segmentVector.GetLengthSq();
+        if (segmentLengthSq < epsilon * epsilon)
         {
-            const AZ::Vector2 segmentVector = segmentEnd - segmentStart;
-
-            // check if the line degenerates to a point
-            const float segmentLengthSq = segmentVector.GetLengthSq();
-            if (segmentLengthSq < epsilon * epsilon)
-            {
-                return (point - segmentStart).GetLengthSq();
-            }
-
-            // if the point projects on to the line segment then the shortest distance is the perpendicular
-            const float projection = (point - segmentStart).Dot(segmentVector);
-            if (projection >= 0.0f && projection <= segmentLengthSq)
-            {
-                const Vector2 perpendicular = (point - segmentStart - projection / segmentLengthSq * segmentVector);
-                return perpendicular.GetLengthSq();
-            }
-
-            // otherwise the point must be closest to one of the end points of the segment
-            return GetMin(
-                (point - segmentStart).GetLengthSq(),
-                (point - segmentEnd).GetLengthSq());
+            return (point - segmentStart).GetLengthSq();
         }
 
-        float Signed2DTriangleArea(const Vector2& a, const Vector2& b, const Vector2& c)
+        // if the point projects on to the line segment then the shortest distance is the perpendicular
+        const float projection = (point - segmentStart).Dot(segmentVector);
+        if (projection >= 0.0f && projection <= segmentLengthSq)
         {
-            return 0.5f * ((a.GetX() - c.GetX()) * (b.GetY() - c.GetY()) - (a.GetY() - c.GetY()) * (b.GetX() - c.GetX()));
+            const Vector2 perpendicular = (point - segmentStart - projection / segmentLengthSq * segmentVector);
+            return perpendicular.GetLengthSq();
         }
 
-        float ShortestDistanceSqSegmentSegment(
-            const Vector2& segment1Start, const Vector2& segment1End,
-            const Vector2& segment2Start, const Vector2& segment2End)
+        // otherwise the point must be closest to one of the end points of the segment
+        return GetMin(
+            (point - segmentStart).GetLengthSq(),
+            (point - segmentEnd).GetLengthSq());
+    }
+
+    float Signed2DTriangleArea(const Vector2& a, const Vector2& b, const Vector2& c)
+    {
+        return 0.5f * ((a.GetX() - c.GetX()) * (b.GetY() - c.GetY()) - (a.GetY() - c.GetY()) * (b.GetX() - c.GetX()));
+    }
+
+    float ShortestDistanceSqSegmentSegment(
+        const Vector2& segment1Start, const Vector2& segment1End,
+        const Vector2& segment2Start, const Vector2& segment2End)
+    {
+        // if the segments cross, then the distance is zero
+
+        // if the two ends of segment 2 are on different sides of segment 1, then these two triangles will have
+        // different winding orders (see Real-Time Collision Detection, Christer Ericson, ISBN 978-1558607323,
+        // Chapter 5.1.9.1)
+        const float area1 = Signed2DTriangleArea(segment1Start, segment1End, segment2End);
+        const float area2 = Signed2DTriangleArea(segment1Start, segment1End, segment2Start);
+        if (area1 * area2 < 0.0f)
         {
-            // if the segments cross, then the distance is zero
-
-            // if the two ends of segment 2 are on different sides of segment 1, then these two triangles will have
-            // different winding orders (see Real-Time Collision Detection, Christer Ericson, ISBN 978-1558607323,
-            // Chapter 5.1.9.1)
-            const float area1 = Signed2DTriangleArea(segment1Start, segment1End, segment2End);
-            const float area2 = Signed2DTriangleArea(segment1Start, segment1End, segment2Start);
-            if (area1 * area2 < 0.0f)
+            // similarly we can check if the two ends of segment 1 are on different sides of segment 2
+            const float area3 = Signed2DTriangleArea(segment2Start, segment2End, segment1Start);
+            const float area4 = area3 + area2 - area1;
+            if (area3 * area4 < 0.0f)
             {
-                // similarly we can check if the two ends of segment 1 are on different sides of segment 2
-                const float area3 = Signed2DTriangleArea(segment2Start, segment2End, segment1Start);
-                const float area4 = area3 + area2 - area1;
-                if (area3 * area4 < 0.0f)
-                {
-                    return 0.0f;
-                }
+                return 0.0f;
             }
-
-            // otherwise the shortest distance must be between one of the segment end points and the other segment
-            return GetMin(
-                GetMin(
-                    ShortestDistanceSqPointSegment(segment1Start, segment2Start, segment2End),
-                    ShortestDistanceSqPointSegment(segment1End, segment2Start, segment2End)),
-                GetMin(
-                    ShortestDistanceSqPointSegment(segment2Start, segment1Start, segment1End),
-                    ShortestDistanceSqPointSegment(segment2End, segment1Start, segment1End))
-            );
         }
 
-        bool IsSimplePolygon(const AZStd::vector<AZ::Vector2>& vertices, float epsilon)
+        // otherwise the shortest distance must be between one of the segment end points and the other segment
+        return GetMin(
+            GetMin(
+                ShortestDistanceSqPointSegment(segment1Start, segment2Start, segment2End),
+                ShortestDistanceSqPointSegment(segment1End, segment2Start, segment2End)),
+            GetMin(
+                ShortestDistanceSqPointSegment(segment2Start, segment1Start, segment1End),
+                ShortestDistanceSqPointSegment(segment2End, segment1Start, segment1End))
+        );
+    }
+
+    bool IsSimplePolygon(const AZStd::vector<AZ::Vector2>& vertices, float epsilon)
+    {
+        // note that this implementation is quadratic in the number of vertices
+        // if it becomes a bottleneck, there are approaches which are O(n log n), e.g. the Bentley-Ottmann algorithm
+
+        const size_t vertexCount = vertices.size();
+
+        if (vertexCount < 3)
         {
-            // note that this implementation is quadratic in the number of vertices
-            // if it becomes a bottleneck, there are approaches which are O(n log n), e.g. the Bentley-Ottmann algorithm
-
-            const size_t vertexCount = vertices.size();
-
-            if (vertexCount < 3)
-            {
-                return false;
-            }
-
-            if (vertexCount == 3)
-            {
-                return true;
-            }
-
-            const float epsilonSq = epsilon * epsilon;
-
-            for (size_t i = 0; i < vertexCount; ++i)
-            {
-                // make it easy to nicely wrap indices
-                const size_t safeIndex = i + vertexCount;
-
-                const size_t endIndex = (safeIndex - 1) % vertexCount;
-                const size_t beginIndex = (safeIndex + 2) % vertexCount;
-
-                for (size_t j = beginIndex; j != endIndex; j = (j + 1) % vertexCount)
-                {
-                    const float distSq = ShortestDistanceSqSegmentSegment(
-                        vertices[i],
-                        vertices[(i + 1) % vertexCount],
-                        vertices[j],
-                        vertices[(j + 1) % vertexCount]
-                    );
-
-                    if (distSq < epsilonSq)
-                    {
-                        return false;
-                    }
-                }
-            }
+            return false;
+        }
 
+        if (vertexCount == 3)
+        {
             return true;
         }
 
-        bool IsConvex(const AZStd::vector<AZ::Vector2>& vertices)
+        const float epsilonSq = epsilon * epsilon;
+
+        for (size_t i = 0; i < vertexCount; ++i)
         {
-            const size_t vertexCount = vertices.size();
+            // make it easy to nicely wrap indices
+            const size_t safeIndex = i + vertexCount;
 
-            if (vertexCount < 3)
-            {
-                return false;
-            }
+            const size_t endIndex = (safeIndex - 1) % vertexCount;
+            const size_t beginIndex = (safeIndex + 2) % vertexCount;
 
-            for (size_t i = 0; i < vertexCount; ++i)
+            for (size_t j = beginIndex; j != endIndex; j = (j + 1) % vertexCount)
             {
-                if (Signed2DTriangleArea(vertices[i], vertices[(i + 1) % vertexCount], vertices[(i + 2) % vertexCount]) < 0.0f)
+                const float distSq = ShortestDistanceSqSegmentSegment(
+                    vertices[i],
+                    vertices[(i + 1) % vertexCount],
+                    vertices[j],
+                    vertices[(j + 1) % vertexCount]
+                );
+
+                if (distSq < epsilonSq)
                 {
                     return false;
                 }
             }
-
-            return true;
         }
-    } // namespace Geometry2DUtils
-} // namespace AZ
+
+        return true;
+    }
+
+    bool IsConvex(const AZStd::vector<AZ::Vector2>& vertices)
+    {
+        const size_t vertexCount = vertices.size();
+
+        if (vertexCount < 3)
+        {
+            return false;
+        }
+
+        for (size_t i = 0; i < vertexCount; ++i)
+        {
+            if (Signed2DTriangleArea(vertices[i], vertices[(i + 1) % vertexCount], vertices[(i + 2) % vertexCount]) < 0.0f)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+} // namespace AZ::Geometry2DUtils
diff --git a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp
index 6d79c4c068..78da9e76d2 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp
@@ -351,7 +351,8 @@ namespace AZ
                 ->Method("CreateFromMatrix3x3AndTranslation", &Matrix3x4::CreateFromMatrix3x3AndTranslation)
                 ->Method("CreateScale", &Matrix3x4::CreateScale)
                 ->Method("CreateDiagonal", &Matrix3x4::CreateDiagonal)
-                ->Method("CreateTranslation", &Matrix3x4::CreateTranslation);
+                ->Method("CreateTranslation", &Matrix3x4::CreateTranslation)
+                ->Method("UnsafeCreateFromMatrix4x4", &Matrix3x4::UnsafeCreateFromMatrix4x4);
         }
     }
 
diff --git a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h
index 60a88df686..25653627ea 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h
@@ -90,6 +90,9 @@ namespace AZ
         //! Constructs from a Matrix3x3 and a translation.
         static Matrix3x4 CreateFromMatrix3x3AndTranslation(const Matrix3x3& matrix3x3, const Vector3& translation);
 
+        //! Constructs from a Matrix4x4.
+        static Matrix3x4 UnsafeCreateFromMatrix4x4(const Matrix4x4& matrix4x4);
+
         //! Constructs from a Transform.
         static Matrix3x4 CreateFromTransform(const Transform& transform);
 
@@ -227,7 +230,7 @@ namespace AZ
         Matrix3x4& operator+=(const Matrix3x4& rhs);
         //! @}
 
-        //! Operator for matrix-matrix substraction.
+        //! Operator for matrix-matrix subtraction.
         //! @{
         [[nodiscard]] Matrix3x4 operator-(const Matrix3x4& rhs) const;
         Matrix3x4& operator-=(const Matrix3x4& rhs);
@@ -266,6 +269,9 @@ namespace AZ
         //! Post-multiplies the matrix by a vector, using only the 3x3 part of the matrix.
         [[nodiscard]] Vector3 TransformVector(const Vector3& rhs) const;
 
+        //! Post-multiplies the matrix by a point, using the rotation and translation part of the matrix.
+        [[nodiscard]] Vector3 TransformPoint(const Vector3& rhs) const;
+
         //! Gets the result of transposing the 3x3 part of the matrix, setting the translation part to zero.
         [[nodiscard]] Matrix3x4 GetTranspose() const;
 
diff --git a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl
index 2f127221ab..d1367cd26c 100644
--- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl
@@ -203,6 +203,16 @@ namespace AZ
     }
 
 
+    AZ_MATH_INLINE Matrix3x4 Matrix3x4::UnsafeCreateFromMatrix4x4(const Matrix4x4& matrix4x4)
+    {
+        Matrix3x4 result;
+        result.SetRow(0, matrix4x4.GetRow(0));
+        result.SetRow(1, matrix4x4.GetRow(1));
+        result.SetRow(2, matrix4x4.GetRow(2));
+        return result;
+    }
+
+
     AZ_MATH_INLINE Matrix3x4 Matrix3x4::CreateScale(const Vector3& scale)
     {
         return CreateDiagonal(scale);
@@ -609,6 +619,12 @@ namespace AZ
     }
 
 
+    AZ_MATH_INLINE Vector3 Matrix3x4::TransformPoint(const Vector3& rhs) const
+    {
+        return Multiply3x3(rhs) + GetTranslation();
+    }
+
+
     AZ_MATH_INLINE Matrix3x4 Matrix3x4::GetTranspose() const
     {
         Matrix3x4 result;
diff --git a/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp b/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp
index 66404a9b3f..5f4dc9e5df 100644
--- a/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp
+++ b/Code/Framework/AzCore/AzCore/Math/Sfmt.cpp
@@ -14,28 +14,26 @@
 
 #include <string.h> // for memset
 
-namespace AZ
+namespace AZ::SfmtInternal
 {
-    namespace SfmtInternal
-    {
-        static const int N32    = N * 4;
-        static const int N64    = N * 2;
-        static const int POS1   = 122;
-        static const int SL1    = 18;
-        static const int SR1    = 11;
-        static const int SL2    = 1;
-        static const int SR2    = 1;
-        static const unsigned int MSK1  = 0xdfffffefU;
-        static const unsigned int MSK2  = 0xddfecb7fU;
-        static const unsigned int MSK3  = 0xbffaffffU;
-        static const unsigned int MSK4  = 0xbffffff6U;
-        static const unsigned int PARITY1   = 0x00000001U;
-        static const unsigned int PARITY2   = 0x00000000U;
-        static const unsigned int PARITY3   = 0x00000000U;
-        static const unsigned int PARITY4   = 0x13c9e684U;
+    static const int N32    = N * 4;
+    static const int N64    = N * 2;
+    static const int POS1   = 122;
+    static const int SL1    = 18;
+    static const int SR1    = 11;
+    static const int SL2    = 1;
+    static const int SR2    = 1;
+    static const unsigned int MSK1  = 0xdfffffefU;
+    static const unsigned int MSK2  = 0xddfecb7fU;
+    static const unsigned int MSK3  = 0xbffaffffU;
+    static const unsigned int MSK4  = 0xbffffff6U;
+    static const unsigned int PARITY1   = 0x00000001U;
+    static const unsigned int PARITY2   = 0x00000000U;
+    static const unsigned int PARITY3   = 0x00000000U;
+    static const unsigned int PARITY4   = 0x13c9e684U;
 
-        /** a parity check vector which certificate the period of 2^{MEXP} */
-        static unsigned int parity[4] = {PARITY1, PARITY2, PARITY3, PARITY4};
+    /** a parity check vector which certificate the period of 2^{MEXP} */
+    static unsigned int parity[4] = {PARITY1, PARITY2, PARITY3, PARITY4};
 
 #ifdef ONLY64
 #   define idxof(_i) (_i ^ 1)
@@ -45,259 +43,257 @@ namespace AZ
 
 
 #if AZ_TRAIT_USE_PLATFORM_SIMD_SSE
-        /**
-         * This function represents the recursion formula.
-         * @param a a 128-bit part of the internal state array
-         * @param b a 128-bit part of the internal state array
-         * @param c a 128-bit part of the internal state array
-         * @param d a 128-bit part of the internal state array
-         * @param mask 128-bit mask
-         * @return output
-         */
-        AZ_FORCE_INLINE static Simd::Vec4::Int32Type simd_recursion(Simd::Vec4::Int32Type* a, Simd::Vec4::Int32Type* b, Simd::Vec4::Int32Type c, Simd::Vec4::Int32Type d, Simd::Vec4::Int32Type mask)
+    /**
+     * This function represents the recursion formula.
+     * @param a a 128-bit part of the internal state array
+     * @param b a 128-bit part of the internal state array
+     * @param c a 128-bit part of the internal state array
+     * @param d a 128-bit part of the internal state array
+     * @param mask 128-bit mask
+     * @return output
+     */
+    AZ_FORCE_INLINE static Simd::Vec4::Int32Type simd_recursion(Simd::Vec4::Int32Type* a, Simd::Vec4::Int32Type* b, Simd::Vec4::Int32Type c, Simd::Vec4::Int32Type d, Simd::Vec4::Int32Type mask)
+    {
+        Simd::Vec4::Int32Type v, x, y, z;
+        x = *a;
+        y = _mm_srli_epi32(*b, SR1);
+        z = _mm_srli_si128(c, SR2);
+        v = _mm_slli_epi32(d, SL1);
+        z = Simd::Vec4::Xor(z, x);
+        z = Simd::Vec4::Xor(z, v);
+        x = _mm_slli_si128(x, SL2);
+        y = Simd::Vec4::And(y, mask);
+        z = Simd::Vec4::Xor(z, x);
+        z = Simd::Vec4::Xor(z, y);
+        return z;
+    }
+
+    /**
+     * This function fills the internal state array with pseudorandom
+     * integers.
+     */
+    inline void gen_rand_all(Sfmt& g)
+    {
+        int i;
+        Simd::Vec4::Int32Type r, r1, r2, mask;
+        mask = Simd::Vec4::LoadImmediate((int32_t)MSK4, (int32_t)MSK3, (int32_t)MSK2, (int32_t)MSK1);
+
+        r1 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 2].si);
+        r2 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 1].si);
+        for (i = 0; i < N - POS1; i++)
         {
-            Simd::Vec4::Int32Type v, x, y, z;
-            x = *a;
-            y = _mm_srli_epi32(*b, SR1);
-            z = _mm_srli_si128(c, SR2);
-            v = _mm_slli_epi32(d, SL1);
-            z = Simd::Vec4::Xor(z, x);
-            z = Simd::Vec4::Xor(z, v);
-            x = _mm_slli_si128(x, SL2);
-            y = Simd::Vec4::And(y, mask);
-            z = Simd::Vec4::Xor(z, x);
-            z = Simd::Vec4::Xor(z, y);
-            return z;
+            r = simd_recursion(&g.m_sfmt[i].si, &g.m_sfmt[i + POS1].si, r1, r2, mask);
+            Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[i].si, r);
+            r1 = r2;
+            r2 = r;
         }
-
-        /**
-         * This function fills the internal state array with pseudorandom
-         * integers.
-         */
-        inline void gen_rand_all(Sfmt& g)
+        for (; i < N; i++)
         {
-            int i;
-            Simd::Vec4::Int32Type r, r1, r2, mask;
-            mask = Simd::Vec4::LoadImmediate((int32_t)MSK4, (int32_t)MSK3, (int32_t)MSK2, (int32_t)MSK1);
-
-            r1 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 2].si);
-            r2 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 1].si);
-            for (i = 0; i < N - POS1; i++)
-            {
-                r = simd_recursion(&g.m_sfmt[i].si, &g.m_sfmt[i + POS1].si, r1, r2, mask);
-                Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[i].si, r);
-                r1 = r2;
-                r2 = r;
-            }
-            for (; i < N; i++)
-            {
-                r = simd_recursion(&g.m_sfmt[i].si, &g.m_sfmt[i + POS1 - N].si, r1, r2, mask);
-                Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[i].si, r);
-                r1 = r2;
-                r2 = r;
-            }
+            r = simd_recursion(&g.m_sfmt[i].si, &g.m_sfmt[i + POS1 - N].si, r1, r2, mask);
+            Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[i].si, r);
+            r1 = r2;
+            r2 = r;
         }
+    }
 
-        /**
-         * This function fills the user-specified array with pseudorandom
-         * integers.
-         *
-         * @param array an 128-bit array to be filled by pseudorandom numbers.
-         * @param size number of 128-bit pesudorandom numbers to be generated.
-         */
-        inline void gen_rand_array(Sfmt& g, w128_t* array, int size)
+    /**
+     * This function fills the user-specified array with pseudorandom
+     * integers.
+     *
+     * @param array an 128-bit array to be filled by pseudorandom numbers.
+     * @param size number of 128-bit pesudorandom numbers to be generated.
+     */
+    inline void gen_rand_array(Sfmt& g, w128_t* array, int size)
+    {
+        int i, j;
+        Simd::Vec4::Int32Type r, r1, r2, mask;
+        mask = Simd::Vec4::LoadImmediate((int32_t)MSK4, (int32_t)MSK3, (int32_t)MSK2, (int32_t)MSK1);
+
+        r1 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 2].si);
+        r2 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 1].si);
+        for (i = 0; i < N - POS1; i++)
         {
-            int i, j;
-            Simd::Vec4::Int32Type r, r1, r2, mask;
-            mask = Simd::Vec4::LoadImmediate((int32_t)MSK4, (int32_t)MSK3, (int32_t)MSK2, (int32_t)MSK1);
-
-            r1 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 2].si);
-            r2 = Simd::Vec4::LoadAligned((const int32_t*)&g.m_sfmt[N - 1].si);
-            for (i = 0; i < N - POS1; i++)
-            {
-                r = simd_recursion(&g.m_sfmt[i].si, &g.m_sfmt[i + POS1].si, r1, r2, mask);
-                Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
-                r1 = r2;
-                r2 = r;
-            }
-            for (; i < N; i++)
-            {
-                r = simd_recursion(&g.m_sfmt[i].si, &array[i + POS1 - N].si, r1, r2, mask);
-                Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
-                r1 = r2;
-                r2 = r;
-            }
-            /* main loop */
-            for (; i < size - N; i++)
-            {
-                r = simd_recursion(&array[i - N].si, &array[i + POS1 - N].si, r1, r2, mask);
-                Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
-                r1 = r2;
-                r2 = r;
-            }
-            for (j = 0; j < 2 * N - size; j++)
-            {
-                r = Simd::Vec4::LoadAligned((const int32_t*)&array[j + size - N].si);
-                Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[j].si, r);
-            }
-            for (; i < size; i++)
-            {
-                r = simd_recursion(&array[i - N].si, &array[i + POS1 - N].si, r1, r2, mask);
-                Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
-                Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[j++].si, r);
-                r1 = r2;
-                r2 = r;
-            }
+            r = simd_recursion(&g.m_sfmt[i].si, &g.m_sfmt[i + POS1].si, r1, r2, mask);
+            Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
+            r1 = r2;
+            r2 = r;
         }
+        for (; i < N; i++)
+        {
+            r = simd_recursion(&g.m_sfmt[i].si, &array[i + POS1 - N].si, r1, r2, mask);
+            Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
+            r1 = r2;
+            r2 = r;
+        }
+        /* main loop */
+        for (; i < size - N; i++)
+        {
+            r = simd_recursion(&array[i - N].si, &array[i + POS1 - N].si, r1, r2, mask);
+            Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
+            r1 = r2;
+            r2 = r;
+        }
+        for (j = 0; j < 2 * N - size; j++)
+        {
+            r = Simd::Vec4::LoadAligned((const int32_t*)&array[j + size - N].si);
+            Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[j].si, r);
+        }
+        for (; i < size; i++)
+        {
+            r = simd_recursion(&array[i - N].si, &array[i + POS1 - N].si, r1, r2, mask);
+            Simd::Vec4::StoreAligned((int32_t*)&array[i].si, r);
+            Simd::Vec4::StoreAligned((int32_t*)&g.m_sfmt[j++].si, r);
+            r1 = r2;
+            r2 = r;
+        }
+    }
 #else
-        inline void rshift128(w128_t* out, w128_t const* in, int shift)
+    inline void rshift128(w128_t* out, w128_t const* in, int shift)
+    {
+        AZ::u64 th, tl, oh, ol;
+ #ifdef ONLY64
+        th = ((AZ::u64)in->u[2] << 32) | ((AZ::u64)in->u[3]);
+        tl = ((AZ::u64)in->u[0] << 32) | ((AZ::u64)in->u[1]);
+
+        oh = th >> (shift * 8);
+        ol = tl >> (shift * 8);
+        ol |= th << (64 - shift * 8);
+        out->u[0] = (AZ::u32)(ol >> 32);
+        out->u[1] = (AZ::u32)ol;
+        out->u[2] = (AZ::u32)(oh >> 32);
+        out->u[3] = (AZ::u32)oh;
+#else
+        th = ((AZ::u64)in->u[3] << 32) | ((AZ::u64)in->u[2]);
+        tl = ((AZ::u64)in->u[1] << 32) | ((AZ::u64)in->u[0]);
+
+        oh = th >> (shift * 8);
+        ol = tl >> (shift * 8);
+        ol |= th << (64 - shift * 8);
+        out->u[1] = (AZ::u32)(ol >> 32);
+        out->u[0] = (AZ::u32)ol;
+        out->u[3] = (AZ::u32)(oh >> 32);
+        out->u[2] = (AZ::u32)oh;
+#endif
+    }
+
+    inline void lshift128(w128_t* out, w128_t const* in, int shift)
+    {
+        AZ::u64 th, tl, oh, ol;
+#ifdef ONLY64
+        th = ((AZ::u64)in->u[2] << 32) | ((AZ::u64)in->u[3]);
+        tl = ((AZ::u64)in->u[0] << 32) | ((AZ::u64)in->u[1]);
+
+        oh = th << (shift * 8);
+        ol = tl << (shift * 8);
+        oh |= tl >> (64 - shift * 8);
+        out->u[0] = (AZ::u32)(ol >> 32);
+        out->u[1] = (AZ::u32)ol;
+        out->u[2] = (AZ::u32)(oh >> 32);
+        out->u[3] = (AZ::u32)oh;
+#else
+        th = ((AZ::u64)in->u[3] << 32) | ((AZ::u64)in->u[2]);
+        tl = ((AZ::u64)in->u[1] << 32) | ((AZ::u64)in->u[0]);
+
+        oh = th << (shift * 8);
+        ol = tl << (shift * 8);
+        oh |= tl >> (64 - shift * 8);
+        out->u[1] = (AZ::u32)(ol >> 32);
+        out->u[0] = (AZ::u32)ol;
+        out->u[3] = (AZ::u32)(oh >> 32);
+        out->u[2] = (AZ::u32)oh;
+#endif
+    }
+
+    inline void do_recursion(w128_t* r, w128_t* a, w128_t* b, w128_t* c,    w128_t* d)
+    {
+        w128_t x;
+        w128_t y;
+        lshift128(&x, a, SL2);
+        rshift128(&y, c, SR2);
+#ifdef ONLY64
+        r->u[0] = a->u[0] ^ x.u[0] ^ ((b->u[0] >> SR1) & MSK2) ^ y.u[0] ^ (d->u[0] << SL1);
+        r->u[1] = a->u[1] ^ x.u[1] ^ ((b->u[1] >> SR1) & MSK1) ^ y.u[1] ^ (d->u[1] << SL1);
+        r->u[2] = a->u[2] ^ x.u[2] ^ ((b->u[2] >> SR1) & MSK4) ^ y.u[2] ^ (d->u[2] << SL1);
+        r->u[3] = a->u[3] ^ x.u[3] ^ ((b->u[3] >> SR1) & MSK3) ^ y.u[3] ^ (d->u[3] << SL1);
+#else
+        r->u[0] = a->u[0] ^ x.u[0] ^ ((b->u[0] >> SR1) & MSK1) ^ y.u[0] ^ (d->u[0] << SL1);
+        r->u[1] = a->u[1] ^ x.u[1] ^ ((b->u[1] >> SR1) & MSK2) ^ y.u[1] ^ (d->u[1] << SL1);
+        r->u[2] = a->u[2] ^ x.u[2] ^ ((b->u[2] >> SR1) & MSK3) ^ y.u[2] ^ (d->u[2] << SL1);
+        r->u[3] = a->u[3] ^ x.u[3] ^ ((b->u[3] >> SR1) & MSK4) ^ y.u[3] ^ (d->u[3] << SL1);
+#endif
+    }
+    /**
+     * This function fills the internal state array with pseudorandom
+     * integers.
+     */
+    inline void gen_rand_all(Sfmt& g)
+    {
+        int i;
+        w128_t* r1, * r2;
+
+        r1 = &g.m_sfmt[N - 2];
+        r2 = &g.m_sfmt[N - 1];
+        for (i = 0; i < N - POS1; i++)
         {
-            AZ::u64 th, tl, oh, ol;
-     #ifdef ONLY64
-            th = ((AZ::u64)in->u[2] << 32) | ((AZ::u64)in->u[3]);
-            tl = ((AZ::u64)in->u[0] << 32) | ((AZ::u64)in->u[1]);
-
-            oh = th >> (shift * 8);
-            ol = tl >> (shift * 8);
-            ol |= th << (64 - shift * 8);
-            out->u[0] = (AZ::u32)(ol >> 32);
-            out->u[1] = (AZ::u32)ol;
-            out->u[2] = (AZ::u32)(oh >> 32);
-            out->u[3] = (AZ::u32)oh;
-    #else
-            th = ((AZ::u64)in->u[3] << 32) | ((AZ::u64)in->u[2]);
-            tl = ((AZ::u64)in->u[1] << 32) | ((AZ::u64)in->u[0]);
-
-            oh = th >> (shift * 8);
-            ol = tl >> (shift * 8);
-            ol |= th << (64 - shift * 8);
-            out->u[1] = (AZ::u32)(ol >> 32);
-            out->u[0] = (AZ::u32)ol;
-            out->u[3] = (AZ::u32)(oh >> 32);
-            out->u[2] = (AZ::u32)oh;
-    #endif
+            do_recursion(&g.m_sfmt[i], &g.m_sfmt[i], &g.m_sfmt[i + POS1], r1, r2);
+            r1 = r2;
+            r2 = &g.m_sfmt[i];
         }
-
-        inline void lshift128(w128_t* out, w128_t const* in, int shift)
+        for (; i < N; i++)
         {
-            AZ::u64 th, tl, oh, ol;
-    #ifdef ONLY64
-            th = ((AZ::u64)in->u[2] << 32) | ((AZ::u64)in->u[3]);
-            tl = ((AZ::u64)in->u[0] << 32) | ((AZ::u64)in->u[1]);
-
-            oh = th << (shift * 8);
-            ol = tl << (shift * 8);
-            oh |= tl >> (64 - shift * 8);
-            out->u[0] = (AZ::u32)(ol >> 32);
-            out->u[1] = (AZ::u32)ol;
-            out->u[2] = (AZ::u32)(oh >> 32);
-            out->u[3] = (AZ::u32)oh;
-    #else
-            th = ((AZ::u64)in->u[3] << 32) | ((AZ::u64)in->u[2]);
-            tl = ((AZ::u64)in->u[1] << 32) | ((AZ::u64)in->u[0]);
-
-            oh = th << (shift * 8);
-            ol = tl << (shift * 8);
-            oh |= tl >> (64 - shift * 8);
-            out->u[1] = (AZ::u32)(ol >> 32);
-            out->u[0] = (AZ::u32)ol;
-            out->u[3] = (AZ::u32)(oh >> 32);
-            out->u[2] = (AZ::u32)oh;
-    #endif
+            do_recursion(&g.m_sfmt[i], &g.m_sfmt[i], &g.m_sfmt[i + POS1 - N], r1, r2);
+            r1 = r2;
+            r2 = &g.m_sfmt[i];
         }
+    }
 
-        inline void do_recursion(w128_t* r, w128_t* a, w128_t* b, w128_t* c,    w128_t* d)
+    /**
+     * This function fills the user-specified array with pseudorandom
+     * integers.
+     *
+     * @param array an 128-bit array to be filled by pseudorandom numbers.
+     * @param size number of 128-bit pseudorandom numbers to be generated.
+     */
+    inline void gen_rand_array(Sfmt& g, w128_t* array, int size)
+    {
+        int i, j;
+        w128_t* r1, * r2;
+
+        r1 = &g.m_sfmt[N - 2];
+        r2 = &g.m_sfmt[N - 1];
+        for (i = 0; i < N - POS1; i++)
         {
-            w128_t x;
-            w128_t y;
-            lshift128(&x, a, SL2);
-            rshift128(&y, c, SR2);
-    #ifdef ONLY64
-            r->u[0] = a->u[0] ^ x.u[0] ^ ((b->u[0] >> SR1) & MSK2) ^ y.u[0] ^ (d->u[0] << SL1);
-            r->u[1] = a->u[1] ^ x.u[1] ^ ((b->u[1] >> SR1) & MSK1) ^ y.u[1] ^ (d->u[1] << SL1);
-            r->u[2] = a->u[2] ^ x.u[2] ^ ((b->u[2] >> SR1) & MSK4) ^ y.u[2] ^ (d->u[2] << SL1);
-            r->u[3] = a->u[3] ^ x.u[3] ^ ((b->u[3] >> SR1) & MSK3) ^ y.u[3] ^ (d->u[3] << SL1);
-    #else
-            r->u[0] = a->u[0] ^ x.u[0] ^ ((b->u[0] >> SR1) & MSK1) ^ y.u[0] ^ (d->u[0] << SL1);
-            r->u[1] = a->u[1] ^ x.u[1] ^ ((b->u[1] >> SR1) & MSK2) ^ y.u[1] ^ (d->u[1] << SL1);
-            r->u[2] = a->u[2] ^ x.u[2] ^ ((b->u[2] >> SR1) & MSK3) ^ y.u[2] ^ (d->u[2] << SL1);
-            r->u[3] = a->u[3] ^ x.u[3] ^ ((b->u[3] >> SR1) & MSK4) ^ y.u[3] ^ (d->u[3] << SL1);
-    #endif
+            do_recursion(&array[i], &g.m_sfmt[i], &g.m_sfmt[i + POS1], r1, r2);
+            r1 = r2;
+            r2 = &array[i];
         }
-        /**
-         * This function fills the internal state array with pseudorandom
-         * integers.
-         */
-        inline void gen_rand_all(Sfmt& g)
+        for (; i < N; i++)
         {
-            int i;
-            w128_t* r1, * r2;
-
-            r1 = &g.m_sfmt[N - 2];
-            r2 = &g.m_sfmt[N - 1];
-            for (i = 0; i < N - POS1; i++)
-            {
-                do_recursion(&g.m_sfmt[i], &g.m_sfmt[i], &g.m_sfmt[i + POS1], r1, r2);
-                r1 = r2;
-                r2 = &g.m_sfmt[i];
-            }
-            for (; i < N; i++)
-            {
-                do_recursion(&g.m_sfmt[i], &g.m_sfmt[i], &g.m_sfmt[i + POS1 - N], r1, r2);
-                r1 = r2;
-                r2 = &g.m_sfmt[i];
-            }
+            do_recursion(&array[i], &g.m_sfmt[i], &array[i + POS1 - N], r1, r2);
+            r1 = r2;
+            r2 = &array[i];
         }
-
-        /**
-         * This function fills the user-specified array with pseudorandom
-         * integers.
-         *
-         * @param array an 128-bit array to be filled by pseudorandom numbers.
-         * @param size number of 128-bit pseudorandom numbers to be generated.
-         */
-        inline void gen_rand_array(Sfmt& g, w128_t* array, int size)
+        for (; i < size - N; i++)
         {
-            int i, j;
-            w128_t* r1, * r2;
-
-            r1 = &g.m_sfmt[N - 2];
-            r2 = &g.m_sfmt[N - 1];
-            for (i = 0; i < N - POS1; i++)
-            {
-                do_recursion(&array[i], &g.m_sfmt[i], &g.m_sfmt[i + POS1], r1, r2);
-                r1 = r2;
-                r2 = &array[i];
-            }
-            for (; i < N; i++)
-            {
-                do_recursion(&array[i], &g.m_sfmt[i], &array[i + POS1 - N], r1, r2);
-                r1 = r2;
-                r2 = &array[i];
-            }
-            for (; i < size - N; i++)
-            {
-                do_recursion(&array[i], &array[i - N], &array[i + POS1 - N], r1, r2);
-                r1 = r2;
-                r2 = &array[i];
-            }
-            for (j = 0; j < 2 * N - size; j++)
-            {
-                g.m_sfmt[j] = array[j + size - N];
-            }
-            for (; i < size; i++, j++)
-            {
-                do_recursion(&array[i], &array[i - N], &array[i + POS1 - N], r1, r2);
-                r1 = r2;
-                r2 = &array[i];
-                g.m_sfmt[j] = array[i];
-            }
+            do_recursion(&array[i], &array[i - N], &array[i + POS1 - N], r1, r2);
+            r1 = r2;
+            r2 = &array[i];
         }
+        for (j = 0; j < 2 * N - size; j++)
+        {
+            g.m_sfmt[j] = array[j + size - N];
+        }
+        for (; i < size; i++, j++)
+        {
+            do_recursion(&array[i], &array[i - N], &array[i + POS1 - N], r1, r2);
+            r1 = r2;
+            r2 = &array[i];
+            g.m_sfmt[j] = array[i];
+        }
+    }
 
 #endif
-    } // SmftInternal
-} // AZ
-
+} // namespace AZ::SfmtInternal
 
 using namespace AZ;
 
diff --git a/Code/Framework/AzCore/AzCore/Math/Uuid.h b/Code/Framework/AzCore/AzCore/Math/Uuid.h
index 6b77e7ec3e..eeacb04877 100644
--- a/Code/Framework/AzCore/AzCore/Math/Uuid.h
+++ b/Code/Framework/AzCore/AzCore/Math/Uuid.h
@@ -45,7 +45,7 @@ namespace AZ
         static constexpr int ValidUuidStringLength = 32; /// Number of characters (data only, no extra formatting) in a valid UUID string
         static const size_t MaxStringBuffer = 39; /// 32 Uuid + 4 dashes + 2 brackets + 1 terminate
         
-        Uuid()  {}
+        Uuid() = default;
         Uuid(const char* string, size_t stringLength = 0) { *this = CreateString(string, stringLength); }
 
         static Uuid CreateNull();
diff --git a/Code/Framework/AzCore/AzCore/Math/Vector2.h b/Code/Framework/AzCore/AzCore/Math/Vector2.h
index 7c37d74135..91eb61d6c8 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector2.h
+++ b/Code/Framework/AzCore/AzCore/Math/Vector2.h
@@ -30,7 +30,7 @@ namespace AZ
 
         Vector2() = default;
 
-        Vector2(const Vector2& v);
+        Vector2(const Vector2& v) = default;
 
         //! Constructs vector with all components set to the same specified value.
         explicit Vector2(float x);
diff --git a/Code/Framework/AzCore/AzCore/Math/Vector2.inl b/Code/Framework/AzCore/AzCore/Math/Vector2.inl
index 086be2bbc3..9691dd3a5c 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector2.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Vector2.inl
@@ -8,13 +8,6 @@
 
 namespace AZ
 {
-    AZ_MATH_INLINE Vector2::Vector2(const Vector2& v)
-        : m_value(v.m_value)
-    {
-        ;
-    }
-
-
     AZ_MATH_INLINE Vector2::Vector2(float x)
         : m_value(Simd::Vec2::Splat(x))
     {
diff --git a/Code/Framework/AzCore/AzCore/Math/Vector3.h b/Code/Framework/AzCore/AzCore/Math/Vector3.h
index 821dc8292c..6b7c53266d 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector3.h
+++ b/Code/Framework/AzCore/AzCore/Math/Vector3.h
@@ -100,7 +100,7 @@ namespace AZ
         void Set(float x, float y, float z);
 
         //! Sets components from an array of 3 floats in xyz order.
-        void Set(float values[]);
+        void Set(const float values[]);
 
         //! Indexed access using operator(), just for convenience.
         float operator()(int32_t index) const;
diff --git a/Code/Framework/AzCore/AzCore/Math/Vector3.inl b/Code/Framework/AzCore/AzCore/Math/Vector3.inl
index 879ade38cf..6371c688b8 100644
--- a/Code/Framework/AzCore/AzCore/Math/Vector3.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Vector3.inl
@@ -186,7 +186,7 @@ namespace AZ
     }
 
 
-    AZ_MATH_INLINE void Vector3::Set(float values[])
+    AZ_MATH_INLINE void Vector3::Set(const float values[])
     {
         m_value = Simd::Vec3::LoadImmediate(values[0], values[1], values[2]);
     }
diff --git a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp
index 3c09b4cae6..44ce08ebd9 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp
@@ -20,44 +20,42 @@
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/std/containers/array.h>
 
-using namespace AZ;
-
 #if !defined(RELEASE) && !defined(AZCORE_MEMORY_ENABLE_OVERRIDES)
 #   define AZCORE_MEMORY_ENABLE_OVERRIDES
 #endif
 
-namespace AZ
+namespace AZ::Internal
 {
-    namespace Internal
+    struct AMStringHasher
     {
-        struct AMStringHasher
+        using is_transparent = void;
+        template<typename ConvertibleToStringView>
+        size_t operator()(const ConvertibleToStringView& key)
         {
-            using is_transparent = void;
-            template<typename ConvertibleToStringView>
-            size_t operator()(const ConvertibleToStringView& key)
-            {
-                return AZStd::hash<AZStd::string_view>{}(key);
-            }
-        };
-        using AMString = AZStd::basic_string<char, AZStd::char_traits<char>, AZStdIAllocator>;
-        using AllocatorNameMap = AZStd::unordered_map<AMString, IAllocator*, AMStringHasher, AZStd::equal_to<>, AZStdIAllocator>;
-        using AllocatorRemappings = AZStd::unordered_map<AMString, AMString, AMStringHasher, AZStd::equal_to<>, AZStdIAllocator>;
+            return AZStd::hash<AZStd::string_view>{}(key);
+        }
+    };
+    using AMString = AZStd::basic_string<char, AZStd::char_traits<char>, AZStdIAllocator>;
+    using AllocatorNameMap = AZStd::unordered_map<AMString, IAllocator*, AMStringHasher, AZStd::equal_to<>, AZStdIAllocator>;
+    using AllocatorRemappings = AZStd::unordered_map<AMString, AMString, AMStringHasher, AZStd::equal_to<>, AZStdIAllocator>;
 
-        // For allocators that are created before we have an environment, we keep some module-local data for them so that we can register them 
-        // properly once the environment is attached.
-        struct PreEnvironmentAttachData
-        {
-            static const int MAX_UNREGISTERED_ALLOCATORS = 8;
-            AZStd::mutex m_mutex;
-            MallocSchema m_mallocSchema;
-            IAllocator* m_unregisteredAllocators[MAX_UNREGISTERED_ALLOCATORS];
-            int m_unregisteredAllocatorCount = 0;
-        };
+    // For allocators that are created before we have an environment, we keep some module-local data for them so that we can register them
+    // properly once the environment is attached.
+    struct PreEnvironmentAttachData
+    {
+        static const int MAX_UNREGISTERED_ALLOCATORS = 8;
+        AZStd::mutex m_mutex;
+        MallocSchema m_mallocSchema;
+        IAllocator* m_unregisteredAllocators[MAX_UNREGISTERED_ALLOCATORS];
+        int m_unregisteredAllocatorCount = 0;
+    };
 
-    }
 }
 
-struct AZ::AllocatorManager::InternalData
+namespace AZ
+{
+
+struct AllocatorManager::InternalData
 {
     explicit InternalData(const AZStdIAllocator& alloc)
         : m_allocatorMap(alloc)
@@ -69,13 +67,13 @@ struct AZ::AllocatorManager::InternalData
     Internal::AllocatorRemappings m_remappingsReverse;
 };
 
-static AZ::EnvironmentVariable<AllocatorManager> s_allocManager = nullptr;
+static EnvironmentVariable<AllocatorManager> s_allocManager = nullptr;
 static AllocatorManager* s_allocManagerDebug = nullptr;  // For easier viewing in crash dumps
 
 /// Returns a module-local instance of data to use for allocators that are created before the environment is attached.
-static AZ::Internal::PreEnvironmentAttachData& GetPreEnvironmentAttachData()
+static Internal::PreEnvironmentAttachData& GetPreEnvironmentAttachData()
 {
-    static AZ::Internal::PreEnvironmentAttachData s_data;
+    static Internal::PreEnvironmentAttachData s_data;
 
     return s_data;
 }
@@ -131,7 +129,7 @@ AllocatorManager& AllocatorManager::Instance()
     if (!s_allocManager)
     {
         AZ_Assert(Environment::IsReady(), "Environment must be ready before calling Instance()");
-        s_allocManager = AZ::Environment::CreateVariable<AllocatorManager>(AZ_CRC("AZ::AllocatorManager::s_allocManager", 0x6bdd908c));
+        s_allocManager = Environment::CreateVariable<AllocatorManager>(AZ_CRC_CE("AZ::AllocatorManager::s_allocManager"));
 
         // Register any allocators that were created in this module before we attached to the environment
         auto& data = GetPreEnvironmentAttachData();
@@ -156,9 +154,9 @@ AllocatorManager& AllocatorManager::Instance()
 
 //////////////////////////////////////////////////////////////////////////
 // Create malloc schema using custom AZ_OS_MALLOC allocator.
-AZ::MallocSchema* AllocatorManager::CreateMallocSchema()
+MallocSchema* AllocatorManager::CreateMallocSchema()
 {
-    return static_cast<AZ::MallocSchema*>(new(AZ_OS_MALLOC(sizeof(AZ::MallocSchema), alignof(AZ::MallocSchema))) AZ::MallocSchema());
+    return static_cast<MallocSchema*>(new(AZ_OS_MALLOC(sizeof(MallocSchema), alignof(MallocSchema))) MallocSchema());
 }
 
 
@@ -168,7 +166,7 @@ AZ::MallocSchema* AllocatorManager::CreateMallocSchema()
 //=========================================================================
 AllocatorManager::AllocatorManager()
     : m_profilingRefcount(0)
-    , m_mallocSchema(CreateMallocSchema(), [](AZ::MallocSchema* schema)
+    , m_mallocSchema(CreateMallocSchema(), [](MallocSchema* schema)
     {
         if (schema)
         {
@@ -182,7 +180,7 @@ AllocatorManager::AllocatorManager()
     m_numAllocators = 0;
     m_isAllocatorLeaking = false;
     m_configurationFinalized = false;
-    m_defaultTrackingRecordMode = AZ::Debug::AllocationRecords::RECORD_NO_RECORDS;
+    m_defaultTrackingRecordMode = Debug::AllocationRecords::RECORD_NO_RECORDS;
     m_data = new (m_mallocSchema->Allocate(sizeof(InternalData), AZStd::alignment_of<InternalData>::value, 0)) InternalData(AZStdIAllocator(m_mallocSchema.get()));
 }
 
@@ -411,12 +409,12 @@ AllocatorManager::RemoveOutOfMemoryListener()
 // [9/16/2011]
 //=========================================================================
 void
-AllocatorManager::SetTrackingMode(AZ::Debug::AllocationRecords::Mode mode)
+AllocatorManager::SetTrackingMode(Debug::AllocationRecords::Mode mode)
 {
     AZStd::lock_guard<AZStd::mutex> lock(m_allocatorListMutex);
     for (int i = 0; i < m_numAllocators; ++i)
     {
-        AZ::Debug::AllocationRecords* records = m_allocators[i]->GetRecords();
+        Debug::AllocationRecords* records = m_allocators[i]->GetRecords();
         if (records)
         {
             records->SetMode(mode);
@@ -595,31 +593,31 @@ void AllocatorManager::GetAllocatorStats(size_t& allocatedBytes, size_t& capacit
 
     AZStd::lock_guard<AZStd::mutex> lock(m_allocatorListMutex);
     const int allocatorCount = GetNumAllocators();
-    AZStd::unordered_map<AZ::IAllocatorAllocate*, AZ::IAllocator*> existingAllocators;
-    AZStd::unordered_map<AZ::IAllocatorAllocate*, AZ::IAllocator*> sourcesToAllocators;
+    AZStd::unordered_map<IAllocatorAllocate*, IAllocator*> existingAllocators;
+    AZStd::unordered_map<IAllocatorAllocate*, IAllocator*> sourcesToAllocators;
 
     // Build a mapping of original allocator sources to their allocators
     for (int i = 0; i < allocatorCount; ++i)
     {
-        AZ::IAllocator* allocator = GetAllocator(i);
+        IAllocator* allocator = GetAllocator(i);
         sourcesToAllocators.emplace(allocator->GetOriginalAllocationSource(), allocator);
     }
 
     for (int i = 0; i < allocatorCount; ++i)
     {
-        AZ::IAllocator* allocator = GetAllocator(i);
-        AZ::IAllocatorAllocate* source = allocator->GetAllocationSource();
-        AZ::IAllocatorAllocate* originalSource = allocator->GetOriginalAllocationSource();
-        AZ::IAllocatorAllocate* schema = allocator->GetSchema();
-        AZ::IAllocator* alias = (source != originalSource) ? sourcesToAllocators[source] : nullptr;
+        IAllocator* allocator = GetAllocator(i);
+        IAllocatorAllocate* source = allocator->GetAllocationSource();
+        IAllocatorAllocate* originalSource = allocator->GetOriginalAllocationSource();
+        IAllocatorAllocate* schema = allocator->GetSchema();
+        IAllocator* alias = (source != originalSource) ? sourcesToAllocators[source] : nullptr;
 
         if (schema && !alias)
         {
             // Check to see if this allocator's source maps to another allocator
             // Need to check both the schema and the allocator itself, as either one might be used as the alias depending on how it's implemented
-            AZStd::array<AZ::IAllocatorAllocate*, 2> checkAllocators = { { schema, allocator->GetAllocationSource() } };
+            AZStd::array<IAllocatorAllocate*, 2> checkAllocators = { { schema, allocator->GetAllocationSource() } };
 
-            for (AZ::IAllocatorAllocate* check : checkAllocators)
+            for (IAllocatorAllocate* check : checkAllocators)
             {
                 auto existing = existingAllocators.emplace(check, allocator);
 
@@ -631,7 +629,7 @@ void AllocatorManager::GetAllocatorStats(size_t& allocatedBytes, size_t& capacit
             }
         }
 
-        static const AZ::IAllocator* OS_ALLOCATOR = &AZ::AllocatorInstance<AZ::OSAllocator>::GetAllocator();
+        static const IAllocator* OS_ALLOCATOR = &AllocatorInstance<OSAllocator>::GetAllocator();
         size_t sourceAllocatedBytes = source->NumAllocatedBytes();
         size_t sourceCapacityBytes = source->Capacity();
 
@@ -742,3 +740,5 @@ AllocatorManager::DebugBreak(void* address, const Debug::AllocationInfo& info)
         }
     }
 }
+
+} // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp b/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp
index 154d59edd3..e4928e83c5 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorOverrideShim.cpp
@@ -8,223 +8,220 @@
 
 #include <AzCore/Memory/AllocatorOverrideShim.h>
 
-namespace AZ
+namespace AZ::Internal
 {
-    namespace Internal
+    AllocatorOverrideShim* AllocatorOverrideShim::Create(IAllocator* owningAllocator, IAllocatorAllocate* shimAllocationSource)
     {
-        AllocatorOverrideShim* AllocatorOverrideShim::Create(IAllocator* owningAllocator, IAllocatorAllocate* shimAllocationSource)
+        void* memory = shimAllocationSource->Allocate(sizeof(AllocatorOverrideShim), AZStd::alignment_of<AllocatorOverrideShim>::value, 0);
+        auto result = new (memory) AllocatorOverrideShim(owningAllocator, shimAllocationSource);
+        return result;
+    }
+
+    void AllocatorOverrideShim::Destroy(AllocatorOverrideShim* source)
+    {
+        auto shimAllocationSource = source->m_shimAllocationSource;
+        source->~AllocatorOverrideShim();
+        shimAllocationSource->DeAllocate(source);
+    }
+
+    AllocatorOverrideShim::AllocatorOverrideShim(IAllocator* owningAllocator, IAllocatorAllocate* shimAllocationSource)
+        : m_owningAllocator(owningAllocator)
+        , m_source(owningAllocator->GetOriginalAllocationSource())
+        , m_overridingSource(owningAllocator->GetOriginalAllocationSource())
+        , m_shimAllocationSource(shimAllocationSource)
+        , m_records(typename AllocationSet::hasher(), typename AllocationSet::key_eq(), StdAllocationSrc(shimAllocationSource))
+    {
+    }
+
+    void AllocatorOverrideShim::SetOverride(IAllocatorAllocate* source)
+    {
+        m_overridingSource = source;
+    }
+
+    IAllocatorAllocate* AllocatorOverrideShim::GetOverride() const
+    {
+        return m_overridingSource;
+    }
+
+    bool AllocatorOverrideShim::IsOverridden() const
+    {
+        return m_source != m_overridingSource;
+    }
+
+    bool AllocatorOverrideShim::HasOrphanedAllocations() const
+    {
+        return !m_records.empty();
+    }
+
+    void AllocatorOverrideShim::SetFinalizedConfiguration()
+    {
+        m_finalizedConfiguration = true;
+    }
+
+    typename AllocatorOverrideShim::pointer_type AllocatorOverrideShim::Allocate(size_type byteSize, size_type alignment, int flags, const char* name, const char* fileName, int lineNum, unsigned int suppressStackRecord)
+    {
+        pointer_type ptr = m_overridingSource->Allocate(byteSize, alignment, flags, name, fileName, lineNum, suppressStackRecord);
+
+        if (!IsOverridden())
         {
-            void* memory = shimAllocationSource->Allocate(sizeof(AllocatorOverrideShim), AZStd::alignment_of<AllocatorOverrideShim>::value, 0);
-            auto result = new (memory) AllocatorOverrideShim(owningAllocator, shimAllocationSource);
-            return result;
+            lock_type lock(m_mutex);
+            m_records.insert(ptr);  // Record in case we need to orphan this allocation later
         }
 
-        void AllocatorOverrideShim::Destroy(AllocatorOverrideShim* source)
+        return ptr;
+    }
+
+    void AllocatorOverrideShim::DeAllocate(pointer_type ptr, size_type byteSize, size_type alignment)
+    {
+        IAllocatorAllocate* source = m_overridingSource;
+        bool destroy = false;
+
         {
-            auto shimAllocationSource = source->m_shimAllocationSource;
-            source->~AllocatorOverrideShim();
-            shimAllocationSource->DeAllocate(source);
+            lock_type lock(m_mutex);
+
+            // Check to see if this came from a prior allocation source
+            if (m_records.erase(ptr) && IsOverridden())
+            {
+                source = m_source;
+
+                if (m_records.empty() && m_finalizedConfiguration)
+                {
+                    // All orphaned records are gone; we are no longer needed
+                    m_owningAllocator->SetAllocationSource(m_overridingSource);
+                    destroy = true;  // Must destroy outside the lock
+                }
+            }
         }
 
-        AllocatorOverrideShim::AllocatorOverrideShim(IAllocator* owningAllocator, IAllocatorAllocate* shimAllocationSource)
-            : m_owningAllocator(owningAllocator)
-            , m_source(owningAllocator->GetOriginalAllocationSource())
-            , m_overridingSource(owningAllocator->GetOriginalAllocationSource())
-            , m_shimAllocationSource(shimAllocationSource)
-            , m_records(typename AllocationSet::hasher(), typename AllocationSet::key_eq(), StdAllocationSrc(shimAllocationSource))
+        source->DeAllocate(ptr, byteSize, alignment);
+
+        if (destroy)
         {
+            Destroy(this);
+        }
+    }
+
+    typename AllocatorOverrideShim::size_type AllocatorOverrideShim::Resize(pointer_type ptr, size_type newSize)
+    {
+        IAllocatorAllocate* source = m_overridingSource;
+
+        if (IsOverridden())
+        {
+            // Determine who owns the allocation
+            lock_type lock(m_mutex);
+
+            if (m_records.count(ptr))
+            {
+                source = m_source;
+            }
         }
 
-        void AllocatorOverrideShim::SetOverride(IAllocatorAllocate* source)
+        size_t result = source->Resize(ptr, newSize);
+
+        return result;
+    }
+
+    typename AllocatorOverrideShim::pointer_type AllocatorOverrideShim::ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment)
+    {
+        pointer_type newPtr = nullptr;
+        bool useOverride = true;
+        bool destroy = false;
+
+        if (IsOverridden())
         {
-            m_overridingSource = source;
+            lock_type lock(m_mutex);
+
+            if (m_records.erase(ptr))
+            {
+                // An old allocation needs to be transferred to the new, overriding allocator.
+                useOverride = false;  // We'll do the reallocation here
+                size_t oldSize = m_source->AllocationSize(ptr);
+
+                if (newSize)
+                {
+                    newPtr = m_overridingSource->Allocate(newSize, newAlignment, 0);
+                    memcpy(newPtr, ptr, AZStd::min(newSize, oldSize));
+                }
+
+                m_source->DeAllocate(ptr, oldSize);
+
+                if (m_records.empty() && m_finalizedConfiguration)
+                {
+                    // All orphaned records are gone; we are no longer needed
+                    m_owningAllocator->SetAllocationSource(m_overridingSource);
+                    destroy = true;  // Must destroy outside the lock
+                }
+            }
         }
 
-        IAllocatorAllocate* AllocatorOverrideShim::GetOverride() const
+        if (useOverride)
         {
-            return m_overridingSource;
-        }
-
-        bool AllocatorOverrideShim::IsOverridden() const
-        {
-            return m_source != m_overridingSource;
-        }
-
-        bool AllocatorOverrideShim::HasOrphanedAllocations() const
-        {
-            return !m_records.empty();
-        }
-
-        void AllocatorOverrideShim::SetFinalizedConfiguration()
-        {
-            m_finalizedConfiguration = true;
-        }
-
-        typename AllocatorOverrideShim::pointer_type AllocatorOverrideShim::Allocate(size_type byteSize, size_type alignment, int flags, const char* name, const char* fileName, int lineNum, unsigned int suppressStackRecord)
-        {
-            pointer_type ptr = m_overridingSource->Allocate(byteSize, alignment, flags, name, fileName, lineNum, suppressStackRecord);
+            // Default behavior, we weren't deleting an old allocation
+            newPtr = m_overridingSource->ReAllocate(ptr, newSize, newAlignment);
 
             if (!IsOverridden())
             {
+                // Still need to do bookkeeping if we haven't been overridden yet
                 lock_type lock(m_mutex);
-                m_records.insert(ptr);  // Record in case we need to orphan this allocation later
-            }
-
-            return ptr;
-        }
-
-        void AllocatorOverrideShim::DeAllocate(pointer_type ptr, size_type byteSize, size_type alignment)
-        {
-            IAllocatorAllocate* source = m_overridingSource;
-            bool destroy = false;
-
-            {
-                lock_type lock(m_mutex);
-
-                // Check to see if this came from a prior allocation source
-                if (m_records.erase(ptr) && IsOverridden())
-                {
-                    source = m_source;
-
-                    if (m_records.empty() && m_finalizedConfiguration)
-                    {
-                        // All orphaned records are gone; we are no longer needed
-                        m_owningAllocator->SetAllocationSource(m_overridingSource);
-                        destroy = true;  // Must destroy outside the lock
-                    }
-                }
-            }
-
-            source->DeAllocate(ptr, byteSize, alignment);
-
-            if (destroy)
-            {
-                Destroy(this);
+                m_records.erase(ptr);
+                m_records.insert(newPtr);
             }
         }
 
-        typename AllocatorOverrideShim::size_type AllocatorOverrideShim::Resize(pointer_type ptr, size_type newSize)
+        if (destroy)
         {
-            IAllocatorAllocate* source = m_overridingSource;
-
-            if (IsOverridden())
-            {
-                // Determine who owns the allocation
-                lock_type lock(m_mutex);
-
-                if (m_records.count(ptr))
-                {
-                    source = m_source;
-                }
-            }
-
-            size_t result = source->Resize(ptr, newSize);
-
-            return result;
-        }
-
-        typename AllocatorOverrideShim::pointer_type AllocatorOverrideShim::ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment)
-        {
-            pointer_type newPtr = nullptr;
-            bool useOverride = true;
-            bool destroy = false;
-
-            if (IsOverridden())
-            {
-                lock_type lock(m_mutex);
-
-                if (m_records.erase(ptr))
-                {
-                    // An old allocation needs to be transferred to the new, overriding allocator.
-                    useOverride = false;  // We'll do the reallocation here
-                    size_t oldSize = m_source->AllocationSize(ptr);
-
-                    if (newSize)
-                    {
-                        newPtr = m_overridingSource->Allocate(newSize, newAlignment, 0);
-                        memcpy(newPtr, ptr, AZStd::min(newSize, oldSize));
-                    }
-
-                    m_source->DeAllocate(ptr, oldSize);
-
-                    if (m_records.empty() && m_finalizedConfiguration)
-                    {
-                        // All orphaned records are gone; we are no longer needed
-                        m_owningAllocator->SetAllocationSource(m_overridingSource);
-                        destroy = true;  // Must destroy outside the lock
-                    }
-                }
-            }
-
-            if (useOverride)
-            {
-                // Default behavior, we weren't deleting an old allocation
-                newPtr = m_overridingSource->ReAllocate(ptr, newSize, newAlignment);
-
-                if (!IsOverridden())
-                {
-                    // Still need to do bookkeeping if we haven't been overridden yet
-                    lock_type lock(m_mutex);
-                    m_records.erase(ptr);
-                    m_records.insert(newPtr);
-                }
-            }
-
-            if (destroy)
-            {
-                Destroy(this);
-            }
-
-            return newPtr;
-        }
-
-        typename AllocatorOverrideShim::size_type AllocatorOverrideShim::AllocationSize(pointer_type ptr)
-        {
-            IAllocatorAllocate* source = m_overridingSource;
-
-            if (IsOverridden())
-            {
-                // Determine who owns the allocation
-                lock_type lock(m_mutex);
-
-                if (m_records.count(ptr))
-                {
-                    source = m_source;
-                }
-            }
-
-            return source->AllocationSize(ptr);
-        }
-
-        void AllocatorOverrideShim::GarbageCollect()
-        {
-            m_source->GarbageCollect();
-        }
-
-        typename AllocatorOverrideShim::size_type AllocatorOverrideShim::NumAllocatedBytes() const
-        {
-            return m_source->NumAllocatedBytes();
-        }
-
-        typename AllocatorOverrideShim::size_type AllocatorOverrideShim::Capacity() const
-        {
-            return m_source->Capacity();
-        }
-
-        typename AllocatorOverrideShim::size_type AllocatorOverrideShim::GetMaxAllocationSize() const
-        {
-            return m_source->GetMaxAllocationSize();
-        }
-
-        auto AllocatorOverrideShim::GetMaxContiguousAllocationSize() const -> size_type
-        {
-            return m_source->GetMaxContiguousAllocationSize();
-        }
-
-        IAllocatorAllocate* AllocatorOverrideShim::GetSubAllocator()
-        {
-            return m_source->GetSubAllocator();
+            Destroy(this);
         }
 
+        return newPtr;
     }
-}
+
+    typename AllocatorOverrideShim::size_type AllocatorOverrideShim::AllocationSize(pointer_type ptr)
+    {
+        IAllocatorAllocate* source = m_overridingSource;
+
+        if (IsOverridden())
+        {
+            // Determine who owns the allocation
+            lock_type lock(m_mutex);
+
+            if (m_records.count(ptr))
+            {
+                source = m_source;
+            }
+        }
+
+        return source->AllocationSize(ptr);
+    }
+
+    void AllocatorOverrideShim::GarbageCollect()
+    {
+        m_source->GarbageCollect();
+    }
+
+    typename AllocatorOverrideShim::size_type AllocatorOverrideShim::NumAllocatedBytes() const
+    {
+        return m_source->NumAllocatedBytes();
+    }
+
+    typename AllocatorOverrideShim::size_type AllocatorOverrideShim::Capacity() const
+    {
+        return m_source->Capacity();
+    }
+
+    typename AllocatorOverrideShim::size_type AllocatorOverrideShim::GetMaxAllocationSize() const
+    {
+        return m_source->GetMaxAllocationSize();
+    }
+
+    auto AllocatorOverrideShim::GetMaxContiguousAllocationSize() const -> size_type
+    {
+        return m_source->GetMaxContiguousAllocationSize();
+    }
+
+    IAllocatorAllocate* AllocatorOverrideShim::GetSubAllocator()
+    {
+        return m_source->GetSubAllocator();
+    }
+
+} // namespace AZ::Internal
diff --git a/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
index 6af8f201c2..6e40ccd8cd 100644
--- a/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
@@ -140,8 +140,8 @@ namespace AZ {
         class const_iterator;
         class iterator
         {
-            typedef T& reference;
-            typedef T* pointer;
+            using reference = T&;
+            using pointer = T*;
             friend class const_iterator;
             T* mPtr;
         public:
@@ -171,8 +171,8 @@ namespace AZ {
 
         class const_iterator
         {
-            typedef const T& reference;
-            typedef const T* pointer;
+            using reference = const T &;
+            using pointer = const T *;
             const T* mPtr;
         public:
             const_iterator()
@@ -327,7 +327,7 @@ namespace AZ {
             uint64_t mSizeAndFlags;
 
         public:
-            typedef block_header* block_ptr;
+            using block_ptr = block_header *;
             size_t size() const { return mSizeAndFlags & ~BL_FLAG_MASK; }
             block_ptr next() const {return (block_ptr)((char*)mem() + size()); }
             block_ptr prev() const {return mPrev; }
@@ -415,7 +415,7 @@ namespace AZ {
             void dec_ref()                          { HPPA_ASSERT(mUseCount > 0); mUseCount--; }
             bool check_marker(size_t marker) const  { return mMarker == (marker ^ ((size_t)this)); }
         };
-        typedef intrusive_list<page> page_list;
+        using page_list = intrusive_list<page>;
         class bucket
         {
             page_list mPageList;
diff --git a/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp
index 76a71e0f08..9aa31cd8b6 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/MallocSchema.cpp
@@ -11,149 +11,168 @@
 #include <AzCore/Memory/OSAllocator.h>
 #include <AzCore/std/algorithm.h>
 
+namespace AZ::Internal
+{
+    struct Header
+    {
+        uint32_t offset;
+        uint32_t size;
+    };
+} // namespace AZ::Internal
+
 namespace AZ
 {
-    namespace Internal
+    //---------------------------------------------------------------------
+    // MallocSchema methods
+    //---------------------------------------------------------------------
+
+    MallocSchema::MallocSchema(const Descriptor& desc)
+        : m_bytesAllocated(0)
     {
-        struct Header
+        if (desc.m_useAZMalloc)
         {
-            uint32_t offset;
-            uint32_t size;
-        };
+            static const int DEFAULT_ALIGNMENT = sizeof(void*) * 2; // Default malloc alignment
+
+            m_mallocFn = [](size_t byteSize)
+            {
+                return AZ_OS_MALLOC(byteSize, DEFAULT_ALIGNMENT);
+            };
+            m_freeFn = [](void* ptr)
+            {
+                AZ_OS_FREE(ptr);
+            };
+        }
+        else
+        {
+            m_mallocFn = &malloc;
+            m_freeFn = &free;
+        }
     }
-}
 
-//---------------------------------------------------------------------
-// MallocSchema methods
-//---------------------------------------------------------------------
-
-AZ::MallocSchema::MallocSchema(const Descriptor& desc) : 
-    m_bytesAllocated(0)
-{
-    if (desc.m_useAZMalloc)
+    MallocSchema::~MallocSchema()
     {
-        static const int DEFAULT_ALIGNMENT = sizeof(void*) * 2;  // Default malloc alignment
-
-        m_mallocFn = [](size_t byteSize) { return AZ_OS_MALLOC(byteSize, DEFAULT_ALIGNMENT); };
-        m_freeFn = [](void* ptr) { AZ_OS_FREE(ptr); };
     }
-    else
+
+    MallocSchema::pointer_type MallocSchema::Allocate(
+        size_type byteSize,
+        size_type alignment,
+        int flags,
+        const char* name,
+        const char* fileName,
+        int lineNum,
+        unsigned int suppressStackRecord)
     {
-        m_mallocFn = &malloc;
-        m_freeFn = &free;
+        (void)flags;
+        (void)name;
+        (void)fileName;
+        (void)lineNum;
+        (void)suppressStackRecord;
+
+        if (!byteSize)
+        {
+            return nullptr;
+        }
+
+        if (alignment == 0)
+        {
+            alignment = sizeof(void*) * 2; // Default malloc alignment
+        }
+
+        AZ_Assert(byteSize < 0x100000000ull, "Malloc allocator only allocates up to 4GB");
+
+        size_type required = byteSize + sizeof(Internal::Header) +
+            ((alignment > sizeof(double))
+                 ? alignment
+                 : 0); // Malloc will align to a minimum boundary for native objects, so we only pad if aligning to a large value
+        void* data = (*m_mallocFn)(required);
+        void* result = PointerAlignUp(reinterpret_cast<void*>(reinterpret_cast<size_t>(data) + sizeof(Internal::Header)), alignment);
+        Internal::Header* header = PointerAlignDown<Internal::Header>(
+            (Internal::Header*)(reinterpret_cast<size_t>(result) - sizeof(Internal::Header)), AZStd::alignment_of<Internal::Header>::value);
+
+        header->offset = static_cast<uint32_t>(reinterpret_cast<size_type>(result) - reinterpret_cast<size_type>(data));
+        header->size = static_cast<uint32_t>(byteSize);
+        m_bytesAllocated += byteSize;
+
+        return result;
     }
-}
 
-AZ::MallocSchema::~MallocSchema()
-{
-}
+    void MallocSchema::DeAllocate(pointer_type ptr, size_type byteSize, size_type alignment)
+    {
+        (void)byteSize;
+        (void)alignment;
 
-AZ::MallocSchema::pointer_type AZ::MallocSchema::Allocate(size_type byteSize, size_type alignment, int flags, const char* name, const char* fileName, int lineNum, unsigned int suppressStackRecord)
-{
-    (void)flags;
-    (void)name;
-    (void)fileName;
-    (void)lineNum;
-    (void)suppressStackRecord;
+        if (!ptr)
+        {
+            return;
+        }
 
-    if (!byteSize)
+        Internal::Header* header = PointerAlignDown(
+            reinterpret_cast<Internal::Header*>(reinterpret_cast<size_t>(ptr) - sizeof(Internal::Header)),
+            AZStd::alignment_of<Internal::Header>::value);
+        void* freePtr = reinterpret_cast<void*>(reinterpret_cast<size_t>(ptr) - static_cast<size_t>(header->offset));
+
+        m_bytesAllocated -= header->size;
+        (*m_freeFn)(freePtr);
+    }
+
+    MallocSchema::pointer_type MallocSchema::ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment)
+    {
+        void* newPtr = Allocate(newSize, newAlignment, 0);
+        size_t oldSize = AllocationSize(ptr);
+
+        memcpy(newPtr, ptr, AZStd::min(oldSize, newSize));
+        DeAllocate(ptr, 0, 0);
+
+        return newPtr;
+    }
+
+    MallocSchema::size_type MallocSchema::Resize(pointer_type ptr, size_type newSize)
+    {
+        (void)ptr;
+        (void)newSize;
+
+        return 0;
+    }
+
+    MallocSchema::size_type MallocSchema::AllocationSize(pointer_type ptr)
+    {
+        if (!ptr)
+        {
+            return 0;
+        }
+        Internal::Header* header = PointerAlignDown(
+            reinterpret_cast<Internal::Header*>(reinterpret_cast<size_t>(ptr) - sizeof(Internal::Header)),
+            AZStd::alignment_of<Internal::Header>::value);
+        return header->size;
+    }
+
+    MallocSchema::size_type MallocSchema::NumAllocatedBytes() const
+    {
+        return m_bytesAllocated;
+    }
+
+    MallocSchema::size_type MallocSchema::Capacity() const
+    {
+        return 0;
+    }
+
+    MallocSchema::size_type MallocSchema::GetMaxAllocationSize() const
+    {
+        return 0xFFFFFFFFull;
+    }
+
+    MallocSchema::size_type MallocSchema::GetMaxContiguousAllocationSize() const
+    {
+        return AZ_CORE_MAX_ALLOCATOR_SIZE;
+    }
+
+    IAllocatorAllocate* MallocSchema::GetSubAllocator()
     {
         return nullptr;
     }
 
-    if (alignment == 0)
+    void MallocSchema::GarbageCollect()
     {
-        alignment = sizeof(void*) * 2;  // Default malloc alignment
     }
 
-    AZ_Assert(byteSize < 0x100000000ull, "Malloc allocator only allocates up to 4GB");
-
-    size_type required = byteSize + sizeof(Internal::Header) + ((alignment > sizeof(double)) ? alignment : 0);  // Malloc will align to a minimum boundary for native objects, so we only pad if aligning to a large value
-    void* data = (*m_mallocFn)(required);
-    void* result = PointerAlignUp(reinterpret_cast<void*>(reinterpret_cast<size_t>(data) + sizeof(Internal::Header)), alignment);
-    Internal::Header* header = PointerAlignDown<Internal::Header>((Internal::Header*)(reinterpret_cast<size_t>(result) - sizeof(Internal::Header)), AZStd::alignment_of<Internal::Header>::value);
-
-    header->offset = static_cast<uint32_t>(reinterpret_cast<size_type>(result) - reinterpret_cast<size_type>(data));
-    header->size = static_cast<uint32_t>(byteSize);
-    m_bytesAllocated += byteSize;
-
-    return result;
-}
-
-void AZ::MallocSchema::DeAllocate(pointer_type ptr, size_type byteSize, size_type alignment)
-{
-    (void)byteSize;
-    (void)alignment;
-
-    if (!ptr)
-    {
-        return;
-    }
-
-    Internal::Header* header = PointerAlignDown(reinterpret_cast<Internal::Header*>(reinterpret_cast<size_t>(ptr) - sizeof(Internal::Header)), AZStd::alignment_of<Internal::Header>::value);
-    void* freePtr = reinterpret_cast<void*>(reinterpret_cast<size_t>(ptr) - static_cast<size_t>(header->offset));
-
-    m_bytesAllocated -= header->size;
-    (*m_freeFn)(freePtr);
-}
-
-AZ::MallocSchema::pointer_type AZ::MallocSchema::ReAllocate(pointer_type ptr, size_type newSize, size_type newAlignment)
-{
-    void* newPtr = Allocate(newSize, newAlignment, 0);
-    size_t oldSize = AllocationSize(ptr);
-
-    memcpy(newPtr, ptr, AZStd::min(oldSize, newSize));
-    DeAllocate(ptr, 0, 0);
-
-    return newPtr;
-}
-
-AZ::MallocSchema::size_type AZ::MallocSchema::Resize(pointer_type ptr, size_type newSize)
-{
-    (void)ptr;
-    (void)newSize;
-
-    return 0;
-}
-
-AZ::MallocSchema::size_type AZ::MallocSchema::AllocationSize(pointer_type ptr)
-{
-    size_type result = 0;
-
-    if (ptr)
-    {
-        Internal::Header* header = PointerAlignDown(reinterpret_cast<Internal::Header*>(reinterpret_cast<size_t>(ptr) - sizeof(Internal::Header)), AZStd::alignment_of<Internal::Header>::value);
-        result = header->size;
-    }
-
-    return result;
-}
-
-AZ::MallocSchema::size_type AZ::MallocSchema::NumAllocatedBytes() const
-{
-    return m_bytesAllocated;
-}
-
-AZ::MallocSchema::size_type AZ::MallocSchema::Capacity() const
-{
-    return 0;
-}
-
-AZ::MallocSchema::size_type AZ::MallocSchema::GetMaxAllocationSize() const
-{
-    return 0xFFFFFFFFull;
-}
-
-AZ::MallocSchema::size_type AZ::MallocSchema::GetMaxContiguousAllocationSize() const
-{
-    return AZ_CORE_MAX_ALLOCATOR_SIZE;
-}
-
-AZ::IAllocatorAllocate* AZ::MallocSchema::GetSubAllocator()
-{
-    return nullptr;
-}
-
-void AZ::MallocSchema::GarbageCollect()
-{
-}
+} // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp b/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp
index 2ea25c3397..dc35c6322b 100644
--- a/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/MemoryDriller.cpp
@@ -15,280 +15,277 @@
 #include <AzCore/IO/GenericStreams.h>
 #include <AzCore/Debug/StackTracer.h>
 
-namespace AZ
+namespace AZ::Debug
 {
-    namespace Debug
+    //=========================================================================
+    // MemoryDriller
+    // [2/6/2013]
+    //=========================================================================
+    MemoryDriller::MemoryDriller(const Descriptor& desc)
     {
-        //=========================================================================
-        // MemoryDriller
-        // [2/6/2013]
-        //=========================================================================
-        MemoryDriller::MemoryDriller(const Descriptor& desc)
+        (void)desc;
+        BusConnect();
+
+        AllocatorManager::Instance().EnterProfilingMode();
+
         {
-            (void)desc;
-            BusConnect();
-
-            AllocatorManager::Instance().EnterProfilingMode();
-
-            {
-                // Register all allocators that were created before the driller existed
-                auto allocatorLock = AllocatorManager::Instance().LockAllocators();
-
-                for (int i = 0; i < AllocatorManager::Instance().GetNumAllocators(); ++i)
-                {
-                    IAllocator* allocator = AllocatorManager::Instance().GetAllocator(i);
-                    RegisterAllocator(allocator);
-                }
-            }
-        }
-
-        //=========================================================================
-        // ~MemoryDriller
-        // [2/6/2013]
-        //=========================================================================
-        MemoryDriller::~MemoryDriller()
-        {
-            BusDisconnect();
-            AllocatorManager::Instance().ExitProfilingMode();
-        }
-
-        //=========================================================================
-        // Start
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::Start(const Param* params, int numParams)
-        {
-            (void)params;
-            (void)numParams;
-
-            // dump current allocations for all allocators with tracking
+            // Register all allocators that were created before the driller existed
             auto allocatorLock = AllocatorManager::Instance().LockAllocators();
+
             for (int i = 0; i < AllocatorManager::Instance().GetNumAllocators(); ++i)
             {
                 IAllocator* allocator = AllocatorManager::Instance().GetAllocator(i);
-                if (auto records = allocator->GetRecords())
-                {
-                    RegisterAllocatorOutput(allocator);
-                    const AllocationRecordsType& allocMap = records->GetMap();
-                    for (AllocationRecordsType::const_iterator allocIt = allocMap.begin(); allocIt != allocMap.end(); ++allocIt)
-                    {
-                        RegisterAllocationOutput(allocator, allocIt->first, &allocIt->second);
-                    }
-                }
+                RegisterAllocator(allocator);
             }
         }
+    }
 
-        //=========================================================================
-        // Stop
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::Stop()
+    //=========================================================================
+    // ~MemoryDriller
+    // [2/6/2013]
+    //=========================================================================
+    MemoryDriller::~MemoryDriller()
+    {
+        BusDisconnect();
+        AllocatorManager::Instance().ExitProfilingMode();
+    }
+
+    //=========================================================================
+    // Start
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::Start(const Param* params, int numParams)
+    {
+        (void)params;
+        (void)numParams;
+
+        // dump current allocations for all allocators with tracking
+        auto allocatorLock = AllocatorManager::Instance().LockAllocators();
+        for (int i = 0; i < AllocatorManager::Instance().GetNumAllocators(); ++i)
         {
-        }
-
-        //=========================================================================
-        // RegisterAllocator
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::RegisterAllocator(IAllocator* allocator)
-        {
-            // Ignore if our allocator is already registered
-            if (allocator->GetRecords() != nullptr)
+            IAllocator* allocator = AllocatorManager::Instance().GetAllocator(i);
+            if (auto records = allocator->GetRecords())
             {
-                return;
-            }
-
-            auto debugConfig = allocator->GetDebugConfig();
-
-            if (!debugConfig.m_excludeFromDebugging)
-            {
-                allocator->SetRecords(aznew Debug::AllocationRecords((unsigned char)debugConfig.m_stackRecordLevels, debugConfig.m_usesMemoryGuards, debugConfig.m_marksUnallocatedMemory, allocator->GetName()));
-
-                m_allAllocatorRecords.push_back(allocator->GetRecords());
-
-                if (m_output == nullptr)
-                {
-                    return;                    // we have no active output
-                }
                 RegisterAllocatorOutput(allocator);
-            }
-        }
-        //=========================================================================
-        // RegisterAllocatorOutput
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::RegisterAllocatorOutput(IAllocator* allocator)
-        {
-            auto records = allocator->GetRecords();
-            m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-            m_output->BeginTag(AZ_CRC("RegisterAllocator", 0x19f08114));
-            m_output->Write(AZ_CRC("Name", 0x5e237e06), allocator->GetName());
-            m_output->Write(AZ_CRC("Id", 0xbf396750), allocator);
-            m_output->Write(AZ_CRC("Capacity", 0xb5e8b174), allocator->GetAllocationSource()->Capacity());
-            m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
-            if (records)
-            {
-                m_output->Write(AZ_CRC("RecordsMode", 0x764c147a), (char)records->GetMode());
-                m_output->Write(AZ_CRC("NumStackLevels", 0xad9cff15), records->GetNumStackLevels());
-            }
-            m_output->EndTag(AZ_CRC("RegisterAllocator", 0x19f08114));
-            m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-        }
-
-        //=========================================================================
-        // UnregisterAllocator
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::UnregisterAllocator(IAllocator* allocator)
-        {
-            auto allocatorRecords = allocator->GetRecords();
-            AZ_Assert(allocatorRecords, "This allocator is not registered with the memory driller!");
-            for (auto records : m_allAllocatorRecords)
-            {
-                if (records == allocatorRecords)
+                const AllocationRecordsType& allocMap = records->GetMap();
+                for (AllocationRecordsType::const_iterator allocIt = allocMap.begin(); allocIt != allocMap.end(); ++allocIt)
                 {
-                    m_allAllocatorRecords.remove(records);
-                    break;
+                    RegisterAllocationOutput(allocator, allocIt->first, &allocIt->second);
                 }
             }
-            delete allocatorRecords;
-            allocator->SetRecords(nullptr);
+        }
+    }
+
+    //=========================================================================
+    // Stop
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::Stop()
+    {
+    }
+
+    //=========================================================================
+    // RegisterAllocator
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::RegisterAllocator(IAllocator* allocator)
+    {
+        // Ignore if our allocator is already registered
+        if (allocator->GetRecords() != nullptr)
+        {
+            return;
+        }
+
+        auto debugConfig = allocator->GetDebugConfig();
+
+        if (!debugConfig.m_excludeFromDebugging)
+        {
+            allocator->SetRecords(aznew Debug::AllocationRecords((unsigned char)debugConfig.m_stackRecordLevels, debugConfig.m_usesMemoryGuards, debugConfig.m_marksUnallocatedMemory, allocator->GetName()));
+
+            m_allAllocatorRecords.push_back(allocator->GetRecords());
+
+            if (m_output == nullptr)
+            {
+                return;                    // we have no active output
+            }
+            RegisterAllocatorOutput(allocator);
+        }
+    }
+    //=========================================================================
+    // RegisterAllocatorOutput
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::RegisterAllocatorOutput(IAllocator* allocator)
+    {
+        auto records = allocator->GetRecords();
+        m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+        m_output->BeginTag(AZ_CRC("RegisterAllocator", 0x19f08114));
+        m_output->Write(AZ_CRC("Name", 0x5e237e06), allocator->GetName());
+        m_output->Write(AZ_CRC("Id", 0xbf396750), allocator);
+        m_output->Write(AZ_CRC("Capacity", 0xb5e8b174), allocator->GetAllocationSource()->Capacity());
+        m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
+        if (records)
+        {
+            m_output->Write(AZ_CRC("RecordsMode", 0x764c147a), (char)records->GetMode());
+            m_output->Write(AZ_CRC("NumStackLevels", 0xad9cff15), records->GetNumStackLevels());
+        }
+        m_output->EndTag(AZ_CRC("RegisterAllocator", 0x19f08114));
+        m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+    }
+
+    //=========================================================================
+    // UnregisterAllocator
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::UnregisterAllocator(IAllocator* allocator)
+    {
+        auto allocatorRecords = allocator->GetRecords();
+        AZ_Assert(allocatorRecords, "This allocator is not registered with the memory driller!");
+        for (auto records : m_allAllocatorRecords)
+        {
+            if (records == allocatorRecords)
+            {
+                m_allAllocatorRecords.remove(records);
+                break;
+            }
+        }
+        delete allocatorRecords;
+        allocator->SetRecords(nullptr);
+
+        if (m_output == nullptr)
+        {
+            return;                    // we have no active output
+        }
+        m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+        m_output->Write(AZ_CRC("UnregisterAllocator", 0xb2b54f93), allocator);
+        m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+    }
+
+    //=========================================================================
+    // RegisterAllocation
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::RegisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, unsigned int stackSuppressCount)
+    {
+        auto records = allocator->GetRecords();
+        if (records)
+        {
+            const AllocationInfo* info = records->RegisterAllocation(address, byteSize, alignment, name, fileName, lineNum, stackSuppressCount + 1);
+            if (m_output == nullptr)
+            {
+                return;                   // we have no active output
+            }
+            RegisterAllocationOutput(allocator, address, info);
+        }
+    }
+
+    //=========================================================================
+    // RegisterAllocationOutput
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::RegisterAllocationOutput(IAllocator* allocator, void* address, const AllocationInfo* info)
+    {
+        auto records = allocator->GetRecords();
+        m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+        m_output->BeginTag(AZ_CRC("RegisterAllocation", 0x992a9780));
+        m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
+        m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
+        if (info)
+        {
+            if (info->m_name)
+            {
+                m_output->Write(AZ_CRC("Name", 0x5e237e06), info->m_name);
+            }
+            m_output->Write(AZ_CRC("Alignment", 0x2cce1e5c), info->m_alignment);
+            m_output->Write(AZ_CRC("Size", 0xf7c0246a), info->m_byteSize);
+            if (info->m_fileName)
+            {
+                m_output->Write(AZ_CRC("FileName", 0x3c0be965), info->m_fileName);
+                m_output->Write(AZ_CRC("FileLine", 0xb33c2395), info->m_lineNum);
+            }
+            // copy the stack frames directly, resolving the stack should happen later as this is a SLOW procedure.
+            if (info->m_stackFrames)
+            {
+                m_output->Write(AZ_CRC("Stack", 0x41a87b6a), info->m_stackFrames, info->m_stackFrames + records->GetNumStackLevels());
+            }
+        }
+        m_output->EndTag(AZ_CRC("RegisterAllocation", 0x992a9780));
+        m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+    }
+
+    //=========================================================================
+    // UnRegisterAllocation
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::UnregisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, AllocationInfo* info)
+    {
+        auto records = allocator->GetRecords();
+        if (records)
+        {
+            records->UnregisterAllocation(address, byteSize, alignment, info);
 
             if (m_output == nullptr)
             {
                 return;                    // we have no active output
             }
             m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-            m_output->Write(AZ_CRC("UnregisterAllocator", 0xb2b54f93), allocator);
-            m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-        }
-
-        //=========================================================================
-        // RegisterAllocation
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::RegisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, const char* name, const char* fileName, int lineNum, unsigned int stackSuppressCount)
-        {
-            auto records = allocator->GetRecords();
-            if (records)
-            {
-                const AllocationInfo* info = records->RegisterAllocation(address, byteSize, alignment, name, fileName, lineNum, stackSuppressCount + 1);
-                if (m_output == nullptr)
-                {
-                    return;                   // we have no active output
-                }
-                RegisterAllocationOutput(allocator, address, info);
-            }
-        }
-
-        //=========================================================================
-        // RegisterAllocationOutput
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::RegisterAllocationOutput(IAllocator* allocator, void* address, const AllocationInfo* info)
-        {
-            auto records = allocator->GetRecords();
-            m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-            m_output->BeginTag(AZ_CRC("RegisterAllocation", 0x992a9780));
+            m_output->BeginTag(AZ_CRC("UnRegisterAllocation", 0xea5dc4cd));
             m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
             m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
-            if (info)
-            {
-                if (info->m_name)
-                {
-                    m_output->Write(AZ_CRC("Name", 0x5e237e06), info->m_name);
-                }
-                m_output->Write(AZ_CRC("Alignment", 0x2cce1e5c), info->m_alignment);
-                m_output->Write(AZ_CRC("Size", 0xf7c0246a), info->m_byteSize);
-                if (info->m_fileName)
-                {
-                    m_output->Write(AZ_CRC("FileName", 0x3c0be965), info->m_fileName);
-                    m_output->Write(AZ_CRC("FileLine", 0xb33c2395), info->m_lineNum);
-                }
-                // copy the stack frames directly, resolving the stack should happen later as this is a SLOW procedure.
-                if (info->m_stackFrames)
-                {
-                    m_output->Write(AZ_CRC("Stack", 0x41a87b6a), info->m_stackFrames, info->m_stackFrames + records->GetNumStackLevels());
-                }
-            }
-            m_output->EndTag(AZ_CRC("RegisterAllocation", 0x992a9780));
+            m_output->EndTag(AZ_CRC("UnRegisterAllocation", 0xea5dc4cd));
             m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
         }
+    }
 
-        //=========================================================================
-        // UnRegisterAllocation
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::UnregisterAllocation(IAllocator* allocator, void* address, size_t byteSize, size_t alignment, AllocationInfo* info)
+    //=========================================================================
+    // ReallocateAllocation
+    // [10/1/2018]
+    //=========================================================================
+    void MemoryDriller::ReallocateAllocation(IAllocator* allocator, void* prevAddress, void* newAddress, size_t newByteSize, size_t newAlignment)
+    {
+        AllocationInfo info;
+        UnregisterAllocation(allocator, prevAddress, 0, 0, &info);
+        RegisterAllocation(allocator, newAddress, newByteSize, newAlignment, info.m_name, info.m_fileName, info.m_lineNum, 0);
+    }
+
+    //=========================================================================
+    // ResizeAllocation
+    // [2/6/2013]
+    //=========================================================================
+    void MemoryDriller::ResizeAllocation(IAllocator* allocator, void* address, size_t newSize)
+    {
+        auto records = allocator->GetRecords();
+        if (records)
         {
-            auto records = allocator->GetRecords();
-            if (records)
-            {
-                records->UnregisterAllocation(address, byteSize, alignment, info);
+            records->ResizeAllocation(address, newSize);
 
-                if (m_output == nullptr)
-                {
-                    return;                    // we have no active output
-                }
-                m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-                m_output->BeginTag(AZ_CRC("UnRegisterAllocation", 0xea5dc4cd));
-                m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
-                m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
-                m_output->EndTag(AZ_CRC("UnRegisterAllocation", 0xea5dc4cd));
-                m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+            if (m_output == nullptr)
+            {
+                return;                    // we have no active output
+            }
+            m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+            m_output->BeginTag(AZ_CRC("ResizeAllocation", 0x8a9c78dc));
+            m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
+            m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
+            m_output->Write(AZ_CRC("Size", 0xf7c0246a), newSize);
+            m_output->EndTag(AZ_CRC("ResizeAllocation", 0x8a9c78dc));
+            m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
+        }
+    }
+
+    void MemoryDriller::DumpAllAllocations()
+    {
+        // Create a copy so allocations done during the printing dont end up affecting the container
+        const AZStd::list<Debug::AllocationRecords*, OSStdAllocator> allocationRecords = m_allAllocatorRecords;
+
+        for (auto records : allocationRecords)
+        {
+            // Skip if we have had no allocations made
+            if (records->RequestedAllocs())
+            {
+                records->EnumerateAllocations(AZ::Debug::PrintAllocationsCB(true, true));
             }
         }
+    }
 
-        //=========================================================================
-        // ReallocateAllocation
-        // [10/1/2018]
-        //=========================================================================
-        void MemoryDriller::ReallocateAllocation(IAllocator* allocator, void* prevAddress, void* newAddress, size_t newByteSize, size_t newAlignment)
-        {
-            AllocationInfo info;
-            UnregisterAllocation(allocator, prevAddress, 0, 0, &info);
-            RegisterAllocation(allocator, newAddress, newByteSize, newAlignment, info.m_name, info.m_fileName, info.m_lineNum, 0);
-        }
-
-        //=========================================================================
-        // ResizeAllocation
-        // [2/6/2013]
-        //=========================================================================
-        void MemoryDriller::ResizeAllocation(IAllocator* allocator, void* address, size_t newSize)
-        {
-            auto records = allocator->GetRecords();
-            if (records)
-            {
-                records->ResizeAllocation(address, newSize);
-
-                if (m_output == nullptr)
-                {
-                    return;                    // we have no active output
-                }
-                m_output->BeginTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-                m_output->BeginTag(AZ_CRC("ResizeAllocation", 0x8a9c78dc));
-                m_output->Write(AZ_CRC("RecordsId", 0x7caaca88), records);
-                m_output->Write(AZ_CRC("Address", 0x0d4e6f81), address);
-                m_output->Write(AZ_CRC("Size", 0xf7c0246a), newSize);
-                m_output->EndTag(AZ_CRC("ResizeAllocation", 0x8a9c78dc));
-                m_output->EndTag(AZ_CRC("MemoryDriller", 0x1b31269d));
-            }
-        }
-
-        void MemoryDriller::DumpAllAllocations()
-        {
-            // Create a copy so allocations done during the printing dont end up affecting the container
-            const AZStd::list<Debug::AllocationRecords*, OSStdAllocator> allocationRecords = m_allAllocatorRecords;
-
-            for (auto records : allocationRecords)
-            {
-                // Skip if we have had no allocations made
-                if (records->RequestedAllocs())
-                {
-                    records->EnumerateAllocations(AZ::Debug::PrintAllocationsCB(true, true));
-                }
-            }
-        }
-
-    }// namespace Debug
-} // namespace AZ
+} // namespace AZ::Debug
diff --git a/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
index 0bef6b7d28..9167864450 100644
--- a/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
@@ -35,8 +35,8 @@ namespace AZ
     public:
         AZ_CLASS_ALLOCATOR(PoolAllocation<Allocator>, SystemAllocator, 0)
 
-        typedef typename Allocator::Page    PageType;
-        typedef typename Allocator::Bucket  BucketType;
+        using PageType = typename Allocator::Page;
+        using BucketType = typename Allocator::Bucket;
 
         PoolAllocation(Allocator* alloc, size_t pageSize, size_t minAllocationSize, size_t maxAllocationSize);
         virtual ~PoolAllocation();
@@ -89,7 +89,7 @@ namespace AZ
             void SetupFreeList(size_t elementSize, size_t pageDataBlockSize);
 
             /// We just use a free list of nodes which we cast to the pool type.
-            typedef AZStd::intrusive_slist<FakeNode, AZStd::slist_base_hook<FakeNode> > FreeListType;
+            using FreeListType = AZStd::intrusive_slist<FakeNode, AZStd::slist_base_hook<FakeNode>>;
 
             FreeListType m_freeList;
             u32 m_bin;
@@ -103,7 +103,7 @@ namespace AZ
         */
         struct Bucket
         {
-            typedef AZStd::intrusive_list<Page, AZStd::list_base_hook<Page> > PageListType;
+            using PageListType = AZStd::intrusive_list<Page, AZStd::list_base_hook<Page>>;
             PageListType            m_pages;
         };
 
@@ -162,7 +162,7 @@ namespace AZ
             return page;
         }
 
-        typedef PoolAllocation<PoolSchemaImpl> AllocatorType;
+        using AllocatorType = PoolAllocation<PoolSchemaImpl>;
         IAllocatorAllocate*                 m_pageAllocator;
         AllocatorType                       m_allocator;
         void*                               m_staticDataBlock;
@@ -199,7 +199,7 @@ namespace AZ
             void SetupFreeList(size_t elementSize, size_t pageDataBlockSize);
 
             /// We just use a free list of nodes which we cast to the pool type.
-            typedef AZStd::intrusive_slist<FakeNode, AZStd::slist_base_hook<FakeNode> > FreeListType;
+            using FreeListType = AZStd::intrusive_slist<FakeNode, AZStd::slist_base_hook<FakeNode>>;
 
             FreeListType m_freeList;
             AZStd::lock_free_intrusive_stack_node<Page> m_lfStack;          ///< Lock Free stack node
@@ -215,7 +215,7 @@ namespace AZ
         */
         struct Bucket
         {
-            typedef AZStd::intrusive_list<Page, AZStd::list_base_hook<Page> > PageListType;
+            using PageListType = AZStd::intrusive_list<Page, AZStd::list_base_hook<Page>>;
             PageListType            m_pages;
         };
 
@@ -291,7 +291,7 @@ namespace AZ
         ThreadPoolSchema::SetThreadPoolData m_threadPoolSetter;
 
         // Fox X64 we push/pop pages using the m_mutex to sync. Pages are
-        typedef Bucket::PageListType FreePagesType;
+        using FreePagesType = Bucket::PageListType;
         FreePagesType               m_freePages;
         AZStd::vector<ThreadPoolData*> m_threads;           ///< Array with all separate thread data. Used to traverse end free elements.
 
@@ -313,12 +313,12 @@ namespace AZ
         ThreadPoolData(ThreadPoolSchemaImpl* alloc, size_t pageSize, size_t minAllocationSize, size_t maxAllocationSize);
         ~ThreadPoolData();
 
-        typedef PoolAllocation<ThreadPoolSchemaImpl>  AllocatorType;
+        using AllocatorType = PoolAllocation<ThreadPoolSchemaImpl>;
         /**
         * Stack with freed elements from other threads. We don't need stamped stack since the ABA problem can not
         * happen here. We push from many threads and pop from only one (we don't push from it).
         */
-        typedef AZStd::lock_free_intrusive_stack<ThreadPoolSchemaImpl::Page::FakeNodeLF, AZStd::lock_free_intrusive_stack_base_hook<ThreadPoolSchemaImpl::Page::FakeNodeLF> > FreedElementsStack;
+        using FreedElementsStack = AZStd::lock_free_intrusive_stack<ThreadPoolSchemaImpl::Page::FakeNodeLF, AZStd::lock_free_intrusive_stack_base_hook<ThreadPoolSchemaImpl::Page::FakeNodeLF>>;
 
         AllocatorType           m_allocator;
         FreedElementsStack      m_freedElements;
diff --git a/Code/Framework/AzCore/AzCore/Module/Environment.cpp b/Code/Framework/AzCore/AzCore/Module/Environment.cpp
index 71da948a35..790af730bf 100644
--- a/Code/Framework/AzCore/AzCore/Module/Environment.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/Environment.cpp
@@ -24,10 +24,10 @@ namespace AZ
         class OSStdAllocator
         {
         public:
-            typedef void*               pointer_type;
-            typedef AZStd::size_t       size_type;
-            typedef AZStd::ptrdiff_t    difference_type;
-            typedef AZStd::false_type   allow_memory_leaks;         ///< Regular allocators should not leak.
+            using pointer_type = void *;
+            using size_type = AZStd::size_t;
+            using difference_type = AZStd::ptrdiff_t;
+            using allow_memory_leaks = AZStd::false_type;         ///< Regular allocators should not leak.
 
             OSStdAllocator(Environment::AllocatorInterface* allocator)
                 : m_name("GlobalEnvironmentAllocator")
@@ -122,7 +122,7 @@ namespace AZ
             : public EnvironmentInterface
         {
         public:
-            typedef AZStd::unordered_map<u32, void*, AZStd::hash<u32>, AZStd::equal_to<u32>, OSStdAllocator> MapType;
+            using MapType = AZStd::unordered_map<u32, void *, AZStd::hash<u32>, AZStd::equal_to<u32>, OSStdAllocator>;
 
             static EnvironmentInterface* Get();
             static void Attach(EnvironmentInstance sourceEnvironment, bool useAsGetFallback);
diff --git a/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp b/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp
index 10aa9904a3..0797fef93f 100644
--- a/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/Internal/ModuleManagerSearchPathTool.cpp
@@ -10,21 +10,18 @@
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Module/ModuleManagerBus.h>
 
-namespace AZ
+namespace AZ::Internal
 {
-    namespace Internal
+    AZ::OSString ModuleManagerSearchPathTool::GetModuleDirectory(const AZ::DynamicModuleDescriptor& moduleDesc)
     {
-        AZ::OSString ModuleManagerSearchPathTool::GetModuleDirectory(const AZ::DynamicModuleDescriptor& moduleDesc)
+        // For each module that is loaded, attempt to set the module's folder as a path for dependent module resolution
+        AZ::OSString modulePath = moduleDesc.m_dynamicLibraryPath;
+        AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationBus::Events::ResolveModulePath, modulePath);
+        auto lastPathSep = modulePath.find_last_of(AZ_TRAIT_OS_PATH_SEPARATOR);
+        if (lastPathSep != modulePath.npos)
         {
-            // For each module that is loaded, attempt to set the module's folder as a path for dependent module resolution
-            AZ::OSString modulePath = moduleDesc.m_dynamicLibraryPath;
-            AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationBus::Events::ResolveModulePath, modulePath);
-            auto lastPathSep = modulePath.find_last_of(AZ_TRAIT_OS_PATH_SEPARATOR);
-            if (lastPathSep != modulePath.npos)
-            {
-                modulePath = modulePath.substr(0, lastPathSep);
-            }
-            return modulePath;
+            modulePath = modulePath.substr(0, lastPathSep);
         }
-    } // namespace Internal
-} // namespace AZ
+        return modulePath;
+    }
+} // namespace AZ::Internal
diff --git a/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
index 574b0bcc7e..69bead11ac 100644
--- a/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
@@ -9,45 +9,41 @@
 #include <AzCore/Name/Internal/NameData.h>
 #include <AzCore/Name/NameDictionary.h>
 
-namespace AZ
+namespace AZ::Internal
 {
-    namespace Internal
+    NameData::NameData(AZStd::string&& name, Hash hash)
+        : m_name{AZStd::move(name)}
+        , m_hash{hash}
+    {}
+
+    AZStd::string_view NameData::GetName() const
     {
-        NameData::NameData(AZStd::string&& name, Hash hash)
-            : m_name{AZStd::move(name)}
-            , m_hash{hash}
-        {}
+        return m_name;
+    }
 
-        AZStd::string_view NameData::GetName() const
-        {
-            return m_name;
-        }
+    NameData::Hash NameData::GetHash() const
+    {
+        return m_hash;
+    }
 
-        NameData::Hash NameData::GetHash() const
-        {
-            return m_hash;
-        }
+    void NameData::add_ref()
+    {
+        AZ_Assert(m_useCount >= 0, "NameData has been deleted");
+        ++m_useCount;
+    }
 
-        void NameData::add_ref()
+    void NameData::release()
+    {
+        // this could be released after we decrement the counter, therefore we will
+        // base the release on the hash which is stable
+        Hash hash = m_hash;
+        AZ_Assert(m_useCount > 0, "m_useCount is already 0!");
+        if (m_useCount.fetch_sub(1) == 1)
         {
-            AZ_Assert(m_useCount >= 0, "NameData has been deleted");
-            ++m_useCount;
-        }
-
-        void NameData::release()
-        {
-            // this could be released after we decrement the counter, therefore we will
-            // base the release on the hash which is stable
-            Hash hash = m_hash;
-            AZ_Assert(m_useCount > 0, "m_useCount is already 0!");
-            if (m_useCount.fetch_sub(1) == 1)
+            if (AZ::NameDictionary::IsReady())
             {
-                if (AZ::NameDictionary::IsReady())
-                {
-                    AZ::NameDictionary::Instance().TryReleaseName(hash);
-                }
+                AZ::NameDictionary::Instance().TryReleaseName(hash);
             }
         }
     }
-}
-
+} // namespace AZ::Internal
diff --git a/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp b/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
index 3047a2894e..1b39eb81bd 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
@@ -32,7 +32,12 @@ namespace AZ
 
         if (!s_instance)
         {
-            s_instance = AZ::Environment::CreateVariable<NameDictionary>(NameDictionaryInstanceName);
+            // Because the NameDictionary allocates memory using the AZ::Allocator and it is created
+            // in the executable memory space, it's ownership cannot be transferred to other module memory spaces
+            // Otherwise this could cause the the NameDictionary to be destroyed in static de-init
+            // after the AZ::Allocators have been destroyed
+            // Therefore we supply the isTransferOwnership value of false using CreateVariableEx
+            s_instance = AZ::Environment::CreateVariableEx<NameDictionary>(NameDictionaryInstanceName, true, false);
         }
     }
 
@@ -50,7 +55,12 @@ namespace AZ
 
         if (!s_instance)
         {
-            s_instance = Environment::FindVariable<NameDictionary>(NameDictionaryInstanceName);
+            // Because the NameDictionary allocates memory using the AZ::Allocator and it is created
+            // in the executable memory space, it's ownership cannot be transferred to other module memory spaces
+            // Otherwise this could cause the the NameDictionary to be destroyed in static de-init
+            // after the AZ::Allocators have been destroyed
+            // Therefore we supply the isTransferOwnership value of false using CreateVariableEx
+            s_instance = AZ::Environment::CreateVariableEx<NameDictionary>(NameDictionaryInstanceName, true, false);
         }
 
         return s_instance.IsConstructed();
diff --git a/Code/Framework/AzCore/AzCore/Platform.cpp b/Code/Framework/AzCore/AzCore/Platform.cpp
index ad345f65e8..0defef826e 100644
--- a/Code/Framework/AzCore/AzCore/Platform.cpp
+++ b/Code/Framework/AzCore/AzCore/Platform.cpp
@@ -8,19 +8,16 @@
 
 #include <AzCore/Platform.h>
 
-namespace AZ
+namespace AZ::Platform
 {
-    namespace Platform
-    {
-        MachineId s_machineId = MachineId(0);
+    MachineId s_machineId = MachineId(0);
 
-        void SetLocalMachineId(AZ::u32 machineId)
+    void SetLocalMachineId(AZ::u32 machineId)
+    {
+        AZ_Assert(machineId != 0, "0 machine ID is reserved!");
+        if (s_machineId != 0)
         {
-            AZ_Assert(machineId != 0, "0 machine ID is reserved!");
-            if (s_machineId != 0)
-            {
-                s_machineId = machineId;
-            }
+            s_machineId = machineId;
         }
     }
-}
+} // namespace AZ::Platform
diff --git a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp
index 6fb03073b0..5632c258c3 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp
+++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContextUtilities.cpp
@@ -117,9 +117,9 @@ namespace AZ
 
         if (!explicitOverloads.m_overloads.empty())
         {
-            for (auto methodAndClass : explicitOverloads.m_overloads)
+            for (const auto& methodAndClass : explicitOverloads.m_overloads)
             {
-                overloads.push_back({ methodAndClass.first, methodAndClass.second });
+                overloads.emplace_back(methodAndClass.first, methodAndClass.second);
             }
         }
         else
@@ -128,7 +128,7 @@ namespace AZ
 
             do
             {
-                overloads.push_back({ overload, behaviorClass });
+                overloads.emplace_back(overload, behaviorClass);
                 overload = overload->m_overload;
             }
             while (overload);
diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
index 3b2aebdee6..4b71c57682 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
@@ -170,61 +170,77 @@ ScriptContext*  ScriptSystemComponent::AddContext(ScriptContext* context, int ga
 ScriptContext* ScriptSystemComponent::AddContextWithId(ScriptContextId id)
 {
     AZ_Assert(m_contexts.empty() || id != ScriptContextIds::DefaultScriptContextId, "Default script context ID is reserved! Please provide a Unique context ID for you ScriptContext!");
-    if (GetContext(id) == nullptr)
+    if (GetContext(id) != nullptr)
     {
-        m_contexts.emplace_back();
-        ContextContainer& cc = m_contexts.back();
-        cc.m_context = aznew ScriptContext(id);
-        cc.m_isOwner = true;
-        cc.m_garbageCollectorSteps = m_defaultGarbageCollectorSteps;
-
-        cc.m_context->SetRequireHook(AZStd::bind(&ScriptSystemComponent::DefaultRequireHook, this, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3));
-
-        if (id != ScriptContextIds::CryScriptContextId)
+        return nullptr;
+    }
+    m_contexts.emplace_back();
+    ContextContainer& cc = m_contexts.back();
+    cc.m_context = aznew ScriptContext(id);
+    cc.m_isOwner = true;
+    cc.m_garbageCollectorSteps = m_defaultGarbageCollectorSteps;
+    cc.m_context->SetRequireHook(
+        [this](lua_State* lua, ScriptContext* context, const char* module) -> int
         {
-            // Reflect script classes
-            ComponentApplication* app = nullptr;
-            EBUS_EVENT_RESULT(app, ComponentApplicationBus, GetApplication);
-            if (app && app->GetDescriptor().m_enableScriptReflection)
+            return DefaultRequireHook(lua, context, module);
+        });
+
+    if (id != ScriptContextIds::CryScriptContextId)
+    {
+        // Reflect script classes
+        ComponentApplication* app = nullptr;
+        EBUS_EVENT_RESULT(app, ComponentApplicationBus, GetApplication);
+        if (app && app->GetDescriptor().m_enableScriptReflection)
+        {
+            if (app->GetBehaviorContext())
             {
-                if (app->GetBehaviorContext())
-                {
-                    cc.m_context->BindTo(app->GetBehaviorContext());
-                }
-                else
-                {
-                    AZ_Error("Script", false, "We are asked to enabled scripting, but the Applicaion has no BehaviorContext! Scripting relies on BehaviorContext!");
-                }
+                cc.m_context->BindTo(app->GetBehaviorContext());
+            }
+            else
+            {
+                AZ_Error("Script", false, "We are asked to enabled scripting, but the Applicaion has no BehaviorContext! Scripting relies on BehaviorContext!");
             }
         }
-
-        return cc.m_context;
     }
 
-    return nullptr;
+    return cc.m_context;
 }
 
 void ScriptSystemComponent::RestoreDefaultRequireHook(ScriptContextId id)
 {
-    if (auto context = GetContext(id))
+    auto context = GetContext(id);
+    if (!context)
     {
-        for (auto& inMemoryModule : m_inMemoryModules)
-        {
-            ClearAssetReferences(inMemoryModule.second->GetId());
-        }
-
-        m_inMemoryModules.clear();
-        context->SetRequireHook(AZStd::bind(&ScriptSystemComponent::DefaultRequireHook, this, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3));
+        return;
     }
+
+    for (auto& inMemoryModule : m_inMemoryModules)
+    {
+        ClearAssetReferences(inMemoryModule.second->GetId());
+    }
+
+    m_inMemoryModules.clear();
+    context->SetRequireHook(
+        [this](lua_State* lua, ScriptContext* context, const char* module) -> int
+        {
+            return DefaultRequireHook(lua, context, module);
+        });
 }
 
 void ScriptSystemComponent::UseInMemoryRequireHook(const InMemoryScriptModules& modules, ScriptContextId id)
 {
-    if (auto context = GetContext(id))
+    auto context = GetContext(id);
+    if (nullptr == context)
     {
-        m_inMemoryModules = modules;
-        context->SetRequireHook(AZStd::bind(&ScriptSystemComponent::InMemoryRequireHook, this, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3));
+        return;
     }
+
+    m_inMemoryModules = modules;
+    context->SetRequireHook(
+        [this](lua_State* lua, ScriptContext* context, const char* module) -> int
+        {
+            return InMemoryRequireHook(lua, context, module);
+        });
 }
 
 //=========================================================================
diff --git a/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp
index b0d141bba9..d0bea11432 100644
--- a/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp
+++ b/Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.cpp
@@ -28,133 +28,130 @@
 #include <AzCore/std/string/string_view.h>
 #include <AzCore/StringFunc/StringFunc.h>
 
-namespace AZ
+namespace AZ::ScriptCanvasOnDemandReflection
 {
-    namespace ScriptCanvasOnDemandReflection
+    // the use of this might have to come at the end of on demand reflection...instead of instantly
+    // basically, it required that dependent classes are reflected first, I'm not sure they are yet.
+    AZStd::string GetPrettyNameForAZTypeId(AZ::BehaviorContext& context, AZ::Uuid typeId)
     {
-        // the use of this might have to come at the end of on demand reflection...instead of instantly
-        // basically, it required that dependent classes are reflected first, I'm not sure they are yet.
-        AZStd::string GetPrettyNameForAZTypeId(AZ::BehaviorContext& context, AZ::Uuid typeId)
+        // return capitalized versions of what we need, otherwise just the regular name
+        // then strip all the stuff
+        if (typeId == azrtti_typeid<Aabb>())
         {
-            // return capitalized versions of what we need, otherwise just the regular name
-            // then strip all the stuff
-            if (typeId == azrtti_typeid<Aabb>())
+            return "AABB";
+        }
+        else if (typeId == azrtti_typeid<bool>())
+        {
+            return "Boolean";
+        }
+        else if (typeId == azrtti_typeid<Color>())
+        {
+            return "Color";
+        }
+        else if (typeId == azrtti_typeid<Crc32>())
+        {
+            return "CRC";
+        }
+        else if (typeId == azrtti_typeid<EntityId>())
+        {
+            return "EntityId";
+        }
+        else if (typeId == azrtti_typeid<Matrix3x3>())
+        {
+            return "Matrix3x3";
+        }
+        else if (typeId == azrtti_typeid<Matrix4x4>())
+        {
+            return "Matrix4x4";
+        }
+        else if (typeId == azrtti_typeid<AZ::s8>())
+        {
+            return "Number:s8";
+        }
+        else if (typeId == azrtti_typeid<AZ::s16>())
+        {
+            return "Number:s16";
+        }
+        else if (typeId == azrtti_typeid<AZ::s32>())
+        {
+            return "Number:s32";
+        }
+        else if (typeId == azrtti_typeid<AZ::s64>())
+        {
+            return "Number:s64";
+        }
+        else if (typeId == azrtti_typeid<AZ::u8>())
+        {
+            return "Number:u8";
+        }
+        else if (typeId == azrtti_typeid<AZ::u16>())
+        {
+            return "Number:u16";
+        }
+        else if (typeId == azrtti_typeid<AZ::u32>())
+        {
+            return "Number:u32";
+        }
+        else if (typeId == azrtti_typeid<AZ::u64>())
+        {
+            return "Number:u64";
+        }
+        else if (typeId == azrtti_typeid<float>())
+        {
+            return "Number:float";
+        }
+        else if (typeId == azrtti_typeid<double>())
+        {
+            return "Number";
+        }
+        else if (typeId == azrtti_typeid<Obb>())
+        {
+            return "OBB";
+        }
+        else if (typeId == azrtti_typeid<Plane>())
+        {
+            return "Plane";
+        }
+        else if (typeId == azrtti_typeid<Quaternion>())
+        {
+            return "Quaternion";
+        }
+        else if (typeId == azrtti_typeid<AZStd::string>() || typeId == azrtti_typeid<AZStd::string_view>())
+        {
+            return "String";
+        }
+        else if (typeId == azrtti_typeid<Transform>())
+        {
+            return "Transform";
+        }
+        else if (typeId == azrtti_typeid<Vector2>())
+        {
+            return "Vector2";
+        }
+        else if (typeId == azrtti_typeid<Vector3>())
+        {
+            return "Vector3";
+        }
+        else if (typeId == azrtti_typeid<Vector4>())
+        {
+            return "Vector4";
+        }
+        else
+        {
+            auto bcClassIter = context.m_typeToClassMap.find(typeId);
+            if (bcClassIter != context.m_typeToClassMap.end())
             {
-                return "AABB";
-            }
-            else if (typeId == azrtti_typeid<bool>())
-            {
-                return "Boolean";
-            }
-            else if (typeId == azrtti_typeid<Color>())
-            {
-                return "Color";
-            }
-            else if (typeId == azrtti_typeid<Crc32>())
-            {
-                return "CRC";
-            }
-            else if (typeId == azrtti_typeid<EntityId>())
-            {
-                return "EntityId";
-            }
-            else if (typeId == azrtti_typeid<Matrix3x3>())
-            {
-                return "Matrix3x3";
-            }
-            else if (typeId == azrtti_typeid<Matrix4x4>())
-            {
-                return "Matrix4x4";
-            }
-            else if (typeId == azrtti_typeid<AZ::s8>())
-            {
-                return "Number:s8";
-            }
-            else if (typeId == azrtti_typeid<AZ::s16>())
-            {
-                return "Number:s16";
-            }
-            else if (typeId == azrtti_typeid<AZ::s32>())
-            {
-                return "Number:s32";
-            }
-            else if (typeId == azrtti_typeid<AZ::s64>())
-            {
-                return "Number:s64";
-            }
-            else if (typeId == azrtti_typeid<AZ::u8>())
-            {
-                return "Number:u8";
-            }
-            else if (typeId == azrtti_typeid<AZ::u16>())
-            {
-                return "Number:u16";
-            }
-            else if (typeId == azrtti_typeid<AZ::u32>())
-            {
-                return "Number:u32";
-            }
-            else if (typeId == azrtti_typeid<AZ::u64>())
-            {
-                return "Number:u64";
-            }
-            else if (typeId == azrtti_typeid<float>())
-            {
-                return "Number:float";
-            }
-            else if (typeId == azrtti_typeid<double>())
-            {
-                return "Number";
-            }
-            else if (typeId == azrtti_typeid<Obb>())
-            {
-                return "OBB";
-            }
-            else if (typeId == azrtti_typeid<Plane>())
-            {
-                return "Plane";
-            }
-            else if (typeId == azrtti_typeid<Quaternion>())
-            {
-                return "Quaternion";
-            }
-            else if (typeId == azrtti_typeid<AZStd::string>() || typeId == azrtti_typeid<AZStd::string_view>())
-            {
-                return "String";
-            }
-            else if (typeId == azrtti_typeid<Transform>())
-            {
-                return "Transform";
-            }
-            else if (typeId == azrtti_typeid<Vector2>())
-            {
-                return "Vector2";
-            }
-            else if (typeId == azrtti_typeid<Vector3>())
-            {
-                return "Vector3";
-            }
-            else if (typeId == azrtti_typeid<Vector4>())
-            {
-                return "Vector4";
+                const AZ::BehaviorClass& bcClass = *(bcClassIter->second);
+                AZStd::string uglyName = bcClass.m_name;
+                AZ::StringFunc::Replace(uglyName, "AZStd::", "", true);
+                AZ::StringFunc::Replace(uglyName, "AZ::", "", true);
+                AZ::StringFunc::Replace(uglyName, "::", ".", true);
+                return uglyName;
             }
             else
             {
-                auto bcClassIter = context.m_typeToClassMap.find(typeId);
-                if (bcClassIter != context.m_typeToClassMap.end())
-                {
-                    const AZ::BehaviorClass& bcClass = *(bcClassIter->second);
-                    AZStd::string uglyName = bcClass.m_name;
-                    AZ::StringFunc::Replace(uglyName, "AZStd::", "", true);
-                    AZ::StringFunc::Replace(uglyName, "AZ::", "", true);
-                    AZ::StringFunc::Replace(uglyName, "::", ".", true);
-                    return uglyName;
-                }
-                else
-                {
-                    return "Invalid";
-                }
+                return "Invalid";
             }
         }
-    } // namespace ScriptCanvasOnDemandReflection
-} // namespace AZ
+    }
+} // namespace AZ::ScriptCanvasOnDemandReflection
diff --git a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
index bae79a6fe7..a633af22da 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
@@ -54,12 +54,8 @@ namespace AZStd
 
 namespace AZ
 {
-    //template<class T>
-    //class ScriptProperty;
-
     namespace Internal
     {
-
         template <class ValueType>
         void SetupClassElementFromType(SerializeContext::ClassElement& classElement)
         {
@@ -86,15 +82,14 @@ namespace AZ
             {
                 auto uuid = AzTypeInfo<ValueType>::Uuid();
 
-                using ContainerType = AttributeContainerType<AZ::TypeId>;
-                classElement.m_attributes.emplace_back(AZ_CRC("EnumType", 0xb177e1b5), CreateModuleAttribute<ContainerType>(AZStd::move(uuid)));
+                classElement.m_attributes.emplace_back(AZ_CRC("EnumType", 0xb177e1b5), CreateModuleAttribute(AZStd::move(uuid)));
             }
         }
 
         template <class T>
         AZStd::enable_if_t<std::is_pod<T>::value> InitializeDefaultIfPodType(T& t)
         {
-            t = {};
+            t = T{};
         }
 
         template <class T>
@@ -648,7 +643,6 @@ namespace AZ
 
                 // Register our key type within an lvalue to rvalue wrapper as an attribute
                 AZ::TypeId uuid = azrtti_typeid<WrappedKeyType>();
-                using ContainerType = AttributeContainerType<AZ::TypeId>;
 
                /**
                 * This should technically bind the reference value from the GetCurrentSerializeContextModule() call 
@@ -658,7 +652,7 @@ namespace AZ
                 */
                 m_classElement.m_attributes.set_allocator(AZStdFunctorAllocator([]() -> IAllocatorAllocate& { return GetCurrentSerializeContextModule().GetAllocator(); }));
 
-                m_classElement.m_attributes.emplace_back(AZ_CRC("KeyType", 0x15bc5303), CreateModuleAttribute<ContainerType>(AZStd::move(uuid)));
+                m_classElement.m_attributes.emplace_back(AZ_CRC("KeyType", 0x15bc5303), CreateModuleAttribute(AZStd::move(uuid)));
             }
 
             // Reflect our wrapped key and value types to serializeContext so that may later be used
diff --git a/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp
index 37f4623301..58f86bf831 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataOverlayProviderMsgs.cpp
@@ -19,8 +19,11 @@ namespace AZ
         nodeStack.push_back(m_dataContainer);
 
         SerializeContext::EnumerateInstanceCallContext callContext(
-            AZStd::bind(&DataOverlayTarget::ElementBegin, this, &nodeStack, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3),
-            AZStd::bind(&DataOverlayTarget::ElementEnd, this, &nodeStack),
+            [this, &nodeStack](void* instancePointer, const SerializeContext::ClassData* classData, const SerializeContext::ClassElement* classElement)->bool
+            {
+                return ElementBegin(&nodeStack, instancePointer, classData, classElement);
+            },
+            [this, &nodeStack]()->bool { return ElementEnd(&nodeStack); },
             m_sc,
             SerializeContext::ENUM_ACCESS_FOR_READ,
             m_errorLogger
diff --git a/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp b/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp
index 6f1635148c..d27a5005b4 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp
@@ -36,7 +36,7 @@ namespace AZ
     class DataNode
     {
     public:
-        typedef AZStd::list<DataNode>   ChildDataNodes;
+        using ChildDataNodes = AZStd::list<DataNode>;
 
         DataNode()
         {
@@ -148,25 +148,28 @@ namespace AZ
         m_root.Reset();
         m_currentNode = nullptr;
 
-        if (m_context && rootClassPtr)
+        if (!m_context || !rootClassPtr)
         {
-            SerializeContext::EnumerateInstanceCallContext callContext(
-                AZStd::bind(&DataNodeTree::BeginNode, this, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3),
-                AZStd::bind(&DataNodeTree::EndNode, this),
-                m_context,
-                SerializeContext::ENUM_ACCESS_FOR_READ,
-                nullptr
-            );
-
-            m_context->EnumerateInstanceConst(
-                &callContext,
-                rootClassPtr,
-                rootClassId,
-                nullptr,
-                nullptr
-            );
+            return;
         }
+        SerializeContext::EnumerateInstanceCallContext callContext(
+            [this](void* instancePointer, const SerializeContext::ClassData* classData, const SerializeContext::ClassElement* classElement)->bool
+            {
+                return BeginNode(instancePointer, classData, classElement);
+            },
+            [this]()->bool { return EndNode(); },
+            m_context,
+            SerializeContext::ENUM_ACCESS_FOR_READ,
+            nullptr
+        );
 
+        m_context->EnumerateInstanceConst(
+            &callContext,
+            rootClassPtr,
+            rootClassId,
+            nullptr,
+            nullptr
+        );
         m_currentNode = nullptr;
     }
 
diff --git a/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp b/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp
index d0c433df16..8a4688d748 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/EditContext.cpp
@@ -34,7 +34,7 @@ namespace AZ
             }
             classIt->ClearElements();
         }
-        for (auto enumIt : m_enumData)
+        for (auto& enumIt : m_enumData)
         {
             enumIt.second.ClearAttributes();
         }
@@ -103,7 +103,7 @@ namespace AZ
         //=========================================================================
         void ElementData::ClearAttributes()
         {
-            for (auto attrib : m_attributes)
+            for (auto& attrib : m_attributes)
             {
                 delete attrib.second;
             }
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
index a741294544..4e80d9ba69 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonDeserializer.cpp
@@ -759,6 +759,7 @@ namespace AZ
             else
             {
                 typeIdResult.m_determination = JsonDeserializer::TypeIdDetermination::FailedToDetermine;
+                typeIdResult.m_typeId = Uuid::CreateNull();
             }
         }
         else if (input.IsString())
@@ -768,6 +769,7 @@ namespace AZ
         else
         {
             typeIdResult.m_determination = JsonDeserializer::TypeIdDetermination::FailedToDetermine;
+            typeIdResult.m_typeId = Uuid::CreateNull();
         }
 
         switch (typeIdResult.m_determination)
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp
index 822c1c43d5..16bad5a466 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializationResult.cpp
@@ -10,265 +10,264 @@
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/std/algorithm.h>
 
-namespace AZ
+namespace AZ::JsonSerializationResult::Internal
 {
-    namespace JsonSerializationResult
+    template<typename StringType>
+    void AppendToString(AZ::JsonSerializationResult::ResultCode code,
+        StringType& target, AZStd::string_view path)
     {
-        namespace Internal
+        if (code.GetTask() == static_cast<Tasks>(0))
         {
-            template<typename StringType>
-            void AppendToString(AZ::JsonSerializationResult::ResultCode code, 
-                StringType& target, AZStd::string_view path)
-            {
-                if (code.GetTask() == static_cast<Tasks>(0))
-                {
-                    target.append("The result code wasn't initialized");
-                    return;
-                }
-
-                target.append("The operation ");
-                switch (code.GetProcessing())
-                {
-                case Processing::Halted:
-                    target.append("has halted during ");
-                    break;
-                case Processing::Altered:
-                    target.append("has taken an alternative approach for ");
-                    break;
-                case Processing::PartialAlter:
-                    target.append("has taken a partially alternative approach for ");
-                    break;
-                case Processing::Completed:
-                    target.append("has completed ");
-                    break;
-                default:
-                    target.append("has unknown processing status for ");
-                    break;
-                }
-
-                switch (code.GetTask())
-                {
-                case Tasks::RetrieveInfo:
-                    target.append("a retrieve info operation ");
-                    break;
-                case Tasks::CreateDefault:
-                    target.append("a create default operation ");
-                    break;
-                case Tasks::Convert:
-                    target.append("a convert operation ");
-                    break;
-                case Tasks::ReadField:
-                    target.append("a read field operation ");
-                    break;
-                case Tasks::WriteValue:
-                    target.append("a write value operation ");
-                    break;
-                case Tasks::Merge:
-                    target.append("a merge operation ");
-                    break;
-                case Tasks::CreatePatch:
-                    target.append("a create patch operation ");
-                    break;
-                case Tasks::Import:
-                    target.append("an import operation");
-                    break;
-                default:
-                    target.append("an unknown operation ");
-                    break;
-                }
-
-                if (!path.empty())
-                {
-                    target.append("for '");
-                    target.append(path.begin(), path.end());
-                    target.append("' ");
-                }
-
-                switch (code.GetOutcome())
-                {
-                case Outcomes::Success:
-                    target.append("which resulted in success");
-                    break;
-                case Outcomes::DefaultsUsed:
-                    target.append("by using only default values");
-                    break;
-                case Outcomes::PartialDefaults:
-                    target.append("by using one or more default values");
-                    break;
-                case Outcomes::Skipped:
-                    target.append("because a field or value was skipped");
-                    break;
-                case Outcomes::PartialSkip:
-                    target.append("because one or more fields or values were skipped");
-                    break;
-                case Outcomes::Unavailable:
-                    target.append("because the target was unavailable");
-                    break;
-                case Outcomes::Unsupported:
-                    target.append("because the action was unsupported");
-                    break;
-                case Outcomes::TypeMismatch:
-                    target.append("because the source and target are unrelated types");
-                    break;
-                case Outcomes::TestFailed:
-                    target.append("because a test against a value failed");
-                    break;
-                case Outcomes::Missing:
-                    target.append("because a required field or value was missing");
-                    break;
-                case Outcomes::Invalid:
-                    target.append("because a field or element has an invalid value");
-                    break;
-                case Outcomes::Unknown:
-                    target.append("because information was missing");
-                    break;
-                case Outcomes::Catastrophic:
-                    target.append("because a catastrophic issue was encountered");
-                    break;
-                default:
-                    break;
-                }
-            }
-        } // namespace JsonSerializationResultInternal
-
-        ResultCode::ResultCode(Tasks task)
-            : m_code(0)
-        {
-            m_options.m_task = task;
+            target.append("The result code wasn't initialized");
+            return;
         }
 
-        ResultCode::ResultCode(uint32_t code)
-            : m_code(code)
-        {}
-
-        ResultCode::ResultCode(Tasks task, Outcomes outcome)
+        target.append("The operation ");
+        switch (code.GetProcessing())
         {
-            m_options.m_task = task;
-            switch (outcome)
-            {
-            case Outcomes::Success:         // fall through
-            case Outcomes::Skipped:         // fall through
-            case Outcomes::PartialSkip:      // fall through
-            case Outcomes::DefaultsUsed:    // fall through
-            case Outcomes::PartialDefaults:
-                m_options.m_processing = Processing::Completed;
-                break;
-            case Outcomes::Unavailable:     // fall through
-            case Outcomes::Unsupported:
-                m_options.m_processing = Processing::Altered;
-                break;
-            case Outcomes::TypeMismatch:    // fall through
-            case Outcomes::TestFailed:      // fall through
-            case Outcomes::Missing:         // fall through
-            case Outcomes::Invalid:         // fall through
-            case Outcomes::Unknown:         // fall through
-            case Outcomes::Catastrophic:    // fall through
-            default:
-                m_options.m_processing = Processing::Halted;
-                break;
-            }
-            m_options.m_outcome = outcome;
+        case Processing::Halted:
+            target.append("has halted during ");
+            break;
+        case Processing::Altered:
+            target.append("has taken an alternative approach for ");
+            break;
+        case Processing::PartialAlter:
+            target.append("has taken a partially alternative approach for ");
+            break;
+        case Processing::Completed:
+            target.append("has completed ");
+            break;
+        default:
+            target.append("has unknown processing status for ");
+            break;
         }
 
-        bool ResultCode::HasDoneWork() const
+        switch (code.GetTask())
         {
-            return m_options.m_outcome != static_cast<Outcomes>(0);
+        case Tasks::RetrieveInfo:
+            target.append("a retrieve info operation ");
+            break;
+        case Tasks::CreateDefault:
+            target.append("a create default operation ");
+            break;
+        case Tasks::Convert:
+            target.append("a convert operation ");
+            break;
+        case Tasks::ReadField:
+            target.append("a read field operation ");
+            break;
+        case Tasks::WriteValue:
+            target.append("a write value operation ");
+            break;
+        case Tasks::Merge:
+            target.append("a merge operation ");
+            break;
+        case Tasks::CreatePatch:
+            target.append("a create patch operation ");
+            break;
+        case Tasks::Import:
+            target.append("an import operation");
+            break;
+        default:
+            target.append("an unknown operation ");
+            break;
         }
 
-        ResultCode& ResultCode::Combine(ResultCode other)
+        if (!path.empty())
         {
-            *this = Combine(*this, other);
-            return *this;
+            target.append("for '");
+            target.append(path.begin(), path.end());
+            target.append("' ");
         }
 
-        ResultCode& ResultCode::Combine(const Result& other)
+        switch (code.GetOutcome())
         {
-            *this = Combine(*this, other.GetResultCode());
-            return *this;
+        case Outcomes::Success:
+            target.append("which resulted in success");
+            break;
+        case Outcomes::DefaultsUsed:
+            target.append("by using only default values");
+            break;
+        case Outcomes::PartialDefaults:
+            target.append("by using one or more default values");
+            break;
+        case Outcomes::Skipped:
+            target.append("because a field or value was skipped");
+            break;
+        case Outcomes::PartialSkip:
+            target.append("because one or more fields or values were skipped");
+            break;
+        case Outcomes::Unavailable:
+            target.append("because the target was unavailable");
+            break;
+        case Outcomes::Unsupported:
+            target.append("because the action was unsupported");
+            break;
+        case Outcomes::TypeMismatch:
+            target.append("because the source and target are unrelated types");
+            break;
+        case Outcomes::TestFailed:
+            target.append("because a test against a value failed");
+            break;
+        case Outcomes::Missing:
+            target.append("because a required field or value was missing");
+            break;
+        case Outcomes::Invalid:
+            target.append("because a field or element has an invalid value");
+            break;
+        case Outcomes::Unknown:
+            target.append("because information was missing");
+            break;
+        case Outcomes::Catastrophic:
+            target.append("because a catastrophic issue was encountered");
+            break;
+        default:
+            break;
         }
+    }
+} // namespace AZ::JsonSerializationResult::Internal
 
-        ResultCode ResultCode::Combine(ResultCode lhs, ResultCode rhs)
+namespace AZ::JsonSerializationResult
+{
+
+    ResultCode::ResultCode(Tasks task)
+        : m_code(0)
+    {
+        m_options.m_task = task;
+    }
+
+    ResultCode::ResultCode(uint32_t code)
+        : m_code(code)
+    {}
+
+    ResultCode::ResultCode(Tasks task, Outcomes outcome)
+    {
+        m_options.m_task = task;
+        switch (outcome)
         {
-            ResultCode result = ResultCode(AZStd::max(lhs.m_code, rhs.m_code));
-
-            if ((lhs.m_options.m_outcome == Outcomes::Success && rhs.m_options.m_outcome == Outcomes::DefaultsUsed) ||
-                (lhs.m_options.m_outcome == Outcomes::DefaultsUsed && rhs.m_options.m_outcome == Outcomes::Success))
-            {
-                result.m_options.m_outcome = Outcomes::PartialDefaults;
-            }
-            else if ((lhs.m_options.m_outcome == Outcomes::Success && rhs.m_options.m_outcome == Outcomes::Skipped) ||
-                     (lhs.m_options.m_outcome == Outcomes::Skipped && rhs.m_options.m_outcome == Outcomes::Success))
-            {
-                result.m_options.m_outcome = Outcomes::PartialSkip;
-            }
-
-            if ((lhs.m_options.m_processing == Processing::Completed && rhs.m_options.m_processing == Processing::Altered) ||
-                (lhs.m_options.m_processing == Processing::Altered && rhs.m_options.m_processing == Processing::Completed))
-            {
-                result.m_options.m_processing = Processing::PartialAlter;
-            }
-
-            return result;
+        case Outcomes::Success:         // fall through
+        case Outcomes::Skipped:         // fall through
+        case Outcomes::PartialSkip:      // fall through
+        case Outcomes::DefaultsUsed:    // fall through
+        case Outcomes::PartialDefaults:
+            m_options.m_processing = Processing::Completed;
+            break;
+        case Outcomes::Unavailable:     // fall through
+        case Outcomes::Unsupported:
+            m_options.m_processing = Processing::Altered;
+            break;
+        case Outcomes::TypeMismatch:    // fall through
+        case Outcomes::TestFailed:      // fall through
+        case Outcomes::Missing:         // fall through
+        case Outcomes::Invalid:         // fall through
+        case Outcomes::Unknown:         // fall through
+        case Outcomes::Catastrophic:    // fall through
+        default:
+            m_options.m_processing = Processing::Halted;
+            break;
         }
+        m_options.m_outcome = outcome;
+    }
 
-        Tasks ResultCode::GetTask() const
+    bool ResultCode::HasDoneWork() const
+    {
+        return m_options.m_outcome != static_cast<Outcomes>(0);
+    }
+
+    ResultCode& ResultCode::Combine(ResultCode other)
+    {
+        *this = Combine(*this, other);
+        return *this;
+    }
+
+    ResultCode& ResultCode::Combine(const Result& other)
+    {
+        *this = Combine(*this, other.GetResultCode());
+        return *this;
+    }
+
+    ResultCode ResultCode::Combine(ResultCode lhs, ResultCode rhs)
+    {
+        ResultCode result = ResultCode(AZStd::max(lhs.m_code, rhs.m_code));
+
+        if ((lhs.m_options.m_outcome == Outcomes::Success && rhs.m_options.m_outcome == Outcomes::DefaultsUsed) ||
+            (lhs.m_options.m_outcome == Outcomes::DefaultsUsed && rhs.m_options.m_outcome == Outcomes::Success))
         {
-            return m_options.m_task;
+            result.m_options.m_outcome = Outcomes::PartialDefaults;
         }
-
-        Processing ResultCode::GetProcessing() const
+        else if ((lhs.m_options.m_outcome == Outcomes::Success && rhs.m_options.m_outcome == Outcomes::Skipped) ||
+                 (lhs.m_options.m_outcome == Outcomes::Skipped && rhs.m_options.m_outcome == Outcomes::Success))
         {
-            return m_options.m_processing == static_cast<Processing>(0) ?
-                Processing::Completed : m_options.m_processing;
+            result.m_options.m_outcome = Outcomes::PartialSkip;
         }
 
-        Outcomes ResultCode::GetOutcome() const
+        if ((lhs.m_options.m_processing == Processing::Completed && rhs.m_options.m_processing == Processing::Altered) ||
+            (lhs.m_options.m_processing == Processing::Altered && rhs.m_options.m_processing == Processing::Completed))
         {
-            return m_options.m_outcome == static_cast<Outcomes>(0) ?
-                Outcomes::DefaultsUsed : m_options.m_outcome;
+            result.m_options.m_processing = Processing::PartialAlter;
         }
 
-        void ResultCode::AppendToString(AZ::OSString& target, AZStd::string_view path) const
-        {
-            Internal::AppendToString(*this, target, path);
-        }
+        return result;
+    }
 
-        void ResultCode::AppendToString(AZStd::string& target, AZStd::string_view path) const
-        {
-            Internal::AppendToString(*this, target, path);
-        }
+    Tasks ResultCode::GetTask() const
+    {
+        return m_options.m_task;
+    }
 
-        AZStd::string ResultCode::ToString(AZStd::string_view path) const
-        {
-            AZStd::string result;
-            AppendToString(result, path);
-            return result;
-        }
+    Processing ResultCode::GetProcessing() const
+    {
+        return m_options.m_processing == static_cast<Processing>(0) ?
+            Processing::Completed : m_options.m_processing;
+    }
 
-        AZ::OSString ResultCode::ToOSString(AZStd::string_view path) const
-        {
-            AZ::OSString result;
-            AppendToString(result, path);
-            return result;
-        }
+    Outcomes ResultCode::GetOutcome() const
+    {
+        return m_options.m_outcome == static_cast<Outcomes>(0) ?
+            Outcomes::DefaultsUsed : m_options.m_outcome;
+    }
+
+    void ResultCode::AppendToString(AZ::OSString& target, AZStd::string_view path) const
+    {
+        Internal::AppendToString(*this, target, path);
+    }
+
+    void ResultCode::AppendToString(AZStd::string& target, AZStd::string_view path) const
+    {
+        Internal::AppendToString(*this, target, path);
+    }
+
+    AZStd::string ResultCode::ToString(AZStd::string_view path) const
+    {
+        AZStd::string result;
+        AppendToString(result, path);
+        return result;
+    }
+
+    AZ::OSString ResultCode::ToOSString(AZStd::string_view path) const
+    {
+        AZ::OSString result;
+        AppendToString(result, path);
+        return result;
+    }
 
 
-        Result::Result(const JsonIssueCallback& callback, AZStd::string_view message, ResultCode result, AZStd::string_view path)
-            : m_result(callback(message, result, path))
-        {}
+    Result::Result(const JsonIssueCallback& callback, AZStd::string_view message, ResultCode result, AZStd::string_view path)
+        : m_result(callback(message, result, path))
+    {}
 
-        Result::Result(const JsonIssueCallback& callback, AZStd::string_view message, Tasks task, Outcomes outcome, AZStd::string_view path)
-            : m_result(callback(message, ResultCode(task, outcome), path))
-        {}
+    Result::Result(const JsonIssueCallback& callback, AZStd::string_view message, Tasks task, Outcomes outcome, AZStd::string_view path)
+        : m_result(callback(message, ResultCode(task, outcome), path))
+    {}
 
-        Result::operator ResultCode() const
-        { 
-            return m_result;
-        }
+    Result::operator ResultCode() const
+    {
+        return m_result;
+    }
 
-        ResultCode Result::GetResultCode() const
-        {
-            return m_result;
-        }
-    } // namespace JsonSerializationResult
-} // namespace AZ
+    ResultCode Result::GetResultCode() const
+    {
+        return m_result;
+    }
+
+} // namespace AZ::JsonSerializationResult
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
index da02e70181..0ba44e4e61 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonSystemComponent.cpp
@@ -104,6 +104,8 @@ namespace AZ
                 ->HandlesType<AZStd::variant>();
             jsonContext->Serializer<JsonOptionalSerializer>()
                 ->HandlesType<AZStd::optional>();
+            jsonContext->Serializer<JsonBitsetSerializer>()
+                ->HandlesType<AZStd::bitset>();
 
             MathReflect(jsonContext);
         }
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonUtils.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonUtils.cpp
index 1a4e7b3e80..6d7edb0716 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonUtils.cpp
@@ -24,438 +24,435 @@
 
 #include <AzCore/Serialization/Json/JsonUtils.h>
 
-namespace AZ
+namespace AZ::JsonSerializationUtils
 {
-    namespace JsonSerializationUtils
+    static const char* FileTypeTag = "Type";
+    static const char* FileType = "JsonSerialization";
+    static const char* VersionTag = "Version";
+    static const char* ClassNameTag = "ClassName";
+    static const char* ClassDataTag = "ClassData";
+
+    AZ::Outcome<void, AZStd::string> WriteJsonString(const rapidjson::Document& document, AZStd::string& jsonText, WriteJsonSettings settings)
     {
-        static const char* FileTypeTag = "Type";
-        static const char* FileType = "JsonSerialization";
-        static const char* VersionTag = "Version";
-        static const char* ClassNameTag = "ClassName";
-        static const char* ClassDataTag = "ClassData";
+        AZ::IO::ByteContainerStream<AZStd::string> stream{&jsonText};
+        return WriteJsonStream(document, stream, settings);
+    }
 
-        AZ::Outcome<void, AZStd::string> WriteJsonString(const rapidjson::Document& document, AZStd::string& jsonText, WriteJsonSettings settings)
+    AZ::Outcome<void, AZStd::string> WriteJsonFile(const rapidjson::Document& document, AZStd::string_view filePath, WriteJsonSettings settings)
+    {
+        // Write the json into memory first and then write the file, rather than passing a file stream to rapidjson.
+        // This should avoid creating a large number of micro-writes to the file.
+        AZStd::string fileContent;
+        auto outcome = WriteJsonString(document, fileContent, settings);
+        if (!outcome.IsSuccess())
         {
-            AZ::IO::ByteContainerStream<AZStd::string> stream{&jsonText};
-            return WriteJsonStream(document, stream, settings);
+            return outcome;
         }
 
-        AZ::Outcome<void, AZStd::string> WriteJsonFile(const rapidjson::Document& document, AZStd::string_view filePath, WriteJsonSettings settings)
-        {
-            // Write the json into memory first and then write the file, rather than passing a file stream to rapidjson.
-            // This should avoid creating a large number of micro-writes to the file.
-            AZStd::string fileContent;
-            auto outcome = WriteJsonString(document, fileContent, settings);
-            if (!outcome.IsSuccess())
-            {
-                return outcome;
-            }
+        return AZ::Utils::WriteFile(fileContent, filePath);
+    }
 
-            return AZ::Utils::WriteFile(fileContent, filePath);
+    AZ::Outcome<void, AZStd::string> WriteJsonStream(const rapidjson::Document& document, IO::GenericStream& stream, WriteJsonSettings settings)
+    {
+        AZ::IO::RapidJSONStreamWriter jsonStreamWriter(&stream);
+
+        rapidjson::PrettyWriter<AZ::IO::RapidJSONStreamWriter> writer(jsonStreamWriter);
+
+        if (settings.m_maxDecimalPlaces >= 0)
+        {
+            writer.SetMaxDecimalPlaces(settings.m_maxDecimalPlaces);
         }
 
-        AZ::Outcome<void, AZStd::string> WriteJsonStream(const rapidjson::Document& document, IO::GenericStream& stream, WriteJsonSettings settings)
+        if (document.Accept(writer))
         {
-            AZ::IO::RapidJSONStreamWriter jsonStreamWriter(&stream);
+            return AZ::Success();
+        }
+        else
+        {
+            return AZ::Failure(AZStd::string{"Json Writer failed"});
+        }
+    }
 
-            rapidjson::PrettyWriter<AZ::IO::RapidJSONStreamWriter> writer(jsonStreamWriter);
-
-            if (settings.m_maxDecimalPlaces >= 0)
-            {
-                writer.SetMaxDecimalPlaces(settings.m_maxDecimalPlaces);
-            }
-
-            if (document.Accept(writer))
-            {
-                return AZ::Success();
-            }
-            else
-            {
-                return AZ::Failure(AZStd::string{"Json Writer failed"});
-            }
+    AZ::Outcome<void, AZStd::string> SaveObjectToStreamByType(const void* objectPtr, const Uuid& classId, IO::GenericStream& stream,
+         const void* defaultObjectPtr, const JsonSerializerSettings* settings)
+    {
+        if (!stream.CanWrite())
+        {
+            return AZ::Failure(AZStd::string("The GenericStream can't be written to"));
         }
 
-        AZ::Outcome<void, AZStd::string> SaveObjectToStreamByType(const void* objectPtr, const Uuid& classId, IO::GenericStream& stream,
-             const void* defaultObjectPtr, const JsonSerializerSettings* settings)
+        JsonSerializerSettings saveSettings;
+        if (settings)
         {
-            if (!stream.CanWrite())
-            {
-                return AZ::Failure(AZStd::string("The GenericStream can't be written to"));
-            }
+            saveSettings = *settings;
+        }
 
-            JsonSerializerSettings saveSettings;
-            if (settings)
-            {
-                saveSettings = *settings;
-            }
-
-            AZ::SerializeContext* serializeContext = saveSettings.m_serializeContext;
+        AZ::SerializeContext* serializeContext = saveSettings.m_serializeContext;
+        if (!serializeContext)
+        {
+            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
             if (!serializeContext)
             {
-                AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext); 
-                if (!serializeContext)
-                {
-                    return AZ::Failure(AZStd::string::format("Need SerializeContext for saving"));
-                }
-                saveSettings.m_serializeContext = serializeContext;
+                return AZ::Failure(AZStd::string::format("Need SerializeContext for saving"));
             }
-
-            rapidjson::Document jsonDocument;
-            jsonDocument.SetObject();
-            jsonDocument.AddMember(rapidjson::StringRef(FileTypeTag), rapidjson::StringRef(FileType), jsonDocument.GetAllocator());
-            
-            rapidjson::Value serializedObject;
-            
-            JsonSerializationResult::ResultCode jsonResult = JsonSerialization::Store(serializedObject, jsonDocument.GetAllocator(),
-                objectPtr, defaultObjectPtr, classId, saveSettings);
-
-            if (jsonResult.GetProcessing() != JsonSerializationResult::Processing::Completed)
-            {
-                return AZ::Failure(jsonResult.ToString(""));
-            }
-
-            const SerializeContext::ClassData* classData = serializeContext->FindClassData(classId);
-
-            jsonDocument.AddMember(rapidjson::StringRef(VersionTag), 1, jsonDocument.GetAllocator());
-            jsonDocument.AddMember(rapidjson::StringRef(ClassNameTag), rapidjson::StringRef(classData->m_name), jsonDocument.GetAllocator());
-            jsonDocument.AddMember(rapidjson::StringRef(ClassDataTag), AZStd::move(serializedObject), jsonDocument.GetAllocator());
-
-            AZ::IO::RapidJSONStreamWriter jsonStreamWriter(&stream);
-            rapidjson::PrettyWriter<AZ::IO::RapidJSONStreamWriter> writer(jsonStreamWriter);
-            bool jsonWriteResult = jsonDocument.Accept(writer);
-            if (!jsonWriteResult)
-            {
-                return AZ::Failure(AZStd::string::format("Unable to write class %s with json serialization format'",
-                    classId.ToString<AZStd::string>().data()));
-            }
-
-            return AZ::Success();
+            saveSettings.m_serializeContext = serializeContext;
         }
 
-        AZ::Outcome<void, AZStd::string> SaveObjectToFileByType(const void* classPtr, const Uuid& classId, const AZStd::string& filePath,
-            const void* defaultClassPtr, const JsonSerializerSettings* settings)
+        rapidjson::Document jsonDocument;
+        jsonDocument.SetObject();
+        jsonDocument.AddMember(rapidjson::StringRef(FileTypeTag), rapidjson::StringRef(FileType), jsonDocument.GetAllocator());
+
+        rapidjson::Value serializedObject;
+
+        JsonSerializationResult::ResultCode jsonResult = JsonSerialization::Store(serializedObject, jsonDocument.GetAllocator(),
+            objectPtr, defaultObjectPtr, classId, saveSettings);
+
+        if (jsonResult.GetProcessing() != JsonSerializationResult::Processing::Completed)
         {
-            AZStd::vector<char> buffer;
-            buffer.reserve(1024);
-            AZ::IO::ByteContainerStream<AZStd::vector<char> > byteStream(&buffer);
-            auto saveResult = SaveObjectToStreamByType(classPtr, classId, byteStream, defaultClassPtr, settings);
-            if (saveResult.IsSuccess())
-            {
-                AZ::IO::FileIOStream outputFileStream;
-                if (!outputFileStream.Open(filePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath | AZ::IO::OpenMode::ModeText))
-                {
-                    return AZ::Failure(AZStd::string::format("Error opening file '%s' for writing", filePath.c_str()));
-                }
-                outputFileStream.Write(buffer.size(), buffer.data());
-            }
-            return saveResult;
+            return AZ::Failure(jsonResult.ToString(""));
         }
 
-        // Helper function to check whether the load outcome was success (for loading json serialization file)
-        bool WasLoadSuccess(JsonSerializationResult::Outcomes outcome)
-        {
-            return (outcome == JsonSerializationResult::Outcomes::Success
-                || outcome == JsonSerializationResult::Outcomes::DefaultsUsed
-                || outcome == JsonSerializationResult::Outcomes::PartialDefaults);
-        }
-        
-        AZ::Outcome<void, AZStd::string> PrepareDeserializerSettings(const JsonDeserializerSettings* inputSettings, JsonDeserializerSettings& returnSettings
-            , AZStd::string& deserializeError)
-        {
-            if (inputSettings)
-            {
-                returnSettings = *inputSettings;
-            }
+        const SerializeContext::ClassData* classData = serializeContext->FindClassData(classId);
 
+        jsonDocument.AddMember(rapidjson::StringRef(VersionTag), 1, jsonDocument.GetAllocator());
+        jsonDocument.AddMember(rapidjson::StringRef(ClassNameTag), rapidjson::StringRef(classData->m_name), jsonDocument.GetAllocator());
+        jsonDocument.AddMember(rapidjson::StringRef(ClassDataTag), AZStd::move(serializedObject), jsonDocument.GetAllocator());
+
+        AZ::IO::RapidJSONStreamWriter jsonStreamWriter(&stream);
+        rapidjson::PrettyWriter<AZ::IO::RapidJSONStreamWriter> writer(jsonStreamWriter);
+        bool jsonWriteResult = jsonDocument.Accept(writer);
+        if (!jsonWriteResult)
+        {
+            return AZ::Failure(AZStd::string::format("Unable to write class %s with json serialization format'",
+                classId.ToString<AZStd::string>().data()));
+        }
+
+        return AZ::Success();
+    }
+
+    AZ::Outcome<void, AZStd::string> SaveObjectToFileByType(const void* classPtr, const Uuid& classId, const AZStd::string& filePath,
+        const void* defaultClassPtr, const JsonSerializerSettings* settings)
+    {
+        AZStd::vector<char> buffer;
+        buffer.reserve(1024);
+        AZ::IO::ByteContainerStream<AZStd::vector<char> > byteStream(&buffer);
+        auto saveResult = SaveObjectToStreamByType(classPtr, classId, byteStream, defaultClassPtr, settings);
+        if (saveResult.IsSuccess())
+        {
+            AZ::IO::FileIOStream outputFileStream;
+            if (!outputFileStream.Open(filePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath | AZ::IO::OpenMode::ModeText))
+            {
+                return AZ::Failure(AZStd::string::format("Error opening file '%s' for writing", filePath.c_str()));
+            }
+            outputFileStream.Write(buffer.size(), buffer.data());
+        }
+        return saveResult;
+    }
+
+    // Helper function to check whether the load outcome was success (for loading json serialization file)
+    bool WasLoadSuccess(JsonSerializationResult::Outcomes outcome)
+    {
+        return (outcome == JsonSerializationResult::Outcomes::Success
+            || outcome == JsonSerializationResult::Outcomes::DefaultsUsed
+            || outcome == JsonSerializationResult::Outcomes::PartialDefaults);
+    }
+
+    AZ::Outcome<void, AZStd::string> PrepareDeserializerSettings(const JsonDeserializerSettings* inputSettings, JsonDeserializerSettings& returnSettings
+        , AZStd::string& deserializeError)
+    {
+        if (inputSettings)
+        {
+            returnSettings = *inputSettings;
+        }
+
+        if (!returnSettings.m_serializeContext)
+        {
+            AZ::ComponentApplicationBus::BroadcastResult(returnSettings.m_serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
             if (!returnSettings.m_serializeContext)
             {
-                AZ::ComponentApplicationBus::BroadcastResult(returnSettings.m_serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
-                if (!returnSettings.m_serializeContext)
+                return AZ::Failure(AZStd::string("Need SerializeContext for loading"));
+            }
+        }
+
+        // Report unused data field as error by default
+        auto reporting = returnSettings.m_reporting;
+        auto issueReportingCallback = [&deserializeError, reporting](AZStd::string_view message, JsonSerializationResult::ResultCode result, AZStd::string_view target) -> JsonSerializationResult::ResultCode
+        {
+            using namespace JsonSerializationResult;
+
+            if (!WasLoadSuccess(result.GetOutcome()))
+            {
+                // This if is a hack around fault in the JSON serialization system
+                // Jira: LY-106587
+                if (message != "No part of the string could be interpreted as a uuid.")
                 {
-                    return AZ::Failure(AZStd::string("Need SerializeContext for loading"));
+                    deserializeError.append(message);
+                    deserializeError.append(AZStd::string::format(" '%s' \n", target.data()));
                 }
             }
 
-            // Report unused data field as error by default
-            auto reporting = returnSettings.m_reporting;
-            auto issueReportingCallback = [&deserializeError, reporting](AZStd::string_view message, JsonSerializationResult::ResultCode result, AZStd::string_view target) -> JsonSerializationResult::ResultCode
+            if (reporting)
             {
-                using namespace JsonSerializationResult;
+                result = reporting(message, result, target);
+            }
 
-                if (!WasLoadSuccess(result.GetOutcome()))
-                {
-                    // This if is a hack around fault in the JSON serialization system
-                    // Jira: LY-106587
-                    if (message != "No part of the string could be interpreted as a uuid.")
-                    {
-                        deserializeError.append(message);
-                        deserializeError.append(AZStd::string::format(" '%s' \n", target.data()));
-                    }
-                }
+            return result;
+        };
 
-                if (reporting)
-                {
-                    result = reporting(message, result, target);
-                }
+        returnSettings.m_reporting = issueReportingCallback;
 
-                return result;
-            };
+        return AZ::Success();
+    }
 
-            returnSettings.m_reporting = issueReportingCallback;
 
-            return AZ::Success();
+    AZ::Outcome<rapidjson::Document, AZStd::string> ReadJsonString(AZStd::string_view jsonText)
+    {
+        if (jsonText.empty())
+        {
+            return AZ::Failure(AZStd::string("Failed to parse JSON: input string is empty."));
         }
 
-
-        AZ::Outcome<rapidjson::Document, AZStd::string> ReadJsonString(AZStd::string_view jsonText)
+        rapidjson::Document jsonDocument;
+        jsonDocument.Parse<rapidjson::kParseCommentsFlag>(jsonText.data(), jsonText.size());
+        if (jsonDocument.HasParseError())
         {
-            if (jsonText.empty())
+            size_t lineNumber = 1;
+
+            const size_t errorOffset = jsonDocument.GetErrorOffset();
+            for (size_t searchOffset = jsonText.find('\n');
+                searchOffset < errorOffset && searchOffset < AZStd::string::npos;
+                searchOffset = jsonText.find('\n', searchOffset + 1))
             {
-                return AZ::Failure(AZStd::string("Failed to parse JSON: input string is empty."));
+                lineNumber++;
             }
 
-            rapidjson::Document jsonDocument;
-            jsonDocument.Parse<rapidjson::kParseCommentsFlag>(jsonText.data(), jsonText.size());
-            if (jsonDocument.HasParseError())
-            {
-                size_t lineNumber = 1;
+            return AZ::Failure(AZStd::string::format("JSON parse error at line %zu: %s", lineNumber, rapidjson::GetParseError_En(jsonDocument.GetParseError())));
+        }
+        else
+        {
+            return AZ::Success(AZStd::move(jsonDocument));
+        }
+    }
 
-                const size_t errorOffset = jsonDocument.GetErrorOffset();
-                for (size_t searchOffset = jsonText.find('\n');
-                    searchOffset < errorOffset && searchOffset < AZStd::string::npos;
-                    searchOffset = jsonText.find('\n', searchOffset + 1))
-                {
-                    lineNumber++;
-                }
-                
-                return AZ::Failure(AZStd::string::format("JSON parse error at line %zu: %s", lineNumber, rapidjson::GetParseError_En(jsonDocument.GetParseError())));
-            }
-            else
-            {
-                return AZ::Success(AZStd::move(jsonDocument));
-            }
+    AZ::Outcome<rapidjson::Document, AZStd::string> ReadJsonStream(IO::GenericStream& stream)
+    {
+        IO::SizeType length = stream.GetLength();
+
+        AZStd::vector<char> memoryBuffer;
+        memoryBuffer.resize_no_construct(static_cast<AZStd::vector<char>::size_type>(static_cast<AZStd::vector<char>::size_type>(length) + 1));
+
+        IO::SizeType bytesRead = stream.Read(length, memoryBuffer.data());
+        if (bytesRead != length)
+        {
+            return AZ::Failure(AZStd::string{"Cannot to read input stream."});
         }
 
-        AZ::Outcome<rapidjson::Document, AZStd::string> ReadJsonStream(IO::GenericStream& stream)
+        memoryBuffer.back() = 0;
+
+        return ReadJsonString(AZStd::string_view{memoryBuffer.data(), memoryBuffer.size()});
+    }
+
+    AZ::Outcome<rapidjson::Document, AZStd::string> ReadJsonFile(AZStd::string_view filePath, size_t maxFileSize)
+    {
+        // Read into memory first and then parse the json, rather than passing a file stream to rapidjson.
+        // This should avoid creating a large number of micro-reads from the file.
+
+        auto readResult = AZ::Utils::ReadFile<AZStd::string>(filePath, maxFileSize);
+        if(!readResult.IsSuccess())
         {
-            IO::SizeType length = stream.GetLength();
-
-            AZStd::vector<char> memoryBuffer;
-            memoryBuffer.resize_no_construct(static_cast<AZStd::vector<char>::size_type>(static_cast<AZStd::vector<char>::size_type>(length) + 1));
-
-            IO::SizeType bytesRead = stream.Read(length, memoryBuffer.data());
-            if (bytesRead != length)
-            {
-                return AZ::Failure(AZStd::string{"Cannot to read input stream."});
-            }
-
-            memoryBuffer.back() = 0;
-
-            return ReadJsonString(AZStd::string_view{memoryBuffer.data(), memoryBuffer.size()});
+            return AZ::Failure(readResult.GetError());
         }
 
-        AZ::Outcome<rapidjson::Document, AZStd::string> ReadJsonFile(AZStd::string_view filePath, size_t maxFileSize)
+        AZStd::string jsonContent = readResult.TakeValue();
+
+        auto result = ReadJsonString(jsonContent);
+        if (!result.IsSuccess())
         {
-            // Read into memory first and then parse the json, rather than passing a file stream to rapidjson.
-            // This should avoid creating a large number of micro-reads from the file.
+            return AZ::Failure(AZStd::string::format("Failed to load '%.*s'. %s", AZ_STRING_ARG(filePath), result.GetError().c_str()));
+        }
+        else
+        {
+            return result;
+        }
+    }
 
-            auto readResult = AZ::Utils::ReadFile<AZStd::string>(filePath, maxFileSize);
-            if(!readResult.IsSuccess())
-            {
-                return AZ::Failure(readResult.GetError());
-            }
-
-            AZStd::string jsonContent = readResult.TakeValue();
-
-            auto result = ReadJsonString(jsonContent);
-            if (!result.IsSuccess())
-            {
-                return AZ::Failure(AZStd::string::format("Failed to load '%.*s'. %s", AZ_STRING_ARG(filePath), result.GetError().c_str()));
-            }
-            else
-            {
-                return result;
-            }
+    // Helper function to validate the JSON is structured with the standard header for a generic class
+    AZ::Outcome<void, AZStd::string> ValidateJsonClassHeader(const rapidjson::Document& jsonDocument)
+    {
+        auto typeItr = jsonDocument.FindMember(FileTypeTag);
+        if (typeItr == jsonDocument.MemberEnd() || !typeItr->value.IsString() || azstricmp(typeItr->value.GetString(), FileType) != 0)
+        {
+            return AZ::Failure(AZStd::string::format("Not a valid JsonSerialization file"));
         }
 
-        // Helper function to validate the JSON is structured with the standard header for a generic class
-        AZ::Outcome<void, AZStd::string> ValidateJsonClassHeader(const rapidjson::Document& jsonDocument)
+        auto nameItr = jsonDocument.FindMember(ClassNameTag);
+        if (nameItr == jsonDocument.MemberEnd() || !nameItr->value.IsString())
         {
-            auto typeItr = jsonDocument.FindMember(FileTypeTag);
-            if (typeItr == jsonDocument.MemberEnd() || !typeItr->value.IsString() || azstricmp(typeItr->value.GetString(), FileType) != 0)
-            {
-                return AZ::Failure(AZStd::string::format("Not a valid JsonSerialization file"));
-            }
-
-            auto nameItr = jsonDocument.FindMember(ClassNameTag);
-            if (nameItr == jsonDocument.MemberEnd() || !nameItr->value.IsString())
-            {
-                return AZ::Failure(AZStd::string::format("File should contain ClassName"));
-            }
-
-            auto dataItr = jsonDocument.FindMember(ClassDataTag);
-            // data can be empty but it should be an object
-            if (dataItr != jsonDocument.MemberEnd() && !dataItr->value.IsObject())
-            {
-                return AZ::Failure(AZStd::string::format("ClassData should be an object"));
-            }
-
-            return AZ::Success();
+            return AZ::Failure(AZStd::string::format("File should contain ClassName"));
         }
 
-        AZ::Outcome<void, AZStd::string> LoadObjectFromStringByType(void* objectToLoad, const Uuid& classId, AZStd::string_view stream,
-            const JsonDeserializerSettings* settings)
+        auto dataItr = jsonDocument.FindMember(ClassDataTag);
+        // data can be empty but it should be an object
+        if (dataItr != jsonDocument.MemberEnd() && !dataItr->value.IsObject())
         {
-            JsonDeserializerSettings loadSettings;
-            AZStd::string deserializeErrors;
-            auto prepare = PrepareDeserializerSettings(settings, loadSettings, deserializeErrors);
-            if (!prepare.IsSuccess())
-            {
-                return AZ::Failure(prepare.GetError());
-            }
+            return AZ::Failure(AZStd::string::format("ClassData should be an object"));
+        }
 
-            auto parseResult = ReadJsonString(stream);
-            if (!parseResult.IsSuccess())
-            {
-                return AZ::Failure(parseResult.GetError());
-            }
+        return AZ::Success();
+    }
 
-            const rapidjson::Document& jsonDocument = parseResult.GetValue();
+    AZ::Outcome<void, AZStd::string> LoadObjectFromStringByType(void* objectToLoad, const Uuid& classId, AZStd::string_view stream,
+        const JsonDeserializerSettings* settings)
+    {
+        JsonDeserializerSettings loadSettings;
+        AZStd::string deserializeErrors;
+        auto prepare = PrepareDeserializerSettings(settings, loadSettings, deserializeErrors);
+        if (!prepare.IsSuccess())
+        {
+            return AZ::Failure(prepare.GetError());
+        }
 
-            auto validateResult = ValidateJsonClassHeader(jsonDocument);
-            if (!validateResult.IsSuccess())
-            {
-                return AZ::Failure(validateResult.GetError());
-            }
+        auto parseResult = ReadJsonString(stream);
+        if (!parseResult.IsSuccess())
+        {
+            return AZ::Failure(parseResult.GetError());
+        }
 
-            const char* className = jsonDocument.FindMember(ClassNameTag)->value.GetString();
+        const rapidjson::Document& jsonDocument = parseResult.GetValue();
 
-            // validate class name 
-            auto classData = loadSettings.m_serializeContext->FindClassData(classId);
-            if (!classData)
-            {
-                return AZ::Failure(AZStd::string::format("Try to load class from Id %s", classId.ToString<AZStd::string>().c_str()));
-            }
+        auto validateResult = ValidateJsonClassHeader(jsonDocument);
+        if (!validateResult.IsSuccess())
+        {
+            return AZ::Failure(validateResult.GetError());
+        }
 
-            if (azstricmp(classData->m_name, className) != 0)
-            {
-                return AZ::Failure(AZStd::string::format("Try to load class %s from class %s data", classData->m_name, className));
-            }
+        const char* className = jsonDocument.FindMember(ClassNameTag)->value.GetString();
 
-            JsonSerializationResult::ResultCode result = JsonSerialization::Load(objectToLoad, classId, jsonDocument.FindMember(ClassDataTag)->value, loadSettings);
+        // validate class name
+        auto classData = loadSettings.m_serializeContext->FindClassData(classId);
+        if (!classData)
+        {
+            return AZ::Failure(AZStd::string::format("Try to load class from Id %s", classId.ToString<AZStd::string>().c_str()));
+        }
+
+        if (azstricmp(classData->m_name, className) != 0)
+        {
+            return AZ::Failure(AZStd::string::format("Try to load class %s from class %s data", classData->m_name, className));
+        }
+
+        JsonSerializationResult::ResultCode result = JsonSerialization::Load(objectToLoad, classId, jsonDocument.FindMember(ClassDataTag)->value, loadSettings);
+
+        if (!WasLoadSuccess(result.GetOutcome()) || !deserializeErrors.empty())
+        {
+            return AZ::Failure(deserializeErrors);
+        }
+
+        return AZ::Success();
+    }
+
+    AZ::Outcome<void, AZStd::string> LoadObjectFromStreamByType(void* objectToLoad, const Uuid& classId, IO::GenericStream& stream,
+        const JsonDeserializerSettings* settings)
+    {
+        JsonDeserializerSettings loadSettings;
+        AZStd::string deserializeErrors;
+        auto prepare = PrepareDeserializerSettings(settings, loadSettings, deserializeErrors);
+        if (!prepare.IsSuccess())
+        {
+            return AZ::Failure(prepare.GetError());
+        }
+
+        auto parseResult = ReadJsonStream(stream);
+        if (!parseResult.IsSuccess())
+        {
+            return AZ::Failure(parseResult.GetError());
+        }
+
+        const rapidjson::Document& jsonDocument = parseResult.GetValue();
+
+        auto validateResult = ValidateJsonClassHeader(jsonDocument);
+        if (!validateResult.IsSuccess())
+        {
+            return AZ::Failure(validateResult.GetError());
+        }
+
+        const char* className = jsonDocument.FindMember(ClassNameTag)->value.GetString();
+
+        // validate class name
+        auto classData = loadSettings.m_serializeContext->FindClassData(classId);
+        if (!classData)
+        {
+            return AZ::Failure(AZStd::string::format("Try to load class from Id %s", classId.ToString<AZStd::string>().c_str()));
+        }
+
+        if (azstricmp(classData->m_name, className) != 0)
+        {
+            return AZ::Failure(AZStd::string::format("Try to load class %s from class %s data", classData->m_name, className));
+        }
+
+        JsonSerializationResult::ResultCode result = JsonSerialization::Load(objectToLoad, classId, jsonDocument.FindMember(ClassDataTag)->value, loadSettings);
+
+        if (!WasLoadSuccess(result.GetOutcome()) || !deserializeErrors.empty())
+        {
+            return AZ::Failure(deserializeErrors);
+        }
+
+        return AZ::Success();
+    }
+
+    AZ::Outcome<AZStd::any, AZStd::string> LoadAnyObjectFromStream(IO::GenericStream& stream, const JsonDeserializerSettings* settings)
+    {
+        JsonDeserializerSettings loadSettings;
+        AZStd::string deserializeErrors;
+        auto prepare = PrepareDeserializerSettings(settings, loadSettings, deserializeErrors);
+        if (!prepare.IsSuccess())
+        {
+            return AZ::Failure(prepare.GetError());
+        }
+
+        auto parseResult = ReadJsonStream(stream);
+        if (!parseResult.IsSuccess())
+        {
+            return AZ::Failure(parseResult.GetError());
+        }
+
+        const rapidjson::Document& jsonDocument = parseResult.GetValue();
+
+        auto validateResult = ValidateJsonClassHeader(jsonDocument);
+        if (!parseResult.IsSuccess())
+        {
+            return AZ::Failure(parseResult.GetError());
+        }
+
+        const char* className = jsonDocument.FindMember(ClassNameTag)->value.GetString();
+        AZStd::vector<AZ::Uuid> ids = loadSettings.m_serializeContext->FindClassId(AZ::Crc32(className));
+
+        // Load with first found class id
+        if (ids.size() >= 1)
+        {
+            auto classId = ids[0];
+            AZStd::any anyData = loadSettings.m_serializeContext->CreateAny(classId);
+            auto& objectData = jsonDocument.FindMember(ClassDataTag)->value;
+            JsonSerializationResult::ResultCode result = JsonSerialization::Load(AZStd::any_cast<void>(&anyData), classId, objectData, loadSettings);
 
             if (!WasLoadSuccess(result.GetOutcome()) || !deserializeErrors.empty())
             {
                 return AZ::Failure(deserializeErrors);
             }
 
-            return AZ::Success();
+            return AZ::Success(anyData);
         }
 
-        AZ::Outcome<void, AZStd::string> LoadObjectFromStreamByType(void* objectToLoad, const Uuid& classId, IO::GenericStream& stream,
-            const JsonDeserializerSettings* settings)
+        return AZ::Failure(AZStd::string::format("Can't find serialize context for class %s", className));
+    }
+
+    AZ::Outcome<AZStd::any, AZStd::string> LoadAnyObjectFromFile(const AZStd::string& filePath, const JsonDeserializerSettings* settings)
+    {
+        AZ::IO::FileIOStream inputFileStream;
+        if (!inputFileStream.Open(filePath.c_str(), AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeText))
         {
-            JsonDeserializerSettings loadSettings;
-            AZStd::string deserializeErrors;
-            auto prepare = PrepareDeserializerSettings(settings, loadSettings, deserializeErrors);
-            if (!prepare.IsSuccess())
-            {
-                return AZ::Failure(prepare.GetError());
-            }
-
-            auto parseResult = ReadJsonStream(stream);
-            if (!parseResult.IsSuccess())
-            {
-                return AZ::Failure(parseResult.GetError());
-            }
-
-            const rapidjson::Document& jsonDocument = parseResult.GetValue();
-
-            auto validateResult = ValidateJsonClassHeader(jsonDocument);
-            if (!validateResult.IsSuccess())
-            {
-                return AZ::Failure(validateResult.GetError());
-            }
-
-            const char* className = jsonDocument.FindMember(ClassNameTag)->value.GetString();
-
-            // validate class name 
-            auto classData = loadSettings.m_serializeContext->FindClassData(classId);
-            if (!classData)
-            {
-                return AZ::Failure(AZStd::string::format("Try to load class from Id %s", classId.ToString<AZStd::string>().c_str()));
-            }
-
-            if (azstricmp(classData->m_name, className) != 0)
-            {
-                return AZ::Failure(AZStd::string::format("Try to load class %s from class %s data", classData->m_name, className));
-            }
-            
-            JsonSerializationResult::ResultCode result = JsonSerialization::Load(objectToLoad, classId, jsonDocument.FindMember(ClassDataTag)->value, loadSettings);
-
-            if (!WasLoadSuccess(result.GetOutcome()) || !deserializeErrors.empty())
-            {
-                return AZ::Failure(deserializeErrors);
-            }
-
-            return AZ::Success();
-        }       
-        
-        AZ::Outcome<AZStd::any, AZStd::string> LoadAnyObjectFromStream(IO::GenericStream& stream, const JsonDeserializerSettings* settings)
-        {
-            JsonDeserializerSettings loadSettings;
-            AZStd::string deserializeErrors;
-            auto prepare = PrepareDeserializerSettings(settings, loadSettings, deserializeErrors);
-            if (!prepare.IsSuccess())
-            {
-                return AZ::Failure(prepare.GetError());
-            }
-
-            auto parseResult = ReadJsonStream(stream);
-            if (!parseResult.IsSuccess())
-            {
-                return AZ::Failure(parseResult.GetError());
-            }
-
-            const rapidjson::Document& jsonDocument = parseResult.GetValue();
-
-            auto validateResult = ValidateJsonClassHeader(jsonDocument);
-            if (!parseResult.IsSuccess())
-            {
-                return AZ::Failure(parseResult.GetError());
-            }
-
-            const char* className = jsonDocument.FindMember(ClassNameTag)->value.GetString();
-            AZStd::vector<AZ::Uuid> ids = loadSettings.m_serializeContext->FindClassId(AZ::Crc32(className));
-
-            // Load with first found class id
-            if (ids.size() >= 1)
-            {
-                auto classId = ids[0];
-                AZStd::any anyData = loadSettings.m_serializeContext->CreateAny(classId);
-                auto& objectData = jsonDocument.FindMember(ClassDataTag)->value;
-                JsonSerializationResult::ResultCode result = JsonSerialization::Load(AZStd::any_cast<void>(&anyData), classId, objectData, loadSettings);
-
-                if (!WasLoadSuccess(result.GetOutcome()) || !deserializeErrors.empty())
-                {
-                    return AZ::Failure(deserializeErrors);
-                }
-
-                return AZ::Success(anyData);
-            }
-
-            return AZ::Failure(AZStd::string::format("Can't find serialize context for class %s", className));
+            return AZ::Failure(AZStd::string::format("Error opening file '%s' for reading", filePath.c_str()));
         }
+        return LoadAnyObjectFromStream(inputFileStream, settings);
+    }
 
-        AZ::Outcome<AZStd::any, AZStd::string> LoadAnyObjectFromFile(const AZStd::string& filePath, const JsonDeserializerSettings* settings)
-        {
-            AZ::IO::FileIOStream inputFileStream;
-            if (!inputFileStream.Open(filePath.c_str(), AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeText))
-            {
-                return AZ::Failure(AZStd::string::format("Error opening file '%s' for reading", filePath.c_str()));
-            }
-            return LoadAnyObjectFromStream(inputFileStream, settings);
-        }
-
-    } // namespace JsonSerializationUtils
-} // namespace AZ
+} // namespace AZ::JsonSerializationUtils
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp
index 2392ff435f..ad1839f974 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.cpp
@@ -15,6 +15,7 @@ namespace AZ
     AZ_CLASS_ALLOCATOR_IMPL(JsonAnySerializer, SystemAllocator, 0);
     AZ_CLASS_ALLOCATOR_IMPL(JsonVariantSerializer, SystemAllocator, 0);
     AZ_CLASS_ALLOCATOR_IMPL(JsonOptionalSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonBitsetSerializer, SystemAllocator, 0);
 
     JsonSerializationResult::Result JsonUnsupportedTypesSerializer::Load(void*, const Uuid&, const rapidjson::Value&,
         JsonDeserializerContext& context)
@@ -49,4 +50,10 @@ namespace AZ
         return "The Json Serialization doesn't support AZStd::optional by design. No JSON format has yet been found that wasn't deemed too "
                "complex or overly verbose.";
     }
+
+    AZStd::string_view JsonBitsetSerializer::GetMessage() const
+    {
+        return "The Json Serialization doesn't support AZStd::bitset by design. No JSON format has yet been found that is content creator "
+               "friendly i.e., easy to comprehend the intent.";
+    }
 } // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h
index d913289d3d..fdcac4c761 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/UnsupportedTypesSerializer.h
@@ -65,4 +65,14 @@ namespace AZ
     protected:
         AZStd::string_view GetMessage() const override;
     };
+
+    class JsonBitsetSerializer : public JsonUnsupportedTypesSerializer
+    {
+    public:
+        AZ_RTTI(JsonBitsetSerializer, "{10CE969D-D69E-4B3F-8593-069736F8F705}", JsonUnsupportedTypesSerializer);
+        AZ_CLASS_ALLOCATOR_DECL;
+
+    protected:
+        AZStd::string_view GetMessage() const override;
+    };
 } // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp b/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp
index 746c80f3ea..ac44ac150c 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp
@@ -1050,7 +1050,7 @@ namespace AZ
                 }
                 m_xmlNode = next;
 
-                Uuid specializedId;
+                Uuid specializedId = Uuid::CreateNull();
                 // now parse the node
                 rapidxml::xml_attribute<char>* attr = m_xmlNode->first_attribute();
                 while (attr)
@@ -1643,12 +1643,15 @@ namespace AZ
                     m_writeElementResultStack.push_back(WriteElement(ptr, classData, classElement));
                     return m_writeElementResultStack.back();
                 };
-                auto closeElementCB = [this, classData]()
+                auto closeElementCB = [this, classTypeId = classData->m_typeId]()
                 {
                     if (m_writeElementResultStack.empty())
                     {
-                        AZ_UNUSED(classData); // Prevent unused warning in release builds
-                        AZ_Error("Serialize", false, "CloseElement is attempted to be called without a corresponding WriteElement when writing class %s", classData->m_name);
+                        // ClassData could be dangling pointer if it was unreflected by the ObjectStreamWriteOverrideCB
+                        // So use the classTypeId instead
+                        AZ_UNUSED(classTypeId);
+                        AZ_Error("Serialize", false, "CloseElement is attempted to be called without a corresponding WriteElement when writing class %s",
+                            classTypeId.ToString<AZStd::fixed_string<AZ::TypeId::MaxStringBuffer>>().c_str());
                         return true;
                     }
                     if (m_writeElementResultStack.back())
@@ -1665,16 +1668,14 @@ namespace AZ
                     SerializeContext::ENUM_ACCESS_FOR_READ,
                     &m_errorLogger
                 );
-                ObjectStreamWriteOverrideCB writeCB;
-                if (objectStreamWriteOverrideCB.Read<ObjectStreamWriteOverrideCB>(writeCB))
+                if (objectStreamWriteOverrideCB.Invoke<void>(callContext, objectPtr, *classData, classElement))
                 {
-                    writeCB(callContext, objectPtr, *classData, classElement);
                     return false;
                 }
                 else
                 {
                     auto objectStreamError = AZStd::string::format("Unable to invoke ObjectStream Write Element Override for class element %s of class data %s",
-                        classElement->m_name ? classElement->m_name : "", classData->m_name);
+                        classElement && classElement->m_name ? classElement->m_name : "", classData->m_name);
                     m_errorLogger.ReportError(objectStreamError.c_str());
                 }
             }
diff --git a/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp b/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp
index 37eacd940e..8439ff8e2c 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializationUtils.cpp
@@ -18,502 +18,499 @@
 
 #include <AzCore/Debug/Profiler.h>
 
-namespace AZ
+namespace AZ::Utils
 {
-    namespace Utils
+    bool LoadObjectFromStreamInPlace(IO::GenericStream& stream, AZ::SerializeContext* context, const SerializeContext::ClassData* objectClassData, void* targetPointer, const FilterDescriptor& filterDesc)
     {
-        bool LoadObjectFromStreamInPlace(IO::GenericStream& stream, AZ::SerializeContext* context, const SerializeContext::ClassData* objectClassData, void* targetPointer, const FilterDescriptor& filterDesc)
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        AZ_Assert(objectClassData, "Class data is required.");
+
+        if (!context)
         {
-            AZ_PROFILE_FUNCTION(AzCore);
-
-            AZ_Assert(objectClassData, "Class data is required.");
-
-            if (!context)
-            {
-                EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
-                AZ_Assert(context, "No serialize context");
-            }
-
-            if (!context)
-            {
-                return false;
-            }
-
-            AZ_Assert(targetPointer, "You must provide a target pointer");
-
-            bool foundSuccess = false;
-            using CreationCallback = AZStd::function<void (void **, const SerializeContext::ClassData **, const Uuid &, SerializeContext *)>;
-            auto handler = [&targetPointer, objectClassData, &foundSuccess](void** instance, const SerializeContext::ClassData** classData, const Uuid& classId, SerializeContext* context)
-                {
-                    void* convertibleInstance{};
-                    if (objectClassData->ConvertFromType(convertibleInstance, classId, targetPointer, *context))
-                    {
-                        foundSuccess = true;
-                        if (instance)
-                        {
-                            // The ObjectStream will ask us for the address of the target to load into, so provide it.
-                            *instance = convertibleInstance;
-                        }
-                        if (classData)
-                        {
-                            // The ObjectStream will ask us for the class data of the target being loaded into, so provide it if needed.
-                            // This allows us to load directly into a generic object (templated containers, strings, etc).
-                            *classData = objectClassData;
-                        }
-                    }
-                };
-            bool readSuccess = ObjectStream::LoadBlocking(&stream, *context, ObjectStream::ClassReadyCB(), filterDesc, CreationCallback(handler, AZ::OSStdAllocator()));
-
-            AZ_Warning("Serialization", readSuccess, "LoadObjectFromStreamInPlace: Stream did not deserialize correctly");
-            AZ_Warning("Serialization", foundSuccess, "LoadObjectFromStreamInPlace: Did not find the expected type in the stream");
-
-            return readSuccess && foundSuccess;
+            EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
+            AZ_Assert(context, "No serialize context");
         }
 
-        bool LoadObjectFromStreamInPlace(IO::GenericStream& stream, AZ::SerializeContext* context, const Uuid& targetClassId, void* targetPointer, const FilterDescriptor& filterDesc)
+        if (!context)
         {
-            AZ_PROFILE_FUNCTION(AzCore);
-
-            if (!context)
-            {
-                EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
-                AZ_Assert(context, "No serialize context");
-            }
-
-            if (!context)
-            {
-                return false;
-            }
-
-            const SerializeContext::ClassData* classData = context->FindClassData(targetClassId);
-            if (!classData)
-            {
-                AZ_Error("Serialization", false,
-                         "Unable to locate class data for uuid \"%s\". This object cannot be serialized as a root element. "
-                         "Make sure the Uuid is valid, or if this is a generic type, use the override that takes a ClassData pointer instead.",
-                         targetClassId.ToString<AZStd::string>().c_str());
-                return false;
-            }
-
-            return LoadObjectFromStreamInPlace(stream, context, classData, targetPointer, filterDesc);
-        }
-
-        bool LoadObjectFromFileInPlace(const AZStd::string& filePath, const Uuid& targetClassId, void* destination, AZ::SerializeContext* context /*= nullptr*/, const FilterDescriptor& filterDesc /*= FilterDescriptor()*/)
-        {
-            AZ::IO::FileIOStream fileStream;
-            if (!fileStream.Open(filePath.c_str(), IO::OpenMode::ModeRead | IO::OpenMode::ModeBinary))
-            {
-                return false;
-            }
-
-            return LoadObjectFromStreamInPlace(fileStream, context, targetClassId, destination, filterDesc);
-        }
-
-        void* LoadObjectFromStream(IO::GenericStream& stream, AZ::SerializeContext* context, const Uuid* targetClassId, const FilterDescriptor& filterDesc)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
-
-            if (!context)
-            {
-                EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
-                AZ_Assert(context, "No serialize context");
-            }
-
-            if (!context)
-            {
-                return nullptr;
-            }
-
-            void* loadedInstance = nullptr;
-            bool success = ObjectStream::LoadBlocking(&stream, *context,
-                    [&loadedInstance, targetClassId](void* classPtr, const Uuid& classId, const SerializeContext* serializeContext)
-                    {
-                        if (targetClassId)
-                        {
-                            void* instance = serializeContext->DownCast(classPtr, classId, *targetClassId);
-
-                            // Given a valid object
-                            if (instance)
-                            {
-                                AZ_Assert(!loadedInstance, "loadedInstance must be NULL, otherwise we are being invoked with multiple valid objects");
-                                loadedInstance = instance;
-                                return;
-                            }
-                        }
-                        else
-                        {
-                            if (!loadedInstance)
-                            {
-                                loadedInstance = classPtr;
-                                return;
-                            }
-                        }
-
-                        auto classData = serializeContext->FindClassData(classId);
-                        if (classData && classData->m_factory)
-                        {
-                            classData->m_factory->Destroy(classPtr);
-                        }
-                    },
-                    filterDesc,
-                    ObjectStream::InplaceLoadRootInfoCB()
-                    );
-
-            if (!success)
-            {
-                return nullptr;
-            }
-
-            return loadedInstance;
-        }
-
-        void* LoadObjectFromFile(const AZStd::string& filePath, const Uuid& targetClassId, SerializeContext* context, const FilterDescriptor& filterDesc, int /*platformFlags*/)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
-
-            AZ::IO::FileIOStream fileStream;           
-            if (!fileStream.Open(filePath.c_str(), IO::OpenMode::ModeRead | IO::OpenMode::ModeBinary))
-            {
-                return nullptr;
-            }
-
-            void* loadedObject = LoadObjectFromStream(fileStream, context, &targetClassId, filterDesc);
-            return loadedObject;
-        }
-
-        bool SaveObjectToStream(IO::GenericStream& stream, DataStream::StreamType streamType, const void* classPtr, const Uuid& classId, SerializeContext* context, const SerializeContext::ClassData* classData)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
-
-            if (!context)
-            {
-                EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
-
-                if(!context)
-                {
-                    AZ_Assert(false, "No serialize context");
-                    return false;
-                }
-            }
-
-            if (!classPtr)
-            {
-                AZ_Assert(false, "SaveObjectToStream: classPtr is null, object cannot be serialized.");
-                return false;
-            }
-
-            AZ::ObjectStream* objectStream = AZ::ObjectStream::Create(&stream, *context, streamType);
-            if (!objectStream)
-            {
-                return false;
-            }
-
-            if (!objectStream->WriteClass(classPtr, classId, classData))
-            {
-                objectStream->Finalize();
-                return false;
-            }
-
-            if (!objectStream->Finalize())
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        bool SaveStreamToFile(const AZStd::string& filePath, const AZStd::vector<AZ::u8>& streamData, int platformFlags)
-        {
-            AZ::IO::FileIOBase* fileIo = AZ::IO::FileIOBase::GetInstance();
-            AZ::IO::FixedMaxPathString resolvedPath;
-            if (fileIo == nullptr || !fileIo->ResolvePath(filePath.c_str(), resolvedPath.data(), resolvedPath.capacity() + 1))
-            {
-                resolvedPath = filePath;
-            }
-            if (AZ::IO::SystemFile fileHandle; fileHandle.Open(resolvedPath.c_str(),
-                AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY,
-                platformFlags))
-            {
-                AZ::IO::SizeType bytesWritten = fileHandle.Write(streamData.data(), streamData.size());
-                return bytesWritten == streamData.size();
-            }
-
             return false;
         }
 
-        bool SaveObjectToFile(const AZStd::string& filePath, DataStream::StreamType fileType, const void* classPtr, const Uuid& classId, SerializeContext* context, int platformFlags)
-        {
-            AZ_PROFILE_FUNCTION(AzCore);
+        AZ_Assert(targetPointer, "You must provide a target pointer");
 
-            // \note This is ok for tools, but we should use the streamer to write objects directly (no memory store)
-            AZStd::vector<AZ::u8> dstData;
-            AZ::IO::ByteContainerStream<AZStd::vector<AZ::u8> > dstByteStream(&dstData);
-
-            if (!SaveObjectToStream(dstByteStream, fileType, classPtr, classId, context))
+        bool foundSuccess = false;
+        using CreationCallback = AZStd::function<void (void **, const SerializeContext::ClassData **, const Uuid &, SerializeContext *)>;
+        auto handler = [&targetPointer, objectClassData, &foundSuccess](void** instance, const SerializeContext::ClassData** classData, const Uuid& classId, SerializeContext* context)
             {
-                return false;
-            }
-
-            return SaveStreamToFile(filePath, dstData, platformFlags);
-        }
-
-        /*!
-        \brief Finds any descendant DataElementNodes of the @classElement which match each Crc32 values in the supplied elementCrcQueue
-        \param context SerializeContext used for looking up ClassData
-        \param classElement Top level DataElementNode to begin comparison each the Crc32 queue
-        \param elementCrcQueue Container of Crc32 values in the order in which DataElementNodes should be matched as the DataElementNode tree is traversed
-        \return Vector of valid pointers to DataElementNodes which match the entire element Crc32 queue
-        */
-        AZStd::vector<AZ::SerializeContext::DataElementNode*> FindDescendantElements(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement,
-            const AZStd::vector<AZ::Crc32>& elementCrcQueue)
-        {
-            AZStd::vector<AZ::SerializeContext::DataElementNode*> dataElementNodes;
-            FindDescendantElements(context, classElement, dataElementNodes, elementCrcQueue.begin(), elementCrcQueue.end());
-
-            return dataElementNodes;
-        }
-
-        /*!
-        \brief Finds any descendant DataElementNodes of the @classElement which match each Crc32 values in the supplied elementCrcQueue
-        \param context SerializeContext used for looking up ClassData
-        \param classElement The current DataElementNode which will be compared against be to current top Crc32 value in the Crc32 queue
-        \param dataElementNodes[out] Array to populate with a DataElementNode which was found by matching all Crc32 values in the Crc32 queue
-        \param first The current front of the Crc32 queue
-        \param last The end of the Crc32 queue
-        */
-        void FindDescendantElements(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement,
-            AZStd::vector<AZ::SerializeContext::DataElementNode*>& dataElementNodes, AZStd::vector<AZ::Crc32>::const_iterator first, AZStd::vector<AZ::Crc32>::const_iterator last)
-        {
-            if (first == last)
-            {
-                return;
-            }
-
-            for (int i = 0; i < classElement.GetNumSubElements(); ++i)
-            {
-                auto& childElement = classElement.GetSubElement(i);
-                if (*first == AZ::Crc32(childElement.GetName()))
+                void* convertibleInstance{};
+                if (objectClassData->ConvertFromType(convertibleInstance, classId, targetPointer, *context))
                 {
-                    if (AZStd::distance(first, last) == 1)
+                    foundSuccess = true;
+                    if (instance)
                     {
-                        dataElementNodes.push_back(&childElement);
+                        // The ObjectStream will ask us for the address of the target to load into, so provide it.
+                        *instance = convertibleInstance;
+                    }
+                    if (classData)
+                    {
+                        // The ObjectStream will ask us for the class data of the target being loaded into, so provide it if needed.
+                        // This allows us to load directly into a generic object (templated containers, strings, etc).
+                        *classData = objectClassData;
+                    }
+                }
+            };
+        bool readSuccess = ObjectStream::LoadBlocking(&stream, *context, ObjectStream::ClassReadyCB(), filterDesc, CreationCallback(handler, AZ::OSStdAllocator()));
+
+        AZ_Warning("Serialization", readSuccess, "LoadObjectFromStreamInPlace: Stream did not deserialize correctly");
+        AZ_Warning("Serialization", foundSuccess, "LoadObjectFromStreamInPlace: Did not find the expected type in the stream");
+
+        return readSuccess && foundSuccess;
+    }
+
+    bool LoadObjectFromStreamInPlace(IO::GenericStream& stream, AZ::SerializeContext* context, const Uuid& targetClassId, void* targetPointer, const FilterDescriptor& filterDesc)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        if (!context)
+        {
+            EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
+            AZ_Assert(context, "No serialize context");
+        }
+
+        if (!context)
+        {
+            return false;
+        }
+
+        const SerializeContext::ClassData* classData = context->FindClassData(targetClassId);
+        if (!classData)
+        {
+            AZ_Error("Serialization", false,
+                     "Unable to locate class data for uuid \"%s\". This object cannot be serialized as a root element. "
+                     "Make sure the Uuid is valid, or if this is a generic type, use the override that takes a ClassData pointer instead.",
+                     targetClassId.ToString<AZStd::string>().c_str());
+            return false;
+        }
+
+        return LoadObjectFromStreamInPlace(stream, context, classData, targetPointer, filterDesc);
+    }
+
+    bool LoadObjectFromFileInPlace(const AZStd::string& filePath, const Uuid& targetClassId, void* destination, AZ::SerializeContext* context /*= nullptr*/, const FilterDescriptor& filterDesc /*= FilterDescriptor()*/)
+    {
+        AZ::IO::FileIOStream fileStream;
+        if (!fileStream.Open(filePath.c_str(), IO::OpenMode::ModeRead | IO::OpenMode::ModeBinary))
+        {
+            return false;
+        }
+
+        return LoadObjectFromStreamInPlace(fileStream, context, targetClassId, destination, filterDesc);
+    }
+
+    void* LoadObjectFromStream(IO::GenericStream& stream, AZ::SerializeContext* context, const Uuid* targetClassId, const FilterDescriptor& filterDesc)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        if (!context)
+        {
+            EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
+            AZ_Assert(context, "No serialize context");
+        }
+
+        if (!context)
+        {
+            return nullptr;
+        }
+
+        void* loadedInstance = nullptr;
+        bool success = ObjectStream::LoadBlocking(&stream, *context,
+                [&loadedInstance, targetClassId](void* classPtr, const Uuid& classId, const SerializeContext* serializeContext)
+                {
+                    if (targetClassId)
+                    {
+                        void* instance = serializeContext->DownCast(classPtr, classId, *targetClassId);
+
+                        // Given a valid object
+                        if (instance)
+                        {
+                            AZ_Assert(!loadedInstance, "loadedInstance must be NULL, otherwise we are being invoked with multiple valid objects");
+                            loadedInstance = instance;
+                            return;
+                        }
                     }
                     else
                     {
-                        FindDescendantElements(context, childElement, dataElementNodes, AZStd::next(first), last);
-                    }
-                }
-            }
-        }
-
-        bool IsVectorContainerType(const AZ::Uuid& type)
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                AZ::TypeId containerTypeId = type;
-
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    // This type is a container
-                    containerTypeId = classInfo->GetGenericTypeId();
-                }
-
-                if (containerTypeId == AZ::GetGenericClassInfoVectorTypeId()
-                    || containerTypeId == AZ::GetGenericClassInfoFixedVectorTypeId()
-                    || containerTypeId == AZ::GetGenericClassInfoArrayTypeId()
-                    )
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        bool IsSetContainerType(const AZ::Uuid& type)
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                AZ::TypeId containerTypeId = type;
-
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    // This type is a container
-                    containerTypeId = classInfo->GetGenericTypeId();
-                }
-
-                if (containerTypeId == AZ::GetGenericClassSetTypeId()
-                    || containerTypeId == AZ::GetGenericClassUnorderedSetTypeId()
-                    )
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-
-        bool IsMapContainerType(const AZ::Uuid& type)
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                AZ::Uuid containerTypeId = type;
-
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    containerTypeId = classInfo->GetGenericTypeId();
-                }
-                
-                if (containerTypeId == AZ::GetGenericClassMapTypeId()
-                    || containerTypeId == AZ::GetGenericClassUnorderedMapTypeId()
-                    )
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        bool IsContainerType(const AZ::Uuid& type)
-        {
-            return IsVectorContainerType(type) || IsSetContainerType(type) || IsMapContainerType(type);
-        }
-
-        AZStd::vector<AZ::Uuid> GetContainedTypes(const AZ::Uuid& type)
-        {
-            AZStd::vector<AZ::Uuid> types;
-
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    for (int i = 0; i < classInfo->GetNumTemplatedArguments(); ++i)
-                    {
-                        types.push_back(classInfo->GetTemplatedTypeId(i));
-                    }
-                }
-            }
-
-            return types;
-        }
-
-        bool IsOutcomeType(const AZ::Uuid& type)
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type);
-                return classInfo && classInfo->GetGenericTypeId() == AZ::GetGenericOutcomeTypeId();
-            }
-
-            return false;
-        }
-
-        bool IsPairContainerType(const AZ::Uuid& type)
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                AZ::Uuid containerTypeId = type;
-
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    containerTypeId = classInfo->GetGenericTypeId();
-                }
-
-                if (containerTypeId == AZ::GetGenericClassPairTypeId())
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        AZ::TypeId GetGenericContainerType(const AZ::TypeId& type)
-        {
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    // This type is a container
-                    return classInfo->GetGenericTypeId();
-                }
-            }
-
-            return azrtti_typeid<void>();
-        }
-
-        bool IsGenericContainerType(const AZ::TypeId& type)
-        {
-            return IsContainerType(type) && GetGenericContainerType(type) == azrtti_typeid<void>();
-        }
-
-        AZStd::pair<AZ::Uuid, AZ::Uuid> GetOutcomeTypes(const AZ::Uuid& type)
-        {
-            AZStd::vector<AZ::Uuid> types;
-
-            AZ::SerializeContext* serializeContext = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
-
-            if (serializeContext)
-            {
-                if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
-                {
-                    AZ_Assert(classInfo->GetNumTemplatedArguments() == 2, "Outcome template arguments must be 2, even if void, void");
-                    return AZStd::make_pair(classInfo->GetTemplatedTypeId(0), classInfo->GetTemplatedTypeId(1));
-                }
-            }
-
-            return AZStd::make_pair(azrtti_typeid<void>(), azrtti_typeid<void>());
-        }
-
-        void* ResolvePointer(void* ptr, const SerializeContext::ClassElement& classElement, const SerializeContext& context)
-        {
-            if (classElement.m_flags & SerializeContext::ClassElement::FLG_POINTER)
-            {
-                // In the case of pointer-to-pointer, we'll deference.
-                ptr = *(void**)(ptr);
-
-                // Pointer-to-pointer fields may be base class / polymorphic, so cast pointer to actual type,
-                // safe for passing as 'this' to member functions.
-                if (ptr && classElement.m_azRtti)
-                {
-                    Uuid actualClassId = classElement.m_azRtti->GetActualUuid(ptr);
-                    if (actualClassId != classElement.m_typeId)
-                    {
-                        const SerializeContext::ClassData* classData = context.FindClassData(actualClassId);
-                        if (classData)
+                        if (!loadedInstance)
                         {
-                            ptr = classElement.m_azRtti->Cast(ptr, classData->m_azRtti->GetTypeId());
+                            loadedInstance = classPtr;
+                            return;
                         }
                     }
-                }
-            }
 
-            return ptr;
+                    auto classData = serializeContext->FindClassData(classId);
+                    if (classData && classData->m_factory)
+                    {
+                        classData->m_factory->Destroy(classPtr);
+                    }
+                },
+                filterDesc,
+                ObjectStream::InplaceLoadRootInfoCB()
+                );
+
+        if (!success)
+        {
+            return nullptr;
         }
 
-    } // namespace Utils
-} // namespace AZ
+        return loadedInstance;
+    }
+
+    void* LoadObjectFromFile(const AZStd::string& filePath, const Uuid& targetClassId, SerializeContext* context, const FilterDescriptor& filterDesc, int /*platformFlags*/)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        AZ::IO::FileIOStream fileStream;
+        if (!fileStream.Open(filePath.c_str(), IO::OpenMode::ModeRead | IO::OpenMode::ModeBinary))
+        {
+            return nullptr;
+        }
+
+        void* loadedObject = LoadObjectFromStream(fileStream, context, &targetClassId, filterDesc);
+        return loadedObject;
+    }
+
+    bool SaveObjectToStream(IO::GenericStream& stream, DataStream::StreamType streamType, const void* classPtr, const Uuid& classId, SerializeContext* context, const SerializeContext::ClassData* classData)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        if (!context)
+        {
+            EBUS_EVENT_RESULT(context, ComponentApplicationBus, GetSerializeContext);
+
+            if(!context)
+            {
+                AZ_Assert(false, "No serialize context");
+                return false;
+            }
+        }
+
+        if (!classPtr)
+        {
+            AZ_Assert(false, "SaveObjectToStream: classPtr is null, object cannot be serialized.");
+            return false;
+        }
+
+        AZ::ObjectStream* objectStream = AZ::ObjectStream::Create(&stream, *context, streamType);
+        if (!objectStream)
+        {
+            return false;
+        }
+
+        if (!objectStream->WriteClass(classPtr, classId, classData))
+        {
+            objectStream->Finalize();
+            return false;
+        }
+
+        if (!objectStream->Finalize())
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    bool SaveStreamToFile(const AZStd::string& filePath, const AZStd::vector<AZ::u8>& streamData, int platformFlags)
+    {
+        AZ::IO::FileIOBase* fileIo = AZ::IO::FileIOBase::GetInstance();
+        AZ::IO::FixedMaxPathString resolvedPath;
+        if (fileIo == nullptr || !fileIo->ResolvePath(filePath.c_str(), resolvedPath.data(), resolvedPath.capacity() + 1))
+        {
+            resolvedPath = filePath;
+        }
+        if (AZ::IO::SystemFile fileHandle; fileHandle.Open(resolvedPath.c_str(),
+            AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY,
+            platformFlags))
+        {
+            AZ::IO::SizeType bytesWritten = fileHandle.Write(streamData.data(), streamData.size());
+            return bytesWritten == streamData.size();
+        }
+
+        return false;
+    }
+
+    bool SaveObjectToFile(const AZStd::string& filePath, DataStream::StreamType fileType, const void* classPtr, const Uuid& classId, SerializeContext* context, int platformFlags)
+    {
+        AZ_PROFILE_FUNCTION(AzCore);
+
+        // \note This is ok for tools, but we should use the streamer to write objects directly (no memory store)
+        AZStd::vector<AZ::u8> dstData;
+        AZ::IO::ByteContainerStream<AZStd::vector<AZ::u8> > dstByteStream(&dstData);
+
+        if (!SaveObjectToStream(dstByteStream, fileType, classPtr, classId, context))
+        {
+            return false;
+        }
+
+        return SaveStreamToFile(filePath, dstData, platformFlags);
+    }
+
+    /*!
+    \brief Finds any descendant DataElementNodes of the @classElement which match each Crc32 values in the supplied elementCrcQueue
+    \param context SerializeContext used for looking up ClassData
+    \param classElement Top level DataElementNode to begin comparison each the Crc32 queue
+    \param elementCrcQueue Container of Crc32 values in the order in which DataElementNodes should be matched as the DataElementNode tree is traversed
+    \return Vector of valid pointers to DataElementNodes which match the entire element Crc32 queue
+    */
+    AZStd::vector<AZ::SerializeContext::DataElementNode*> FindDescendantElements(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement,
+        const AZStd::vector<AZ::Crc32>& elementCrcQueue)
+    {
+        AZStd::vector<AZ::SerializeContext::DataElementNode*> dataElementNodes;
+        FindDescendantElements(context, classElement, dataElementNodes, elementCrcQueue.begin(), elementCrcQueue.end());
+
+        return dataElementNodes;
+    }
+
+    /*!
+    \brief Finds any descendant DataElementNodes of the @classElement which match each Crc32 values in the supplied elementCrcQueue
+    \param context SerializeContext used for looking up ClassData
+    \param classElement The current DataElementNode which will be compared against be to current top Crc32 value in the Crc32 queue
+    \param dataElementNodes[out] Array to populate with a DataElementNode which was found by matching all Crc32 values in the Crc32 queue
+    \param first The current front of the Crc32 queue
+    \param last The end of the Crc32 queue
+    */
+    void FindDescendantElements(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement,
+        AZStd::vector<AZ::SerializeContext::DataElementNode*>& dataElementNodes, AZStd::vector<AZ::Crc32>::const_iterator first, AZStd::vector<AZ::Crc32>::const_iterator last)
+    {
+        if (first == last)
+        {
+            return;
+        }
+
+        for (int i = 0; i < classElement.GetNumSubElements(); ++i)
+        {
+            auto& childElement = classElement.GetSubElement(i);
+            if (*first == AZ::Crc32(childElement.GetName()))
+            {
+                if (AZStd::distance(first, last) == 1)
+                {
+                    dataElementNodes.push_back(&childElement);
+                }
+                else
+                {
+                    FindDescendantElements(context, childElement, dataElementNodes, AZStd::next(first), last);
+                }
+            }
+        }
+    }
+
+    bool IsVectorContainerType(const AZ::Uuid& type)
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            AZ::TypeId containerTypeId = type;
+
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                // This type is a container
+                containerTypeId = classInfo->GetGenericTypeId();
+            }
+
+            if (containerTypeId == AZ::GetGenericClassInfoVectorTypeId()
+                || containerTypeId == AZ::GetGenericClassInfoFixedVectorTypeId()
+                || containerTypeId == AZ::GetGenericClassInfoArrayTypeId()
+                )
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    bool IsSetContainerType(const AZ::Uuid& type)
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            AZ::TypeId containerTypeId = type;
+
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                // This type is a container
+                containerTypeId = classInfo->GetGenericTypeId();
+            }
+
+            if (containerTypeId == AZ::GetGenericClassSetTypeId()
+                || containerTypeId == AZ::GetGenericClassUnorderedSetTypeId()
+                )
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    bool IsMapContainerType(const AZ::Uuid& type)
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            AZ::Uuid containerTypeId = type;
+
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                containerTypeId = classInfo->GetGenericTypeId();
+            }
+
+            if (containerTypeId == AZ::GetGenericClassMapTypeId()
+                || containerTypeId == AZ::GetGenericClassUnorderedMapTypeId()
+                )
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    bool IsContainerType(const AZ::Uuid& type)
+    {
+        return IsVectorContainerType(type) || IsSetContainerType(type) || IsMapContainerType(type);
+    }
+
+    AZStd::vector<AZ::Uuid> GetContainedTypes(const AZ::Uuid& type)
+    {
+        AZStd::vector<AZ::Uuid> types;
+
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                for (int i = 0; i < classInfo->GetNumTemplatedArguments(); ++i)
+                {
+                    types.push_back(classInfo->GetTemplatedTypeId(i));
+                }
+            }
+        }
+
+        return types;
+    }
+
+    bool IsOutcomeType(const AZ::Uuid& type)
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type);
+            return classInfo && classInfo->GetGenericTypeId() == AZ::GetGenericOutcomeTypeId();
+        }
+
+        return false;
+    }
+
+    bool IsPairContainerType(const AZ::Uuid& type)
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            AZ::Uuid containerTypeId = type;
+
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                containerTypeId = classInfo->GetGenericTypeId();
+            }
+
+            if (containerTypeId == AZ::GetGenericClassPairTypeId())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    AZ::TypeId GetGenericContainerType(const AZ::TypeId& type)
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                // This type is a container
+                return classInfo->GetGenericTypeId();
+            }
+        }
+
+        return azrtti_typeid<void>();
+    }
+
+    bool IsGenericContainerType(const AZ::TypeId& type)
+    {
+        return IsContainerType(type) && GetGenericContainerType(type) == azrtti_typeid<void>();
+    }
+
+    AZStd::pair<AZ::Uuid, AZ::Uuid> GetOutcomeTypes(const AZ::Uuid& type)
+    {
+        AZStd::vector<AZ::Uuid> types;
+
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
+
+        if (serializeContext)
+        {
+            if (GenericClassInfo* classInfo = serializeContext->FindGenericClassInfo(type))
+            {
+                AZ_Assert(classInfo->GetNumTemplatedArguments() == 2, "Outcome template arguments must be 2, even if void, void");
+                return AZStd::make_pair(classInfo->GetTemplatedTypeId(0), classInfo->GetTemplatedTypeId(1));
+            }
+        }
+
+        return AZStd::make_pair(azrtti_typeid<void>(), azrtti_typeid<void>());
+    }
+
+    void* ResolvePointer(void* ptr, const SerializeContext::ClassElement& classElement, const SerializeContext& context)
+    {
+        if (classElement.m_flags & SerializeContext::ClassElement::FLG_POINTER)
+        {
+            // In the case of pointer-to-pointer, we'll deference.
+            ptr = *(void**)(ptr);
+
+            // Pointer-to-pointer fields may be base class / polymorphic, so cast pointer to actual type,
+            // safe for passing as 'this' to member functions.
+            if (ptr && classElement.m_azRtti)
+            {
+                Uuid actualClassId = classElement.m_azRtti->GetActualUuid(ptr);
+                if (actualClassId != classElement.m_typeId)
+                {
+                    const SerializeContext::ClassData* classData = context.FindClassData(actualClassId);
+                    if (classData)
+                    {
+                        ptr = classElement.m_azRtti->Cast(ptr, classData->m_azRtti->GetTypeId());
+                    }
+                }
+            }
+        }
+
+        return ptr;
+    }
+
+} // namespace AZ::Utils
diff --git a/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp
index 81546f4f28..ff0ad571f7 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp
@@ -2065,11 +2065,15 @@ namespace AZ
         }
 
         EnumerateInstanceCallContext callContext(
-            AZStd::bind(&SerializeContext::BeginCloneElement, this, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3, &cloneData, &m_errorLogger, &scratchBuffer),
-            AZStd::bind(&SerializeContext::EndCloneElement, this, &cloneData),
-            this,
-            SerializeContext::ENUM_ACCESS_FOR_READ,
-            &m_errorLogger);
+            [&](void* ptr, const ClassData* classData, const ClassElement* elementData) -> bool
+            {
+                return BeginCloneElement(ptr, classData, elementData, &cloneData, &m_errorLogger, &scratchBuffer);
+            },
+            [&]() -> bool
+            {
+                return EndCloneElement(&cloneData);
+            },
+            this, SerializeContext::ENUM_ACCESS_FOR_READ, &m_errorLogger);
 
         EnumerateInstance(
             &callContext
@@ -2098,19 +2102,17 @@ namespace AZ
         if (ptr)
         {
             EnumerateInstanceCallContext callContext(
-            AZStd::bind(&SerializeContext::BeginCloneElementInplace, this, dest, AZStd::placeholders::_1, AZStd::placeholders::_2, AZStd::placeholders::_3, &cloneData, &m_errorLogger, &scratchBuffer),
-                AZStd::bind(&SerializeContext::EndCloneElement, this, &cloneData),
-                this,
-                SerializeContext::ENUM_ACCESS_FOR_READ,
-                &m_errorLogger);
+                [&](void* ptr, const ClassData* classData, const ClassElement* elementData) -> bool
+                {
+                    return BeginCloneElementInplace(dest, ptr, classData, elementData, &cloneData, &m_errorLogger, &scratchBuffer);
+                },
+                [&]() -> bool
+                {
+                    return EndCloneElement(&cloneData);
+                },
+                this, SerializeContext::ENUM_ACCESS_FOR_READ, &m_errorLogger);
 
-            EnumerateInstance(
-                &callContext
-                , const_cast<void*>(ptr)
-                , classId
-                , nullptr
-                , nullptr
-            );
+            EnumerateInstance(&callContext, const_cast<void*>(ptr), classId, nullptr, nullptr);
         }
     }
 
@@ -2941,14 +2943,10 @@ namespace AZ
     {
         m_errorHandler = errorHandler ? errorHandler : &m_defaultErrorHandler;
 
-        m_elementCallback = AZStd::bind(static_cast<bool (SerializeContext::*)(EnumerateInstanceCallContext*, void*, const Uuid&, const ClassData*, const ClassElement*) const>(&SerializeContext::EnumerateInstance)
-            , m_context
-            , this
-            , AZStd::placeholders::_1
-            , AZStd::placeholders::_2
-            , AZStd::placeholders::_3
-            , AZStd::placeholders::_4
-        );
+        m_elementCallback = [this](void* ptr, const Uuid& classId, const ClassData* classData, const ClassElement* classElement)->bool
+        {
+            return m_context->EnumerateInstance(this, ptr, classId, classData, classElement);
+        };
     }
 
     //=========================================================================
diff --git a/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h
index a37780029e..bf96bcdb9a 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h
+++ b/Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h
@@ -90,7 +90,7 @@ namespace AZ
 
     using AttributePtr = AZStd::shared_ptr<Attribute>;
     using AttributeSharedPair = AZStd::pair<AttributeId, AttributePtr>;
-    template <typename ContainerType, typename T>
+    template <typename T, typename ContainerType = AttributeContainerType<T>>
     AttributePtr CreateModuleAttribute(T&& attrValue);
 
     /**
@@ -540,6 +540,7 @@ namespace AZ
          */
         struct ClassElement
         {
+            AZ_TYPE_INFO(ClassElement, "{7D386902-A1D9-4525-8284-F68435FE1D05}");
             enum Flags
             {
                 FLG_POINTER             = (1 << 0),       ///< Element is stored as pointer (it's not a value).
@@ -563,22 +564,22 @@ namespace AZ
             void ClearAttributes();
             Attribute* FindAttribute(AttributeId attributeId) const;
 
-            const char* m_name;                     ///< Used in XML output and debugging purposes
-            u32 m_nameCrc;                          ///< CRC32 of m_name
-            Uuid m_typeId;
-            size_t m_dataSize;
-            size_t m_offset;
+            const char* m_name{ "" };                 ///< Used in XML output and debugging purposes
+            u32 m_nameCrc{};                          ///< CRC32 of m_name
+            Uuid m_typeId = AZ::TypeId::CreateNull();
+            size_t m_dataSize{};
+            size_t m_offset{};
 
-            IRttiHelper* m_azRtti;                  ///< Interface used to support RTTI.
+            IRttiHelper* m_azRtti{};                  ///< Interface used to support RTTI.
             GenericClassInfo* m_genericClassInfo = nullptr;   ///< Valid when the generic class is set. So you don't search for the actual type in the class register.
-            Edit::ElementData* m_editData;          ///< Pointer to edit data (generated by EditContext).
+            Edit::ElementData* m_editData{};          ///< Pointer to edit data (generated by EditContext).
             AZStd::vector<AttributeSharedPair, AZStdFunctorAllocator> m_attributes{
                 AZStdFunctorAllocator([]() -> IAllocatorAllocate& { return AZ::AllocatorInstance<AZ::SystemAllocator>::Get(); })
             }; ///< Attributes attached to ClassElement. Lambda is required here as AZStdFunctorAllocator expects a function pointer
                ///< that returns an IAllocatorAllocate& and the AZ::AllocatorInstance<AZ::SystemAllocator>::Get returns an AZ::SystemAllocator&
                /// which while it inherits from IAllocatorAllocate, does not work as function pointers do not support covariant return types
             AttributeOwnership m_attributeOwnership = AttributeOwnership::Parent;
-            int m_flags;    ///<
+            int m_flags{};    ///<
         };
         typedef AZStd::vector<ClassElement> ClassElementArray;
 
@@ -589,6 +590,8 @@ namespace AZ
         class ClassData
         {
         public:
+            AZ_TYPE_INFO(ClassData, "{20EB8E2E-D807-4039-84E2-CE37D7647CD4}");
+
             ClassData();
             ~ClassData() { ClearAttributes(); }
             ClassData(ClassData&&) = default;
@@ -1040,6 +1043,7 @@ namespace AZ
         */
         struct EnumerateInstanceCallContext
         {
+            AZ_TYPE_INFO(EnumerateInstanceCallContext, "{FCC1DB4B-72BD-4D78-9C23-C84B91589D33}");
             EnumerateInstanceCallContext(const BeginElemEnumCB& beginElemCB, const EndElemEnumCB& endElemCB, const SerializeContext* context, unsigned int accessflags, ErrorHandler* errorHandler);
 
             BeginElemEnumCB                 m_beginElemCB;          ///< Optional callback when entering an element's hierarchy.
@@ -2539,7 +2543,7 @@ namespace AZ
     /// associated with current module
     /// @param attrValue value to store within the attribute
     /// @param ContainerType second parameter which is used for function parameter deduction
-    template <typename ContainerType, typename T>
+    template <typename T, typename ContainerType>
     AttributePtr CreateModuleAttribute(T&& attrValue)
     {
         IAllocatorAllocate& moduleAllocator = GetCurrentSerializeContextModule().GetAllocator();
diff --git a/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl b/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl
index 70972bb846..06d4f76c80 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl
@@ -433,9 +433,7 @@ namespace AZ
                 m_classData.m_attributes.set_allocator(AZStd::move(dllAllocator));
 
                 // Create the ObjectStreamWriteOverrideCB in the current module
-                using ContainerType = AttributeData<AZStd::function<void(SerializeContext::EnumerateInstanceCallContext&,
-                    const void*, const SerializeContext::ClassData&, const SerializeContext::ClassElement*)>>;
-                m_classData.m_attributes.emplace_back(AZ_CRC("ObjectStreamWriteElementOverride", 0x35eb659f), CreateModuleAttribute<ContainerType>(&ObjectStreamWriter));
+                m_classData.m_attributes.emplace_back(AZ_CRC("ObjectStreamWriteElementOverride", 0x35eb659f), CreateModuleAttribute(&ObjectStreamWriter));
             }
 
             SerializeContext::ClassData* GetClassData() override
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp
index 7a8ab85ce3..e5f87f4e7f 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp
@@ -9,6 +9,7 @@
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ConsoleFunctor.h>
 #include <AzCore/IO/ByteContainerStream.h>
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryConsoleUtils.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/StringFunc/StringFunc.h>
@@ -36,7 +37,7 @@ namespace AZ::SettingsRegistryConsoleUtils
                 combinedKeyValueCommand.c_str());
             AZ::Debug::Trace::Output("SettingsRegistry", setOutput.c_str());
         }
-    };
+    }
 
     static void ConsoleRemoveSettingsRegistryValue(SettingsRegistryInterface& settingsRegistry, const ConsoleCommandContainer& commandArgs)
     {
@@ -57,7 +58,7 @@ namespace AZ::SettingsRegistryConsoleUtils
                 AZ::Debug::Trace::Output("SettingsRegistry", removeOutput.c_str());
             }
         }
-    };
+    }
 
     static void ConsoleDumpSettingsRegistryValue(SettingsRegistryInterface& settingsRegistry, const ConsoleCommandContainer& commandArgs)
     {
@@ -88,13 +89,39 @@ namespace AZ::SettingsRegistryConsoleUtils
         }
 
         AZ::Debug::Trace::Output("SettingsRegistry", outputString.c_str());
-    };
+    }
 
     static void ConsoleDumpAllSettingsRegistryValues(SettingsRegistryInterface& settingsRegistry,
         [[maybe_unused]] const ConsoleCommandContainer& commandArgs)
     {
         ConsoleDumpSettingsRegistryValue(settingsRegistry, { "" });
-    };
+    }
+
+    static void ConsoleMergeFileToSettingsRegistry(SettingsRegistryInterface& settingsRegistry, const ConsoleCommandContainer& commandArgs)
+    {
+        if (commandArgs.empty())
+        {
+            AZ_Error("SettingsRegistryConsoleUtils", false, "Command %s requires a <file path> argument to locate json file to merge",
+                SettingsRegistryMergeFile);
+            return;
+        }
+
+        auto commandArgumentsIter = commandArgs.begin();
+        // Extract the JSON pointer path from the argument list
+        AZStd::string_view filePath{ *commandArgumentsIter++ };
+        AZ::SettingsRegistryInterface::FixedValueString jsonAnchorPath;
+        AZ::StringFunc::Join(jsonAnchorPath, commandArgumentsIter, commandArgs.end(), ' ');
+
+        const auto mergeFormat = AZ::IO::PathView(filePath).Extension() != ".setregpatch" ? AZ::SettingsRegistryInterface::Format::JsonMergePatch : AZ::SettingsRegistryInterface::Format::JsonPatch;
+        if (settingsRegistry.MergeSettingsFile(filePath, mergeFormat, jsonAnchorPath))
+        {
+            const auto mergeFileOutput = AZ::SettingsRegistryInterface::FixedValueString::format(
+                R"(Merged json file "%*.s" anchored to json path "%s" into the global settings registry)" "\n",
+                AZ_STRING_ARG(filePath), jsonAnchorPath.c_str());
+            AZ::Debug::Trace::Output("SettingsRegistry", mergeFileOutput.c_str());
+        }
+    }
+
 
     [[nodiscard]] ConsoleFunctorHandle RegisterAzConsoleCommands(SettingsRegistryInterface& registry, AZ::IConsole& azConsole)
     {
@@ -115,6 +142,11 @@ namespace AZ::SettingsRegistryConsoleUtils
         resultHandle.m_consoleFunctors.emplace_back(azConsole, SettingsRegistryDumpAll,
             R"(Dumps all values from the global settings registry)" "\n",
             ConsoleFunctorFlags::Null, AZ::TypeId::CreateNull(), registry, &ConsoleDumpAllSettingsRegistryValues);
+        resultHandle.m_consoleFunctors.emplace_back(azConsole, SettingsRegistryMergeFile,
+            R"(Merges File into the global settings registry)" "\n"
+            R"(@param file-path - path to JSON formatted file to merge)" "\n"
+            R"(@param anchor-path - JSON path to anchor merge operation. Defaults to "")" "\n",
+            ConsoleFunctorFlags::Null, AZ::TypeId::CreateNull(), registry, &ConsoleMergeFileToSettingsRegistry);
 
         return resultHandle;
     }
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h
index ba0d552dde..2e37431839 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h
@@ -14,15 +14,16 @@
 
 namespace AZ::SettingsRegistryConsoleUtils
 {
-    //! Only 4 console command are registered for the settings registry
-    //! "regset", "regremove", "regdump", "regdumpall"
+    //! The following console command are registered for the settings registry
+    //! "regset", "regremove", "regdump", "regdumpall", "regset-file"
     //! The value should be increased if more commands are needed
-    inline constexpr size_t MaxSettingsRegistryConsoleFunctors = 4;
+    inline constexpr size_t MaxSettingsRegistryConsoleFunctors = 5;
 
     inline constexpr const char* SettingsRegistrySet = "sr_regset";
     inline constexpr const char* SettingsRegistryRemove = "sr_regremove";
     inline constexpr const char* SettingsRegistryDump = "sr_regdump";
     inline constexpr const char* SettingsRegistryDumpAll = "sr_regdumpall";
+    inline constexpr const char* SettingsRegistryMergeFile = "sr_regset_file";
 
     // RAII structure which owns the instances of the Settings Registry Console commands
     // registered with an AZ Console
@@ -51,6 +52,10 @@ namespace AZ::SettingsRegistryConsoleUtils
     //!
     //! "sr_regdumpall" accepts 0 arguments and dumps the entire settings registry
     //!  NOTE: this might result in a large amount of output to the console
+    //!
+    //! "sr_regset_file" accepts 1 or 2 arguments - <file-path> [<anchor json path>]
+    //!  Merges the json formatted file <file path> into the settings registry underneath the root anchor ""
+    //!  or <anchor json path> if supplied
     [[nodiscard]] ConsoleFunctorHandle RegisterAzConsoleCommands(SettingsRegistryInterface& registry, AZ::IConsole& azConsole);
     
 }
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
index cbf25c29d4..43c8a64b93 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp
@@ -327,7 +327,7 @@ namespace AZ
 
         while (!localNotifierQueue.empty())
         {
-            for (SignalNotifierArgs notifierArgs : localNotifierQueue)
+            for (const SignalNotifierArgs& notifierArgs : localNotifierQueue)
             {
                 localNotifierEvent.Signal(notifierArgs.m_jsonPath, notifierArgs.m_type);
             }
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
index 3668ab14fd..eed0112ad1 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
@@ -19,9 +19,6 @@
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Settings/CommandLine.h>
 #include <AzCore/std/string/conversions.h>
-#include <AzCore/std/string/wildcard.h>
-#include <AzCore/std/tuple.h>
-#include <AzCore/std/containers/variant.h>
 #include <AzCore/Utils/Utils.h>
 
 #include <cinttypes>
@@ -266,7 +263,8 @@ namespace AZ::SettingsRegistryMergeUtils
 
         // Step 3 locate the project root and attempt to find the engine root using the registered engine
         // for the project in the project.json file
-        AZ::IO::FixedMaxPath projectRoot = FindProjectRoot(settingsRegistry);
+        AZ::IO::FixedMaxPath projectRoot;
+        settingsRegistry.Get(projectRoot.Native(), FilePathKey_ProjectPath);
         if (projectRoot.empty())
         {
             return {};
@@ -668,7 +666,7 @@ namespace AZ::SettingsRegistryMergeUtils
         // NOTE: We make the project-path in the BootstrapSettingsRootKey absolute first
 
         AZ::IO::FixedMaxPath projectPath = FindProjectRoot(registry);
-        if (constexpr auto projectPathKey = FixedValueString(BootstrapSettingsRootKey) + "/project_path";
+        if ([[maybe_unused]] constexpr auto projectPathKey = FixedValueString(BootstrapSettingsRootKey) + "/project_path";
             !projectPath.empty())
         {
             if (projectPath.IsRelative())
@@ -693,6 +691,7 @@ namespace AZ::SettingsRegistryMergeUtils
                 R"(Project path isn't set in the Settings Registry at "%.*s".)"
                 " Project-related filepaths will be set relative to the executable directory\n",
                 AZ_STRING_ARG(projectPathKey));
+            projectPath = exePath;
             registry.Set(FilePathKey_ProjectPath, exePath.Native());
         }
 
@@ -981,7 +980,7 @@ namespace AZ::SettingsRegistryMergeUtils
     // code in the loop makes calls that mutates the `commandLine` instance, invalidating the iterators. Making a copy
     // ensures that the iterators remain valid.
     // NOLINTNEXTLINE(performance-unnecessary-value-param)
-    void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, AZ::CommandLine commandLine, bool executeCommands)
+    void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, AZ::CommandLine commandLine, bool executeRegdumpCommands)
     {
         // Iterate over all the command line options in order to parse the --regset and --regremove
         // arguments in the order they were supplied
@@ -996,18 +995,44 @@ namespace AZ::SettingsRegistryMergeUtils
                     continue;
                 }
             }
+            else if (commandArgument.m_option == "regset-file")
+            {
+                AZStd::string_view fileArg(commandArgument.m_value);
+                AZStd::string_view jsonAnchorPath;
+                // double colons is treated as the separator for an anchor path
+                // single colon cannot be used as it is used in Windows paths
+                if (auto anchorPathIndex = AZ::StringFunc::Find(fileArg, "::");
+                    anchorPathIndex != AZStd::string_view::npos)
+                {
+                    jsonAnchorPath = fileArg.substr(anchorPathIndex + 2);
+                    fileArg = fileArg.substr(0, anchorPathIndex);
+                }
+                if (!fileArg.empty())
+                {
+                    AZ::IO::PathView filePath(fileArg);
+                    const auto mergeFormat = filePath.Extension() != ".setregpatch"
+                        ? AZ::SettingsRegistryInterface::Format::JsonMergePatch
+                        : AZ::SettingsRegistryInterface::Format::JsonPatch;
+                    if (!registry.MergeSettingsFile(filePath.Native(), mergeFormat, jsonAnchorPath))
+                    {
+                        AZ_Warning("SettingsRegistryMergeUtils", false, R"(Merging of file "%.*s" to the Settings Registry has failed at anchor  "%.*s".)",
+                            AZ_STRING_ARG(filePath.Native()), AZ_STRING_ARG(jsonAnchorPath));
+                        continue;
+                    }
+                }
+            }
             else if (commandArgument.m_option == "regremove")
             {
                 if (!registry.Remove(commandArgument.m_value))
                 {
                     AZ_Warning("SettingsRegistryMergeUtils", false, "Unable to remove value at JSON Pointer %s for --regremove.",
-                        commandArgument.m_value.data());
+                        commandArgument.m_value.c_str());
                     continue;
                 }
             }
         }
 
-        if (executeCommands)
+        if (executeRegdumpCommands)
         {
             constexpr bool prettifyOutput = true;
             const size_t regdumpSwitchValues = commandLine.GetNumSwitchValues("regdump");
diff --git a/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp
index 0b410369f0..ca89e95162 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp
@@ -840,7 +840,7 @@ namespace AZ
     }
 
     SliceComponent::SliceInstance* SliceComponent::SliceReference::CreateInstanceFromExistingEntities(AZStd::vector<AZ::Entity*>& entities,
-        const EntityIdToEntityIdMap assetToLiveIdMap,
+        const EntityIdToEntityIdMap& assetToLiveIdMap,
         SliceInstanceId sliceInstanceId)
     {
         AZ_PROFILE_FUNCTION(AzCore);
diff --git a/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h
index 7a66167a96..ae4ec155c7 100644
--- a/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h
+++ b/Code/Framework/AzCore/AzCore/Slice/SliceComponent.h
@@ -443,7 +443,7 @@ namespace AZ
              * @return A pointer to the newly created slice instance. Returns nullptr on error or if the SliceComponent is not instantiated.
             */
             SliceInstance* CreateInstanceFromExistingEntities(AZStd::vector<AZ::Entity*>& entities,
-                const EntityIdToEntityIdMap assetToLiveIdMap,
+                const EntityIdToEntityIdMap& assetToLiveIdMap,
                 SliceInstanceId sliceInstanceId = SliceInstanceId::CreateRandom());
 
             /** 
diff --git a/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp b/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp
index f15c288ad8..71c0aeea6d 100644
--- a/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp
+++ b/Code/Framework/AzCore/AzCore/Socket/AzSocket.cpp
@@ -8,77 +8,74 @@
 
 #include <AzCore/Socket/AzSocket.h>
 
-namespace AZ
+namespace AZ::AzSock
 {
-    namespace AzSock
+    AzSocketAddress::AzSocketAddress()
     {
-        AzSocketAddress::AzSocketAddress()
-        {
-            Reset();
-        }
-
-        AzSocketAddress& AzSocketAddress::operator=(const AZSOCKADDR& addr)
-        {
-            m_sockAddr = *reinterpret_cast<const AZSOCKADDR_IN*>(&addr);
-            return *this;
-        }
-
-        bool AzSocketAddress::operator==(const AzSocketAddress& rhs) const
-        {
-            return m_sockAddr.sin_family == rhs.m_sockAddr.sin_family
-                && m_sockAddr.sin_addr.s_addr == rhs.m_sockAddr.sin_addr.s_addr
-                && m_sockAddr.sin_port == rhs.m_sockAddr.sin_port;
-        }
-
-        const AZSOCKADDR* AzSocketAddress::GetTargetAddress() const
-        {
-            return reinterpret_cast<const AZSOCKADDR*>(&m_sockAddr);
-        }
-
-        AZStd::string AzSocketAddress::GetIP() const
-        {
-            char ip[INET_ADDRSTRLEN];
-            inet_ntop(AF_INET, const_cast<in_addr*>(&m_sockAddr.sin_addr), ip, AZ_ARRAY_SIZE(ip));
-            return AZStd::string(ip);
-        }
-
-        AZStd::string AzSocketAddress::GetAddress() const
-        {
-            char ip[INET_ADDRSTRLEN];
-            inet_ntop(AF_INET, const_cast<in_addr*>(&m_sockAddr.sin_addr), ip, AZ_ARRAY_SIZE(ip));
-            return AZStd::string::format("%s:%d", ip, AZ::AzSock::NetToHostShort(m_sockAddr.sin_port));
-        }
-
-        AZ::u16 AzSocketAddress::GetAddrPort() const
-        {
-            return AZ::AzSock::NetToHostShort(m_sockAddr.sin_port);
-        }
-
-        void AzSocketAddress::SetAddrPort(AZ::u16 port)
-        {
-            m_sockAddr.sin_port = AZ::AzSock::HostToNetShort(port);
-        }
-
-        bool AzSocketAddress::SetAddress(const AZStd::string& ip, AZ::u16 port)
-        {
-            AZ_Assert(!ip.empty(), "Invalid address string!");
-            Reset();
-            return AZ::AzSock::ResolveAddress(ip, port, m_sockAddr);
-        }
-
-        bool AzSocketAddress::SetAddress(AZ::u32 ip, AZ::u16 port)
-        {
-            Reset();
-            m_sockAddr.sin_addr.s_addr = AZ::AzSock::HostToNetLong(ip);
-            m_sockAddr.sin_port = AZ::AzSock::HostToNetShort(port);
-            return true;
-        }
-
-        void AzSocketAddress::Reset()
-        {
-            memset(&m_sockAddr, 0, sizeof(m_sockAddr));
-            m_sockAddr.sin_family = AF_INET;
-            m_sockAddr.sin_addr.s_addr = INADDR_ANY;
-        }
+        Reset();
     }
-}
+
+    AzSocketAddress& AzSocketAddress::operator=(const AZSOCKADDR& addr)
+    {
+        m_sockAddr = *reinterpret_cast<const AZSOCKADDR_IN*>(&addr);
+        return *this;
+    }
+
+    bool AzSocketAddress::operator==(const AzSocketAddress& rhs) const
+    {
+        return m_sockAddr.sin_family == rhs.m_sockAddr.sin_family
+            && m_sockAddr.sin_addr.s_addr == rhs.m_sockAddr.sin_addr.s_addr
+            && m_sockAddr.sin_port == rhs.m_sockAddr.sin_port;
+    }
+
+    const AZSOCKADDR* AzSocketAddress::GetTargetAddress() const
+    {
+        return reinterpret_cast<const AZSOCKADDR*>(&m_sockAddr);
+    }
+
+    AZStd::string AzSocketAddress::GetIP() const
+    {
+        char ip[INET_ADDRSTRLEN];
+        inet_ntop(AF_INET, const_cast<in_addr*>(&m_sockAddr.sin_addr), ip, AZ_ARRAY_SIZE(ip));
+        return AZStd::string(ip);
+    }
+
+    AZStd::string AzSocketAddress::GetAddress() const
+    {
+        char ip[INET_ADDRSTRLEN];
+        inet_ntop(AF_INET, const_cast<in_addr*>(&m_sockAddr.sin_addr), ip, AZ_ARRAY_SIZE(ip));
+        return AZStd::string::format("%s:%d", ip, AZ::AzSock::NetToHostShort(m_sockAddr.sin_port));
+    }
+
+    AZ::u16 AzSocketAddress::GetAddrPort() const
+    {
+        return AZ::AzSock::NetToHostShort(m_sockAddr.sin_port);
+    }
+
+    void AzSocketAddress::SetAddrPort(AZ::u16 port)
+    {
+        m_sockAddr.sin_port = AZ::AzSock::HostToNetShort(port);
+    }
+
+    bool AzSocketAddress::SetAddress(const AZStd::string& ip, AZ::u16 port)
+    {
+        AZ_Assert(!ip.empty(), "Invalid address string!");
+        Reset();
+        return AZ::AzSock::ResolveAddress(ip, port, m_sockAddr);
+    }
+
+    bool AzSocketAddress::SetAddress(AZ::u32 ip, AZ::u16 port)
+    {
+        Reset();
+        m_sockAddr.sin_addr.s_addr = AZ::AzSock::HostToNetLong(ip);
+        m_sockAddr.sin_port = AZ::AzSock::HostToNetShort(port);
+        return true;
+    }
+
+    void AzSocketAddress::Reset()
+    {
+        memset(&m_sockAddr, 0, sizeof(m_sockAddr));
+        m_sockAddr.sin_family = AF_INET;
+        m_sockAddr.sin_addr.s_addr = INADDR_ANY;
+    }
+} // namespace AZ::AzSock
diff --git a/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp b/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp
index 47f85c8309..3093d38a10 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp
+++ b/Code/Framework/AzCore/AzCore/Statistics/RunningStatistic.cpp
@@ -10,66 +10,63 @@
 
 #include "RunningStatistic.h"
 
-namespace AZ
+namespace AZ::Statistics
 {
-    namespace Statistics
+    void RunningStatistic::Reset()
     {
-        void RunningStatistic::Reset()
+        m_numSamples = 0;
+        m_mostRecentSample = 0.0;
+        m_minimum = 0.0;
+        m_maximum = 0.0;
+        m_sum = 0.0;
+        m_average = 0.0;
+        m_varianceTracking = 0.0;
+    }
+
+    void RunningStatistic::PushSample(double value)
+    {
+        m_numSamples++;
+        m_mostRecentSample = value;
+        m_sum += value;
+
+        if (m_numSamples == 1)
         {
-            m_numSamples = 0;
-            m_mostRecentSample = 0.0;
-            m_minimum = 0.0;
-            m_maximum = 0.0;
-            m_sum = 0.0;
-            m_average = 0.0;
-            m_varianceTracking = 0.0;
+            m_minimum = value;
+            m_maximum = value;
+            m_average = value;
+            return;
         }
 
-        void RunningStatistic::PushSample(double value)
+        if (value < m_minimum)
         {
-            m_numSamples++;
-            m_mostRecentSample = value;
-            m_sum += value;
-
-            if (m_numSamples == 1)
-            {
-                m_minimum = value;
-                m_maximum = value;
-                m_average = value;
-                return;
-            }
-
-            if (value < m_minimum)
-            {
-                m_minimum = value;
-            }
-            else if (value > m_maximum)
-            {
-                m_maximum = value;
-            }
-
-            //See header notes and references to understand this way of calculating
-            //running average & variance.
-            const double newAverage = m_average + (value - m_average) / m_numSamples;
-            m_varianceTracking = m_varianceTracking + (value - m_average)*(value - newAverage);
-
-            m_average = newAverage;
+            m_minimum = value;
+        }
+        else if (value > m_maximum)
+        {
+            m_maximum = value;
         }
 
-        double RunningStatistic::GetVariance(VarianceType varianceType) const
-        {
-            if (m_numSamples > 1)
-            {
-                const AZ::u64 varianceDivisor = (varianceType == VarianceType::S) ? m_numSamples - 1 : m_numSamples;
-                return m_varianceTracking / varianceDivisor;
-            }
-            return 0.0;
-        }
+        //See header notes and references to understand this way of calculating
+        //running average & variance.
+        const double newAverage = m_average + (value - m_average) / m_numSamples;
+        m_varianceTracking = m_varianceTracking + (value - m_average)*(value - newAverage);
 
-        double RunningStatistic::GetStdev(VarianceType varianceType) const
+        m_average = newAverage;
+    }
+
+    double RunningStatistic::GetVariance(VarianceType varianceType) const
+    {
+        if (m_numSamples > 1)
         {
-            return sqrt(GetVariance(varianceType));
+            const AZ::u64 varianceDivisor = (varianceType == VarianceType::S) ? m_numSamples - 1 : m_numSamples;
+            return m_varianceTracking / varianceDivisor;
         }
-  
-    }//namespace Statistics
-}//namespace AZ
+        return 0.0;
+    }
+
+    double RunningStatistic::GetStdev(VarianceType varianceType) const
+    {
+        return sqrt(GetVariance(varianceType));
+    }
+
+} // namespace AZ::Statistics
diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h
index 278b2ecc98..7fae0ca354 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h
@@ -157,6 +157,22 @@ namespace AZ::Statistics
             }
         }
 
+        void GetAllStatistics(AZStd::vector<NamedRunningStatistic*>& stats)
+        {
+            for (auto& iter : m_profilers)
+            {
+                iter.second.m_profiler.GetStatsManager().GetAllStatistics(stats);
+            }
+        }
+
+        void GetAllStatisticsOfUnits(AZStd::vector<NamedRunningStatistic*>& stats, const char* units)
+        {
+            for (auto& iter : m_profilers)
+            {
+                iter.second.m_profiler.GetStatsManager().GetAllStatisticsOfUnits(stats, units);
+            }
+        }
+
     private:
         struct ProfilerInfo
         {
diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp
index 00bb97b745..ef87307624 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp
@@ -12,55 +12,52 @@
 #include "StatisticalProfilerProxySystemComponent.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-namespace AZ
+namespace AZ::Statistics
 {
-    namespace Statistics
+    StatisticalProfilerProxy* StatisticalProfilerProxy::TimedScope::m_profilerProxy = nullptr;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void StatisticalProfilerProxySystemComponent::Reflect(AZ::ReflectContext* context)
     {
-        StatisticalProfilerProxy* StatisticalProfilerProxy::TimedScope::m_profilerProxy = nullptr;
-
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        void StatisticalProfilerProxySystemComponent::Reflect(AZ::ReflectContext* context)
+        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-            {
-                serializeContext->Class<StatisticalProfilerProxySystemComponent, AZ::Component>()
-                    ->Version(1);
-            }
+            serializeContext->Class<StatisticalProfilerProxySystemComponent, AZ::Component>()
+                ->Version(1);
         }
+    }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        void StatisticalProfilerProxySystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("StatisticalProfilerService", 0x20066f73));
-        }
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void StatisticalProfilerProxySystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    {
+        provided.push_back(AZ_CRC("StatisticalProfilerService", 0x20066f73));
+    }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        void StatisticalProfilerProxySystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("StatisticalProfilerService", 0x20066f73));
-        }
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void StatisticalProfilerProxySystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC("StatisticalProfilerService", 0x20066f73));
+    }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        StatisticalProfilerProxySystemComponent::StatisticalProfilerProxySystemComponent()
-            : m_StatisticalProfilerProxy(nullptr)
-        {
-        }
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    StatisticalProfilerProxySystemComponent::StatisticalProfilerProxySystemComponent()
+        : m_StatisticalProfilerProxy(nullptr)
+    {
+    }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        StatisticalProfilerProxySystemComponent::~StatisticalProfilerProxySystemComponent()
-        {
-        }
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    StatisticalProfilerProxySystemComponent::~StatisticalProfilerProxySystemComponent()
+    {
+    }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        void StatisticalProfilerProxySystemComponent::Activate()
-        {
-            m_StatisticalProfilerProxy = new StatisticalProfilerProxy;
-        }
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void StatisticalProfilerProxySystemComponent::Activate()
+    {
+        m_StatisticalProfilerProxy = new StatisticalProfilerProxy;
+    }
 
-        ////////////////////////////////////////////////////////////////////////////////////////////////
-        void StatisticalProfilerProxySystemComponent::Deactivate()
-        {
-            delete m_StatisticalProfilerProxy;
-        }
-    } //namespace Statistics
-} // namespace AZ
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void StatisticalProfilerProxySystemComponent::Deactivate()
+    {
+        delete m_StatisticalProfilerProxy;
+    }
+} // namespace AZ::Statistics
diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h
index 5984701f4e..dc97de40c1 100644
--- a/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h
+++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h
@@ -56,13 +56,25 @@ namespace AZ
 
             void GetAllStatistics(AZStd::vector<NamedRunningStatistic*>& vector)
             {
-                for (auto const& it : m_statistics)
+                for (const auto& it : m_statistics)
                 {
                     NamedRunningStatistic* stat = it.second;
                     vector.push_back(stat);
                 }
             }
 
+            void GetAllStatisticsOfUnits(AZStd::vector<NamedRunningStatistic*>& vector, const char* units)
+            {
+                for (const auto& it : m_statistics)
+                {
+                    NamedRunningStatistic* stat = it.second;
+                    if (stat->GetUnits() == units)
+                    {
+                        vector.push_back(stat);
+                    }
+                }
+            }
+
             //! Helper method to apply units to statistics with empty units string.
             AZ::u32 ApplyUnits(const AZStd::string& units)
             {
diff --git a/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
index ff30291a70..8405424f7d 100644
--- a/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
+++ b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.cpp
@@ -416,2147 +416,2155 @@ namespace AZ::StringFunc::Internal
 
 }
 
-namespace AZ
+namespace AZ::StringFunc
 {
-    namespace StringFunc
+    AZStd::string_view LStrip(AZStd::string_view in, AZStd::string_view stripCharacters)
     {
-        AZStd::string_view LStrip(AZStd::string_view in, AZStd::string_view stripCharacters)
+        if (size_t pos = in.find_first_not_of(stripCharacters); pos != AZStd::string_view::npos)
         {
-            if (size_t pos = in.find_first_not_of(stripCharacters); pos != AZStd::string_view::npos)
-            {
-                return in.substr(pos);
-            }
+            return in.substr(pos);
+        }
 
-            return {};
-        };
+        return {};
+    };
 
-        AZStd::string_view RStrip(AZStd::string_view in, AZStd::string_view stripCharacters)
+    AZStd::string_view RStrip(AZStd::string_view in, AZStd::string_view stripCharacters)
+    {
+        if (size_t pos = in.find_last_not_of(stripCharacters); pos != AZStd::string_view::npos)
         {
-            if (size_t pos = in.find_last_not_of(stripCharacters); pos != AZStd::string_view::npos)
-            {
-                return in.substr(0, pos < in.size() ? pos + 1 : pos);
-            }
+            return in.substr(0, pos < in.size() ? pos + 1 : pos);
+        }
 
-            return {};
-        };
+        return {};
+    };
 
-        AZStd::string_view StripEnds(AZStd::string_view in, AZStd::string_view stripCharacters)
+    AZStd::string_view StripEnds(AZStd::string_view in, AZStd::string_view stripCharacters)
+    {
+        return LStrip(RStrip(in, stripCharacters), stripCharacters);
+    };
+
+    bool Equal(const char* inA, const char* inB, bool bCaseSensitive /*= false*/, size_t n /*= 0*/)
+    {
+        if (!inA || !inB)
         {
-            return LStrip(RStrip(in, stripCharacters), stripCharacters);
-        };
+            return false;
+        }
 
-        bool Equal(const char* inA, const char* inB, bool bCaseSensitive /*= false*/, size_t n /*= 0*/)
+        if (inA == inB)
         {
-            if (!inA || !inB)
-            {
-                return false;
-            }
+            return true;
+        }
 
-            if (inA == inB)
+        if (bCaseSensitive)
+        {
+            if (n)
             {
-                return true;
-            }
-
-            if (bCaseSensitive)
-            {
-                if (n)
-                {
-                    return !strncmp(inA, inB, n);
-                }
-                else
-                {
-                    return !strcmp(inA, inB);
-                }
+                return !strncmp(inA, inB, n);
             }
             else
             {
-                if (n)
-                {
-                    return !azstrnicmp(inA, inB, n);
-                }
-                else
-                {
-                    return !azstricmp(inA, inB);
-                }
+                return !strcmp(inA, inB);
             }
         }
-        bool Equal(AZStd::string_view inA, AZStd::string_view inB, bool bCaseSensitive)
+        else
         {
-            const size_t maxCharsToCompare = inA.size();
-
-            return inA.size() == inB.size() && (bCaseSensitive
-                ? strncmp(inA.data(), inB.data(), maxCharsToCompare) == 0
-                : azstrnicmp(inA.data(), inB.data(), maxCharsToCompare) == 0);
-        }
-
-        bool StartsWith(AZStd::string_view sourceValue, AZStd::string_view prefixValue, bool bCaseSensitive)
-        {
-            return sourceValue.size() >= prefixValue.size()
-                && Equal(sourceValue.data(), prefixValue.data(), bCaseSensitive, prefixValue.size());
-        }
-
-        bool EndsWith(AZStd::string_view sourceValue, AZStd::string_view suffixValue, bool bCaseSensitive)
-        {
-            return sourceValue.size() >= suffixValue.size()
-                && Equal(sourceValue.substr(sourceValue.size() - suffixValue.size(), AZStd::string_view::npos).data(), suffixValue.data(), bCaseSensitive, suffixValue.size());
-        }
-
-        bool Contains(AZStd::string_view in, char ch, bool bCaseSensitive)
-        {
-            return Find(in, ch, 0, false, bCaseSensitive) != AZStd::string_view::npos;
-        }
-        bool Contains(AZStd::string_view in, AZStd::string_view sv, bool bCaseSensitive)
-        {
-            return Find(in, sv, 0, false, bCaseSensitive) != AZStd::string_view::npos;
-        }
-
-        size_t Find(AZStd::string_view in, char c, size_t pos /*= 0*/, bool bReverse /*= false*/, bool bCaseSensitive /*= false*/)
-        {
-            if (in.empty())
+            if (n)
             {
-                return AZStd::string::npos;
+                return !azstrnicmp(inA, inB, n);
             }
-
-            if (pos == AZStd::string::npos)
+            else
             {
-                pos = 0;
+                return !azstricmp(inA, inB);
             }
+        }
+    }
+    bool Equal(AZStd::string_view inA, AZStd::string_view inB, bool bCaseSensitive)
+    {
+        const size_t maxCharsToCompare = inA.size();
 
-            size_t inLen = in.size();
-            if (inLen < pos)
-            {
-                return AZStd::string::npos;
-            }
+        return inA.size() == inB.size() && (bCaseSensitive
+            ? strncmp(inA.data(), inB.data(), maxCharsToCompare) == 0
+            : azstrnicmp(inA.data(), inB.data(), maxCharsToCompare) == 0);
+    }
 
+    bool StartsWith(AZStd::string_view sourceValue, AZStd::string_view prefixValue, bool bCaseSensitive)
+    {
+        return sourceValue.size() >= prefixValue.size()
+            && Equal(sourceValue.data(), prefixValue.data(), bCaseSensitive, prefixValue.size());
+    }
+
+    bool EndsWith(AZStd::string_view sourceValue, AZStd::string_view suffixValue, bool bCaseSensitive)
+    {
+        return sourceValue.size() >= suffixValue.size()
+            && Equal(sourceValue.substr(sourceValue.size() - suffixValue.size(), AZStd::string_view::npos).data(), suffixValue.data(), bCaseSensitive, suffixValue.size());
+    }
+
+    bool Contains(AZStd::string_view in, char ch, bool bCaseSensitive)
+    {
+        return Find(in, ch, 0, false, bCaseSensitive) != AZStd::string_view::npos;
+    }
+    bool Contains(AZStd::string_view in, AZStd::string_view sv, bool bCaseSensitive)
+    {
+        return Find(in, sv, 0, false, bCaseSensitive) != AZStd::string_view::npos;
+    }
+
+    size_t Find(AZStd::string_view in, char c, size_t pos /*= 0*/, bool bReverse /*= false*/, bool bCaseSensitive /*= false*/)
+    {
+        if (in.empty())
+        {
+            return AZStd::string::npos;
+        }
+
+        if (pos == AZStd::string::npos)
+        {
+            pos = 0;
+        }
+
+        size_t inLen = in.size();
+        if (inLen < pos)
+        {
+            return AZStd::string::npos;
+        }
+
+        if (!bCaseSensitive)
+        {
+            c = (char)tolower(c);
+        }
+
+        if (bReverse)
+        {
+            pos = inLen - pos - 1;
+        }
+
+        char character;
+
+        do
+        {
             if (!bCaseSensitive)
             {
-                c = (char)tolower(c);
+                character = (char)tolower(in[pos]);
+            }
+            else
+            {
+                character = in[pos];
+            }
+
+            if (character == c)
+            {
+                return pos;
             }
 
             if (bReverse)
             {
-                pos = inLen - pos - 1;
+                pos = pos > 0 ? pos-1 : pos;
             }
-
-            char character;
-
-            do
+            else
             {
-                if (!bCaseSensitive)
-                {
-                    character = (char)tolower(in[pos]);
-                }
-                else
-                {
-                    character = in[pos];
-                }
+                pos++;
+            }
+        } while (bReverse ? pos : character != '\0');
 
-                if (character == c)
-                {
-                    return pos;
-                }
+        return AZStd::string::npos;
+    }
 
-                if (bReverse)
-                {
-                    pos = pos > 0 ? pos-1 : pos;
-                }
-                else
-                {
-                    pos++;
-                }
-            } while (bReverse ? pos : character != '\0');
+    size_t Find(AZStd::string_view in, AZStd::string_view s, size_t offset /*= 0*/, bool bReverse /*= false*/, bool bCaseSensitive /*= false*/)
+    {
+        // Formally an empty string matches at the offset if it is <= to the size of the input string
+        if (s.empty() && offset <= in.size())
+        {
+            return offset;
+        }
 
+        if (in.empty())
+        {
             return AZStd::string::npos;
         }
 
-        size_t Find(AZStd::string_view in, AZStd::string_view s, size_t offset /*= 0*/, bool bReverse /*= false*/, bool bCaseSensitive /*= false*/)
+        const size_t inlen = in.size();
+        const size_t slen = s.size();
+
+        if (offset == AZStd::string::npos)
         {
-            // Formally an empty string matches at the offset if it is <= to the size of the input string
-            if (s.empty() && offset <= in.size())
+            offset = 0;
+        }
+
+        if (offset + slen > inlen)
+        {
+            return AZStd::string::npos;
+        }
+
+        const char* pCur;
+
+        if (bReverse)
+        {
+            // Start at the end (- pos)
+            pCur = in.data() + inlen - slen - offset;
+        }
+        else
+        {
+            // Start at the beginning (+ pos)
+            pCur = in.data() + offset;
+        }
+
+        do
+        {
+            if (bCaseSensitive)
             {
-                return offset;
+                if (!strncmp(pCur, s.data(), slen))
+                {
+                    return static_cast<size_t>(pCur - in.data());
+                }
             }
-
-            if (in.empty())
+            else
             {
-                return AZStd::string::npos;
+                if (!azstrnicmp(pCur, s.data(), slen))
+                {
+                    return static_cast<size_t>(pCur - in.data());
+                }
             }
 
-            const size_t inlen = in.size();
-            const size_t slen = s.size();
-
-            if (offset == AZStd::string::npos)
-            {
-                offset = 0;
-            }
-
-            if (offset + slen > inlen)
-            {
-                return AZStd::string::npos;
-            }
-
-            const char* pCur;
-
             if (bReverse)
             {
-                // Start at the end (- pos)
-                pCur = in.data() + inlen - slen - offset;
+                pCur--;
             }
             else
             {
-                // Start at the beginning (+ pos)
-                pCur = in.data() + offset;
+                pCur++;
+            }
+        } while (bReverse ? pCur >= in.data() : pCur - in.data() <= static_cast<ptrdiff_t>(inlen));
+
+        return AZStd::string::npos;
+    }
+
+    char FirstCharacter(const char* in)
+    {
+        if (!in)
+        {
+            return '\0';
+        }
+        if (in[0] == '\n')
+        {
+            return '\0';
+        }
+        return in[0];
+    }
+
+    char LastCharacter(const char* in)
+    {
+        if (!in)
+        {
+            return '\0';
+        }
+        size_t len = strlen(in);
+        if (!len)
+        {
+            return '\0';
+        }
+        return in[len - 1];
+    }
+
+    AZStd::string& Append(AZStd::string& inout, const char s)
+    {
+        return inout.append(1, s);
+    }
+
+    AZStd::string& Append(AZStd::string& inout, const char* str)
+    {
+        if (!str)
+        {
+            return inout;
+        }
+        return inout.append(str);
+    }
+
+    AZStd::string& Prepend(AZStd::string& inout, const char s)
+    {
+        return inout.insert((size_t)0, 1, s);
+    }
+
+    AZStd::string& Prepend(AZStd::string& inout, const char* str)
+    {
+        if (!str)
+        {
+            return inout;
+        }
+        return inout.insert(0, str);
+    }
+
+    AZStd::string& LChop(AZStd::string& inout, size_t num)
+    {
+        return Internal::LChop(inout, num);
+    }
+
+    AZStd::string_view LChop(AZStd::string_view in, size_t num)
+    {
+        return Internal::LChop(in, num);
+    }
+
+    AZStd::string& RChop(AZStd::string& inout, size_t num)
+    {
+        return Internal::RChop(inout, num);
+    }
+
+    AZStd::string_view RChop(AZStd::string_view in, size_t num)
+    {
+        return Internal::RChop(in, num);
+    }
+
+    AZStd::string& LKeep(AZStd::string& inout, size_t pos, bool bKeepPosCharacter)
+    {
+        return Internal::LKeep(inout, pos, bKeepPosCharacter);
+    }
+
+    AZStd::string& RKeep(AZStd::string& inout, size_t pos, bool bKeepPosCharacter)
+    {
+        return Internal::RKeep(inout, pos, bKeepPosCharacter);
+    }
+
+    bool Replace(AZStd::string& inout, const char replaceA, const char withB, bool bCaseSensitive, bool bReplaceFirst, bool bReplaceLast)
+    {
+        return Internal::Replace(inout, replaceA, withB, bCaseSensitive, bReplaceFirst, bReplaceLast);
+    }
+
+    bool Replace(AZStd::string& inout, const char* replaceA, const char* withB, bool bCaseSensitive, bool bReplaceFirst, bool bReplaceLast)
+    {
+        return Internal::Replace(inout, replaceA, withB, bCaseSensitive, bReplaceFirst, bReplaceLast);
+    }
+
+    bool Strip(AZStd::string& inout, const char stripCharacter, bool bCaseSensitive, bool bStripBeginning, bool bStripEnding)
+    {
+        return Internal::Strip(inout, stripCharacter, bCaseSensitive, bStripBeginning, bStripEnding);
+    }
+
+    bool Strip(AZStd::string& inout, const char* stripCharacters, bool bCaseSensitive, bool bStripBeginning, bool bStripEnding)
+    {
+        return Internal::Strip(inout, stripCharacters, bCaseSensitive, bStripBeginning, bStripEnding);
+    }
+
+    AZStd::string& TrimWhiteSpace(AZStd::string& value, bool leading, bool trailing)
+    {
+        static const char* trimmable = " \t\r\n";
+        if (value.length() > 0)
+        {
+            if (leading)
+            {
+                value.erase(0, value.find_first_not_of(trimmable));
+            }
+            if (trailing)
+            {
+                value.erase(value.find_last_not_of(trimmable) + 1);
+            }
+        }
+        return value;
+    }
+
+    void Tokenize(AZStd::string_view in, AZStd::vector<AZStd::string>& tokens, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
+    {
+        return Tokenize(in, tokens, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
+    }
+
+    void Tokenize(AZStd::string_view in, AZStd::vector<AZStd::string>& tokens, AZStd::string_view delimiters, bool keepEmptyStrings, bool keepSpaceStrings)
+    {
+        auto insertVisitor = [&tokens](AZStd::string_view token)
+        {
+            tokens.push_back(token);
+        };
+        return TokenizeVisitor(in, insertVisitor, delimiters, keepEmptyStrings, keepSpaceStrings);
+    }
+
+    void TokenizeVisitor(AZStd::string_view in, const TokenVisitor& tokenVisitor, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
+    {
+        return TokenizeVisitor(in, tokenVisitor, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
+    }
+
+    void TokenizeVisitor(AZStd::string_view in, const TokenVisitor& tokenVisitor, AZStd::string_view delimiters,
+        bool keepEmptyStrings, bool keepSpaceStrings)
+    {
+        if (delimiters.empty() || in.empty())
+        {
+            return;
+        }
+
+        while (AZStd::optional<AZStd::string_view> nextToken = TokenizeNext(in, delimiters))
+        {
+            bool bIsEmpty = nextToken->empty();
+            bool bIsSpaces = false;
+            if (!bIsEmpty)
+            {
+                AZStd::string_view strippedNextToken = StripEnds(*nextToken, " ");
+                bIsSpaces = strippedNextToken.empty();
             }
 
-            do
+            if ((bIsEmpty && keepEmptyStrings) ||
+                (bIsSpaces && keepSpaceStrings) ||
+                (!bIsSpaces && !bIsEmpty))
             {
-                if (bCaseSensitive)
+                tokenVisitor(*nextToken);
+            }
+        }
+    }
+
+    void TokenizeVisitorReverse(AZStd::string_view in, const TokenVisitor& tokenVisitor, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
+    {
+        return TokenizeVisitorReverse(in, tokenVisitor, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
+    }
+
+    void TokenizeVisitorReverse(AZStd::string_view in, const TokenVisitor& tokenVisitor, AZStd::string_view delimiters,
+        bool keepEmptyStrings, bool keepSpaceStrings)
+    {
+        if (delimiters.empty() || in.empty())
+        {
+            return;
+        }
+
+        while (AZStd::optional<AZStd::string_view> nextToken = TokenizeLast(in, delimiters))
+        {
+            bool bIsEmpty = nextToken->empty();
+            bool bIsSpaces = false;
+            if (!bIsEmpty)
+            {
+                AZStd::string_view strippedNextToken = StripEnds(*nextToken, " ");
+                bIsSpaces = strippedNextToken.empty();
+            }
+
+            if ((bIsEmpty && keepEmptyStrings) ||
+                (bIsSpaces && keepSpaceStrings) ||
+                (!bIsSpaces && !bIsEmpty))
+            {
+                tokenVisitor(*nextToken);
+            }
+        }
+    }
+
+    AZStd::optional<AZStd::string_view> TokenizeNext(AZStd::string_view& inout, const char delimiter)
+    {
+        return TokenizeNext(inout, { &delimiter, 1 });
+    }
+    AZStd::optional<AZStd::string_view> TokenizeNext(AZStd::string_view& inout, AZStd::string_view delimiters)
+    {
+        if (delimiters.empty() || inout.empty())
+        {
+            return AZStd::nullopt;
+        }
+
+        AZStd::string_view resultToken;
+        if (size_t pos = inout.find_first_of(delimiters); pos == AZStd::string_view::npos)
+        {
+            // The delimiter has not been found, a new view containing the entire
+            // string will be returned and the input parameter will be set to empty
+            resultToken.swap(inout);
+        }
+        else
+        {
+            resultToken = { inout.data(), pos };
+            // Strip off all previous characters before the delimiter plus
+            // the delimiter itself from the input view
+            inout.remove_prefix(pos + 1);
+        }
+
+        return resultToken;
+    }
+
+    AZStd::optional<AZStd::string_view> TokenizeLast(AZStd::string_view& inout, const char delimiter)
+    {
+        return TokenizeLast(inout, { &delimiter, 1 });
+    }
+    AZStd::optional<AZStd::string_view> TokenizeLast(AZStd::string_view& inout, AZStd::string_view delimiters)
+    {
+        if (delimiters.empty() || inout.empty())
+        {
+            return AZStd::nullopt;
+        }
+
+        AZStd::string_view resultToken;
+        if (size_t pos = inout.find_last_of(delimiters); pos == AZStd::string_view::npos)
+        {
+            // The delimiter has not been found, a new view containing the entire
+            // string will be returned and the input parameter will be set to empty
+            resultToken.swap(inout);
+        }
+        else
+        {
+            resultToken = inout.substr(pos + 1);
+            // Strip off all previous characters before the delimiter plus
+            // the delimiter itself from the input view
+            inout = inout.substr(0, pos);
+        }
+
+        return resultToken;
+    }
+
+    bool FindFirstOf(AZStd::string_view inString, size_t offset, const AZStd::vector<AZStd::string_view>& searchStrings, uint32_t& outIndex, size_t& outOffset)
+    {
+        bool found = false;
+
+        outIndex = 0;
+        outOffset = AZStd::string::npos;
+        for (int32_t i = 0; i < searchStrings.size(); ++i)
+        {
+            const AZStd::string& search = searchStrings[i];
+
+            size_t entry = inString.find(search, offset);
+            if (entry != AZStd::string::npos)
+            {
+                if (!found || (entry < outOffset))
                 {
-                    if (!strncmp(pCur, s.data(), slen))
-                    {
-                        return static_cast<size_t>(pCur - in.data());
-                    }
-                }
-                else
-                {
-                    if (!azstrnicmp(pCur, s.data(), slen))
-                    {
-                        return static_cast<size_t>(pCur - in.data());
-                    }
-                }
-
-                if (bReverse)
-                {
-                    pCur--;
-                }
-                else
-                {
-                    pCur++;
-                }
-            } while (bReverse ? pCur >= in.data() : pCur - in.data() <= static_cast<ptrdiff_t>(inlen));
-
-            return AZStd::string::npos;
-        }
-
-        char FirstCharacter(const char* in)
-        {
-            if (!in)
-            {
-                return '\0';
-            }
-            if (in[0] == '\n')
-            {
-                return '\0';
-            }
-            return in[0];
-        }
-
-        char LastCharacter(const char* in)
-        {
-            if (!in)
-            {
-                return '\0';
-            }
-            size_t len = strlen(in);
-            if (!len)
-            {
-                return '\0';
-            }
-            return in[len - 1];
-        }
-
-        AZStd::string& Append(AZStd::string& inout, const char s)
-        {
-            return inout.append(1, s);
-        }
-
-        AZStd::string& Append(AZStd::string& inout, const char* str)
-        {
-            if (!str)
-            {
-                return inout;
-            }
-            return inout.append(str);
-        }
-
-        AZStd::string& Prepend(AZStd::string& inout, const char s)
-        {
-            return inout.insert((size_t)0, 1, s);
-        }
-
-        AZStd::string& Prepend(AZStd::string& inout, const char* str)
-        {
-            if (!str)
-            {
-                return inout;
-            }
-            return inout.insert(0, str);
-        }
-
-        AZStd::string& LChop(AZStd::string& inout, size_t num)
-        {
-            return Internal::LChop(inout, num);
-        }
-
-        AZStd::string_view LChop(AZStd::string_view in, size_t num)
-        {
-            return Internal::LChop(in, num);
-        }
-
-        AZStd::string& RChop(AZStd::string& inout, size_t num)
-        {
-            return Internal::RChop(inout, num);
-        }
-
-        AZStd::string_view RChop(AZStd::string_view in, size_t num)
-        {
-            return Internal::RChop(in, num);
-        }
-
-        AZStd::string& LKeep(AZStd::string& inout, size_t pos, bool bKeepPosCharacter)
-        {
-            return Internal::LKeep(inout, pos, bKeepPosCharacter);
-        }
-
-        AZStd::string& RKeep(AZStd::string& inout, size_t pos, bool bKeepPosCharacter)
-        {
-            return Internal::RKeep(inout, pos, bKeepPosCharacter);
-        }
-
-        bool Replace(AZStd::string& inout, const char replaceA, const char withB, bool bCaseSensitive, bool bReplaceFirst, bool bReplaceLast)
-        {
-            return Internal::Replace(inout, replaceA, withB, bCaseSensitive, bReplaceFirst, bReplaceLast);
-        }
-
-        bool Replace(AZStd::string& inout, const char* replaceA, const char* withB, bool bCaseSensitive, bool bReplaceFirst, bool bReplaceLast)
-        {
-            return Internal::Replace(inout, replaceA, withB, bCaseSensitive, bReplaceFirst, bReplaceLast);
-        }
-
-        bool Strip(AZStd::string& inout, const char stripCharacter, bool bCaseSensitive, bool bStripBeginning, bool bStripEnding)
-        {
-            return Internal::Strip(inout, stripCharacter, bCaseSensitive, bStripBeginning, bStripEnding);
-        }
-
-        bool Strip(AZStd::string& inout, const char* stripCharacters, bool bCaseSensitive, bool bStripBeginning, bool bStripEnding)
-        {
-            return Internal::Strip(inout, stripCharacters, bCaseSensitive, bStripBeginning, bStripEnding);
-        }
-
-        AZStd::string& TrimWhiteSpace(AZStd::string& value, bool leading, bool trailing)
-        {
-            static const char* trimmable = " \t\r\n";
-            if (value.length() > 0)
-            {
-                if (leading)
-                {
-                    value.erase(0, value.find_first_not_of(trimmable));
-                }
-                if (trailing)
-                {
-                    value.erase(value.find_last_not_of(trimmable) + 1);
-                }
-            }
-            return value;
-        }
-
-        void Tokenize(AZStd::string_view in, AZStd::vector<AZStd::string>& tokens, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
-        {
-            return Tokenize(in, tokens, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
-        }
-
-        void Tokenize(AZStd::string_view in, AZStd::vector<AZStd::string>& tokens, AZStd::string_view delimiters, bool keepEmptyStrings, bool keepSpaceStrings)
-        {
-            auto insertVisitor = [&tokens](AZStd::string_view token)
-            {
-                tokens.push_back(token);
-            };
-            return TokenizeVisitor(in, insertVisitor, delimiters, keepEmptyStrings, keepSpaceStrings);
-        }
-
-        void TokenizeVisitor(AZStd::string_view in, const TokenVisitor& tokenVisitor, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
-        {
-            return TokenizeVisitor(in, tokenVisitor, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
-        }
-
-        void TokenizeVisitor(AZStd::string_view in, const TokenVisitor& tokenVisitor, AZStd::string_view delimiters,
-            bool keepEmptyStrings, bool keepSpaceStrings)
-        {
-            if (delimiters.empty() || in.empty())
-            {
-                return;
-            }
-
-            while (AZStd::optional<AZStd::string_view> nextToken = TokenizeNext(in, delimiters))
-            {
-                bool bIsEmpty = nextToken->empty();
-                bool bIsSpaces = false;
-                if (!bIsEmpty)
-                {
-                    AZStd::string_view strippedNextToken = StripEnds(*nextToken, " ");
-                    bIsSpaces = strippedNextToken.empty();
-                }
-
-                if ((bIsEmpty && keepEmptyStrings) ||
-                    (bIsSpaces && keepSpaceStrings) ||
-                    (!bIsSpaces && !bIsEmpty))
-                {
-                    tokenVisitor(*nextToken);
+                    found = true;
+                    outIndex = i;
+                    outOffset = entry;
                 }
             }
         }
 
-        void TokenizeVisitorReverse(AZStd::string_view in, const TokenVisitor& tokenVisitor, const char delimiter, bool keepEmptyStrings, bool keepSpaceStrings)
+        return found;
+    }
+
+    void Tokenize(AZStd::string_view input, AZStd::vector<AZStd::string>& tokens, const AZStd::vector<AZStd::string_view>& delimiters, bool keepEmptyStrings /*= false*/, bool keepSpaceStrings /*= false*/)
+    {
+        if (input.empty())
         {
-            return TokenizeVisitorReverse(in, tokenVisitor, { &delimiter, 1 }, keepEmptyStrings, keepSpaceStrings);
+            return;
         }
 
-        void TokenizeVisitorReverse(AZStd::string_view in, const TokenVisitor& tokenVisitor, AZStd::string_view delimiters,
-            bool keepEmptyStrings, bool keepSpaceStrings)
+        size_t offset = 0;
+        for (;;)
         {
-            if (delimiters.empty() || in.empty())
+            uint32_t nextMatch = 0;
+            size_t nextOffset = offset;
+            if (!FindFirstOf(input, offset, delimiters, nextMatch, nextOffset))
             {
-                return;
+                // No more occurrences of a separator, consume whatever is left and exit
+                tokens.push_back(input.substr(offset));
+                break;
             }
 
-            while (AZStd::optional<AZStd::string_view> nextToken = TokenizeLast(in, delimiters))
+            // Take the substring, not including the separator, and increment our offset
+            AZStd::string nextSubstring = input.substr(offset, nextOffset - offset);
+            if (keepEmptyStrings || keepSpaceStrings || !nextSubstring.empty())
             {
-                bool bIsEmpty = nextToken->empty();
-                bool bIsSpaces = false;
-                if (!bIsEmpty)
-                {
-                    AZStd::string_view strippedNextToken = StripEnds(*nextToken, " ");
-                    bIsSpaces = strippedNextToken.empty();
-                }
-
-                if ((bIsEmpty && keepEmptyStrings) ||
-                    (bIsSpaces && keepSpaceStrings) ||
-                    (!bIsSpaces && !bIsEmpty))
-                {
-                    tokenVisitor(*nextToken);
-                }
+                tokens.push_back(nextSubstring);
             }
+
+            offset = nextOffset + delimiters[nextMatch].size();
         }
+    }
 
-        AZStd::optional<AZStd::string_view> TokenizeNext(AZStd::string_view& inout, const char delimiter)
+    int ToInt(const char* in)
+    {
+        if (!in)
         {
-            return TokenizeNext(inout, { &delimiter, 1 });
+            return 0;
         }
-        AZStd::optional<AZStd::string_view> TokenizeNext(AZStd::string_view& inout, AZStd::string_view delimiters)
+        return atoi(in);
+    }
+
+    bool LooksLikeInt(const char* in, int* pInt /*=nullptr*/)
+    {
+        if (!in)
         {
-            if (delimiters.empty() || inout.empty())
-            {
-                return AZStd::nullopt;
-            }
-
-            AZStd::string_view resultToken;
-            if (size_t pos = inout.find_first_of(delimiters); pos == AZStd::string_view::npos)
-            {
-                // The delimiter has not been found, a new view containing the entire
-                // string will be returned and the input parameter will be set to empty
-                resultToken.swap(inout);
-            }
-            else
-            {
-                resultToken = { inout.data(), pos };
-                // Strip off all previous characters before the delimiter plus 
-                // the delimiter itself from the input view
-                inout.remove_prefix(pos + 1);
-            }
-
-            return resultToken;
-        }
-
-        AZStd::optional<AZStd::string_view> TokenizeLast(AZStd::string_view& inout, const char delimiter)
-        {
-            return TokenizeLast(inout, { &delimiter, 1 });
-        }
-        AZStd::optional<AZStd::string_view> TokenizeLast(AZStd::string_view& inout, AZStd::string_view delimiters)
-        {
-            if (delimiters.empty() || inout.empty())
-            {
-                return AZStd::nullopt;
-            }
-
-            AZStd::string_view resultToken;
-            if (size_t pos = inout.find_last_of(delimiters); pos == AZStd::string_view::npos)
-            {
-                // The delimiter has not been found, a new view containing the entire
-                // string will be returned and the input parameter will be set to empty
-                resultToken.swap(inout);
-            }
-            else
-            {
-                resultToken = inout.substr(pos + 1);
-                // Strip off all previous characters before the delimiter plus 
-                // the delimiter itself from the input view
-                inout = inout.substr(0, pos);
-            }
-
-            return resultToken;
-        }
-
-        bool FindFirstOf(AZStd::string_view inString, size_t offset, const AZStd::vector<AZStd::string_view>& searchStrings, uint32_t& outIndex, size_t& outOffset)
-        {
-            bool found = false;
-
-            outIndex = 0;
-            outOffset = AZStd::string::npos;
-            for (int32_t i = 0; i < searchStrings.size(); ++i)
-            {
-                const AZStd::string& search = searchStrings[i];
-
-                size_t entry = inString.find(search, offset);
-                if (entry != AZStd::string::npos)
-                {
-                    if (!found || (entry < outOffset))
-                    {
-                        found = true;
-                        outIndex = i;
-                        outOffset = entry;
-                    }
-                }
-            }
-
-            return found;
-        }
-
-        void Tokenize(AZStd::string_view input, AZStd::vector<AZStd::string>& tokens, const AZStd::vector<AZStd::string_view>& delimiters, bool keepEmptyStrings /*= false*/, bool keepSpaceStrings /*= false*/)
-        {
-            if (input.empty())
-            {
-                return;
-            }
-
-            size_t offset = 0;
-            for (;;)
-            {
-                uint32_t nextMatch = 0;
-                size_t nextOffset = offset;
-                if (!FindFirstOf(input, offset, delimiters, nextMatch, nextOffset))
-                {
-                    // No more occurrences of a separator, consume whatever is left and exit
-                    tokens.push_back(input.substr(offset));
-                    break;
-                }
-
-                // Take the substring, not including the separator, and increment our offset
-                AZStd::string nextSubstring = input.substr(offset, nextOffset - offset);
-                if (keepEmptyStrings || keepSpaceStrings || !nextSubstring.empty())
-                {
-                    tokens.push_back(nextSubstring);
-                }
-
-                offset = nextOffset + delimiters[nextMatch].size();
-            }
-        }
-
-        int ToInt(const char* in)
-        {
-            if (!in)
-            {
-                return 0;
-            }
-            return atoi(in);
-        }
-
-        bool LooksLikeInt(const char* in, int* pInt /*=nullptr*/)
-        {
-            if (!in)
-            {
-                return false;
-            }
-
-            //if pos is past then end of the string false
-            size_t len = strlen(in);
-            if (!len)//must at least 1 characters to work with "1"
-            {
-                return false;
-            }
-
-            const char* pStr = in;
-
-            size_t countNeg = 0;
-            while (*pStr != '\0' &&
-                   (isdigit(*pStr) ||
-                    *pStr == '-'))
-            {
-                if (*pStr == '-')
-                {
-                    countNeg++;
-                }
-                pStr++;
-            }
-
-            if (*pStr == '\0' &&
-                countNeg < 2)
-            {
-                if (pInt)
-                {
-                    *pInt = ToInt(in);
-                }
-
-                return true;
-            }
             return false;
         }
 
-        double ToDouble(const char* in)
+        //if pos is past then end of the string false
+        size_t len = strlen(in);
+        if (!len)//must at least 1 characters to work with "1"
         {
-            if (!in)
-            {
-                return 0.;
-            }
-            return atof(in);
-        }
-
-        bool LooksLikeDouble(const char* in, double* pDouble)
-        {
-            if (!in)
-            {
-                return false;
-            }
-
-            size_t len = strlen(in);
-            if (len < 2)//must have at least 2 characters to work with "1."
-            {
-                return false;
-            }
-
-            const char* pStr = in;
-
-            size_t countDot = 0;
-            size_t countNeg = 0;
-            while (*pStr != '\0' &&
-                (isdigit(*pStr) ||
-                (*pStr == '-' ||
-                    *pStr == '.')))
-            {
-                if (*pStr == '.')
-                {
-                    countDot++;
-                }
-                if (*pStr == '-')
-                {
-                    countNeg++;
-                }
-                pStr++;
-            }
-
-            if (*pStr == '\0' &&
-                countDot == 1 &&
-                countNeg < 2)
-            {
-                if (pDouble)
-                {
-                    *pDouble = ToDouble(in);
-                }
-
-                return true;
-            }
-
             return false;
         }
 
-        float ToFloat(const char* in)
+        const char* pStr = in;
+
+        size_t countNeg = 0;
+        while (*pStr != '\0' &&
+               (isdigit(*pStr) ||
+                *pStr == '-'))
         {
-            if (!in)
+            if (*pStr == '-')
             {
-                return 0.f;
+                countNeg++;
             }
-            return (float)atof(in);
+            pStr++;
         }
 
-        bool LooksLikeFloat(const char* in, float* pFloat /* = nullptr */)
+        if (*pStr == '\0' &&
+            countNeg < 2)
         {
-            bool result = false;
-
-            if (pFloat)
+            if (pInt)
             {
-                double doubleValue = 0.0;
-                result = LooksLikeDouble(in, &doubleValue);
-
-                (*pFloat) = aznumeric_cast<float>(doubleValue);
-            }
-            else
-            {
-                result = LooksLikeDouble(in);
+                *pInt = ToInt(in);
             }
 
-            return result;
+            return true;
         }
+        return false;
+    }
 
-        bool ToBool(const char* in)
+    double ToDouble(const char* in)
+    {
+        if (!in)
+        {
+            return 0.;
+        }
+        return atof(in);
+    }
+
+    bool LooksLikeDouble(const char* in, double* pDouble)
+    {
+        if (!in)
         {
-            bool boolValue = false;
-            if (LooksLikeBool(in, &boolValue))
-            {
-                return boolValue;
-            }
             return false;
         }
 
-        bool LooksLikeBool(const char* in, bool* pBool /* = nullptr */)
+        size_t len = strlen(in);
+        if (len < 2)//must have at least 2 characters to work with "1."
         {
-            if (!in)
-            {
-                return false;
-            }
-
-            if (!azstricmp(in, "true") || !azstricmp(in, "1"))
-            {
-                if (pBool)
-                {
-                    *pBool = true;
-                }
-                return true;
-            }
-
-            if (!azstricmp(in, "false") || !azstricmp(in, "0"))
-            {
-                if (pBool)
-                {
-                    *pBool = false;
-                }
-                return true;
-            }
-
             return false;
         }
 
-        template <typename VECTOR_TYPE, uint32_t ELEMENT_COUNT>
-        bool LooksLikeVectorHelper(const char* in, VECTOR_TYPE* outVector)
-        {
-            AZStd::vector<AZStd::string> tokens;
-            Tokenize(in, tokens, ',', false, true);
-            if (tokens.size() == ELEMENT_COUNT)
-            {
-                float vectorValues[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
+        const char* pStr = in;
 
+        size_t countDot = 0;
+        size_t countNeg = 0;
+        while (*pStr != '\0' &&
+            (isdigit(*pStr) ||
+            (*pStr == '-' ||
+                *pStr == '.')))
+        {
+            if (*pStr == '.')
+            {
+                countDot++;
+            }
+            if (*pStr == '-')
+            {
+                countNeg++;
+            }
+            pStr++;
+        }
+
+        if (*pStr == '\0' &&
+            countDot == 1 &&
+            countNeg < 2)
+        {
+            if (pDouble)
+            {
+                *pDouble = ToDouble(in);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    float ToFloat(const char* in)
+    {
+        if (!in)
+        {
+            return 0.f;
+        }
+        return (float)atof(in);
+    }
+
+    bool LooksLikeFloat(const char* in, float* pFloat /* = nullptr */)
+    {
+        bool result = false;
+
+        if (pFloat)
+        {
+            double doubleValue = 0.0;
+            result = LooksLikeDouble(in, &doubleValue);
+
+            (*pFloat) = aznumeric_cast<float>(doubleValue);
+        }
+        else
+        {
+            result = LooksLikeDouble(in);
+        }
+
+        return result;
+    }
+
+    bool ToBool(const char* in)
+    {
+        bool boolValue = false;
+        if (LooksLikeBool(in, &boolValue))
+        {
+            return boolValue;
+        }
+        return false;
+    }
+
+    bool LooksLikeBool(const char* in, bool* pBool /* = nullptr */)
+    {
+        if (!in)
+        {
+            return false;
+        }
+
+        if (!azstricmp(in, "true") || !azstricmp(in, "1"))
+        {
+            if (pBool)
+            {
+                *pBool = true;
+            }
+            return true;
+        }
+
+        if (!azstricmp(in, "false") || !azstricmp(in, "0"))
+        {
+            if (pBool)
+            {
+                *pBool = false;
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    template <typename VECTOR_TYPE, uint32_t ELEMENT_COUNT>
+    bool LooksLikeVectorHelper(const char* in, VECTOR_TYPE* outVector)
+    {
+        AZStd::vector<AZStd::string> tokens;
+        Tokenize(in, tokens, ',', false, true);
+        if (tokens.size() == ELEMENT_COUNT)
+        {
+            float vectorValues[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
+
+            for (uint32_t element = 0; element < ELEMENT_COUNT; ++element)
+            {
+                if (!LooksLikeFloat(tokens[element].c_str(), outVector ? &vectorValues[element] : nullptr))
+                {
+                    return false;
+                }
+            }
+
+            if (outVector)
+            {
                 for (uint32_t element = 0; element < ELEMENT_COUNT; ++element)
                 {
-                    if (!LooksLikeFloat(tokens[element].c_str(), outVector ? &vectorValues[element] : nullptr))
-                    {
-                        return false;
-                    }
+                    outVector->SetElement(element, vectorValues[element]);
                 }
-
-                if (outVector)
-                {
-                    for (uint32_t element = 0; element < ELEMENT_COUNT; ++element)
-                    {
-                        outVector->SetElement(element, vectorValues[element]);
-                    }
-                }
-
-                return true;
             }
 
-            return false;
-        }
-
-        bool LooksLikeVector2(const char* in, AZ::Vector2* outVector)
-        {
-            return LooksLikeVectorHelper<AZ::Vector2, 2>(in, outVector);
-        }
-
-        AZ::Vector2 ToVector2(const char* in)
-        {
-            AZ::Vector2 vector;
-            LooksLikeVector2(in, &vector);
-            return vector;
-        }
-
-        bool LooksLikeVector3(const char* in, AZ::Vector3* outVector)
-        {
-            return LooksLikeVectorHelper<AZ::Vector3, 3>(in, outVector);
-        }
-
-        AZ::Vector3 ToVector3(const char* in)
-        {
-            AZ::Vector3 vector;
-            LooksLikeVector3(in, &vector);
-            return vector;
-        }
-
-        bool LooksLikeVector4(const char* in, AZ::Vector4* outVector)
-        {
-            return LooksLikeVectorHelper<AZ::Vector4, 4>(in, outVector);
-        }
-
-        AZ::Vector4 ToVector4(const char* in)
-        {
-            AZ::Vector4 vector;
-            LooksLikeVector4(in, &vector);
-            return vector;
-        }
-
-        bool ToHexDump(const char* in, AZStd::string& out)
-        {
-            struct TInline
-            {
-                static void ByteToHex(char* pszHex, unsigned char bValue)
-                {
-                    pszHex[0] = bValue / 16;
-
-                    if (pszHex[0] < 10)
-                    {
-                        pszHex[0] += '0';
-                    }
-                    else
-                    {
-                        pszHex[0] -= 10;
-                        pszHex[0] += 'A';
-                    }
-
-                    pszHex[1] = bValue % 16;
-
-                    if (pszHex[1] < 10)
-                    {
-                        pszHex[1] += '0';
-                    }
-                    else
-                    {
-                        pszHex[1] -= 10;
-                        pszHex[1] += 'A';
-                    }
-                }
-            };
-
-            size_t len = strlen(in);
-            if (len < 1) //must be at least 1 character to work with
-            {
-                return false;
-            }
-
-            size_t nBytes = len;
-
-            char* pszData = reinterpret_cast<char*>(azmalloc((nBytes * 2) + 1));
-
-            for (size_t ii = 0; ii < nBytes; ++ii)
-            {
-                TInline::ByteToHex(&pszData[ii * 2], in[ii]);
-            }
-
-            pszData[nBytes * 2] = 0x00;
-            out = pszData;
-            azfree(pszData);
-
             return true;
         }
 
-        bool FromHexDump(const char* in, AZStd::string& out)
+        return false;
+    }
+
+    bool LooksLikeVector2(const char* in, AZ::Vector2* outVector)
+    {
+        return LooksLikeVectorHelper<AZ::Vector2, 2>(in, outVector);
+    }
+
+    AZ::Vector2 ToVector2(const char* in)
+    {
+        AZ::Vector2 vector;
+        LooksLikeVector2(in, &vector);
+        return vector;
+    }
+
+    bool LooksLikeVector3(const char* in, AZ::Vector3* outVector)
+    {
+        return LooksLikeVectorHelper<AZ::Vector3, 3>(in, outVector);
+    }
+
+    AZ::Vector3 ToVector3(const char* in)
+    {
+        AZ::Vector3 vector;
+        LooksLikeVector3(in, &vector);
+        return vector;
+    }
+
+    bool LooksLikeVector4(const char* in, AZ::Vector4* outVector)
+    {
+        return LooksLikeVectorHelper<AZ::Vector4, 4>(in, outVector);
+    }
+
+    AZ::Vector4 ToVector4(const char* in)
+    {
+        AZ::Vector4 vector;
+        LooksLikeVector4(in, &vector);
+        return vector;
+    }
+
+    bool ToHexDump(const char* in, AZStd::string& out)
+    {
+        struct TInline
         {
-            struct TInline
+            static void ByteToHex(char* pszHex, unsigned char bValue)
             {
-                static unsigned char HexToByte(const char* pszHex)
+                pszHex[0] = bValue / 16;
+
+                if (pszHex[0] < 10)
                 {
-                    unsigned char bHigh = 0;
-                    unsigned char bLow = 0;
-
-                    if ((pszHex[0] >= '0') && (pszHex[0] <= '9'))
-                    {
-                        bHigh = pszHex[0] - '0';
-                    }
-                    else if ((pszHex[0] >= 'A') && (pszHex[0] <= 'F'))
-                    {
-                        bHigh = (pszHex[0] - 'A') + 10;
-                    }
-
-                    bHigh = bHigh << 4;
-
-                    if ((pszHex[1] >= '0') && (pszHex[1] <= '9'))
-                    {
-                        bLow = pszHex[1] - '0';
-                    }
-                    else if ((pszHex[1] >= 'A') && (pszHex[1] <= 'F'))
-                    {
-                        bLow = (pszHex[1] - 'A') + 10;
-                    }
-
-                    return bHigh | bLow;
-                }
-            };
-
-            size_t len = strlen(in);
-            if (len < 2) //must be at least 2 characters to work with
-            {
-                return false;
-            }
-
-            size_t nBytes = len / 2;
-            char* pszData = reinterpret_cast<char*>(azmalloc(nBytes + 1));
-
-            for (size_t ii = 0; ii < nBytes; ++ii)
-            {
-                pszData[ii] = TInline::HexToByte(&in[ii * 2]);
-            }
-
-            pszData[nBytes] = 0x00;
-            out = pszData;
-            azfree(pszData);
-
-            return true;
-        }
-
-        namespace NumberFormatting
-        {
-            int GroupDigits(char* buffer, size_t bufferSize, size_t decimalPosHint, char digitSeparator, char decimalSeparator, int groupingSize, int firstGroupingSize)
-            {
-                static const int MAX_SEPARATORS = 16;
-
-                AZ_Assert(buffer, "Null string buffer");
-                AZ_Assert(bufferSize > decimalPosHint, "Decimal position %lu cannot be located beyond bufferSize %lu", decimalPosHint, bufferSize);
-                AZ_Assert(groupingSize > 0, "Grouping size must be a positive integer");
-
-                int numberEndPos = 0;
-                int stringEndPos = 0;
-                
-                if (decimalPosHint > 0 && decimalPosHint < (bufferSize - 1) && buffer[decimalPosHint] == decimalSeparator)
-                {
-                    // Assume the number ends at the supplied location
-                    numberEndPos = (int)decimalPosHint;
-                    stringEndPos = numberEndPos + (int)strnlen(buffer + numberEndPos, bufferSize - numberEndPos);
+                    pszHex[0] += '0';
                 }
                 else
                 {
-                    // Search for the final digit or separator while obtaining the string length
-                    int lastDigitSeenPos = 0;
-
-                    while (stringEndPos < bufferSize)
-                    {
-                        char c = buffer[stringEndPos];
-
-                        if (!c)
-                        {
-                            break;
-                        }
-                        else if (c == decimalSeparator)
-                        {
-                            // End the number if there's a decimal
-                            numberEndPos = stringEndPos;
-                        }
-                        else if (numberEndPos <= 0 && c >= '0' && c <= '9')
-                        {
-                            // Otherwise keep track of where the last digit we've seen is
-                            lastDigitSeenPos = stringEndPos;
-                        }
-
-                        stringEndPos++;
-                    }
-
-                    if (numberEndPos <= 0)
-                    {
-                        if (lastDigitSeenPos > 0)
-                        {
-                            // No decimal, so use the last seen digit as the end of the number
-                            numberEndPos = lastDigitSeenPos + 1;
-                        }
-                        else
-                        {
-                            // No digits, no decimals, therefore no change in the string
-                            return stringEndPos;
-                        }
-                    }
+                    pszHex[0] -= 10;
+                    pszHex[0] += 'A';
                 }
 
-                if (firstGroupingSize <= 0)
+                pszHex[1] = bValue % 16;
+
+                if (pszHex[1] < 10)
                 {
-                    firstGroupingSize = groupingSize;
+                    pszHex[1] += '0';
+                }
+                else
+                {
+                    pszHex[1] -= 10;
+                    pszHex[1] += 'A';
+                }
+            }
+        };
+
+        size_t len = strlen(in);
+        if (len < 1) //must be at least 1 character to work with
+        {
+            return false;
+        }
+
+        size_t nBytes = len;
+
+        char* pszData = reinterpret_cast<char*>(azmalloc((nBytes * 2) + 1));
+
+        for (size_t ii = 0; ii < nBytes; ++ii)
+        {
+            TInline::ByteToHex(&pszData[ii * 2], in[ii]);
+        }
+
+        pszData[nBytes * 2] = 0x00;
+        out = pszData;
+        azfree(pszData);
+
+        return true;
+    }
+
+    bool FromHexDump(const char* in, AZStd::string& out)
+    {
+        struct TInline
+        {
+            static unsigned char HexToByte(const char* pszHex)
+            {
+                unsigned char bHigh = 0;
+                unsigned char bLow = 0;
+
+                if ((pszHex[0] >= '0') && (pszHex[0] <= '9'))
+                {
+                    bHigh = pszHex[0] - '0';
+                }
+                else if ((pszHex[0] >= 'A') && (pszHex[0] <= 'F'))
+                {
+                    bHigh = (pszHex[0] - 'A') + 10;
                 }
 
-                // Determine where to place the separators
-                int groupingSizes[] = { firstGroupingSize + 1, groupingSize };  // First group gets +1 since we begin all subsequent groups at the second digit
-                int groupingOffsetsToNext[] = { 1, 0 };  // We will offset from the first entry to the second, then stay at the second for remaining iterations
-                const int* currentGroupingSize = groupingSizes;
-                const int* currentGroupingOffsetToNext = groupingOffsetsToNext;
-                AZStd::fixed_vector<char*, MAX_SEPARATORS> separatorLocations;
-                int groupCounter = 0;
-                int digitPosition = numberEndPos - 1;
+                bHigh = bHigh << 4;
 
-                while (digitPosition >= 0)
+                if ((pszHex[1] >= '0') && (pszHex[1] <= '9'))
                 {
-                    // Walk backwards in the string from the least significant digit to the most significant, demarcating consecutive groups of digits
-                    char c = buffer[digitPosition];
+                    bLow = pszHex[1] - '0';
+                }
+                else if ((pszHex[1] >= 'A') && (pszHex[1] <= 'F'))
+                {
+                    bLow = (pszHex[1] - 'A') + 10;
+                }
 
-                    if (c >= '0' && c <= '9')
-                    {
-                        if (++groupCounter == *currentGroupingSize)
-                        {
-                            // Demarcate a new group of digits at this location
-                            separatorLocations.push_back(buffer + digitPosition);
-                            currentGroupingSize += *currentGroupingOffsetToNext;
-                            currentGroupingOffsetToNext += *currentGroupingOffsetToNext;
-                            groupCounter = 0;
-                        }
+                return bHigh | bLow;
+            }
+        };
 
-                        digitPosition--;
-                    }
-                    else
+        size_t len = strlen(in);
+        if (len < 2) //must be at least 2 characters to work with
+        {
+            return false;
+        }
+
+        size_t nBytes = len / 2;
+        char* pszData = reinterpret_cast<char*>(azmalloc(nBytes + 1));
+
+        for (size_t ii = 0; ii < nBytes; ++ii)
+        {
+            pszData[ii] = TInline::HexToByte(&in[ii * 2]);
+        }
+
+        pszData[nBytes] = 0x00;
+        out = pszData;
+        azfree(pszData);
+
+        return true;
+    }
+
+    namespace NumberFormatting
+    {
+        int GroupDigits(char* buffer, size_t bufferSize, size_t decimalPosHint, char digitSeparator, char decimalSeparator, int groupingSize, int firstGroupingSize)
+        {
+            static const int MAX_SEPARATORS = 16;
+
+            AZ_Assert(buffer, "Null string buffer");
+            AZ_Assert(bufferSize > decimalPosHint, "Decimal position %lu cannot be located beyond bufferSize %lu", decimalPosHint, bufferSize);
+            AZ_Assert(groupingSize > 0, "Grouping size must be a positive integer");
+
+            int numberEndPos = 0;
+            int stringEndPos = 0;
+
+            if (decimalPosHint > 0 && decimalPosHint < (bufferSize - 1) && buffer[decimalPosHint] == decimalSeparator)
+            {
+                // Assume the number ends at the supplied location
+                numberEndPos = (int)decimalPosHint;
+                stringEndPos = numberEndPos + (int)strnlen(buffer + numberEndPos, bufferSize - numberEndPos);
+            }
+            else
+            {
+                // Search for the final digit or separator while obtaining the string length
+                int lastDigitSeenPos = 0;
+
+                while (stringEndPos < bufferSize)
+                {
+                    char c = buffer[stringEndPos];
+
+                    if (!c)
                     {
                         break;
                     }
-                }
-
-                if (stringEndPos + separatorLocations.size() >= bufferSize)
-                {
-                    // Won't fit into buffer, so return unchanged
-                    return stringEndPos;
-                }
-
-                // Insert the separators by shifting characters forward in the string, starting at the end and working backwards
-                const char* src = buffer + stringEndPos;
-                char* dest = buffer + stringEndPos + separatorLocations.size();
-                auto separatorItr = separatorLocations.begin();
-
-                while (separatorItr != separatorLocations.end())
-                {
-                    while (src > *separatorItr)
+                    else if (c == decimalSeparator)
                     {
-                        *dest-- = *src--;
+                        // End the number if there's a decimal
+                        numberEndPos = stringEndPos;
+                    }
+                    else if (numberEndPos <= 0 && c >= '0' && c <= '9')
+                    {
+                        // Otherwise keep track of where the last digit we've seen is
+                        lastDigitSeenPos = stringEndPos;
                     }
 
-                    // Insert the separator and reduce the distance between our destination and source by one
-                    *dest-- = digitSeparator;
-                    ++separatorItr;
+                    stringEndPos++;
                 }
 
-                return (int)(stringEndPos + separatorLocations.size());
+                if (numberEndPos <= 0)
+                {
+                    if (lastDigitSeenPos > 0)
+                    {
+                        // No decimal, so use the last seen digit as the end of the number
+                        numberEndPos = lastDigitSeenPos + 1;
+                    }
+                    else
+                    {
+                        // No digits, no decimals, therefore no change in the string
+                        return stringEndPos;
+                    }
+                }
             }
-        }
 
-        namespace AssetPath
+            if (firstGroupingSize <= 0)
+            {
+                firstGroupingSize = groupingSize;
+            }
+
+            // Determine where to place the separators
+            int groupingSizes[] = { firstGroupingSize + 1, groupingSize };  // First group gets +1 since we begin all subsequent groups at the second digit
+            int groupingOffsetsToNext[] = { 1, 0 };  // We will offset from the first entry to the second, then stay at the second for remaining iterations
+            const int* currentGroupingSize = groupingSizes;
+            const int* currentGroupingOffsetToNext = groupingOffsetsToNext;
+            AZStd::fixed_vector<char*, MAX_SEPARATORS> separatorLocations;
+            int groupCounter = 0;
+            int digitPosition = numberEndPos - 1;
+
+            while (digitPosition >= 0)
+            {
+                // Walk backwards in the string from the least significant digit to the most significant, demarcating consecutive groups of digits
+                char c = buffer[digitPosition];
+
+                if (c >= '0' && c <= '9')
+                {
+                    if (++groupCounter == *currentGroupingSize)
+                    {
+                        // Demarcate a new group of digits at this location
+                        separatorLocations.push_back(buffer + digitPosition);
+                        currentGroupingSize += *currentGroupingOffsetToNext;
+                        currentGroupingOffsetToNext += *currentGroupingOffsetToNext;
+                        groupCounter = 0;
+                    }
+
+                    digitPosition--;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            if (stringEndPos + separatorLocations.size() >= bufferSize)
+            {
+                // Won't fit into buffer, so return unchanged
+                return stringEndPos;
+            }
+
+            // Insert the separators by shifting characters forward in the string, starting at the end and working backwards
+            const char* src = buffer + stringEndPos;
+            char* dest = buffer + stringEndPos + separatorLocations.size();
+            auto separatorItr = separatorLocations.begin();
+
+            while (separatorItr != separatorLocations.end())
+            {
+                while (src > *separatorItr)
+                {
+                    *dest-- = *src--;
+                }
+
+                // Insert the separator and reduce the distance between our destination and source by one
+                *dest-- = digitSeparator;
+                ++separatorItr;
+            }
+
+            return (int)(stringEndPos + separatorLocations.size());
+        }
+    }
+
+    namespace AssetPath
+    {
+        namespace Internal
         {
-            void CalculateBranchToken(const AZStd::string& appRootPath, AZStd::string& token)
+            AZ::u32 CalculateBranchTokenHash(AZStd::string_view engineRootPath)
             {
                 // Normalize the token to prepare for CRC32 calculation
-                AZStd::string normalized = appRootPath;
+                auto NormalizeEnginePath = [](const char element) -> char
+                {
+                    // Substitute path separators with '_' and lower case
+                    return element == AZ::IO::WindowsPathSeparator || element == AZ::IO::PosixPathSeparator
+                        ? '_'
+                        : static_cast<char>(std::tolower(element));
+                };
 
-                // Strip out any trailing path separators
-                AZ::StringFunc::Strip(normalized, AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING  AZ_WRONG_FILESYSTEM_SEPARATOR_STRING,false, false, true);
-
-                // Lower case always
-                AZStd::to_lower(normalized.begin(), normalized.end());
-
-                // Substitute path separators with '_'
-                AZStd::replace(normalized.begin(), normalized.end(), '\\', '_');
-                AZStd::replace(normalized.begin(), normalized.end(), '/', '_');
+                // Trim off trailing path separators
+                engineRootPath = RStrip(engineRootPath, AZ_CORRECT_AND_WRONG_FILESYSTEM_SEPARATOR);
+                AZ::IO::FixedMaxPathString enginePath;
+                AZStd::transform(
+                    engineRootPath.begin(), engineRootPath.end(), AZStd::back_inserter(enginePath), AZStd::move(NormalizeEnginePath));
 
                 // Perform the CRC32 calculation
-                const AZ::Crc32 branchTokenCrc(normalized.c_str(), normalized.size(), true);
-                char branchToken[12];
-                azsnprintf(branchToken, AZ_ARRAY_SIZE(branchToken), "0x%08X", static_cast<AZ::u32>(branchTokenCrc));
-                token = AZStd::string(branchToken);
+                constexpr bool forceLowercase = true;
+                return static_cast<AZ::u32>(AZ::Crc32(enginePath.c_str(), enginePath.size(), forceLowercase));
             }
+        } // namespace Internal
+        void CalculateBranchToken(AZStd::string_view engineRootPath, AZStd::string& token)
+        {
+            token = AZStd::string::format("0x%08X", Internal::CalculateBranchTokenHash(engineRootPath));
+        }
+        void CalculateBranchToken(AZStd::string_view engineRootPath, AZ::IO::FixedMaxPathString& token)
+        {
+            token = AZ::IO::FixedMaxPathString::format("0x%08X", Internal::CalculateBranchTokenHash(engineRootPath));
+        }
+    } // namespace AssetPath
+
+    namespace AssetDatabasePath
+    {
+        bool Normalize(AZStd::string& inout)
+        {
+            // Asset Paths uses the forward slash for the database separator
+            AZ::IO::Path path(AZStd::move(inout), AZ_CORRECT_DATABASE_SEPARATOR);
+            bool appendTrailingSlash = (path.Native().ends_with(AZ_CORRECT_DATABASE_SEPARATOR) || path.Native().ends_with(AZ_WRONG_DATABASE_SEPARATOR))
+                && path.HasRelativePath();
+            inout = AZStd::move(path.LexicallyNormal().Native());
+            if (appendTrailingSlash)
+            {
+                inout.push_back(AZ_CORRECT_DATABASE_SEPARATOR);
+            }
+            return IsValid(inout.c_str());
         }
 
-        namespace AssetDatabasePath
+        bool IsValid(const char* in)
         {
-            bool Normalize(AZStd::string& inout)
+            if (!in)
             {
-                // Asset Paths uses the forward slash for the database separator
-                AZ::IO::Path path(AZStd::move(inout), AZ_CORRECT_DATABASE_SEPARATOR);
-                bool appendTrailingSlash = (path.Native().ends_with(AZ_CORRECT_DATABASE_SEPARATOR) || path.Native().ends_with(AZ_WRONG_DATABASE_SEPARATOR))
-                    && path.HasRelativePath();
-                inout = AZStd::move(path.LexicallyNormal().Native());
-                if (appendTrailingSlash)
-                {
-                    inout.push_back(AZ_CORRECT_DATABASE_SEPARATOR);
-                }
-                return IsValid(inout.c_str());
+                return false;
             }
 
-            bool IsValid(const char* in)
+            if (!strlen(in))
             {
-                if (!in)
-                {
-                    return false;
-                }
+                return false;
+            }
 
-                if (!strlen(in))
-                {
-                    return false;
-                }
+            if (Find(in, AZ_DATABASE_INVALID_CHARACTERS) != AZStd::string::npos)
+            {
+                return false;
+            }
 
-                if (Find(in, AZ_DATABASE_INVALID_CHARACTERS) != AZStd::string::npos)
-                {
-                    return false;
-                }
-
-                if (Find(in, AZ_WRONG_DATABASE_SEPARATOR) != AZStd::string::npos)
-                {
-                    return false;
-                }
+            if (Find(in, AZ_WRONG_DATABASE_SEPARATOR) != AZStd::string::npos)
+            {
+                return false;
+            }
 
 #ifndef AZ_FILENAME_ALLOW_SPACES
-                if (Find(in, AZ_SPACE_CHARACTERS) != AZStd::string::npos)
-                {
-                    return false;
-                }
+            if (Find(in, AZ_SPACE_CHARACTERS) != AZStd::string::npos)
+            {
+                return false;
+            }
 #endif // AZ_FILENAME_ALLOW_SPACES
 
-                if (LastCharacter(in) == AZ_CORRECT_DATABASE_SEPARATOR)
-                {
-                    return false;
-                }
-
-                return true;
-            }
-
-            bool Split(const char* in, [[maybe_unused]] AZStd::string* pDstProjectRootOut, AZStd::string* pDstDatabaseRootOut,
-                AZStd::string* pDstDatabasePathOut , AZStd::string* pDstFileOut, AZStd::string* pDstFileExtensionOut)
+            if (LastCharacter(in) == AZ_CORRECT_DATABASE_SEPARATOR)
             {
-                AZStd::string_view path{ in };
-                if (path.empty())
-                {
-                    return false;
-                }
-
-                AZ::IO::PathView pathView(path, AZ_CORRECT_DATABASE_SEPARATOR);
-                if (pDstDatabaseRootOut)
-                {
-                    AZStd::string_view rootNameView = pathView.RootName().Native();
-                    if (rootNameView.size() > pDstDatabaseRootOut->max_size())
-                    {
-                        return false;
-                    }
-                    *pDstDatabaseRootOut = rootNameView;
-                }
-                if (pDstDatabasePathOut)
-                {
-                    AZStd::string_view rootPathView = pathView.RootPath().Native();
-                    AZStd::string_view relPathParentView = pathView.ParentPath().RelativePath().Native();
-                    if (rootPathView.size() + relPathParentView.size() > pDstDatabasePathOut->max_size())
-                    {
-                        return false;
-                    }
-                    // Append the root directory if there is one
-                    *pDstDatabasePathOut = rootPathView;
-                    // Append the relative path portion of the split path excluding the filename
-                    *pDstDatabasePathOut += relPathParentView;
-                }
-                if (pDstFileOut)
-                {
-                    AZStd::string_view stemView = pathView.Stem().Native();
-                    if (stemView.size() > pDstFileOut->max_size())
-                    {
-                        return false;
-                    }
-                    *pDstFileOut = stemView;
-                }
-                if (pDstFileExtensionOut)
-                {
-                    AZStd::string_view extensionView = pathView.Extension().Native();
-                    if (extensionView.size() > pDstFileExtensionOut->max_size())
-                    {
-                        return false;
-                    }
-                    *pDstFileExtensionOut = extensionView;
-                }
-
-                return true;
+                return false;
             }
 
-            bool Join(const char* pFirstPart, const char* pSecondPart, AZStd::string& out, [[maybe_unused]] bool bCaseInsensitive /*= true*/, bool bNormalize /*= true*/)
-            {
-                // both paths cannot be empty
-                if (!pFirstPart || !pSecondPart)
-                {
-                    return false;
-                }
+            return true;
+        }
 
-                AZ::IO::PathView secondPath(pSecondPart);
-                AZ_Warning("StringFunc", secondPath.IsRelative(), "The second join parameter %s is an absolute path,"
-                    " this will replace the first part of the path resulting in an output of just the second part",
-                    pSecondPart);
-
-                AZ::IO::Path resultPath(pFirstPart, AZ_CORRECT_DATABASE_SEPARATOR);
-                resultPath /= secondPath;
-                out = bNormalize ? AZStd::move(resultPath.LexicallyNormal().Native()) : AZStd::move(resultPath.Native());
-                return true;
-            }
-        } //namespace AssetDatabasePath
-
-        namespace Root
+        bool Split(const char* in, [[maybe_unused]] AZStd::string* pDstProjectRootOut, AZStd::string* pDstDatabaseRootOut,
+            AZStd::string* pDstDatabasePathOut , AZStd::string* pDstFileOut, AZStd::string* pDstFileExtensionOut)
         {
-            bool Normalize(AZStd::string& inout)
+            AZStd::string_view path{ in };
+            if (path.empty())
             {
-                AZ::IO::Path path(AZStd::move(inout));
-                path = path.LexicallyNormal();
-                // After normalization check if the path contains a relative path
-                bool appendTrailingSlash = path.HasRelativePath();
-                inout = AZStd::move(path.Native());
-                if (appendTrailingSlash)
-                {
-                    inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR); // Append a trailing separator for Root path normalization
-                }
-                return IsValid(inout.c_str());
+                return false;
             }
 
-            bool IsValid(const char* in)
+            AZ::IO::PathView pathView(path, AZ_CORRECT_DATABASE_SEPARATOR);
+            if (pDstDatabaseRootOut)
             {
-                if (!in)
+                AZStd::string_view rootNameView = pathView.RootName().Native();
+                if (rootNameView.size() > pDstDatabaseRootOut->max_size())
                 {
                     return false;
                 }
-
-                if (!strlen(in))
+                *pDstDatabaseRootOut = rootNameView;
+            }
+            if (pDstDatabasePathOut)
+            {
+                AZStd::string_view rootPathView = pathView.RootPath().Native();
+                AZStd::string_view relPathParentView = pathView.ParentPath().RelativePath().Native();
+                if (rootPathView.size() + relPathParentView.size() > pDstDatabasePathOut->max_size())
                 {
                     return false;
                 }
-
-                if (Find(in, AZ_FILESYSTEM_INVALID_CHARACTERS) != AZStd::string::npos)
+                // Append the root directory if there is one
+                *pDstDatabasePathOut = rootPathView;
+                // Append the relative path portion of the split path excluding the filename
+                *pDstDatabasePathOut += relPathParentView;
+            }
+            if (pDstFileOut)
+            {
+                AZStd::string_view stemView = pathView.Stem().Native();
+                if (stemView.size() > pDstFileOut->max_size())
                 {
                     return false;
                 }
-
-                if (Find(in, AZ_WRONG_FILESYSTEM_SEPARATOR) != AZStd::string::npos)
+                *pDstFileOut = stemView;
+            }
+            if (pDstFileExtensionOut)
+            {
+                AZStd::string_view extensionView = pathView.Extension().Native();
+                if (extensionView.size() > pDstFileExtensionOut->max_size())
                 {
                     return false;
                 }
+                *pDstFileExtensionOut = extensionView;
+            }
 
-    #ifndef AZ_FILENAME_ALLOW_SPACES
-                if (Find(in, AZ_SPACE_CHARACTERS) != AZStd::string::npos)
-                {
-                    return false;
-                }
-    #endif // AZ_FILENAME_ALLOW_SPACES
+            return true;
+        }
 
-                AZ::IO::PathView pathView(in);
-                if (!pathView.HasRootPath())
-                {
-                    return false;
-                }
+        bool Join(const char* pFirstPart, const char* pSecondPart, AZStd::string& out, [[maybe_unused]] bool bCaseInsensitive /*= true*/, bool bNormalize /*= true*/)
+        {
+            // both paths cannot be empty
+            if (!pFirstPart || !pSecondPart)
+            {
+                return false;
+            }
 
-                if (LastCharacter(in) != AZ_CORRECT_FILESYSTEM_SEPARATOR)
-                {
-                    return false;
-                }
+            AZ::IO::PathView secondPath(pSecondPart);
+            AZ_Warning("StringFunc", secondPath.IsRelative(), "The second join parameter %s is an absolute path,"
+                " this will replace the first part of the path resulting in an output of just the second part",
+                pSecondPart);
 
+            AZ::IO::Path resultPath(pFirstPart, AZ_CORRECT_DATABASE_SEPARATOR);
+            resultPath /= secondPath;
+            out = bNormalize ? AZStd::move(resultPath.LexicallyNormal().Native()) : AZStd::move(resultPath.Native());
+            return true;
+        }
+    } //namespace AssetDatabasePath
+
+    namespace Root
+    {
+        bool Normalize(AZStd::string& inout)
+        {
+            AZ::IO::Path path(AZStd::move(inout));
+            path = path.LexicallyNormal();
+            // After normalization check if the path contains a relative path
+            bool appendTrailingSlash = path.HasRelativePath();
+            inout = AZStd::move(path.Native());
+            if (appendTrailingSlash)
+            {
+                inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR); // Append a trailing separator for Root path normalization
+            }
+            return IsValid(inout.c_str());
+        }
+
+        bool IsValid(const char* in)
+        {
+            if (!in)
+            {
+                return false;
+            }
+
+            if (!strlen(in))
+            {
+                return false;
+            }
+
+            if (Find(in, AZ_FILESYSTEM_INVALID_CHARACTERS) != AZStd::string::npos)
+            {
+                return false;
+            }
+
+            if (Find(in, AZ_WRONG_FILESYSTEM_SEPARATOR) != AZStd::string::npos)
+            {
+                return false;
+            }
+
+#ifndef AZ_FILENAME_ALLOW_SPACES
+            if (Find(in, AZ_SPACE_CHARACTERS) != AZStd::string::npos)
+            {
+                return false;
+            }
+#endif // AZ_FILENAME_ALLOW_SPACES
+
+            AZ::IO::PathView pathView(in);
+            if (!pathView.HasRootPath())
+            {
+                return false;
+            }
+
+            if (LastCharacter(in) != AZ_CORRECT_FILESYSTEM_SEPARATOR)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }//namespace Root
+
+    namespace RelativePath
+    {
+        bool Normalize(AZStd::string& inout)
+        {
+            AZ::IO::Path path(AZStd::move(inout));
+            path = path.LexicallyNormal();
+            // After normalization check if the path contains a relative path
+            bool appendTrailingSlash = path.HasRelativePath();
+            inout = AZStd::move(path.Native());
+            if (appendTrailingSlash)
+            {
+                inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR); // Append trailing separator for Relative path normalization if it it is not empty
+            }
+            return IsValid(inout.c_str());
+        }
+
+        bool IsValid(const char* in)
+        {
+            if (!in)
+            {
+                return false;
+            }
+
+            if (!strlen(in))
+            {
                 return true;
             }
-        }//namespace Root
 
-        namespace RelativePath
+            if (Find(in, AZ_FILESYSTEM_INVALID_CHARACTERS) != AZStd::string::npos)
+            {
+                return false;
+            }
+
+            if (Find(in, AZ_WRONG_FILESYSTEM_SEPARATOR) != AZStd::string::npos)
+            {
+                return false;
+            }
+
+#ifndef AZ_FILENAME_ALLOW_SPACES
+            if (Find(in, AZ_SPACE_CHARACTERS) != AZStd::string::npos)
+            {
+                return false;
+            }
+#endif // AZ_FILENAME_ALLOW_SPACES
+
+            if (Path::HasDrive(in))
+            {
+                return false;
+            }
+
+            if (FirstCharacter(in) == AZ_CORRECT_FILESYSTEM_SEPARATOR)
+            {
+                return false;
+            }
+
+            if (LastCharacter(in) != AZ_CORRECT_FILESYSTEM_SEPARATOR)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }//namespace RelativePath
+
+    namespace Path
+    {
+        bool Normalize(AZStd::string& inout)
         {
-            bool Normalize(AZStd::string& inout)
+            AZ::IO::Path path(AZStd::move(inout));
+            bool appendTrailingSlash = (path.Native().ends_with(AZ_CORRECT_FILESYSTEM_SEPARATOR) || path.Native().ends_with(AZ_WRONG_FILESYSTEM_SEPARATOR));
+            path = path.LexicallyNormal();
+            // After normalization check if the path contains a relative path and addition to ending with a path separator before
+            appendTrailingSlash = appendTrailingSlash && path.HasRelativePath();
+            inout = AZStd::move(path.Native());
+            if (appendTrailingSlash)
             {
-                AZ::IO::Path path(AZStd::move(inout));
-                path = path.LexicallyNormal();
-                // After normalization check if the path contains a relative path
-                bool appendTrailingSlash = path.HasRelativePath();
-                inout = AZStd::move(path.Native());
-                if (appendTrailingSlash)
-                {
-                    inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR); // Append trailing separator for Relative path normalization if it it is not empty
-                }
-                return IsValid(inout.c_str());
+                inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR);
             }
+            return IsValid(inout.c_str());
+        }
 
-            bool IsValid(const char* in)
-            {
-                if (!in)
-                {
-                    return false;
-                }
-
-                if (!strlen(in))
-                {
-                    return true;
-                }
-
-                if (Find(in, AZ_FILESYSTEM_INVALID_CHARACTERS) != AZStd::string::npos)
-                {
-                    return false;
-                }
-
-                if (Find(in, AZ_WRONG_FILESYSTEM_SEPARATOR) != AZStd::string::npos)
-                {
-                    return false;
-                }
-
-    #ifndef AZ_FILENAME_ALLOW_SPACES
-                if (Find(in, AZ_SPACE_CHARACTERS) != AZStd::string::npos)
-                {
-                    return false;
-                }
-    #endif // AZ_FILENAME_ALLOW_SPACES
-
-                if (Path::HasDrive(in))
-                {
-                    return false;
-                }
-
-                if (FirstCharacter(in) == AZ_CORRECT_FILESYSTEM_SEPARATOR)
-                {
-                    return false;
-                }
-
-                if (LastCharacter(in) != AZ_CORRECT_FILESYSTEM_SEPARATOR)
-                {
-                    return false;
-                }
-
-                return true;
-            }
-        }//namespace RelativePath
-
-        namespace Path
+        bool Normalize(FixedString& inout)
         {
-            bool Normalize(AZStd::string& inout)
+            AZ::IO::FixedMaxPath path(AZStd::move(inout));
+            bool appendTrailingSlash = (path.Native().ends_with(AZ_CORRECT_FILESYSTEM_SEPARATOR) || path.Native().ends_with(AZ_WRONG_FILESYSTEM_SEPARATOR));
+            path = path.LexicallyNormal();
+            // After normalization check if the path contains a relative path and addition to ending with a path separator before
+            appendTrailingSlash = appendTrailingSlash && path.HasRelativePath();
+            inout = AZStd::move(path.Native());
+            if (appendTrailingSlash)
             {
-                AZ::IO::Path path(AZStd::move(inout));
-                bool appendTrailingSlash = (path.Native().ends_with(AZ_CORRECT_FILESYSTEM_SEPARATOR) || path.Native().ends_with(AZ_WRONG_FILESYSTEM_SEPARATOR));
-                path = path.LexicallyNormal();
-                // After normalization check if the path contains a relative path and addition to ending with a path separator before
-                appendTrailingSlash = appendTrailingSlash && path.HasRelativePath();
-                inout = AZStd::move(path.Native());
-                if (appendTrailingSlash)
-                {
-                    inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR);
-                }
-                return IsValid(inout.c_str());
+                inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR);
+            }
+            return IsValid(inout.c_str());
+        }
+
+        bool IsValid(const char* in, bool bHasDrive /*= false*/, bool bHasExtension /*= false*/, AZStd::string* errors /*= nullptr*/)
+        {
+            //if they gave us a error reporting string empty it.
+            if (errors)
+            {
+                errors->clear();
             }
 
-            bool Normalize(FixedString& inout)
+            //empty is not a valid path
+            if (!in)
             {
-                AZ::IO::FixedMaxPath path(AZStd::move(inout));
-                bool appendTrailingSlash = (path.Native().ends_with(AZ_CORRECT_FILESYSTEM_SEPARATOR) || path.Native().ends_with(AZ_WRONG_FILESYSTEM_SEPARATOR));
-                path = path.LexicallyNormal();
-                // After normalization check if the path contains a relative path and addition to ending with a path separator before
-                appendTrailingSlash = appendTrailingSlash && path.HasRelativePath();
-                inout = AZStd::move(path.Native());
-                if (appendTrailingSlash)
-                {
-                    inout.push_back(AZ_CORRECT_FILESYSTEM_SEPARATOR);
-                }
-                return IsValid(inout.c_str());
-            }
-
-            bool IsValid(const char* in, bool bHasDrive /*= false*/, bool bHasExtension /*= false*/, AZStd::string* errors /*= nullptr*/)
-            {
-                //if they gave us a error reporting string empty it.
                 if (errors)
                 {
-                    errors->clear();
+                    *errors += "The path is Empty.";
                 }
+                return false;
+            }
 
-                //empty is not a valid path
-                if (!in)
+            //empty is not a valid path
+            size_t length = strlen(in);
+            if (!length)
+            {
+                if (errors)
                 {
-                    if (errors)
-                    {
-                        *errors += "The path is Empty.";
-                    }
-                    return false;
+                    *errors += "The path is Empty.";
                 }
+                return false;
+            }
 
-                //empty is not a valid path
-                size_t length = strlen(in);
-                if (!length)
+            //invalid characters
+            const char* inEnd = in + length;
+            const char* invalidCharactersBegin = AZ_FILESYSTEM_INVALID_CHARACTERS;
+            const char* invalidCharactersEnd = invalidCharactersBegin + AZ_ARRAY_SIZE(AZ_FILESYSTEM_INVALID_CHARACTERS);
+            if (AZStd::find_first_of(in, inEnd, invalidCharactersBegin, invalidCharactersEnd) != inEnd)
+            {
+                if (errors)
                 {
-                    if (errors)
-                    {
-                        *errors += "The path is Empty.";
-                    }
-                    return false;
+                    *errors += "The path has invalid characters.";
                 }
+                return false;
+            }
 
-                //invalid characters
-                const char* inEnd = in + length;
-                const char* invalidCharactersBegin = AZ_FILESYSTEM_INVALID_CHARACTERS;
-                const char* invalidCharactersEnd = invalidCharactersBegin + AZ_ARRAY_SIZE(AZ_FILESYSTEM_INVALID_CHARACTERS);
-                if (AZStd::find_first_of(in, inEnd, invalidCharactersBegin, invalidCharactersEnd) != inEnd)
+            //invalid characters
+            if (Find(in, AZ_WRONG_FILESYSTEM_SEPARATOR) != AZStd::string::npos)
+            {
+                if (errors)
                 {
-                    if (errors)
-                    {
-                        *errors += "The path has invalid characters.";
-                    }
-                    return false;
+                    *errors += "The path has wrong separator.";
                 }
+                return false;
+            }
 
-                //invalid characters
-                if (Find(in, AZ_WRONG_FILESYSTEM_SEPARATOR) != AZStd::string::npos)
+#ifndef AZ_FILENAME_ALLOW_SPACES
+            const char* spaceCharactersBegin = AZ_SPACE_CHARACTERS;
+            const char* spaceCharactersEnd = spaceCharactersBegin + AZ_ARRAY_SIZE(AZ_SPACE_CHARACTERS);
+            if (AZStd::find_first_of(in, inEnd, spaceCharactersBegin, spaceCharactersEnd) != inEnd)
+            {
+                if (errors)
                 {
-                    if (errors)
-                    {
-                        *errors += "The path has wrong separator.";
-                    }
-                    return false;
+                    *errors += "The path has space characters.";
                 }
+                return false;
+            }
+#endif // AZ_FILENAME_ALLOW_SPACES
 
-    #ifndef AZ_FILENAME_ALLOW_SPACES
-                const char* spaceCharactersBegin = AZ_SPACE_CHARACTERS;
-                const char* spaceCharactersEnd = spaceCharactersBegin + AZ_ARRAY_SIZE(AZ_SPACE_CHARACTERS);
-                if (AZStd::find_first_of(in, inEnd, spaceCharactersBegin, spaceCharactersEnd) != inEnd)
+            //does it have a drive if specified
+            if (bHasDrive && !HasDrive(in))
+            {
+                if (errors)
                 {
-                    if (errors)
-                    {
-                        *errors += "The path has space characters.";
-                    }
-                    return false;
+                    *errors += "The path should have a drive. The path [";
+                    *errors += in;
+                    *errors += "] is invalid.";
                 }
-    #endif // AZ_FILENAME_ALLOW_SPACES
+                return false;
+            }
 
-                //does it have a drive if specified
-                if (bHasDrive && !HasDrive(in))
+            //does it have and extension if specified
+            if (bHasExtension && !HasExtension(in))
+            {
+                if (errors)
                 {
-                    if (errors)
-                    {
-                        *errors += "The path should have a drive. The path [";
-                        *errors += in;
-                        *errors += "] is invalid.";
-                    }
-                    return false;
+                    *errors += "The path should have the a file extension. The path [";
+                    *errors += in;
+                    *errors += "] is invalid.";
                 }
+                return false;
+            }
 
-                //does it have and extension if specified
-                if (bHasExtension && !HasExtension(in))
+            //start at the beginning and walk down the characters of the path
+            const char* elementStart = in;
+            const char* walk = elementStart;
+            while (*walk)
+            {
+                if (*walk == AZ_CORRECT_FILESYSTEM_SEPARATOR) //is this the correct separator
                 {
-                    if (errors)
-                    {
-                        *errors += "The path should have the a file extension. The path [";
-                        *errors += in;
-                        *errors += "] is invalid.";
-                    }
-                    return false;
+                    elementStart = walk;
                 }
-
-                //start at the beginning and walk down the characters of the path
-                const char* elementStart = in;
-                const char* walk = elementStart;
-                while (*walk)
+#if AZ_TRAIT_OS_USE_WINDOWS_FILE_PATHS
+                else if (*walk == AZ_FILESYSTEM_DRIVE_SEPARATOR) //is this the drive separator
                 {
-                    if (*walk == AZ_CORRECT_FILESYSTEM_SEPARATOR) //is this the correct separator
-                    {
-                        elementStart = walk;
-                    }
-    #if AZ_TRAIT_OS_USE_WINDOWS_FILE_PATHS
-                    else if (*walk == AZ_FILESYSTEM_DRIVE_SEPARATOR) //is this the drive separator
-                    {
-                        //A AZ_FILESYSTEM_DRIVE_SEPARATOR character con only occur in the first
-                        //component of a valid path. If the elementStart is not GetBufferPtr()
-                        //then we have past the first component
-                        if (elementStart != in)
-                        {
-                            if (errors)
-                            {
-                                *errors += "There is a stray AZ_FILESYSTEM_DRIVE_SEPARATOR = ";
-                                *errors += AZ_FILESYSTEM_DRIVE_SEPARATOR;
-                                *errors += " found after the first component. The path [";
-                                *errors += in;
-                                *errors += "] is invalid.";
-                            }
-                            return false;
-                        }
-                    }
-    #endif
-    #ifndef AZ_FILENAME_ALLOW_SPACES
-                    else if (*walk == ' ') //is this a space
+                    //A AZ_FILESYSTEM_DRIVE_SEPARATOR character con only occur in the first
+                    //component of a valid path. If the elementStart is not GetBufferPtr()
+                    //then we have past the first component
+                    if (elementStart != in)
                     {
                         if (errors)
                         {
-                            *errors += "The component [";
-                            for (const char* c = elementStart + 1; c != walk; ++c)
-                            {
-                                *errors += *c;
-                            }
-                            *errors += "] has a SPACE character. The path [";
+                            *errors += "There is a stray AZ_FILESYSTEM_DRIVE_SEPARATOR = ";
+                            *errors += AZ_FILESYSTEM_DRIVE_SEPARATOR;
+                            *errors += " found after the first component. The path [";
                             *errors += in;
                             *errors += "] is invalid.";
                         }
                         return false;
                     }
-    #endif
-
-                    ++walk;
                 }
-
-    #if !AZ_TRAIT_OS_ALLOW_UNLIMITED_PATH_COMPONENT_LENGTH
-                //is this full path longer than AZ::IO::MaxPathLength (The longest a path with all components can possibly be)?
-                if (walk - in > AZ::IO::MaxPathLength)
+#endif
+#ifndef AZ_FILENAME_ALLOW_SPACES
+                else if (*walk == ' ') //is this a space
                 {
-                    if (errors != 0)
+                    if (errors)
                     {
-                        *errors += "The path [";
+                        *errors += "The component [";
+                        for (const char* c = elementStart + 1; c != walk; ++c)
+                        {
+                            *errors += *c;
+                        }
+                        *errors += "] has a SPACE character. The path [";
                         *errors += in;
-                        *errors += "] is over the AZ::IO::MaxPathLength = ";
-                        char buf[64];
-                        _itoa_s(AZ::IO::MaxPathLength, buf, 10);
-                        *errors += buf;
-                        *errors += " characters total length limit.";
+                        *errors += "] is invalid.";
                     }
                     return false;
                 }
-    #endif
+#endif
 
-                return true;
+                ++walk;
             }
 
-            bool ConstructFull(const char* pRootPath, const char* pFileName, AZStd::string& out, bool bNormalize /* = false*/)
+#if !AZ_TRAIT_OS_ALLOW_UNLIMITED_PATH_COMPONENT_LENGTH
+            //is this full path longer than AZ::IO::MaxPathLength (The longest a path with all components can possibly be)?
+            if (walk - in > AZ::IO::MaxPathLength)
             {
-                if (!pRootPath || AZ::IO::PathView(pRootPath).IsRelative()
-                    || !pFileName || AZ::IO::PathView(pFileName).IsAbsolute())
+                if (errors != 0)
                 {
-                    return false;
-                }
-                AZ::IO::Path path(pRootPath);
-                path /= pFileName;
-                if (bNormalize)
-                {
-                    out = AZStd::move(path.LexicallyNormal().Native());
-                }
-                else
-                {
-                    out = AZStd::move(path.Native());
-                }
-                return IsValid(out.c_str());
-            }
-
-            bool ConstructFull(const char* pRootPath, const char* pFileName, const char* pFileExtension, AZStd::string& out, bool bNormalize /* = false*/)
-            {
-                if (!pRootPath || AZ::IO::PathView(pRootPath).IsRelative()
-                    || !pFileName || AZ::IO::PathView(pFileName).IsAbsolute())
-                {
-                    return false;
-                }
-                AZ::IO::Path path(pRootPath);
-                path /= pFileName;
-                if (pFileExtension)
-                {
-                    path.ReplaceExtension(pFileExtension);
-                }
-                if (bNormalize)
-                {
-                    out = AZStd::move(path.LexicallyNormal().Native());
-                }
-                else
-                {
-                    out = AZStd::move(path.Native());
-                }
-                return IsValid(out.c_str());
-            }
-
-            bool ConstructFull(const char* pRoot, const char* pRelativePath, const char* pFileName, const char* pFileExtension, AZStd::string& out, bool bNormalize /* = false*/)
-            {
-                if (!pRoot  || AZ::IO::PathView(pRoot).IsRelative()
-                    || !pRelativePath || AZ::IO::PathView(pRelativePath).IsAbsolute()
-                    || !pFileName || AZ::IO::PathView(pFileName).IsAbsolute())
-                {
-                    return false;
-                }
-                AZ::IO::Path path(pRoot);
-                path /= pRelativePath;
-                path /= pFileName;
-                if (pFileExtension)
-                {
-                    path.ReplaceExtension(pFileExtension);
-                }
-                if (bNormalize)
-                {
-                    out = AZStd::move(path.LexicallyNormal().Native());
-                }
-                else
-                {
-                    out = AZStd::move(path.Native());
-                }
-                return IsValid(out.c_str());
-            }
-
-            bool Split(const char* in, AZStd::string* pDstDrive, AZStd::string* pDstPath, AZStd::string* pDstName, AZStd::string* pDstExtension)
-            {
-                AZStd::string_view path{ in };
-                if (path.empty())
-                {
-                    return false;
-                }
-
-                AZ::IO::PathView pathView(path);
-                if (pDstDrive)
-                {
-                    AZStd::string_view rootNameView = pathView.RootName().Native();
-                    if (rootNameView.size() > pDstDrive->max_size())
-                    {
-                        return false;
-                    }
-                    *pDstDrive = rootNameView;
-                }
-                if (pDstPath)
-                {
-                    AZStd::string_view rootDirectoryView = pathView.RootDirectory().Native();
-                    AZStd::string_view relPathParentView = pathView.ParentPath().RelativePath().Native();
-                    if (rootDirectoryView.size() + relPathParentView.size() > pDstPath->max_size())
-                    {
-                        return false;
-                    }
-                    // Append the root directory if there is one
-                    *pDstPath = rootDirectoryView;
-                    // Append the relative path portion of the split path excluding the filename
-                    *pDstPath += relPathParentView;
-                }
-                if (pDstName)
-                {
-                    AZStd::string_view stemView = pathView.Stem().Native();
-                    if (stemView.size() > pDstName->max_size())
-                    {
-                        return false;
-                    }
-                    *pDstName = stemView;
-                }
-                if (pDstExtension)
-                {
-                    AZStd::string_view extensionView = pathView.Extension().Native();
-                    if (extensionView.size() > pDstExtension->max_size())
-                    {
-                        return false;
-                    }
-                    *pDstExtension = extensionView;
-                }
-
-                return true;
-            }
-
-            bool Join(const char* pFirstPart, const char* pSecondPart, AZStd::string& out, [[maybe_unused]] bool bCaseInsensitive, bool bNormalize)
-            {
-                if (!pFirstPart || !pSecondPart)
-                {
-                    return false;
-                }
-
-                AZ::IO::PathView secondPath(pSecondPart);
-                AZ_Warning("StringFunc", secondPath.IsRelative(), "The second join parameter %s is an absolute path,"
-                    " this will replace the first part of the path resulting in an output of just the second part",
-                    pSecondPart);
-
-                AZ::IO::Path resultPath(pFirstPart);
-                resultPath /= secondPath;
-                out = bNormalize ? AZStd::move(resultPath.LexicallyNormal().Native()) : AZStd::move(resultPath.Native());
-                return true;
-            }
-
-            bool Join(const char* pFirstPart, const char* pSecondPart, FixedString& out, [[maybe_unused]] bool bCaseInsensitive, bool bNormalize)
-            {
-                if (!pFirstPart || !pSecondPart)
-                {
-                    return false;
-                }
-
-                AZ::IO::PathView secondPath(pSecondPart);
-                AZ_Warning("StringFunc", secondPath.IsRelative(), "The second join parameter %s is an absolute path,"
-                    " this will replace the first part of the path resulting in an output of just the second part",
-                    pSecondPart);
-
-                AZ::IO::FixedMaxPath resultPath(pFirstPart);
-                resultPath /= secondPath;
-                out = bNormalize ? AZStd::move(resultPath.LexicallyNormal().Native()) : AZStd::move(resultPath.Native());
-                return true;
-            }
-
-            bool HasDrive(const char* in, bool bCheckAllFileSystemFormats /*= false*/)
-            {
-                // no drive if empty
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
-                AZ::IO::PathView pathView(in);
-                return pathView.HasRootName() || (bCheckAllFileSystemFormats && pathView.HasRootDirectory());
-            }
-
-            bool HasExtension(const char* in)
-            {
-                //it doesn't have an extension if it's empty
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
-
-                return AZ::IO::PathView(in).HasExtension();
-            }
-
-            bool IsExtension(const char* in, const char* pExtension, bool bCaseInsenitive /*= false*/)
-            {
-                //it doesn't have an extension if it's empty
-                if (!in || in[0] == '\0' || !pExtension || pExtension[0] == '\0')
-                {
-                    return false;
-                }
-
-                AZStd::string_view pathExtension = AZ::IO::PathView(in).Extension().Native();
-                if (pathExtension.starts_with(AZ_FILESYSTEM_EXTENSION_SEPARATOR))
-                {
-                    pathExtension.remove_prefix(1);
-                }
-                AZStd::string_view extensionView(pExtension);
-                if (extensionView.starts_with(AZ_FILESYSTEM_EXTENSION_SEPARATOR))
-                {
-                    extensionView.remove_prefix(1);
-                }
-
-                return AZStd::equal(pathExtension.begin(), pathExtension.end(), extensionView.begin(), extensionView.end(),
-                    [bCaseInsenitive](const char lhs, const char rhs)
-                {
-                    return !bCaseInsenitive ? lhs == rhs : tolower(lhs) == tolower(rhs);
-                });
-            }
-
-            bool IsRelative(const char* in)
-            {
-                //not relative if empty
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
-
-                return AZ::IO::PathView(in).IsRelative();
-            }
-
-            bool StripDrive(AZStd::string& inout)
-            {
-                AZ::IO::PathView pathView(inout);
-                AZ::IO::PathView rootNameView(pathView.RootName());
-                if (!rootNameView.empty())
-                {
-                    inout.replace(0, rootNameView.Native().size(), "");
-                    return true;
+                    *errors += "The path [";
+                    *errors += in;
+                    *errors += "] is over the AZ::IO::MaxPathLength = ";
+                    char buf[64];
+                    _itoa_s(AZ::IO::MaxPathLength, buf, 10);
+                    *errors += buf;
+                    *errors += " characters total length limit.";
                 }
                 return false;
             }
+#endif
 
-            void StripPath(AZStd::string& inout)
+            return true;
+        }
+
+        bool ConstructFull(const char* pRootPath, const char* pFileName, AZStd::string& out, bool bNormalize /* = false*/)
+        {
+            if (!pRootPath || AZ::IO::PathView(pRootPath).IsRelative()
+                || !pFileName || AZ::IO::PathView(pFileName).IsAbsolute())
             {
-                inout = AZ::IO::PathView(inout).Filename().Native();
+                return false;
+            }
+            AZ::IO::Path path(pRootPath);
+            path /= pFileName;
+            if (bNormalize)
+            {
+                out = AZStd::move(path.LexicallyNormal().Native());
+            }
+            else
+            {
+                out = AZStd::move(path.Native());
+            }
+            return IsValid(out.c_str());
+        }
+
+        bool ConstructFull(const char* pRootPath, const char* pFileName, const char* pFileExtension, AZStd::string& out, bool bNormalize /* = false*/)
+        {
+            if (!pRootPath || AZ::IO::PathView(pRootPath).IsRelative()
+                || !pFileName || AZ::IO::PathView(pFileName).IsAbsolute())
+            {
+                return false;
+            }
+            AZ::IO::Path path(pRootPath);
+            path /= pFileName;
+            if (pFileExtension)
+            {
+                path.ReplaceExtension(pFileExtension);
+            }
+            if (bNormalize)
+            {
+                out = AZStd::move(path.LexicallyNormal().Native());
+            }
+            else
+            {
+                out = AZStd::move(path.Native());
+            }
+            return IsValid(out.c_str());
+        }
+
+        bool ConstructFull(const char* pRoot, const char* pRelativePath, const char* pFileName, const char* pFileExtension, AZStd::string& out, bool bNormalize /* = false*/)
+        {
+            if (!pRoot  || AZ::IO::PathView(pRoot).IsRelative()
+                || !pRelativePath || AZ::IO::PathView(pRelativePath).IsAbsolute()
+                || !pFileName || AZ::IO::PathView(pFileName).IsAbsolute())
+            {
+                return false;
+            }
+            AZ::IO::Path path(pRoot);
+            path /= pRelativePath;
+            path /= pFileName;
+            if (pFileExtension)
+            {
+                path.ReplaceExtension(pFileExtension);
+            }
+            if (bNormalize)
+            {
+                out = AZStd::move(path.LexicallyNormal().Native());
+            }
+            else
+            {
+                out = AZStd::move(path.Native());
+            }
+            return IsValid(out.c_str());
+        }
+
+        bool Split(const char* in, AZStd::string* pDstDrive, AZStd::string* pDstPath, AZStd::string* pDstName, AZStd::string* pDstExtension)
+        {
+            AZStd::string_view path{ in };
+            if (path.empty())
+            {
+                return false;
             }
 
-            void StripFullName(AZStd::string& inout)
+            AZ::IO::PathView pathView(path);
+            if (pDstDrive)
             {
-                inout = AZ::IO::Path(AZStd::move(inout)).RemoveFilename().Native();
-            }
-
-            void StripExtension(AZStd::string& inout)
-            {
-                AZ::IO::Path path(AZStd::move(inout));
-                path.ReplaceExtension();
-                inout = AZStd::move(path.Native());
-            }
-
-            bool StripComponent(AZStd::string& inout, bool bLastComponent /* = false*/)
-            {
-                AZ::IO::PathView pathView(inout);
-                auto pathBeginIter = pathView.begin();
-                auto pathEndIter = pathView.end();
-                if (pathBeginIter == pathEndIter)
+                AZStd::string_view rootNameView = pathView.RootName().Native();
+                if (rootNameView.size() > pDstDrive->max_size())
                 {
                     return false;
                 }
-                AZ::IO::Path resultPath;
-                if (!bLastComponent)
-                {
-                    // Removing leading path component
-                    AZStd::advance(pathBeginIter, 1);
-                }
-                else
-                {
-                    // Remove trailing path component
-                    AZStd::advance(pathEndIter, -1);
-                }
-                for (; pathBeginIter != pathEndIter; ++pathBeginIter)
-                {
-                    resultPath /= *pathBeginIter;
-                }
-                if (resultPath.empty())
+                *pDstDrive = rootNameView;
+            }
+            if (pDstPath)
+            {
+                AZStd::string_view rootDirectoryView = pathView.RootDirectory().Native();
+                AZStd::string_view relPathParentView = pathView.ParentPath().RelativePath().Native();
+                if (rootDirectoryView.size() + relPathParentView.size() > pDstPath->max_size())
                 {
                     return false;
                 }
-                inout = AZStd::move(resultPath.Native());
+                // Append the root directory if there is one
+                *pDstPath = rootDirectoryView;
+                // Append the relative path portion of the split path excluding the filename
+                *pDstPath += relPathParentView;
+            }
+            if (pDstName)
+            {
+                AZStd::string_view stemView = pathView.Stem().Native();
+                if (stemView.size() > pDstName->max_size())
+                {
+                    return false;
+                }
+                *pDstName = stemView;
+            }
+            if (pDstExtension)
+            {
+                AZStd::string_view extensionView = pathView.Extension().Native();
+                if (extensionView.size() > pDstExtension->max_size())
+                {
+                    return false;
+                }
+                *pDstExtension = extensionView;
+            }
+
+            return true;
+        }
+
+        bool Join(const char* pFirstPart, const char* pSecondPart, AZStd::string& out, [[maybe_unused]] bool bCaseInsensitive, bool bNormalize)
+        {
+            if (!pFirstPart || !pSecondPart)
+            {
+                return false;
+            }
+
+            AZ::IO::PathView secondPath(pSecondPart);
+            AZ_Warning("StringFunc", secondPath.IsRelative(), "The second join parameter %s is an absolute path,"
+                " this will replace the first part of the path resulting in an output of just the second part",
+                pSecondPart);
+
+            AZ::IO::Path resultPath(pFirstPart);
+            resultPath /= secondPath;
+            out = bNormalize ? AZStd::move(resultPath.LexicallyNormal().Native()) : AZStd::move(resultPath.Native());
+            return true;
+        }
+
+        bool Join(const char* pFirstPart, const char* pSecondPart, FixedString& out, [[maybe_unused]] bool bCaseInsensitive, bool bNormalize)
+        {
+            if (!pFirstPart || !pSecondPart)
+            {
+                return false;
+            }
+
+            AZ::IO::PathView secondPath(pSecondPart);
+            AZ_Warning("StringFunc", secondPath.IsRelative(), "The second join parameter %s is an absolute path,"
+                " this will replace the first part of the path resulting in an output of just the second part",
+                pSecondPart);
+
+            AZ::IO::FixedMaxPath resultPath(pFirstPart);
+            resultPath /= secondPath;
+            out = bNormalize ? AZStd::move(resultPath.LexicallyNormal().Native()) : AZStd::move(resultPath.Native());
+            return true;
+        }
+
+        bool HasDrive(const char* in, bool bCheckAllFileSystemFormats /*= false*/)
+        {
+            // no drive if empty
+            if (!in || in[0] == '\0')
+            {
+                return false;
+            }
+            AZ::IO::PathView pathView(in);
+            return pathView.HasRootName() || (bCheckAllFileSystemFormats && pathView.HasRootDirectory());
+        }
+
+        bool HasExtension(const char* in)
+        {
+            //it doesn't have an extension if it's empty
+            if (!in || in[0] == '\0')
+            {
+                return false;
+            }
+
+            return AZ::IO::PathView(in).HasExtension();
+        }
+
+        bool IsExtension(const char* in, const char* pExtension, bool bCaseInsenitive /*= false*/)
+        {
+            //it doesn't have an extension if it's empty
+            if (!in || in[0] == '\0' || !pExtension || pExtension[0] == '\0')
+            {
+                return false;
+            }
+
+            AZStd::string_view pathExtension = AZ::IO::PathView(in).Extension().Native();
+            if (pathExtension.starts_with(AZ_FILESYSTEM_EXTENSION_SEPARATOR))
+            {
+                pathExtension.remove_prefix(1);
+            }
+            AZStd::string_view extensionView(pExtension);
+            if (extensionView.starts_with(AZ_FILESYSTEM_EXTENSION_SEPARATOR))
+            {
+                extensionView.remove_prefix(1);
+            }
+
+            return AZStd::equal(pathExtension.begin(), pathExtension.end(), extensionView.begin(), extensionView.end(),
+                [bCaseInsenitive](const char lhs, const char rhs)
+            {
+                return !bCaseInsenitive ? lhs == rhs : tolower(lhs) == tolower(rhs);
+            });
+        }
+
+        bool IsRelative(const char* in)
+        {
+            //not relative if empty
+            if (!in || in[0] == '\0')
+            {
+                return false;
+            }
+
+            return AZ::IO::PathView(in).IsRelative();
+        }
+
+        bool StripDrive(AZStd::string& inout)
+        {
+            AZ::IO::PathView pathView(inout);
+            AZ::IO::PathView rootNameView(pathView.RootName());
+            if (!rootNameView.empty())
+            {
+                inout.replace(0, rootNameView.Native().size(), "");
                 return true;
             }
+            return false;
+        }
 
-            bool GetDrive(const char* in, AZStd::string& out)
+        void StripPath(AZStd::string& inout)
+        {
+            inout = AZ::IO::PathView(inout).Filename().Native();
+        }
+
+        void StripFullName(AZStd::string& inout)
+        {
+            inout = AZ::IO::Path(AZStd::move(inout)).RemoveFilename().Native();
+        }
+
+        void StripExtension(AZStd::string& inout)
+        {
+            AZ::IO::Path path(AZStd::move(inout));
+            path.ReplaceExtension();
+            inout = AZStd::move(path.Native());
+        }
+
+        bool StripComponent(AZStd::string& inout, bool bLastComponent /* = false*/)
+        {
+            AZ::IO::PathView pathView(inout);
+            auto pathBeginIter = pathView.begin();
+            auto pathEndIter = pathView.end();
+            if (pathBeginIter == pathEndIter)
             {
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
+                return false;
+            }
+            AZ::IO::Path resultPath;
+            if (!bLastComponent)
+            {
+                // Removing leading path component
+                AZStd::advance(pathBeginIter, 1);
+            }
+            else
+            {
+                // Remove trailing path component
+                AZStd::advance(pathEndIter, -1);
+            }
+            for (; pathBeginIter != pathEndIter; ++pathBeginIter)
+            {
+                resultPath /= *pathBeginIter;
+            }
+            if (resultPath.empty())
+            {
+                return false;
+            }
+            inout = AZStd::move(resultPath.Native());
+            return true;
+        }
 
-                out = AZ::IO::PathView(in).RootName().Native();
+        bool GetDrive(const char* in, AZStd::string& out)
+        {
+            if (!in || in[0] == '\0')
+            {
+                return false;
+            }
+
+            out = AZ::IO::PathView(in).RootName().Native();
+            return !out.empty();
+        }
+
+        AZStd::optional<AZStd::string_view> GetParentDir(AZStd::string_view path)
+        {
+            if (path.empty())
+            {
+                return {};
+            }
+
+            AZStd::string_view parentDir = AZ::IO::PathView(path).ParentPath().Native();
+            return !parentDir.empty() ? AZStd::make_optional<AZStd::string_view>(parentDir) : AZStd::nullopt;
+        }
+
+        bool GetFullPath(const char* in, AZStd::string& out)
+        {
+            if (!in || in[0] == '\0')
+            {
+                return false;
+            }
+
+            out = AZ::IO::PathView(in).ParentPath().Native();
+            return !out.empty();
+        }
+
+        bool GetFolderPath(const char* in, AZStd::string& out)
+        {
+            return GetFullPath(in, out);
+        }
+
+        bool GetFolder(const char* in, AZStd::string& out, bool bFirst /* = false*/)
+        {
+            if (!in || in[0] == '\0')
+            {
+                return false;
+            }
+
+            if (!bFirst)
+            {
+                out = AZ::IO::PathView(in).ParentPath().Filename().Native();
                 return !out.empty();
             }
-
-            AZStd::optional<AZStd::string_view> GetParentDir(AZStd::string_view path)
+            else
             {
-                if (path.empty())
-                {
-                    return {};
-                }
-
-                AZStd::string_view parentDir = AZ::IO::PathView(path).ParentPath().Native();
-                return !parentDir.empty() ? AZStd::make_optional<AZStd::string_view>(parentDir) : AZStd::nullopt;
-            }
-
-            bool GetFullPath(const char* in, AZStd::string& out)
-            {
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
-
-                out = AZ::IO::PathView(in).ParentPath().Native();
+                AZStd::string_view relativePath = AZ::IO::PathView(in).RelativePath().Native();
+                size_t nextSeparator = relativePath.find_first_of(AZ_CORRECT_FILESYSTEM_SEPARATOR);
+                out = nextSeparator != AZStd::string_view::npos ? relativePath.substr(0, nextSeparator) : relativePath;
                 return !out.empty();
             }
+        }
 
-            bool GetFolderPath(const char* in, AZStd::string& out)
+        bool GetFullFileName(const char* in, AZStd::string& out)
+        {
+            if (!in || in[0] == '\0')
             {
-                return GetFullPath(in, out);
+                return false;
             }
 
-            bool GetFolder(const char* in, AZStd::string& out, bool bFirst /* = false*/)
-            {
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
+            out = AZ::IO::PathView(in).Filename().Native();
+            return !out.empty();
+        }
 
-                if (!bFirst)
-                {
-                    out = AZ::IO::PathView(in).ParentPath().Filename().Native();
-                    return !out.empty();
-                }
-                else
-                {
-                    AZStd::string_view relativePath = AZ::IO::PathView(in).RelativePath().Native();
-                    size_t nextSeparator = relativePath.find_first_of(AZ_CORRECT_FILESYSTEM_SEPARATOR);
-                    out = nextSeparator != AZStd::string_view::npos ? relativePath.substr(0, nextSeparator) : relativePath;
-                    return !out.empty();
-                }
+        bool GetFileName(const char* in, AZStd::string& out)
+        {
+            if (!in || in[0] == '\0')
+            {
+                return false;
             }
 
-            bool GetFullFileName(const char* in, AZStd::string& out)
-            {
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
+            out = AZ::IO::PathView(in).Stem().Native();
+            return !out.empty();
+        }
 
-                out = AZ::IO::PathView(in).Filename().Native();
-                return !out.empty();
+        bool GetExtension(const char* in, AZStd::string& out, bool includeDot)
+        {
+            if (!in || in[0] == '\0')
+            {
+                return false;
             }
 
-            bool GetFileName(const char* in, AZStd::string& out)
+            AZStd::string_view extensionView = AZ::IO::PathView(in).Extension().Native();
+            // PathView returns extensions with the <dot> character, so remove the <dot>
+            // if it is not included
+            if (!includeDot && extensionView.starts_with(AZ_FILESYSTEM_EXTENSION_SEPARATOR))
             {
-                if (!in || in[0] == '\0')
+                extensionView.remove_prefix(1);
+            }
+            out = extensionView;
+            return !out.empty();
+        }
+
+        void ReplaceFullName(AZStd::string& inout, const char* pFileName /* = nullptr*/, const char* pFileExtension /* = nullptr*/)
+        {
+            //strip the full file name if it has one
+            AZ::IO::Path path(AZStd::move(inout));
+            path.RemoveFilename();
+            if (pFileName)
+            {
+                path /= pFileName;
+            }
+            if (pFileExtension)
+            {
+                path.ReplaceExtension(pFileExtension);
+            }
+            inout = AZStd::move(path.Native());
+        }
+
+        void ReplaceExtension(AZStd::string& inout, const char* newExtension /* = nullptr*/)
+        {
+            //treat this as a strip
+            if (!newExtension || newExtension[0] == '\0')
+            {
+                return;
+            }
+            AZ::IO::Path path(AZStd::move(inout));
+            path.ReplaceExtension(newExtension);
+            inout = AZStd::move(path.Native());
+        }
+
+        AZStd::string& AppendSeparator(AZStd::string& inout)
+        {
+            if (inout.ends_with(AZ_WRONG_FILESYSTEM_SEPARATOR))
+            {
+                inout.replace(inout.end() - 1, inout.end(), 1, AZ_CORRECT_FILESYSTEM_SEPARATOR);
+            }
+            else if (!inout.ends_with(AZ_CORRECT_FILESYSTEM_SEPARATOR))
+            {
+                inout.append(1, AZ_CORRECT_FILESYSTEM_SEPARATOR);
+            }
+            return inout;
+        }
+    } // namespace Path
+
+    namespace Json
+    {
+        /*
+        According to http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf:
+        A string is a sequence of Unicode code points wrapped with quotation marks (U+0022). All characters may be
+        placed within the quotation marks except for the characters that must be escaped: quotation mark (U+0022),
+        reverse solidus (U+005C), and the control characters U+0000 to U+001F.
+        */
+        AZStd::string& ToEscapedString(AZStd::string& inout)
+        {
+            size_t strSize = inout.size();
+
+            for (size_t i = 0; i < strSize; ++i)
+            {
+                char character = inout[i];
+
+                // defaults to 1 if it hits any cases except default
+                size_t jumpChar = 1;
+                switch (character)
                 {
-                    return false;
+                case '"':
+                    inout.insert(i, "\\");
+                    break;
+
+                case '\\':
+                    inout.insert(i, "\\");
+                    break;
+
+                case '/':
+                    inout.insert(i, "\\");
+                    break;
+
+                case '\b':
+                    inout.replace(i, i + 1, "\\b");
+                    break;
+
+                case '\f':
+                    inout.replace(i, i + 1, "\\f");
+                    break;
+
+                case '\n':
+                    inout.replace(i, i + 1, "\\n");
+                    break;
+
+                case '\r':
+                    inout.replace(i, i + 1, "\\r");
+                    break;
+
+                case '\t':
+                    inout.replace(i, i + 1, "\\t");
+                    break;
+
+                default:
+                    /*
+                    Control characters U+0000 to U+001F may be represented as a six - character sequence : a reverse solidus,
+                    followed by the lowercase letter u, followed by four hexadecimal digits that encode the code point.
+                    */
+                    if (character >= '\x0000' && character <= '\x001f')
+                    {
+                        // jumping "\uXXXX" characters
+                        jumpChar = 6;
+
+                        AZStd::string hexStr = AZStd::string::format("\\u%04x", static_cast<int>(character));
+                        inout.replace(i, i + 1, hexStr);
+                    }
+                    else
+                    {
+                        jumpChar = 0;
+                    }
                 }
 
-                out = AZ::IO::PathView(in).Stem().Native();
-                return !out.empty();
+                i += jumpChar;
+                strSize += jumpChar;
             }
 
-            bool GetExtension(const char* in, AZStd::string& out, bool includeDot)
-            {
-                if (!in || in[0] == '\0')
-                {
-                    return false;
-                }
+            return inout;
+        }
+    } // namespace Json
 
-                AZStd::string_view extensionView = AZ::IO::PathView(in).Extension().Native();
-                // PathView returns extensions with the <dot> character, so remove the <dot>
-                // if it is not included
-                if (!includeDot && extensionView.starts_with(AZ_FILESYSTEM_EXTENSION_SEPARATOR))
-                {
-                    extensionView.remove_prefix(1);
-                }
-                out = extensionView;
-                return !out.empty();
-            }
+    namespace Base64
+    {
+        static const char base64pad = '=';
 
-            void ReplaceFullName(AZStd::string& inout, const char* pFileName /* = nullptr*/, const char* pFileExtension /* = nullptr*/)
-            {
-                //strip the full file name if it has one
-                AZ::IO::Path path(AZStd::move(inout));
-                path.RemoveFilename();
-                if (pFileName)
-                {
-                    path /= pFileName;
-                }
-                if (pFileExtension)
-                {
-                    path.ReplaceExtension(pFileExtension);
-                }
-                inout = AZStd::move(path.Native());
-            }
+        static const char c_base64Table[] =
+        {
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            "abcdefghijklmnopqrstuvwxyz"
+            "0123456789+/"
+        };
 
-            void ReplaceExtension(AZStd::string& inout, const char* newExtension /* = nullptr*/)
-            {
-                //treat this as a strip
-                if (!newExtension || newExtension[0] == '\0')
-                {
-                    return;
-                }
-                AZ::IO::Path path(AZStd::move(inout));
-                path.ReplaceExtension(newExtension);
-                inout = AZStd::move(path.Native());
-            }
+        static const AZ::u8 c_inverseBase64Table[] =
+        {
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
+            0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+            0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+            0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
 
-            AZStd::string& AppendSeparator(AZStd::string& inout)
-            {
-                if (inout.ends_with(AZ_WRONG_FILESYSTEM_SEPARATOR))
-                {
-                    inout.replace(inout.end() - 1, inout.end(), 1, AZ_CORRECT_FILESYSTEM_SEPARATOR);
-                }
-                else if (!inout.ends_with(AZ_CORRECT_FILESYSTEM_SEPARATOR))
-                {
-                    inout.append(1, AZ_CORRECT_FILESYSTEM_SEPARATOR);
-                }
-                return inout;
-            }
-        } // namespace Path
+        bool IsValidEncodedChar(const char encodedChar)
+        {
+            return c_inverseBase64Table[static_cast<size_t>(encodedChar)] != 0xff;
+        }
 
-        namespace Json
+        AZStd::string Encode(const AZ::u8* in, const size_t size)
         {
             /*
-            According to http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf:
-            A string is a sequence of Unicode code points wrapped with quotation marks (U+0022). All characters may be
-            placed within the quotation marks except for the characters that must be escaped: quotation mark (U+0022),
-            reverse solidus (U+005C), and the control characters U+0000 to U+001F.
+            figure retrieved from the Base encoding rfc https://tools.ietf.org/html/rfc4648
+            +--first octet--+-second octet--+--third octet--+
+            |7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|
+            +-----------+---+-------+-------+---+-----------+
+            |5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|
+            +--1.index--+--2.index--+--3.index--+--4.index--+
             */
-            AZStd::string& ToEscapedString(AZStd::string& inout)
+            AZStd::string result;
+
+            const size_t remainder = size % 3;
+            const size_t alignEndSize = size - remainder;
+            const AZ::u8* encodeBuf = in;
+            size_t encodeIndex = 0;
+            for (; encodeIndex < alignEndSize; encodeIndex += 3)
             {
-                size_t strSize = inout.size();
-
-                for (size_t i = 0; i < strSize; ++i)
-                {
-                    char character = inout[i];
-
-                    // defaults to 1 if it hits any cases except default
-                    size_t jumpChar = 1;
-                    switch (character)
-                    {
-                    case '"':
-                        inout.insert(i, "\\");
-                        break;
-
-                    case '\\':
-                        inout.insert(i, "\\");
-                        break;
-
-                    case '/':
-                        inout.insert(i, "\\");
-                        break;
-
-                    case '\b':
-                        inout.replace(i, i + 1, "\\b");
-                        break;
-
-                    case '\f':
-                        inout.replace(i, i + 1, "\\f");
-                        break;
-
-                    case '\n':
-                        inout.replace(i, i + 1, "\\n");
-                        break;
-
-                    case '\r':
-                        inout.replace(i, i + 1, "\\r");
-                        break;
-
-                    case '\t':
-                        inout.replace(i, i + 1, "\\t");
-                        break;
-
-                    default:
-                        /*
-                        Control characters U+0000 to U+001F may be represented as a six - character sequence : a reverse solidus,
-                        followed by the lowercase letter u, followed by four hexadecimal digits that encode the code point.
-                        */
-                        if (character >= '\x0000' && character <= '\x001f')
-                        {
-                            // jumping "\uXXXX" characters
-                            jumpChar = 6;
-
-                            AZStd::string hexStr = AZStd::string::format("\\u%04x", static_cast<int>(character));
-                            inout.replace(i, i + 1, hexStr);
-                        }
-                        else
-                        {
-                            jumpChar = 0;
-                        }
-                    }
-
-                    i += jumpChar;
-                    strSize += jumpChar;
-                }
-
-                return inout;
-            }
-        } // namespace Json
-
-        namespace Base64
-        {
-            static const char base64pad = '=';
-
-            static const char c_base64Table[] =
-            {
-                "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                "abcdefghijklmnopqrstuvwxyz"
-                "0123456789+/"
-            };
-
-            static const AZ::u8 c_inverseBase64Table[] =
-            {
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
-                0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-                0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-                0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            };
-
-            bool IsValidEncodedChar(const char encodedChar)
-            {
-                return c_inverseBase64Table[static_cast<size_t>(encodedChar)] != 0xff;
-            }
-
-            AZStd::string Encode(const AZ::u8* in, const size_t size)
-            {
-                /*
-                figure retrieved from the Base encoding rfc https://tools.ietf.org/html/rfc4648
-                +--first octet--+-second octet--+--third octet--+
-                |7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|
-                +-----------+---+-------+-------+---+-----------+
-                |5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|
-                +--1.index--+--2.index--+--3.index--+--4.index--+
-                */
-                AZStd::string result;
-
-                const size_t remainder = size % 3;
-                const size_t alignEndSize = size - remainder;
-                const AZ::u8* encodeBuf = in;
-                size_t encodeIndex = 0;
-                for (; encodeIndex < alignEndSize; encodeIndex += 3)
-                {
-                    encodeBuf = &in[encodeIndex];
-
-                    result.push_back(c_base64Table[(encodeBuf[0] & 0xfc) >> 2]);
-                    result.push_back(c_base64Table[((encodeBuf[0] & 0x03) << 4) | ((encodeBuf[1] & 0xf0) >> 4)]);
-                    result.push_back(c_base64Table[((encodeBuf[1] & 0x0f) << 2) | ((encodeBuf[2] & 0xc0) >> 6)]);
-                    result.push_back(c_base64Table[encodeBuf[2] & 0x3f]);
-                }
-
                 encodeBuf = &in[encodeIndex];
-                if (remainder == 2)
-                {
-                    result.push_back(c_base64Table[(encodeBuf[0] & 0xfc) >> 2]);
-                    result.push_back(c_base64Table[((encodeBuf[0] & 0x03) << 4) | ((encodeBuf[1] & 0xf0) >> 4)]);
-                    result.push_back(c_base64Table[((encodeBuf[1] & 0x0f) << 2)]);
-                    result.push_back(base64pad);
-                }
-                else if (remainder == 1)
-                {
-                    result.push_back(c_base64Table[(encodeBuf[0] & 0xfc) >> 2]);
-                    result.push_back(c_base64Table[(encodeBuf[0] & 0x03) << 4]);
-                    result.push_back(base64pad);
-                    result.push_back(base64pad);
-                }
 
-                return result;
+                result.push_back(c_base64Table[(encodeBuf[0] & 0xfc) >> 2]);
+                result.push_back(c_base64Table[((encodeBuf[0] & 0x03) << 4) | ((encodeBuf[1] & 0xf0) >> 4)]);
+                result.push_back(c_base64Table[((encodeBuf[1] & 0x0f) << 2) | ((encodeBuf[2] & 0xc0) >> 6)]);
+                result.push_back(c_base64Table[encodeBuf[2] & 0x3f]);
             }
 
-            bool Decode(AZStd::vector<AZ::u8>& out, const char* in, const size_t size)
+            encodeBuf = &in[encodeIndex];
+            if (remainder == 2)
             {
-                if (size % 4 != 0)
-                {
-                    AZ_Warning("StringFunc", size % 4 == 0, "Base 64 encoded data length must be multiple of 4");
-                    return false;
-                }
-
-                AZStd::vector<AZ::u8> result;
-                result.reserve(size * 3 / 4);
-                const char* decodeBuf = in;
-                size_t decodeIndex = 0;
-                for (; decodeIndex < size; decodeIndex += 4)
-                {
-                    decodeBuf = &in[decodeIndex];
-                    //Check if each character is a valid Base64 encoded character 
-                    {
-                        // First Octet
-                        if (!IsValidEncodedChar(decodeBuf[0]))
-                        {
-                            AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[0]));
-                            return false;
-                        }
-                        if (!IsValidEncodedChar(decodeBuf[1]))
-                        {
-                            AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[1]));
-                            return false;
-                        }
-
-                        result.push_back((c_inverseBase64Table[static_cast<size_t>(decodeBuf[0])] << 2) | ((c_inverseBase64Table[static_cast<size_t>(decodeBuf[1])] & 0x30) >> 4));
-                    }
-
-                    {
-                        // Second Octet
-                        if (decodeBuf[2] == base64pad)
-                        {
-                            break;
-                        }
-
-                        if (!IsValidEncodedChar(decodeBuf[2]))
-                        {
-                            AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[2]));
-                            return false;
-                        }
-
-                        result.push_back(((c_inverseBase64Table[static_cast<size_t>(decodeBuf[1])] & 0x0f) << 4) | ((c_inverseBase64Table[static_cast<size_t>(decodeBuf[2])] & 0x3c) >> 2));
-                    }
-
-                    {
-                        // Third Octet
-                        if (decodeBuf[3] == base64pad)
-                        {
-                            break;
-                        }
-
-                        if (!IsValidEncodedChar(decodeBuf[3]))
-                        {
-                            AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[3]));
-                            return false;
-                        }
-
-                        result.push_back(((c_inverseBase64Table[static_cast<size_t>(decodeBuf[2])] & 0x03) << 6) | (c_inverseBase64Table[static_cast<size_t>(decodeBuf[3])] & 0x3f));
-                    }
-                }
-
-                out = AZStd::move(result);
-                return true;
+                result.push_back(c_base64Table[(encodeBuf[0] & 0xfc) >> 2]);
+                result.push_back(c_base64Table[((encodeBuf[0] & 0x03) << 4) | ((encodeBuf[1] & 0xf0) >> 4)]);
+                result.push_back(c_base64Table[((encodeBuf[1] & 0x0f) << 2)]);
+                result.push_back(base64pad);
             }
+            else if (remainder == 1)
+            {
+                result.push_back(c_base64Table[(encodeBuf[0] & 0xfc) >> 2]);
+                result.push_back(c_base64Table[(encodeBuf[0] & 0x03) << 4]);
+                result.push_back(base64pad);
+                result.push_back(base64pad);
+            }
+
+            return result;
         }
 
-        namespace Utf8
+        bool Decode(AZStd::vector<AZ::u8>& out, const char* in, const size_t size)
         {
-            bool CheckNonAsciiChar(const AZStd::string& in)
+            if (size % 4 != 0)
             {
-                for (int i = 0; i < in.length(); ++i)
-                {
-                    char byte = in[i];
-                    if (byte & 0x80)
-                    {
-                        return true;
-                    }
-                }
+                AZ_Warning("StringFunc", size % 4 == 0, "Base 64 encoded data length must be multiple of 4");
                 return false;
             }
+
+            AZStd::vector<AZ::u8> result;
+            result.reserve(size * 3 / 4);
+            const char* decodeBuf = in;
+            size_t decodeIndex = 0;
+            for (; decodeIndex < size; decodeIndex += 4)
+            {
+                decodeBuf = &in[decodeIndex];
+                //Check if each character is a valid Base64 encoded character
+                {
+                    // First Octet
+                    if (!IsValidEncodedChar(decodeBuf[0]))
+                    {
+                        AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[0]));
+                        return false;
+                    }
+                    if (!IsValidEncodedChar(decodeBuf[1]))
+                    {
+                        AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[1]));
+                        return false;
+                    }
+
+                    result.push_back((c_inverseBase64Table[static_cast<size_t>(decodeBuf[0])] << 2) | ((c_inverseBase64Table[static_cast<size_t>(decodeBuf[1])] & 0x30) >> 4));
+                }
+
+                {
+                    // Second Octet
+                    if (decodeBuf[2] == base64pad)
+                    {
+                        break;
+                    }
+
+                    if (!IsValidEncodedChar(decodeBuf[2]))
+                    {
+                        AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[2]));
+                        return false;
+                    }
+
+                    result.push_back(((c_inverseBase64Table[static_cast<size_t>(decodeBuf[1])] & 0x0f) << 4) | ((c_inverseBase64Table[static_cast<size_t>(decodeBuf[2])] & 0x3c) >> 2));
+                }
+
+                {
+                    // Third Octet
+                    if (decodeBuf[3] == base64pad)
+                    {
+                        break;
+                    }
+
+                    if (!IsValidEncodedChar(decodeBuf[3]))
+                    {
+                        AZ_Warning("StringFunc", false, "Invalid Base64 encoded text at offset %tu", AZStd::distance(in, &decodeBuf[3]));
+                        return false;
+                    }
+
+                    result.push_back(((c_inverseBase64Table[static_cast<size_t>(decodeBuf[2])] & 0x03) << 6) | (c_inverseBase64Table[static_cast<size_t>(decodeBuf[3])] & 0x3f));
+                }
+            }
+
+            out = AZStd::move(result);
+            return true;
         }
-    } // namespace StringFunc
-} // namespace AZ
+    }
+
+    namespace Utf8
+    {
+        bool CheckNonAsciiChar(const AZStd::string& in)
+        {
+            for (int i = 0; i < in.length(); ++i)
+            {
+                char byte = in[i];
+                if (byte & 0x80)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+} // namespace AZ::StringFunc
diff --git a/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h
index 1e651afc93..55236a0fff 100644
--- a/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h
+++ b/Code/Framework/AzCore/AzCore/StringFunc/StringFunc.h
@@ -485,10 +485,11 @@ namespace AZ
             //! CalculateBranchToken
             /*! Calculate the branch token that is used for asset processor connection negotiations
             *
-            * \param appRootPath - The absolute path of the app root to base the token calculation on
+            * \param engineRootPath - The absolute path to the engine root to base the token calculation on
             * \param token       - The result of the branch token calculation
             */
-            void CalculateBranchToken(const AZStd::string& appRootPath, AZStd::string& token);
+            void CalculateBranchToken(AZStd::string_view engineRootPath, AZStd::string& token);
+            void CalculateBranchToken(AZStd::string_view engineRootPath, AZ::IO::FixedMaxPathString& token);
         }
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Framework/AzCore/AzCore/Task/TaskGraphSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Task/TaskGraphSystemComponent.cpp
index 56b56e96a1..1cacef7ff3 100644
--- a/Code/Framework/AzCore/AzCore/Task/TaskGraphSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Task/TaskGraphSystemComponent.cpp
@@ -30,8 +30,13 @@ namespace AZ
 
         if (Interface<TaskGraphActiveInterface>::Get() == nullptr)
         {
+        #if (AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS)
+            const uint32_t numberOfWorkerThreads = AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS;
+        #else
+            const uint32_t numberOfWorkerThreads = Threading::CalcNumWorkerThreads(cl_taskGraphThreadsConcurrencyRatio, cl_taskGraphThreadsMinNumber, cl_taskGraphThreadsNumReserved);
+        #endif // (AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS)
             Interface<TaskGraphActiveInterface>::Register(this); // small window that another thread can try to use taskgraph between this line and the set instance.
-            m_taskExecutor = aznew TaskExecutor(Threading::CalcNumWorkerThreads(cl_taskGraphThreadsConcurrencyRatio, cl_taskGraphThreadsMinNumber, cl_taskGraphThreadsNumReserved));
+            m_taskExecutor = aznew TaskExecutor(numberOfWorkerThreads);
             TaskExecutor::SetInstance(m_taskExecutor);
         }
     }
diff --git a/Code/Framework/AzCore/AzCore/Time/ITime.h b/Code/Framework/AzCore/AzCore/Time/ITime.h
index a97ba2319a..a61b629f35 100644
--- a/Code/Framework/AzCore/AzCore/Time/ITime.h
+++ b/Code/Framework/AzCore/AzCore/Time/ITime.h
@@ -12,8 +12,8 @@
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/RTTI/TypeSafeIntegral.h>
-#include <AzCore/std/time.h>
 #include <AzCore/std/chrono/chrono.h>
+#include <AzCore/std/time.h>
 
 namespace AZ
 {
@@ -24,15 +24,21 @@ namespace AZ
     //! Using int64_t as the underlying type, this is good to represent approximately 292,471 years
     AZ_TYPE_SAFE_INTEGRAL(TimeUs, int64_t);
 
+    namespace Time
+    {
+        static const AZ::TimeMs ZeroTimeMs = AZ::TimeMs{ 0 };
+        static const AZ::TimeUs ZeroTimeUs = AZ::TimeUs{ 0 };
+    }
+
     //! @class ITime
     //! @brief This is an AZ::Interface<> for managing time related operations.
     //! AZ::ITime and associated types may not operate in realtime. These abstractions are to allow our application
     //! simulation to operate both slower and faster than realtime in a well defined and user controllable manner
-    //! The rate at which time passes for AZ::ITime is controlled by the cvar t_scale
-    //!     t_scale == 0 means simulation time should halt
-    //! 0 < t_scale <  1 will cause time to pass slower than realtime, with t_scale 0.1 being roughly 1/10th realtime
-    //!     t_scale == 1 will cause time to pass at roughly realtime
-    //!     t_scale >  1 will cause time to pass faster than normal, with t_scale 10 being roughly 10x realtime
+    //! The rate at which time passes for AZ::ITime is controlled by the cvar t_simulationTickScale
+    //!     t_simulationTickScale == 0 means simulation time should halt
+    //! 0 < t_simulationTickScale <  1 will cause time to pass slower than realtime, with t_simulationTickScale 0.1 being roughly 1/10th realtime
+    //!     t_simulationTickScale == 1 will cause time to pass at roughly realtime
+    //!     t_simulationTickScale >  1 will cause time to pass faster than normal, with t_simulationTickScale 10 being roughly 10x realtime
     class ITime
     {
     public:
@@ -41,15 +47,72 @@ namespace AZ
         ITime() = default;
         virtual ~ITime() = default;
 
-        //! Returns the number of milliseconds since application start.
-        //! @return the number of milliseconds that have elapsed since application start
+        //! Returns the number of milliseconds since application start scaled by t_simulationTickScale.
+        //! @return The number of milliseconds that have elapsed since application start.
         virtual TimeMs GetElapsedTimeMs() const = 0;
 
-        //! Returns the number of microseconds since application start.
+        //! Returns the number of microseconds since application start scaled by t_simulationTickScale.
         //! @return the number of microseconds that have elapsed since application start
         virtual TimeUs GetElapsedTimeUs() const = 0;
+        
+        //! Returns the number of milliseconds since application start.
+        //! This value is not affected by the t_simulationTickScale cvar.
+        //! @return The number of milliseconds that have elapsed since application start.
+        virtual TimeMs GetRealElapsedTimeMs() const = 0;
+
+        //! Returns the number of microseconds since application start.
+        //! This value is not affected by the t_simulationTickScale cvar.
+        //! @return The number of microseconds that have elapsed since application start.
+        virtual TimeUs GetRealElapsedTimeUs() const = 0;
+
+        //! Returns the current simulation tick delta time.
+        //! This is affected by the cvars t_simulationTickScale, t_simulationTickDeltaOverride, and t_maxGameTickDelta.
+        //! @return The number of microseconds elapsed since the last game tick.
+        virtual TimeUs GetSimulationTickDeltaTimeUs() const = 0;
+
+        //! Returns the non-manipulated tick time.
+        //! @return The number of microseconds elapsed since the last game tick.
+        virtual TimeUs GetRealTickDeltaTimeUs() const = 0;
+
+        //! Returns the time since application start of when the last simulation tick was updated.
+        virtual TimeUs GetLastSimulationTickTime() const = 0;
+
+        //! If > 0 this will override the simulation tick delta time with the provided value.
+        //! When enabled this will ignore any set simulation tick scale.
+        //! Setting to 0 disables the override.
+        //! @param timeMs The time in milliseconds to use for the tick delta.
+        virtual void SetSimulationTickDeltaOverride(TimeMs timeMs) = 0;
+
+        //! Returns the current simulation tick override.
+        //! 0 means disabled.
+        //! @returns The current simulation tick override in milliseconds.
+        virtual TimeMs GetSimulationTickDeltaOverride() const = 0;
+
+        //! A scalar amount to adjust the passage of time by, 1.0 == realtime, 0.5 == half realtime, 2.0 == doubletime.
+        //! @param scale The scalar value to apply to the simulation time.
+        virtual void SetSimulationTickScale(float scale) = 0;
+
+        //! Returns the current simulation tick scale.
+        //! 1.0 == realtime, 0.5 == half realtime, 2.0 == doubletime.
+        //! @returns The simulation tick scale value.
+        virtual float GetSimulationTickScale() const = 0;
+
+        //! The minimum rate to force the simulation tick to run.
+        //! 0 for as fast as possible. 30 = ~33ms, 60 = ~16ms.
+        //! Setting to 0 will disable rate limiting.
+        //! @note It is not guaranteed to hit the requested tick rate exactly.
+        //! @param rate The rate in frames per second.
+        virtual void SetSimulationTickRate(int rate) = 0;
+
+        //! Return the current simulation tick rate.
+        //! 0 means disabled.
+        //! @return The rate in frames per second.
+        virtual int32_t GetSimulationTickRate() const = 0;
 
         AZ_DISABLE_COPY_MOVE(ITime);
+
+        static const AZ::TimeMs ZeroTimeMs = AZ::TimeMs{ 0 };
+        static const AZ::TimeUs ZeroTimeUs = AZ::TimeUs{ 0 };
     };
 
     // EBus wrapper for ScriptCanvas
@@ -74,6 +137,36 @@ namespace AZ
         return AZ::Interface<ITime>::Get()->GetElapsedTimeUs();
     }
 
+    //! This is a simple convenience wrapper
+    inline TimeMs GetRealElapsedTimeMs()
+    {
+        return AZ::Interface<ITime>::Get()->GetRealElapsedTimeMs();
+    }
+
+    //! This is a simple convenience wrapper
+    inline TimeUs GetRealElapsedTimeUs()
+    {
+        return AZ::Interface<ITime>::Get()->GetRealElapsedTimeUs();
+    }
+
+    //! This is a simple convenience wrapper
+    inline TimeUs GetSimulationTickDeltaTimeUs()
+    {
+        return AZ::Interface<ITime>::Get()->GetSimulationTickDeltaTimeUs();
+    }
+
+    //! This is a simple convenience wrapper
+    inline TimeUs GetRealTickDeltaTimeUs()
+    {
+        return AZ::Interface<ITime>::Get()->GetRealTickDeltaTimeUs();
+    }
+
+    //! This is a simple convenience wrapper
+    inline TimeUs GetLastSimulationTickTime()
+    {
+        return AZ::Interface<ITime>::Get()->GetLastSimulationTickTime();
+    }
+
     //! Converts from milliseconds to microseconds
     inline TimeUs TimeMsToUs(TimeMs value)
     {
@@ -92,12 +185,24 @@ namespace AZ
         return static_cast<float>(value) / 1000.0f;
     }
 
+    //! Converts from milliseconds to seconds
+    inline double TimeMsToSecondsDouble(TimeMs value)
+    {
+        return static_cast<double>(value) / 1000.0;
+    }
+
     //! Converts from microseconds to seconds
     inline float TimeUsToSeconds(TimeUs value)
     {
         return static_cast<float>(value) / 1000000.0f;
     }
 
+    //! Converts from microseconds to seconds
+    inline double TimeUsToSecondsDouble(TimeUs value)
+    {
+        return static_cast<double>(value) / 1000000.0;
+    }
+
     //! Converts from milliseconds to AZStd::chrono::time_point
     inline auto TimeMsToChrono(TimeMs value)
     {
@@ -113,6 +218,20 @@ namespace AZ
         auto chronoValue = AZStd::chrono::microseconds(aznumeric_cast<int64_t>(value));
         return epoch + chronoValue;
     }
+
+    //! A utility function to convert from seconds to TimeMs
+    inline TimeMs SecondsToTimeMs(const double value)
+    {
+        const double valueMs = value * 1000.0;
+        return static_cast<TimeMs>(static_cast<int64_t>(valueMs));
+    }
+
+    //! A utility function to convert from seconds to TimeUs
+    inline TimeUs SecondsToTimeUs(const double value)
+    {
+        const double valueMs = value * 1000000.0;
+        return static_cast<TimeUs>(static_cast<int64_t>(valueMs));
+    }
 } // namespace AZ
 
 AZ_TYPE_SAFE_INTEGRAL_SERIALIZEBINDING(AZ::TimeMs);
diff --git a/Code/Framework/AzCore/AzCore/Time/TimeSystem.cpp b/Code/Framework/AzCore/AzCore/Time/TimeSystem.cpp
new file mode 100644
index 0000000000..a5e0908ac4
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/Time/TimeSystem.cpp
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Time/TimeSystem.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+namespace AZ
+{
+    namespace
+    {
+        void cvar_t_simulationTickScale_Changed(const float& value)
+        {
+            if (auto* timeSystem = AZ::Interface<ITime>::Get())
+            {
+                timeSystem->SetSimulationTickScale(value);
+            }
+        }
+
+        void cvar_t_simulationTickDeltaOverride_Changed(const float& value)
+        {
+            if (auto* timeSystem = AZ::Interface<ITime>::Get())
+            {
+                timeSystem->SetSimulationTickDeltaOverride(AZ::SecondsToTimeMs(value));
+            }
+        }
+
+        void cvar_t_simulationTickRate_Changed(const int& rate)
+        {
+            AZ_Warning("tick", false, "Simulation tick rate limiting is currently disabled. Setting will not be applied.");
+            if (auto* timeSystem = AZ::Interface<ITime>::Get())
+            {
+                timeSystem->SetSimulationTickRate(rate);
+            }
+        }
+    } // namespace
+
+    AZ_CVAR(float, t_simulationTickScale, 1.0f, cvar_t_simulationTickScale_Changed, AZ::ConsoleFunctorFlags::Null,
+        "A scalar amount to adjust time passage by, 1.0 == realtime, 0.5 == half realtime, 2.0 == doubletime");
+
+    AZ_CVAR(float, t_simulationTickDeltaOverride, 0.0f, cvar_t_simulationTickDeltaOverride_Changed, AZ::ConsoleFunctorFlags::Null,
+        "If > 0, overrides the simulation tick delta time with the provided value (Seconds) and ignores any t_simulationTickScale value.");
+
+    AZ_CVAR(int, t_simulationTickRate, 0, cvar_t_simulationTickRate_Changed, AZ::ConsoleFunctorFlags::Null,
+        "The minimum rate to force the game simulation tick to run. 0 for as fast as possible. 30 = ~33ms, 60 = ~16ms");
+
+    void TimeSystem::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<TimeSystem, ITime>()
+                ->Version(1);
+        }
+    }
+
+    TimeSystem::TimeSystem()
+    {
+        m_lastInvokedTimeUs = static_cast<TimeUs>(AZStd::GetTimeNowMicroSecond());
+        AZ::Interface<ITime>::Register(this);
+        ITimeRequestBus::Handler::BusConnect();
+    }
+
+    TimeSystem::~TimeSystem()
+    {
+        AZ::Interface<ITime>::Unregister(this);
+        ITimeRequestBus::Handler::BusDisconnect();
+    }
+
+    TimeMs TimeSystem::GetElapsedTimeMs() const
+    {
+        return AZ::TimeUsToMs(GetElapsedTimeUs());
+    }
+
+    TimeUs TimeSystem::GetElapsedTimeUs() const
+    {
+        TimeUs currentTime = static_cast<TimeUs>(AZStd::GetTimeNowMicroSecond());
+        TimeUs deltaTime = currentTime - m_lastInvokedTimeUs;
+
+        if (t_simulationTickScale != 1.0f)
+        {
+            const float floatDelta = AZStd::GetMax(static_cast<float>(deltaTime) * t_simulationTickScale, 1.0f);
+            deltaTime = static_cast<TimeUs>(static_cast<int64_t>(floatDelta));
+        }
+
+        m_accumulatedTimeUs += deltaTime;
+        m_lastInvokedTimeUs = currentTime;
+
+        return m_accumulatedTimeUs;
+    }
+
+    TimeMs TimeSystem::GetRealElapsedTimeMs() const
+    {
+        return AZ::TimeUsToMs(GetRealElapsedTimeUs());
+    }
+
+    TimeUs TimeSystem::GetRealElapsedTimeUs() const
+    {
+        return static_cast<TimeUs>(AZStd::GetTimeNowMicroSecond());
+    }
+
+    TimeUs TimeSystem::GetSimulationTickDeltaTimeUs() const
+    {
+        return m_simulationTickDeltaTimeUs;
+    }
+
+    TimeUs TimeSystem::GetRealTickDeltaTimeUs() const
+    {
+        return m_realTickDeltaTimeUs;
+    }
+
+    TimeUs TimeSystem::GetLastSimulationTickTime() const
+    {
+        return m_lastSimulationTickTimeUs;
+    }
+
+    TimeUs TimeSystem::AdvanceTickDeltaTimes()
+    {
+        const TimeUs currentTimeUs = static_cast<TimeUs>(AZStd::GetTimeNowMicroSecond());
+
+        //real time
+        m_realTickDeltaTimeUs = currentTimeUs - m_lastSimulationTickTimeUs;
+
+        //game time
+        if (m_simulationTickDeltaOverride > AZ::Time::ZeroTimeUs)
+        {
+            m_simulationTickDeltaTimeUs = m_simulationTickDeltaOverride;
+            m_lastSimulationTickTimeUs = currentTimeUs;
+            return m_simulationTickDeltaTimeUs;
+        }
+
+        m_simulationTickDeltaTimeUs = currentTimeUs - m_lastSimulationTickTimeUs;
+
+        if (!AZ::IsClose(t_simulationTickScale, 1.0f))
+        {
+            const double floatDelta = AZStd::GetMax(static_cast<double>(m_simulationTickDeltaTimeUs) * static_cast<double>(t_simulationTickScale), 1.0);
+            m_simulationTickDeltaTimeUs = static_cast<TimeUs>(static_cast<int64_t>(floatDelta));
+        }
+        m_lastSimulationTickTimeUs = currentTimeUs;
+
+        return m_simulationTickDeltaTimeUs;
+    }
+
+    void TimeSystem::ApplyTickRateLimiterIfNeeded()
+    {
+        // Currently disabling the Tick rate limiter as there are some reported issues when using it.
+        #ifdef ENABLE_TICK_RATE_LIMITER
+        // If tick rate limiting is on, ensure (1 / t_simulationTickRate) ms has elapsed since the last frame,
+        // sleeping if there's still time remaining.
+        if (t_simulationTickRate > 0)
+        {
+            const TimeUs currentTimeUs = AZ::GetRealElapsedTimeUs();
+            const TimeUs timeUntilNextTick = (m_lastSimulationTickTimeUs + m_simulationTickLimitTimeUs) - currentTimeUs;
+            if (timeUntilNextTick > AZ::Time::ZeroTimeUs)
+            {
+                AZ_TracePrintf("tick", "Sleeping for %.2f", AZ::TimeUsToSecondsDouble(timeUntilNextTick));
+                AZStd::this_thread::sleep_for(AZStd::chrono::microseconds(static_cast<int64_t>(timeUntilNextTick)));
+            }
+        }
+        #endif // #ifdef ENABLE_TICK_RATE_LIMITER
+    }
+
+    void TimeSystem::SetSimulationTickDeltaOverride(TimeMs timeMs)
+    {
+        const TimeUs timeUs = AZ::TimeMsToUs(timeMs);
+        if (timeUs != m_simulationTickDeltaOverride)
+        {
+            m_simulationTickDeltaOverride = timeUs;
+            t_simulationTickDeltaOverride = AZ::TimeUsToSeconds(timeUs); //update the cvar
+        }
+    }
+
+    TimeMs TimeSystem::GetSimulationTickDeltaOverride() const
+    {
+        return AZ::TimeUsToMs(m_simulationTickDeltaOverride);
+    }
+
+    void TimeSystem::SetSimulationTickScale(float scale)
+    {
+        if (!AZ::IsClose(scale, t_simulationTickScale))
+        {
+            t_simulationTickScale = scale;
+        }
+    }
+
+    float TimeSystem::GetSimulationTickScale() const
+    {
+        return t_simulationTickScale;
+    }
+
+    void TimeSystem::SetSimulationTickRate(int rate)
+    {
+        m_simulationTickLimitRate = AZStd::abs(rate);
+        if (m_simulationTickLimitRate != 0)
+        {
+            m_simulationTickLimitTimeUs = AZ::SecondsToTimeUs(1.0f / m_simulationTickLimitRate);
+        }
+        else
+        {
+            m_simulationTickLimitTimeUs = AZ::Time::ZeroTimeUs;
+        }
+    }
+
+    int32_t TimeSystem::GetSimulationTickRate() const
+    {
+        return m_simulationTickLimitRate;
+    }
+} // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Time/TimeSystem.h b/Code/Framework/AzCore/AzCore/Time/TimeSystem.h
new file mode 100644
index 0000000000..ded70c9be5
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/Time/TimeSystem.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Time/ITime.h>
+
+namespace AZ
+{
+    class ReflectContext;
+
+    //! Implementation of the ITime system interface.
+    class TimeSystem
+        : public ITimeRequestBus::Handler
+    {
+    public:
+        AZ_RTTI(AZ::TimeSystem, "{CE1C5E4F-7DC1-4248-B10C-AC55E8924A48}", AZ::ITime);
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        TimeSystem();
+        virtual ~TimeSystem();
+
+        //! ITime overrides.
+        //! @{
+        TimeMs GetElapsedTimeMs() const override;
+        TimeUs GetElapsedTimeUs() const override;
+        TimeMs GetRealElapsedTimeMs() const override;
+        TimeUs GetRealElapsedTimeUs() const override;
+        TimeUs GetSimulationTickDeltaTimeUs() const override;
+        TimeUs GetRealTickDeltaTimeUs() const override;
+        TimeUs GetLastSimulationTickTime() const override;
+        void SetSimulationTickDeltaOverride(TimeMs timeMs) override;
+        TimeMs GetSimulationTickDeltaOverride() const override;
+        void SetSimulationTickScale(float scale) override;
+        float GetSimulationTickScale() const override;
+        void SetSimulationTickRate(int rate) override;
+        int32_t GetSimulationTickRate() const override;
+        //! @}
+        
+        //! Advances the Simulation and Real tick delta time counters.
+        //! This is called from the owner of the TimeSystem, ComponentApplication in Tick().
+        //! @return The delta in microseconds from the last call to AdvanceTickDeltaTimes(). Value will be the same as GetSimulationTickDeltaTimeUs().
+        TimeUs AdvanceTickDeltaTimes();
+
+        //! If t_simulationTickRate is >0 this will try to have the game delta time run at a maximum of the rate set.
+        //! This is called from the owner of the TimeSystem, ComponentApplication in Tick().
+        //! example. If t_simulationTickRate is set to 60Fps, and the game tick delta is <17ms(60fps), this will add a sleep for the remaining time.
+        //! example. If t_simulationTickRate is set to 60Fps, and the game tick delta is >=17ms(60fps), this will not sleep at all.
+        //! @note It is not guaranteed to hit the requested tick rate exactly.
+        void ApplyTickRateLimiterIfNeeded();
+    private:
+        //! Used to calculate the delta time between calls to GetElapsedTimeMs/TimeUs().
+        //! Mutable to allow GetElapsedTimeMs/TimeUs() to be a const functions.
+        mutable TimeUs m_lastInvokedTimeUs = AZ::Time::ZeroTimeUs;
+
+        //! Accumulates the delta time of GetElapsedTimeMs/TimeUs() calls.
+        //! Mutable to allow GetElapsedTimeMs/TimeUs() to be a const functions.
+        mutable TimeUs m_accumulatedTimeUs = AZ::Time::ZeroTimeUs;
+
+        //! The current game tick delta time.
+        //! Can be affected by time system cvars.
+        //! Updated in AdvanceTickDeltaTimes().
+        TimeUs m_simulationTickDeltaTimeUs = AZ::Time::ZeroTimeUs;
+
+        //! The current real tick delta time.
+        //! Will not be affected by time system cvars.
+        //! Updated in AdvanceTickDeltaTimes().
+        TimeUs m_realTickDeltaTimeUs = AZ::Time::ZeroTimeUs;
+
+        TimeUs m_lastSimulationTickTimeUs = AZ::Time::ZeroTimeUs; //!< Used to determine the game tick delta time.
+
+        TimeUs m_simulationTickDeltaOverride = AZ::Time::ZeroTimeUs; //<! Stores the TimeUs value of the t_simulationTickDeltaOverride cvar.
+        TimeUs m_simulationTickLimitTimeUs = AZ::Time::ZeroTimeUs; //<! Stores the TimeUs value of the t_simulationTickRate cvar.
+        int32_t m_simulationTickLimitRate = 0; //<! Stores the simulation rate limit in frames per second.
+    };
+}
diff --git a/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp
deleted file mode 100644
index 99145d377a..0000000000
--- a/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Time/TimeSystemComponent.h>
-#include <AzCore/Console/IConsole.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-namespace AZ
-{
-    AZ_CVAR(float, t_scale, 1.0f, nullptr, AZ::ConsoleFunctorFlags::Null, "A scalar amount to adjust time passage by, 1.0 == realtime, 0.5 == half realtime, 2.0 == doubletime");
-
-    void TimeSystemComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<TimeSystemComponent, AZ::Component>()
-                ->Version(1);
-        }
-    }
-
-    void TimeSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-    {
-        provided.push_back(AZ_CRC_CE("TimeService"));
-    }
-
-    void TimeSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-    {
-        incompatible.push_back(AZ_CRC_CE("TimeService"));
-    }
-
-    TimeSystemComponent::TimeSystemComponent()
-    {
-        m_lastInvokedTimeUs = static_cast<TimeUs>(AZStd::GetTimeNowMicroSecond());
-        AZ::Interface<ITime>::Register(this);
-        ITimeRequestBus::Handler::BusConnect();
-    }
-
-    TimeSystemComponent::~TimeSystemComponent()
-    {
-        ITimeRequestBus::Handler::BusDisconnect();
-        AZ::Interface<ITime>::Unregister(this);
-    }
-
-    void TimeSystemComponent::Activate()
-    {
-        ;
-    }
-
-    void TimeSystemComponent::Deactivate()
-    {
-        ;
-    }
-
-    TimeMs TimeSystemComponent::GetElapsedTimeMs() const
-    {
-        return TimeUsToMs(GetElapsedTimeUs());
-    }
-
-    TimeUs TimeSystemComponent::GetElapsedTimeUs() const
-    {
-        TimeUs currentTime = static_cast<TimeUs>(AZStd::GetTimeNowMicroSecond());
-        TimeUs deltaTime = currentTime - m_lastInvokedTimeUs;
-
-        if (t_scale != 1.0f)
-        {
-            float floatDelta = static_cast<float>(deltaTime) * t_scale;
-            deltaTime = static_cast<TimeUs>(static_cast<int64_t>(floatDelta));
-        }
-
-        m_accumulatedTimeUs += deltaTime;
-        m_lastInvokedTimeUs = currentTime;
-
-        return m_accumulatedTimeUs;
-    }
-}
diff --git a/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h b/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h
deleted file mode 100644
index 3ab3dbc234..0000000000
--- a/Code/Framework/AzCore/AzCore/Time/TimeSystemComponent.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Time/ITime.h>
-#include <AzCore/Component/Component.h>
-#include <AzCore/Console/IConsole.h>
-
-namespace AZ
-{
-    //! Implementation of the ITime system interface.
-    class TimeSystemComponent
-        : public AZ::Component
-        , public ITimeRequestBus::Handler
-    {
-    public:
-
-        AZ_COMPONENT(TimeSystemComponent, "{CE1C5E4F-7DC1-4248-B10C-AC55E8924A48}");
-
-        static void Reflect(AZ::ReflectContext* context);
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
-
-        TimeSystemComponent();
-        virtual ~TimeSystemComponent();
-
-        //! AZ::Component overrides.
-        //! @{
-        void Activate() override;
-        void Deactivate() override;
-        //! @}
-
-        //! ITime overrides.
-        //! @{
-        TimeMs GetElapsedTimeMs() const override;
-        TimeUs GetElapsedTimeUs() const override;
-        //! @}
-
-    private:
-
-        mutable TimeUs m_lastInvokedTimeUs = TimeUs{0};
-        mutable TimeUs m_accumulatedTimeUs = TimeUs{0};
-    };
-}
diff --git a/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h b/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h
index 8f069da9dd..190fa09cb7 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/MockComponentApplication.h
@@ -41,7 +41,6 @@ namespace UnitTest
         MOCK_METHOD0(GetSerializeContext, AZ::SerializeContext* ());
         MOCK_METHOD0(GetJsonRegistrationContext, AZ::JsonRegistrationContext* ());
         MOCK_METHOD0(GetBehaviorContext, AZ::BehaviorContext* ());
-        MOCK_CONST_METHOD0(GetAppRoot, const char* ());
         MOCK_CONST_METHOD0(GetEngineRoot, const char* ());
         MOCK_CONST_METHOD0(GetExecutableFolder, const char* ());
         MOCK_CONST_METHOD1(QueryApplicationType, void(AZ::ApplicationTypeQuery&));
diff --git a/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockITime.h b/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockITime.h
new file mode 100644
index 0000000000..3d31056e27
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/UnitTest/Mocks/MockITime.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Time/TimeSystem.h>
+#include <gmock/gmock.h>
+
+namespace AZ
+{
+    class MockTimeSystem;
+    using NiceTimeSystemMock =::testing::NiceMock<MockTimeSystem>;
+
+    //used if you wish to mock any of the Get time functions.
+    class MockTimeSystem
+        : public ITimeRequestBus::Handler
+    {
+    public:
+        MockTimeSystem()
+        {
+            AZ::Interface<ITime>::Register(this);
+            ITimeRequestBus::Handler::BusConnect();
+        }
+        virtual ~MockTimeSystem()
+        {
+            AZ::Interface<ITime>::Unregister(this);
+            ITimeRequestBus::Handler::BusDisconnect();
+        }
+
+        MOCK_CONST_METHOD0(GetElapsedTimeMs, TimeMs());
+        MOCK_CONST_METHOD0(GetElapsedTimeUs, TimeUs());
+        MOCK_CONST_METHOD0(GetRealElapsedTimeMs, TimeMs());
+        MOCK_CONST_METHOD0(GetRealElapsedTimeUs, TimeUs());
+        MOCK_CONST_METHOD0(GetSimulationTickDeltaTimeUs, TimeUs());
+        MOCK_CONST_METHOD0(GetRealTickDeltaTimeUs, TimeUs());
+        MOCK_CONST_METHOD0(GetLastSimulationTickTime, TimeUs());
+        MOCK_METHOD1(SetSimulationTickDeltaOverride, void(TimeMs));
+        MOCK_CONST_METHOD0(GetSimulationTickDeltaOverride, TimeMs());
+        MOCK_METHOD1(SetSimulationTickScale, void(float));
+        MOCK_CONST_METHOD0(GetSimulationTickScale, float());
+        MOCK_METHOD1(SetSimulationTickRate, void(int));
+        MOCK_CONST_METHOD0(GetSimulationTickRate, int32_t());
+    };
+
+    //used if you wish to override any of the Get time functions with specific functionality.
+    class StubTimeSystem
+        : public AZ::TimeSystem
+    {
+    public:
+        AZ_RTTI(AZ::StubTimeSystem, "{DD5D5A6A-345F-49FD-A61E-A40E63C49CFA}", AZ::TimeSystem);
+
+        virtual AZ::TimeMs GetElapsedTimeMs() const override
+        {
+            return AZ::Time::ZeroTimeMs;
+        }
+
+        virtual AZ::TimeUs GetElapsedTimeUs() const override
+        {
+            return AZ::Time::ZeroTimeUs;
+        }
+
+        virtual AZ::TimeMs GetRealElapsedTimeMs() const override
+        {
+            return AZ::Time::ZeroTimeMs;
+        }
+
+        virtual AZ::TimeUs GetRealElapsedTimeUs() const override
+        {
+            return AZ::Time::ZeroTimeUs;
+        }
+
+        virtual AZ::TimeUs GetSimulationTickDeltaTimeUs() const override
+        {
+            return AZ::Time::ZeroTimeUs;
+        }
+
+        virtual AZ::TimeUs GetRealTickDeltaTimeUs() const override
+        {
+            return AZ::Time::ZeroTimeUs;
+        }
+
+        virtual AZ::TimeUs GetLastSimulationTickTime() const override
+        {
+            return AZ::Time::ZeroTimeUs;
+        }
+
+        virtual void SetSimulationTickDeltaOverride([[maybe_unused]]TimeMs timeMs) override
+        {
+        }
+
+        virtual TimeMs GetSimulationTickDeltaOverride() const override
+        {
+            return AZ::Time::ZeroTimeMs; 
+        }
+
+        virtual void SetSimulationTickScale([[maybe_unused]] float scale) override
+        {
+        }
+
+        virtual float GetSimulationTickScale() const override
+        {
+            return 1.0f;
+        }
+
+        virtual void SetSimulationTickRate([[maybe_unused]] int rate) override
+        {
+        }
+
+        virtual int32_t GetSimulationTickRate() const override
+        {
+            return 0;
+        }
+    };
+
+} // namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h b/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h
index 5244493c78..be9199b6c4 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/UnitTest.h
@@ -60,6 +60,7 @@ namespace UnitTest
             m_isAssertTest = true;
             m_numAssertsFailed = 0;
         }
+
         int  StopAssertTests()
         {
             m_isAssertTest = false;
@@ -69,6 +70,11 @@ namespace UnitTest
         }
 
         bool m_isAssertTest;
+        bool m_suppressErrors = true;
+        bool m_suppressWarnings = true;
+        bool m_suppressAsserts = true;
+        bool m_suppressOutput = true;
+        bool m_suppressPrintf = true;
         int  m_numAssertsFailed;
     };
 
@@ -114,7 +120,7 @@ namespace UnitTest
 
     // utility classes that you can derive from or contain, which suppress AZ_Asserts
     // and AZ_Errors to the below macros (processAssert, etc)
-    // If TraceBusHook or TraceBusRedirector have been started in your unit tests, 
+    // If TraceBusHook or TraceBusRedirector have been started in your unit tests,
     //  use AZ_TEST_START_TRACE_SUPPRESSION and AZ_TEST_STOP_TRACE_SUPPRESSION(numExpectedAsserts) macros to perform AZ_Assert and AZ_Error suppression
     class TraceBusRedirector
         : public AZ::Debug::TraceMessageBus::Handler
@@ -124,16 +130,19 @@ namespace UnitTest
             if (UnitTest::TestRunner::Instance().m_isAssertTest)
             {
                 UnitTest::TestRunner::Instance().ProcessAssert(message, file, line, false);
+                return true;
             }
-            else
+            else if (UnitTest::TestRunner::Instance().m_suppressAsserts)
             {
                 GTEST_MESSAGE_AT_(file, line, message, ::testing::TestPartResult::kNonFatalFailure);
+                return true;
             }
-            return true;
+
+            return false;
         }
         bool OnAssert(const char* /*message*/) override
         {
-            return true; // stop processing
+            return UnitTest::TestRunner::Instance().m_suppressAsserts; // stop processing
         }
         bool OnPreError(const char* /*window*/, const char* file, int line, const char* /*func*/, const char* message) override
         {
@@ -142,6 +151,7 @@ namespace UnitTest
                 UnitTest::TestRunner::Instance().ProcessAssert(message, file, line, false);
                 return true;
             }
+
             return false;
         }
         bool OnError(const char* /*window*/, const char* message) override
@@ -149,12 +159,15 @@ namespace UnitTest
             if (UnitTest::TestRunner::Instance().m_isAssertTest)
             {
                 UnitTest::TestRunner::Instance().ProcessAssert(message, __FILE__, __LINE__, UnitTest::AssertionExpr(false));
+                return true;
             }
-            else
+            else if (UnitTest::TestRunner::Instance().m_suppressErrors)
             {
                 GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure);
+                return true;
             }
-            return true; // stop processing
+
+            return false;
         }
         bool OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) override
         {
@@ -163,21 +176,21 @@ namespace UnitTest
         }
         bool OnWarning(const char* /*window*/, const char* /*message*/) override
         {
-            return true;
+            return UnitTest::TestRunner::Instance().m_suppressWarnings;
         }
 
         bool OnOutput(const char* /*window*/, const char* /*message*/) override
         {
-            return true;
+            return UnitTest::TestRunner::Instance().m_suppressOutput;
         }
 
         bool OnPrintf(const char* window, const char* message) override
         {
             if (AZStd::string_view(window) == "Memory") // We want to print out the memory leak's stack traces
             {
-                ColoredPrintf(COLOR_RED, "[  MEMORY  ] %s", message); 
+                ColoredPrintf(COLOR_RED, "[  MEMORY  ] %s", message);
             }
-            return true; 
+            return UnitTest::TestRunner::Instance().m_suppressPrintf;
         }
     };
 
@@ -259,7 +272,6 @@ namespace UnitTest
         bool m_environmentSetup = false;
         bool m_createdAllocator = false;
     };
-
 }
 
 
diff --git a/Code/Framework/AzCore/AzCore/azcore_files.cmake b/Code/Framework/AzCore/AzCore/azcore_files.cmake
index a5cc3fdcd4..0c381c9850 100644
--- a/Code/Framework/AzCore/AzCore/azcore_files.cmake
+++ b/Code/Framework/AzCore/AzCore/azcore_files.cmake
@@ -187,6 +187,8 @@ set(FILES
     IO/Path/Path.inl
     IO/Path/PathIterable.inl
     IO/Path/PathParser.inl
+    IO/Path/PathReflect.cpp
+    IO/Path/PathReflect.h
     IO/Path/Path_fwd.h
     IO/SystemFile.cpp
     IO/SystemFile.h
@@ -654,8 +656,8 @@ set(FILES
     Threading/ThreadUtils.h
     Threading/ThreadUtils.cpp
     Time/ITime.h
-    Time/TimeSystemComponent.cpp
-    Time/TimeSystemComponent.h
+    Time/TimeSystem.cpp
+    Time/TimeSystem.h
 )
 
 # Prevent the following files from being grouped in UNITY builds
diff --git a/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake b/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake
index 6c25641f9f..e31dc803b9 100644
--- a/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake
+++ b/Code/Framework/AzCore/AzCore/azcoretestcommon_files.cmake
@@ -12,5 +12,6 @@ set(FILES
     UnitTest/UnitTest.h
     UnitTest/TestTypes.h
     UnitTest/Mocks/MockFileIOBase.h
+    UnitTest/Mocks/MockITime.h
     UnitTest/Mocks/MockSettingsRegistry.h
 )
diff --git a/Code/Framework/AzCore/AzCore/std/containers/deque.h b/Code/Framework/AzCore/AzCore/std/containers/deque.h
index db585e0ec9..9eed66aeb3 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/deque.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/deque.h
@@ -1233,6 +1233,14 @@ namespace AZStd
         right.swap(AZStd::forward<this_type>(left));
     }
 
+    template<class T, class Allocator, AZStd::size_t NumElementsPerBlock, AZStd::size_t MinMapSize, class U>
+    decltype(auto) erase(deque<T, Allocator, NumElementsPerBlock, MinMapSize>& container, const U& value)
+    {
+        auto iter = AZStd::remove(container.begin(), container.end(), value);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
     template<class T, class Allocator, AZStd::size_t NumElementsPerBlock, AZStd::size_t MinMapSize, class Predicate>
     decltype(auto) erase_if(deque<T, Allocator, NumElementsPerBlock, MinMapSize>& container, Predicate predicate)
     {
diff --git a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h
index 7c0cca0308..82faaab2d8 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h
@@ -130,10 +130,11 @@ namespace AZStd::Internal
 
 
         //! Constructors
-        constexpr fixed_trivial_storage() = default;
+        fixed_trivial_storage() = default;
 
         template <typename U, typename = enable_if_t<is_convertible_v<U, T>>>
-        constexpr fixed_trivial_storage(AZStd::initializer_list<U> ilist) noexcept
+        fixed_trivial_storage(AZStd::initializer_list<U> ilist) noexcept
+            : m_size(aznumeric_caster(ilist.size()))
         {
             AZSTD_CONTAINER_ASSERT(ilist.size() <= capacity(), "Initializer list cannot be larger than storage capacity");
             size_t index{};
@@ -141,20 +142,19 @@ namespace AZStd::Internal
             {
                 m_data[index++] = element;
             }
-            resize_no_construct(ilist.size());
         }
 
-        constexpr pointer data() noexcept
+        pointer data() noexcept
         {
             return m_data;
         }
-        constexpr const_pointer data() const noexcept
+        const_pointer data() const noexcept
         {
             return m_data;
         }
 
         //! Number of elements currently stored.
-        constexpr size_type size() const noexcept
+        size_type size() const noexcept
         {
             return m_size;
         }
@@ -164,12 +164,12 @@ namespace AZStd::Internal
             return Capacity;
         }
         //! Is the storage empty?
-        constexpr bool empty() const noexcept
+        bool empty() const noexcept
         {
             return size() == 0;
         }
         //! Is the storage full?
-        constexpr bool full() const noexcept
+        bool full() const noexcept
         {
             return size() == capacity();
         }
@@ -186,7 +186,7 @@ namespace AZStd::Internal
         //! Increases size of the storage by one.
         //! Always fails for empty storage.
         template <typename... Args, typename = enable_if_t<is_constructible_v<T, Args...>>>
-        constexpr reference emplace_back(Args&&... args) noexcept
+        reference emplace_back(Args&&... args) noexcept
         {
             AZSTD_CONTAINER_ASSERT(!full(), "emplace_back cannot be invoked on full storage");
             reference new_element = *(data() + size());
@@ -196,7 +196,7 @@ namespace AZStd::Internal
         }
         //! Removes the last element of the storage.
         //! Precondition: size is not empty
-        constexpr void pop_back() noexcept
+        void pop_back() noexcept
         {
             AZSTD_CONTAINER_ASSERT(!empty(), "pop_back cannot be invoked on empty storage");
             resize_no_construct(size() - 1);
@@ -205,7 +205,7 @@ namespace AZStd::Internal
         //! removing elements (unsafe).
         //!
         //! Updates the size of the container while checking that the new size is less than capacity
-        constexpr void resize_no_construct(size_t new_size) noexcept
+        void resize_no_construct(size_t new_size) noexcept
         {
             AZSTD_CONTAINER_ASSERT(new_size <= capacity(), "New size cannot be larger than capacity");
             m_size = aznumeric_cast<size_type>(new_size);
@@ -215,19 +215,19 @@ namespace AZStd::Internal
         //! This does not modify the size of the storage
         //! This is a no-op for trivial types
         template <typename InputIt, typename = enable_if_t<Internal::is_input_iterator_v<InputIt>>>
-        constexpr void unsafe_destroy(InputIt, InputIt) noexcept
+        void unsafe_destroy(InputIt, InputIt) noexcept
         {
         }
 
         //! Destructs all elements of the storage.
         //! This does not modify the size of the storage
         //! This is a no-op for trivial types
-        constexpr void unsafe_destroy_all() noexcept
+        void unsafe_destroy_all() noexcept
         {
         }
 
     private:
-        T m_data[Capacity]{};
+        T m_data[Capacity];
         size_type m_size{};
     };
 
@@ -245,7 +245,7 @@ namespace AZStd::Internal
         using reference = T&;
         using const_reference = const T&;
 
-        constexpr fixed_non_trivial_storage() = default;
+        fixed_non_trivial_storage() = default;
 
         ~fixed_non_trivial_storage() noexcept
         {
@@ -253,7 +253,7 @@ namespace AZStd::Internal
         }
 
         template <typename U, typename = enable_if_t<is_convertible_v<U, T>>>
-        constexpr fixed_non_trivial_storage(AZStd::initializer_list<U> ilist) noexcept(noexcept(emplace_back(AZStd::declval<U>())))
+        fixed_non_trivial_storage(AZStd::initializer_list<U> ilist) noexcept(noexcept(emplace_back(AZStd::declval<U>())))
         {
             AZSTD_CONTAINER_ASSERT(ilist.size() <= capacity(), "Initializer list cannot be larger than storage capacity");
             for (const U& element : ilist)
@@ -272,7 +272,7 @@ namespace AZStd::Internal
         }
 
         //! Number of elements currently stored.
-        constexpr size_type size() const noexcept
+        size_type size() const noexcept
         {
             return m_size;
         }
@@ -282,12 +282,12 @@ namespace AZStd::Internal
             return Capacity;
         }
         //! Is the storage empty?
-        constexpr bool empty() const noexcept
+        bool empty() const noexcept
         {
             return size() == 0;
         }
         //! Is the storage full?
-        constexpr bool full() const noexcept
+        bool full() const noexcept
         {
             return size() == capacity();
         }
@@ -325,7 +325,7 @@ namespace AZStd::Internal
         //! removing elements (unsafe).
         //!
         //! Updates the size of the container while checking that the new size is less than capacity
-        constexpr void resize_no_construct(size_t new_size) noexcept
+        void resize_no_construct(size_t new_size) noexcept
         {
             AZSTD_CONTAINER_ASSERT(new_size <= capacity(), "New size cannot be larger than capacity");
             m_size = aznumeric_cast<size_type>(new_size);
@@ -402,23 +402,23 @@ namespace AZStd
 
         //////////////////////////////////////////////////////////////////////////
         // 23.2.4.1 construct/copy/destroy
-        constexpr fixed_vector() = default;
+        fixed_vector() = default;
 
-        constexpr explicit fixed_vector(size_type numElements, const_reference value = value_type())
+        explicit fixed_vector(size_type numElements, const_reference value = value_type())
         {
             resize_no_construct(numElements);
             AZStd::uninitialized_fill_n(data(), numElements, value);
         }
 
         template <class InputIt, typename = AZStd::enable_if_t<Internal::is_input_iterator_v<InputIt>>>
-        constexpr fixed_vector(InputIt first, InputIt last)
+        fixed_vector(InputIt first, InputIt last)
         {
             resize_no_construct(AZStd::distance(first, last));
             AZStd::uninitialized_copy(first, last, data());
         }
 
 
-        constexpr fixed_vector(const fixed_vector& rhs)
+        fixed_vector(const fixed_vector& rhs)
         {
             resize_no_construct(rhs.size());
             AZStd::uninitialized_copy(rhs.data(), rhs.data() + rhs.size(), data());
@@ -428,7 +428,7 @@ namespace AZStd
         // It performs an AZStd::move on each of the fixed_vector elements instead
         // of swapping pointers to the allocted memory address
         // as it is unable to perform that operations due to the storage being baked into the container
-        constexpr fixed_vector(fixed_vector&& rhs)
+        fixed_vector(fixed_vector&& rhs)
         {
             resize_no_construct(rhs.size());
             AZStd::uninitialized_move(rhs.data(), rhs.data() + rhs.size(), data());
@@ -440,7 +440,7 @@ namespace AZStd
         // into a fixed_vector given that the type in question isn't the same type as this fixed_vector type
         template <typename VectorContainer, typename = AZStd::enable_if_t<!AZStd::is_same_v<VectorContainer, fixed_vector>
             && !AZStd::is_convertible_v<VectorContainer, size_type>>>
-        constexpr fixed_vector(VectorContainer&& rhs)
+        fixed_vector(VectorContainer&& rhs)
         {
             constexpr bool is_const_or_lvalue_reference = AZStd::is_lvalue_reference_v<VectorContainer>
                 || AZStd::is_const_v<VectorContainer>;
@@ -459,12 +459,12 @@ namespace AZStd
             }
         }
 
-        constexpr fixed_vector(AZStd::initializer_list<value_type> ilist)
+        fixed_vector(AZStd::initializer_list<value_type> ilist)
             : base_type(ilist)
         {
         }
 
-        constexpr fixed_vector& operator=(const fixed_vector& rhs)
+        fixed_vector& operator=(const fixed_vector& rhs)
         {
             if (this == &rhs)
             {
@@ -475,7 +475,7 @@ namespace AZStd
             return assign_helper(rhs);
         }
 
-        constexpr fixed_vector& operator=(fixed_vector&& rhs)
+        fixed_vector& operator=(fixed_vector&& rhs)
         {
             if (this == &rhs)
             {
@@ -487,23 +487,23 @@ namespace AZStd
         }
 
         template <typename VectorContainer>
-        constexpr AZStd::enable_if_t<!AZStd::is_same_v<AZStd::remove_cvref_t<VectorContainer>, fixed_vector>, fixed_vector>& operator=(VectorContainer&& rhs)
+        AZStd::enable_if_t<!AZStd::is_same_v<AZStd::remove_cvref_t<VectorContainer>, fixed_vector>, fixed_vector>& operator=(VectorContainer&& rhs)
         {
             return assign_helper(AZStd::forward<VectorContainer>(rhs));
         }
 
-        constexpr iterator begin() { return iterator(data()); }
-        constexpr const_iterator begin() const { return const_iterator(data()); }
-        constexpr const_iterator cbegin() const { return const_iterator(data()); }
-        constexpr iterator end() { return iterator(data() + size()); }
-        constexpr const_iterator end() const { return const_iterator(data() + size()); }
-        constexpr const_iterator cend() const { return const_iterator(data() + size()); }
-        constexpr reverse_iterator rbegin() { return reverse_iterator(end()); }
-        constexpr const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
-        constexpr const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); }
-        constexpr reverse_iterator rend() { return reverse_iterator(begin()); }
-        constexpr const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
-        constexpr const_reverse_iterator crend() const { return const_reverse_iterator(begin()); }
+        iterator begin() { return iterator(data()); }
+        const_iterator begin() const { return const_iterator(data()); }
+        const_iterator cbegin() const { return const_iterator(data()); }
+        iterator end() { return iterator(data() + size()); }
+        const_iterator end() const { return const_iterator(data() + size()); }
+        const_iterator cend() const { return const_iterator(data() + size()); }
+        reverse_iterator rbegin() { return reverse_iterator(end()); }
+        const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+        const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); }
+        reverse_iterator rend() { return reverse_iterator(begin()); }
+        const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+        const_reverse_iterator crend() const { return const_reverse_iterator(begin()); }
 
         // bring in fixed_vector_storage functions into scope
         using base_type::data;
@@ -514,7 +514,7 @@ namespace AZStd
         // extension method
         using base_type::resize_no_construct;
 
-        constexpr size_type size() const noexcept
+        size_type size() const noexcept
         {
             return base_type::size();
         }
@@ -527,12 +527,12 @@ namespace AZStd
             return base_type::max_size();
         }
 
-        constexpr void resize(size_type newSize)
+        void resize(size_type newSize)
         {
             return resize(newSize, value_type{});
         }
 
-        constexpr void resize(size_type newSize, const_reference value)
+        void resize(size_type newSize, const_reference value)
         {
             size_type dataSize = size();
             if (dataSize < newSize)
@@ -547,7 +547,7 @@ namespace AZStd
 
         // Removes unused capacity - For fixed_vector this only asserts
         // that the supplied capacity is not longer than the fixed_vector capacity
-        constexpr void reserve(size_type newCapacity)
+        void reserve(size_type newCapacity)
         {
             // No-op - Implemented to provide consistent std::vector
             AZSTD_CONTAINER_ASSERT(newCapacity <= capacity(),
@@ -556,79 +556,79 @@ namespace AZStd
         }
 
         // Removes unused capacity - For fixed_vector this does nothing
-        constexpr void shrink_to_fit()
+        void shrink_to_fit()
         {
             // No-op - Implemented to provide consistent std::vector
         }
 
-        constexpr reference at(size_type position)
+        reference at(size_type position)
         {
             AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range");
             return *(data() + position);
         }
-        constexpr const_reference at(size_type position) const
+        const_reference at(size_type position) const
         {
             AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range");
             return *(data() + position);
         }
 
-        constexpr reference operator[](size_type position)
+        reference operator[](size_type position)
         {
             AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range");
             return *(data() + position);
         }
-        constexpr const_reference operator[](size_type position) const
+        const_reference operator[](size_type position) const
         {
             AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range");
             return *(data() + position);
         }
 
-        constexpr reference front()
+        reference front()
         {
             AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::front - container is empty!");
             return *data();
         }
-        constexpr const_reference front() const
+        const_reference front() const
         {
             AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::front - container is empty!");
             return *data();
         }
-        constexpr reference back()
+        reference back()
         {
             AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::back - container is empty!");
             return *(data() + size() - 1);
         }
-        constexpr const_reference back() const
+        const_reference back() const
         {
             AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::back - container is empty!");
             return *(data() + size() - 1);
         }
 
-        constexpr void push_back(const_reference value)
+        void push_back(const_reference value)
         {
             emplace_back(value);
         }
 
-        constexpr void assign(size_type numElements, const_reference value)
+        void assign(size_type numElements, const_reference value)
         {
             clear();
             insert(end(), numElements, value);
         }
 
         template <class InputIt, typename = AZStd::enable_if_t<Internal::is_input_iterator_v<InputIt>>>
-        constexpr void assign(InputIt first, InputIt last)
+        void assign(InputIt first, InputIt last)
         {
             clear();
             insert(end(), first, last);
         }
 
-        constexpr void assign(AZStd::initializer_list<value_type> ilist)
+        void assign(AZStd::initializer_list<value_type> ilist)
         {
             assign(ilist.begin(), ilist.end());
         }
 
         template <typename... Args, typename = AZStd::enable_if_t<is_constructible_v<T, Args...>>>
-        constexpr iterator emplace(const_iterator insertPos, Args&&... args)
+        iterator emplace(const_iterator insertPos, Args&&... args)
         {
             AZSTD_CONTAINER_ASSERT(!full(), "Cannot emplace on a full fixed_vector");
             AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container");
@@ -645,18 +645,18 @@ namespace AZStd
             AZStd::construct_at(insertPosPtr, AZStd::forward<Args>(args)...);
             return iterator(insertPosPtr);
         }
-        constexpr iterator insert(const_iterator insertPos, const_reference value)
+        iterator insert(const_iterator insertPos, const_reference value)
         {
             AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container");
             return emplace(insertPos, value);
         }
-        constexpr iterator insert(const_iterator insertPos, value_type&& value)
+        iterator insert(const_iterator insertPos, value_type&& value)
         {
             AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container");
             return emplace(insertPos, AZStd::move(value));
         }
 
-        constexpr void insert(const_iterator insertPos, size_type numElements, const_reference value)
+        void insert(const_iterator insertPos, size_type numElements, const_reference value)
         {
             if (numElements == 0)
             {
@@ -708,24 +708,24 @@ namespace AZStd
         }
 
         template<class InputIt, typename = AZStd::enable_if_t<Internal::is_input_iterator_v<InputIt>>>
-        constexpr void insert(const_iterator insertPos, InputIt first, InputIt last)
+        void insert(const_iterator insertPos, InputIt first, InputIt last)
         {
             // specialize for iterator categories.
             AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container");
             insert_iter(insertPos, first, last, typename iterator_traits<InputIt>::iterator_category());
         };
 
-        constexpr void insert(const_iterator insertPos, AZStd::initializer_list<value_type> ilist)
+        void insert(const_iterator insertPos, AZStd::initializer_list<value_type> ilist)
         {
             insert(insertPos, ilist.begin(), ilist.end());
         }
 
-        constexpr iterator erase(const_iterator elementIter)
+        iterator erase(const_iterator elementIter)
         {
             return erase(elementIter, elementIter + 1);
         }
 
-        constexpr iterator erase(const_iterator first, const_iterator last)
+        iterator erase(const_iterator first, const_iterator last)
         {
             AZSTD_CONTAINER_ASSERT(first >= cbegin() && last <= cend(), "erase iterator must be inside the range of fixed_vector container");
             iterator dataStart = begin();
@@ -741,12 +741,12 @@ namespace AZStd
             return dataStart + offset;
         }
 
-        constexpr void clear()
+        void clear()
         {
             base_type::unsafe_destroy_all();
             resize_no_construct(0);
         }
-        constexpr void swap(fixed_vector& rhs)
+        void swap(fixed_vector& rhs)
         {
             // Fixed containers cannot swap pointers, they need to do full copies.
             // The strategy is to extend the smaller fixed_vector to be the size
@@ -776,12 +776,12 @@ namespace AZStd
         }
 
         // Validate container status.
-        constexpr bool validate() const
+        bool validate() const
         {
             return size() <= max_size();
         }
         // Validate iterator.
-        constexpr int validate_iterator(const_iterator iter) const
+        int validate_iterator(const_iterator iter) const
         {
             const_pointer start = data();
             const_pointer end = data() + size();
@@ -799,19 +799,19 @@ namespace AZStd
         }
 
         // pushes back an empty without a provided instance.
-        constexpr void push_back()
+        void push_back()
         {
             emplace_back();
         }
 
-        constexpr void leak_and_reset()
+        void leak_and_reset()
         {
             resize_no_construct(0);
         }
 
     private:
         template <typename VectorContainer>
-        constexpr fixed_vector& assign_helper(VectorContainer&& rhs)
+        fixed_vector& assign_helper(VectorContainer&& rhs)
         {
             constexpr bool is_const_or_lvalue_reference = AZStd::is_lvalue_reference_v<VectorContainer>
                 || AZStd::is_const_v<VectorContainer>;
@@ -872,7 +872,7 @@ namespace AZStd
         }
 
         template<class Iterator>
-        constexpr void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const forward_iterator_tag&)
+        void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const forward_iterator_tag&)
         {
             size_type numElements = AZStd::distance(first, last);
             if (numElements == 0)
@@ -923,7 +923,7 @@ namespace AZStd
         }
 
         template<class Iterator>
-        constexpr void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const input_iterator_tag&)
+        void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const input_iterator_tag&)
         {
             iterator dataStart = data();
             size_type offset = AZStd::distance(dataStart, insertPos);
@@ -974,4 +974,22 @@ namespace AZStd
     {
         return !operator<(a, b);
     }
+
+    // C++20 erase free functions
+    template<class T, size_t Capacity, class U>
+    constexpr decltype(auto) erase(fixed_vector<T, Capacity>& container, const U& value)
+    {
+        auto iter = AZStd::remove(container.begin(), container.end(), value);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
+    template<class T, size_t Capacity, class Predicate>
+    constexpr decltype(auto) erase_if(fixed_vector<T, Capacity>& container, Predicate predicate)
+    {
+        auto iter = AZStd::remove_if(container.begin(), container.end(), predicate);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
 }
diff --git a/Code/Framework/AzCore/AzCore/std/containers/forward_list.h b/Code/Framework/AzCore/AzCore/std/containers/forward_list.h
index 407d65ffa9..9d7eebbe0e 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/forward_list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/forward_list.h
@@ -1275,6 +1275,11 @@ namespace AZStd
         return !(left == right);
     }
 
+    template<class T, class Allocator, class U>
+    decltype(auto) erase(forward_list<T, Allocator>& container, const U& value)
+    {
+        return container.remove(value);
+    }
     template<class T, class Allocator, class Predicate>
     decltype(auto) erase_if(forward_list<T, Allocator>& container, Predicate predicate)
     {
diff --git a/Code/Framework/AzCore/AzCore/std/containers/list.h b/Code/Framework/AzCore/AzCore/std/containers/list.h
index 60d2977749..51bc62f444 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/list.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/list.h
@@ -1340,6 +1340,11 @@ namespace AZStd
         return !(left == right);
     }
 
+    template<class T, class Allocator, class U>
+    decltype(auto) erase(list<T, Allocator>& container, const U& value)
+    {
+        return container.remove(value);
+    }
     template<class T, class Allocator, class Predicate>
     decltype(auto) erase_if(list<T, Allocator>& container, Predicate predicate)
     {
diff --git a/Code/Framework/AzCore/AzCore/std/containers/vector.h b/Code/Framework/AzCore/AzCore/std/containers/vector.h
index 48de12a5b4..255e1c4de4 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/vector.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/vector.h
@@ -1387,6 +1387,14 @@ namespace AZStd
     }
     //#pragma endregion
 
+    template<class T, class Allocator, class U>
+    decltype(auto) erase(vector<T, Allocator>& container, const U& value)
+    {
+        auto iter = AZStd::remove(container.begin(), container.end(), value);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
     template<class T, class Allocator, class Predicate>
     decltype(auto) erase_if(vector<T, Allocator>& container, Predicate predicate)
     {
diff --git a/Code/Framework/AzCore/AzCore/std/string/fixed_string.h b/Code/Framework/AzCore/AzCore/std/string/fixed_string.h
index b68f21784b..a8e0f96988 100644
--- a/Code/Framework/AzCore/AzCore/std/string/fixed_string.h
+++ b/Code/Framework/AzCore/AzCore/std/string/fixed_string.h
@@ -465,6 +465,15 @@ namespace AZStd
     template<class Element, size_t MaxElementCount, class Traits>
     constexpr bool operator>=(const Element* lhs, const basic_fixed_string<Element, MaxElementCount, Traits>& rhs);
 
+    // C++20 erase helpers
+    template<class Element, size_t MaxElementCount, class Traits, class U>
+    constexpr auto erase(basic_fixed_string<Element, MaxElementCount, Traits>& container, const U& element)
+        -> typename basic_fixed_string<Element, MaxElementCount, Traits>::size_type;
+
+    template<class Element, size_t MaxElementCount, class Traits, class Predicate>
+    constexpr auto erase_if(basic_fixed_string<Element, MaxElementCount, Traits>& container, Predicate predicate)
+        -> typename basic_fixed_string<Element, MaxElementCount, Traits>::size_type;
+
     template<class T>
     struct hash;
 
diff --git a/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl b/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl
index 9a7e38aca0..8b973d3b2c 100644
--- a/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl
+++ b/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <cstring>
 
-#include <AzCore/std/typetraits/is_integral.h>
+#include <AzCore/std/algorithm.h>
 
 #include <AzCore/std/string/fixed_string_Platform.inl>
 
@@ -1680,6 +1680,26 @@ namespace AZStd
         return !operator<(lhs, rhs);
     }
 
+    template<class Element, size_t MaxElementCount, class Traits, class U>
+    inline constexpr auto erase(basic_fixed_string<Element, MaxElementCount, Traits>& container, const U& element)
+        -> typename basic_fixed_string<Element, MaxElementCount, Traits>::size_type
+    {
+        auto iter = AZStd::remove(container.begin(), container.end(), element);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
+
+    template<class Element, size_t MaxElementCount, class Traits, class Predicate>
+    inline constexpr auto erase_if(basic_fixed_string<Element, MaxElementCount, Traits>& container, Predicate predicate)
+        -> typename basic_fixed_string<Element, MaxElementCount, Traits>::size_type
+    {
+        auto iter = AZStd::remove_if(container.begin(), container.end(), predicate);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
+
     template<class Element, size_t MaxElementCount, class Traits>
     struct hash<basic_fixed_string<Element, MaxElementCount, Traits>>
     {
diff --git a/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp b/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp
index 8f2d5ddf25..21f3a1c5f4 100644
--- a/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp
+++ b/Code/Framework/AzCore/AzCore/std/string/memorytoascii.cpp
@@ -8,179 +8,176 @@
 
 #include <AzCore/std/string/memorytoascii.h>
 
-namespace AZStd
+namespace AZStd::MemoryToASCII
 {
-    namespace MemoryToASCII
+    AZStd::string ToString(const void* memoryAddrs, AZStd::size_t dataSize, AZStd::size_t maxShowSize, AZStd::size_t dataWidth/*=16*/, Options format/*=Options::Default*/)
     {
-        AZStd::string ToString(const void* memoryAddrs, AZStd::size_t dataSize, AZStd::size_t maxShowSize, AZStd::size_t dataWidth/*=16*/, Options format/*=Options::Default*/)
+        AZStd::string output;
+
+        if ((memoryAddrs != nullptr) && (dataSize > 0))
         {
-            AZStd::string output;
+            const AZ::u8 *data = reinterpret_cast<const AZ::u8*>(memoryAddrs);
 
-            if ((memoryAddrs != nullptr) && (dataSize > 0))
+            if (static_cast<unsigned>(format) != 0)
             {
-                const AZ::u8 *data = reinterpret_cast<const AZ::u8*>(memoryAddrs);
+                output.reserve(8162);
 
-                if (static_cast<unsigned>(format) != 0)
+                bool showHeader = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Header) ? true : false;
+                bool showOffset = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Offset) ? true : false;
+                bool showBinary = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Binary) ? true : false;
+                bool showASCII = static_cast<unsigned>(format) & static_cast<unsigned>(Options::ASCII) ? true : false;
+                bool showInfo = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Info) ? true : false;
+
+                // Because of the auto formatting for the headers, the min width is 3
+                if (dataWidth < 3)
                 {
-                    output.reserve(8162);
+                    dataWidth = 3;
+                }
 
-                    bool showHeader = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Header) ? true : false;
-                    bool showOffset = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Offset) ? true : false;
-                    bool showBinary = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Binary) ? true : false;
-                    bool showASCII = static_cast<unsigned>(format) & static_cast<unsigned>(Options::ASCII) ? true : false;
-                    bool showInfo = static_cast<unsigned>(format) & static_cast<unsigned>(Options::Info) ? true : false;
+                if (showHeader)
+                {
+                    AZStd::string line1;
+                    AZStd::string line2;
+                    line1.reserve(1024);
+                    line2.reserve(1024);
 
-                    // Because of the auto formatting for the headers, the min width is 3
-                    if (dataWidth < 3)
+                    if (showOffset)
                     {
-                        dataWidth = 3;
+                        line1 += "Offset";
+                        line2 += "------";
+
+                        if (showBinary || showASCII)
+                        {
+                            line1 += " ";
+                            line2 += " ";
+                        }
                     }
 
-                    if (showHeader)
+                    if (showBinary)
                     {
-                        AZStd::string line1;
-                        AZStd::string line2;
-                        line1.reserve(1024);
-                        line2.reserve(1024);
+                        static const char *kHeaderName = "Data";
+                        static AZStd::size_t kHeaderNameSize = 4;
 
-                        if (showOffset)
+                        AZStd::size_t lineLength = (dataWidth * 3) - 1;
+                        AZStd::size_t numPreSpaces = (lineLength - kHeaderNameSize) / 2;
+                        AZStd::size_t numPostSpaces = lineLength - numPreSpaces - kHeaderNameSize;
+
+                        line1 += AZStd::string(numPreSpaces, ' ') + kHeaderName + AZStd::string(numPostSpaces, ' ');
+                        //line2 += AZStd::string(lineLength, '-');
+                        for(size_t i=0; i<dataWidth; i++)
                         {
-                            line1 += "Offset";
-                            line2 += "------";
-
-                            if (showBinary || showASCII)
+                            if (i > 0)
                             {
-                                line1 += " ";
-                                line2 += " ";
-                            }
-                        }
-
-                        if (showBinary)
-                        {
-                            static const char *kHeaderName = "Data";
-                            static AZStd::size_t kHeaderNameSize = 4;
-
-                            AZStd::size_t lineLength = (dataWidth * 3) - 1;
-                            AZStd::size_t numPreSpaces = (lineLength - kHeaderNameSize) / 2;
-                            AZStd::size_t numPostSpaces = lineLength - numPreSpaces - kHeaderNameSize;
-
-                            line1 += AZStd::string(numPreSpaces, ' ') + kHeaderName + AZStd::string(numPostSpaces, ' ');
-                            //line2 += AZStd::string(lineLength, '-');
-                            for(size_t i=0; i<dataWidth; i++)
-                            {
-                                if (i > 0)
-                                {
-                                    line2 += "-";
-                                }
-
-                                line2 += AZStd::string::format("%02zx", i);
+                                line2 += "-";
                             }
 
-                            if (showASCII)
-                            {
-                                line1 += " ";
-                                line2 += " ";
-                            }
+                            line2 += AZStd::string::format("%02zx", i);
                         }
 
                         if (showASCII)
                         {
-                            static const char *kHeaderName = "ASCII";
-                            static AZStd::size_t kHeaderNameSize = 5;
-
-                            AZStd::size_t numPreSpaces = (dataWidth - kHeaderNameSize) / 2;
-                            AZStd::size_t numPostSpaces = dataWidth - numPreSpaces - kHeaderNameSize;
-
-                            line1 += AZStd::string(numPreSpaces, ' ') + kHeaderName + AZStd::string(numPostSpaces, ' ');
-                            line2 += AZStd::string(dataWidth, '-');
+                            line1 += " ";
+                            line2 += " ";
                         }
-
-                        if (showInfo)
-                        {
-                            output += AZStd::string::format("Address: 0x%p Data Size:%zu Max Size:%zu\n", data, dataSize, maxShowSize);
-                        }
-
-                        output += line1 + "\n";
-                        output += line2 + "\n";
                     }
 
-                    AZStd::size_t offset = 0;
-                    AZStd::size_t maxSize = dataSize > maxShowSize ? maxShowSize : dataSize;
-
-                    while (offset < maxSize)
+                    if (showASCII)
                     {
-                        if (showOffset)
-                        {
-                            output += AZStd::string::format("%06zx", offset);
+                        static const char *kHeaderName = "ASCII";
+                        static AZStd::size_t kHeaderNameSize = 5;
 
-                            if (showBinary || showASCII)
+                        AZStd::size_t numPreSpaces = (dataWidth - kHeaderNameSize) / 2;
+                        AZStd::size_t numPostSpaces = dataWidth - numPreSpaces - kHeaderNameSize;
+
+                        line1 += AZStd::string(numPreSpaces, ' ') + kHeaderName + AZStd::string(numPostSpaces, ' ');
+                        line2 += AZStd::string(dataWidth, '-');
+                    }
+
+                    if (showInfo)
+                    {
+                        output += AZStd::string::format("Address: 0x%p Data Size:%zu Max Size:%zu\n", data, dataSize, maxShowSize);
+                    }
+
+                    output += line1 + "\n";
+                    output += line2 + "\n";
+                }
+
+                AZStd::size_t offset = 0;
+                AZStd::size_t maxSize = dataSize > maxShowSize ? maxShowSize : dataSize;
+
+                while (offset < maxSize)
+                {
+                    if (showOffset)
+                    {
+                        output += AZStd::string::format("%06zx", offset);
+
+                        if (showBinary || showASCII)
+                        {
+                            output += " ";
+                        }
+                    }
+
+                    if (showBinary)
+                    {
+                        AZStd::string binLine;
+                        binLine.reserve((dataWidth * 3) * 2);
+
+                        for (AZStd::size_t index = 0; index < dataWidth; index++)
+                        {
+                            if (!binLine.empty())
                             {
-                                output += " ";
+                                binLine += " ";
+                            }
+
+                            if ((offset + index) < maxSize)
+                            {
+                                binLine += AZStd::string::format("%02x", data[offset + index]);
+                            }
+                            else
+                            {
+                                binLine += "  ";
                             }
                         }
 
-                        if (showBinary)
-                        {
-                            AZStd::string binLine;
-                            binLine.reserve((dataWidth * 3) * 2);
-
-                            for (AZStd::size_t index = 0; index < dataWidth; index++)
-                            {
-                                if (!binLine.empty())
-                                {
-                                    binLine += " ";
-                                }
-
-                                if ((offset + index) < maxSize)
-                                {
-                                    binLine += AZStd::string::format("%02x", data[offset + index]);
-                                }
-                                else
-                                {
-                                    binLine += "  ";
-                                }
-                            }
-
-                            output += binLine;
-
-                            if (showASCII)
-                            {
-                                output += " ";
-                            }
-                        }
+                        output += binLine;
 
                         if (showASCII)
                         {
-                            AZStd::string asciiLine;
-                            asciiLine.reserve(dataWidth * 2);
+                            output += " ";
+                        }
+                    }
 
-                            for (AZStd::size_t index = 0; index < dataWidth; index++)
+                    if (showASCII)
+                    {
+                        AZStd::string asciiLine;
+                        asciiLine.reserve(dataWidth * 2);
+
+                        for (AZStd::size_t index = 0; index < dataWidth; index++)
+                        {
+                            if ((offset + index) > maxSize)
                             {
-                                if ((offset + index) > maxSize)
-                                {
-                                    break;
-                                }
-                                else
-                                {
-                                    char value = static_cast<char>(data[offset + index]);
-
-                                    if ((value < 32) || (value > 127))
-                                        value = ' ';
-
-                                    asciiLine += value;
-                                }
+                                break;
                             }
+                            else
+                            {
+                                char value = static_cast<char>(data[offset + index]);
 
-                            output += asciiLine;
+                                if ((value < 32) || (value > 127))
+                                    value = ' ';
+
+                                asciiLine += value;
+                            }
                         }
 
-                        output += "\n";
-                        offset += dataWidth;
+                        output += asciiLine;
                     }
+
+                    output += "\n";
+                    offset += dataWidth;
                 }
             }
-
-            return output;
         }
-    } // namespace MemoryToASCII
-} // namespace AZStd
+
+        return output;
+    }
+} // namespace AZStd::MemoryToASCII
diff --git a/Code/Framework/AzCore/AzCore/std/string/string.h b/Code/Framework/AzCore/AzCore/std/string/string.h
index 9ef7ea3086..e107c4657d 100644
--- a/Code/Framework/AzCore/AzCore/std/string/string.h
+++ b/Code/Framework/AzCore/AzCore/std/string/string.h
@@ -1955,6 +1955,16 @@ namespace AZStd
     {
         return basic_string<Element, Traits, Allocator>(lhs).compare(rhs) >= 0;
     }
+
+    template<class Element, class Traits, class Allocator, class U>
+    decltype(auto) erase(basic_string<Element, Traits, Allocator>& container, const U& element)
+    {
+        auto iter = AZStd::remove(container.begin(), container.end(), element);
+        auto removedCount = AZStd::distance(iter, container.end());
+        container.erase(iter, container.end());
+        return removedCount;
+    }
+
     template<class Element, class Traits, class Allocator, class Predicate>
     decltype(auto) erase_if(basic_string<Element, Traits, Allocator>& container, Predicate predicate)
     {
diff --git a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
index 495c8d5f2c..e8efce1133 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 0
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 1
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 1
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 0
@@ -75,7 +73,6 @@
 #define AZ_TRAIT_HEAPSCHEMA_COMPILE_MALLINFO 0
 #define AZ_TRAIT_IS_ABS_PATH_IF_COLON_FOUND_ANYWHERE 0
 #define AZ_TRAIT_JSON_CLANG_IGNORE_UNKNOWN_WARNING 0
-#define AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS 0
 #define AZ_TRAIT_PERF_MEMORYBENCHMARK_IS_AVAILABLE 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING_INTERVAL_MS 0
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/Trace_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/Trace_UnixLike.cpp
index f4d7db802b..92a80b0d9a 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/Trace_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Debug/Trace_UnixLike.cpp
@@ -13,73 +13,67 @@
 #include <signal.h>
 #include <unistd.h>
 
-namespace AZ
+namespace AZ::Debug::Platform
 {
-    namespace Debug
-    {
-        namespace Platform
-        {
 #if defined(AZ_ENABLE_DEBUG_TOOLS)
-            bool performDebuggerDetection()
+    bool performDebuggerDetection()
+    {
+        AZ::IO::SystemFile processStatusFile;
+        if (!processStatusFile.Open("/proc/self/status", AZ::IO::SystemFile::SF_OPEN_READ_ONLY))
+        {
+            return false;
+        }
+
+        char buffer[4096];
+        AZ::IO::SystemFile::SizeType numRead = processStatusFile.Read(sizeof(buffer), buffer);
+
+        const AZStd::string_view processStatusView(buffer, buffer + numRead);
+        constexpr AZStd::string_view tracerPidString = "TracerPid:";
+        const size_t tracerPidOffset = processStatusView.find(tracerPidString);
+        if (tracerPidOffset == AZStd::string_view::npos)
+        {
+            return false;
+        }
+        for (size_t i = tracerPidOffset + tracerPidString.length(); i < numRead; ++i)
+        {
+            if (!::isspace(processStatusView[i]))
             {
-                AZ::IO::SystemFile processStatusFile;
-                if (!processStatusFile.Open("/proc/self/status", AZ::IO::SystemFile::SF_OPEN_READ_ONLY))
-                {
-                    return false;
-                }
-
-                char buffer[4096];
-                AZ::IO::SystemFile::SizeType numRead = processStatusFile.Read(sizeof(buffer), buffer);
-
-                const AZStd::string_view processStatusView(buffer, buffer + numRead);
-                constexpr AZStd::string_view tracerPidString = "TracerPid:";
-                const size_t tracerPidOffset = processStatusView.find(tracerPidString);
-                if (tracerPidOffset == AZStd::string_view::npos)
-                {
-                    return false;
-                }
-                for (size_t i = tracerPidOffset + tracerPidString.length(); i < numRead; ++i)
-                {
-                    if (!::isspace(processStatusView[i]))
-                    {
-                        return processStatusView[i] != '0';
-                    }
-                }
-                return false;
-            }
-
-            bool IsDebuggerPresent()
-            {
-                static bool s_detectionPerformed = false;
-                static bool s_debuggerDetected = false;
-                if (!s_detectionPerformed)
-                {
-                    s_debuggerDetected = performDebuggerDetection();
-                    s_detectionPerformed = true;
-                }
-                return s_debuggerDetected;
-            }
-
-            bool AttachDebugger()
-            {
-                // Not supported yet
-                AZ_Assert(false, "AttachDebugger() is not supported for Unix platform yet");
-                return false;
-            }
-
-            void HandleExceptions(bool)
-            {}
-
-            void DebugBreak()
-            {
-                raise(SIGINT);
-            }
-#endif // AZ_ENABLE_DEBUG_TOOLS
-
-            void Terminate(int exitCode)
-            {
-                _exit(exitCode);
+                return processStatusView[i] != '0';
             }
         }
+        return false;
     }
-}
+
+    bool IsDebuggerPresent()
+    {
+        static bool s_detectionPerformed = false;
+        static bool s_debuggerDetected = false;
+        if (!s_detectionPerformed)
+        {
+            s_debuggerDetected = performDebuggerDetection();
+            s_detectionPerformed = true;
+        }
+        return s_debuggerDetected;
+    }
+
+    bool AttachDebugger()
+    {
+        // Not supported yet
+        AZ_Assert(false, "AttachDebugger() is not supported for Unix platform yet");
+        return false;
+    }
+
+    void HandleExceptions(bool)
+    {}
+
+    void DebugBreak()
+    {
+        raise(SIGINT);
+    }
+#endif // AZ_ENABLE_DEBUG_TOOLS
+
+    void Terminate(int exitCode)
+    {
+        _exit(exitCode);
+    }
+} // namespace AZ::Debug::Platform
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.cpp
index 07614ad56b..4c605f6154 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/IO/Internal/SystemFileUtils_UnixLike.cpp
@@ -8,82 +8,76 @@
 
 #include "SystemFileUtils_UnixLike.h"
 
-namespace AZ
+namespace AZ::IO::Internal
 {
-    namespace IO
+    bool FormatAndPeelOffWildCardExtension(const char* sourcePath, char* filePath, size_t filePathSize, char* extensionPath, size_t extensionSize, bool keepWildcard)
     {
-        namespace Internal
+        if (sourcePath == nullptr || filePath == nullptr || extensionPath == nullptr || filePathSize == 0 || extensionSize == 0)
         {
-            bool FormatAndPeelOffWildCardExtension(const char* sourcePath, char* filePath, size_t filePathSize, char* extensionPath, size_t extensionSize, bool keepWildcard)
+            AZ_Error("AZ::IO::Internal", false, "FormatAndPeelOffWildCardExtension: One or more parameters was invalid.");
+            return false;
+        }
+        const char* pSrcPath = sourcePath;
+        char* pDestPath = filePath;
+        size_t destinationSize = filePathSize;
+        unsigned    numFileChars = 0;
+        unsigned    numExtensionChars = 0;
+        unsigned* pNumDestChars = &numFileChars;
+        bool        bIsWildcardExtension = false;
+        while (*pSrcPath)
+        {
+            char srcChar = *pSrcPath++;
+
+            // Skip '*' and '.'
+            if ((!bIsWildcardExtension && srcChar != '*') || (bIsWildcardExtension && srcChar != '.' && (keepWildcard || srcChar != '*')))
             {
-                if (sourcePath == nullptr || filePath == nullptr || extensionPath == nullptr || filePathSize == 0 || extensionSize == 0)
+                unsigned numChars = *pNumDestChars;
+                pDestPath[numChars++] = srcChar;
+                *pNumDestChars = numChars;
+
+                --destinationSize;
+                if (destinationSize == 0)
                 {
-                    AZ_Error("AZ::IO::Internal", false, "FormatAndPeelOffWildCardExtension: One or more parameters was invalid.");
+                    AZ_Error(
+                        "AZ::IO::Internal",
+                        false,
+                        "Error splitting sourcePath '%s' into filePath and extension, %s length is larger than storage size %d.",
+                        sourcePath,
+                        bIsWildcardExtension ? "extensionPath" : "filePath",
+                        bIsWildcardExtension ? extensionSize : filePathSize);
                     return false;
                 }
-                const char* pSrcPath = sourcePath;
-                char* pDestPath = filePath;
-                size_t destinationSize = filePathSize;
-                unsigned    numFileChars = 0;
-                unsigned    numExtensionChars = 0;
-                unsigned* pNumDestChars = &numFileChars;
-                bool        bIsWildcardExtension = false;
-                while (*pSrcPath)
+            }
+            // Wild-card extension is separate
+            if (srcChar == '*')
+            {
+                bIsWildcardExtension = true;
+                pDestPath = extensionPath;
+                destinationSize = extensionSize;
+                pNumDestChars = &numExtensionChars;
+                if (keepWildcard)
                 {
-                    char srcChar = *pSrcPath++;
+                    unsigned numChars = *pNumDestChars;
+                    pDestPath[numChars++] = srcChar;
+                    *pNumDestChars = numChars;
 
-                    // Skip '*' and '.'
-                    if ((!bIsWildcardExtension && srcChar != '*') || (bIsWildcardExtension && srcChar != '.' && (keepWildcard || srcChar != '*')))
+                    --destinationSize;
+                    if (destinationSize == 0)
                     {
-                        unsigned numChars = *pNumDestChars;
-                        pDestPath[numChars++] = srcChar;
-                        *pNumDestChars = numChars;
-
-                        --destinationSize;
-                        if (destinationSize == 0)
-                        {
-                            AZ_Error(
-                                "AZ::IO::Internal",
-                                false,
-                                "Error splitting sourcePath '%s' into filePath and extension, %s length is larger than storage size %d.",
-                                sourcePath,
-                                bIsWildcardExtension ? "extensionPath" : "filePath",
-                                bIsWildcardExtension ? extensionSize : filePathSize);
-                            return false;
-                        }
-                    }
-                    // Wild-card extension is separate
-                    if (srcChar == '*')
-                    {
-                        bIsWildcardExtension = true;
-                        pDestPath = extensionPath;
-                        destinationSize = extensionSize;
-                        pNumDestChars = &numExtensionChars;
-                        if (keepWildcard)
-                        {
-                            unsigned numChars = *pNumDestChars;
-                            pDestPath[numChars++] = srcChar;
-                            *pNumDestChars = numChars;
-
-                            --destinationSize;
-                            if (destinationSize == 0)
-                            {
-                                AZ_Error(
-                                    "AZ::IO::Internal",
-                                    false,
-                                    "Error splitting sourcePath '%s' into filePath and extension, extensionPath length is larger than storage size %d.",
-                                    sourcePath,
-                                    extensionSize);
-                                return false;
-                            }
-                        }
+                        AZ_Error(
+                            "AZ::IO::Internal",
+                            false,
+                            "Error splitting sourcePath '%s' into filePath and extension, extensionPath length is larger than storage size %d.",
+                            sourcePath,
+                            extensionSize);
+                        return false;
                     }
                 }
-                // Close strings
-                filePath[numFileChars] = 0;
-                extensionPath[numExtensionChars] = 0;
-                return true;
             }
         }
+        // Close strings
+        filePath[numFileChars] = 0;
+        extensionPath[numExtensionChars] = 0;
+        return true;
     }
-}
+} // namespace AZ::IO::Internal
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp
index bdc2e753be..4a316bcde6 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Platform_UnixLike.cpp
@@ -14,31 +14,28 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-namespace AZ
+namespace AZ::Platform
 {
-    namespace Platform
+    ProcessId GetCurrentProcessId()
     {
-        ProcessId GetCurrentProcessId()
-        {
-            return static_cast<ProcessId>(::getpid());
-        }
+        return static_cast<ProcessId>(::getpid());
+    }
 
-        MachineId GetLocalMachineId()
+    MachineId GetLocalMachineId()
+    {
+        if (s_machineId == 0)
         {
+            // In specialized server situations, SetLocalMachineId() should be used, with whatever criteria works best in that environment
+            // A proper implementation for each supported system will be needed instead of this temporary measure to avoid collision in the small scale.
+            // On a larger scale, the odds of two people getting in here at the same millisecond will go up drastically, and we'll have the same issue again,
+            // though far less reproducible, for duplicated EntityId's across a network.
+            s_machineId = static_cast<AZ::u32>(AZStd::GetTimeUTCMilliSecond() & 0xffffffff);
             if (s_machineId == 0)
             {
-                // In specialized server situations, SetLocalMachineId() should be used, with whatever criteria works best in that environment
-                // A proper implementation for each supported system will be needed instead of this temporary measure to avoid collision in the small scale.
-                // On a larger scale, the odds of two people getting in here at the same millisecond will go up drastically, and we'll have the same issue again,
-                // though far less reproducible, for duplicated EntityId's across a network.
-                s_machineId = static_cast<AZ::u32>(AZStd::GetTimeUTCMilliSecond() & 0xffffffff);
-                if (s_machineId == 0)
-                {
-                    s_machineId = 1;
-                    AZ_Warning("System", false, "0 machine ID is reserved!");
-                }
+                s_machineId = 1;
+                AZ_Warning("System", false, "0 machine ID is reserved!");
             }
-            return s_machineId;
         }
-    } // namespace Platform
-}
+        return s_machineId;
+    }
+} // namespace AZ::Platform
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.cpp
index 5b35b13d8b..555d70f1e6 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Socket/AzSocket_UnixLike.cpp
@@ -18,365 +18,362 @@
 #define INVALID_SOCKET (-1)
 #define closesocket(_s)         close(_s)
 #define GetInternalSocketError  errno
-typedef int SOCKET;
-typedef AZ::u32 AZSOCKLEN;
+using SOCKET = int;
+using AZSOCKLEN = AZ::u32;
 
-namespace AZ
+namespace AZ::AzSock
 {
-    namespace AzSock
+    AZ::s32 TranslateOSError(AZ::s32 oserror)
     {
-        AZ::s32 TranslateOSError(AZ::s32 oserror)
-        {
-            AZ::s32 error;
+        AZ::s32 error;
 
 #define TRANSLATE(_from, _to) case (_from): error = static_cast<AZ::s32>(_to); break;
 
-            switch (oserror)
-            {
-                TRANSLATE(0, AzSockError::eASE_NO_ERROR);
-                TRANSLATE(EACCES, AzSockError::eASE_EACCES);
-                TRANSLATE(EADDRINUSE, AzSockError::eASE_EADDRINUSE);
-                TRANSLATE(EADDRNOTAVAIL, AzSockError::eASE_EADDRNOTAVAIL);
-                TRANSLATE(EAFNOSUPPORT, AzSockError::eASE_EAFNOSUPPORT);
-                TRANSLATE(EALREADY, AzSockError::eASE_EALREADY);
-                TRANSLATE(EBADF, AzSockError::eASE_EBADF);
-                TRANSLATE(ECONNABORTED, AzSockError::eASE_ECONNABORTED);
-                TRANSLATE(ECONNREFUSED, AzSockError::eASE_ECONNREFUSED);
-                TRANSLATE(ECONNRESET, AzSockError::eASE_ECONNRESET);
-                TRANSLATE(EFAULT, AzSockError::eASE_EFAULT);
-                TRANSLATE(EHOSTDOWN, AzSockError::eASE_EHOSTDOWN);
-                TRANSLATE(EINPROGRESS, AzSockError::eASE_EINPROGRESS);
-                TRANSLATE(EINTR, AzSockError::eASE_EINTR);
-                TRANSLATE(EINVAL, AzSockError::eASE_EINVAL);
-                TRANSLATE(EISCONN, AzSockError::eASE_EISCONN);
-                TRANSLATE(EMFILE, AzSockError::eASE_EMFILE);
-                TRANSLATE(EMSGSIZE, AzSockError::eASE_EMSGSIZE);
-                TRANSLATE(ENETUNREACH, AzSockError::eASE_ENETUNREACH);
-                TRANSLATE(ENOBUFS, AzSockError::eASE_ENOBUFS);
-                TRANSLATE(ENOPROTOOPT, AzSockError::eASE_ENOPROTOOPT);
-                TRANSLATE(ENOTCONN, AzSockError::eASE_ENOTCONN);
-                TRANSLATE(EOPNOTSUPP, AzSockError::eASE_EOPNOTSUPP);
-                TRANSLATE(EPROTONOSUPPORT, AzSockError::eASE_EAFNOSUPPORT);
-                TRANSLATE(ETIMEDOUT, AzSockError::eASE_ETIMEDOUT);
-                TRANSLATE(ETOOMANYREFS, AzSockError::eASE_ETOOMANYREFS);
-                TRANSLATE(EWOULDBLOCK, AzSockError::eASE_EWOULDBLOCK);
+        switch (oserror)
+        {
+            TRANSLATE(0, AzSockError::eASE_NO_ERROR);
+            TRANSLATE(EACCES, AzSockError::eASE_EACCES);
+            TRANSLATE(EADDRINUSE, AzSockError::eASE_EADDRINUSE);
+            TRANSLATE(EADDRNOTAVAIL, AzSockError::eASE_EADDRNOTAVAIL);
+            TRANSLATE(EAFNOSUPPORT, AzSockError::eASE_EAFNOSUPPORT);
+            TRANSLATE(EALREADY, AzSockError::eASE_EALREADY);
+            TRANSLATE(EBADF, AzSockError::eASE_EBADF);
+            TRANSLATE(ECONNABORTED, AzSockError::eASE_ECONNABORTED);
+            TRANSLATE(ECONNREFUSED, AzSockError::eASE_ECONNREFUSED);
+            TRANSLATE(ECONNRESET, AzSockError::eASE_ECONNRESET);
+            TRANSLATE(EFAULT, AzSockError::eASE_EFAULT);
+            TRANSLATE(EHOSTDOWN, AzSockError::eASE_EHOSTDOWN);
+            TRANSLATE(EINPROGRESS, AzSockError::eASE_EINPROGRESS);
+            TRANSLATE(EINTR, AzSockError::eASE_EINTR);
+            TRANSLATE(EINVAL, AzSockError::eASE_EINVAL);
+            TRANSLATE(EISCONN, AzSockError::eASE_EISCONN);
+            TRANSLATE(EMFILE, AzSockError::eASE_EMFILE);
+            TRANSLATE(EMSGSIZE, AzSockError::eASE_EMSGSIZE);
+            TRANSLATE(ENETUNREACH, AzSockError::eASE_ENETUNREACH);
+            TRANSLATE(ENOBUFS, AzSockError::eASE_ENOBUFS);
+            TRANSLATE(ENOPROTOOPT, AzSockError::eASE_ENOPROTOOPT);
+            TRANSLATE(ENOTCONN, AzSockError::eASE_ENOTCONN);
+            TRANSLATE(EOPNOTSUPP, AzSockError::eASE_EOPNOTSUPP);
+            TRANSLATE(EPROTONOSUPPORT, AzSockError::eASE_EAFNOSUPPORT);
+            TRANSLATE(ETIMEDOUT, AzSockError::eASE_ETIMEDOUT);
+            TRANSLATE(ETOOMANYREFS, AzSockError::eASE_ETOOMANYREFS);
+            TRANSLATE(EWOULDBLOCK, AzSockError::eASE_EWOULDBLOCK);
 
-            default:
-                AZ_TracePrintf("AzSock", "AzSocket could not translate OS error code %x, treating as miscellaneous.\n", oserror);
-                error = static_cast<AZ::s32>(AzSockError::eASE_MISC_ERROR);
-                break;
-            }
+        default:
+            AZ_TracePrintf("AzSock", "AzSocket could not translate OS error code %x, treating as miscellaneous.\n", oserror);
+            error = static_cast<AZ::s32>(AzSockError::eASE_MISC_ERROR);
+            break;
+        }
 
 #undef TRANSLATE
 
-            return error;
-        }
+        return error;
+    }
 
-        AZ::s32 TranslateSocketOption(AzSocketOption opt)
-        {
-            AZ::s32 value;
+    AZ::s32 TranslateSocketOption(AzSocketOption opt)
+    {
+        AZ::s32 value;
 
 #define TRANSLATE(_from, _to) case (_from): value = (_to); break;
 
-            switch (opt)
-            {
-                TRANSLATE(AzSocketOption::REUSEADDR, SO_REUSEADDR);
-                TRANSLATE(AzSocketOption::KEEPALIVE, SO_KEEPALIVE);
-                TRANSLATE(AzSocketOption::LINGER, SO_LINGER);
+        switch (opt)
+        {
+            TRANSLATE(AzSocketOption::REUSEADDR, SO_REUSEADDR);
+            TRANSLATE(AzSocketOption::KEEPALIVE, SO_KEEPALIVE);
+            TRANSLATE(AzSocketOption::LINGER, SO_LINGER);
 
-            default:
-                AZ_TracePrintf("AzSock", "AzSocket option %x not yet supported", opt);
-                value = 0;
-                break;
-            }
+        default:
+            AZ_TracePrintf("AzSock", "AzSocket option %x not yet supported", opt);
+            value = 0;
+            break;
+        }
 
 #undef TRANSLATE
 
-            return value;
-        }
+        return value;
+    }
 
-        AZSOCKET HandleInvalidSocket(SOCKET sock)
+    AZSOCKET HandleInvalidSocket(SOCKET sock)
+    {
+        AZSOCKET azsock = static_cast<AZSOCKET>(sock);
+        if (sock == INVALID_SOCKET)
         {
-            AZSOCKET azsock = static_cast<AZSOCKET>(sock);
-            if (sock == INVALID_SOCKET)
-            {
-                azsock = TranslateOSError(GetInternalSocketError);
-            }
-            return azsock;
+            azsock = TranslateOSError(GetInternalSocketError);
         }
+        return azsock;
+    }
 
-        AZ::s32 HandleSocketError(AZ::s32 socketError)
+    AZ::s32 HandleSocketError(AZ::s32 socketError)
+    {
+        if (socketError == SOCKET_ERROR)
         {
-            if (socketError == SOCKET_ERROR)
-            {
-                socketError = TranslateOSError(GetInternalSocketError);
-            }
-            return socketError;
+            socketError = TranslateOSError(GetInternalSocketError);
         }
+        return socketError;
+    }
 
-        const char* GetStringForError(AZ::s32 errorNumber)
-        {
-            AzSockError errorCode = AzSockError(errorNumber);
+    const char* GetStringForError(AZ::s32 errorNumber)
+    {
+        AzSockError errorCode = AzSockError(errorNumber);
 
 #define CASE_RETSTRING(errorEnum) case errorEnum: { return #errorEnum; }
 
-            switch (errorCode)
-            {
-                CASE_RETSTRING(AzSockError::eASE_NO_ERROR);
-                CASE_RETSTRING(AzSockError::eASE_SOCKET_INVALID);
-                CASE_RETSTRING(AzSockError::eASE_EACCES);
-                CASE_RETSTRING(AzSockError::eASE_EADDRINUSE);
-                CASE_RETSTRING(AzSockError::eASE_EADDRNOTAVAIL);
-                CASE_RETSTRING(AzSockError::eASE_EAFNOSUPPORT);
-                CASE_RETSTRING(AzSockError::eASE_EALREADY);
-                CASE_RETSTRING(AzSockError::eASE_EBADF);
-                CASE_RETSTRING(AzSockError::eASE_ECONNABORTED);
-                CASE_RETSTRING(AzSockError::eASE_ECONNREFUSED);
-                CASE_RETSTRING(AzSockError::eASE_ECONNRESET);
-                CASE_RETSTRING(AzSockError::eASE_EFAULT);
-                CASE_RETSTRING(AzSockError::eASE_EHOSTDOWN);
-                CASE_RETSTRING(AzSockError::eASE_EINPROGRESS);
-                CASE_RETSTRING(AzSockError::eASE_EINTR);
-                CASE_RETSTRING(AzSockError::eASE_EINVAL);
-                CASE_RETSTRING(AzSockError::eASE_EISCONN);
-                CASE_RETSTRING(AzSockError::eASE_EMFILE);
-                CASE_RETSTRING(AzSockError::eASE_EMSGSIZE);
-                CASE_RETSTRING(AzSockError::eASE_ENETUNREACH);
-                CASE_RETSTRING(AzSockError::eASE_ENOBUFS);
-                CASE_RETSTRING(AzSockError::eASE_ENOPROTOOPT);
-                CASE_RETSTRING(AzSockError::eASE_ENOTCONN);
-                CASE_RETSTRING(AzSockError::eASE_ENOTINITIALISED);
-                CASE_RETSTRING(AzSockError::eASE_EOPNOTSUPP);
-                CASE_RETSTRING(AzSockError::eASE_EPIPE);
-                CASE_RETSTRING(AzSockError::eASE_EPROTONOSUPPORT);
-                CASE_RETSTRING(AzSockError::eASE_ETIMEDOUT);
-                CASE_RETSTRING(AzSockError::eASE_ETOOMANYREFS);
-                CASE_RETSTRING(AzSockError::eASE_EWOULDBLOCK);
-                CASE_RETSTRING(AzSockError::eASE_EWOULDBLOCK_CONN);
-                CASE_RETSTRING(AzSockError::eASE_MISC_ERROR);
-            }
+        switch (errorCode)
+        {
+            CASE_RETSTRING(AzSockError::eASE_NO_ERROR);
+            CASE_RETSTRING(AzSockError::eASE_SOCKET_INVALID);
+            CASE_RETSTRING(AzSockError::eASE_EACCES);
+            CASE_RETSTRING(AzSockError::eASE_EADDRINUSE);
+            CASE_RETSTRING(AzSockError::eASE_EADDRNOTAVAIL);
+            CASE_RETSTRING(AzSockError::eASE_EAFNOSUPPORT);
+            CASE_RETSTRING(AzSockError::eASE_EALREADY);
+            CASE_RETSTRING(AzSockError::eASE_EBADF);
+            CASE_RETSTRING(AzSockError::eASE_ECONNABORTED);
+            CASE_RETSTRING(AzSockError::eASE_ECONNREFUSED);
+            CASE_RETSTRING(AzSockError::eASE_ECONNRESET);
+            CASE_RETSTRING(AzSockError::eASE_EFAULT);
+            CASE_RETSTRING(AzSockError::eASE_EHOSTDOWN);
+            CASE_RETSTRING(AzSockError::eASE_EINPROGRESS);
+            CASE_RETSTRING(AzSockError::eASE_EINTR);
+            CASE_RETSTRING(AzSockError::eASE_EINVAL);
+            CASE_RETSTRING(AzSockError::eASE_EISCONN);
+            CASE_RETSTRING(AzSockError::eASE_EMFILE);
+            CASE_RETSTRING(AzSockError::eASE_EMSGSIZE);
+            CASE_RETSTRING(AzSockError::eASE_ENETUNREACH);
+            CASE_RETSTRING(AzSockError::eASE_ENOBUFS);
+            CASE_RETSTRING(AzSockError::eASE_ENOPROTOOPT);
+            CASE_RETSTRING(AzSockError::eASE_ENOTCONN);
+            CASE_RETSTRING(AzSockError::eASE_ENOTINITIALISED);
+            CASE_RETSTRING(AzSockError::eASE_EOPNOTSUPP);
+            CASE_RETSTRING(AzSockError::eASE_EPIPE);
+            CASE_RETSTRING(AzSockError::eASE_EPROTONOSUPPORT);
+            CASE_RETSTRING(AzSockError::eASE_ETIMEDOUT);
+            CASE_RETSTRING(AzSockError::eASE_ETOOMANYREFS);
+            CASE_RETSTRING(AzSockError::eASE_EWOULDBLOCK);
+            CASE_RETSTRING(AzSockError::eASE_EWOULDBLOCK_CONN);
+            CASE_RETSTRING(AzSockError::eASE_MISC_ERROR);
+        }
 
 #undef CASE_RETSTRING
 
-            return "(invalid)";
-        }
-
-        AZ::u32 HostToNetLong(AZ::u32 hstLong)
-        {
-            return htonl(hstLong);
-        }
-
-        AZ::u32 NetToHostLong(AZ::u32 netLong)
-        {
-            return ntohl(netLong);
-        }
-
-        AZ::u16 HostToNetShort(AZ::u16 hstShort)
-        {
-            return htons(hstShort);
-        }
-
-        AZ::u16 NetToHostShort(AZ::u16 netShort)
-        {
-            return ntohs(netShort);
-        }
-
-        AZ::s32 GetHostName(AZStd::string& hostname)
-        {
-            AZ::s32 result = 0;
-            hostname.clear();
-            char name[256];
-            result = HandleSocketError(gethostname(name, AZ_ARRAY_SIZE(name)));
-            if (result == static_cast<AZ::s32>(AzSockError::eASE_NO_ERROR))
-            {
-                hostname = name;
-            }
-            return result;
-        }
-
-        AZSOCKET Socket()
-        {
-            return Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-        }
-
-        AZSOCKET Socket(AZ::s32 af, AZ::s32 type, AZ::s32 protocol)
-        {
-            return HandleInvalidSocket(socket(af, type, protocol));
-        }
-
-        AZ::s32 SetSockOpt(AZSOCKET sock, AZ::s32 level, AZ::s32 optname, const char* optval, AZ::s32 optlen)
-        {
-            AZSOCKLEN length(optlen);
-            return HandleSocketError(setsockopt(sock, level, optname, optval, length));
-        }
-
-        AZ::s32 SetSocketOption(AZSOCKET sock, AzSocketOption opt, bool enable)
-        {
-            AZ::u32 val = enable ? 1 : 0;
-            return SetSockOpt(sock, SOL_SOCKET, TranslateSocketOption(opt), reinterpret_cast<const char*>(&val), sizeof(val));
-        }
-
-        AZ::s32 EnableTCPNoDelay(AZSOCKET sock, bool enable)
-        {
-            AZ::u32 val = enable ? 1 : 0;
-            return SetSockOpt(sock, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<const char*>(&val), sizeof(val));
-        }
-
-        AZ::s32 SetSocketBlockingMode(AZSOCKET sock, bool blocking)
-        {
-            AZ::s32 flags = ::fcntl(sock, F_GETFL);
-            flags &= ~O_NONBLOCK;
-            flags |= (blocking ? 0 : O_NONBLOCK);
-            return ::fcntl(sock, F_SETFL, flags);
-        }
-
-        AZ::s32 CloseSocket(AZSOCKET sock)
-        {
-            return HandleSocketError(closesocket(sock));
-        }
-
-        AZ::s32 Shutdown(AZSOCKET sock, AZ::s32 how)
-        {
-            return HandleSocketError(shutdown(sock, how));
-        }
-
-        AZ::s32 GetSockName(AZSOCKET sock, AzSocketAddress& addr)
-        {
-            AZSOCKADDR sAddr;
-            AZSOCKLEN sAddrLen = sizeof(AZSOCKADDR);
-            memset(&sAddr, 0, sAddrLen);
-            AZ::s32 result = HandleSocketError(getsockname(sock, &sAddr, &sAddrLen));
-            addr = sAddr;
-            return result;
-        }
-
-        AZ::s32 Connect(AZSOCKET sock, const AzSocketAddress& addr)
-        {
-            AZ::s32 err = HandleSocketError(connect(sock, addr.GetTargetAddress(), sizeof(AZSOCKADDR_IN)));
-            if (err == static_cast<AZ::s32>(AzSockError::eASE_EINPROGRESS))
-            {
-                err = static_cast<AZ::s32>(AzSockError::eASE_EWOULDBLOCK_CONN);
-            }
-            return err;
-        }
-
-        AZ::s32 Listen(AZSOCKET sock, AZ::s32 backlog)
-        {
-            return HandleSocketError(listen(sock, backlog));
-        }
-
-        AZSOCKET Accept(AZSOCKET sock, AzSocketAddress& addr)
-        {
-            AZSOCKADDR sAddr;
-            AZSOCKLEN sAddrLen = sizeof(AZSOCKADDR);
-            memset(&sAddr, 0, sAddrLen);
-            AZSOCKET outSock = HandleInvalidSocket(accept(sock, &sAddr, &sAddrLen));
-            addr = sAddr;
-            return outSock;
-        }
-
-        AZ::s32 Send(AZSOCKET sock, const char* buf, AZ::s32 len, AZ::s32 flags)
-        {
-            AZ::s32 msgNoSignal = MSG_NOSIGNAL;
-            return HandleSocketError(send(sock, buf, len, flags | msgNoSignal));
-        }
-
-        AZ::s32 Recv(AZSOCKET sock, char* buf, AZ::s32 len, AZ::s32 flags)
-        {
-            return HandleSocketError(recv(sock, buf, len, flags));
-        }
-
-        AZ::s32 Bind(AZSOCKET sock, const AzSocketAddress& addr)
-        {
-            return HandleSocketError(bind(sock, addr.GetTargetAddress(), sizeof(AZSOCKADDR_IN)));
-        }
-
-        AZ::s32 Select(AZSOCKET sock, AZFD_SET* readfdsock, AZFD_SET* writefdsock, AZFD_SET* exceptfdsock, AZTIMEVAL* timeout)
-        {
-            return HandleSocketError(::select(sock + 1, readfdsock, writefdsock, exceptfdsock, timeout));
-        }
-
-        AZ::s32 IsRecvPending(AZSOCKET sock, AZTIMEVAL* timeout)
-        {
-            AZFD_SET readSet;
-            FD_ZERO(&readSet);
-            FD_SET(sock, &readSet);
-
-            AZ::s32 ret = Select(sock, &readSet, nullptr, nullptr, timeout);
-            if (ret >= 0)
-            {
-                ret = FD_ISSET(sock, &readSet);
-                if (ret != 0)
-                {
-                    ret = 1;
-                }
-            }
-
-            return ret;
-        }
-
-        AZ::s32 WaitForWritableSocket(AZSOCKET sock, AZTIMEVAL* timeout)
-        {
-            AZFD_SET writeSet;
-            FD_ZERO(&writeSet);
-            FD_SET(sock, &writeSet);
-
-            AZ::s32 ret = Select(sock, nullptr, &writeSet, nullptr, timeout);
-            if (ret >= 0)
-            {
-                ret = FD_ISSET(sock, &writeSet);
-                if (ret != 0)
-                {
-                    ret = 1;
-                }
-            }
-
-            return ret;
-        }
-
-        AZ::s32 Startup()
-        {
-            return static_cast<AZ::s32>(AzSockError::eASE_NO_ERROR);
-        }
-
-        AZ::s32 Cleanup()
-        {
-            return static_cast<AZ::s32>(AzSockError::eASE_NO_ERROR);
-        }
-
-        bool ResolveAddress(const AZStd::string& ip, AZ::u16 port, AZSOCKADDR_IN& socketAddress)
-        {
-            bool foundAddr = false;
-            addrinfo hints;
-            memset(&hints, 0, sizeof(addrinfo));
-            addrinfo* addrInfo;
-            hints.ai_family = AF_INET;
-            hints.ai_flags = AI_CANONNAME;
-            char strPort[8];
-            azsnprintf(strPort, AZ_ARRAY_SIZE(strPort), "%d", port);
-            
-            const char* address = ip.c_str();
-            if (address && strlen(address) == 0) // getaddrinfo doesn't accept empty string
-            {
-                address = nullptr;
-            }
-
-            AZ::s32 err = HandleSocketError(getaddrinfo(address, strPort, &hints, &addrInfo));
-            if (err == 0) // eASE_NO_ERROR
-            {
-                if (addrInfo->ai_family == AF_INET)
-                {
-                    socketAddress = *reinterpret_cast<const AZSOCKADDR_IN*>(addrInfo->ai_addr);
-                    foundAddr = true;
-                }
-
-                freeaddrinfo(addrInfo);
-            }
-            else
-            {
-                AZ_Assert(false, "AzSocketAddress could not resolve address %s with port %d. (reason - %s)", ip.c_str(), port, GetStringForError(err));
-            }
-            return foundAddr;
-        }
+        return "(invalid)";
     }
-}
+
+    AZ::u32 HostToNetLong(AZ::u32 hstLong)
+    {
+        return htonl(hstLong);
+    }
+
+    AZ::u32 NetToHostLong(AZ::u32 netLong)
+    {
+        return ntohl(netLong);
+    }
+
+    AZ::u16 HostToNetShort(AZ::u16 hstShort)
+    {
+        return htons(hstShort);
+    }
+
+    AZ::u16 NetToHostShort(AZ::u16 netShort)
+    {
+        return ntohs(netShort);
+    }
+
+    AZ::s32 GetHostName(AZStd::string& hostname)
+    {
+        AZ::s32 result = 0;
+        hostname.clear();
+        char name[256];
+        result = HandleSocketError(gethostname(name, AZ_ARRAY_SIZE(name)));
+        if (result == static_cast<AZ::s32>(AzSockError::eASE_NO_ERROR))
+        {
+            hostname = name;
+        }
+        return result;
+    }
+
+    AZSOCKET Socket()
+    {
+        return Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    }
+
+    AZSOCKET Socket(AZ::s32 af, AZ::s32 type, AZ::s32 protocol)
+    {
+        return HandleInvalidSocket(socket(af, type, protocol));
+    }
+
+    AZ::s32 SetSockOpt(AZSOCKET sock, AZ::s32 level, AZ::s32 optname, const char* optval, AZ::s32 optlen)
+    {
+        AZSOCKLEN length(optlen);
+        return HandleSocketError(setsockopt(sock, level, optname, optval, length));
+    }
+
+    AZ::s32 SetSocketOption(AZSOCKET sock, AzSocketOption opt, bool enable)
+    {
+        AZ::u32 val = enable ? 1 : 0;
+        return SetSockOpt(sock, SOL_SOCKET, TranslateSocketOption(opt), reinterpret_cast<const char*>(&val), sizeof(val));
+    }
+
+    AZ::s32 EnableTCPNoDelay(AZSOCKET sock, bool enable)
+    {
+        AZ::u32 val = enable ? 1 : 0;
+        return SetSockOpt(sock, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<const char*>(&val), sizeof(val));
+    }
+
+    AZ::s32 SetSocketBlockingMode(AZSOCKET sock, bool blocking)
+    {
+        AZ::s32 flags = ::fcntl(sock, F_GETFL);
+        flags &= ~O_NONBLOCK;
+        flags |= (blocking ? 0 : O_NONBLOCK);
+        return ::fcntl(sock, F_SETFL, flags);
+    }
+
+    AZ::s32 CloseSocket(AZSOCKET sock)
+    {
+        return HandleSocketError(closesocket(sock));
+    }
+
+    AZ::s32 Shutdown(AZSOCKET sock, AZ::s32 how)
+    {
+        return HandleSocketError(shutdown(sock, how));
+    }
+
+    AZ::s32 GetSockName(AZSOCKET sock, AzSocketAddress& addr)
+    {
+        AZSOCKADDR sAddr;
+        AZSOCKLEN sAddrLen = sizeof(AZSOCKADDR);
+        memset(&sAddr, 0, sAddrLen);
+        AZ::s32 result = HandleSocketError(getsockname(sock, &sAddr, &sAddrLen));
+        addr = sAddr;
+        return result;
+    }
+
+    AZ::s32 Connect(AZSOCKET sock, const AzSocketAddress& addr)
+    {
+        AZ::s32 err = HandleSocketError(connect(sock, addr.GetTargetAddress(), sizeof(AZSOCKADDR_IN)));
+        if (err == static_cast<AZ::s32>(AzSockError::eASE_EINPROGRESS))
+        {
+            err = static_cast<AZ::s32>(AzSockError::eASE_EWOULDBLOCK_CONN);
+        }
+        return err;
+    }
+
+    AZ::s32 Listen(AZSOCKET sock, AZ::s32 backlog)
+    {
+        return HandleSocketError(listen(sock, backlog));
+    }
+
+    AZSOCKET Accept(AZSOCKET sock, AzSocketAddress& addr)
+    {
+        AZSOCKADDR sAddr;
+        AZSOCKLEN sAddrLen = sizeof(AZSOCKADDR);
+        memset(&sAddr, 0, sAddrLen);
+        AZSOCKET outSock = HandleInvalidSocket(accept(sock, &sAddr, &sAddrLen));
+        addr = sAddr;
+        return outSock;
+    }
+
+    AZ::s32 Send(AZSOCKET sock, const char* buf, AZ::s32 len, AZ::s32 flags)
+    {
+        AZ::s32 msgNoSignal = MSG_NOSIGNAL;
+        return HandleSocketError(send(sock, buf, len, flags | msgNoSignal));
+    }
+
+    AZ::s32 Recv(AZSOCKET sock, char* buf, AZ::s32 len, AZ::s32 flags)
+    {
+        return HandleSocketError(recv(sock, buf, len, flags));
+    }
+
+    AZ::s32 Bind(AZSOCKET sock, const AzSocketAddress& addr)
+    {
+        return HandleSocketError(bind(sock, addr.GetTargetAddress(), sizeof(AZSOCKADDR_IN)));
+    }
+
+    AZ::s32 Select(AZSOCKET sock, AZFD_SET* readfdsock, AZFD_SET* writefdsock, AZFD_SET* exceptfdsock, AZTIMEVAL* timeout)
+    {
+        return HandleSocketError(::select(sock + 1, readfdsock, writefdsock, exceptfdsock, timeout));
+    }
+
+    AZ::s32 IsRecvPending(AZSOCKET sock, AZTIMEVAL* timeout)
+    {
+        AZFD_SET readSet;
+        FD_ZERO(&readSet);
+        FD_SET(sock, &readSet);
+
+        AZ::s32 ret = Select(sock, &readSet, nullptr, nullptr, timeout);
+        if (ret >= 0)
+        {
+            ret = FD_ISSET(sock, &readSet);
+            if (ret != 0)
+            {
+                ret = 1;
+            }
+        }
+
+        return ret;
+    }
+
+    AZ::s32 WaitForWritableSocket(AZSOCKET sock, AZTIMEVAL* timeout)
+    {
+        AZFD_SET writeSet;
+        FD_ZERO(&writeSet);
+        FD_SET(sock, &writeSet);
+
+        AZ::s32 ret = Select(sock, nullptr, &writeSet, nullptr, timeout);
+        if (ret >= 0)
+        {
+            ret = FD_ISSET(sock, &writeSet);
+            if (ret != 0)
+            {
+                ret = 1;
+            }
+        }
+
+        return ret;
+    }
+
+    AZ::s32 Startup()
+    {
+        return static_cast<AZ::s32>(AzSockError::eASE_NO_ERROR);
+    }
+
+    AZ::s32 Cleanup()
+    {
+        return static_cast<AZ::s32>(AzSockError::eASE_NO_ERROR);
+    }
+
+    bool ResolveAddress(const AZStd::string& ip, AZ::u16 port, AZSOCKADDR_IN& socketAddress)
+    {
+        bool foundAddr = false;
+        addrinfo hints;
+        memset(&hints, 0, sizeof(addrinfo));
+        addrinfo* addrInfo;
+        hints.ai_family = AF_INET;
+        hints.ai_flags = AI_CANONNAME;
+        char strPort[8];
+        azsnprintf(strPort, AZ_ARRAY_SIZE(strPort), "%d", port);
+
+        const char* address = ip.c_str();
+        if (address && strlen(address) == 0) // getaddrinfo doesn't accept empty string
+        {
+            address = nullptr;
+        }
+
+        AZ::s32 err = HandleSocketError(getaddrinfo(address, strPort, &hints, &addrInfo));
+        if (err == 0) // eASE_NO_ERROR
+        {
+            if (addrInfo->ai_family == AF_INET)
+            {
+                socketAddress = *reinterpret_cast<const AZSOCKADDR_IN*>(addrInfo->ai_addr);
+                foundAddr = true;
+            }
+
+            freeaddrinfo(addrInfo);
+        }
+        else
+        {
+            AZ_Assert(false, "AzSocketAddress could not resolve address %s with port %d. (reason - %s)", ip.c_str(), port, GetStringForError(err));
+        }
+        return foundAddr;
+    }
+} // namespace AZ::AzSock
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
index 7327c8f152..8a93f88ac2 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
@@ -11,68 +11,65 @@
 #include <cstdlib>
 #include <pwd.h>
 
-namespace AZ
+namespace AZ::Utils
 {
-    namespace Utils
+    void RequestAbnormalTermination()
     {
-        void RequestAbnormalTermination()
+        abort();
+    }
+
+    void NativeErrorMessageBox(const char*, const char*) {}
+
+    AZ::IO::FixedMaxPathString GetHomeDirectory()
+    {
+        constexpr AZStd::string_view overrideHomeDirKey = "/Amazon/Settings/override_home_dir";
+        AZ::IO::FixedMaxPathString overrideHomeDir;
+        if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
         {
-            abort();
-        }
-
-        void NativeErrorMessageBox(const char*, const char*) {}
-
-        AZ::IO::FixedMaxPathString GetHomeDirectory()
-        {
-            constexpr AZStd::string_view overrideHomeDirKey = "/Amazon/Settings/override_home_dir";
-            AZ::IO::FixedMaxPathString overrideHomeDir;
-            if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+            if (settingsRegistry->Get(overrideHomeDir, overrideHomeDirKey))
             {
-                if (settingsRegistry->Get(overrideHomeDir, overrideHomeDirKey))
-                {
-                    AZ::IO::FixedMaxPath path{overrideHomeDir};
-                    return path.Native();
-                }
-            }
-
-            if (const char* homePath = std::getenv("HOME"); homePath != nullptr)
-            {
-                AZ::IO::FixedMaxPath path{homePath};
+                AZ::IO::FixedMaxPath path{overrideHomeDir};
                 return path.Native();
             }
-
-            struct passwd* pass = getpwuid(getuid());
-            if (pass)
-            {
-                AZ::IO::FixedMaxPath path{pass->pw_dir};
-                return path.Native();
-            }
-
-            return {};
         }
 
-        bool ConvertToAbsolutePath(const char* path, char* absolutePath, AZ::u64 maxLength)
+        if (const char* homePath = std::getenv("HOME"); homePath != nullptr)
         {
+            AZ::IO::FixedMaxPath path{homePath};
+            return path.Native();
+        }
+
+        struct passwd* pass = getpwuid(getuid());
+        if (pass)
+        {
+            AZ::IO::FixedMaxPath path{pass->pw_dir};
+            return path.Native();
+        }
+
+        return {};
+    }
+
+    bool ConvertToAbsolutePath(const char* path, char* absolutePath, AZ::u64 maxLength)
+    {
 #ifdef PATH_MAX
-            static constexpr size_t UnixMaxPathLength = PATH_MAX;
+        static constexpr size_t UnixMaxPathLength = PATH_MAX;
 #else
-            // Fallback to 4096 if the PATH_MAX macro isn't defined on the Unix System
-            static constexpr size_t UnixMaxPathLength = 4096;
+        // Fallback to 4096 if the PATH_MAX macro isn't defined on the Unix System
+        static constexpr size_t UnixMaxPathLength = 4096;
 #endif
-            if (!AZ::IO::PathView(path).IsAbsolute())
+        if (!AZ::IO::PathView(path).IsAbsolute())
+        {
+            // note that realpath fails if the path does not exist and actually changes the return value
+            // to be the actual place that FAILED, which we don't want.
+            // if we fail, we'd prefer to fall through and at least use the original path.
+            char absolutePathBuffer[UnixMaxPathLength];
+            if (const char* result = realpath(path, absolutePathBuffer); result != nullptr)
             {
-                // note that realpath fails if the path does not exist and actually changes the return value
-                // to be the actual place that FAILED, which we don't want.
-                // if we fail, we'd prefer to fall through and at least use the original path.
-                char absolutePathBuffer[UnixMaxPathLength];
-                if (const char* result = realpath(path, absolutePathBuffer); result != nullptr)
-                {
-                    azstrcpy(absolutePath, maxLength, absolutePathBuffer);
-                    return true;
-                }
+                azstrcpy(absolutePath, maxLength, absolutePathBuffer);
+                return true;
             }
-            azstrcpy(absolutePath, maxLength, path);
-            return AZ::IO::PathView(absolutePath).IsAbsolute();
         }
-    } // namespace Utils
-} // namespace AZ
+        azstrcpy(absolutePath, maxLength, path);
+        return AZ::IO::PathView(absolutePath).IsAbsolute();
+    }
+} // namespace AZ::Utils
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h
index 6ba369e86d..59d5f3c5ed 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 1
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -75,7 +73,6 @@
 #define AZ_TRAIT_HEAPSCHEMA_COMPILE_MALLINFO 1
 #define AZ_TRAIT_IS_ABS_PATH_IF_COLON_FOUND_ANYWHERE 0
 #define AZ_TRAIT_JSON_CLANG_IGNORE_UNKNOWN_WARNING 0
-#define AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS 0
 #define AZ_TRAIT_PERF_MEMORYBENCHMARK_IS_AVAILABLE 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING_INTERVAL_MS 0
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp
index 1ca06fcf7f..e4cd0d0db4 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Debug/Trace_Linux.cpp
@@ -9,16 +9,10 @@
 #include <AzCore/Debug/Trace.h>
 #include <iostream>
 
-namespace AZ
+namespace AZ::Debug::Platform
 {
-    namespace Debug
+    void OutputToDebugger([[maybe_unused]] const char* title, [[maybe_unused]] const char* message)
     {
-        namespace Platform
-        {
-            void OutputToDebugger([[maybe_unused]] const char* title, [[maybe_unused]] const char* message)
-            {
-                // std::cout << title << ": " << message;
-            }
-        }
+        // std::cout << title << ": " << message;
     }
-}
+} // namespace AZ::Debug::Platform
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp
index e28832cf61..d9defd5acc 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Memory/HeapSchema_Linux.cpp
@@ -8,13 +8,10 @@
 
 #include <AzCore/base.h>
 
-namespace AZ
+namespace AZ::Platform
 {
-    namespace Platform
+    size_t GetHeapCapacity()
     {
-        size_t GetHeapCapacity()
-        {
-            return 0;
-        }
+        return 0;
     }
-}
+} // namespace AZ::Platform
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp
index 62718c2d46..aee2bdb622 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/DynamicModuleHandle_Linux.cpp
@@ -10,28 +10,25 @@
 #include <AzCore/Utils/Utils.h>
 #include <dlfcn.h>
 
-namespace AZ
+namespace AZ::Platform
 {
-    namespace Platform
+    AZ::IO::FixedMaxPath GetModulePath()
     {
-        AZ::IO::FixedMaxPath GetModulePath()
-        {
-            return AZ::Utils::GetExecutableDirectory();
-        }
-
-        void* OpenModule(const AZ::OSString& fileName, bool& alreadyOpen)
-        {
-            void* handle = dlopen(fileName.c_str(), RTLD_NOLOAD);
-            alreadyOpen = (handle != nullptr);
-            if (!alreadyOpen)
-            {
-                handle = dlopen(fileName.c_str(), RTLD_NOW);
-            }
-            return handle;
-        }
-
-        void ConstructModuleFullFileName(AZ::IO::FixedMaxPath&)
-        {
-        }
+        return AZ::Utils::GetExecutableDirectory();
     }
-}
+
+    void* OpenModule(const AZ::OSString& fileName, bool& alreadyOpen)
+    {
+        void* handle = dlopen(fileName.c_str(), RTLD_NOLOAD);
+        alreadyOpen = (handle != nullptr);
+        if (!alreadyOpen)
+        {
+            handle = dlopen(fileName.c_str(), RTLD_NOW);
+        }
+        return handle;
+    }
+
+    void ConstructModuleFullFileName(AZ::IO::FixedMaxPath&)
+    {
+    }
+} // namespace AZ::Platform
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/Module/Internal/ModuleManagerSearchPathTool_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/Internal/ModuleManagerSearchPathTool_Linux.cpp
index 39b4cbd4ea..9dfa08e554 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Module/Internal/ModuleManagerSearchPathTool_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Module/Internal/ModuleManagerSearchPathTool_Linux.cpp
@@ -8,20 +8,17 @@
 
 #include <AzCore/Module/Internal/ModuleManagerSearchPathTool.h>
 
-namespace AZ
+namespace AZ::Internal
 {
-    namespace Internal
+    ModuleManagerSearchPathTool::ModuleManagerSearchPathTool()
     {
-        ModuleManagerSearchPathTool::ModuleManagerSearchPathTool()
-        {
-        }
+    }
 
-        ModuleManagerSearchPathTool::~ModuleManagerSearchPathTool()
-        {
-        }
+    ModuleManagerSearchPathTool::~ModuleManagerSearchPathTool()
+    {
+    }
 
-        void ModuleManagerSearchPathTool::SetModuleSearchPath(const AZ::DynamicModuleDescriptor&)
-        {
-        }
-    } // namespace Internal
-} // namespace AZ
+    void ModuleManagerSearchPathTool::SetModuleSearchPath(const AZ::DynamicModuleDescriptor&)
+    {
+    }
+} // namespace AZ::Internal
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp
index d75eab0139..ed4e2674c5 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/Utils/Utils_Linux.cpp
@@ -13,42 +13,39 @@
 
 #include <unistd.h>
 
-namespace AZ
+namespace AZ::Utils
 {
-    namespace Utils
+    GetExecutablePathReturnType GetExecutablePath(char* exeStorageBuffer, size_t exeStorageSize)
     {
-        GetExecutablePathReturnType GetExecutablePath(char* exeStorageBuffer, size_t exeStorageSize)
+        GetExecutablePathReturnType result;
+        result.m_pathIncludesFilename = true;
+
+        // http://man7.org/linux/man-pages/man5/proc.5.html
+        const ssize_t bytesWritten = readlink("/proc/self/exe", exeStorageBuffer, exeStorageSize);
+        if (bytesWritten == -1)
         {
-            GetExecutablePathReturnType result;
-            result.m_pathIncludesFilename = true;
-
-            // http://man7.org/linux/man-pages/man5/proc.5.html
-            const ssize_t bytesWritten = readlink("/proc/self/exe", exeStorageBuffer, exeStorageSize);
-            if (bytesWritten == -1)
-            {
-                result.m_pathStored = ExecutablePathResult::GeneralError;
-            }
-            else if (bytesWritten == exeStorageSize)
-            {
-                result.m_pathStored = ExecutablePathResult::BufferSizeNotLargeEnough;
-            }
-            else
-            {
-                // readlink doesn't null terminate
-                exeStorageBuffer[bytesWritten] = '\0';
-            }
-
-            return result;
+            result.m_pathStored = ExecutablePathResult::GeneralError;
+        }
+        else if (bytesWritten == exeStorageSize)
+        {
+            result.m_pathStored = ExecutablePathResult::BufferSizeNotLargeEnough;
+        }
+        else
+        {
+            // readlink doesn't null terminate
+            exeStorageBuffer[bytesWritten] = '\0';
         }
 
-        AZStd::optional<AZ::IO::FixedMaxPathString> GetDefaultAppRootPath()
-        {
-            return AZStd::nullopt;
-        }
-
-        AZStd::optional<AZ::IO::FixedMaxPathString> GetDevWriteStoragePath()
-        {
-            return AZStd::nullopt;
-        }
+        return result;
     }
-}
+
+    AZStd::optional<AZ::IO::FixedMaxPathString> GetDefaultAppRootPath()
+    {
+        return AZStd::nullopt;
+    }
+
+    AZStd::optional<AZ::IO::FixedMaxPathString> GetDevWriteStoragePath()
+    {
+        return AZStd::nullopt;
+    }
+} // namespace AZ::Utils
diff --git a/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h
index a41b5c6baa..1a3d0663e1 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -75,7 +73,6 @@
 #define AZ_TRAIT_HEAPSCHEMA_COMPILE_MALLINFO 1
 #define AZ_TRAIT_IS_ABS_PATH_IF_COLON_FOUND_ANYWHERE 0
 #define AZ_TRAIT_JSON_CLANG_IGNORE_UNKNOWN_WARNING 0
-#define AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS 0
 #define AZ_TRAIT_PERF_MEMORYBENCHMARK_IS_AVAILABLE 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING_INTERVAL_MS 0
diff --git a/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h
index 2f9fcefdbd..1a83aba267 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 0
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 0
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 0
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 0
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -75,7 +73,6 @@
 #define AZ_TRAIT_HEAPSCHEMA_COMPILE_MALLINFO 1
 #define AZ_TRAIT_IS_ABS_PATH_IF_COLON_FOUND_ANYWHERE 0
 #define AZ_TRAIT_JSON_CLANG_IGNORE_UNKNOWN_WARNING 1
-#define AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS 0
 #define AZ_TRAIT_PERF_MEMORYBENCHMARK_IS_AVAILABLE 1
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING_INTERVAL_MS 0
diff --git a/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h
index d53f4b057e..7a75af71fb 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -76,7 +74,6 @@
 #define AZ_TRAIT_HEAPSCHEMA_COMPILE_MALLINFO 1
 #define AZ_TRAIT_IS_ABS_PATH_IF_COLON_FOUND_ANYWHERE 0
 #define AZ_TRAIT_JSON_CLANG_IGNORE_UNKNOWN_WARNING 0
-#define AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS 0
 #define AZ_TRAIT_PERF_MEMORYBENCHMARK_IS_AVAILABLE 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING 0
 #define AZ_TRAIT_PUMP_SYSTEM_EVENTS_WHILE_LOADING_INTERVAL_MS 0
diff --git a/Code/Framework/AzCore/Tests/AZStd/String.cpp b/Code/Framework/AzCore/Tests/AZStd/String.cpp
index 68bdd311d5..356310a94d 100644
--- a/Code/Framework/AzCore/Tests/AZStd/String.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/String.cpp
@@ -2376,17 +2376,52 @@ namespace UnitTest
         static_assert(AZStd::wildcard_match_case(filter1, blahValue));
     }
 
-    TEST_F(String, StringEraseIf_Succeeds)
+    TEST_F(String, StringCXX20Erase_Succeeds)
     {
-
         AZStd::string eraseIfTest = "ABC CBA";
-        auto eraseCount = AZStd::erase_if(eraseIfTest, [](AZStd::string::value_type ch)
-            {
-                return ch == 'C';
-            });
+        auto erasePredicate = [](AZStd::string::value_type ch)
+        {
+            return ch == 'C';
+        };
+        auto eraseCount = AZStd::erase_if(eraseIfTest, erasePredicate);
         EXPECT_EQ(2, eraseCount);
         EXPECT_EQ(5, eraseIfTest.size());
         EXPECT_STREQ("AB BA", eraseIfTest.c_str());
+
+        // Now erase the letter 'A';
+        eraseCount = AZStd::erase(eraseIfTest, 'A');
+        EXPECT_EQ(2, eraseCount);
+        EXPECT_EQ(3, eraseIfTest.size());
+        EXPECT_EQ("B B", eraseIfTest);
+    }
+
+    TEST_F(String, FixedStringCXX20Erase_Succeeds)
+    {
+        // Erase 'l' from the phrase "Hello" World"
+        constexpr auto eraseTest = [](const char* testString) constexpr
+        {
+            AZStd::fixed_string<16> testResult{ testString };
+            AZStd::erase(testResult, 'l');
+            return testResult;
+        }("HelloWorld");
+
+        static_assert(eraseTest == "HeoWord");
+        EXPECT_EQ("HeoWord", eraseTest);
+
+        // Use erase_if to erase both 'H' and 'e' from the remaining eraseTest string
+        constexpr auto eraseIfTest = [](AZStd::string_view testString) constexpr
+        {
+            AZStd::fixed_string<16> testResult{ testString };
+            auto erasePredicate = [](char ch)
+            {
+                return ch == 'H' || ch == 'e';
+            };
+            AZStd::erase_if(testResult, erasePredicate);
+            return testResult;
+        }(eraseTest);
+
+        static_assert(eraseIfTest == "oWord");
+        EXPECT_EQ("oWord", eraseIfTest);
     }
 
     template <typename StringType>
diff --git a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp
index 47c3630091..851a7a8609 100644
--- a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp
@@ -753,7 +753,7 @@ namespace UnitTest
 
     TEST_F(Arrays, FixedVectorCanCopyAndMoveWithDifferentCapacity)
     {
-        constexpr AZStd::fixed_vector<int, 32> sourceVector{ 1,2,3,4,5 };
+        AZStd::fixed_vector<int, 32> sourceVector{ 1,2,3,4,5 };
 
         AZStd::fixed_vector<int, 8> copyConstructVector{ sourceVector };
         EXPECT_EQ(sourceVector, copyConstructVector);
@@ -768,32 +768,63 @@ namespace UnitTest
 
         AZStd::fixed_vector<int, 16> moveAssignVector = AZStd::move(moveConstructVector);
 
-        constexpr AZStd::fixed_vector expectedVector{ 1,2,3,4,5,6 };
+        AZStd::fixed_vector expectedVector{ 1,2,3,4,5,6 };
         EXPECT_EQ(expectedVector, moveAssignVector);
     }
 
     TEST_F(Arrays, FixedVectorComparisonOperatorsSucceedAsExpected)
     {
-        constexpr AZStd::fixed_vector<int, 32> testVector{ 1,2,3,4,5 };
-        constexpr AZStd::fixed_vector<int, 32> equalVector{ 1,2,3,4,5 };
-        constexpr AZStd::fixed_vector<int, 32> notEqualVectorDifferentSize{ 1,2,3,4,5,6 };
-        constexpr AZStd::fixed_vector<int, 32> lessVector{ 1,2,3,4,4 };
-        constexpr AZStd::fixed_vector<int, 32> greaterVectorDifferentSize{ 1,2,3,4,5, 1 };
+        AZStd::fixed_vector<int, 32> testVector{ 1,2,3,4,5 };
+        AZStd::fixed_vector<int, 32> equalVector{ 1,2,3,4,5 };
+        AZStd::fixed_vector<int, 32> notEqualVectorDifferentSize{ 1,2,3,4,5,6 };
+        AZStd::fixed_vector<int, 32> lessVector{ 1,2,3,4,4 };
+        AZStd::fixed_vector<int, 32> greaterVectorDifferentSize{ 1,2,3,4,5, 1 };
 
-        static_assert(testVector == equalVector);
-        static_assert(testVector != notEqualVectorDifferentSize);
-        static_assert(testVector != lessVector);
-        static_assert(lessVector < testVector);
-        static_assert(lessVector < greaterVectorDifferentSize);
-        static_assert(lessVector <= lessVector);
-        static_assert(lessVector <= testVector);
-        static_assert(lessVector <= greaterVectorDifferentSize);
-        static_assert(testVector > lessVector);
-        static_assert(testVector > lessVector);
-        static_assert(notEqualVectorDifferentSize > testVector);
-        static_assert(testVector >= testVector);
-        static_assert(testVector >= lessVector);
-        static_assert(greaterVectorDifferentSize > lessVector);
+        EXPECT_EQ(testVector, equalVector);
+        EXPECT_NE(testVector, notEqualVectorDifferentSize);
+        EXPECT_NE(testVector, lessVector);
+        EXPECT_LT(lessVector, testVector);
+        EXPECT_LT(lessVector, greaterVectorDifferentSize);
+        EXPECT_LE(lessVector, lessVector);
+        EXPECT_LE(lessVector, testVector);
+        EXPECT_LE(lessVector, greaterVectorDifferentSize);
+        EXPECT_GT(testVector, lessVector);
+        EXPECT_GT(testVector, lessVector);
+        EXPECT_GT(notEqualVectorDifferentSize, testVector);
+        EXPECT_GE(testVector, testVector);
+        EXPECT_GE(testVector, lessVector);
+        EXPECT_GT(greaterVectorDifferentSize, lessVector);
+    }
+
+    TEST_F(Arrays, FixedVectorCXX20Erase_Succeeds)
+    {
+        // Erase 'l' from the phrase "Hello" World"
+        auto eraseTest = [](AZStd::initializer_list<char> testInit)
+        {
+            AZStd::fixed_vector<char, 16> testResult{ testInit };
+            AZStd::erase(testResult, 'l');
+            return testResult;
+        }({ 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' });
+
+        constexpr AZStd::string_view expectedEraseString = "HeoWord";
+        AZStd::string_view testEraseString{ eraseTest.begin(), eraseTest.end() };
+        EXPECT_EQ(expectedEraseString, testEraseString);
+
+        // Use erase_if to erase both 'H' and 'e' from the remaining eraseTest string
+        auto eraseIfTest = [](const AZStd::fixed_vector<char, 16>& testVector)
+        {
+            AZStd::fixed_vector<char, 16> testResult{ testVector };
+            auto erasePredicate = [](char ch)
+            {
+                return ch == 'H' || ch == 'e';
+            };
+            AZStd::erase_if(testResult, erasePredicate);
+            return testResult;
+        }(testEraseString);
+
+        constexpr AZStd::string_view expectedEraseIfString = "oWord";
+        AZStd::string_view testEraseIfString{ eraseIfTest.begin(), eraseIfTest.end() };
+        EXPECT_EQ(expectedEraseIfString, testEraseIfString);
     }
 
     TEST_F(Arrays, VectorSwap)
diff --git a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp
index e33dbce9c1..043eb1aee6 100644
--- a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp
@@ -26,6 +26,7 @@
 #include <AzCore/std/functional.h>
 #include <AzCore/std/parallel/condition_variable.h>
 #include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/UnitTest/Mocks/MockFileIOBase.h>
 #include <AZTestShared/Utils/Utils.h>
 #include <Streamer/IStreamerMock.h>
 #include <Tests/Asset/BaseAssetManagerTest.h>
@@ -131,8 +132,8 @@ namespace UnitTest
     * This will test the aspect of the system where ObjectStreams and asset jobs loading dependent
     * assets will do the work in their own thread.
     */
-    class AssetJobsFloodTest
-        : public BaseAssetManagerTest
+
+    class AssetJobsFloodTest : public DisklessAssetManagerBase
     {
     public:
         TestAssetManager* m_testAssetManager{ nullptr };
@@ -183,15 +184,14 @@ namespace UnitTest
 
         void SetUp() override
         {
-            BaseAssetManagerTest::SetUp();
+            DisklessAssetManagerBase::SetUp();
             SetupTest();
         }
 
         void TearDown() override
         {
-            TearDownTest();
             AssetManager::Destroy();
-            BaseAssetManagerTest::TearDown();
+            DisklessAssetManagerBase::TearDown();
         }
 
         void SetupAssets()
@@ -257,9 +257,9 @@ namespace UnitTest
                 AssetWithSerializedData ap2;
                 AssetWithSerializedData ap3;
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset4.txt", AZ::DataStream::ST_XML, &ap1, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset5.txt", AZ::DataStream::ST_XML, &ap2, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset6.txt", AZ::DataStream::ST_XML, &ap3, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset4.txt", &ap1, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset5.txt", &ap2, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset6.txt", &ap3, m_serializeContext));
 
                 AssetWithAssetReference assetWithPreload1;
                 AssetWithAssetReference assetWithPreload2;
@@ -273,11 +273,11 @@ namespace UnitTest
                 noLoadAsset.m_asset = m_testAssetManager->CreateAsset<AssetWithSerializedData>(MyAsset2Id, AssetLoadBehavior::NoLoad);
                 EXPECT_EQ(m_assetHandlerAndCatalog->m_numCreations, 4);
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &assetWithPreload1, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &assetWithPreload2, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &assetWithPreload3, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "DelayLoadAsset.txt", AZ::DataStream::ST_XML, &delayedAsset, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "NoLoadAsset.txt", AZ::DataStream::ST_XML, &noLoadAsset, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset1.txt", &assetWithPreload1, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset2.txt", &assetWithPreload2, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset3.txt", &assetWithPreload3, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("DelayLoadAsset.txt", &delayedAsset, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("NoLoadAsset.txt", &noLoadAsset, m_serializeContext));
 
                 AssetWithQueueAndPreLoadReferences preLoadRoot;
                 AssetWithQueueAndPreLoadReferences preLoadA;
@@ -297,16 +297,16 @@ namespace UnitTest
                 preLoadBrokenA.m_preLoad = m_testAssetManager->CreateAsset<AssetWithAssetReference>(PreloadBrokenDepBId, AssetLoadBehavior::PreLoad);
                 preLoadBrokenB.m_preLoad = m_testAssetManager->CreateAsset<AssetWithAssetReference>(PreloadAssetNoDataId, AssetLoadBehavior::PreLoad);
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadRoot.txt", AZ::DataStream::ST_XML, &preLoadRoot, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadA.txt", AZ::DataStream::ST_XML, &preLoadA, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadB.txt", AZ::DataStream::ST_XML, &noRefs, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadC.txt", AZ::DataStream::ST_XML, &noRefs, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "QueueLoadA.txt", AZ::DataStream::ST_XML, &queueLoadA, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "QueueLoadB.txt", AZ::DataStream::ST_XML, &noRefs, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "QueueLoadC.txt", AZ::DataStream::ST_XML, &noRefs, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadBrokenA.txt", AZ::DataStream::ST_XML, &preLoadBrokenA, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadBrokenB.txt", AZ::DataStream::ST_XML, &preLoadBrokenB, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "PreLoadNoData.txt", AZ::DataStream::ST_XML, &noRefs, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadRoot.txt", &preLoadRoot, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadA.txt", &preLoadA, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadB.txt", &noRefs, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadC.txt", &noRefs, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("QueueLoadA.txt", &queueLoadA, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("QueueLoadB.txt", &noRefs, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("QueueLoadC.txt", &noRefs, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadBrokenA.txt", &preLoadBrokenA, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadBrokenB.txt", &preLoadBrokenB, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("PreLoadNoData.txt", &noRefs, m_serializeContext));
 
                 AssetWithQueueAndPreLoadReferences circularA;
                 AssetWithQueueAndPreLoadReferences circularB;
@@ -318,43 +318,15 @@ namespace UnitTest
                 circularC.m_preLoad = m_testAssetManager->CreateAsset<AssetWithAssetReference>(CircularBId, AssetLoadBehavior::PreLoad);
                 circularD.m_preLoad = circularC.m_preLoad;
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "CircularA.txt", AZ::DataStream::ST_XML, &circularA, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "CircularB.txt", AZ::DataStream::ST_XML, &circularB, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "CircularC.txt", AZ::DataStream::ST_XML, &circularC, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "CircularD.txt", AZ::DataStream::ST_XML, &circularD, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("CircularA.txt", &circularA, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("CircularB.txt", &circularB, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("CircularC.txt", &circularC, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("CircularD.txt", &circularD, m_serializeContext));
+
                 m_assetHandlerAndCatalog->m_numCreations = 0;
             }
         }
 
-        void TearDownTest()
-        {
-            DeleteAssetFromDisk(GetTestFolderPath() + "TestAsset4.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "TestAsset5.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "TestAsset6.txt");
-
-            DeleteAssetFromDisk(GetTestFolderPath() + "TestAsset1.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "TestAsset2.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "TestAsset3.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "DelayLoadAsset.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "NoLoadAsset.txt");
-
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadRoot.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadA.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadB.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadC.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "QueueLoadA.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "QueueLoadB.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "QueueLoadC.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadBrokenA.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadBrokenB.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "PreLoadNoData.txt");
-
-            DeleteAssetFromDisk(GetTestFolderPath() + "CircularA.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "CircularB.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "CircularC.txt");
-            DeleteAssetFromDisk(GetTestFolderPath() + "CircularD.txt");
-        }
-
         void CheckFinishedCreationsAndDestructions()
         {
             // Make sure asset jobs have finished before validating the number of destroyed assets, because it's possible that the asset job
@@ -367,7 +339,7 @@ namespace UnitTest
     };
 
     static constexpr AZStd::chrono::seconds MaxDispatchTimeoutSeconds = BaseAssetManagerTest::DefaultTimeoutSeconds * 12;
-    
+
     template <typename Pred>
     bool DispatchEventsUntilCondition(AZ::Data::AssetManager& assetManager, Pred&& conditionPredicate,
         AZStd::chrono::seconds logIntervalSeconds = BaseAssetManagerTest::DefaultTimeoutSeconds,
@@ -609,23 +581,8 @@ namespace UnitTest
         EXPECT_EQ(baseStatus, expected_base_status);
     }
 
-    struct DebugListener : AZ::Interface<IDebugAssetEvent>::Registrar
-    {
-        void AssetStatusUpdate(AZ::Data::AssetId id, AZ::Data::AssetData::AssetStatus status) override
-        {
-            AZ::Debug::Trace::Output(
-                "", AZStd::string::format("Status %s - %d\n", id.ToString<AZStd::string>().c_str(), static_cast<int>(status)).c_str());
-        }
-        void ReleaseAsset(AZ::Data::AssetId id) override
-        {
-            AZ::Debug::Trace::Output(
-                "", AZStd::string::format("Release %s\n", id.ToString<AZStd::string>().c_str()).c_str());
-        }
-    };
-
     TEST_F(AssetJobsFloodTest, RapidAcquireAndRelease)
     {
-        DebugListener listener;  
         auto assetUuids = {
             MyAsset1Id,
             MyAsset2Id,
@@ -652,11 +609,11 @@ namespace UnitTest
             threads.emplace_back([this, &threadCount, &cv, assetUuid]() {
                 bool checkLoaded = true;
 
-                for (int i = 0; i < 5000; i++)
+                for (int i = 0; i < 1000; i++)
                 {
                     Asset<AssetWithAssetReference> asset1 =
                         m_testAssetManager->GetAsset(assetUuid, azrtti_typeid<AssetWithAssetReference>(), AZ::Data::AssetLoadBehavior::PreLoad);
-                    
+
                     if (checkLoaded)
                     {
                         asset1.BlockUntilLoadComplete();
@@ -678,7 +635,7 @@ namespace UnitTest
         while (threadCount > 0 && !timedOut)
         {
             AZStd::unique_lock<AZStd::mutex> lock(mutex);
-            timedOut = (AZStd::cv_status::timeout == cv.wait_until(lock, AZStd::chrono::system_clock::now() + DefaultTimeoutSeconds * 20000));
+            timedOut = (AZStd::cv_status::timeout == cv.wait_until(lock, AZStd::chrono::system_clock::now() + DefaultTimeoutSeconds));
         }
 
         ASSERT_EQ(threadCount, 0) << "Thread count is non-zero, a thread has likely deadlocked.  Test will not shut down cleanly.";
@@ -729,8 +686,8 @@ namespace UnitTest
 
             AssetWithSerializedData ap;
 
-            EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "a.txt", AZ::DataStream::ST_XML, &ap, m_serializeContext));
-            EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "b.txt", AZ::DataStream::ST_XML, &ap, m_serializeContext));
+            EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("a.txt", &ap, m_serializeContext));
+            EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("b.txt", &ap, m_serializeContext));
         }
 
         auto& assetManager = AssetManager::Instance();
@@ -793,7 +750,7 @@ namespace UnitTest
     * Verify that loads without using the Asset Container still work correctly
     */
     class AssetContainerDisableTest
-        : public BaseAssetManagerTest
+        : public DisklessAssetManagerBase
     {
     public:
         static inline const AZ::Uuid MyAsset1Id{ "{5B29FE2B-6B41-48C9-826A-C723951B0560}" };
@@ -812,7 +769,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            BaseAssetManagerTest::SetUp();
+            DisklessAssetManagerBase::SetUp();
             SetupTest();
 
         }
@@ -822,7 +779,7 @@ namespace UnitTest
             AssetManager::Instance().UnregisterHandler(m_assetHandlerAndCatalog);
             delete m_assetHandlerAndCatalog;
             AssetManager::Destroy();
-            BaseAssetManagerTest::TearDown();
+            DisklessAssetManagerBase::TearDown();
         }
 
         void SetupAssets()
@@ -864,9 +821,9 @@ namespace UnitTest
                 AssetWithSerializedData ap2;
                 AssetWithSerializedData ap3;
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset4.txt", AZ::DataStream::ST_XML, &ap1, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset5.txt", AZ::DataStream::ST_XML, &ap2, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset6.txt", AZ::DataStream::ST_XML, &ap3, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset4.txt", &ap1, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset5.txt", &ap2, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset6.txt", &ap3, m_serializeContext));
 
                 AssetWithAssetReference assetWithPreload1;
                 AssetWithAssetReference assetWithPreload2;
@@ -877,9 +834,9 @@ namespace UnitTest
                 assetWithPreload3.m_asset = m_testAssetManager->CreateAsset<AssetWithSerializedData>(MyAsset6Id, AssetLoadBehavior::PreLoad);
                 EXPECT_EQ(m_assetHandlerAndCatalog->m_numCreations, 3);
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &assetWithPreload1, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &assetWithPreload2, m_serializeContext));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &assetWithPreload3, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset1.txt", &assetWithPreload1, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset2.txt", &assetWithPreload2, m_serializeContext));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset3.txt", &assetWithPreload3, m_serializeContext));
 
                 m_assetHandlerAndCatalog->m_numCreations = 0;
             }
@@ -1190,7 +1147,7 @@ namespace UnitTest
 #if AZ_TRAIT_DISABLE_FAILED_ASSET_MANAGER_TESTS
     TEST_F(AssetJobsFloodTest, DISABLED_ContainerFilterTest_ContainersWithAndWithoutFiltering_Success)
 #else
-    TEST_F(AssetJobsFloodTest, DISABLED_ContainerFilterTest_ContainersWithAndWithoutFiltering_Success)
+    TEST_F(AssetJobsFloodTest, ContainerFilterTest_ContainersWithAndWithoutFiltering_Success)
 #endif // !AZ_TRAIT_DISABLE_FAILED_ASSET_MANAGER_TESTS
     {
         m_assetHandlerAndCatalog->AssetCatalogRequestBus::Handler::BusConnect();
@@ -2029,11 +1986,12 @@ namespace UnitTest
         CheckFinishedCreationsAndDestructions();
         m_assetHandlerAndCatalog->AssetCatalogRequestBus::Handler::BusDisconnect();
     }
+
     /**
     * Run multiple threads that get and release assets simultaneously to test AssetManager's thread safety
     */
     class AssetJobsMultithreadedTest
-        : public BaseAssetManagerTest
+        : public DisklessAssetManagerBase
     {
     public:
         static inline const AZ::Uuid MyAsset1Id{ "{5B29FE2B-6B41-48C9-826A-C723951B0560}" };
@@ -2043,6 +2001,7 @@ namespace UnitTest
         static inline const AZ::Uuid MyAsset5Id{ "{D9CDAB04-D206-431E-BDC0-1DD615D56197}" };
         static inline const AZ::Uuid MyAsset6Id{ "{B2F139C3-5032-4B52-ADCA-D52A8F88E043}" };
 
+
         // Initialize the Job Manager with 2 threads for the Asset Manager to use.
         size_t GetNumJobManagerThreads() const override { return 2; }
 
@@ -2093,9 +2052,9 @@ namespace UnitTest
                 AssetWithSerializedData ap2;
                 AssetWithSerializedData ap3;
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset4.txt", AZ::DataStream::ST_XML, &ap1, &context));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset5.txt", AZ::DataStream::ST_XML, &ap2, &context));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset6.txt", AZ::DataStream::ST_XML, &ap3, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset4.txt", &ap1, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset5.txt", &ap2, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset6.txt", &ap3, &context));
 
                 AssetWithAssetReference assetWithPreload1;
                 AssetWithAssetReference assetWithPreload2;
@@ -2104,9 +2063,9 @@ namespace UnitTest
                 assetWithPreload2.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset5Id, AssetLoadBehavior::PreLoad);
                 assetWithPreload3.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset6Id, AssetLoadBehavior::PreLoad);
 
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &assetWithPreload1, &context));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &assetWithPreload2, &context));
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &assetWithPreload3, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset1.txt", &assetWithPreload1, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset2.txt", &assetWithPreload2, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset3.txt", &assetWithPreload3, &context));
 
                 EXPECT_TRUE(assetHandlerAndCatalog->m_numCreations == 3);
                 assetHandlerAndCatalog->m_numCreations = 0;
@@ -2206,22 +2165,22 @@ namespace UnitTest
                 // A will be saved to disk with MyAsset1Id
                 AssetWithAssetReference a;
                 a.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset2Id);
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &a, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset1.txt", &a, &context));
                 AssetWithAssetReference b;
                 b.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset3Id);
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &b, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset2.txt", &b, &context));
                 AssetWithAssetReference c;
                 c.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset4Id);
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &c, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset3.txt", &c, &context));
                 AssetWithAssetReference d;
                 d.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset5Id);
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset4.txt", AZ::DataStream::ST_XML, &d, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset4.txt", &d, &context));
                 AssetWithAssetReference e;
                 e.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset6Id);
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset5.txt", AZ::DataStream::ST_XML, &e, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset5.txt", &e, &context));
                 AssetWithAssetReference f;
                 f.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(MyAsset1Id); // refer back to asset1
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset6.txt", AZ::DataStream::ST_XML, &f, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset6.txt", &f, &context));
 
                 EXPECT_TRUE(assetHandlerAndCatalog->m_numCreations == 6);
                 assetHandlerAndCatalog->m_numCreations = 0;
@@ -2297,6 +2256,45 @@ namespace UnitTest
             AssetManager::Destroy();
         }
 
+        struct MockAssetContainer : AssetContainer
+        {
+            MockAssetContainer(Asset<AssetData> assetData, const AssetLoadParameters& loadParams)
+            {
+                // Copying the code in the original constructor, we can't call that constructor because it will not invoke our virtual method
+                m_rootAsset = AssetInternal::WeakAsset<AssetData>(assetData);
+                m_containerAssetId = m_rootAsset.GetId();
+
+                AddDependentAssets(assetData, loadParams);
+            }
+
+        protected:
+            AZStd::vector<AZStd::pair<AssetInfo, Asset<AssetData>>> CreateAndQueueDependentAssets(
+                const AZStd::vector<AssetInfo>& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter) override
+            {
+                auto result = AssetContainer::CreateAndQueueDependentAssets(dependencyInfoList, loadParamsCopyWithNoLoadingFilter);
+
+                // Sleep for a long enough time to allow asset loads to complete and start triggering AssetReady events
+                // This forces the race condition to occur
+                AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(500));
+
+                return result;
+            }
+        };
+
+        struct MockAssetManager : AssetManager
+        {
+            explicit MockAssetManager(const Descriptor& desc)
+                : AssetManager(desc)
+            {
+            }
+
+        protected:
+            AZStd::shared_ptr<AssetContainer> CreateAssetContainer(Asset<AssetData> asset, const AssetLoadParameters& loadParams) const override
+            {
+                return AZStd::shared_ptr<AssetContainer>(aznew MockAssetContainer(asset, loadParams));
+            }
+        };
+
         void ParallelDeepAssetReferences()
         {
             SerializeContext context;
@@ -2304,7 +2302,7 @@ namespace UnitTest
             AssetWithAssetReference::Reflect(context);
 
             AssetManager::Descriptor desc;
-            AssetManager::Create(desc);
+            AssetManager::SetInstance(aznew MockAssetManager(desc));
 
             auto& db = AssetManager::Instance();
 
@@ -2323,26 +2321,26 @@ namespace UnitTest
                 // AssetD is MYASSETD
                 AssetWithSerializedData d;
                 d.m_data = 42;
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset4.txt", AZ::DataStream::ST_XML, &d, &context));
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset4.txt", &d, &context));
 
                 // AssetC is MYASSETC
                 AssetWithAssetReference c;
-                c.m_asset = AssetManager::Instance().CreateAsset<AssetWithSerializedData>(AssetId(MyAssetDId)); // point at D
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &c, &context));
+                c.m_asset = db.CreateAsset<AssetWithSerializedData>(AssetId(MyAssetDId)); // point at D
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset3.txt", &c, &context));
 
                 // AssetB is MYASSETB
                 AssetWithAssetReference b;
-                b.m_asset = AssetManager::Instance().CreateAsset<AssetWithAssetReference>(AssetId(MyAssetCId)); // point at C
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &b, &context));
+                b.m_asset = db.CreateAsset<AssetWithAssetReference>(AssetId(MyAssetCId)); // point at C
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset2.txt", &b, &context));
 
                 // AssetA will be written to disk as MYASSETA
                 AssetWithAssetReference a;
-                a.m_asset = AssetManager::Instance().CreateAsset<AssetWithAssetReference>(AssetId(MyAssetBId)); // point at B
-                EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &a, &context));
+                a.m_asset = db.CreateAsset<AssetWithAssetReference>(AssetId(MyAssetBId)); // point at B
+                EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("TestAsset1.txt", &a, &context));
             }
 
-            const size_t numThreads = 4;
-            AZStd::atomic_int threadCount(numThreads);
+            constexpr size_t NumThreads = 4;
+            AZStd::atomic_int threadCount(NumThreads);
             AZStd::condition_variable cv;
             AZStd::vector<AZStd::thread> threads;
             AZStd::atomic_bool keepDispatching(true);
@@ -2357,7 +2355,7 @@ namespace UnitTest
 
             AZStd::thread dispatchThread(dispatch);
 
-            for (size_t threadIdx = 0; threadIdx < numThreads; ++threadIdx)
+            for (size_t threadIdx = 0; threadIdx < NumThreads; ++threadIdx)
             {
                 threads.emplace_back([&threadCount, &db, &cv]()
                     {
@@ -2545,15 +2543,14 @@ namespace UnitTest
 #if AZ_TRAIT_DISABLE_FAILED_ASSET_MANAGER_TESTS
     TEST_F(AssetJobsMultithreadedTest, DISABLED_ParallelDeepAssetReferences)
 #else
-    // temporarily disabled until sporadic failures can be root caused
-    TEST_F(AssetJobsMultithreadedTest, DISABLED_ParallelDeepAssetReferences)
+    TEST_F(AssetJobsMultithreadedTest, ParallelDeepAssetReferences)
 #endif // AZ_TRAIT_DISABLE_FAILED_ASSET_MANAGER_TESTS
     {
         ParallelDeepAssetReferences();
     }
 
     class AssetManagerTests
-        : public BaseAssetManagerTest
+        : public DisklessAssetManagerBase
     {
     protected:
         static inline const AZ::Uuid MyAsset1Id{ "{5B29FE2B-6B41-48C9-826A-C723951B0560}" };
@@ -2568,7 +2565,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            BaseAssetManagerTest::SetUp();
+            DisklessAssetManagerBase::SetUp();
 
             m_console = AZStd::make_unique<AZ::Console>();
             AZ::Interface<AZ::IConsole>::Register(m_console.get());
@@ -2607,7 +2604,7 @@ namespace UnitTest
             AssetManager::Destroy();
             AZ::Interface<AZ::IConsole>::Unregister(m_console.get());
             m_console = nullptr;
-            BaseAssetManagerTest::TearDown();
+            DisklessAssetManagerBase::TearDown();
         }
     };
 
@@ -2958,7 +2955,7 @@ namespace UnitTest
     * the middle of loading.  The tests help ensure that assets can't get stuck in perpetual loading states.
     **/
     class AssetManagerClearAssetReferenceTests
-        : public BaseAssetManagerTest
+        : public DisklessAssetManagerBase
     {
     protected:
         static inline const AZ::Uuid RootAssetId{ "{AB13F568-C676-41FE-A7E9-341F71A78104}" };
@@ -2977,7 +2974,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            BaseAssetManagerTest::SetUp();
+            DisklessAssetManagerBase::SetUp();
 
             // create the database
             AssetManager::Descriptor desc;
@@ -3015,21 +3012,18 @@ namespace UnitTest
 
             // Create and save the dependent asset first, so that we can get a reference to it.
             AssetWithSerializedData dependentBlockingAsset;
-            EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "DependentPreloadBlockingAsset.txt",
-                AZ::DataStream::ST_XML, &dependentBlockingAsset, m_serializeContext));
+            EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("DependentPreloadBlockingAsset.txt", &dependentBlockingAsset, m_serializeContext));
 
             AssetWithAssetReference dependentAsset;
             dependentAsset.m_asset = AssetManager::Instance().CreateAsset<AssetWithAssetReference>(
                 NestedDependentPreloadBlockingAssetId, AssetLoadBehavior::PreLoad);
-            EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "DependentPreloadAsset.txt",
-                AZ::DataStream::ST_XML, &dependentAsset, m_serializeContext));
+            EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("DependentPreloadAsset.txt", &dependentAsset, m_serializeContext));
 
             // Create and save the top-level asset.
             AssetWithAssetReference rootAsset;
             rootAsset.m_asset = AssetManager::Instance().CreateAsset<AssetWithAssetReference>(
                 DependentPreloadAssetId, AssetLoadBehavior::PreLoad);
-            EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "RootAsset.txt",
-                AZ::DataStream::ST_XML, &rootAsset, m_serializeContext));
+            EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile("RootAsset.txt", &rootAsset, m_serializeContext));
         }
 
         void TearDown() override
@@ -3041,7 +3035,7 @@ namespace UnitTest
             delete m_assetHandlerAndCatalog;
 
             AssetManager::Destroy();
-            BaseAssetManagerTest::TearDown();
+            DisklessAssetManagerBase::TearDown();
         }
     };
 
diff --git a/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp
index 4dbd3c0e1e..532cb0a1d8 100644
--- a/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp
+++ b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.cpp
@@ -67,7 +67,10 @@ namespace UnitTest
     {
         SerializeContextFixture::SetUp();
 
+        SuppressTraceOutput(false);
+
         AZ::JobManagerDesc jobDesc;
+
         AZ::JobManagerThreadDesc threadDesc;
         for (size_t threadCount = 0; threadCount < GetNumJobManagerThreads(); threadCount++)
         {
@@ -111,9 +114,21 @@ namespace UnitTest
         delete m_jobContext;
         delete m_jobManager;
 
+        // Reset back to default suppression settings to avoid affecting other tests
+        SuppressTraceOutput(true);
+
         SerializeContextFixture::TearDown();
     }
 
+    void BaseAssetManagerTest::SuppressTraceOutput(bool suppress)
+    {
+        UnitTest::TestRunner::Instance().m_suppressAsserts = suppress;
+        UnitTest::TestRunner::Instance().m_suppressErrors = suppress;
+        UnitTest::TestRunner::Instance().m_suppressWarnings = suppress;
+        UnitTest::TestRunner::Instance().m_suppressPrintf = suppress;
+        UnitTest::TestRunner::Instance().m_suppressOutput = suppress;
+    }
+
     void BaseAssetManagerTest::WriteAssetToDisk(const AZStd::string& assetName, [[maybe_unused]] const AZStd::string& assetIdGuid)
     {
         AZStd::string assetFileName = GetTestFolderPath() + assetName;
@@ -150,4 +165,254 @@ namespace UnitTest
 
         EXPECT_FALSE(AssetManager::Instance().HasActiveJobsOrStreamerRequests());
     }
+
+    MemoryStreamerWrapper::MemoryStreamerWrapper()
+    {
+        using ::testing::_;
+        using ::testing::NiceMock;
+        using ::testing::Return;
+
+        ON_CALL(m_mockStreamer, SuspendProcessing()).WillByDefault([this]()
+        {
+            m_suspended = true;
+        });
+
+        ON_CALL(m_mockStreamer, ResumeProcessing()).WillByDefault([this]()
+        {
+            AZStd::unique_lock lock(m_mutex);
+
+            m_suspended = false;
+
+            while (!m_processingQueue.empty())
+            {
+                FileRequestHandle requestHandle = m_processingQueue.front();
+                m_processingQueue.pop();
+
+                const auto& onCompleteCallback = GetReadRequest(requestHandle)->m_callback;
+
+                if (onCompleteCallback)
+                {
+                    onCompleteCallback(requestHandle);
+                }
+            }
+        });
+
+        ON_CALL(m_mockStreamer, Read(_, ::testing::An<IStreamerTypes::RequestMemoryAllocator&>(), _, _, _, _))
+            .WillByDefault(
+            [this](
+            [[maybe_unused]] AZStd::string_view relativePath, IStreamerTypes::RequestMemoryAllocator& allocator, size_t size,
+            AZStd::chrono::microseconds deadline, IStreamerTypes::Priority priority, [[maybe_unused]] size_t offset)
+            {
+                AZStd::unique_lock lock(m_mutex);
+
+                ReadRequest request;
+
+                // Save off the requested deadline and priority
+                request.m_deadline = deadline;
+                request.m_priority = priority;
+                request.m_data = allocator.Allocate(size, size, 8);
+
+                const auto* virtualFile = FindFile(relativePath);
+
+                AZ_Assert(
+                    virtualFile->size() == size, "Streamer read request size did not match size of saved file: %d vs %d (%.*s)",
+                    virtualFile->size(), size,
+                    relativePath.size(), relativePath.data());
+                AZ_Assert(size > 0, "Size is zero %.*s", relativePath.size(), relativePath.data());
+
+                memcpy(request.m_data.m_address, virtualFile->data(), size);
+
+                // Create a real file request result and return it
+                request.m_request = m_context.GetNewExternalRequest();
+
+                m_readRequests.push_back(request);
+
+                return request.m_request;
+            });
+
+        ON_CALL(m_mockStreamer, SetRequestCompleteCallback(_, _))
+            .WillByDefault([this](FileRequestPtr& request, AZ::IO::IStreamer::OnCompleteCallback callback) -> FileRequestPtr&
+            {
+                // Save off the callback just so that we can call it when the request is "done"
+                AZStd::unique_lock lock(m_mutex);
+                ReadRequest* readRequest = GetReadRequest(request);
+                readRequest->m_callback = callback;
+
+                return request;
+            });
+
+        ON_CALL(m_mockStreamer, QueueRequest(_))
+            .WillByDefault([this](const auto& fileRequest)
+            {
+                if (!m_suspended)
+                {
+                    decltype(ReadRequest::m_callback) onCompleteCallback;
+
+                    AZStd::unique_lock lock(m_mutex);
+                    ReadRequest* readRequest = GetReadRequest(fileRequest);
+                    onCompleteCallback = readRequest->m_callback;
+
+                    if (onCompleteCallback)
+                    {
+                        onCompleteCallback(fileRequest);
+
+                        m_readRequests.erase(readRequest);
+                    }
+                }
+                else
+                {
+                    AZStd::unique_lock lock(m_mutex);
+
+                    m_processingQueue.push(fileRequest);
+                }
+            });
+
+        ON_CALL(m_mockStreamer, GetRequestStatus(_))
+            .WillByDefault([]([[maybe_unused]] FileRequestHandle request)
+            {
+                // Return whatever request status has been set in this class
+                return IO::IStreamerTypes::RequestStatus::Completed;
+            });
+
+        ON_CALL(m_mockStreamer, GetReadRequestResult(_, _, _, _))
+            .WillByDefault([this](
+            [[maybe_unused]] FileRequestHandle request, void*& buffer, AZ::u64& numBytesRead,
+            IStreamerTypes::ClaimMemory claimMemory)
+            {
+                // Make sure the requestor plans to free the data buffer we allocated.
+                EXPECT_EQ(claimMemory, IStreamerTypes::ClaimMemory::Yes);
+
+                AZStd::unique_lock lock(m_mutex);
+
+                ReadRequest* readRequest = GetReadRequest(request);
+
+                // Provide valid data buffer results.
+                numBytesRead = readRequest->m_data.m_size;
+                buffer = readRequest->m_data.m_address;
+
+                return true;
+            });
+
+        ON_CALL(m_mockStreamer, RescheduleRequest(_, _, _))
+            .WillByDefault([this](IO::FileRequestPtr target, AZStd::chrono::microseconds newDeadline, IO::IStreamerTypes::Priority newPriority)
+            {
+                AZStd::unique_lock lock(m_mutex);
+                ReadRequest* readRequest = GetReadRequest(target);
+
+                readRequest->m_deadline = newDeadline;
+                readRequest->m_priority = newPriority;
+
+                return target;
+            });
+    }
+
+    ReadRequest* MemoryStreamerWrapper::GetReadRequest(FileRequestHandle request)
+    {
+        auto itr = AZStd::find_if(
+            m_readRequests.begin(), m_readRequests.end(),
+            [request](const ReadRequest& searchItem) -> bool
+            {
+                return (searchItem.m_request == request);
+            });
+
+        return itr;
+    }
+
+    AZStd::vector<char>* MemoryStreamerWrapper::FindFile(AZStd::string_view path)
+    {
+        auto itr = m_virtualFiles.find(path);
+
+        if (itr == m_virtualFiles.end())
+        {
+            // Path didn't work as-is, does it have the test folder prefixed? If so try removing it
+            if (AZ::StringFunc::StartsWith(path, GetTestFolderPath()))
+            {
+                AZStd::string_view pathWithoutFolder = path;
+
+                pathWithoutFolder = AZ::StringFunc::LStrip(pathWithoutFolder, GetTestFolderPath().c_str());
+                itr = m_virtualFiles.find(pathWithoutFolder);
+            }
+            else // Path isn't prefixed, so try adding it
+            {
+                itr = m_virtualFiles.find(GetTestFolderPath().append(path));
+            }
+        }
+
+        if (itr != m_virtualFiles.end())
+        {
+            return &itr->second;
+        }
+
+        // Currently no test expects a file not to exist so we assert to make it easy to quickly find where something went wrong
+        // If we ever need to test for a non-existent file this assert should just be conditionally disabled for that specific test
+        AZ_Assert(false, "Failed to find virtual file %*.s", path.size(), path.data())
+
+        return nullptr;
+    }
+
+    void DisklessAssetManagerBase::SetUp()
+    {
+        using ::testing::_;
+        using ::testing::NiceMock;
+        using ::testing::Return;
+
+        BaseAssetManagerTest::SetUp();
+
+        ON_CALL(m_fileIO, Size(::testing::Matcher<const char*>(::testing::_), _))
+            .WillByDefault(
+            [this](const char* path, u64& size)
+            {
+                AZStd::scoped_lock lock(m_streamerWrapper->m_mutex);
+
+                const auto* file = m_streamerWrapper->FindFile(path);
+
+                if (file)
+                {
+                    size = file->size();
+                    return ResultCode::Success;
+                }
+
+                AZ_Error("DisklessAssetManagerBase", false, "Failed to find virtual file %.*s", path);
+
+                return ResultCode::Error;
+            });
+
+        m_prevFileIO = IO::FileIOBase::GetInstance();
+        IO::FileIOBase::SetInstance(nullptr);
+        IO::FileIOBase::SetInstance(&m_fileIO);
+    }
+
+    void DisklessAssetManagerBase::TearDown()
+    {
+        IO::FileIOBase::SetInstance(nullptr);
+        IO::FileIOBase::SetInstance(m_prevFileIO);
+
+        BaseAssetManagerTest::TearDown();
+    }
+
+    IO::IStreamer* DisklessAssetManagerBase::CreateStreamer()
+    {
+        m_streamerWrapper = AZStd::make_unique<MemoryStreamerWrapper>();
+
+        return &(m_streamerWrapper->m_mockStreamer);
+    }
+
+    void DisklessAssetManagerBase::DestroyStreamer(IO::IStreamer*)
+    {
+        m_streamerWrapper = nullptr;
+    }
+
+    void DisklessAssetManagerBase::WriteAssetToDisk(const AZStd::string& assetName, const AZStd::string&)
+    {
+        AZStd::string assetFileName = GetTestFolderPath() + assetName;
+
+        AssetWithCustomData asset;
+
+        EXPECT_TRUE(m_streamerWrapper->WriteMemoryFile(assetFileName, &asset, m_serializeContext));
+    }
+
+    void DisklessAssetManagerBase::DeleteAssetFromDisk(const AZStd::string&)
+    {
+
+    }
 }
diff --git a/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h
index 757edb3713..af48c74a60 100644
--- a/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h
+++ b/Code/Framework/AzCore/Tests/Asset/BaseAssetManagerTest.h
@@ -20,7 +20,8 @@
 #include <Tests/Asset/TestAssetTypes.h>
 #include <Tests/SerializeContextFixture.h>
 #include <Tests/TestCatalog.h>
-
+#include <AzCore/UnitTest/Mocks/MockFileIOBase.h>
+#include <Streamer/IStreamerMock.h>
 
 namespace UnitTest
 {
@@ -58,14 +59,20 @@ namespace UnitTest
 
         // Subclasses can optionally override the streamer creation and destruction
         virtual IO::IStreamer* CreateStreamer() { return aznew IO::Streamer(AZStd::thread_desc{}, StreamerComponent::CreateStreamerStack()); }
-        virtual void DestroyStreamer(IO::IStreamer* streamer) { delete streamer; }
+        virtual void DestroyStreamer(IO::IStreamer* streamer)
+        {
+            delete streamer;
+            streamer = nullptr;
+        }
 
         void SetUp() override;
         void TearDown() override;
 
+        static void SuppressTraceOutput(bool suppress);
+
         // Helper methods to create and destroy actual assets on the disk for true end-to-end asset loading.
-        void WriteAssetToDisk(const AZStd::string& assetName, const AZStd::string& assetIdGuid);
-        void DeleteAssetFromDisk(const AZStd::string& assetName);
+        virtual void WriteAssetToDisk(const AZStd::string& assetName, const AZStd::string& assetIdGuid);
+        virtual void DeleteAssetFromDisk(const AZStd::string& assetName);
 
         void BlockUntilAssetJobsAreComplete();
 
@@ -80,4 +87,57 @@ namespace UnitTest
         AZStd::vector<AZStd::string> m_assetsWritten;
     };
 
+    
+    struct ReadRequest
+    {
+        AZStd::chrono::milliseconds m_deadline{};
+        AZ::IO::IStreamerTypes::Priority m_priority{};
+        IO::IStreamerTypes::RequestMemoryAllocatorResult m_data{ nullptr, 0, IO::IStreamerTypes::MemoryType::ReadWrite };
+        AZ::IO::IStreamer::OnCompleteCallback m_callback;
+        IO::FileRequestPtr m_request;
+    };
+
+    struct MemoryStreamerWrapper
+    {
+        MemoryStreamerWrapper();
+        ~MemoryStreamerWrapper() = default;
+
+        ReadRequest* GetReadRequest(IO::FileRequestHandle request);
+
+        template<typename TObject>
+        bool WriteMemoryFile(const AZStd::string& filePath, TObject* object, AZ::SerializeContext* context)
+        {
+            auto& buffer = m_virtualFiles[filePath];
+            ByteContainerStream stream(&buffer);
+
+            return AZ::Utils::SaveObjectToStream(stream, DataStream::StreamType::ST_XML, object, context);
+        }
+
+        AZStd::vector<char>* FindFile(AZStd::string_view path);
+
+        ::testing::NiceMock<StreamerMock> m_mockStreamer;
+        IO::StreamerContext m_context;
+        AZStd::atomic_bool m_suspended{ false };
+
+        AZStd::recursive_mutex m_mutex;
+        AZStd::queue<FileRequestHandle> m_processingQueue; // Keeps tracks of requests that have been queued while processing is suspended
+        AZStd::vector<ReadRequest> m_readRequests;
+        AZStd::unordered_map<AZStd::string, AZStd::vector<char>> m_virtualFiles;
+    };
+
+    struct DisklessAssetManagerBase : BaseAssetManagerTest
+    {
+        void SetUp() override;
+        void TearDown() override;
+        IO::IStreamer* CreateStreamer() override;
+        void DestroyStreamer(IO::IStreamer*) override;
+
+        void WriteAssetToDisk(const AZStd::string& assetName, const AZStd::string& assetIdGuid) override;
+        void DeleteAssetFromDisk(const AZStd::string& assetName) override;
+
+        AZStd::unique_ptr<MemoryStreamerWrapper> m_streamerWrapper;
+        ::testing::NiceMock<MockFileIOBase> m_fileIO;
+        IO::FileIOBase* m_prevFileIO{};
+    };
+
 }
diff --git a/Code/Framework/AzCore/Tests/BehaviorContextFixture.h b/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
index 1895f2e35b..3c6d48add7 100644
--- a/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
+++ b/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
@@ -59,7 +59,6 @@ namespace UnitTest
         AZ::SerializeContext* GetSerializeContext() override { return nullptr; }
         AZ::BehaviorContext*  GetBehaviorContext() override { return m_behaviorContext; }
         AZ::JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
diff --git a/Code/Framework/AzCore/Tests/Components.cpp b/Code/Framework/AzCore/Tests/Components.cpp
index 55b1c193b3..013d998c52 100644
--- a/Code/Framework/AzCore/Tests/Components.cpp
+++ b/Code/Framework/AzCore/Tests/Components.cpp
@@ -1060,26 +1060,21 @@ namespace UnitTest
     /**
      * UserSettingsComponent test
      */
-     class UserSettingsTestApp
-         : public ComponentApplication
-         , public UserSettingsFileLocatorBus::Handler
-     {
-     public:
-         void SetExecutableFolder(const char* path)
-         {
-             m_exeDirectory = path;
-         }
-
+    class UserSettingsTestApp
+        : public ComponentApplication
+        , public UserSettingsFileLocatorBus::Handler
+    {
+    public:
         AZStd::string ResolveFilePath(u32 providerId) override
         {
             AZStd::string filePath;
             if (providerId == UserSettings::CT_GLOBAL)
             {
-                filePath = (m_exeDirectory / "GlobalUserSettings.xml").String();
+                filePath = (AZ::IO::Path(GetTestFolderPath()) / "GlobalUserSettings.xml").Native();
             }
             else if (providerId == UserSettings::CT_LOCAL)
             {
-                filePath = (m_exeDirectory / "LocalUserSettings.xml").String();
+                filePath = (AZ::IO::Path(GetTestFolderPath()) / "LocalUserSettings.xml").Native();
             }
             return filePath;
         }
@@ -1117,7 +1112,6 @@ namespace UnitTest
         ComponentApplication::Descriptor appDesc;
         appDesc.m_memoryBlocksByteSize = 10 * 1024 * 1024;
         Entity* systemEntity = app.Create(appDesc);
-        app.SetExecutableFolder(GetTestFolderPath().c_str());
         app.UserSettingsFileLocatorBus::Handler::BusConnect();
 
         // Make sure user settings file does not exist at this point
diff --git a/Code/Framework/AzCore/Tests/Debug.cpp b/Code/Framework/AzCore/Tests/Debug.cpp
index 0d6e1a51e0..bd90611af3 100644
--- a/Code/Framework/AzCore/Tests/Debug.cpp
+++ b/Code/Framework/AzCore/Tests/Debug.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-#include <AzCore/Debug/Timer.h>
 #include <AzCore/Debug/StackTracer.h>
 #include <AzCore/Debug/TraceMessagesDrillerBus.h>
 #include <AzCore/Debug/Profiler.h>
diff --git a/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp b/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp
index ec9a09fb09..b9c690edcc 100644
--- a/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp
+++ b/Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp
@@ -11,7 +11,7 @@
 #include <AzCore/EBus/ScheduledEvent.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Console/LoggerSystemComponent.h>
-#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/Time/TimeSystem.h>
 #include <AzCore/Name/NameDictionary.h>
 #include <AzCore/UnitTest/TestTypes.h>
 
@@ -26,22 +26,22 @@ namespace UnitTest
             SetupAllocator();
             AZ::NameDictionary::Create();
 
-            m_loggerComponent = new AZ::LoggerSystemComponent;
-            m_timeComponent = new AZ::TimeSystemComponent;
-            m_eventSchedulerComponent = new AZ::EventSchedulerSystemComponent;
+            m_loggerComponent = AZStd::make_unique<AZ::LoggerSystemComponent>();
+            m_timeSystem = AZStd::make_unique<AZ::TimeSystem>();
+            m_eventSchedulerComponent = AZStd::make_unique<AZ::EventSchedulerSystemComponent>();
 
-            m_testEvent = new AZ::ScheduledEvent([this] { TestBasicEvent(); }, AZ::Name("UnitTestEvent fire once event"));
-            m_testRequeue = new AZ::ScheduledEvent([this] { TestAutoRequeuedEvent(); }, AZ::Name("UnitTestEvent auto Requeue"));
+            m_testEvent = AZStd::make_unique<AZ::ScheduledEvent>([this] { TestBasicEvent(); }, AZ::Name("UnitTestEvent fire once event"));
+            m_testRequeue = AZStd::make_unique<AZ::ScheduledEvent>([this] { TestAutoRequeuedEvent(); }, AZ::Name("UnitTestEvent auto Requeue"));
         }
 
         void TearDown() override
         {
-            delete m_testEvent;
-            delete m_testRequeue;
+            m_testEvent.reset();
+            m_testRequeue.reset();
 
-            delete m_eventSchedulerComponent;
-            delete m_timeComponent;
-            delete m_loggerComponent;
+            m_eventSchedulerComponent.reset();
+            m_timeSystem.reset();
+            m_loggerComponent.reset();
 
             AZ::NameDictionary::Destroy();
             TeardownAllocator();
@@ -60,12 +60,12 @@ namespace UnitTest
         uint32_t m_basicEventTriggerCount = 0;
         uint32_t m_requeuedEventTriggerCount = 0;
 
-        AZ::ScheduledEvent* m_testEvent = nullptr;
-        AZ::ScheduledEvent* m_testRequeue = nullptr;
+        AZStd::unique_ptr<AZ::ScheduledEvent> m_testEvent;
+        AZStd::unique_ptr<AZ::ScheduledEvent> m_testRequeue;
 
-        AZ::LoggerSystemComponent* m_loggerComponent = nullptr;
-        AZ::TimeSystemComponent* m_timeComponent = nullptr;
-        AZ::EventSchedulerSystemComponent* m_eventSchedulerComponent = nullptr;
+        AZStd::unique_ptr<AZ::LoggerSystemComponent> m_loggerComponent;
+        AZStd::unique_ptr<AZ::TimeSystem> m_timeSystem;
+        AZStd::unique_ptr<AZ::EventSchedulerSystemComponent> m_eventSchedulerComponent;
     };
 
     TEST_F(ScheduledEventTests, TestFireOnce)
diff --git a/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp b/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp
index 294d622a92..31fa6b626f 100644
--- a/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/FrustumTests.cpp
@@ -552,7 +552,6 @@ namespace UnitTest
         box.testCaseName = "BoxShaped";
         frustums.push_back(box);
 
-        // Default values in a CCamera from Cry_Camera.h
         FrustumTestCase defaultCameraFrustum;
         defaultCameraFrustum.nearTopLeft = AZ::Vector3(-0.204621f, 0.200000f, 0.153465f);
         defaultCameraFrustum.nearTopRight = AZ::Vector3(0.204621f, 0.200000f, 0.153465f);
diff --git a/Code/Framework/AzCore/Tests/Math/MathTestData.h b/Code/Framework/AzCore/Tests/Math/MathTestData.h
index f87ab8f448..72a98e835d 100644
--- a/Code/Framework/AzCore/Tests/Math/MathTestData.h
+++ b/Code/Framework/AzCore/Tests/Math/MathTestData.h
@@ -33,6 +33,15 @@ namespace MathTestData
         AZ::Matrix3x3::CreateScale(AZ::Vector3(0.7f, 1.3f, 0.9f))
     };
 
+    static const AZ::Matrix4x4 Matrix4x4s[] = {
+        AZ::Matrix4x4::CreateIdentity(),
+        AZ::Matrix4x4::CreateFromQuaternionAndTranslation(AZ::Quaternion(-0.46f, 0.26f, -0.22f, 0.82f), AZ::Vector3(1.0f, 5.0f, 10.0f)),
+        AZ::Matrix4x4::CreateFromTransform(AZ::Transform::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateScale(AZ::Vector3(1.0f, 2.0f, 3.0f)), AZ::Vector3(2.0f, 4.0f, 6.0f))),
+        AZ::Matrix4x4::CreateScale(AZ::Vector3(5.0f, 10.0f, 15.0f)),
+        AZ::Matrix4x4::CreateRotationZ(AZ::DegToRad(45.0f))
+    };
+
     using AxisPair = AZStd::pair<AZ::Constants::Axis, AZ::Vector3>;
     static const AxisPair Axes[] = {
         { AZ::Constants::Axis::XPositive, AZ::Vector3::CreateAxisX(1.0f) },
diff --git a/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp
index 8f8f8ca1e9..20d1107757 100644
--- a/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp
@@ -10,6 +10,7 @@
 #include <AzCore/Math/Matrix3x4.h>
 #include <AzCore/Math/Matrix3x3.h>
 #include <AzCore/Math/Quaternion.h>
+#include <AzCore/Math/VectorConversions.h>
 #include <AZTestShared/Math/MathTestHelpers.h>
 #include "MathTestData.h"
 
@@ -392,6 +393,32 @@ namespace UnitTest
 
     INSTANTIATE_TEST_CASE_P(MATH_Matrix3x4, Matrix3x4CreateFromMatrix3x3Fixture, ::testing::ValuesIn(MathTestData::Matrix3x3s));
 
+    using Matrix3x4CreateFromMatrix4x4Fixture = ::testing::TestWithParam<AZ::Matrix4x4>;
+
+    TEST_P(Matrix3x4CreateFromMatrix4x4Fixture, UnsafeCreateFromMatrix4x4)
+    {
+        const AZ::Matrix4x4 matrix4x4 = GetParam();
+        const AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::UnsafeCreateFromMatrix4x4(matrix4x4);
+        EXPECT_THAT(matrix3x4.GetTranslation(), IsClose(matrix4x4.GetTranslation()));
+        const AZ::Vector3 vector(2.3f, -0.6, 1.8f);
+        EXPECT_THAT(matrix3x4.TransformVector(vector), IsClose((matrix4x4 * AZ::Vector3ToVector4(vector, 0.0f)).GetAsVector3()));
+        const AZ::Vector3 point(12.3f, -5.6, 7.3f);
+        EXPECT_THAT(matrix3x4.TransformPoint(point), IsClose((matrix4x4 * AZ::Vector3ToVector4(point, 1.0f)).GetAsVector3()));
+    }
+
+    INSTANTIATE_TEST_CASE_P(MATH_Matrix3x4, Matrix3x4CreateFromMatrix4x4Fixture, ::testing::ValuesIn(MathTestData::Matrix4x4s));
+
+    TEST(MATH_Matrix3x4, TransformPoint)
+    {
+        const AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(90.0f)), AZ::Vector3(5.0f, 0.0f, 0.0f));
+
+        const AZ::Vector3 result = matrix3x4.TransformPoint(AZ::Vector3(1.0f, 0.0f, 0.0f));
+        const AZ::Vector3 expected = AZ::Vector3(5.0f, 0.0f, -1.0f);
+
+        EXPECT_THAT(result, expected);
+    }
+
     TEST(MATH_Matrix3x4, CreateScale)
     {
         const AZ::Vector3 scale(1.7f, 0.3f, 2.4f);
diff --git a/Code/Framework/AzCore/Tests/Serialization.cpp b/Code/Framework/AzCore/Tests/Serialization.cpp
index f1d5edc490..1666913317 100644
--- a/Code/Framework/AzCore/Tests/Serialization.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization.cpp
@@ -59,6 +59,7 @@
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/IO/ByteContainerStream.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzCore/IO/Path/PathReflect.h>
 #include <AzCore/IO/Streamer/StreamerComponent.h>
 
 #include <AzCore/RTTI/AttributeReader.h>
@@ -1240,7 +1241,6 @@ namespace UnitTest
         SerializeContext* GetSerializeContext() override { return m_serializeContext.get(); }
         BehaviorContext*  GetBehaviorContext() override { return nullptr; }
         JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
@@ -8152,5 +8152,98 @@ namespace UnitTest
         m_serializeContext->Class<TestClassWithEnumFieldThatSpecializesTypeInfo>();
         m_serializeContext->DisableRemoveReflection();
     }
+
+    template <typename ParamType>
+    class PathSerializationParamFixture
+        : public ScopedAllocatorSetupFixture
+        , public ::testing::WithParamInterface<ParamType>
+    {
+    public:
+        PathSerializationParamFixture()
+            : ScopedAllocatorSetupFixture(
+                []() { AZ::SystemAllocator::Descriptor desc; desc.m_stackRecordLevels = 30; return desc; }()
+            )
+        {}
+
+        // We must expose the class for serialization first.
+        void SetUp() override
+        {
+            m_serializeContext = AZStd::make_unique<AZ::SerializeContext>();
+            AZ::IO::PathReflect(m_serializeContext.get());
+
+        }
+
+        void TearDown() override
+        {
+            m_serializeContext->EnableRemoveReflection();
+            AZ::IO::PathReflect(m_serializeContext.get());
+            m_serializeContext->DisableRemoveReflection();
+
+            m_serializeContext.reset();
+        }
+
+    protected:
+        AZStd::unique_ptr<AZ::SerializeContext> m_serializeContext;
+    };
+
+    struct PathSerializationParams
+    {
+        const char m_preferredSeparator{};
+        const char* m_testPath{};
+    };
+    using PathSerializationFixture = PathSerializationParamFixture<PathSerializationParams>;
+
+    TEST_P(PathSerializationFixture, PathSerializer_SerializesStringBackedPath_Succeeds)
+    {
+        const auto& testParams = GetParam();
+        {
+            // Path serialization
+            AZ::IO::Path testPath{ testParams.m_testPath, testParams.m_preferredSeparator };
+
+            AZStd::vector<char> byteBuffer;
+            AZ::IO::ByteContainerStream byteStream(&byteBuffer);
+            auto objStream = AZ::ObjectStream::Create(&byteStream, *m_serializeContext, AZ::ObjectStream::ST_XML);
+            objStream->WriteClass(&testPath);
+            objStream->Finalize();
+
+            byteStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN);
+
+            AZ::IO::Path loadPath{ testParams.m_preferredSeparator };
+            EXPECT_TRUE(AZ::Utils::LoadObjectFromStreamInPlace(byteStream, loadPath, m_serializeContext.get()));
+            EXPECT_EQ(testPath.LexicallyNormal(), loadPath);
+        }
+
+        {
+            // FixedMaxPath serialization
+            AZ::IO::FixedMaxPath testFixedMaxPath{ testParams.m_testPath, testParams.m_preferredSeparator };
+
+            AZStd::vector<char> byteBuffer;
+            AZ::IO::ByteContainerStream byteStream(&byteBuffer);
+            auto objStream = AZ::ObjectStream::Create(&byteStream, *m_serializeContext, AZ::ObjectStream::ST_XML);
+            objStream->WriteClass(&testFixedMaxPath);
+            objStream->Finalize();
+
+            byteStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN);
+
+            AZ::IO::FixedMaxPath loadPath{ testParams.m_preferredSeparator };
+            EXPECT_TRUE(AZ::Utils::LoadObjectFromStreamInPlace(byteStream, loadPath, m_serializeContext.get()));
+            EXPECT_EQ(testFixedMaxPath.LexicallyNormal(), loadPath);
+        }
+    }
+
+    INSTANTIATE_TEST_CASE_P(
+        PathSerialization,
+        PathSerializationFixture,
+        ::testing::Values(
+            PathSerializationParams{ AZ::IO::PosixPathSeparator, "" },
+            PathSerializationParams{ AZ::IO::PosixPathSeparator, "test" },
+            PathSerializationParams{ AZ::IO::PosixPathSeparator, "/test" },
+            PathSerializationParams{ AZ::IO::WindowsPathSeparator, "test" },
+            PathSerializationParams{ AZ::IO::WindowsPathSeparator, "/test" },
+            PathSerializationParams{ AZ::IO::WindowsPathSeparator, "D:test" },
+            PathSerializationParams{ AZ::IO::WindowsPathSeparator, "D:/test" },
+            PathSerializationParams{ AZ::IO::WindowsPathSeparator, "test/foo/../bar" }
+        )
+    );
 }
 
diff --git a/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp
index 00a18f7682..485593a699 100644
--- a/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp
@@ -539,6 +539,22 @@ tags=tools,renderer,metal)"
         EXPECT_STREQ("Bat", commandLine.GetMiscValue(2).c_str());
     }
 
+    TEST_F(SettingsRegistryMergeUtilsCommandLineFixture, RegsetFileArgument_DoesNotMergeNUL)
+    {
+        AZStd::string regsetFile = AZ::IO::SystemFile::GetNullFilename();
+        AZ::CommandLine commandLine;
+        commandLine.Parse({ "--regset-file", regsetFile });
+
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_registry, commandLine, false);
+
+        // Add a settings path to anchor loaded settings underneath
+        regsetFile = AZStd::string::format("%s::/AnchorPath/Of/Settings", AZ::IO::SystemFile::GetNullFilename());
+        commandLine.Parse({ "--regset-file", regsetFile });
+
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_registry, commandLine, false);
+        EXPECT_EQ(AZ::SettingsRegistryInterface::Type::NoType, m_registry->GetType("/AnchorPath/Of/Settings"));
+    }
+
     using SettingsRegistryAncestorDescendantOrEqualPathFixture = SettingsRegistryMergeUtilsCommandLineFixture;
 
     TEST_F(SettingsRegistryAncestorDescendantOrEqualPathFixture, ValidateThatAncestorOrDescendantOrPathWithTheSameValue_Succeeds)
diff --git a/Code/Framework/AzCore/Tests/TestCatalog.cpp b/Code/Framework/AzCore/Tests/TestCatalog.cpp
index c633c6391b..cb8fa11c72 100644
--- a/Code/Framework/AzCore/Tests/TestCatalog.cpp
+++ b/Code/Framework/AzCore/Tests/TestCatalog.cpp
@@ -167,7 +167,8 @@ namespace UnitTest
         if (!info.m_streamName.empty())
         {
             AZStd::string fullName = GetTestFolderPath() + info.m_streamName;
-            info.m_dataLen = static_cast<size_t>(IO::SystemFile::Length(fullName.c_str()));
+            IO::FileIOBase* io = IO::FileIOBase::GetInstance();
+            io->Size(fullName.c_str(), info.m_dataLen);
         }
         else
         {
@@ -187,8 +188,11 @@ namespace UnitTest
 
         if (!info.m_streamName.empty())
         {
+            IO::FileIOBase* io = AZ::IO::FileIOBase::GetInstance();
+
             AZStd::string fullName = GetTestFolderPath() + info.m_streamName;
-            info.m_dataLen = static_cast<size_t>(IO::SystemFile::Length(fullName.c_str()));
+
+            io->Size(fullName.c_str(), info.m_dataLen);
         }
         else
         {
diff --git a/Code/Framework/AzCore/Tests/Time/TimeTests.cpp b/Code/Framework/AzCore/Tests/Time/TimeTests.cpp
index 6727ef1501..7ba01ec0e0 100644
--- a/Code/Framework/AzCore/Tests/Time/TimeTests.cpp
+++ b/Code/Framework/AzCore/Tests/Time/TimeTests.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/Time/TimeSystem.h>
 #include <AzCore/UnitTest/TestTypes.h>
 
 namespace UnitTest
@@ -18,16 +18,16 @@ namespace UnitTest
         void SetUp() override
         {
             SetupAllocator();
-            m_timeComponent = new AZ::TimeSystemComponent;
+            m_timeSystem = AZStd::make_unique<AZ::TimeSystem>();
         }
 
         void TearDown() override
         {
-            delete m_timeComponent;
+            m_timeSystem.reset();
             TeardownAllocator();
         }
 
-        AZ::TimeSystemComponent* m_timeComponent = nullptr;
+        AZStd::unique_ptr<AZ::TimeSystem> m_timeSystem;
     };
 
     TEST_F(TimeTests, TestConversionUsToMs)
@@ -44,6 +44,30 @@ namespace UnitTest
         EXPECT_EQ(timeUs, AZ::TimeUs{ 1000000 });
     }
 
+    TEST_F(TimeTests, TestConversionTimeMsToSeconds)
+    {
+        AZ::TimeMs timeMs = AZ::TimeMs{ 1000 };
+        float timeSecondsFloat = AZ::TimeMsToSeconds(timeMs);
+        EXPECT_TRUE(AZ::IsClose(timeSecondsFloat, 1.0f));
+
+        double timeSecondsDouble = AZ::TimeMsToSecondsDouble(timeMs);
+        EXPECT_TRUE(AZ::IsClose(timeSecondsDouble, 1.0));
+    }
+
+    TEST_F(TimeTests, TestConversionSecondsToTimeUs)
+    {
+        double seconds = 1.0;
+        AZ::TimeUs timeUs = AZ::SecondsToTimeUs(seconds);
+        EXPECT_EQ(timeUs, AZ::TimeUs{ 1000000 });
+    }
+
+    TEST_F(TimeTests, TestConversionSecondsToTimeMs)
+    {
+        double seconds = 1.0;
+        AZ::TimeMs timeMs = AZ::SecondsToTimeMs(seconds);
+        EXPECT_EQ(timeMs, AZ::TimeMs{ 1000 });
+    }
+
     TEST_F(TimeTests, TestClocks)
     {
         AZ::TimeUs timeUs = AZ::GetElapsedTimeUs();
diff --git a/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h b/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
index 1c5db0a82b..e536082d61 100644
--- a/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
+++ b/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
@@ -67,12 +67,6 @@ namespace AzFramework
         /// Make path relative to the provided root.
         virtual void MakePathRelative(AZStd::string& /*fullPath*/, const char* /*rootPath*/) {}
 
-        /// Gets the engine root path where the modules for the current engine are located.
-        virtual const char* GetEngineRoot() const { return nullptr; }
-
-        /// Retrieves the app root path for the application.
-        virtual const char* GetAppRoot() const { return nullptr; }
-
         /// Get the Command Line arguments passed in.
         virtual const CommandLine* GetCommandLine() { return nullptr; }
 
diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
index 323e834413..b3521a877f 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
@@ -69,6 +69,7 @@
 #include <AzCore/Console/Console.h>
 #include <AzFramework/Viewport/ViewportBus.h>
 #include <GridMate/Memory.h>
+#include <AzFramework/Physics/HeightfieldProviderBus.h>
 
 #include "Application.h"
 #include <AzFramework/AzFrameworkModule.h>
@@ -224,13 +225,6 @@ namespace AzFramework
         }
     }
 
-    void Application::PreModuleLoad()
-    {
-        SetRootPath(RootPathType::EngineRoot, m_engineRoot.c_str());
-        AZ_TracePrintf(s_azFrameworkWarningWindow, "Engine Path: %s\n", m_engineRoot.c_str());
-    }
-
-
     void Application::Stop()
     {
         if (m_isStarted)
@@ -318,6 +312,8 @@ namespace AzFramework
         AzFramework::SurfaceData::SurfaceTagWeight::Reflect(context);
         AzFramework::SurfaceData::SurfacePoint::Reflect(context);
         AzFramework::Terrain::TerrainDataRequests::Reflect(context);
+        Physics::HeightfieldProviderRequests::Reflect(context);
+        Physics::HeightMaterialPoint::Reflect(context);
 
         if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
@@ -394,11 +390,6 @@ namespace AzFramework
         outModules.emplace_back(aznew AzFrameworkModule());
     }
 
-    const char* Application::GetAppRoot() const
-    {
-        return m_appRoot.c_str();
-    }
-
     const char* Application::GetCurrentConfigurationName() const
     {
 #if defined(_RELEASE)
@@ -434,19 +425,19 @@ namespace AzFramework
 
     void Application::ResolveEnginePath(AZStd::string& engineRelativePath) const
     {
-        AZ::IO::FixedMaxPath fullPath = m_engineRoot / engineRelativePath;
+        auto fullPath = AZ::IO::FixedMaxPath(GetEngineRoot()) / engineRelativePath;
         engineRelativePath = fullPath.String();
     }
 
     void Application::CalculateBranchTokenForEngineRoot(AZStd::string& token) const
     {
-        AzFramework::StringFunc::AssetPath::CalculateBranchToken(m_engineRoot.String(), token);
+        AZ::StringFunc::AssetPath::CalculateBranchToken(GetEngineRoot(), token);
     }
 
     ////////////////////////////////////////////////////////////////////////////
     void Application::MakePathRootRelative(AZStd::string& fullPath)
     {
-        MakePathRelative(fullPath, m_engineRoot.c_str());
+        MakePathRelative(fullPath, GetEngineRoot());
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -562,11 +553,9 @@ namespace AzFramework
 
     ////////////////////////////////////////////////////////////////////////////
 
-    AZ_CVAR(float, t_frameTimeOverride, 0.0f, nullptr, AZ::ConsoleFunctorFlags::Null, "If > 0, overrides the application delta frame-time with the provided value");
-
-    void Application::Tick(float deltaOverride /*= -1.f*/)
+    void Application::Tick()
     {
-        ComponentApplication::Tick((t_frameTimeOverride > 0.0f) ? t_frameTimeOverride : deltaOverride);
+        ComponentApplication::Tick();
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -582,30 +571,6 @@ namespace AzFramework
         }
     }
 
-    void Application::SetRootPath(RootPathType type, const char* source)
-    {
-        [[maybe_unused]] const size_t sourceLen = strlen(source);
-
-        // Copy the source path to the intended root path and correct the path separators as well
-        switch (type)
-        {
-        case RootPathType::AppRoot:
-        {
-            AZ_Assert(sourceLen < m_appRoot.Native().max_size(), "String overflow for App Root: %s", source);
-            m_appRoot = AZ::IO::PathView(source).LexicallyNormal();
-        }
-        break;
-        case RootPathType::EngineRoot:
-        {
-            AZ_Assert(sourceLen < m_engineRoot.Native().max_size(), "String overflow for Engine Root: %s", source);
-            m_engineRoot = AZ::IO::PathView(source).LexicallyNormal();
-        }
-        break;
-        default:
-            AZ_Assert(false, "Invalid RootPathType (%d)", static_cast<int>(type));
-        }
-    }
-
     struct DeprecatedAliasesKeyVisitor
         : AZ::SettingsRegistryInterface::Visitor
     {
diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.h b/Code/Framework/AzFramework/AzFramework/Application/Application.h
index c6b1dfeaae..27144e4376 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.h
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.h
@@ -87,7 +87,7 @@ namespace AzFramework
          */
         virtual void Stop();
 
-        void Tick(float deltaOverride = -1.f) override;
+        void Tick() override;
 
 
         AZ::ComponentTypeList GetRequiredSystemComponents() const override;
@@ -95,8 +95,6 @@ namespace AzFramework
 
         //////////////////////////////////////////////////////////////////////////
         //! ApplicationRequests::Bus::Handler
-        const char* GetEngineRoot() const override { return m_engineRoot.c_str(); }
-        const char* GetAppRoot() const override;
         void ResolveEnginePath(AZStd::string& engineRelativePath) const override;
         void CalculateBranchTokenForEngineRoot(AZStd::string& token) const override;
         bool IsPrefabSystemEnabled() const override;
@@ -146,8 +144,6 @@ namespace AzFramework
          */
         void SetFileIOAliases();
 
-        void PreModuleLoad() override;
-
         //////////////////////////////////////////////////////////////////////////
         //! AZ::ComponentApplication
         void RegisterCoreComponents() override;
@@ -181,13 +177,7 @@ namespace AzFramework
         bool m_ownsConsole = false;
 
         bool m_exitMainLoopRequested = false;
-        
-        enum class RootPathType
-        {
-            AppRoot,
-            EngineRoot
-        };
-        void SetRootPath(RootPathType type, const char* source);
+
     };
 } // namespace AzFramework
 
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index c1c5775958..04802a8d0e 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -34,7 +34,6 @@
 #include <AzFramework/Archive/Archive.h>
 #include <AzFramework/Archive/NestedArchive.h>
 #include <AzFramework/Archive/ArchiveBus.h>
-#include <AzFramework/Archive/ArchiveVars.h>
 #include <AzFramework/Archive/MissingFileReport.h>
 #include <AzFramework/Archive/ZipDirFind.h>
 #include <AzFramework/Archive/ZipDirCacheFactory.h>
@@ -43,13 +42,10 @@
 
 namespace AZ::IO
 {
-    AZ_CVAR(int, sys_PakPriority, aznumeric_cast<int>(ArchiveVars{}.nPriority), nullptr, AZ::ConsoleFunctorFlags::Null,
-        "If set to 1, tells Archive to try to open the file in pak first, then go to file system");
-    AZ_CVAR(int, sys_PakMessageInvalidFileAccess, ArchiveVars{}.nMessageInvalidFileAccess, nullptr, AZ::ConsoleFunctorFlags::Null,
-        "Message Box synchronous file access when in game");
-
-    AZ_CVAR(int, sys_PakWarnOnPakAccessFailures, ArchiveVars{}.nWarnOnPakAccessFails, nullptr, AZ::ConsoleFunctorFlags::Null,
-        "If 1, access failure for Paks is treated as a warning, if zero it is only a log message.");
+    AZ_CVAR(int, sys_PakPriority, aznumeric_cast<int>(ArchiveVars{}.m_fileSearchPriority), nullptr, AZ::ConsoleFunctorFlags::Null,
+        "If set to 0, tells Archive to try to open the file on the file system first othewise check mounted paks.\n"
+        "If set to 1, tells Archive to try to open the file in pak first, then go to file system.\n"
+        "If set to 2, tells the Archive to only open files from the pak");
     AZ_CVAR(int, sys_report_files_not_found_in_paks, 0, nullptr, AZ::ConsoleFunctorFlags::Null,
         "Reports when files are searched for in paks and not found. 1 = log, 2 = warning, 3 = error");
     AZ_CVAR(int32_t, az_archive_verbosity, 0, nullptr, AZ::ConsoleFunctorFlags::Null,
@@ -437,9 +433,9 @@ namespace AZ::IO
 
 
     //////////////////////////////////////////////////////////////////////////
-    bool Archive::IsFileExist(AZStd::string_view sFilename, EFileSearchLocation fileLocation)
+    bool Archive::IsFileExist(AZStd::string_view sFilename, FileSearchLocation fileLocation)
     {
-        const AZ::IO::ArchiveLocationPriority nVarPakPriority = GetPakPriority();
+        const AZ::IO::FileSearchPriority nVarPakPriority = GetPakPriority();
 
         auto szFullPath = AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(sFilename);
         if (!szFullPath)
@@ -450,25 +446,25 @@ namespace AZ::IO
 
         switch(fileLocation)
         {
-        case IArchive::eFileLocation_Any:
+        case FileSearchLocation::Any:
             // Search for file based on pak priority
             switch (nVarPakPriority)
             {
-            case ArchiveLocationPriority::ePakPriorityFileFirst:
+            case FileSearchPriority::FileFirst:
                 return FileIOBase::GetDirectInstance()->Exists(szFullPath->c_str()) || FindPakFileEntry(szFullPath->Native());
-            case ArchiveLocationPriority::ePakPriorityPakFirst:
+            case FileSearchPriority::PakFirst:
                 return FindPakFileEntry(szFullPath->Native()) || IO::FileIOBase::GetDirectInstance()->Exists(szFullPath->c_str());
-            case ArchiveLocationPriority::ePakPriorityPakOnly:
+            case FileSearchPriority::PakOnly:
                 return FindPakFileEntry(szFullPath->Native());
             default:
-                AZ_Assert(false, "PakPriority %d doesn't match a value in the ArchiveLocationPriority enum",
+                AZ_Assert(false, "PakPriority %d doesn't match a value in the FileSearchPriority enum",
                     aznumeric_cast<int>(nVarPakPriority));
             }
             break;
-        case IArchive::eFileLocation_InPak:
+        case FileSearchLocation::InPak:
             return FindPakFileEntry(szFullPath->Native());
-        case IArchive::eFileLocation_OnDisk:
-            if (nVarPakPriority != ArchiveLocationPriority::ePakPriorityPakOnly)
+        case FileSearchLocation::OnDisk:
+            if (nVarPakPriority != FileSearchPriority::PakOnly)
             {
                 return FileIOBase::GetDirectInstance()->Exists(szFullPath->c_str());
             }
@@ -485,7 +481,7 @@ namespace AZ::IO
     //////////////////////////////////////////////////////////////////////////
     bool Archive::IsFolder(AZStd::string_view sPath)
     {
-        AZStd::fixed_string<AZ::IO::MaxPathLength > filePath{ sPath };
+        AZ::IO::FixedMaxPath filePath{ sPath };
         return AZ::IO::FileIOBase::GetDirectInstance()->IsDirectory(filePath.c_str());
     }
 
@@ -515,7 +511,7 @@ namespace AZ::IO
 
         // get the priority into local variable to avoid it changing in the course of
         // this function execution (?)
-        const ArchiveLocationPriority nVarPakPriority = GetPakPriority();
+        const FileSearchPriority nVarPakPriority = GetPakPriority();
 
         AZ::IO::OpenMode nOSFlags = AZ::IO::GetOpenModeFromStringMode(szMode);
 
@@ -628,17 +624,17 @@ namespace AZ::IO
 
         switch (nVarPakPriority)
         {
-        case ArchiveLocationPriority::ePakPriorityFileFirst:
+        case FileSearchPriority::FileFirst:
         {
             AZ::IO::HandleType fileHandle = OpenFromFileSystem();
             return fileHandle != AZ::IO::InvalidHandle ? fileHandle : OpenFromArchive();
         }
-        case ArchiveLocationPriority::ePakPriorityPakFirst:
+        case FileSearchPriority::PakFirst:
         {
             AZ::IO::HandleType fileHandle = OpenFromArchive();
             return fileHandle != AZ::IO::InvalidHandle ? fileHandle : OpenFromFileSystem();
         }
-        case ArchiveLocationPriority::ePakPriorityPakOnly:
+        case FileSearchPriority::PakOnly:
         {
             return OpenFromArchive();
         }
@@ -810,7 +806,7 @@ namespace AZ::IO
             return 0;
         }
 
-        if (GetPakPriority() == ArchiveLocationPriority::ePakPriorityFileFirst) // if the file system files have priority now..
+        if (GetPakPriority() == FileSearchPriority::FileFirst) // if the file system files have priority now..
         {
             IArchive::SignedFileSize nFileSize = GetFileSizeOnDisk(fullPath->Native());
             if (nFileSize != IArchive::FILE_NOT_PRESENT)
@@ -825,7 +821,7 @@ namespace AZ::IO
             return pFileEntry->desc.lSizeUncompressed;
         }
 
-        if (bAllowUseFileSystem || GetPakPriority() == ArchiveLocationPriority::ePakPriorityPakFirst) // if the archive files had more priority, we didn't attempt fopen before- try it now
+        if (bAllowUseFileSystem || GetPakPriority() == FileSearchPriority::PakFirst) // if the archive files had more priority, we didn't attempt fopen before- try it now
         {
             IArchive::SignedFileSize nFileSize = GetFileSizeOnDisk(fullPath->Native());
             if (nFileSize != IArchive::FILE_NOT_PRESENT)
@@ -1023,7 +1019,7 @@ namespace AZ::IO
 
 
     //////////////////////////////////////////////////////////////////////////
-    AZ::IO::ArchiveFileIterator Archive::FindFirst(AZStd::string_view pDir, EFileSearchType searchType)
+    AZ::IO::ArchiveFileIterator Archive::FindFirst(AZStd::string_view pDir, FileSearchLocation searchType)
     {
         auto szFullPath = AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(pDir);
         if (!szFullPath)
@@ -1036,18 +1032,21 @@ namespace AZ::IO
         bool bAllowUseFileSystem{};
         switch (searchType)
         {
-            case IArchive::eFileSearchType_AllowInZipsOnly:
-                bAllowUseFileSystem = false;
-                bScanZips = true;
-                break;
-            case IArchive::eFileSearchType_AllowOnDiskAndInZips:
-                bAllowUseFileSystem = true;
-                bScanZips = true;
-                break;
-            case IArchive::eFileSearchType_AllowOnDiskOnly:
-                bAllowUseFileSystem = true;
-                bScanZips = false;
-                break;
+        case FileSearchLocation::InPak:
+            bAllowUseFileSystem = false;
+            bScanZips = true;
+            break;
+        case FileSearchLocation::Any:
+            bAllowUseFileSystem = true;
+            bScanZips = true;
+            break;
+        case FileSearchLocation::OnDisk:
+            bAllowUseFileSystem = true;
+            bScanZips = false;
+            break;
+        default:
+            AZ_Assert(false, "Invalid search location value supplied");
+            break;
         }
 
         AZStd::intrusive_ptr pFindData = aznew AZ::IO::FindData();
@@ -1218,7 +1217,7 @@ namespace AZ::IO
         else
         {
             // [LYN-2376] Remove once legacy slice support is removed
-            AZStd::vector<AZStd::string> levelDirs;
+            AZStd::vector<AZ::IO::Path> levelDirs;
 
             if (addLevels)
             {
@@ -1241,6 +1240,10 @@ namespace AZ::IO
 
             m_arrZips.insert(revItZip.base(), desc);
 
+            // This lock is for m_arrZips.
+            // Unlock it now because the modification is complete, and events responding to this signal
+            // will attempt to lock the same mutex, causing the application to lock up.
+            lock.unlock();
             m_levelOpenEvent.Signal(levelDirs);
         }
 
@@ -1376,7 +1379,7 @@ namespace AZ::IO
             return true;
         }
 
-        if (AZ::IO::ArchiveFileIterator fileIterator = FindFirst(pWildcardIn, IArchive::eFileSearchType_AllowOnDiskOnly); fileIterator)
+        if (AZ::IO::ArchiveFileIterator fileIterator = FindFirst(pWildcardIn, FileSearchLocation::OnDisk); fileIterator)
         {
             AZStd::vector<AZ::IO::FixedMaxPath> files;
             do
@@ -1951,15 +1954,15 @@ namespace AZ::IO
     }
 
     // gets the current archive priority
-    ArchiveLocationPriority Archive::GetPakPriority() const
+    FileSearchPriority Archive::GetPakPriority() const
     {
-        int pakPriority = aznumeric_cast<int>(ArchiveVars{}.nPriority);
+        FileSearchPriority pakPriority = ArchiveVars{}.m_fileSearchPriority;
         if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
         {
-            [[maybe_unused]] AZ::GetValueResult getCvarResult = console->GetCvarValue("sys_PakPriority", pakPriority);
+            [[maybe_unused]] AZ::GetValueResult getCvarResult = console->GetCvarValue("sys_PakPriority", reinterpret_cast<int&>(pakPriority));
             AZ_Error("Archive", getCvarResult == AZ::GetValueResult::Success, "Lookup of 'sys_PakPriority console variable failed with error %s", AZ::GetEnumString(getCvarResult));
         }
-        return static_cast<ArchiveLocationPriority>(pakPriority);
+        return pakPriority;
     }
 
     //////////////////////////////////////////////////////////////////////////
@@ -2026,13 +2029,13 @@ namespace AZ::IO
 
                 switch (GetPakPriority())
                 {
-                case ArchiveLocationPriority::ePakPriorityFileFirst:
+                case FileSearchPriority::FileFirst:
                     info.m_conflictResolution = AZ::IO::ConflictResolution::PreferFile;
                     break;
-                case ArchiveLocationPriority::ePakPriorityPakFirst:
+                case FileSearchPriority::PakFirst:
                     info.m_conflictResolution = AZ::IO::ConflictResolution::PreferArchive;
                     break;
-                case ArchiveLocationPriority::ePakPriorityPakOnly:
+                case FileSearchPriority::PakOnly:
                     info.m_conflictResolution = AZ::IO::ConflictResolution::UseArchiveOnly;
                     break;
                 }
@@ -2143,13 +2146,13 @@ namespace AZ::IO
         return manifestInfo;
     }
 
-    AZStd::vector<AZStd::string> Archive::ScanForLevels(ZipDir::CachePtr pZip)
+    AZStd::vector<AZ::IO::Path> Archive::ScanForLevels(ZipDir::CachePtr pZip)
     {
-        AZStd::queue<AZStd::string> scanDirs;
-        AZStd::vector<AZStd::string> levelDirs;
-        AZStd::string currentDir = "levels";
-        AZStd::string currentDirPattern;
-        AZStd::string currentFilePattern;
+        AZStd::queue<AZ::IO::Path> scanDirs;
+        AZStd::vector<AZ::IO::Path> levelDirs;
+        AZ::IO::Path currentDir = "levels";
+        AZ::IO::Path currentDirPattern;
+        AZ::IO::Path currentFilePattern;
         ZipDir::FindDir findDir(pZip);
 
         findDir.FindFirst(currentDir.c_str());
@@ -2167,11 +2170,10 @@ namespace AZ::IO
                 scanDirs.pop();
             }
 
-            currentDirPattern = currentDir + AZ_FILESYSTEM_SEPARATOR_WILDCARD;
-            currentFilePattern = currentDir + AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING + "level.pak";
+            currentDirPattern = currentDir / "*";
+            currentFilePattern = currentDir / "level.pak";
 
-            ZipDir::FileEntry* fileEntry = findFile.FindExact(currentFilePattern.c_str());
-            if (fileEntry)
+            if (ZipDir::FileEntry* fileEntry = findFile.FindExact(currentFilePattern); fileEntry)
             {
                 levelDirs.emplace_back(currentDir);
                 continue;
@@ -2179,9 +2181,7 @@ namespace AZ::IO
 
             for (findDir.FindFirst(currentDirPattern.c_str()); findDir.GetDirEntry(); findDir.FindNext())
             {
-                AZStd::string_view dirName = findDir.GetDirName();
-                AZStd::string dirToAdd = AZStd::string::format("%s/%.*s", currentDir.data(), aznumeric_cast<int>(dirName.size()), dirName.data());
-                scanDirs.push(dirToAdd);
+                scanDirs.push(currentDir / findDir.GetDirName());
             }
         } while (!scanDirs.empty());
 
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.h b/Code/Framework/AzFramework/AzFramework/Archive/Archive.h
index 279702b433..d429aa8f17 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.h
@@ -207,7 +207,7 @@ namespace AZ::IO
         uint64_t FTell(AZ::IO::HandleType handle) override;
         int FFlush(AZ::IO::HandleType handle) override;
         int FClose(AZ::IO::HandleType handle) override;
-        AZ::IO::ArchiveFileIterator FindFirst(AZStd::string_view pDir, EFileSearchType searchType = eFileSearchType_AllowInZipsOnly) override;
+        AZ::IO::ArchiveFileIterator FindFirst(AZStd::string_view pDir, FileSearchLocation searchType = FileSearchLocation::InPak) override;
         AZ::IO::ArchiveFileIterator FindNext(AZ::IO::ArchiveFileIterator fileIterator) override;
         bool FindClose(AZ::IO::ArchiveFileIterator fileIterator) override;
         int FEof(AZ::IO::HandleType handle) override;
@@ -219,7 +219,7 @@ namespace AZ::IO
         bool RemoveDir(AZStd::string_view pName) override;  // remove directory from FS (if supported)
         bool IsAbsPath(AZStd::string_view pPath) override;
 
-        bool IsFileExist(AZStd::string_view sFilename, EFileSearchLocation fileLocation = eFileLocation_Any) override;
+        bool IsFileExist(AZStd::string_view sFilename, FileSearchLocation fileLocation = FileSearchLocation::Any) override;
         bool IsFolder(AZStd::string_view sPath) override;
         IArchive::SignedFileSize GetFileSizeOnDisk(AZStd::string_view filename) override;
 
@@ -255,7 +255,7 @@ namespace AZ::IO
         bool DisableRuntimeFileAccess(bool status, AZStd::thread_id threadId) override;
 
         // gets the current archive priority
-        ArchiveLocationPriority GetPakPriority() const override;
+        FileSearchPriority GetPakPriority() const override;
 
         uint64_t GetFileOffsetOnMedia(AZStd::string_view szName) const override;
 
@@ -305,7 +305,7 @@ namespace AZ::IO
         AZStd::shared_ptr<AzFramework::AssetRegistry> GetBundleCatalog(ZipDir::CachePtr pZip, const AZStd::string& catalogName);
 
         // [LYN-2376] Remove once legacy slice support is removed
-        AZStd::vector<AZStd::string> ScanForLevels(ZipDir::CachePtr pZip);
+        AZStd::vector<AZ::IO::Path> ScanForLevels(ZipDir::CachePtr pZip);
 
         mutable AZStd::shared_mutex m_csOpenFiles;
         ZipPseudoFileArray m_arrOpenFiles;
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp
index 9e6e1034ea..8cc2b9dfb4 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp
@@ -169,7 +169,7 @@ namespace AZ::IO
         size = m_archive->FGetSize(filePath, true);
         if (!size)
         {
-            return m_archive->IsFileExist(filePath, IArchive::eFileLocation_Any) ? IO::ResultCode::Success : IO::ResultCode::Error;
+            return m_archive->IsFileExist(filePath, FileSearchLocation::Any) ? IO::ResultCode::Success : IO::ResultCode::Error;
         }
 
         return IO::ResultCode::Success;
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
index 7b483dc5de..9e4290131e 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
@@ -78,9 +78,9 @@ namespace AZ::IO
     {
         // get the priority into local variable to avoid it changing in the course of
         // this function execution
-        ArchiveLocationPriority nVarPakPriority = archive->GetPakPriority();
+        FileSearchPriority nVarPakPriority = archive->GetPakPriority();
 
-        if (nVarPakPriority == ArchiveLocationPriority::ePakPriorityFileFirst)
+        if (nVarPakPriority == FileSearchPriority::FileFirst)
         {
             // first, find the file system files
             ScanFS(archive, szDir);
@@ -96,7 +96,7 @@ namespace AZ::IO
             {
                 ScanZips(archive, szDir);
             }
-            if (bAllowUseFS || nVarPakPriority != ArchiveLocationPriority::ePakPriorityPakOnly)
+            if (bAllowUseFS || nVarPakPriority != FileSearchPriority::PakOnly)
             {
                 ScanFS(archive, szDir);
             }
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp
new file mode 100644
index 0000000000..0098d97b8d
--- /dev/null
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+
+#include <AzFramework/Archive/ArchiveVars.h>
+
+namespace AZ::IO
+{
+    FileSearchPriority GetDefaultFileSearchPriority()
+    {
+#if defined(LY_ARCHIVE_FILE_SEARCH_MODE)
+        return FileSearchPriority{ LY_ARCHIVE_FILE_SEARCH_MODE };
+#else
+        return FileSearchPriority{ !ArchiveVars::IsReleaseConfig
+            ? FileSearchPriority::FileFirst
+            : FileSearchPriority::PakOnly };
+#endif
+    }
+}
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h
index 931b07fa71..2c2ec33544 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h
@@ -9,17 +9,26 @@
 
 #pragma once
 
-#include <AzFramework/Archive/ArchiveVars_Platform.h>
-
 namespace AZ::IO
 {
-    enum class ArchiveLocationPriority
+    enum class FileSearchPriority
     {
-        ePakPriorityFileFirst = 0,
-        ePakPriorityPakFirst = 1,
-        ePakPriorityPakOnly = 2
+        FileFirst,
+        PakFirst,
+        PakOnly
     };
 
+
+    //file location enum used in isFileExist to control where the archive system looks for the file.
+    enum class FileSearchLocation
+    {
+        Any,
+        OnDisk,
+        InPak
+    };
+
+    FileSearchPriority GetDefaultFileSearchPriority();
+
     // variables that control behavior of the Archive subsystem
     struct ArchiveVars
     {
@@ -28,29 +37,10 @@ namespace AZ::IO
 #else
         inline static constexpr bool IsReleaseConfig{};
 #endif
-
-    public:
-        int nReadSlice{};
-        int nSaveTotalResourceList{};
-        int nSaveFastloadResourceList{};
-        int nSaveMenuCommonResourceList{};
         int nSaveLevelResourceList{};
-        int nValidateFileHashes{ IsReleaseConfig ? 0 : 1 };
-        int nUncachedStreamReads{ 1 };
-        int nInMemoryPerPakSizeLimit{ 6 }; // Limits in MB
-        int nTotalInMemoryPakSizeLimit{ 30 };
-        int nLoadCache{};
-        int nLoadModePaks{};
-        int nStreamCache{ STREAM_CACHE_DEFAULT };
-        ArchiveLocationPriority nPriority{ IsReleaseConfig
-            ? ArchiveLocationPriority::ePakPriorityPakOnly
-            : ArchiveLocationPriority::ePakPriorityFileFirst }; // Which file location to favor (loose vs. pak files)
+        FileSearchPriority m_fileSearchPriority{ GetDefaultFileSearchPriority()};
         int nMessageInvalidFileAccess{};
         int nLogInvalidFileAccess{ IsReleaseConfig ? 0 : 1 };
-        int nDisableNonLevelRelatedPaks{ 1 };
-        int nWarnOnPakAccessFails{ 1 }; // Whether to treat failed pak access as a warning or log message
-        int nSetLogLevel{ 3 };
-        int nLogAllFileAccess{};
 
     };
 }
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h b/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
index bd9615110a..d7eaee6e24 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
+++ b/Code/Framework/AzFramework/AzFramework/Archive/IArchive.h
@@ -18,13 +18,13 @@
 #include <AzCore/std/string/fixed_string.h>
 
 #include <AzFramework/Archive/ArchiveFindData.h>
-
+#include <AzFramework/Archive/ArchiveVars.h>
 
 enum EStreamSourceMediaType : int32_t;
 
 namespace AZ::IO
 {
-    enum class ArchiveLocationPriority;
+    enum class FileSearchPriority;
     struct IResourceList;
     struct INestedArchive;
     struct IArchive;
@@ -114,14 +114,6 @@ namespace AZ::IO
             RFOM_NextLevel                          // used for level2level loading
         };
 
-        //file location enum used in isFileExist to control where the archive system looks for the file.
-        enum EFileSearchLocation
-        {
-            eFileLocation_Any = 0,
-            eFileLocation_OnDisk,
-            eFileLocation_InPak,
-        };
-
         enum EInMemoryArchiveLocation
         {
             eInMemoryPakLocale_Unload = 0,
@@ -130,12 +122,6 @@ namespace AZ::IO
             eInMemoryPakLocale_PAK,
         };
 
-        enum EFileSearchType
-        {
-            eFileSearchType_AllowInZipsOnly = 0,
-            eFileSearchType_AllowOnDiskAndInZips,
-            eFileSearchType_AllowOnDiskOnly
-        };
 
         using SignedFileSize = int64_t;
 
@@ -213,7 +199,7 @@ namespace AZ::IO
         virtual AZStd::intrusive_ptr<AZ::IO::MemoryBlock> PoolAllocMemoryBlock(size_t nSize, const char* sUsage, size_t nAlign = 1) = 0;
 
         // Arguments:
-        virtual ArchiveFileIterator FindFirst(AZStd::string_view pDir, EFileSearchType searchType = eFileSearchType_AllowInZipsOnly) = 0;
+        virtual ArchiveFileIterator FindFirst(AZStd::string_view pDir, FileSearchLocation searchType = FileSearchLocation::InPak) = 0;
         virtual ArchiveFileIterator FindNext(AZ::IO::ArchiveFileIterator handle) = 0;
         virtual bool FindClose(AZ::IO::ArchiveFileIterator handle) = 0;
         //returns file modification time
@@ -221,7 +207,7 @@ namespace AZ::IO
 
         // Description:
         //    Checks if specified file exist in filesystem.
-        virtual bool IsFileExist(AZStd::string_view sFilename, EFileSearchLocation = eFileLocation_Any) = 0;
+        virtual bool IsFileExist(AZStd::string_view sFilename, FileSearchLocation = FileSearchLocation::Any) = 0;
 
         // Checks if path is a folder
         virtual bool IsFolder(AZStd::string_view sPath) = 0;
@@ -283,7 +269,7 @@ namespace AZ::IO
         virtual bool DisableRuntimeFileAccess(bool status, AZStd::thread_id threadId) = 0;
 
         // gets the current pak priority
-        virtual ArchiveLocationPriority GetPakPriority() const = 0;
+        virtual FileSearchPriority GetPakPriority() const = 0;
 
         // Summary:
         // Return offset in archive file (ideally has to return offset on DVD) for streaming requests sorting
@@ -295,7 +281,7 @@ namespace AZ::IO
 
         // Event sent when a archive file is opened that contains a level.pak
         // @param const AZStd::vector<AZStd::string>& - Array of directories containing level.pak files
-        using LevelPackOpenEvent = AZ::Event<const AZStd::vector<AZStd::string>&>;
+        using LevelPackOpenEvent = AZ::Event<const AZStd::vector<AZ::IO::Path>&>;
         virtual auto GetLevelPackOpenEvent()->LevelPackOpenEvent* = 0;
         // Event sent when a archive contains a level.pak is closed
         // @param const AZStd::string_view - Name of the pak file that was closed
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp
index 43a5e8fdb3..b4da5745be 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.cpp
@@ -7,23 +7,153 @@
  */
 
 #include <AzFramework/Asset/AssetBundleManifest.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/Serialization/ObjectStream.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
 namespace AzFramework
 {
-    
-    const int AssetBundleManifest::CurrentBundleVersion = 2;
+    // Redirects writing of the AssetBundleManifest to an older version if the bundle version
+    // is not set to the current version
+    static void OldBundleManifestWriter(AZ::SerializeContext::EnumerateInstanceCallContext& callContext, const void* bundleManifestPointer,
+        const AZ::SerializeContext::ClassData&, const AZ::SerializeContext::ClassElement* assetBundleManifestClassElement);
+
+    static bool BundleManifestVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& rootElement);
+
+    const int AssetBundleManifest::CurrentBundleVersion = 3;
     const char AssetBundleManifest::s_manifestFileName[] = "manifest.xml";
+
+    AssetBundleManifest::AssetBundleManifest() = default;
+    AssetBundleManifest::~AssetBundleManifest() = default;
+
     void AssetBundleManifest::ReflectSerialize(AZ::SerializeContext* serializeContext)
     {
         if (serializeContext)
         {
             serializeContext->Class<AssetBundleManifest>()
-                ->Version(2)
+                ->Version(CurrentBundleVersion, &BundleManifestVersionConverter)
+                ->Attribute(AZ::SerializeContextAttributes::ObjectStreamWriteElementOverride, &OldBundleManifestWriter)
                 ->Field("BundleVersion", &AssetBundleManifest::m_bundleVersion)
                 ->Field("CatalogName", &AssetBundleManifest::m_catalogName)
-                ->Field("DependentBundleNames", &AssetBundleManifest::m_depedendentBundleNames)
+                ->Field("DependentBundleNames", &AssetBundleManifest::m_dependentBundleNames)
                 ->Field("LevelNames", &AssetBundleManifest::m_levelDirs);
+
+            // Make sure the AZStd::vector<AZStd::string> type is reflected so that it can be read
+            // using DataElement::GetChildData
+            serializeContext->RegisterGenericType<AZStd::vector<AZStd::string>>();
         }
     }
+
+    bool BundleManifestVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& rootElement)
+    {
+        if (rootElement.GetVersion() < 3)
+        {
+            static constexpr AZ::u32 levelNamesCrc = AZ_CRC_CE("LevelNames");
+            AZStd::vector<AZ::IO::Path> newLevelDirs;
+            if (AZStd::vector<AZStd::string> oldLevelNames; rootElement.GetChildData(levelNamesCrc, oldLevelNames))
+            {
+                newLevelDirs.insert(newLevelDirs.end(),
+                    AZStd::make_move_iterator(oldLevelNames.begin()), AZStd::make_move_iterator(oldLevelNames.end()));
+            }
+            else
+            {
+                AZ_Error("AssetBundleManifest", false, R"(Unable to read "levelNames" from AssetBundleManifest version %u )",
+                    rootElement.GetVersion());
+            }
+
+            rootElement.RemoveElementByName(levelNamesCrc);
+            rootElement.AddElementWithData(context, "LevelNames", newLevelDirs);
+        }
+        return true;
+    }
+
+    void OldBundleManifestWriter(AZ::SerializeContext::EnumerateInstanceCallContext& callContext, const void* bundleManifestPointer,
+        const AZ::SerializeContext::ClassData&, const AZ::SerializeContext::ClassElement* assetBundleManifestClassElement)
+    {
+        // Copy the AssetBundleManifest current version instance to the AssetBundleManifest V2 instance
+        auto assetBundleManifestCurrent = reinterpret_cast<const AssetBundleManifest*>(bundleManifestPointer);
+        if (assetBundleManifestCurrent->GetBundleVersion() <= 2)
+        {
+            auto serializeContext = const_cast<AZ::SerializeContext*>(callContext.m_context);
+
+            struct AssetBundleManifestV2
+            {
+                // Use the same ClassName and typeid as the AssetBundleManifest
+                AZ_TYPE_INFO(AssetBundleManifest, azrtti_typeid<AssetBundleManifest>());
+                AZStd::string m_catalogName;
+                AZStd::vector<AZStd::string> m_dependentBundleNames;
+                AZStd::vector<AZStd::string> m_levelDirs;
+                int m_bundleVersion{};
+            };
+            auto ReflectAssetBundleManifestV2 = [](AZ::SerializeContext* serializeContext)
+            {
+                serializeContext->Class<AssetBundleManifestV2>()
+                    ->Version(2)
+                    ->Field("BundleVersion", &AssetBundleManifestV2::m_bundleVersion)
+                    ->Field("CatalogName", &AssetBundleManifestV2::m_catalogName)
+                    ->Field("DependentBundleNames", &AssetBundleManifestV2::m_dependentBundleNames)
+                    ->Field("LevelNames", &AssetBundleManifestV2::m_levelDirs);
+            };
+
+            // Unreflect the AssetBundleManifest class at the version since it shares the same typeid
+            // as the older version and Reflect the V2 AssetBundlerManifest
+            serializeContext->EnableRemoveReflection();
+            AssetBundleManifest::ReflectSerialize(serializeContext);
+            serializeContext->DisableRemoveReflection();
+            ReflectAssetBundleManifestV2(serializeContext);
+
+            // Use the Current AssetBundleManifest instance to make a Version 2 AssetBundleManifest
+            AssetBundleManifestV2 assetBundleManifestV2;
+            assetBundleManifestV2.m_catalogName = assetBundleManifestCurrent->GetCatalogName();
+            assetBundleManifestV2.m_dependentBundleNames = assetBundleManifestCurrent->GetDependentBundleNames();
+            assetBundleManifestV2.m_bundleVersion = assetBundleManifestCurrent->GetBundleVersion();
+            for (const AZ::IO::Path& levelDir : assetBundleManifestCurrent->GetLevelDirectories())
+            {
+                assetBundleManifestV2.m_levelDirs.emplace_back(levelDir.Native());
+            }
+
+            const AZ::TypeId& assetBundlerManifestTypeId = azrtti_typeid<AssetBundleManifestV2>();
+            const auto assetBundleManifestV2ClassData = serializeContext->FindClassData(assetBundlerManifestTypeId);
+
+            // Create an AssetBundleManifest Version 2 Class Eleemnt
+            // It will copy over the name and nameCrc values of the current AssetBundleManifestelemnt
+            auto CreateAssetBundleManifestV2ClassElement = [&assetBundlerManifestTypeId](
+                const AZ::SerializeContext::ClassElement* currentVersionElement) -> AZ::SerializeContext::ClassElement
+            {
+                AZ::SerializeContext::ClassElement v2ClassElement;
+                // Copy over the name of he current
+                if (currentVersionElement)
+                {
+                    v2ClassElement.m_name = currentVersionElement->m_name;
+                    v2ClassElement.m_nameCrc = currentVersionElement->m_nameCrc;
+                }
+                v2ClassElement.m_dataSize = sizeof(AssetBundleManifest);
+                v2ClassElement.m_azRtti = AZ::GetRttiHelper<AssetBundleManifestV2>();
+                v2ClassElement.m_genericClassInfo = nullptr;
+                v2ClassElement.m_typeId = assetBundlerManifestTypeId;
+                v2ClassElement.m_editData = nullptr;
+                v2ClassElement.m_attributeOwnership = AZ::SerializeContext::ClassElement::AttributeOwnership::Self;
+                return v2ClassElement;
+            };
+            const auto assetBundleManifestV2ClassElement = CreateAssetBundleManifestV2ClassElement(assetBundleManifestClassElement);
+
+            serializeContext->EnumerateInstanceConst(&callContext, &assetBundleManifestV2, assetBundlerManifestTypeId,
+                assetBundleManifestV2ClassData, assetBundleManifestClassElement ? &assetBundleManifestV2ClassElement : nullptr);
+
+            // Unreflect the V2 AssetBundleManifest and Re-reflect the AssetBundleManifest class at the current version
+            serializeContext->EnableRemoveReflection();
+            ReflectAssetBundleManifestV2(serializeContext);
+            serializeContext->DisableRemoveReflection();
+            AssetBundleManifest::ReflectSerialize(serializeContext);
+        }
+    }
+
+    const AZStd::vector<AZ::IO::Path>& AssetBundleManifest::GetLevelDirectories() const
+    {
+        return m_levelDirs;
+    }
+    void AssetBundleManifest::SetLevelsDirectory(const AZStd::vector<AZ::IO::Path>& levelDirs)
+    {
+        m_levelDirs = levelDirs;
+    }
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h
index 9760482231..eb0390a8c0 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetBundleManifest.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/IO/Path/Path_fwd.h>
 #include <AzCore/RTTI/TypeInfo.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/string/string.h>
@@ -27,7 +28,8 @@ namespace AzFramework
         AZ_TYPE_INFO(AssetBundleManifest, "{8628A669-7B19-4C48-A7CB-F670CC9586FD}");
         AZ_CLASS_ALLOCATOR(AssetBundleManifest, AZ::SystemAllocator, 0);
 
-        AssetBundleManifest() = default;
+        AssetBundleManifest();
+        ~AssetBundleManifest();
 
         static void ReflectSerialize(AZ::SerializeContext* serializeContext);
         
@@ -35,21 +37,21 @@ namespace AzFramework
         // of files within the AssetBundle in order to update the Asset Registry at runtime when
         // loading the bundle
         const AZStd::string& GetCatalogName() const { return m_catalogName; }
-        AZStd::vector<AZStd::string> GetDependentBundleNames() const { return m_depedendentBundleNames;  }
-        AZStd::vector<AZStd::string> GetLevelDirectories() const { return m_levelDirs; }
+        AZStd::vector<AZStd::string> GetDependentBundleNames() const { return m_dependentBundleNames;  }
+        const AZStd::vector<AZ::IO::Path>& GetLevelDirectories() const;
         int GetBundleVersion() const { return m_bundleVersion; }
         void SetCatalogName(const AZStd::string& catalogName) { m_catalogName = catalogName; }
         void SetBundleVersion(int bundleVersion) { m_bundleVersion = bundleVersion; }
-        void SetDependentBundleNames(const AZStd::vector<AZStd::string>& dependentBundleNames) { m_depedendentBundleNames = dependentBundleNames; }
-        void SetLevelsDirectory(const AZStd::vector<AZStd::string>& levelDirs) { m_levelDirs = levelDirs; }
+        void SetDependentBundleNames(const AZStd::vector<AZStd::string>& dependentBundleNames) { m_dependentBundleNames = dependentBundleNames; }
+        void SetLevelsDirectory(const AZStd::vector<AZ::IO::Path>& levelDirs);
 
         static const char s_manifestFileName[];
         static const int CurrentBundleVersion;
         
-    private: 
+    private:
         AZStd::string m_catalogName;
-        AZStd::vector<AZStd::string> m_depedendentBundleNames;
-        AZStd::vector<AZStd::string> m_levelDirs;
+        AZStd::vector<AZStd::string> m_dependentBundleNames;
+        AZStd::vector<AZ::IO::Path> m_levelDirs;
         int m_bundleVersion = CurrentBundleVersion;
     };
 
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
index 3d76bcefc4..0c6b195434 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
@@ -1186,7 +1186,7 @@ namespace AzFramework
     }
 
 
-    bool AssetCatalog::CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZStd::string>& levelDirs)
+    bool AssetCatalog::CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZ::IO::Path>& levelDirs)
     {
         if (bundleVersion > AzFramework::AssetBundleManifest::CurrentBundleVersion || bundleVersion < 0)
         {
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h
index 64f3c2e3d2..20f1355e7f 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.h
@@ -67,7 +67,7 @@ namespace AzFramework
         bool InsertDeltaCatalogBefore(AZStd::shared_ptr<AzFramework::AssetRegistry> deltaCatalog, AZStd::shared_ptr<AzFramework::AssetRegistry> afterDeltaCatalog) override;
         bool RemoveDeltaCatalog(AZStd::shared_ptr<AzFramework::AssetRegistry> deltaCatalog) override;
         static bool SaveAssetBundleManifest(const char* assetBundleManifestFile, AzFramework::AssetBundleManifest* bundleManifest);
-        bool CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZStd::string>& levelDirs) override;
+        bool CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZ::IO::Path>& levelDirs) override;
         bool CreateDeltaCatalog(const AZStd::vector<AZStd::string>& files, const AZStd::string& filePath) override;
         void AddExtension(const char* extension) override;
 
diff --git a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
index bc109b73c2..809f664a10 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
@@ -534,7 +534,7 @@ namespace AzFramework
 
     void TransformComponent::SetParentImpl(AZ::EntityId parentId, bool isKeepWorldTM)
     {
-        if (parentId == GetEntityId())
+        if (GetEntity() && parentId == GetEntityId())
         {
             AZ_Warning("TransformComponent", false, "An entity can not be set as its own parent.");
             return;
diff --git a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
index 49506364f4..b81a0ab7f0 100644
--- a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h
@@ -76,9 +76,12 @@ namespace AzFramework
         virtual void DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded = true) { (void)pos; (void)dir; (void)radius; (void)height; (void)drawShaded; }
         virtual void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) { (void)center; (void)axis; (void)radius; (void)height; }
         virtual void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded = true) { (void)center; (void)axis; (void)radius; (void)height; (void)drawShaded; }
+        virtual void DrawWireCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) { (void)center; (void)axis; (void)radius; (void)height; }
+        virtual void DrawSolidCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded = true) { (void)center; (void)axis; (void)radius; (void)height; (void)drawShaded; }
         virtual void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float heightStraightSection) { (void)center; (void)axis; (void)radius; (void)heightStraightSection; }
         virtual void DrawWireSphere(const AZ::Vector3& pos, float radius) { (void)pos; (void)radius; }
         virtual void DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius) { (void)pos; (void)radius; }
+        virtual void DrawWireHemisphere(const AZ::Vector3& pos, const AZ::Vector3& axis, float radius) { (void)pos; (void)axis; (void)radius; }
         virtual void DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) { (void)pos; (void)dir; (void)radius; }
         virtual void DrawBall(const AZ::Vector3& pos, float radius, bool drawShaded = true) { (void)pos; (void)radius; (void)drawShaded; }
         virtual void DrawDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) { (void)pos; (void)dir; (void)radius; }
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.cpp b/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.cpp
new file mode 100644
index 0000000000..38fac9655c
--- /dev/null
+++ b/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "HeightfieldProviderBus.h"
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/Math/Transform.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+namespace Physics
+{
+    void HeightfieldProviderRequests::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->EBus<Physics::HeightfieldProviderRequestsBus>("HeightfieldProviderRequestsBus")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Event("GetHeightfieldGridSpacing", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridSpacing)
+                ->Event("GetHeightfieldAabb", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldAabb)
+                ->Event("GetHeightfieldTransform", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldTransform)
+                ->Event("GetMaterialList", &Physics::HeightfieldProviderRequestsBus::Events::GetMaterialList)
+                ->Event("GetHeights", &Physics::HeightfieldProviderRequestsBus::Events::GetHeights)
+                ->Event("GetHeightsAndMaterials", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightsAndMaterials)
+                ->Event("GetHeightfieldMinHeight", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldMinHeight)
+                ->Event("GetHeightfieldMaxHeight", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldMaxHeight)
+                ->Event("GetHeightfieldGridColumns", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridColumns)
+                ->Event("GetHeightfieldGridRows", &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridRows)
+                ;
+        }
+    }
+
+    void HeightMaterialPoint::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<Physics::HeightMaterialPoint>()->Attribute(AZ::Script::Attributes::Category, "Physics");
+        }
+    }
+
+} // namespace Physics
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.h b/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.h
index 73523ee1ba..da361f0a2b 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.h
@@ -26,10 +26,25 @@ namespace Physics
 
     struct HeightMaterialPoint
     {
+        HeightMaterialPoint(
+            float height = 0.0f, QuadMeshType type = QuadMeshType::SubdivideUpperLeftToBottomRight, uint8_t index = 0)
+            : m_height(height)
+            , m_quadMeshType(type)
+            , m_materialIndex(index)
+            , m_padding(0)
+        {
+        }
+
+        virtual ~HeightMaterialPoint() = default;
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        AZ_RTTI(HeightMaterialPoint, "{DF167ED4-24E6-4F7B-8AB7-42622F7DBAD3}");
         float m_height{ 0.0f }; //!< Holds the height of this point in the heightfield relative to the heightfield entity location.
         QuadMeshType m_quadMeshType{ QuadMeshType::SubdivideUpperLeftToBottomRight }; //!< By default, create two triangles like this |\|, where this point is in the upper left corner.
         uint8_t m_materialIndex{ 0 }; //!< The surface material index for the upper left corner of this quad.
         uint16_t m_padding{ 0 }; //!< available for future use.
+
     };
 
     //! An interface to provide heightfield values.
@@ -37,6 +52,8 @@ namespace Physics
         : public AZ::ComponentBus
     {
     public:
+        static void Reflect(AZ::ReflectContext* context);
+
         //! Returns the distance between each height in the map.
         //! @return Vector containing Column Spacing, Rows Spacing.
         virtual AZ::Vector2 GetHeightfieldGridSpacing() const = 0;
@@ -46,11 +63,27 @@ namespace Physics
         //! @param numRows contains the size of the grid in the y direction.
         virtual void GetHeightfieldGridSize(int32_t& numColumns, int32_t& numRows) const = 0;
 
+        //! Returns the height field gridsize columns.
+        //! @return the size of the grid in the x direction.
+        virtual int32_t GetHeightfieldGridColumns() const = 0;
+
+        //! Returns the height field gridsize rows.
+        //! @return the size of the grid in the y direction.
+        virtual int32_t GetHeightfieldGridRows() const = 0;
+
         //! Returns the height field min and max height bounds.
         //! @param minHeightBounds contains the minimum height that the heightfield can contain.
         //! @param maxHeightBounds contains the maximum height that the heightfield can contain.
         virtual void GetHeightfieldHeightBounds(float& minHeightBounds, float& maxHeightBounds) const = 0;
 
+        //! Returns the height field min height bounds.
+        //! @return the minimum height that the heightfield can contain.
+        virtual float GetHeightfieldMinHeight() const = 0;
+
+        //! Returns the height field max height bounds.
+        //! @return the maximum height that the heightfield can contain.
+        virtual float GetHeightfieldMaxHeight() const = 0;
+
         //! Returns the AABB of the heightfield.
         //! This is provided separately from the shape AABB because the heightfield might choose to modify the AABB bounds.
         //! @return AABB of the heightfield.
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
index 222bc48dda..d78d4e0943 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
@@ -360,6 +360,11 @@ namespace Physics
                 ->Field("MaterialId", &Physics::MaterialId::m_id)
                 ;
         }
+
+        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<Physics::MaterialId>()->Attribute(AZ::Script::Attributes::Category, "Physics");
+        }
     }
 
     MaterialId MaterialId::Create()
diff --git a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp
similarity index 82%
rename from Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp
rename to Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp
index c6008deb34..51674bb32c 100644
--- a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp
@@ -6,16 +6,17 @@
  *
  */
 
-#include "CommunicatorTracePrinter.h"
+#include "ProcessCommunicatorTracePrinter.h"
 
-CommunicatorTracePrinter::CommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window) :
+
+ProcessCommunicatorTracePrinter::ProcessCommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window) :
     m_communicator(communicator),
     m_window(window)
 {
     m_stringBeingConcatenated.reserve(1024);
 }
 
-CommunicatorTracePrinter::~CommunicatorTracePrinter()
+ProcessCommunicatorTracePrinter::~ProcessCommunicatorTracePrinter()
 {
     // flush stdout
     WriteCurrentString(false);
@@ -24,7 +25,7 @@ CommunicatorTracePrinter::~CommunicatorTracePrinter()
     WriteCurrentString(true);
 }
 
-void CommunicatorTracePrinter::Pump()
+void ProcessCommunicatorTracePrinter::Pump()
 {
     if (m_communicator->IsValid())
     {
@@ -42,7 +43,7 @@ void CommunicatorTracePrinter::Pump()
     }
 }
 
-void CommunicatorTracePrinter::ParseDataBuffer(AZ::u32 readSize, bool isFromStdErr)
+void ProcessCommunicatorTracePrinter::ParseDataBuffer(AZ::u32 readSize, bool isFromStdErr)
 {
     if (readSize > AZ_ARRAY_SIZE(m_streamBuffer))
     {
@@ -67,7 +68,7 @@ void CommunicatorTracePrinter::ParseDataBuffer(AZ::u32 readSize, bool isFromStdE
     }
 }
 
-void CommunicatorTracePrinter::WriteCurrentString(bool isFromStdErr)
+void ProcessCommunicatorTracePrinter::WriteCurrentString(bool isFromStdErr)
 {
     AZStd::string& bufferToUse = isFromStdErr ? m_errorStringBeingConcatenated : m_stringBeingConcatenated;
 
diff --git a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h
similarity index 54%
rename from Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h
rename to Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h
index c2e4da32af..5e14fa290d 100644
--- a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h
+++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h
@@ -10,20 +10,21 @@
 
 #include <AzFramework/Process/ProcessCommunicator.h>
 
-//! CommunicatorTracePrinter listens to stderr and stdout of a running process and writes its output to the AZ_Trace system
+//! ProcessCommunicatorTracePrinter listens to stderr and stdout of a running process and writes its output to the AZ_Trace system
 //! Importantly, it does not do any blocking operations.
-class CommunicatorTracePrinter
+class ProcessCommunicatorTracePrinter
 {
 public:
-    CommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window);
-    ~CommunicatorTracePrinter();
+    ProcessCommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window);
+    ~ProcessCommunicatorTracePrinter();
 
-    // call this periodically to drain the buffers and write them.
+    //! Call this periodically to drain the buffers and write them.
     void Pump();
 
-    // drains the buffer into the string thats being built, then traces the string when it hits a newline.
+    //! Drains the buffer into the string that's being built, then traces the string when it hits a newline.
     void ParseDataBuffer(AZ::u32 readSize, bool isFromStdErr);
 
+    //! Prints the current buffer to AZ_Error or AZ_TracePrintf so that it can be picked up by AZ::Debug::Trace
     void WriteCurrentString(bool isFromStdError);
 
 private:
diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp
index 561408db20..f803e73462 100644
--- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp
@@ -26,10 +26,11 @@ namespace AzFramework::Terrain
                 ->Event("GetSurfaceWeights", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfaceWeights)
                 ->Event("GetSurfaceWeightsFromVector2",
                     &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfaceWeightsFromVector2)
+                ->Event("GetIsHole", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetIsHole)
                 ->Event("GetIsHoleFromFloats", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetIsHoleFromFloats)
-                ->Event("GetSurfacePoint", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfacePoint)
+                ->Event("GetSurfacePoint", &AzFramework::Terrain::TerrainDataRequestBus::Events::BehaviorContextGetSurfacePoint)
                 ->Event("GetSurfacePointFromVector2",
-                    &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfacePointFromVector2)
+                    &AzFramework::Terrain::TerrainDataRequestBus::Events::BehaviorContextGetSurfacePointFromVector2)
                 ->Event("GetTerrainAabb", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetTerrainAabb)
                 ->Event("GetTerrainHeightQueryResolution",
                     &AzFramework::Terrain::TerrainDataRequestBus::Events::GetTerrainHeightQueryResolution)
diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
index 30a2f8e044..4c73ddd770 100644
--- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
@@ -52,8 +52,8 @@ namespace AzFramework
             virtual void SetTerrainAabb(const AZ::Aabb& worldBounds) = 0;
 
             //! Returns terrains height in meters at location x,y.
-            //! @terrainExistsPtr: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside a terrain HOLE then *terrainExistsPtr will become false,
-            //!                  otherwise *terrainExistsPtr will become true.
+            //! @terrainExistsPtr: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside
+            //!  a terrain HOLE then *terrainExistsPtr will become false, otherwise *terrainExistsPtr will become true.
             virtual float GetHeight(const AZ::Vector3& position, Sampler sampler = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
             virtual float GetHeightFromVector2(
                 const AZ::Vector2& position, Sampler sampler = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
@@ -68,8 +68,7 @@ namespace AzFramework
 
             // Given an XY coordinate, return the surface normal.
             //! @terrainExists: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside a
-            //! terrain HOLE then *terrainExistsPtr will be set to false,
-            //!                  otherwise *terrainExistsPtr will be set to true.
+            //! terrain HOLE then *terrainExistsPtr will be set to false, otherwise *terrainExistsPtr will be set to true.
             virtual AZ::Vector3 GetNormal(
                 const AZ::Vector3& position, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
             virtual AZ::Vector3 GetNormalFromVector2(
@@ -78,8 +77,8 @@ namespace AzFramework
                 float x, float y, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
 
             //! Given an XY coordinate, return the max surface type and weight.
-            //! @terrainExists: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside a terrain HOLE then *terrainExistsPtr will be set to false,
-            //!                  otherwise *terrainExistsPtr will be set to true.
+            //! @terrainExists: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside
+            //! a terrain HOLE then *terrainExistsPtr will be set to false, otherwise *terrainExistsPtr will be set to true.
             virtual SurfaceData::SurfaceTagWeight GetMaxSurfaceWeight(
                 const AZ::Vector3& position, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
             virtual SurfaceData::SurfaceTagWeight GetMaxSurfaceWeightFromVector2(
@@ -87,8 +86,8 @@ namespace AzFramework
             virtual SurfaceData::SurfaceTagWeight GetMaxSurfaceWeightFromFloats(
                 float x, float y, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
 
-            //! Given an XY coordinate, return the set of surface types and weights.  The Vector3 input position version is defined to ignore
-            //! the input Z value.
+            //! Given an XY coordinate, return the set of surface types and weights. The Vector3 input position version is defined to
+            //! ignore the input Z value.
             virtual void GetSurfaceWeights(
                 const AZ::Vector3& inPosition,
                 SurfaceData::SurfaceTagWeightList& outSurfaceWeights,
@@ -106,13 +105,14 @@ namespace AzFramework
                 Sampler sampleFilter = Sampler::DEFAULT,
                 bool* terrainExistsPtr = nullptr) const = 0;
 
-            //! Convenience function for  low level systems that can't do a reverse lookup from Crc to string. Everyone else should use GetMaxSurfaceWeight or GetMaxSurfaceWeightFromFloats.
+            //! Convenience function for  low level systems that can't do a reverse lookup from Crc to string. Everyone else should use
+            //! GetMaxSurfaceWeight or GetMaxSurfaceWeightFromFloats.
             //! Not available in the behavior context.
             //! Returns nullptr if the position is inside a hole or outside of the terrain boundaries.
             virtual const char* GetMaxSurfaceName(
                 const AZ::Vector3& position, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0;
 
-            //! Given an XY coordinate, return all terrain information at that location.  The Vector3 input position version is defined
+            //! Given an XY coordinate, return all terrain information at that location. The Vector3 input position version is defined
             //! to ignore the input Z value.
             virtual void GetSurfacePoint(
                 const AZ::Vector3& inPosition,
@@ -130,6 +130,27 @@ namespace AzFramework
                 SurfaceData::SurfacePoint& outSurfacePoint,
                 Sampler sampleFilter = Sampler::DEFAULT,
                 bool* terrainExistsPtr = nullptr) const = 0;
+
+        private:
+            // Private variations of the GetSurfacePoint API exposed to BehaviorContext that returns a value instead of
+            // using an "out" parameter. The "out" parameter is useful for reusing memory allocated in SurfacePoint when
+            // using the public API, but can't easily be used from Script Canvas.
+            SurfaceData::SurfacePoint BehaviorContextGetSurfacePoint(
+                const AZ::Vector3& inPosition,
+                Sampler sampleFilter = Sampler::DEFAULT) const
+            {
+                SurfaceData::SurfacePoint result;
+                    GetSurfacePoint(inPosition, result, sampleFilter);
+                return result;
+            }
+            SurfaceData::SurfacePoint BehaviorContextGetSurfacePointFromVector2(
+                const AZ::Vector2& inPosition,
+                Sampler sampleFilter = Sampler::DEFAULT) const
+            {
+                SurfaceData::SurfacePoint result;
+                GetSurfacePointFromVector2(inPosition, result, sampleFilter);
+                return result;
+            }
         };
         using TerrainDataRequestBus = AZ::EBus<TerrainDataRequests>;
 
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
index 26c9db64aa..771884ac6a 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
@@ -94,27 +94,27 @@ namespace AzFramework
         float y;
         float z;
 
-        // 2.4 Factor as RzRyRx
-        if (orientation.GetElement(2, 0) < 1.0f)
+        // 2.5 Factor as RzRxRy
+        if (orientation.GetElement(2, 1) < 1.0f)
         {
-            if (orientation.GetElement(2, 0) > -1.0f)
+            if (orientation.GetElement(2, 1) > -1.0f)
             {
-                x = AZStd::atan2(orientation.GetElement(2, 1), orientation.GetElement(2, 2));
-                y = AZStd::asin(-orientation.GetElement(2, 0));
-                z = AZStd::atan2(orientation.GetElement(1, 0), orientation.GetElement(0, 0));
+                x = AZStd::asin(orientation.GetElement(2, 1));
+                y = AZStd::atan2(-orientation.GetElement(2, 0), orientation.GetElement(2, 2));
+                z = AZStd::atan2(-orientation.GetElement(0, 1), orientation.GetElement(1, 1));
             }
             else
             {
-                x = 0.0f;
-                y = AZ::Constants::Pi * 0.5f;
-                z = -AZStd::atan2(-orientation.GetElement(2, 1), orientation.GetElement(1, 1));
+                x = -AZ::Constants::Pi * 0.5f;
+                y = 0.0f;
+                z = -AZStd::atan2(orientation.GetElement(0, 2), orientation.GetElement(0, 0));
             }
         }
         else
         {
-            x = 0.0f;
-            y = -AZ::Constants::Pi * 0.5f;
-            z = AZStd::atan2(-orientation.GetElement(1, 2), orientation.GetElement(1, 1));
+            x = AZ::Constants::Pi * 0.5f;
+            y = 0.0f;
+            z = AZStd::atan2(orientation.GetElement(0, 2), orientation.GetElement(0, 0));
         }
 
         return { x, y, z };
@@ -122,14 +122,36 @@ namespace AzFramework
 
     void UpdateCameraFromTransform(Camera& camera, const AZ::Transform& transform)
     {
-        const auto eulerAngles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(transform));
+        UpdateCameraFromTranslationAndRotation(
+            camera, transform.GetTranslation(), AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(transform)));
+    }
 
+    void UpdateCameraFromTranslationAndRotation(Camera& camera, const AZ::Vector3& translation, const AZ::Vector3& eulerAngles)
+    {
         camera.m_pitch = eulerAngles.GetX();
         camera.m_yaw = eulerAngles.GetZ();
-        camera.m_pivot = transform.GetTranslation();
+        camera.m_pivot = translation;
         camera.m_offset = AZ::Vector3::CreateZero();
     }
 
+    float SmoothValueTime(const float smoothness, float deltaTime)
+    {
+        // note: the math for the lerp smoothing implementation for camera rotation and translation was inspired by this excellent
+        // article by Scott Lembcke: https://www.gamasutra.com/blogs/ScottLembcke/20180404/316046/Improved_Lerp_Smoothing.php
+        const float rate = AZStd::exp2(smoothness);
+        return AZStd::exp2(-rate * deltaTime);
+    }
+
+    float SmoothValue(const float target, const float current, const float time)
+    {
+        return AZ::Lerp(target, current, time);
+    }
+
+    float SmoothValue(const float target, const float current, const float smoothness, const float deltaTime)
+    {
+        return SmoothValue(target, current, SmoothValueTime(smoothness, deltaTime));
+    }
+
     bool CameraSystem::HandleEvents(const InputEvent& event)
     {
         if (const auto& cursor = AZStd::get_if<CursorEvent>(&event))
@@ -291,6 +313,11 @@ namespace AzFramework
         {
             return false;
         };
+
+        m_constrainPitch = []() constexpr
+        {
+            return true;
+        };
     }
 
     bool RotateCameraInput::HandleEvents(const InputEvent& event, const ScreenVector& cursorDelta, [[maybe_unused]] const float scrollDelta)
@@ -312,7 +339,10 @@ namespace AzFramework
         nextCamera.m_yaw -= float(cursorDelta.m_x) * rotateSpeed * Invert(m_invertYawFn());
 
         nextCamera.m_yaw = WrapYawRotation(nextCamera.m_yaw);
-        nextCamera.m_pitch = ClampPitchRotation(nextCamera.m_pitch);
+        if (m_constrainPitch())
+        {
+            nextCamera.m_pitch = ClampPitchRotation(nextCamera.m_pitch);
+        }
 
         return nextCamera;
     }
@@ -726,14 +756,14 @@ namespace AzFramework
 
     Camera SmoothCamera(const Camera& currentCamera, const Camera& targetCamera, const CameraProps& cameraProps, const float deltaTime)
     {
-        const auto clamp_rotation = [](const float angle)
+        const auto clampRotation = [](const float angle)
         {
             return AZStd::fmod(angle + AZ::Constants::TwoPi, AZ::Constants::TwoPi);
         };
 
         // keep yaw in 0 - 360 range
-        float targetYaw = clamp_rotation(targetCamera.m_yaw);
-        const float currentYaw = clamp_rotation(currentCamera.m_yaw);
+        float targetYaw = clampRotation(targetCamera.m_yaw);
+        const float currentYaw = clampRotation(currentCamera.m_yaw);
 
         // return the sign of the float input (-1, 0, 1)
         const auto sign = [](const float value)
@@ -742,21 +772,17 @@ namespace AzFramework
         };
 
         // ensure smooth transition when moving across 0 - 360 boundary
-        const float yawDelta = targetYaw - currentYaw;
-        if (AZStd::abs(yawDelta) >= AZ::Constants::Pi)
+        if (const float yawDelta = targetYaw - currentYaw; AZStd::abs(yawDelta) >= AZ::Constants::Pi)
         {
             targetYaw -= AZ::Constants::TwoPi * sign(yawDelta);
         }
 
         Camera camera;
-        // note: the math for the lerp smoothing implementation for camera rotation and translation was inspired by this excellent
-        // article by Scott Lembcke: https://www.gamasutra.com/blogs/ScottLembcke/20180404/316046/Improved_Lerp_Smoothing.php
         if (cameraProps.m_rotateSmoothingEnabledFn())
         {
-            const float lookRate = AZStd::exp2(cameraProps.m_rotateSmoothnessFn());
-            const float lookTime = AZStd::exp2(-lookRate * deltaTime);
-            camera.m_pitch = AZ::Lerp(targetCamera.m_pitch, currentCamera.m_pitch, lookTime);
-            camera.m_yaw = AZ::Lerp(targetYaw, currentYaw, lookTime);
+            const float lookTime = SmoothValueTime(cameraProps.m_rotateSmoothnessFn(), deltaTime);
+            camera.m_pitch = SmoothValue(targetCamera.m_pitch, currentCamera.m_pitch, lookTime);
+            camera.m_yaw = SmoothValue(targetYaw, currentYaw, lookTime);
         }
         else
         {
@@ -766,8 +792,7 @@ namespace AzFramework
 
         if (cameraProps.m_translateSmoothingEnabledFn())
         {
-            const float moveRate = AZStd::exp2(cameraProps.m_translateSmoothnessFn());
-            const float moveTime = AZStd::exp2(-moveRate * deltaTime);
+            const float moveTime = SmoothValueTime(cameraProps.m_rotateSmoothnessFn(), deltaTime);
             camera.m_pivot = targetCamera.m_pivot.Lerp(currentCamera.m_pivot, moveTime);
             camera.m_offset = targetCamera.m_offset.Lerp(currentCamera.m_offset, moveTime);
         }
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h
index 2d02bb0b6d..4eea94cbe7 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h
@@ -85,6 +85,19 @@ namespace AzFramework
     //! Extracts Euler angles (orientation) and translation from the transform and writes the values to the camera.
     void UpdateCameraFromTransform(Camera& camera, const AZ::Transform& transform);
 
+    //! Writes the translation value and Euler angles to the camera.
+    void UpdateCameraFromTranslationAndRotation(Camera& camera, const AZ::Vector3& translation, const AZ::Vector3& eulerAngles);
+
+    //! Returns the time ('t') input value to use with SmoothValue.
+    //! Useful if it is to be reused for multiple calls to SmoothValue.
+    float SmoothValueTime(float smoothness, float deltaTime);
+
+    // Smoothly interpolate a value from current to target according to a smoothing parameter.
+    float SmoothValue(float target, float current, float smoothness, float deltaTime);
+
+    // Overload of SmoothValue that takes time ('t') value directly.
+    float SmoothValue(float target, float current, float time);
+
     //! Generic motion type.
     template<typename MotionTag>
     struct MotionEvent
@@ -334,6 +347,7 @@ namespace AzFramework
         AZStd::function<float()> m_rotateSpeedFn;
         AZStd::function<bool()> m_invertPitchFn;
         AZStd::function<bool()> m_invertYawFn;
+        AZStd::function<bool()> m_constrainPitch;
 
     private:
         InputChannelId m_rotateChannelId; //!< Input channel to begin the rotate camera input.
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp
index 00cbda7b34..40fb82ca97 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp
@@ -8,18 +8,18 @@
 
 #include "CameraState.h"
 
-#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Math/Matrix3x4.h>
 #include <AzCore/Math/Transform.h>
+#include <AzCore/Serialization/SerializeContext.h>
 
 namespace AzFramework
 {
     void SetCameraClippingVolume(
-        AzFramework::CameraState& cameraState, const float nearPlane, const float farPlane, const float fovRad)
+        AzFramework::CameraState& cameraState, const float nearPlane, const float farPlane, const float verticalFovRad)
     {
         cameraState.m_nearClip = nearPlane;
         cameraState.m_farClip = farPlane;
-        cameraState.m_fovOrZoom = fovRad;
+        cameraState.m_fovOrZoom = verticalFovRad;
     }
 
     void SetCameraTransform(CameraState& cameraState, const AZ::Transform& transform)
@@ -35,20 +35,34 @@ namespace AzFramework
         SetCameraClippingVolume(cameraState, 0.1f, 1000.0f, AZ::DegToRad(60.0f));
     }
 
-    AzFramework::CameraState CreateDefaultCamera(
-         const AZ::Transform& transform, const AZ::Vector2& viewportSize)
+    CameraState CreateCamera(
+        const AZ::Transform& transform,
+        const float nearPlane,
+        const float farPlane,
+        const float verticalFovRad,
+        const AZ::Vector2& viewportSize)
     {
         AzFramework::CameraState cameraState;
 
-        SetDefaultCameraClippingVolume(cameraState);
         SetCameraTransform(cameraState, transform);
+        SetCameraClippingVolume(cameraState, nearPlane, farPlane, verticalFovRad);
         cameraState.m_viewportSize = viewportSize;
 
         return cameraState;
     }
 
-    AzFramework::CameraState CreateIdentityDefaultCamera(
-        const AZ::Vector3& position, const AZ::Vector2& viewportSize)
+    AzFramework::CameraState CreateDefaultCamera(const AZ::Transform& transform, const AZ::Vector2& viewportSize)
+    {
+        AzFramework::CameraState cameraState;
+
+        SetCameraTransform(cameraState, transform);
+        SetDefaultCameraClippingVolume(cameraState);
+        cameraState.m_viewportSize = viewportSize;
+
+        return cameraState;
+    }
+
+    AzFramework::CameraState CreateIdentityDefaultCamera(const AZ::Vector3& position, const AZ::Vector2& viewportSize)
     {
         return CreateDefaultCamera(AZ::Transform::CreateTranslation(position), viewportSize);
     }
@@ -89,15 +103,15 @@ namespace AzFramework
 
     void CameraState::Reflect(AZ::SerializeContext& serializeContext)
     {
-        serializeContext.Class<CameraState>()->
-            Field("Position", &CameraState::m_position)->
-            Field("Forward", &CameraState::m_forward)->
-            Field("Side", &CameraState::m_side)->
-            Field("Up", &CameraState::m_up)->
-            Field("ViewportSize", &CameraState::m_viewportSize)->
-            Field("NearClip", &CameraState::m_nearClip)->
-            Field("FarClip", &CameraState::m_farClip)->
-            Field("FovZoom", &CameraState::m_fovOrZoom)->
-            Field("Ortho", &CameraState::m_orthographic);
+        serializeContext.Class<CameraState>()
+            ->Field("Position", &CameraState::m_position)
+            ->Field("Forward", &CameraState::m_forward)
+            ->Field("Side", &CameraState::m_side)
+            ->Field("Up", &CameraState::m_up)
+            ->Field("ViewportSize", &CameraState::m_viewportSize)
+            ->Field("NearClip", &CameraState::m_nearClip)
+            ->Field("FarClip", &CameraState::m_farClip)
+            ->Field("FovZoom", &CameraState::m_fovOrZoom)
+            ->Field("Ortho", &CameraState::m_orthographic);
     }
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
index e174771c3b..cefb144ec1 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h
@@ -40,10 +40,14 @@ namespace AzFramework
         AZ::Vector2 m_viewportSize = AZ::Vector2::CreateZero(); //!< Dimensions of the viewport.
         float m_nearClip = 0.01f; //!< Near clip plane of the camera.
         float m_farClip = 100.0f; //!< Far clip plane of the camera.
-        float m_fovOrZoom = 0.0f; //!< Fov or zoom of camera depending on if it is using orthographic projection or not.
+        float m_fovOrZoom = 0.0f; //!< Vertical fov or zoom of camera depending on if it is using orthographic projection or not.
         bool m_orthographic = false; //!< Is the camera using orthographic projection or not.
     };
 
+    //! Create a camera at the given transform, specifying the near and far clip planes as well as the fov with a specific viewport size.
+    CameraState CreateCamera(
+        const AZ::Transform& transform, float nearPlane, float farPlane, float verticalFovRad, const AZ::Vector2& viewportSize);
+
     //! Create a camera at the given transform with a specific viewport size.
     //! @note The near/far clip planes and fov are sensible default values - please
     //! use SetCameraClippingVolume to override them.
@@ -60,7 +64,7 @@ namespace AzFramework
     CameraState CreateCameraFromWorldFromViewMatrix(const AZ::Matrix4x4& worldFromView, const AZ::Vector2& viewportSize);
 
     //! Override the default near/far clipping planes and fov of the camera.
-    void SetCameraClippingVolume(CameraState& cameraState, float nearPlane, float farPlane, float fovRad);
+    void SetCameraClippingVolume(CameraState& cameraState, float nearPlane, float farPlane, float verticalFovRad);
 
     //! Override the default near/far clipping planes and fov of the camera by inferring them the specified right handed transform into clip space.
     void SetCameraClippingVolumeFromPerspectiveFovMatrixRH(CameraState& cameraState, const AZ::Matrix4x4& clipFromView);
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
index 1b3645630e..294ff71974 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp
@@ -24,11 +24,12 @@ namespace AzFramework
 
     ClickDetector::ClickOutcome ClickDetector::DetectClick(const ClickEvent clickEvent, const ScreenVector& cursorDelta)
     {
+        m_moveAccumulator += ScreenVectorLength(cursorDelta);
+
         const auto previousDetectionState = m_detectionState;
         if (previousDetectionState == DetectionState::WaitingForMove)
         {
             // only allow the action to begin if the mouse has been moved a small amount
-            m_moveAccumulator += ScreenVectorLength(cursorDelta);
             if (m_moveAccumulator > m_deadZone)
             {
                 m_detectionState = DetectionState::Moved;
@@ -43,7 +44,7 @@ namespace AzFramework
                 using FloatingPointSeconds = AZStd::chrono::duration<float, AZStd::chrono::seconds::period>;
 
                 const auto diff = now - m_tryBeginTime.value();
-                if (FloatingPointSeconds(diff).count() < m_doubleClickInterval)
+                if (FloatingPointSeconds(diff).count() < m_doubleClickInterval && m_moveAccumulator < m_deadZone)
                 {
                     return ClickOutcome::Nil;
                 }
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
index 70bdeb4619..544afe6d69 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
@@ -15,6 +15,10 @@
 
 namespace AzFramework
 {
+    //! Default value to use for detecting if the mouse has moved far enough after a mouse down to no longer
+    //! register a click when a mouse up occurs.
+    inline constexpr float DefaultMouseMoveDeadZone = 2.0f;
+
     struct ScreenVector;
 
     //! Utility class to help detect different types of mouse click (mouse down and up with
@@ -66,7 +70,7 @@ namespace AzFramework
         };
 
         float m_moveAccumulator = 0.0f; //!< How far the mouse has moved after mouse down.
-        float m_deadZone = 2.0f; //!< How far to move before a click is cancelled (when Move will fire).
+        float m_deadZone = DefaultMouseMoveDeadZone; //!< How far to move before a click is cancelled (when Move will fire).
         float m_doubleClickInterval = 0.4f; //!< Default double click interval, can be overridden.
         DetectionState m_detectionState; //!< Internal state of ClickDetector.
         //! Mouse down time (happens each mouse down, helps with double click handling).
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp
index e26d7cfa9b..f1c21230c7 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp
@@ -24,6 +24,10 @@ namespace AzFramework
             serializeContext->Class<ScreenVector>()->
                 Field("X", &ScreenVector::m_x)->
                 Field("Y", &ScreenVector::m_y);
+
+            serializeContext->Class<ScreenSize>()->
+                Field("Width", &ScreenSize::m_width)->
+                Field("Height", &ScreenSize::m_height);
         }
     }
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
index 1529d760e5..7a5d7fdc62 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h
@@ -26,7 +26,7 @@ namespace AzFramework
         AZ_TYPE_INFO(ScreenPoint, "{8472B6C2-527F-44FC-87F8-C226B1A57A97}");
         ScreenPoint() = default;
 
-        ScreenPoint(int x, int y)
+        constexpr ScreenPoint(int x, int y)
             : m_x(x)
             , m_y(y)
         {
@@ -45,7 +45,7 @@ namespace AzFramework
         AZ_TYPE_INFO(ScreenVector, "{1EAA2C62-8FDB-4A28-9FE3-1FA4F1418894}");
         ScreenVector() = default;
 
-        ScreenVector(int x, int y)
+        constexpr ScreenVector(int x, int y)
             : m_x(x)
             , m_y(y)
         {
@@ -55,6 +55,22 @@ namespace AzFramework
         int m_y; //!< Y screen delta.
     };
 
+    //! A wrapper around a screen width and height.
+    struct ScreenSize
+    {
+        AZ_TYPE_INFO(ScreenSize, "{26D28916-6E8E-44B8-83F9-C44BCDA370E2}");
+        ScreenSize() = default;
+
+        constexpr ScreenSize(int width, int height)
+            : m_width(width)
+            , m_height(height)
+        {
+        }
+
+        int m_width; //!< Screen size width.
+        int m_height; //!< Screen size height.
+    };
+
     void ScreenGeometryReflect(AZ::ReflectContext* context);
 
     inline const ScreenVector operator-(const ScreenPoint& lhs, const ScreenPoint& rhs)
@@ -138,6 +154,16 @@ namespace AzFramework
         return !operator==(lhs, rhs);
     }
 
+    inline const bool operator==(const ScreenSize& lhs, const ScreenSize& rhs)
+    {
+        return lhs.m_width == rhs.m_width && lhs.m_height == rhs.m_height;
+    }
+
+    inline const bool operator!=(const ScreenSize& lhs, const ScreenSize& rhs)
+    {
+        return !operator==(lhs, rhs);
+    }
+
     inline ScreenVector& operator*=(ScreenVector& lhs, const float rhs)
     {
         lhs.m_x = aznumeric_cast<int>(AZStd::lround(aznumeric_cast<float>(lhs.m_x) * rhs));
@@ -152,6 +178,20 @@ namespace AzFramework
         return result;
     }
 
+    inline ScreenSize& operator*=(ScreenSize& lhs, const float rhs)
+    {
+        lhs.m_width = aznumeric_cast<int>(AZStd::lround(aznumeric_cast<float>(lhs.m_width) * rhs));
+        lhs.m_height = aznumeric_cast<int>(AZStd::lround(aznumeric_cast<float>(lhs.m_height) * rhs));
+        return lhs;
+    }
+
+    inline const ScreenSize operator*(const ScreenSize& lhs, const float rhs)
+    {
+        ScreenSize result{ lhs };
+        result *= rhs;
+        return result;
+    }
+
     inline float ScreenVectorLength(const ScreenVector& screenVector)
     {
         return aznumeric_cast<float>(AZStd::sqrt(screenVector.m_x * screenVector.m_x + screenVector.m_y * screenVector.m_y));
@@ -168,4 +208,28 @@ namespace AzFramework
     {
         return AZ::Vector2(aznumeric_cast<float>(screenVector.m_x), aznumeric_cast<float>(screenVector.m_y));
     }
+
+    //! Return an AZ::Vector2 from a ScreenSize.
+    inline AZ::Vector2 Vector2FromScreenSize(const ScreenSize& screenSize)
+    {
+        return AZ::Vector2(aznumeric_cast<float>(screenSize.m_width), aznumeric_cast<float>(screenSize.m_height));
+    }
+
+    //! Return a ScreenPoint from an AZ::Vector2.
+    inline ScreenPoint ScreenPointFromVector2(const AZ::Vector2& vector2)
+    {
+        return ScreenPoint(aznumeric_cast<int>(AZStd::lround(vector2.GetX())), aznumeric_cast<int>(AZStd::lround(vector2.GetY())));
+    }
+
+    //! Return a ScreenVector from an AZ::Vector2.
+    inline ScreenVector ScreenVectorFromVector2(const AZ::Vector2& vector2)
+    {
+        return ScreenVector(aznumeric_cast<int>(AZStd::lround(vector2.GetX())), aznumeric_cast<int>(AZStd::lround(vector2.GetY())));
+    }
+
+    //! Return a ScreenSize from an AZ::Vector2.
+    inline ScreenSize ScreenSizeFromVector2(const AZ::Vector2& vector2)
+    {
+        return ScreenSize(aznumeric_cast<int>(AZStd::lround(vector2.GetX())), aznumeric_cast<int>(AZStd::lround(vector2.GetY())));
+    }
 } // namespace AzFramework
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h
index 131ecc0c57..f53b84a63f 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h
@@ -15,6 +15,7 @@
 namespace AZ
 {
     class Matrix4x4;
+    class Matrix3x4;
     class Transform;
     class ReflectContext;
 } // namespace AZ
@@ -32,6 +33,8 @@ namespace AzFramework
 
         //! Gets the current camera's world to view matrix.
         virtual const AZ::Matrix4x4& GetCameraViewMatrix() const = 0;
+        //! Gets the current camera's world to view matrix as a Matrix3x4.
+        virtual AZ::Matrix3x4 GetCameraViewMatrixAsMatrix3x4() const = 0;
         //! Sets the current camera's world to view matrix.
         virtual void SetCameraViewMatrix(const AZ::Matrix4x4& matrix) = 0;
         //! Gets the current camera's projection (view to clip) matrix.
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp
index afd16a6c23..a23b306546 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp
@@ -10,6 +10,7 @@
 
 #include <AzCore/Math/Frustum.h>
 #include <AzCore/Math/Matrix4x4.h>
+#include <AzCore/Math/MatrixUtils.h>
 #include <AzCore/Math/Vector4.h>
 #include <AzCore/Math/VectorConversions.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
@@ -30,34 +31,31 @@ namespace AzFramework
     // multiplication which must be used (see CameraTransformFromCameraView and CameraViewFromCameraTransform)
     // note: coordinate system convention is right handed
     //       see Matrix4x4::CreateProjection for more details
-    static AZ::Matrix4x4 ZYCoordinateSystemConversion()
+    static AZ::Matrix3x4 ZYCoordinateSystemConversion()
     {
         // note: the below matrix is the result of these combined transformations
         //      pitch = AZ::Matrix4x4::CreateRotationX(AZ::DegToRad(-90.0f));
         //      yaw = AZ::Matrix4x4::CreateRotationZ(AZ::DegToRad(180.0f));
         //      conversion = pitch * yaw
-        return AZ::Matrix4x4::CreateFromColumns(
-            AZ::Vector4(-1.0f, 0.0f, 0.0f, 0.0f), AZ::Vector4(0.0f, 0.0f, 1.0f, 0.0f), AZ::Vector4(0.0f, 1.0f, 0.0f, 0.0f),
-            AZ::Vector4(0.0f, 0.0f, 0.0f, 1.0f));
+        return AZ::Matrix3x4::CreateFromColumns(
+            AZ::Vector3(-1.0f, 0.0f, 0.0f), AZ::Vector3(0.0f, 0.0f, 1.0f), AZ::Vector3(0.0f, 1.0f, 0.0f), AZ::Vector3(0.0f, 0.0f, 0.0f));
     }
 
-    AZ::Matrix4x4 CameraTransform(const CameraState& cameraState)
+    AZ::Matrix3x4 CameraTransform(const CameraState& cameraState)
     {
-        return AZ::Matrix4x4::CreateFromColumns(
-            AZ::Vector3ToVector4(cameraState.m_side), AZ::Vector3ToVector4(cameraState.m_forward), AZ::Vector3ToVector4(cameraState.m_up),
-            AZ::Vector3ToVector4(cameraState.m_position, 1.0f));
+        return AZ::Matrix3x4::CreateFromColumns(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position);
     }
 
-    AZ::Matrix4x4 CameraView(const CameraState& cameraState)
+    AZ::Matrix3x4 CameraView(const CameraState& cameraState)
     {
         // ensure the camera is looking down positive z with the x axis pointing left
-        return ZYCoordinateSystemConversion() * CameraTransform(cameraState).GetInverseTransform();
+        return ZYCoordinateSystemConversion() * CameraTransform(cameraState).GetInverseFast();
     }
 
-    AZ::Matrix4x4 InverseCameraView(const CameraState& cameraState)
+    AZ::Matrix3x4 InverseCameraView(const CameraState& cameraState)
     {
         // ensure the camera is looking down positive z with the x axis pointing left
-        return CameraView(cameraState).GetInverseTransform();
+        return CameraView(cameraState).GetInverseFast();
     }
 
     AZ::Matrix4x4 CameraProjection(const CameraState& cameraState)
@@ -71,14 +69,14 @@ namespace AzFramework
         return CameraProjection(cameraState).GetInverseFull();
     }
 
-    AZ::Matrix4x4 CameraTransformFromCameraView(const AZ::Matrix4x4& cameraView)
+    AZ::Matrix3x4 CameraTransformFromCameraView(const AZ::Matrix3x4& cameraView)
     {
-        return (ZYCoordinateSystemConversion() * cameraView).GetInverseTransform();
+        return (ZYCoordinateSystemConversion() * cameraView).GetInverseFast();
     }
 
-    AZ::Matrix4x4 CameraViewFromCameraTransform(const AZ::Matrix4x4& cameraTransform)
+    AZ::Matrix3x4 CameraViewFromCameraTransform(const AZ::Matrix3x4& cameraTransform)
     {
-        return ZYCoordinateSystemConversion() * cameraTransform.GetInverseTransform();
+        return ZYCoordinateSystemConversion() * cameraTransform.GetInverseFast();
     }
 
     AZ::Frustum FrustumFromCameraState(const CameraState& cameraState)
@@ -90,16 +88,17 @@ namespace AzFramework
     {
         const auto worldFromView = AzFramework::CameraTransform(cameraState);
         const auto cameraWorldTransform = AZ::Transform::CreateFromMatrix3x3AndTranslation(
-            AZ::Matrix3x3::CreateFromMatrix4x4(worldFromView), worldFromView.GetTranslation());
+            AZ::Matrix3x3::CreateFromMatrix3x4(worldFromView), worldFromView.GetTranslation());
         return AZ::ViewFrustumAttributes(
             cameraWorldTransform, AspectRatio(cameraState.m_viewportSize), cameraState.m_fovOrZoom, cameraState.m_nearClip,
             cameraState.m_farClip);
     }
 
-    AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix4x4& cameraView, const AZ::Matrix4x4& cameraProjection)
+    AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix3x4& cameraView, const AZ::Matrix4x4& cameraProjection)
     {
         // transform the world space position to clip space
-        const auto clipSpacePosition = cameraProjection * cameraView * AZ::Vector3ToVector4(worldPosition, 1.0f);
+        const auto clipSpacePosition =
+            cameraProjection * AZ::Vector3ToVector4(cameraView.TransformPoint(worldPosition), 1.0f);
         // transform the clip space position to ndc space (perspective divide)
         const auto ndcPosition = clipSpacePosition / clipSpacePosition.GetW();
         // transform ndc space from <-1,1> to <0, 1> range
@@ -108,13 +107,12 @@ namespace AzFramework
 
     ScreenPoint WorldToScreen(
         const AZ::Vector3& worldPosition,
-        const AZ::Matrix4x4& cameraView,
+        const AZ::Matrix3x4& cameraView,
         const AZ::Matrix4x4& cameraProjection,
         const AZ::Vector2& viewportSize)
     {
-        const auto ndcNormalizedPosition = WorldToScreenNdc(worldPosition, cameraView, cameraProjection);
         // scale ndc position by screen dimensions to return screen position
-        return ScreenPointFromNdc(AZ::Vector3ToVector2(ndcNormalizedPosition), viewportSize);
+        return ScreenPointFromNdc(AZ::Vector3ToVector2(WorldToScreenNdc(worldPosition, cameraView, cameraProjection)), viewportSize);
     }
 
     ScreenPoint WorldToScreen(const AZ::Vector3& worldPosition, const CameraState& cameraState)
@@ -123,7 +121,7 @@ namespace AzFramework
     }
 
     AZ::Vector3 ScreenNdcToWorld(
-        const AZ::Vector2& normalizedScreenPosition, const AZ::Matrix4x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection)
+        const AZ::Vector2& normalizedScreenPosition, const AZ::Matrix3x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection)
     {
         // convert screen space coordinates from <0, 1> to <-1,1> range
         const auto ndcPosition = normalizedScreenPosition * 2.0f - AZ::Vector2::CreateOne();
@@ -140,13 +138,11 @@ namespace AzFramework
 
     AZ::Vector3 ScreenToWorld(
         const ScreenPoint& screenPosition,
-        const AZ::Matrix4x4& inverseCameraView,
+        const AZ::Matrix3x4& inverseCameraView,
         const AZ::Matrix4x4& inverseCameraProjection,
         const AZ::Vector2& viewportSize)
     {
-        const auto normalizedScreenPosition = NdcFromScreenPoint(screenPosition, viewportSize);
-
-        return ScreenNdcToWorld(normalizedScreenPosition, inverseCameraView, inverseCameraProjection);
+        return ScreenNdcToWorld(NdcFromScreenPoint(screenPosition, viewportSize), inverseCameraView, inverseCameraProjection);
     }
 
     AZ::Vector3 ScreenToWorld(const ScreenPoint& screenPosition, const CameraState& cameraState)
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h
index 8a6c0249b2..9cd88e1c0c 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h
@@ -16,6 +16,7 @@
 namespace AZ
 {
     class Frustum;
+    class Matrix3x4;
     class Matrix4x4;
     struct ViewFrustumAttributes;
 } // namespace AZ
@@ -43,7 +44,7 @@ namespace AzFramework
     }
 
     //! Projects a position in world space to screen space normalized device coordinates for the given camera.
-    AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix4x4& cameraView, const AZ::Matrix4x4& cameraProjection);
+    AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix3x4& cameraView, const AZ::Matrix4x4& cameraProjection);
 
     //! Projects a position in world space to screen space for the given camera.
     ScreenPoint WorldToScreen(const AZ::Vector3& worldPosition, const CameraState& cameraState);
@@ -52,7 +53,7 @@ namespace AzFramework
     //! is called many times in a loop.
     ScreenPoint WorldToScreen(
         const AZ::Vector3& worldPosition,
-        const AZ::Matrix4x4& cameraView,
+        const AZ::Matrix3x4& cameraView,
         const AZ::Matrix4x4& cameraProjection,
         const AZ::Vector2& viewportSize);
 
@@ -64,14 +65,14 @@ namespace AzFramework
     //! is called many times in a loop.
     AZ::Vector3 ScreenToWorld(
         const ScreenPoint& screenPosition,
-        const AZ::Matrix4x4& inverseCameraView,
+        const AZ::Matrix3x4& inverseCameraView,
         const AZ::Matrix4x4& inverseCameraProjection,
         const AZ::Vector2& viewportSize);
 
     //! Unprojects a position in screen space normalized device coordinates to world space.
     //! Note: The position returned will be on the near clip plane of the camera in world space.
     AZ::Vector3 ScreenNdcToWorld(
-        const AZ::Vector2& ndcPosition, const AZ::Matrix4x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection);
+        const AZ::Vector2& ndcPosition, const AZ::Matrix3x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection);
 
     //! Returns the camera projection for the current camera state.
     AZ::Matrix4x4 CameraProjection(const CameraState& cameraState);
@@ -81,27 +82,27 @@ namespace AzFramework
 
     //! Returns the camera view for the current camera state.
     //! @note This is the 'v' in the MVP transform going from world space to view space (viewFromWorld).
-    AZ::Matrix4x4 CameraView(const CameraState& cameraState);
+    AZ::Matrix3x4 CameraView(const CameraState& cameraState);
 
     //! Returns the inverse of the camera view for the current camera state.
     //! @note This is the same as the CameraTransform but corrected for Z up.
-    AZ::Matrix4x4 InverseCameraView(const CameraState& cameraState);
+    AZ::Matrix3x4 InverseCameraView(const CameraState& cameraState);
 
     //! Returns the camera transform for the current camera state.
     //! @note This is the inverse of 'v' in the MVP transform going from view space to world space (worldFromView).
-    AZ::Matrix4x4 CameraTransform(const CameraState& cameraState);
+    AZ::Matrix3x4 CameraTransform(const CameraState& cameraState);
 
     //! Takes a camera view (the world to camera space transform) and returns the
     //! corresponding camera transform (the world position and orientation of the camera).
     //! @note The parameter is the viewFromWorld transform (the 'v' in MVP) going from world space
     //! to view space. The return value is worldFromView transform going from view space to world space.
-    AZ::Matrix4x4 CameraTransformFromCameraView(const AZ::Matrix4x4& cameraView);
+    AZ::Matrix3x4 CameraTransformFromCameraView(const AZ::Matrix3x4& cameraView);
 
     //! Takes a camera transform (the world position and orientation of the camera) and
     //! returns the corresponding camera view (to be used to transform from world to camera space).
     //! @note The parameter is the worldFromView transform going from view space to world space. The
     //! return value is viewFromWorld transform (the 'v' in MVP) going from view space to world space.
-    AZ::Matrix4x4 CameraViewFromCameraTransform(const AZ::Matrix4x4& cameraTransform);
+    AZ::Matrix3x4 CameraViewFromCameraTransform(const AZ::Matrix3x4& cameraTransform);
 
     //! Returns a frustum representing the camera transform and view volume in world space.
     AZ::Frustum FrustumFromCameraState(const CameraState& cameraState);
diff --git a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp
index c89d12a8ae..bb3c5e4388 100644
--- a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp
@@ -143,6 +143,13 @@ namespace AzFramework
         return vsync_interval;
     }
 
+    bool NativeWindow::SetSyncInterval(uint32_t newSyncInterval)
+    {
+        vsync_interval = newSyncInterval;
+        return true;
+    }
+
+
     /*static*/ bool NativeWindow::GetFullScreenStateOfDefaultWindow()
     {
         NativeWindowHandle defaultWindowHandle = nullptr;
diff --git a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h
index 0eb699475f..9c844034cb 100644
--- a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h
+++ b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h
@@ -132,6 +132,7 @@ namespace AzFramework
         void ToggleFullScreenState() override;
         float GetDpiScaleFactor() const override;
         uint32_t GetSyncInterval() const override;
+        bool SetSyncInterval(uint32_t newSyncInterval) override;
         uint32_t GetDisplayRefreshRate() const override;
 
         //! Get the full screen state of the default window.
diff --git a/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h b/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h
index d3bd0ce82c..faae925580 100644
--- a/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h
@@ -78,6 +78,10 @@ namespace AzFramework
         //! Returns the sync interval which tells the drivers the number of v-blanks to synchronize with
         virtual uint32_t GetSyncInterval() const = 0;
 
+        //! Sets the sync interval which tells the drivers the number of v-blanks to synchronize with
+        //! Returns if the sync interval was succesfully set
+        virtual bool SetSyncInterval(uint32_t newSyncInterval) = 0;
+
         //! Returns the refresh rate of the main display
         virtual uint32_t GetDisplayRefreshRate() const = 0;
     };
diff --git a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
index 22fbddb39a..aac7bd8f14 100644
--- a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
+++ b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake
@@ -21,6 +21,7 @@ set(FILES
     Archive/ArchiveFindData.cpp
     Archive/ArchiveFindData.h
     Archive/ArchiveVars.h
+    Archive/ArchiveVars.cpp
     Archive/Codec.h
     Archive/IArchive.h
     Archive/INestedArchive.h
@@ -78,6 +79,7 @@ set(FILES
     CommandLine/CommandLine.h
     CommandLine/CommandRegistrationBus.h
     Debug/DebugCameraBus.h
+    feature_options.cmake
     Viewport/ViewportBus.h
     Viewport/ViewportBus.cpp
     Viewport/ViewportColors.h
@@ -229,6 +231,7 @@ set(FILES
     Physics/Configuration/SystemConfiguration.h
     Physics/Configuration/SystemConfiguration.cpp
     Physics/HeightfieldProviderBus.h
+    Physics/HeightfieldProviderBus.cpp
     Physics/SimulatedBodies/RigidBody.h
     Physics/SimulatedBodies/RigidBody.cpp
     Physics/SimulatedBodies/StaticRigidBody.h
@@ -274,6 +277,8 @@ set(FILES
     Process/ProcessWatcher.cpp
     Process/ProcessWatcher.h
     Process/ProcessCommon_fwd.h
+    Process/ProcessCommunicatorTracePrinter.cpp
+    Process/ProcessCommunicatorTracePrinter.h
     ProjectManager/ProjectManager.h
     ProjectManager/ProjectManager.cpp
     Render/GameIntersectorComponent.h
diff --git a/Code/Framework/AzFramework/AzFramework/feature_options.cmake b/Code/Framework/AzFramework/AzFramework/feature_options.cmake
new file mode 100644
index 0000000000..e10ddf6ba6
--- /dev/null
+++ b/Code/Framework/AzFramework/AzFramework/feature_options.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(LY_ARCHIVE_FILE_SEARCH_MODE "" CACHE STRING "Set the default file search mode to locate non-Pak files within the Archive System\n\
+    Valid values are:\n\
+    0 = Search FileSystem first, before searching within mounted Paks (default in debug/profile)\n\
+    1 = Search mounted Paks first, before searching FileSystem\n\
+    2 = Search only mounted Paks (default in release)\n")
diff --git a/Code/Framework/AzFramework/CMakeLists.txt b/Code/Framework/AzFramework/CMakeLists.txt
index c8eeac5c2d..9f30d23a19 100644
--- a/Code/Framework/AzFramework/CMakeLists.txt
+++ b/Code/Framework/AzFramework/CMakeLists.txt
@@ -6,6 +6,7 @@
 #
 #
 
+include(AzFramework/feature_options.cmake)
 
 ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
 ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)
@@ -33,6 +34,14 @@ ly_add_target(
             3rdParty::lz4
 )
 
+set(LY_SEARCH_MODE_DEFINE $<$<BOOL:"${LY_ARCHIVE_FILE_SEARCH_MODE}">:LY_ARCHIVE_FILE_SEARCH_MODE=${LY_ARCHIVE_FILE_SEARCH_MODE}>)
+
+ly_add_source_properties(
+    SOURCES
+        AzFramework/Archive/ArchiveVars.cpp
+    PROPERTY COMPILE_DEFINITIONS
+    VALUES ${LY_SEARCH_MODE_DEFINE})
+
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
 
     ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Tests/Platform/${PAL_PLATFORM_NAME})
@@ -43,6 +52,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         FILES_CMAKE
             Tests/framework_shared_tests_files.cmake
             AzFramework/Physics/physics_mock_files.cmake
+            Tests/terrain_mock_files.cmake
         INCLUDE_DIRECTORIES
             PUBLIC
                 Tests
diff --git a/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake b/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake
index c220bc1154..9eddc4964a 100644
--- a/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake
@@ -27,8 +27,6 @@ set(FILES
     AzFramework/Input/User/LocalUserId_Platform.h
     ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
     AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Android.h
     AzFramework/Process/ProcessCommon.h
     AzFramework/Process/ProcessWatcher_Android.cpp
     AzFramework/Process/ProcessCommunicator_Android.cpp
diff --git a/Code/Framework/AzFramework/Platform/Common/Xcb/AzFramework/XcbInputDeviceMouse.h b/Code/Framework/AzFramework/Platform/Common/Xcb/AzFramework/XcbInputDeviceMouse.h
index a69a8a9ec5..f5b805a7a5 100644
--- a/Code/Framework/AzFramework/Platform/Common/Xcb/AzFramework/XcbInputDeviceMouse.h
+++ b/Code/Framework/AzFramework/Platform/Common/Xcb/AzFramework/XcbInputDeviceMouse.h
@@ -6,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/XcbConnectionManager.h>
 #include <AzFramework/XcbEventHandler.h>
diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h
deleted file mode 100644
index 5a80afe271..0000000000
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
diff --git a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
index 206563fdda..da1ce54a15 100644
--- a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake
@@ -28,6 +28,4 @@ set(FILES
     AzFramework/Input/User/LocalUserId_Platform.h
     ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
     ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Linux.h
 )
diff --git a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h
deleted file mode 100644
index 5311c78de6..0000000000
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_Mac.h>
diff --git a/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake
index 78f11a65da..319f8f7a46 100644
--- a/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake
@@ -30,8 +30,6 @@ set(FILES
     AzFramework/Input/User/LocalUserId_Platform.h
     ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
     ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Mac.h
     ../Common/Apple/AzFramework/Utils/SystemUtilsApple.h
     ../Common/Apple/AzFramework/Utils/SystemUtilsApple.mm
 )
diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h
deleted file mode 100644
index 771c25c998..0000000000
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_Windows.h>
diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h
deleted file mode 100644
index 5a80afe271..0000000000
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
diff --git a/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake
index b8f5b5f841..021ecd3298 100644
--- a/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake
@@ -32,6 +32,4 @@ set(FILES
     AzFramework/Input/User/LocalUserId_Platform.h
     ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
     ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Windows.h
 )
diff --git a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h
deleted file mode 100644
index 6ebbe5aade..0000000000
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_iOS.h>
diff --git a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h
deleted file mode 100644
index 5a80afe271..0000000000
--- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
diff --git a/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake
index 7745f43ec9..e784e4f6df 100644
--- a/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake
+++ b/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake
@@ -27,8 +27,6 @@ set(FILES
     AzFramework/Input/User/LocalUserId_Platform.h
     ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
     ../Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_iOS.h
     AzFramework/Process/ProcessCommon.h
     AzFramework/Process/ProcessWatcher_iOS.cpp
     AzFramework/Process/ProcessCommunicator_iOS.cpp
diff --git a/Code/Framework/AzFramework/Tests/ArchiveTests.cpp b/Code/Framework/AzFramework/Tests/ArchiveTests.cpp
index ff0e3ab724..33924d7e0c 100644
--- a/Code/Framework/AzFramework/Tests/ArchiveTests.cpp
+++ b/Code/Framework/AzFramework/Tests/ArchiveTests.cpp
@@ -273,7 +273,7 @@ namespace UnitTest
         // Also enable extra verbosity in the AZ::IO::Archive code
         CVarIntValueScope previousLocationPriority{ *console, "sys_pakPriority" };
         CVarIntValueScope oldArchiveVerbosity{ *console, "az_archive_verbosity" };
-        console->PerformCommand("sys_PakPriority", { AZ::CVarFixedString::format("%d", aznumeric_cast<int>(AZ::IO::ArchiveLocationPriority::ePakPriorityPakOnly)) });
+        console->PerformCommand("sys_PakPriority", { AZ::CVarFixedString::format("%d", aznumeric_cast<int>(AZ::IO::FileSearchPriority::PakOnly)) });
         console->PerformCommand("az_archive_verbosity", { "1" });
 
         // ---- Archive FGetCachedFileDataTests (these leverage Archive CachedFile mechanism for caching data ---
@@ -459,7 +459,7 @@ namespace UnitTest
 
         // Once the archive has been deleted it should no longer be searched
         CVarIntValueScope previousLocationPriority{ *console, "sys_pakPriority" };
-        console->PerformCommand("sys_PakPriority", { AZ::CVarFixedString::format("%d", aznumeric_cast<int>(AZ::IO::ArchiveLocationPriority::ePakPriorityPakOnly)) });
+        console->PerformCommand("sys_PakPriority", { AZ::CVarFixedString::format("%d", aznumeric_cast<int>(AZ::IO::FileSearchPriority::PakOnly)) });
 
         handle = archive->FindFirst("levels\\*");
         EXPECT_FALSE(static_cast<bool>(handle));
@@ -785,7 +785,7 @@ namespace UnitTest
 
         EXPECT_TRUE(archive->OpenPack("@usercache@", realNameBuf));
         EXPECT_TRUE(archive->IsFileExist("@usercache@/foundit.dat"));
-        EXPECT_FALSE(archive->IsFileExist("@usercache@/foundit.dat", AZ::IO::IArchive::eFileLocation_OnDisk));
+        EXPECT_FALSE(archive->IsFileExist("@usercache@/foundit.dat", AZ::IO::FileSearchLocation::OnDisk));
         EXPECT_FALSE(archive->IsFileExist("@usercache@/notfoundit.dat"));
         EXPECT_TRUE(archive->ClosePack(realNameBuf));
 
@@ -793,7 +793,7 @@ namespace UnitTest
         EXPECT_TRUE(archive->OpenPack("@products@", realNameBuf));
         EXPECT_TRUE(archive->IsFileExist("@products@/foundit.dat"));
         EXPECT_FALSE(archive->IsFileExist("@usercache@/foundit.dat")); // do not find it in the previous location!
-        EXPECT_FALSE(archive->IsFileExist("@products@/foundit.dat", AZ::IO::IArchive::eFileLocation_OnDisk));
+        EXPECT_FALSE(archive->IsFileExist("@products@/foundit.dat", AZ::IO::FileSearchLocation::OnDisk));
         EXPECT_FALSE(archive->IsFileExist("@products@/notfoundit.dat"));
         EXPECT_TRUE(archive->ClosePack(realNameBuf));
 
@@ -802,8 +802,8 @@ namespace UnitTest
         EXPECT_TRUE(archive->IsFileExist("@products@/mystuff/foundit.dat"));
         EXPECT_FALSE(archive->IsFileExist("@products@/foundit.dat")); // do not find it in the previous locations!
         EXPECT_FALSE(archive->IsFileExist("@usercache@/foundit.dat")); // do not find it in the previous locations!
-        EXPECT_FALSE(archive->IsFileExist("@products@/foundit.dat", AZ::IO::IArchive::eFileLocation_OnDisk));
-        EXPECT_FALSE(archive->IsFileExist("@products@/mystuff/foundit.dat", AZ::IO::IArchive::eFileLocation_OnDisk));
+        EXPECT_FALSE(archive->IsFileExist("@products@/foundit.dat", AZ::IO::FileSearchLocation::OnDisk));
+        EXPECT_FALSE(archive->IsFileExist("@products@/mystuff/foundit.dat", AZ::IO::FileSearchLocation::OnDisk));
         EXPECT_FALSE(archive->IsFileExist("@products@/notfoundit.dat")); // non-existent file
         EXPECT_FALSE(archive->IsFileExist("@products@/mystuff/notfoundit.dat")); // non-existent file
         EXPECT_TRUE(archive->ClosePack(realNameBuf));
diff --git a/Code/Framework/AzFramework/Tests/CameraInputTests.cpp b/Code/Framework/AzFramework/Tests/CameraInputTests.cpp
index a89fb0bd84..005623677c 100644
--- a/Code/Framework/AzFramework/Tests/CameraInputTests.cpp
+++ b/Code/Framework/AzFramework/Tests/CameraInputTests.cpp
@@ -104,9 +104,10 @@ namespace UnitTest
         AZStd::shared_ptr<AzFramework::OrbitCameraInput> m_orbitCamera;
         AZ::Vector3 m_pivot = AZ::Vector3::CreateZero();
 
-        //! This is approximately Pi/2 * 1000 - this can be used to rotate the camera 90 degrees (pitch or yaw based
-        //! on vertical or horizontal motion) as the rotate speed function is set to be 1/1000.
-        inline static const int PixelMotionDelta = 1570;
+        // this is approximately Pi/2 * 1000 - this can be used to rotate the camera 90 degrees (pitch or yaw based
+        // on vertical or horizontal motion) as the rotate speed function is set to be 1/1000.
+        inline static const int PixelMotionDelta90Degrees = 1570;
+        inline static const int PixelMotionDelta135Degrees = 2356;
     };
 
     TEST_F(CameraInputFixture, BeginAndEndOrbitCameraInputConsumesCorrectEvents)
@@ -292,7 +293,7 @@ namespace UnitTest
 
         HandleEventAndUpdate(
             AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began });
-        HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ PixelMotionDelta });
+        HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ PixelMotionDelta90Degrees });
 
         const float expectedYaw = AzFramework::WrapYawRotation(-AZ::Constants::HalfPi);
 
@@ -310,7 +311,7 @@ namespace UnitTest
 
         HandleEventAndUpdate(
             AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began });
-        HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta });
+        HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta90Degrees });
 
         const float expectedPitch = AzFramework::ClampPitchRotation(-AZ::Constants::HalfPi);
 
@@ -331,7 +332,7 @@ namespace UnitTest
         HandleEventAndUpdate(AzFramework::DiscreteInputEvent{ m_orbitChannelId, AzFramework::InputChannel::State::Began });
         HandleEventAndUpdate(
             AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Left, AzFramework::InputChannel::State::Began });
-        HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta });
+        HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta90Degrees });
 
         const auto expectedCameraEndingPosition = AZ::Vector3(0.0f, -10.0f, 10.0f);
         const float expectedPitch = AzFramework::ClampPitchRotation(-AZ::Constants::HalfPi);
@@ -354,7 +355,7 @@ namespace UnitTest
         HandleEventAndUpdate(AzFramework::DiscreteInputEvent{ m_orbitChannelId, AzFramework::InputChannel::State::Began });
         HandleEventAndUpdate(
             AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Left, AzFramework::InputChannel::State::Began });
-        HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ -PixelMotionDelta });
+        HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ -PixelMotionDelta90Degrees });
 
         const auto expectedCameraEndingPosition = AZ::Vector3(20.0f, -5.0f, 0.0f);
         const float expectedYaw = AzFramework::WrapYawRotation(AZ::Constants::HalfPi);
@@ -366,4 +367,42 @@ namespace UnitTest
         EXPECT_THAT(m_camera.m_offset, IsClose(AZ::Vector3(5.0f, -10.0f, 0.0f)));
         EXPECT_THAT(m_camera.Translation(), IsCloseTolerance(expectedCameraEndingPosition, 0.01f));
     }
+
+    TEST_F(CameraInputFixture, CameraPitchCanNotBeMovedPastNinetyDegreesWhenConstrained)
+    {
+        const auto cameraStartingPosition = AZ::Vector3(15.0f, -20.0f, 0.0f);
+        m_targetCamera.m_pivot = cameraStartingPosition;
+
+        HandleEventAndUpdate(
+            AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began });
+        // pitch by 135.0 degrees
+        HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ -PixelMotionDelta135Degrees });
+
+        // clamped to 90.0 degrees
+        const float expectedPitch = AZ::DegToRad(90.0f);
+
+        using ::testing::FloatNear;
+        EXPECT_THAT(m_camera.m_pitch, FloatNear(expectedPitch, 0.001f));
+    }
+
+    TEST_F(CameraInputFixture, CameraPitchCanBeMovedPastNinetyDegreesWhenUnconstrained)
+    {
+        m_firstPersonRotateCamera->m_constrainPitch = []
+        {
+            return false;
+        };
+
+        const auto cameraStartingPosition = AZ::Vector3(15.0f, -20.0f, 0.0f);
+        m_targetCamera.m_pivot = cameraStartingPosition;
+
+        HandleEventAndUpdate(
+            AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began });
+        // pitch by 135.0 degrees
+        HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ -PixelMotionDelta135Degrees });
+
+        const float expectedPitch = AZ::DegToRad(135.0f);
+
+        using ::testing::FloatNear;
+        EXPECT_THAT(m_camera.m_pitch, FloatNear(expectedPitch, 0.001f));
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzFramework/Tests/CameraState.cpp b/Code/Framework/AzFramework/Tests/CameraState.cpp
index 70fa8be89a..1f35d5a06c 100644
--- a/Code/Framework/AzFramework/Tests/CameraState.cpp
+++ b/Code/Framework/AzFramework/Tests/CameraState.cpp
@@ -11,6 +11,7 @@
 #include <AzFramework/Viewport/CameraState.h>
 #include <AZTestShared/Math/MathTestHelpers.h>
 #include <AzCore/Math/SimdMath.h>
+#include <AzCore/Math/MatrixUtils.h>
 #include <AzCore/Math/Matrix4x4.h>
 
 namespace UnitTest
@@ -51,22 +52,6 @@ namespace UnitTest
     {
     };
 
-    // Taken from Atom::MatrixUtils for testing purposes, this can be removed if MakePerspectiveFovMatrixRH makes it into AZ
-    static AZ::Matrix4x4 MakePerspectiveMatrixRH(float fovY, float aspectRatio, float nearClip, float farClip)
-    {
-        float sinFov, cosFov;
-        AZ::SinCos(0.5f * fovY, sinFov, cosFov);
-        float yScale = cosFov / sinFov; //cot(fovY/2)
-        float xScale = yScale / aspectRatio;
-
-        AZ::Matrix4x4 out;
-        out.SetRow(0,   xScale, 0.f,    0.f,                                0.f                                     );
-        out.SetRow(1,   0.f,    yScale, 0.f,                                0.f                                     );
-        out.SetRow(2,   0.f,    0.f,    farClip / (nearClip - farClip),     nearClip*farClip / (nearClip - farClip) );
-        out.SetRow(3,   0.f,    0.f,    -1.f,                               0.f                                     );
-        return out;
-    }
-
     TEST_P(Translation, Permutation)
     {
         // Given a position
@@ -176,7 +161,8 @@ namespace UnitTest
     {
         auto [fovY, aspectRatio, nearClip, farClip] = GetParam();
 
-        AZ::Matrix4x4 clipFromView = MakePerspectiveMatrixRH(fovY, aspectRatio, nearClip, farClip);
+        AZ::Matrix4x4 clipFromView;
+        MakePerspectiveFovMatrixRH(clipFromView, fovY, aspectRatio, nearClip, farClip);
 
         AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(m_cameraState, clipFromView);
 
diff --git a/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp b/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp
index 45bac2770e..62852c9b87 100644
--- a/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp
+++ b/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp
@@ -144,12 +144,45 @@ namespace UnitTest
     {
         using ::testing::Eq;
 
-        const ClickDetector::ClickOutcome downOutcome =
-            m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0));
-        const ClickDetector::ClickOutcome upOutcome =
-            m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(50, 50));
+        const ClickDetector::ClickOutcome downOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0));
+        const ClickDetector::ClickOutcome upOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(50, 50));
 
         EXPECT_THAT(downOutcome, Eq(ClickDetector::ClickOutcome::Nil));
         EXPECT_THAT(upOutcome, Eq(ClickDetector::ClickOutcome::Release));
     }
+
+    //! note: ClickDetector does not explicitly return double clicks but if one occurs the ClickOutcome will be Nil
+    TEST_F(ClickDetectorFixture, DoubleClickIsRegisteredIfMouseDeltaHasMovedLessThanDeadzoneInClickInterval)
+    {
+        using ::testing::Eq;
+
+        const ClickDetector::ClickOutcome firstDownOutcome =
+            m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0));
+        const ClickDetector::ClickOutcome firstUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0));
+        const ClickDetector::ClickOutcome secondDownOutcome =
+            m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0));
+        const ClickDetector::ClickOutcome secondUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0));
+
+        EXPECT_THAT(firstDownOutcome, Eq(ClickDetector::ClickOutcome::Nil));
+        EXPECT_THAT(firstUpOutcome, Eq(ClickDetector::ClickOutcome::Click));
+        EXPECT_THAT(secondDownOutcome, Eq(ClickDetector::ClickOutcome::Nil));
+        EXPECT_THAT(secondUpOutcome, Eq(ClickDetector::ClickOutcome::Nil));
+    }
+
+    TEST_F(ClickDetectorFixture, DoubleClickIsNotRegisteredIfMouseDeltaHasMovedMoreThanDeadzoneInClickInterval)
+    {
+        using ::testing::Eq;
+
+        const ClickDetector::ClickOutcome firstDownOutcome =
+            m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0));
+        const ClickDetector::ClickOutcome firstUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0));
+        const ClickDetector::ClickOutcome secondDownOutcome =
+            m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(10, 10));
+        const ClickDetector::ClickOutcome secondUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0));
+
+        EXPECT_THAT(firstDownOutcome, Eq(ClickDetector::ClickOutcome::Nil));
+        EXPECT_THAT(firstUpOutcome, Eq(ClickDetector::ClickOutcome::Click));
+        EXPECT_THAT(secondDownOutcome, Eq(ClickDetector::ClickOutcome::Nil));
+        EXPECT_THAT(secondUpOutcome, Eq(ClickDetector::ClickOutcome::Click));
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzFramework/Tests/CursorStateTests.cpp b/Code/Framework/AzFramework/Tests/CursorStateTests.cpp
index 923cd02a10..fe15580dad 100644
--- a/Code/Framework/AzFramework/Tests/CursorStateTests.cpp
+++ b/Code/Framework/AzFramework/Tests/CursorStateTests.cpp
@@ -8,12 +8,13 @@
 
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzFramework/Viewport/CursorState.h>
+#include <Tests/Utils/Printers.h>
 
 namespace UnitTest
 {
     using AzFramework::CursorState;
-    using AzFramework::ScreenVector;
     using AzFramework::ScreenPoint;
+    using AzFramework::ScreenVector;
 
     class CursorStateFixture : public ::testing::Test
     {
diff --git a/Code/Framework/AzFramework/Tests/InputTests.cpp b/Code/Framework/AzFramework/Tests/InputTests.cpp
index 5fba7f5796..31558250b5 100644
--- a/Code/Framework/AzFramework/Tests/InputTests.cpp
+++ b/Code/Framework/AzFramework/Tests/InputTests.cpp
@@ -29,6 +29,13 @@ namespace InputUnitTests
     ////////////////////////////////////////////////////////////////////////////////////////////////
     class InputTest : public ScopedAllocatorSetupFixture
     {
+    public:
+        InputTest() : ScopedAllocatorSetupFixture()
+        {
+            // Many input tests are only valid if the GamePad device is supported on this platform.
+            m_gamepadSupported = InputDeviceGamepad::GetMaxSupportedGamepads() > 0;
+        }
+
     protected:
         ////////////////////////////////////////////////////////////////////////////////////////////
         void SetUp() override
@@ -46,6 +53,7 @@ namespace InputUnitTests
         
         ////////////////////////////////////////////////////////////////////////////////////////////
         AZStd::unique_ptr<InputSystemComponent> m_inputSystemComponent;
+        bool m_gamepadSupported;
     };
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -78,12 +86,17 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputContext_ActivateDeactivate_Successfull)
-#else
     TEST_F(InputTest, InputContext_ActivateDeactivate_Successfull)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputContext_ActivateDeactivate_Successfull";
+        #else
+            SUCCEED() << "Skipping test InputContext_ActivateDeactivate_Successfull";
+        #endif
+            return;
+        }
         // Create an input context (they are inactive by default).
         InputContext inputContext("TestInputContext");
 
@@ -148,12 +161,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputContext_AddRemoveInputMapping_Successfull)
-#else
     TEST_F(InputTest, InputContext_AddRemoveInputMapping_Successfull)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputContext_AddRemoveInputMapping_Successfull";
+        #else
+            SUCCEED() << "Skipping test InputContext_AddRemoveInputMapping_Successfull";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -256,12 +275,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputContext_ConsumeProcessedInput_Consumed)
-#else
     TEST_F(InputTest, InputContext_ConsumeProcessedInput_Consumed)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputContext_ConsumeProcessedInput_Consumed";
+        #else
+            SUCCEED() << "Skipping test InputContext_ConsumeProcessedInput_Consumed";
+        #endif
+            return;
+        }
+
         InputContext::InitData initData;
 
         // Create a high priority input context that consumes input processed by any of its mappings.
@@ -340,12 +365,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputContext_FilteredInput_Mapped)
-#else
     TEST_F(InputTest, InputContext_FilteredInput_Mapped)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputContext_FilteredInput_Mapped";
+        #else
+            SUCCEED() << "Skipping test InputContext_FilteredInput_Mapped";
+        #endif
+            return;
+        }
+
         // Create an input context that initially only listens for keyboard input.
         InputContext::InitData initData;
         initData.autoActivate = true;
@@ -413,12 +444,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingOr_AddRemoveSourceInput_Successful)
-#else
     TEST_F(InputTest, InputMappingOr_AddRemoveSourceInput_Successful)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingOr_AddRemoveSourceInput_Successful";
+        #else
+            SUCCEED() << "Skipping test InputMappingOr_AddRemoveSourceInput_Successful";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -491,12 +528,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingOr_SingleSourceInput_Mapped)
-#else
     TEST_F(InputTest, InputMappingOr_SingleSourceInput_Mapped)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingOr_SingleSourceInput_Mapped";
+        #else
+            SUCCEED() << "Skipping test InputMappingOr_SingleSourceInput_Mapped";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -558,12 +601,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingOr_MultipleSourceInputs_Mapped)
-#else
     TEST_F(InputTest, InputMappingOr_MultipleSourceInputs_Mapped)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingOr_MultipleSourceInputs_Mapped";
+        #else
+            SUCCEED() << "Skipping test InputMappingOr_MultipleSourceInputs_Mapped";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -650,12 +699,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingAnd_AddRemoveSourceInput_Successful)
-#else
     TEST_F(InputTest, InputMappingAnd_AddRemoveSourceInput_Successful)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingAnd_AddRemoveSourceInput_Successful";
+        #else
+            SUCCEED() << "Skipping test InputMappingAnd_AddRemoveSourceInput_Successful";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -728,12 +783,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingAnd_SingleSourceInput_Mapped)
-#else
     TEST_F(InputTest, InputMappingAnd_SingleSourceInput_Mapped)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingAnd_SingleSourceInput_Mapped";
+        #else
+            SUCCEED() << "Skipping test InputMappingAnd_SingleSourceInput_Mapped";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -795,12 +856,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingAnd_MultipleSourceInputs_Mapped)
-#else
     TEST_F(InputTest, InputMappingAnd_MultipleSourceInputs_Mapped)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingAnd_MultipleSourceInputs_Mapped";
+        #else
+            SUCCEED() << "Skipping test InputMappingAnd_MultipleSourceInputs_Mapped";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -909,12 +976,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged)
-#else
     TEST_F(InputTest, InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged";
+        #else
+            SUCCEED() << "Skipping test InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
@@ -969,12 +1042,18 @@ namespace InputUnitTests
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
-#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
-    TEST_F(InputTest, DISABLED_InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped)
-#else
     TEST_F(InputTest, InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped)
-#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
     {
+        if (!m_gamepadSupported)
+        {
+        #if defined(GTEST_SKIP)
+            GTEST_SKIP() << "Skipping test InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped";
+        #else
+            SUCCEED() << "Skipping test InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped";
+        #endif
+            return;
+        }
+
         // Create an input context and activate it.
         InputContext inputContext("TestInputContext");
         inputContext.Activate();
diff --git a/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h b/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h
index 63f73d0b28..a166df19b4 100644
--- a/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h
+++ b/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h
@@ -36,6 +36,7 @@ namespace UnitTest
         MOCK_METHOD0(ToggleFullScreenState, void());
         MOCK_CONST_METHOD0(GetDpiScaleFactor, float());
         MOCK_CONST_METHOD0(GetSyncInterval, uint32_t());
+        MOCK_METHOD1(SetSyncInterval, bool(uint32_t));
         MOCK_CONST_METHOD0(GetDisplayRefreshRate, uint32_t());
     };
 } // namespace UnitTest
diff --git a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
new file mode 100644
index 0000000000..dbce11d639
--- /dev/null
+++ b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <gmock/gmock.h>
+
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzFramework/Physics/HeightfieldProviderBus.h>
+#include <AzFramework/Terrain/TerrainDataRequestBus.h>
+#include <TerrainSystem/TerrainSystemBus.h>
+
+namespace UnitTest
+{
+    class MockTerrainDataNotificationListener : public AzFramework::Terrain::TerrainDataNotificationBus::Handler
+    {
+    public:
+        MockTerrainDataNotificationListener()
+        {
+            AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
+        }
+
+        ~MockTerrainDataNotificationListener()
+        {
+            AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect();
+        }
+
+        MOCK_METHOD0(OnTerrainDataCreateBegin, void());
+        MOCK_METHOD0(OnTerrainDataCreateEnd, void());
+        MOCK_METHOD0(OnTerrainDataDestroyBegin, void());
+        MOCK_METHOD0(OnTerrainDataDestroyEnd, void());
+        MOCK_METHOD2(OnTerrainDataChanged, void(const AZ::Aabb& dirtyRegion, TerrainDataChangedMask dataChangedMask));
+    };
+
+    class MockTerrainDataRequests : public AzFramework::Terrain::TerrainDataRequestBus::Handler
+    {
+    public:
+        MockTerrainDataRequests()
+        {
+            AzFramework::Terrain::TerrainDataRequestBus::Handler::BusConnect();
+        }
+
+        ~MockTerrainDataRequests()
+        {
+            AzFramework::Terrain::TerrainDataRequestBus::Handler::BusDisconnect();
+        }
+
+        MOCK_CONST_METHOD0(GetTerrainHeightQueryResolution, AZ::Vector2());
+        MOCK_METHOD1(SetTerrainHeightQueryResolution, void(AZ::Vector2));
+        MOCK_CONST_METHOD0(GetTerrainAabb, AZ::Aabb());
+        MOCK_METHOD1(SetTerrainAabb, void(const AZ::Aabb&));
+        MOCK_CONST_METHOD3(GetHeight, float(const AZ::Vector3&, Sampler, bool*));
+        MOCK_CONST_METHOD3(GetHeightFromVector2, float(const AZ::Vector2&, Sampler, bool*));
+        MOCK_CONST_METHOD4(GetHeightFromFloats, float(float, float, Sampler, bool*));
+        MOCK_CONST_METHOD2(GetIsHole, bool(const AZ::Vector3&, Sampler));
+        MOCK_CONST_METHOD2(GetIsHoleFromVector2, bool(const AZ::Vector2&, Sampler));
+        MOCK_CONST_METHOD3(GetIsHoleFromFloats, bool(float, float, Sampler));
+        MOCK_CONST_METHOD3(GetNormal, AZ::Vector3(const AZ::Vector3&, Sampler, bool*));
+        MOCK_CONST_METHOD3(GetNormalFromVector2, AZ::Vector3(const AZ::Vector2&, Sampler, bool*));
+        MOCK_CONST_METHOD4(GetNormalFromFloats, AZ::Vector3(float, float, Sampler, bool*));
+        MOCK_CONST_METHOD3(GetMaxSurfaceWeight, AzFramework::SurfaceData::SurfaceTagWeight(const AZ::Vector3&, Sampler, bool*));
+        MOCK_CONST_METHOD3(GetMaxSurfaceWeightFromVector2, AzFramework::SurfaceData::SurfaceTagWeight(const AZ::Vector2&, Sampler, bool*));
+        MOCK_CONST_METHOD4(GetMaxSurfaceWeightFromFloats, AzFramework::SurfaceData::SurfaceTagWeight(float, float, Sampler, bool*));
+        MOCK_CONST_METHOD4(GetSurfaceWeights, void(const AZ::Vector3&, AzFramework::SurfaceData::SurfaceTagWeightList&, Sampler, bool*));
+        MOCK_CONST_METHOD4(
+            GetSurfaceWeightsFromVector2, void(const AZ::Vector2&, AzFramework::SurfaceData::SurfaceTagWeightList&, Sampler, bool*));
+        MOCK_CONST_METHOD5(
+            GetSurfaceWeightsFromFloats, void(float, float, AzFramework::SurfaceData::SurfaceTagWeightList&, Sampler, bool*));
+        MOCK_CONST_METHOD3(GetMaxSurfaceName, const char*(const AZ::Vector3&, Sampler, bool*));
+        MOCK_CONST_METHOD4(GetSurfacePoint, void(const AZ::Vector3&, AzFramework::SurfaceData::SurfacePoint&, Sampler, bool*));
+        MOCK_CONST_METHOD4(
+            GetSurfacePointFromVector2, void(const AZ::Vector2&, AzFramework::SurfaceData::SurfacePoint&, Sampler, bool*));
+        MOCK_CONST_METHOD5(
+            GetSurfacePointFromFloats, void(float, float, AzFramework::SurfaceData::SurfacePoint&, Sampler, bool*));
+    };
+} // namespace UnitTest
diff --git a/Code/Framework/AzFramework/Tests/Utils/Printers.cpp b/Code/Framework/AzFramework/Tests/Utils/Printers.cpp
new file mode 100644
index 0000000000..91c9558be7
--- /dev/null
+++ b/Code/Framework/AzFramework/Tests/Utils/Printers.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "Printers.h"
+
+#include <AzFramework/Viewport/ScreenGeometry.h>
+
+#include <ostream>
+#include <string>
+
+namespace AzFramework
+{
+    void PrintTo(const ScreenPoint& screenPoint, std::ostream* os)
+    {
+        *os << "(x: " << screenPoint.m_x << ", y: " << screenPoint.m_y << ")";
+    }
+
+    void PrintTo(const ScreenVector& screenVector, std::ostream* os)
+    {
+        *os << "(x: " << screenVector.m_x << ", y: " << screenVector.m_y << ")";
+    }
+
+    void PrintTo(const ScreenSize& screenSize, std::ostream* os)
+    {
+        *os << "(width: " << screenSize.m_width << ", height: " << screenSize.m_height << ")";
+    }
+} // namespace AzFramework
diff --git a/Code/Framework/AzFramework/Tests/Utils/Printers.h b/Code/Framework/AzFramework/Tests/Utils/Printers.h
new file mode 100644
index 0000000000..fc967eabe9
--- /dev/null
+++ b/Code/Framework/AzFramework/Tests/Utils/Printers.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <iosfwd>
+
+namespace AzFramework
+{
+    struct ScreenPoint;
+    struct ScreenVector;
+    struct ScreenSize;
+
+    void PrintTo(const ScreenPoint& screenPoint, std::ostream* os);
+    void PrintTo(const ScreenVector& screenVector, std::ostream* os);
+    void PrintTo(const ScreenSize& screenSize, std::ostream* os);
+} // namespace AzFramework
diff --git a/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake
index 85c00a2e8a..9427738e67 100644
--- a/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake
+++ b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake
@@ -11,5 +11,7 @@ set(FILES
     Mocks/MockWindowRequests.h
     Utils/Utils.h
     Utils/Utils.cpp
+    Utils/Printers.h
+    Utils/Printers.cpp
     FrameworkApplicationFixture.h
 )
diff --git a/Code/Framework/AzFramework/Tests/terrain_mock_files.cmake b/Code/Framework/AzFramework/Tests/terrain_mock_files.cmake
new file mode 100644
index 0000000000..590c64d88b
--- /dev/null
+++ b/Code/Framework/AzFramework/Tests/terrain_mock_files.cmake
@@ -0,0 +1,11 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    Mocks/Terrain/MockTerrainDataRequestBus.h
+)
\ No newline at end of file
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
index 06db67a05f..99f11c37da 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
@@ -39,6 +39,10 @@ namespace AzManipulatorTestFramework
         DerivedDispatcherT* MouseLButtonDown();
         //! Set the left mouse button up.
         DerivedDispatcherT* MouseLButtonUp();
+        //! Set the middle mouse button down.
+        DerivedDispatcherT* MouseMButtonDown();
+        //! Set the middle mouse button up.
+        DerivedDispatcherT* MouseMButtonUp();
         //! Send a double click event.
         DerivedDispatcherT* MouseLButtonDoubleClick();
         //! Set the keyboard modifier button down.
@@ -73,6 +77,8 @@ namespace AzManipulatorTestFramework
         virtual void CameraStateImpl(const AzFramework::CameraState& cameraState) = 0;
         virtual void MouseLButtonDownImpl() = 0;
         virtual void MouseLButtonUpImpl() = 0;
+        virtual void MouseMButtonDownImpl() = 0;
+        virtual void MouseMButtonUpImpl() = 0;
         virtual void MouseLButtonDoubleClickImpl() = 0;
         virtual void MousePositionImpl(const AzFramework::ScreenPoint& position) = 0;
         virtual void KeyboardModifierDownImpl(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier) = 0;
@@ -183,6 +189,22 @@ namespace AzManipulatorTestFramework
         return static_cast<DerivedDispatcherT*>(this);
     }
 
+    template<typename DerivedDispatcherT>
+    DerivedDispatcherT* ActionDispatcher<DerivedDispatcherT>::MouseMButtonDown()
+    {
+        Log("Mouse middle button down");
+        MouseMButtonDownImpl();
+        return static_cast<DerivedDispatcherT*>(this);
+    }
+
+    template<typename DerivedDispatcherT>
+    DerivedDispatcherT* ActionDispatcher<DerivedDispatcherT>::MouseMButtonUp()
+    {
+        Log("Mouse middle button up");
+        MouseMButtonUpImpl();
+        return static_cast<DerivedDispatcherT*>(this);
+    }
+
     template<typename DerivedDispatcherT>
     DerivedDispatcherT* ActionDispatcher<DerivedDispatcherT>::MouseLButtonDoubleClick()
     {
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
index 5f0179d6ad..66227c692b 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzFramework/Viewport/ViewportId.h>
 #include <AzToolsFramework/Manipulators/ManipulatorBus.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
@@ -40,7 +41,7 @@ namespace AzManipulatorTestFramework
         //! Set the angular step.
         virtual void SetAngularStep(float step) = 0;
         //! Get the viewport id.
-        virtual int GetViewportId() const = 0;
+        virtual AzFramework::ViewportId GetViewportId() const = 0;
         //! Updates the visibility state.
         //! Updates which entities are currently visible given the current camera state.
         virtual void UpdateVisibility() = 0;
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h
index 3421116b96..7cef7b635d 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h
@@ -30,7 +30,7 @@ namespace AzManipulatorTestFramework
 
     private:
         AZStd::shared_ptr<CustomManipulatorManager> m_customManager;
-        std::unique_ptr<ViewportInteraction> m_viewportInteraction;
-        std::unique_ptr<DirectCallManipulatorManager> m_manipulatorManager;
+        AZStd::unique_ptr<ViewportInteraction> m_viewportInteraction;
+        AZStd::unique_ptr<DirectCallManipulatorManager> m_manipulatorManager;
     };
 } // namespace AzManipulatorTestFramework
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
index 5d1f606e8c..8a05a15fd9 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
@@ -25,7 +25,7 @@ namespace AzManipulatorTestFramework
         using MouseInteractionEvent = AzToolsFramework::ViewportInteraction::MouseInteractionEvent;
 
     public:
-        explicit ImmediateModeActionDispatcher(ManipulatorViewportInteraction& viewportManipulatorInteraction);
+        explicit ImmediateModeActionDispatcher(ManipulatorViewportInteraction& manipulatorViewportInteraction);
         ~ImmediateModeActionDispatcher();
 
         //! Clear the current event state.
@@ -55,13 +55,15 @@ namespace AzManipulatorTestFramework
         AZStd::chrono::milliseconds EditorViewportInputTimeNow() override;
 
     protected:
-        // ActionDispatcher ...
+        // ActionDispatcher overrides ...
         void SetSnapToGridImpl(bool enabled) override;
         void SetStickySelectImpl(bool enabled) override;
         void GridSizeImpl(float size) override;
         void CameraStateImpl(const AzFramework::CameraState& cameraState) override;
         void MouseLButtonDownImpl() override;
         void MouseLButtonUpImpl() override;
+        void MouseMButtonDownImpl() override;
+        void MouseMButtonUpImpl() override;
         void MouseLButtonDoubleClickImpl() override;
         void MousePositionImpl(const AzFramework::ScreenPoint& position) override;
         void KeyboardModifierDownImpl(const KeyboardModifier& keyModifier) override;
@@ -82,7 +84,7 @@ namespace AzManipulatorTestFramework
         const MouseInteractionEvent* GetMouseInteractionEvent() const;
 
         mutable AZStd::unique_ptr<MouseInteractionEvent> m_event;
-        ManipulatorViewportInteraction& m_viewportManipulatorInteraction;
+        ManipulatorViewportInteraction& m_manipulatorViewportInteraction;
 
         //! Current time that ticks up after each call to EditorViewportInputTimeNow.
         AZStd::chrono::milliseconds m_timeNow = AZStd::chrono::milliseconds(0);
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
index a8ba63500c..a353140d4c 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
@@ -33,7 +33,7 @@ namespace AzManipulatorTestFramework
         void SetAngularSnapping(bool enabled) override;
         void SetGridSize(float size) override;
         void SetAngularStep(float step) override;
-        int GetViewportId() const override;
+        AzFramework::ViewportId GetViewportId() const override;
         void UpdateVisibility() override;
         void SetStickySelect(bool enabled) override;
         AZ::Vector3 DefaultEditorCameraPosition() const override;
@@ -41,8 +41,8 @@ namespace AzManipulatorTestFramework
         // ViewportInteractionRequestBus overrides ...
         AzFramework::CameraState GetCameraState() override;
         AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override;
-        AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override;
-        AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
+        AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) override;
+        AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportScreenToWorldRay(
             const AzFramework::ScreenPoint& screenPosition) override;
         float DeviceScalingFactor() override;
 
@@ -60,9 +60,10 @@ namespace AzManipulatorTestFramework
         void FindVisibleEntities(AZStd::vector<AZ::EntityId>& visibleEntities) override;
 
     private:
+        static constexpr AzFramework::ViewportId m_viewportId = 1234; //!< Arbitrary viewport id for manipulator tests.
+
         AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
         AZStd::unique_ptr<NullDebugDisplayRequests> m_nullDebugDisplayRequests;
-        const int m_viewportId = 1234; // Arbitrary viewport id for manipulator tests
         AzFramework::CameraState m_cameraState;
         bool m_gridSnapping = false;
         bool m_angularSnapping = false;
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
index 4f1e108a14..6fbf2cb219 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp
@@ -95,7 +95,7 @@ namespace AzManipulatorTestFramework
 
         AzToolsFramework::ViewportInteraction::MousePick mousePick;
         mousePick.m_screenCoordinates = screenPoint;
-        mousePick.m_rayOrigin = cameraState.m_position;
+        mousePick.m_rayOrigin = nearPlaneWorldPosition;
         mousePick.m_rayDirection = (nearPlaneWorldPosition - cameraState.m_position).GetNormalized();
 
         return mousePick;
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
index c122a941c4..aea93ca342 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
@@ -29,8 +29,8 @@ namespace AzManipulatorTestFramework
     using KeyboardModifier = AzToolsFramework::ViewportInteraction::KeyboardModifier;
     using MouseInteractionEvent = AzToolsFramework::ViewportInteraction::MouseInteractionEvent;
 
-    ImmediateModeActionDispatcher::ImmediateModeActionDispatcher(ManipulatorViewportInteraction& viewportManipulatorInteraction)
-        : m_viewportManipulatorInteraction(viewportManipulatorInteraction)
+    ImmediateModeActionDispatcher::ImmediateModeActionDispatcher(ManipulatorViewportInteraction& manipulatorViewportInteraction)
+        : m_manipulatorViewportInteraction(manipulatorViewportInteraction)
     {
         AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusConnect();
         AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler::BusConnect();
@@ -48,36 +48,34 @@ namespace AzManipulatorTestFramework
         // mouse down and mouse up event, to match the editor behavior we insert this event
         // to ensure the tests are simulating the same environment as the editor
         GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Move;
-        m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
     }
 
     void ImmediateModeActionDispatcher::SetSnapToGridImpl(const bool enabled)
     {
-        m_viewportManipulatorInteraction.GetViewportInteraction().SetGridSnapping(enabled);
+        m_manipulatorViewportInteraction.GetViewportInteraction().SetGridSnapping(enabled);
     }
 
     void ImmediateModeActionDispatcher::SetStickySelectImpl(const bool enabled)
     {
-        m_viewportManipulatorInteraction.GetViewportInteraction().SetStickySelect(enabled);
+        m_manipulatorViewportInteraction.GetViewportInteraction().SetStickySelect(enabled);
     }
 
     void ImmediateModeActionDispatcher::GridSizeImpl(const float size)
     {
-        m_viewportManipulatorInteraction.GetViewportInteraction().SetGridSize(size);
+        m_manipulatorViewportInteraction.GetViewportInteraction().SetGridSize(size);
     }
 
     void ImmediateModeActionDispatcher::CameraStateImpl(const AzFramework::CameraState& cameraState)
     {
-        m_viewportManipulatorInteraction.GetViewportInteraction().SetCameraState(cameraState);
-        GetMouseInteractionEvent()->m_mouseInteraction.m_mousePick.m_rayOrigin = cameraState.m_position;
-        GetMouseInteractionEvent()->m_mouseInteraction.m_mousePick.m_rayDirection = cameraState.m_forward;
+        m_manipulatorViewportInteraction.GetViewportInteraction().SetCameraState(cameraState);
     }
 
     void ImmediateModeActionDispatcher::MouseLButtonDownImpl()
     {
         ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left);
         GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Down;
-        m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
         // the mouse position will be the same as the previous event, thus the delta will be 0
         MouseMoveAfterButton();
     }
@@ -85,17 +83,35 @@ namespace AzManipulatorTestFramework
     void ImmediateModeActionDispatcher::MouseLButtonUpImpl()
     {
         GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Up;
-        m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
         ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left);
         // the mouse position will be the same as the previous event, thus the delta will be 0
         MouseMoveAfterButton();
     }
 
+    void ImmediateModeActionDispatcher::MouseMButtonDownImpl()
+    {
+        ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Middle);
+        GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Down;
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        // the mouse position will be the same as the previous event, thus the delta will be 0
+        MouseMoveAfterButton();
+    }
+
+    void ImmediateModeActionDispatcher::MouseMButtonUpImpl()
+    {
+        GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Up;
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Middle);
+        // the mouse position will be the same as the previous event, thus the delta will be 0
+        MouseMoveAfterButton();
+    }
+
     void ImmediateModeActionDispatcher::MouseLButtonDoubleClickImpl()
     {
         GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::DoubleClick;
         ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left);
-        m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
         ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left);
         // the mouse position will be the same as the previous event, thus the delta will be 0
         MouseMoveAfterButton();
@@ -103,10 +119,10 @@ namespace AzManipulatorTestFramework
 
     void ImmediateModeActionDispatcher::MousePositionImpl(const AzFramework::ScreenPoint& position)
     {
-        const auto cameraState = m_viewportManipulatorInteraction.GetViewportInteraction().GetCameraState();
+        const auto cameraState = m_manipulatorViewportInteraction.GetViewportInteraction().GetCameraState();
         GetMouseInteractionEvent()->m_mouseInteraction.m_mousePick = BuildMousePick(position, cameraState);
         GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Move;
-        m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
+        m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
     }
 
     void ImmediateModeActionDispatcher::KeyboardModifierDownImpl(const KeyboardModifier& keyModifier)
@@ -146,7 +162,7 @@ namespace AzManipulatorTestFramework
         {
             m_event = AZStd::unique_ptr<MouseInteractionEvent>(AZStd::make_unique<MouseInteractionEvent>());
             m_event->m_mouseInteraction.m_interactionId.m_viewportId =
-                m_viewportManipulatorInteraction.GetViewportInteraction().GetViewportId();
+                m_manipulatorViewportInteraction.GetViewportInteraction().GetViewportId();
         }
 
         return m_event.get();
@@ -180,12 +196,12 @@ namespace AzManipulatorTestFramework
 
     void ImmediateModeActionDispatcher::ExpectManipulatorBeingInteractedImpl()
     {
-        EXPECT_TRUE(m_viewportManipulatorInteraction.GetManipulatorManager().ManipulatorBeingInteracted());
+        EXPECT_TRUE(m_manipulatorViewportInteraction.GetManipulatorManager().ManipulatorBeingInteracted());
     }
 
     void ImmediateModeActionDispatcher::ExpectManipulatorNotBeingInteractedImpl()
     {
-        EXPECT_FALSE(m_viewportManipulatorInteraction.GetManipulatorManager().ManipulatorBeingInteracted());
+        EXPECT_FALSE(m_manipulatorViewportInteraction.GetManipulatorManager().ManipulatorBeingInteracted());
     }
 
     ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::ResetEvent()
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp
index 730c106301..9bcb8986d5 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp
@@ -20,7 +20,8 @@ namespace AzManipulatorTestFramework
     {
     public:
         IndirectCallManipulatorManager(ViewportInteractionInterface& viewportInteraction);
-        // ManipulatorManagerInterface ...
+
+        // ManipulatorManagerInterface overrides ...
         void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event) override;
         AzToolsFramework::ManipulatorManagerId GetId() const override;
         bool ManipulatorBeingInteracted() const override;
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
index 269baa703d..e56f7d6d72 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
@@ -135,21 +135,20 @@ namespace AzManipulatorTestFramework
         m_angularStep = step;
     }
 
-    int ViewportInteraction::GetViewportId() const
+    AzFramework::ViewportId ViewportInteraction::GetViewportId() const
     {
         return m_viewportId;
     }
 
-    AZStd::optional<AZ::Vector3> ViewportInteraction::ViewportScreenToWorld(
-        [[maybe_unused]] const AzFramework::ScreenPoint& screenPosition, [[maybe_unused]] float depth)
+    AZ::Vector3 ViewportInteraction::ViewportScreenToWorld([[maybe_unused]] const AzFramework::ScreenPoint& screenPosition)
     {
-        return {};
+        return AzFramework::ScreenToWorld(screenPosition, m_cameraState);
     }
 
-    AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportInteraction::ViewportScreenToWorldRay(
+    AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportInteraction::ViewportScreenToWorldRay(
         [[maybe_unused]] const AzFramework::ScreenPoint& screenPosition)
     {
-        return {};
+        return AzToolsFramework::ViewportInteraction::ViewportScreenToWorldRay(m_cameraState, screenPosition);
     }
 
     float ViewportInteraction::DeviceScalingFactor()
diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
index 211c8d64ef..376c18072e 100644
--- a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp
@@ -140,8 +140,8 @@ namespace UnitTest
         // given a left mouse down ray in world space
         // consume the mouse move event
         state.m_actionDispatcher->CameraState(m_cameraState)
-            ->MouseLButtonDown()
             ->MousePosition(AzManipulatorTestFramework::GetCameraStateViewportCenter(m_cameraState))
+            ->MouseLButtonDown()
             ->ExpectTrue(state.m_linearManipulator->PerformingAction())
             ->ExpectManipulatorBeingInteracted()
             ->MouseLButtonUp()
diff --git a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp
index 3a3ab06d02..6705ec8b36 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.cpp
@@ -42,7 +42,7 @@ namespace AzNetworking
     {
         const uint32_t sampleAtom = 1 - m_activeAtom;
 
-        if (m_atoms[sampleAtom].m_timeAccumulatorMs == AZ::TimeMs{0})
+        if (m_atoms[sampleAtom].m_timeAccumulatorMs == AZ::Time::ZeroTimeMs)
         {
             return 0.0f;
         }
diff --git a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h
index b576c64e86..19db52b979 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/ConnectionMetrics.h
@@ -19,7 +19,7 @@ namespace AzNetworking
     {
         DatarateAtom() = default;
 
-        AZ::TimeMs m_timeAccumulatorMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_timeAccumulatorMs = AZ::Time::ZeroTimeMs;
         uint32_t m_bytesTransmitted = 0;
         uint32_t m_packetsSent = 0;
         uint32_t m_packetsLost = 0;
@@ -78,7 +78,7 @@ namespace AzNetworking
         ConnectionPacketEntry(PacketId packetId, AZ::TimeMs sendTimeMs);
 
         PacketId m_packetId = InvalidPacketId;
-        AZ::TimeMs m_sendTimeMs = AZ::TimeMs{0};
+        AZ::TimeMs m_sendTimeMs = AZ::Time::ZeroTimeMs;
     };
 
     //! @class ConnectionComputeRtt
diff --git a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h
index 363fd1d37b..7afbbaee7c 100644
--- a/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h
+++ b/Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h
@@ -28,8 +28,8 @@ namespace AzNetworking
         ConnectionQuality(int32_t lossPercentage, AZ::TimeMs latencyMs, AZ::TimeMs varianceMs);
 
         int32_t m_lossPercentage = 0;
-        AZ::TimeMs m_latencyMs = AZ::TimeMs{ 0 };
-        AZ::TimeMs m_varianceMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_latencyMs = AZ::Time::ZeroTimeMs;
+        AZ::TimeMs m_varianceMs = AZ::Time::ZeroTimeMs;
     };
 
     enum class TrustZone
diff --git a/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h
index 097e45c960..1a4423144f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/TimeoutQueue.h
@@ -37,8 +37,8 @@ namespace AzNetworking
             void UpdateTimeoutTime(AZ::TimeMs currentTimeMs);
 
             uint64_t m_userData = 0;
-            AZ::TimeMs m_timeoutMs = AZ::TimeMs{0};
-            AZ::TimeMs m_nextTimeoutTimeMs = AZ::TimeMs{0};
+            AZ::TimeMs m_timeoutMs = AZ::Time::ZeroTimeMs;
+            AZ::TimeMs m_nextTimeoutTimeMs = AZ::Time::ZeroTimeMs;
         };
 
         TimeoutQueue() = default;
diff --git a/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h
index 8cad6e5537..d4bfabf54a 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Framework/NetworkInterfaceMetrics.h
@@ -15,11 +15,11 @@ namespace AzNetworking
     struct NetworkInterfaceMetrics
     {
         //! Returns the total number of milliseconds spent updating this network interface.
-        AZ::TimeMs m_updateTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_updateTimeMs = AZ::Time::ZeroTimeMs;
         //! Returns the total number of connections bound to this network interface.
         uint64_t m_connectionCount = 0;
         //! Returns the total number of milliseconds spent sending data on this network interface.
-        AZ::TimeMs m_sendTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_sendTimeMs = AZ::Time::ZeroTimeMs;
         //! Returns the total number of packets sent on this socket.
         uint64_t m_sendPackets = 0;
         //! Returns the total number of encrypted packets sent on this socket.
@@ -37,7 +37,7 @@ namespace AzNetworking
         //! Returns the total number of packets that had to be resent on this network interface due to packet loss.
         uint64_t m_resentPackets = 0;
         //! Returns the total number of milliseconds spent processing received data on this network interface.
-        AZ::TimeMs m_recvTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_recvTimeMs = AZ::Time::ZeroTimeMs;
         //! Returns the total number of packets received on this socket.
         uint64_t m_recvPackets = 0;
         //! Returns the total number of bytes received on this socket after compression.
diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h
index 0859e1d0f7..f2dc88cab4 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpListenThread.h
@@ -67,6 +67,6 @@ namespace AzNetworking
         uint32_t m_listenPortCount = 0;
         TcpSocketManager m_tcpSocketManager;
         AZ::ThreadSafeDeque<ListenPort> m_listenPorts;
-        AZ::TimeMs m_updateTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_updateTimeMs = AZ::Time::ZeroTimeMs;
     };
 }
diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
index 0278856ce9..18ce25c4dd 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
@@ -107,7 +107,7 @@ namespace AzNetworking
 
         auto readCallback = [this, startTimeMs](SocketFd socketFd) { HandleConnectionRecv(socketFd, startTimeMs); };
         auto writeCallback = [this](SocketFd socketFd) { HandleConnectionSend(socketFd); };
-        m_tcpSocketManager.ProcessEvents(AZ::TimeMs{ 0 }, readCallback, writeCallback);
+        m_tcpSocketManager.ProcessEvents(AZ::Time::ZeroTimeMs, readCallback, writeCallback);
 
         FlushQueuedRemoves();
 
diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h
index 8d45e847a8..d483a89cf3 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h
@@ -146,7 +146,7 @@ namespace AzNetworking
         AZ::Name m_name;
         TrustZone m_trustZone;
         uint16_t m_port = 0;
-        AZ::TimeMs m_timeoutMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_timeoutMs = AZ::Time::ZeroTimeMs;
         IConnectionListener& m_connectionListener;
         TcpConnectionSet m_connectionSet;
         TcpSocketManager m_tcpSocketManager;
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
index b810c7a347..1ca5922753 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
@@ -736,7 +736,7 @@ namespace AzNetworking
             udpConnection->SendUnreliablePacket(CorePackets::HeartbeatPacket(true));
             ++udpConnection->m_timeoutCounter;
         }
-        else if (net_UdpTimeoutConnections && (GetTimeoutMs() > AZ::TimeMs{ 0 }))
+        else if (net_UdpTimeoutConnections && (GetTimeoutMs() > AZ::Time::ZeroTimeMs))
         {
             udpConnection->Disconnect(DisconnectReason::Timeout, TerminationEndpoint::Local);
             return TimeoutResult::Delete;
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h
index e6abeded0d..a640a6e3b8 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h
@@ -171,7 +171,7 @@ namespace AzNetworking
         TrustZone m_trustZone;
         uint16_t m_port = 0;
         bool m_allowIncomingConnections = false;
-        AZ::TimeMs m_timeoutMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_timeoutMs = AZ::Time::ZeroTimeMs;
         IConnectionListener& m_connectionListener;
         UdpConnectionSet m_connectionSet;
         TimeoutQueue m_connectionTimeoutQueue;
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h
index e0c97f157f..1d25a9e6e1 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.h
@@ -94,6 +94,6 @@ namespace AzNetworking
         int32_t m_backIndex = 0;
         AZStd::array<ReaderBuffer, 2> m_readerBuffers;
         AZStd::vector<UdpSocket*> m_pendingAdds;
-        AZ::TimeMs m_updateTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_updateTimeMs = AZ::Time::ZeroTimeMs;
     };
 }
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
index 300b3527fa..85cc3a38f8 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
@@ -135,7 +135,7 @@ namespace AzNetworking
         int32_t sentBytes = size;
 
 #ifdef ENABLE_LATENCY_DEBUG
-        if (connectionQuality.m_latencyMs <= AZ::TimeMs{ 0 })
+        if (connectionQuality.m_latencyMs <= AZ::Time::ZeroTimeMs)
 #endif
         {
             sentBytes = SendInternal(address, data, size, encrypt, dtlsEndpoint);
@@ -153,9 +153,9 @@ namespace AzNetworking
             }
         }
 #ifdef ENABLE_LATENCY_DEBUG
-        else if ((connectionQuality.m_latencyMs > AZ::TimeMs{ 0 }) || (connectionQuality.m_varianceMs > AZ::TimeMs{ 0 }))
+        else if ((connectionQuality.m_latencyMs > AZ::Time::ZeroTimeMs) || (connectionQuality.m_varianceMs > AZ::Time::ZeroTimeMs))
         {
-            const AZ::TimeMs jitterMs = aznumeric_cast<AZ::TimeMs>(m_random.GetRandom()) % (connectionQuality.m_varianceMs > AZ::TimeMs{ 0 }
+            const AZ::TimeMs jitterMs = aznumeric_cast<AZ::TimeMs>(m_random.GetRandom()) % (connectionQuality.m_varianceMs > AZ::Time::ZeroTimeMs
                                       ? connectionQuality.m_varianceMs
                                       : AZ::TimeMs{ 1 });
             const AZ::TimeMs deferTimeMs = (connectionQuality.m_latencyMs) + jitterMs;
diff --git a/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp b/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp
index 9f496c3e0c..0903205eb8 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Utilities/EncryptionCommon.cpp
@@ -94,7 +94,7 @@ namespace AzNetworking
     static const uint32_t MaxCookieHistory = 8;
     static bool g_encryptionInitialized = false;
     static int32_t g_azNetworkingTrustDataIndex = 0;
-    static AZ::TimeMs g_lastCookieTimestamp = AZ::TimeMs{0};
+    static AZ::TimeMs g_lastCookieTimestamp = AZ::Time::ZeroTimeMs;
     static uint64_t g_validCookieArray[MaxCookieHistory];
     static uint32_t g_cookieReplaceIndex = 0;
 
diff --git a/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp b/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp
index 32562d9940..4ad9412849 100644
--- a/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/Serialization/DeltaSerializerTests.cpp
@@ -15,7 +15,7 @@ namespace UnitTest
     {
         AzNetworking::PacketId m_packetId = AzNetworking::InvalidPacketId;
         uint32_t m_id = 0;
-        AZ::TimeMs m_timeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_timeMs = AZ::Time::ZeroTimeMs;
         float m_blendFactor = 0.f;
         AZStd::vector<int> m_growVector, m_shrinkVector;
 
diff --git a/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp b/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp
index 77632da572..d3a956bef3 100644
--- a/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/TcpTransport/TcpTransportTests.cpp
@@ -11,7 +11,7 @@
 #include <AzNetworking/AutoGen/CorePackets.AutoPackets.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Console/LoggerSystemComponent.h>
-#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/Time/TimeSystem.h>
 #include <AzCore/Name/NameDictionary.h>
 #include <AzCore/UnitTest/TestTypes.h>
 
@@ -102,24 +102,24 @@ namespace UnitTest
             SetupAllocator();
             AZ::NameDictionary::Create();
 
-            m_loggerComponent = new AZ::LoggerSystemComponent;
-            m_timeComponent = new AZ::TimeSystemComponent;
-            m_networkingSystemComponent = new AzNetworking::NetworkingSystemComponent;
+            m_loggerComponent = AZStd::make_unique<AZ::LoggerSystemComponent>();
+            m_timeSystem = AZStd::make_unique<AZ::TimeSystem>();
+            m_networkingSystemComponent = AZStd::make_unique<AzNetworking::NetworkingSystemComponent>();
         }
 
         void TearDown() override
         {
-            delete m_networkingSystemComponent;
-            delete m_timeComponent;
-            delete m_loggerComponent;
+            m_networkingSystemComponent.reset();
+            m_timeSystem.reset();
+            m_loggerComponent.reset();
 
             AZ::NameDictionary::Destroy();
             TeardownAllocator();
         }
 
-        AZ::LoggerSystemComponent* m_loggerComponent;
-        AZ::TimeSystemComponent* m_timeComponent;
-        AzNetworking::NetworkingSystemComponent* m_networkingSystemComponent;
+        AZStd::unique_ptr<AZ::LoggerSystemComponent> m_loggerComponent;
+        AZStd::unique_ptr<AZ::TimeSystem> m_timeSystem;
+        AZStd::unique_ptr<AzNetworking::NetworkingSystemComponent> m_networkingSystemComponent;
     };
 
     #if AZ_TRAIT_DISABLE_FAILED_NETWORKING_TESTS
diff --git a/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp b/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp
index 65c2cfa2b5..821c261fab 100644
--- a/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp
+++ b/Code/Framework/AzNetworking/Tests/UdpTransport/UdpTransportTests.cpp
@@ -14,7 +14,7 @@
 #include <AzNetworking/AutoGen/CorePackets.AutoPackets.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Console/LoggerSystemComponent.h>
-#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/Time/TimeSystem.h>
 #include <AzCore/Name/NameDictionary.h>
 #include <AzCore/UnitTest/TestTypes.h>
 
@@ -105,24 +105,24 @@ namespace UnitTest
             SetupAllocator();
             AZ::NameDictionary::Create();
 
-            m_loggerComponent = new AZ::LoggerSystemComponent;
-            m_timeComponent = new AZ::TimeSystemComponent;
-            m_networkingSystemComponent = new AzNetworking::NetworkingSystemComponent;
+            m_loggerComponent = AZStd::make_unique<AZ::LoggerSystemComponent>();
+            m_timeSystem = AZStd::make_unique<AZ::TimeSystem>();
+            m_networkingSystemComponent = AZStd::make_unique<AzNetworking::NetworkingSystemComponent>();
         }
 
         void TearDown() override
         {
-            delete m_networkingSystemComponent;
-            delete m_timeComponent;
-            delete m_loggerComponent;
+            m_networkingSystemComponent.reset();
+            m_timeSystem.reset();
+            m_loggerComponent.reset();
 
             AZ::NameDictionary::Destroy();
             TeardownAllocator();
         }
 
-        AZ::LoggerSystemComponent* m_loggerComponent;
-        AZ::TimeSystemComponent* m_timeComponent;
-        AzNetworking::NetworkingSystemComponent* m_networkingSystemComponent;
+        AZStd::unique_ptr<AZ::LoggerSystemComponent> m_loggerComponent;
+        AZStd::unique_ptr<AZ::TimeSystem> m_timeSystem;
+        AZStd::unique_ptr<AzNetworking::NetworkingSystemComponent> m_networkingSystemComponent;
     };
 
     TEST_F(UdpTransportTests, PacketIdWrap)
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
index b6acd14a83..7e78f64778 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
@@ -53,14 +53,13 @@ static void OptimizedSetParent(QWidget* widget, QWidget* parent)
 
 namespace AzQtComponents
 {
-    static FancyDockingDropZoneConstants g_FancyDockingConstants;
 
     // Constant for the threshold in pixels for snapping to edges while dragging for docking
     static const int g_snapThresholdInPixels = 15;
 
-    static QString g_minimizeButtonObjectName =     "minimizeButton";
-    static QString g_maximizeButtonObjectName =     "maximizeButton";
-    static QString g_closeButtonObjectName =        "closeButton";
+    static const QString MinimizeButtonObjectName =     QStringLiteral("minimizeButton");
+    static const QString MaximizeButtonObjectName =     QStringLiteral("maximizeButton");
+    static const QString CloseButtonObjectName =        QStringLiteral("closeButton");
 
     static Qt::Orientation orientation(Qt::DockWidgetArea area)
     {
@@ -155,7 +154,7 @@ namespace AzQtComponents
 
         // Timer for updating our hovered drop zone opacity
         QObject::connect(m_dropZoneHoverFadeInTimer, &QTimer::timeout, this, &FancyDocking::onDropZoneHoverFadeInUpdate);
-        m_dropZoneHoverFadeInTimer->setInterval(g_FancyDockingConstants.dropZoneHoverFadeUpdateIntervalMS);
+        m_dropZoneHoverFadeInTimer->setInterval(FancyDockingDropZoneConstants::dropZoneHoverFadeUpdateIntervalMS);
         QIcon dragIcon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
         m_dragCursor = QCursor(dragIcon.pixmap(16), 5, 2);
     }
@@ -333,13 +332,13 @@ namespace AzQtComponents
      */
     void FancyDocking::onDropZoneHoverFadeInUpdate()
     {
-        const qreal dropZoneHoverOpacity = g_FancyDockingConstants.dropZoneHoverFadeIncrement + m_dropZoneState.dropZoneHoverOpacity();
+        const qreal dropZoneHoverOpacity = FancyDockingDropZoneConstants::dropZoneHoverFadeIncrement + m_dropZoneState.dropZoneHoverOpacity();
 
         // Once we've reached the full drop zone opacity, cut it off in case we
         // went over and stop the timer
-        if (dropZoneHoverOpacity >= g_FancyDockingConstants.dropZoneOpacity)
+        if (dropZoneHoverOpacity >= FancyDockingDropZoneConstants::dropZoneOpacity)
         {
-            m_dropZoneState.setDropZoneHoverOpacity(g_FancyDockingConstants.dropZoneOpacity);
+            m_dropZoneState.setDropZoneHoverOpacity(FancyDockingDropZoneConstants::dropZoneOpacity);
             m_dropZoneHoverFadeInTimer->stop();
         }
         else
@@ -460,7 +459,7 @@ namespace AzQtComponents
 
         // Minimize Icon
         QAction* minimizeAction = new QAction(tr("Minimize"));
-        minimizeAction->setObjectName(g_minimizeButtonObjectName);
+        minimizeAction->setObjectName(MinimizeButtonObjectName);
 
         connect(minimizeAction, &QAction::triggered, this, [titleBar]() {
             titleBar->handleMinimize();
@@ -470,7 +469,7 @@ namespace AzQtComponents
 
         // Maximize Icon
         QAction* maximizeAction = new QAction(tr("Maximize"));
-        maximizeAction->setObjectName(g_maximizeButtonObjectName);
+        maximizeAction->setObjectName(MaximizeButtonObjectName);
 
         connect(maximizeAction, &QAction::triggered, this, [titleBar]() {
             titleBar->handleMaximize();
@@ -480,7 +479,7 @@ namespace AzQtComponents
 
         // Close Icon
         QAction* closeAction = new QAction(tr("Close"));
-        closeAction->setObjectName(g_closeButtonObjectName);
+        closeAction->setObjectName(CloseButtonObjectName);
 
         connect(closeAction, &QAction::triggered, this, [titleBar]() {
             titleBar->handleClose();
@@ -792,12 +791,12 @@ namespace AzQtComponents
         QPoint mainWindowTopLeft = multiscreenMapFromGlobal(mainWindow->mapToGlobal(mainWindowRect.topLeft()));
         QPoint mainWindowTopRight = multiscreenMapFromGlobal(mainWindow->mapToGlobal(mainWindowRect.topRight()));
         QPoint mainWindowBottomLeft = multiscreenMapFromGlobal(mainWindow->mapToGlobal(mainWindowRect.bottomLeft()));
-        QSize absoluteLeftRightSize(g_FancyDockingConstants.absoluteDropZoneSizeInPixels, mainWindowRect.height());
+        QSize absoluteLeftRightSize(FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels, mainWindowRect.height());
         QRect absoluteLeftDropZone(mainWindowTopLeft, absoluteLeftRightSize);
-        QRect absoluteRightDropZone(mainWindowTopRight - QPoint(g_FancyDockingConstants.absoluteDropZoneSizeInPixels, 0), absoluteLeftRightSize);
-        QSize absoluteTopBottomSize(mainWindowRect.width(), g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
+        QRect absoluteRightDropZone(mainWindowTopRight - QPoint(FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels, 0), absoluteLeftRightSize);
+        QSize absoluteTopBottomSize(mainWindowRect.width(), FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
         QRect absoluteTopDropZone(mainWindowTopLeft, absoluteTopBottomSize);
-        QRect absoluteBottomDropZone(mainWindowBottomLeft - QPoint(0, g_FancyDockingConstants.absoluteDropZoneSizeInPixels), absoluteTopBottomSize);
+        QRect absoluteBottomDropZone(mainWindowBottomLeft - QPoint(0, FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels), absoluteTopBottomSize);
 
         // If the drop target is a main window, then we will only show the absolute
         // drop zone if the cursor is in that zone already
@@ -986,16 +985,16 @@ namespace AzQtComponents
         switch (m_dropZoneState.absoluteDropZoneArea())
         {
         case Qt::LeftDockWidgetArea:
-            dockRect.setX(dockRect.x() + g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
+            dockRect.setX(dockRect.x() + FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
             break;
         case Qt::RightDockWidgetArea:
-            dockRect.setWidth(dockRect.width() - g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
+            dockRect.setWidth(dockRect.width() - FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
             break;
         case Qt::TopDockWidgetArea:
-            dockRect.setY(dockRect.y() + g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
+            dockRect.setY(dockRect.y() + FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
             break;
         case Qt::BottomDockWidgetArea:
-            dockRect.setHeight(dockRect.height() - g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
+            dockRect.setHeight(dockRect.height() - FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
             break;
         }
 
@@ -1034,15 +1033,15 @@ namespace AzQtComponents
         // Set the drop zone width/height to the default, but if the dock widget
         // width and/or height is below the threshold, then switch to scaling them
         // down accordingly
-        int dropZoneWidth = g_FancyDockingConstants.dropZoneSizeInPixels;
-        if (dockWidth < g_FancyDockingConstants.minDockSizeBeforeDropZoneScalingInPixels)
+        int dropZoneWidth = FancyDockingDropZoneConstants::dropZoneSizeInPixels;
+        if (dockWidth < FancyDockingDropZoneConstants::minDockSizeBeforeDropZoneScalingInPixels)
         {
-            dropZoneWidth = aznumeric_cast<int>(dockWidth * g_FancyDockingConstants.dropZoneScaleFactor);
+            dropZoneWidth = aznumeric_cast<int>(dockWidth * FancyDockingDropZoneConstants::dropZoneScaleFactor);
         }
-        int dropZoneHeight = g_FancyDockingConstants.dropZoneSizeInPixels;
-        if (dockHeight < g_FancyDockingConstants.minDockSizeBeforeDropZoneScalingInPixels)
+        int dropZoneHeight = FancyDockingDropZoneConstants::dropZoneSizeInPixels;
+        if (dockHeight < FancyDockingDropZoneConstants::minDockSizeBeforeDropZoneScalingInPixels)
         {
-            dropZoneHeight = aznumeric_cast<int>(dockHeight * g_FancyDockingConstants.dropZoneScaleFactor);
+            dropZoneHeight = aznumeric_cast<int>(dockHeight * FancyDockingDropZoneConstants::dropZoneScaleFactor);
         }
 
         // Calculate the inner corners to be used when constructing the drop zone polygons
@@ -1078,7 +1077,7 @@ namespace AzQtComponents
         int innerDropZoneWidth = m_dropZoneState.innerDropZoneRect().width();
         int innerDropZoneHeight = m_dropZoneState.innerDropZoneRect().height();
         int centerDropZoneDiameter = (innerDropZoneWidth < innerDropZoneHeight) ? innerDropZoneWidth : innerDropZoneHeight;
-        centerDropZoneDiameter = aznumeric_cast<int>(centerDropZoneDiameter * g_FancyDockingConstants.centerTabDropZoneScale);
+        centerDropZoneDiameter = aznumeric_cast<int>(centerDropZoneDiameter * FancyDockingDropZoneConstants::centerTabDropZoneScale);
 
         // Setup our center tab drop zone
         const QSize centerDropZoneSize(centerDropZoneDiameter, centerDropZoneDiameter);
@@ -1986,7 +1985,7 @@ namespace AzQtComponents
             // hasn't faded in all the way yet, then ignore the drop zone area
             // which will make the widget floating
             bool modifiedKeyPressed = FancyDockingDropZoneWidget::CheckModifierKey();
-            if (modifiedKeyPressed || m_dropZoneState.dropZoneHoverOpacity() != g_FancyDockingConstants.dropZoneOpacity)
+            if (modifiedKeyPressed || m_dropZoneState.dropZoneHoverOpacity() != FancyDockingDropZoneConstants::dropZoneOpacity)
             {
                 area = Qt::NoDockWidgetArea;
             }
@@ -3026,7 +3025,7 @@ namespace AzQtComponents
         {
             bool modifiedKeyPressed = FancyDockingDropZoneWidget::CheckModifierKey();
 
-            m_ghostWidget->setWindowOpacity(modifiedKeyPressed ? 1.0f : g_FancyDockingConstants.draggingDockWidgetOpacity);
+            m_ghostWidget->setWindowOpacity(modifiedKeyPressed ? 1.0f : FancyDockingDropZoneConstants::draggingDockWidgetOpacity);
             m_ghostWidget->setPixmap(m_state.dockWidgetScreenGrab.screenGrab, m_state.placeholder(), m_state.placeholderScreen());
         }
     }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
index d729929d7b..3873f0389b 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
@@ -19,26 +19,6 @@
 
 namespace AzQtComponents
 {
-    static FancyDockingDropZoneConstants g_Constants;
-
-    FancyDockingDropZoneConstants::FancyDockingDropZoneConstants()
-    {
-        draggingDockWidgetOpacity = 0.6;
-        dropZoneOpacity = 0.4;
-        dropZoneSizeInPixels = 40;
-        minDockSizeBeforeDropZoneScalingInPixels = dropZoneSizeInPixels * 3;
-        dropZoneScaleFactor = 0.25;
-        centerTabDropZoneScale = 0.5;
-        centerTabIconScale = 0.5;
-        dropZoneColor = QColor(155, 155, 155);
-        dropZoneBorderColor = Qt::black;
-        dropZoneBorderInPixels = 1;
-        absoluteDropZoneSizeInPixels = 25;
-        dockingTargetDelayMS = 110;
-        dropZoneHoverFadeUpdateIntervalMS = 20;
-        dropZoneHoverFadeIncrement = dropZoneOpacity / (dockingTargetDelayMS / dropZoneHoverFadeUpdateIntervalMS);
-        centerDropZoneIconPath = QString(":/stylesheet/img/UI20/docking/tabs_icon.svg");
-    }
 
     FancyDockingDropZoneWidget::FancyDockingDropZoneWidget(QMainWindow* mainWindow, QWidget* coordinatesRelativeTo, QScreen* screen, FancyDockingDropZoneState* dropZoneState)
         // NOTE: this will not work with multiple monitors if this widget has a parent. The floating drop zone
@@ -154,7 +134,7 @@ namespace AzQtComponents
 
             // Draw all of the normal drop zones if they exist (if a dock widget is hovered over)
             painter.setPen(Qt::NoPen);
-            painter.setOpacity(g_Constants.dropZoneOpacity);
+            painter.setOpacity(FancyDockingDropZoneConstants::dropZoneOpacity);
             auto dropZones = m_dropZoneState->dropZones();
             for (auto it = dropZones.cbegin(); it != dropZones.cend(); ++it)
             {
@@ -189,7 +169,7 @@ namespace AzQtComponents
         // Otherwise, set the normal color
         else
         {
-            painter.setBrush(g_Constants.dropZoneColor);
+            painter.setBrush(FancyDockingDropZoneConstants::dropZoneColor);
         }
 
         // negate the window position to offset everything by that much
@@ -214,8 +194,8 @@ namespace AzQtComponents
             // Scale the tabs icon based on the drop zone size and our specified offset
             // Doing this through QIcon to make sure that SVG is rendered already in desired resolution
             const QSize& dropZoneSize = dropZoneRect.size();
-            const QSize requestedIconSize = dropZoneSize * g_Constants.centerTabIconScale;
-            const QIcon dropZoneIcon = QIcon(g_Constants.centerDropZoneIconPath);
+            const QSize requestedIconSize = dropZoneSize * FancyDockingDropZoneConstants::centerTabIconScale;
+            const QIcon dropZoneIcon = QIcon(FancyDockingDropZoneConstants::centerDropZoneIconPath);
             const QPixmap dropZonePixmap = dropZoneIcon.pixmap(requestedIconSize);
             const QSize receivedIconSize = dropZoneIcon.actualSize(requestedIconSize);
 
@@ -264,7 +244,7 @@ namespace AzQtComponents
             }
             else
             {
-                painter.setBrush(g_Constants.dropZoneColor);
+                painter.setBrush(FancyDockingDropZoneConstants::dropZoneColor);
             }
             painter.drawRect(absoluteDropZoneRect);
 
@@ -313,8 +293,8 @@ namespace AzQtComponents
         const QPoint innerBottomRight = innerDropZoneRect.bottomRight();
 
         // Draw the lines using the appropriate pen
-        QPen dropZoneBorderPen(g_Constants.dropZoneBorderColor);
-        dropZoneBorderPen.setWidth(g_Constants.dropZoneBorderInPixels);
+        QPen dropZoneBorderPen(FancyDockingDropZoneConstants::dropZoneBorderColor);
+        dropZoneBorderPen.setWidth(FancyDockingDropZoneConstants::dropZoneBorderInPixels);
         painter.setPen(dropZoneBorderPen);
         painter.setOpacity(1);
         painter.drawLine(topLeft, innerTopLeft);
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
index 94a6792833..865adcea59 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
@@ -28,63 +28,58 @@ class QPainter;
 
 namespace AzQtComponents
 {
-    struct AZ_QT_COMPONENTS_API FancyDockingDropZoneConstants
+    namespace FancyDockingDropZoneConstants
     {
         // Constant for the opacity of the screen grab for the dock widget being dragged
-        qreal draggingDockWidgetOpacity;
+        static constexpr qreal draggingDockWidgetOpacity = 0.6;
 
         // Constant for the opacity of the normal drop zones
-        qreal dropZoneOpacity;
+        static constexpr qreal dropZoneOpacity  = 0.4;
 
         // Constant for the default drop zone size (in pixels)
-        int dropZoneSizeInPixels;
+        static constexpr int dropZoneSizeInPixels  = 40;
 
         // Constant for the dock width/height size (in pixels) before we need to start
         // scaling down the drop zone sizes, or else they will overlap with the center
         // tab icon or each other
-        int minDockSizeBeforeDropZoneScalingInPixels;
+        static constexpr int minDockSizeBeforeDropZoneScalingInPixels = dropZoneSizeInPixels * 3;
 
         // Constant for the factor by which we must scale down the drop zone sizes once
         // the dock width/height size is too small
-        qreal dropZoneScaleFactor;
+        static constexpr qreal dropZoneScaleFactor  = 0.25;
 
         // Constant for the percentage to scale down the inner drop zone rectangle for the center tab drop zone
-        qreal centerTabDropZoneScale;
+        static constexpr qreal centerTabDropZoneScale  = 0.5;
 
         // Constant for the percentage to scale down the center tab drop zone for the center tab icon
-        qreal centerTabIconScale;
+        static constexpr qreal centerTabIconScale  = 0.5;
 
         // Constant for the drop zone hotspot default color
-        QColor dropZoneColor;
+        static const QColor dropZoneColor = QColor(155, 155, 155);
 
         // Constant for the drop zone border color
-        QColor dropZoneBorderColor;
+        static const QColor dropZoneBorderColor = Qt::black;
 
         // Constant for the border width in pixels separating the drop zones
-        int dropZoneBorderInPixels;
+        static constexpr int dropZoneBorderInPixels  = 1;
 
         // Constant for the border width in pixels separating the drop zones
-        int absoluteDropZoneSizeInPixels;
+        static constexpr int absoluteDropZoneSizeInPixels  = 25;
 
         // Constant for the delay (in milliseconds) before a drop zone becomes active
         // once it is hovered over
-        int dockingTargetDelayMS;
+        static constexpr int dockingTargetDelayMS = 110;
 
         // Constant for the rate at which we will update (fade in) the drop zone opacity
         // when hovered over (in milliseconds)
-        int dropZoneHoverFadeUpdateIntervalMS;
+        static constexpr int dropZoneHoverFadeUpdateIntervalMS  = 20;
 
         // Constant for the incremental opacity increase for the hovered drop zone
         // that will fade in to the full drop zone opacity in the desired time
-        qreal dropZoneHoverFadeIncrement;
+        static constexpr qreal dropZoneHoverFadeIncrement = dropZoneOpacity / (dockingTargetDelayMS / dropZoneHoverFadeUpdateIntervalMS);
 
         // Constant for the path to the center drop zone tabs icon
-        QString centerDropZoneIconPath;
-
-        FancyDockingDropZoneConstants();
-
-        FancyDockingDropZoneConstants(const FancyDockingDropZoneConstants&) = delete;
-        FancyDockingDropZoneConstants& operator=(const FancyDockingDropZoneConstants&) = delete;
+        static const QString centerDropZoneIconPath = QStringLiteral(":/stylesheet/img/UI20/docking/tabs_icon.svg");
     };
 
     class FancyDockingDropZoneState
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp
index 03d2c13f64..7e18843d65 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp
@@ -27,7 +27,7 @@ AZ_POP_DISABLE_WARNING
 
 namespace AzQtComponents
 {
-    static const char clearButtonActionNameC[] = "_q_qlineeditclearaction";
+    static const QString ClearButtonActionNameC = QStringLiteral("_q_qlineeditclearaction");
 
     struct BrowseEdit::InternalData
     {
@@ -263,7 +263,7 @@ namespace AzQtComponents
             auto lineEdit = browseEdit->m_data->m_lineEdit;
             LineEdit::polish(style, lineEdit, lineEditConfig);
 
-            QAction* action = lineEdit->findChild<QAction*>(clearButtonActionNameC);
+            QAction* action = lineEdit->findChild<QAction*>(ClearButtonActionNameC);
             if (action)
             {
                 QStyleOptionFrame option;
@@ -284,7 +284,7 @@ namespace AzQtComponents
             auto lineEdit = browseEdit->m_data->m_lineEdit;
             LineEdit::unpolish(style, lineEdit, lineEditConfig);
 
-            QAction* action = lineEdit->findChild<QAction*>(clearButtonActionNameC);
+            QAction* action = lineEdit->findChild<QAction*>(ClearButtonActionNameC);
             if (action)
             {
                 QStyleOptionFrame option;
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
index 176443c0cd..4e8e86bc5a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
@@ -323,7 +323,7 @@ namespace AzQtComponents
                     saturation *= 2.0 - lightness;
                 }
                 double value = (lightness + saturation) / 2.0;
-                saturation = (2.0 * saturation) / (lightness + saturation);
+                saturation = qFuzzyIsNull(lightness + saturation) ? 0 : (2.0 * saturation) / (lightness + saturation);
 
                 m_hsv.saturation = AZ::GetClamp(saturation, 0.0, 1.0);
                 m_hsv.value = AZ::GetClamp(value, 0.0, 12.5);
@@ -341,11 +341,12 @@ namespace AzQtComponents
                 double saturation = m_hsv.saturation * m_hsv.value;
                 if (lightness <= 1.0)
                 {
-                    saturation /= lightness;
+                    saturation = (qFuzzyIsNull(lightness)) ? 0.0 : saturation / lightness;
                 }
                 else
                 {
-                    saturation /= 2.0 - lightness;
+                    double two_minus_lightness = 2.0 - lightness;
+                    saturation = (qFuzzyIsNull(two_minus_lightness)) ? 0.0 : saturation / two_minus_lightness;
                 }
                 lightness /= 2.0;
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp
index f6417d3470..21f2500822 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp
@@ -32,7 +32,7 @@ namespace AzQtComponents
 
     namespace Internal
     {
-        const char* OverlayWidgetLayer::s_layerStyle = "background-color:rgba(0, 0, 0, 179)";
+        static const QString LayerStyle = QStringLiteral("background-color:rgba(0, 0, 0, 179)");
 
         OverlayWidgetLayer::OverlayWidgetLayer(OverlayWidget* parent, QWidget* centerWidget, QWidget* breakoutWidget, 
             const char* title, const OverlayWidgetButtonList& buttons)
@@ -66,7 +66,7 @@ namespace AzQtComponents
                 
             if (breakoutWidget)
             {
-                setStyleSheet(s_layerStyle);
+                setStyleSheet(LayerStyle);
                 setLayout(new QHBoxLayout());
                 
                 // close the overlay if either dependent widget is destroyed
@@ -100,7 +100,7 @@ namespace AzQtComponents
                 }
                 else
                 {
-                    setStyleSheet(s_layerStyle);
+                    setStyleSheet(LayerStyle);
                 }
                 AddButtons(*m_ui.data(), buttons, parent == nullptr);
             }
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h
index 1ad3cb5071..cba61cb67d 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h
@@ -59,8 +59,6 @@ namespace AzQtComponents
 
             bool eventFilter(QObject* object, QEvent* event) override;
 
-            static const char* s_layerStyle;
-
             QVector<Button> m_buttons;
             QScopedPointer<Ui::OverlayWidgetLayer> m_ui;
             OverlayWidget* m_parent;
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
index 725349cb50..f5cb90ae1a 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
@@ -213,12 +213,10 @@ namespace AzQtComponents
         // rectangle drawing.
         if (qTableView || qListView)
         {
-            int hHdr = 0;
             int vHdr = 0;
 
             if (qTableView)
             {
-                hHdr = qTableView->horizontalHeader()->isVisible() ? qTableView->horizontalHeader()->height() : 0;
                 vHdr = qTableView->verticalHeader()->isVisible() ? qTableView->verticalHeader()->width() : 0;
             }
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
index fbd58dcac7..9e9bb92737 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
@@ -164,11 +164,7 @@ namespace
     }
 }
 
-#if AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST
-TEST(AzQtComponents, DISABLED_ColorConversionsTestAllZeros)
-#else
 TEST(AzQtComponents, ColorConversionsTestAllZeros)
-#endif // AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST
 {
     TestConversions({ 0.0, 0.0, 0.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 0.0, 0.0 });
 }
diff --git a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
index d9b48b7835..6d6513043b 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
@@ -13,19 +13,16 @@
 #define AZ_TRAIT_UNIT_TEST_ENTITY_ID_GEN_TEST_COUNT 10000
 #define AZ_TRAIT_UNIT_TEST_DILLER_TRIGGER_EVENT_COUNT 100000
 
-#define AZ_TRAIT_DISABLE_ALL_SAVE_DATA_TESTS true
-
 #define AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS true
 
 #define AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_ARCHIVE_TESTS true
-#define AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST true
+
 #define AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST true
 #define AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_GRADIENT_SIGNAL_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS true
-#define AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_NATIVE_WINDOWS_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_PROCESS_LAUNCHER_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_EMOTION_FX_TESTS true
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h
index d8d4c37f01..7bfc891476 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h
@@ -10,6 +10,7 @@
 
 #include <AzCore/base.h>
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/Math/Vector2.h>
 
 class CVegetationMap;
 struct CVegetationInstance;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h
new file mode 100644
index 0000000000..6acc160ddc
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+namespace AzToolsFramework::EmbeddedPython
+{
+    // When using embedded Python, some platforms need to explicitly load the python library.
+    // For any modules that depend on 3rdParty::Python package, the AZ::Module should inherit this class.
+    class PythonLoader
+    {
+    public:
+        PythonLoader();
+        ~PythonLoader();
+
+    private:
+        [[maybe_unused]] void* m_embeddedLibPythonHandle{ nullptr };
+    };
+
+} // namespace AzToolsFramework::EmbeddedPython
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
index fd4196a296..282898c37d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
@@ -927,6 +927,9 @@ namespace AzToolsFramework
         /// Notify that the MainWindow has been fully initialized
         virtual void NotifyMainWindowInitialized(QMainWindow* /*mainWindow*/) {}
 
+        /// Notify that the Editor has been fully initialized
+        virtual void NotifyEditorInitialized() {}
+
         /// Signal that an asset should be highlighted / selected
         virtual void SelectAsset(const QString& /* assetPath */) {}
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
index f203251407..6c69fc04da 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
@@ -30,6 +30,7 @@
 #include <AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h>
 #include <AzToolsFramework/Entity/EditorEntityContextComponent.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.h>
 #include <AzToolsFramework/FocusMode/FocusModeSystemComponent.h>
 #include <AzToolsFramework/Slice/SliceMetadataEntityContextComponent.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponent.h>
@@ -54,6 +55,7 @@
 #include <AzToolsFramework/API/ComponentEntityObjectBus.h>
 #include <AzToolsFramework/API/EditorCameraBus.h>
 #include <AzToolsFramework/API/ViewPaneOptions.h>
+#include <AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h>
 #include <AzToolsFramework/Entity/EditorEntitySearchComponent.h>
 #include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
 #include <AzToolsFramework/Entity/EditorEntityModelComponent.h>
@@ -215,12 +217,17 @@ namespace AzToolsFramework
             , public AZ::BehaviorEBusHandler
         {
             AZ_EBUS_BEHAVIOR_BINDER(EditorEventsBusHandler, "{352F80BB-469A-40B6-B322-FE57AB51E4DA}", AZ::SystemAllocator,
-                NotifyRegisterViews);
+                NotifyRegisterViews, NotifyEditorInitialized);
 
             void NotifyRegisterViews() override
             {
                 Call(FN_NotifyRegisterViews);
             }
+
+            void NotifyEditorInitialized() override
+            {
+                Call(FN_NotifyEditorInitialized);
+            }
         };
 
     } // Internal
@@ -234,12 +241,14 @@ namespace AzToolsFramework
         , m_isInIsolationMode(false)
     {
         ToolsApplicationRequests::Bus::Handler::BusConnect();
+        AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusConnect();
 
         m_undoCache.RegisterToUndoCacheInterface();
     }
 
     ToolsApplication::~ToolsApplication()
     {
+        AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusDisconnect();
         ToolsApplicationRequests::Bus::Handler::BusDisconnect();
         Stop();
     }
@@ -260,6 +269,7 @@ namespace AzToolsFramework
                 azrtti_typeid<Components::EditorEntityUiSystemComponent>(),
                 azrtti_typeid<FocusModeSystemComponent>(),
                 azrtti_typeid<ContainerEntitySystemComponent>(),
+                azrtti_typeid<ReadOnlyEntitySystemComponent>(),
                 azrtti_typeid<SliceMetadataEntityContextComponent>(),
                 azrtti_typeid<Prefab::PrefabSystemComponent>(),
                 azrtti_typeid<EditorEntityFixupComponent>(),
@@ -378,6 +388,7 @@ namespace AzToolsFramework
         ComponentModeFramework::ComponentModeDelegate::Reflect(context);
 
         ViewportInteraction::ViewportInteractionReflect(context);
+        ViewportEditorModeNotifications::Reflect(context);
 
         Camera::EditorCameraRequests::Reflect(context);
         AzToolsFramework::EditorTransformComponentSelectionRequests::Reflect(context);
@@ -445,6 +456,7 @@ namespace AzToolsFramework
                 ->Attribute(AZ::Script::Attributes::Module, "editor")
                 ->Handler<Internal::EditorEventsBusHandler>()
                 ->Event("NotifyRegisterViews", &EditorEvents::NotifyRegisterViews)
+                ->Event("NotifyEditorInitialized", &EditorEvents::NotifyEditorInitialized)
                 ;
 
             behaviorContext->EBus<ViewPaneCallbackBus>("ViewPaneCallbackBus")
@@ -560,6 +572,12 @@ namespace AzToolsFramework
     void ToolsApplication::MarkEntitySelected(AZ::EntityId entityId)
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
+
+        if (m_freezeSelectionUpdates)
+        {
+            return;
+        }
+
         AZ_Assert(entityId.IsValid(), "Invalid entity Id being marked as selected.");
 
         EntityIdList::iterator foundIter = AZStd::find(m_selectedEntities.begin(), m_selectedEntities.end(), entityId);
@@ -579,6 +597,11 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
 
+        if (m_freezeSelectionUpdates)
+        {
+            return;
+        }
+
         EntityIdList entitiesSelected;
         entitiesSelected.reserve(entitiesToSelect.size());
 
@@ -602,6 +625,12 @@ namespace AzToolsFramework
     void ToolsApplication::MarkEntityDeselected(AZ::EntityId entityId)
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
+
+        if (m_freezeSelectionUpdates)
+        {
+            return;
+        }
+
         auto foundIter = AZStd::find(m_selectedEntities.begin(), m_selectedEntities.end(), entityId);
         if (foundIter != m_selectedEntities.end())
         {
@@ -619,6 +648,11 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
 
+        if (m_freezeSelectionUpdates)
+        {
+            return;
+        }
+
         ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::BeforeEntitySelectionChanged);
 
         EntityIdSet entitySetToDeselect(entitiesToDeselect.begin(), entitiesToDeselect.end());
@@ -673,6 +707,11 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
 
+        if (m_freezeSelectionUpdates)
+        {
+            return;
+        }
+
         // We're setting the selection set as a batch from an external caller.
         // * Filter out any unselectable entities
         // * Calculate selection/deselection delta so we can notify specific entities only on change.
@@ -1192,14 +1231,25 @@ namespace AzToolsFramework
 
     AZ::EntityId ToolsApplication::GetCurrentLevelEntityId()
     {
-        AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
-        AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId);
-        AZ::SliceComponent* rootSliceComponent = nullptr;
-        AzFramework::SliceEntityOwnershipServiceRequestBus::EventResult(rootSliceComponent, editorEntityContextId,
-            &AzFramework::SliceEntityOwnershipServiceRequestBus::Events::GetRootSlice);
-        if (rootSliceComponent && rootSliceComponent->GetMetadataEntity())
+        if (IsPrefabSystemEnabled())
         {
-            return rootSliceComponent->GetMetadataEntity()->GetId();
+            if (auto prefabPublicInterface = AZ::Interface<Prefab::PrefabPublicInterface>::Get())
+            {
+                return prefabPublicInterface->GetLevelInstanceContainerEntityId();
+            }
+        }
+        else
+        {
+            AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
+                editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId);
+            AZ::SliceComponent* rootSliceComponent = nullptr;
+            AzFramework::SliceEntityOwnershipServiceRequestBus::EventResult(
+                rootSliceComponent, editorEntityContextId, &AzFramework::SliceEntityOwnershipServiceRequestBus::Events::GetRootSlice);
+            if (rootSliceComponent && rootSliceComponent->GetMetadataEntity())
+            {
+                return rootSliceComponent->GetMetadataEntity()->GetId();
+            }
         }
 
         return AZ::EntityId();
@@ -1552,6 +1602,16 @@ namespace AzToolsFramework
         }
     }
 
+    void ToolsApplication::OnPrefabInstancePropagationBegin()
+    {
+        m_freezeSelectionUpdates = true;
+    }
+
+    void ToolsApplication::OnPrefabInstancePropagationEnd()
+    {
+        m_freezeSelectionUpdates = false;
+    }
+
     void ToolsApplication::CreateUndosForDirtyEntities()
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
index 5e9208b475..3dcb43f17d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
@@ -16,6 +16,7 @@
 #include <AzToolsFramework/API/EditorEntityAPI.h>
 #include <AzToolsFramework/Application/EditorEntityManager.h>
 #include <AzToolsFramework/Commands/PreemptiveUndoCache.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 
 #pragma once
 
@@ -29,6 +30,7 @@ namespace AzToolsFramework
     class ToolsApplication
         : public AzFramework::Application
         , public ToolsApplicationRequests::Bus::Handler
+        , public AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler
     {
     public:
         AZ_RTTI(ToolsApplication, "{2895561E-BE90-4CC3-8370-DD46FCF74C01}", AzFramework::Application);
@@ -169,6 +171,14 @@ namespace AzToolsFramework
         };
         //////////////////////////////////////////////////////////////////////////
 
+        //////////////////////////////////////////////////////////////////////////
+        // PrefabPublicNotificationBus::Handler
+
+        void OnPrefabInstancePropagationBegin() override;
+        void OnPrefabInstancePropagationEnd() override;
+
+        //////////////////////////////////////////////////////////////////////////
+
         void CreateUndosForDirtyEntities();
         void ConsistencyCheckUndoCache();
         AZ::Aabb                            m_selectionBounds;
@@ -181,6 +191,7 @@ namespace AzToolsFramework
         bool                                m_isDuringUndoRedo;
         bool                                m_isInIsolationMode;
         EntityIdSet                         m_isolatedEntityIdSet;
+        bool                                m_freezeSelectionUpdates = false;
 
         EditorEntityAPI* m_editorEntityAPI = nullptr;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
index 139bbb563c..6fd881dbb9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
@@ -14,7 +14,7 @@
 #include <AzCore/Module/DynamicModuleHandle.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/StringFunc/StringFunc.h>
-#include <AzFramework/API/ApplicationAPI.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/IO/LocalFileIO.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/Asset/AssetUtils.h>
@@ -205,7 +205,7 @@ namespace AzToolsFramework::AssetUtils
         return platformConfigFilePathsAdded;
     }
 
-    AZStd::vector<AZ::IO::Path> GetConfigFiles(AZStd::string_view engineRoot, AZStd::string_view assetRoot, AZStd::string_view projectPath,
+    AZStd::vector<AZ::IO::Path> GetConfigFiles(AZStd::string_view engineRoot, AZStd::string_view projectPath,
         bool addPlatformConfigs, bool addGemsConfigs, AZ::SettingsRegistryInterface* settingsRegistry)
     {
         constexpr const char* AssetProcessorGamePlatformConfigFileName = "AssetProcessorGamePlatformConfig.ini";
@@ -232,14 +232,13 @@ namespace AzToolsFramework::AssetUtils
             Internal::AddGemConfigFiles(gemInfoList, configFiles);
         }
 
-        AZ::IO::Path assetRootDir(assetRoot);
-        assetRootDir /= projectPath;
+        AZ::IO::Path projectRoot(projectPath);
 
-        AZ::IO::Path projectConfigFile = assetRootDir / AssetProcessorGamePlatformConfigFileName;
+        AZ::IO::Path projectConfigFile = projectRoot / AssetProcessorGamePlatformConfigFileName;
         configFiles.push_back(projectConfigFile);
 
         // Add a file entry for the Project AssetProcessor setreg file
-        projectConfigFile = assetRootDir / AssetProcessorGamePlatformConfigSetreg;
+        projectConfigFile = projectRoot / AssetProcessorGamePlatformConfigSetreg;
         configFiles.push_back(projectConfigFile);
 
         return configFiles;
@@ -251,10 +250,10 @@ namespace AzToolsFramework::AssetUtils
         AZStd::vector<AZStd::string> tokens;
         AZ::StringFunc::Tokenize(relPathFromRoot.c_str(), tokens, AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
 
-        AZStd::string validatedPath;
+        AZ::IO::FixedMaxPath validatedPath;
         if (rootPath.empty())
         {
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(validatedPath, &AzFramework::ApplicationRequests::GetEngineRoot);
+            validatedPath = AZ::Utils::GetEnginePath();
         }
         else
         {
@@ -299,10 +298,7 @@ namespace AzToolsFramework::AssetUtils
                 break;
             }
 
-            AZStd::string absoluteFilePath;
-            AZ::StringFunc::Path::ConstructFull(validatedPath.c_str(), element.c_str(), absoluteFilePath);
-
-            validatedPath = absoluteFilePath; // go one step deeper.
+            validatedPath /= element; // go one step deeper.
         }
 
         if (success)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h
index 39aab4d3fb..31ee9dcf60 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.h
@@ -40,7 +40,7 @@ namespace AzToolsFramework::AssetUtils
     //! Also note that if the project has any "game project gems", then those will also be inserted last, 
     //! and thus have a higher priority than the root or non - project gems.
     //! Also note that the game project could be in a different location to the engine therefore we need the assetRoot param.
-    AZStd::vector<AZ::IO::Path> GetConfigFiles(AZStd::string_view engineRoot, AZStd::string_view assetRoot, AZStd::string_view projectPath,
+    AZStd::vector<AZ::IO::Path> GetConfigFiles(AZStd::string_view engineRoot, AZStd::string_view projectPath,
         bool addPlatformConfigs = true, bool addGemsConfigs = true, AZ::SettingsRegistryInterface* settingsRegistry = nullptr);
 
     //! A utility function which checks the given path starting at the root and updates the relative path to be the actual case correct path.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
index 7da6f794d6..172bd3a29c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
@@ -234,11 +234,6 @@ namespace AzToolsFramework
                     return SourceFileDetails("Icons/AssetBrowser/Lua_16.svg");
                 }
 
-                if (AzFramework::StringFunc::Equal(extension.c_str(), ".mtl"))
-                {
-                    return SourceFileDetails("Icons/AssetBrowser/Material_16.svg");
-                }
-
                 if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str()))
                 {
                     return SourceFileDetails("Icons/AssetBrowser/Slice_16.svg");
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
index acf935e6dc..c6772ea2d7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
@@ -20,7 +20,7 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
 AZ_POP_DISABLE_WARNING
 
 AZ_CVAR(
-    bool, ed_useNewAssetBrowserTableView, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+    bool, ed_useNewAssetBrowserTableView, true, nullptr, AZ::ConsoleFunctorFlags::Null,
     "Use the new AssetBrowser TableView for searching assets.");
 namespace AzToolsFramework
 {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp
index 14c5e719b4..775462f63f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp
@@ -30,6 +30,7 @@ namespace AzToolsFramework
             connect(m_filterModel, &QAbstractItemModel::rowsRemoved, this, &AssetBrowserTableModel::UpdateTableModelMaps);
             connect(m_filterModel, &QAbstractItemModel::layoutChanged, this, &AssetBrowserTableModel::UpdateTableModelMaps);
             connect(m_filterModel, &AssetBrowserFilterModel::filterChanged, this, &AssetBrowserTableModel::beginResetModel);
+            connect(m_filterModel, &AssetBrowserFilterModel::filterChanged, this, &AssetBrowserTableModel::UpdateTableModelMaps);
             connect(m_filterModel, &QAbstractItemModel::dataChanged, this, &AssetBrowserTableModel::SourceDataChanged);
         }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
index 259d0426fe..4e3b8ee745 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
@@ -31,7 +31,10 @@ AZ_POP_DISABLE_WARNING
 AZ_CVAR(
     bool, ed_hideAssetPickerPathColumn, true, nullptr, AZ::ConsoleFunctorFlags::Null,
     "Hide AssetPicker path column for a clearer view.");
-AZ_CVAR_EXTERNED(bool, ed_useNewAssetBrowserTableView);
+
+AZ_CVAR(
+    bool, ed_useNewAssetPickerView, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+    "Uses the new Asset Picker View.");
 
 namespace AzToolsFramework
 {
@@ -118,7 +121,7 @@ namespace AzToolsFramework
             m_persistentState = AZ::UserSettings::CreateFind<AzToolsFramework::QWidgetSavedState>(AZ::Crc32(("AssetBrowserTreeView_Dialog_" + name).toUtf8().data()), AZ::UserSettings::CT_GLOBAL);
 
             m_ui->m_assetBrowserTableViewWidget->setVisible(false);
-            if (ed_useNewAssetBrowserTableView)
+            if (ed_useNewAssetPickerView)
             {
                 m_ui->m_assetBrowserTreeViewWidget->setVisible(false);
                 m_ui->m_assetBrowserTableViewWidget->setVisible(true);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
index a5206c9608..4869e0d09f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
@@ -9,11 +9,11 @@
 #include <AzCore/EBus/Results.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/vector.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h>
-#include <AzFramework/API/ApplicationAPI.h>
 #include <QString>
 
 namespace AzToolsFramework
@@ -113,11 +113,9 @@ namespace AzToolsFramework
 
             if (iconPathToUse.isEmpty())
             {
-                const char* engineRoot = nullptr;
-                AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-                AZ_Assert(engineRoot, "Engine Root not initialized");
-                AZStd::string iconPath = AZStd::string::format("%s%s", engineRoot, DefaultFileIconPath);
-                iconPathToUse = iconPath.c_str();
+                AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
+                AZ_Assert(!engineRoot.empty(), "Engine Root not initialized");
+                iconPathToUse = (engineRoot / DefaultFileIconPath).c_str();
             }
 
             m_pixmap.load(iconPathToUse);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
index 8924907e81..ac8e034faf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
@@ -202,9 +202,9 @@ namespace AzToolsFramework
         AZ_TracePrintf(logWindowName, "Creating new asset bundle manifest file \"%s\" for source pak \"%s\".\n", AzFramework::AssetBundleManifest::s_manifestFileName, sourcePak.c_str());
         bool manifestSaved = false;
         AZStd::string manifestDirectory;
-        AZStd::vector<AZStd::string> levelDirs;
         AzFramework::StringFunc::Path::GetFullPath(sourcePak.c_str(), manifestDirectory);
-        AssetCatalogRequestBus::BroadcastResult(manifestSaved, &AssetCatalogRequestBus::Events::CreateBundleManifest, outCatalogPath, AZStd::vector<AZStd::string>(), manifestDirectory, AzFramework::AssetBundleManifest::CurrentBundleVersion, levelDirs);
+        AssetCatalogRequestBus::BroadcastResult(manifestSaved, &AssetCatalogRequestBus::Events::CreateBundleManifest, outCatalogPath,
+            AZStd::vector<AZStd::string>(), manifestDirectory, AzFramework::AssetBundleManifest::CurrentBundleVersion, AZStd::vector<AZ::IO::Path>{});
 
         AZStd::string manifestPath;
         AzFramework::StringFunc::Path::Join(manifestDirectory.c_str(), AzFramework::AssetBundleManifest::s_manifestFileName, manifestPath);
@@ -263,7 +263,7 @@ namespace AzToolsFramework
         AZStd::string tempBundleFilePath = bundleFilePath.Native() + "_temp";
 
         AZStd::vector<AZStd::string> dependentBundleNames;
-        AZStd::vector<AZStd::string> levelDirs;
+        AZStd::vector<AZ::IO::Path> levelDirs;
         AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>> bundlePathDeltaCatalogPair;
         bundlePathDeltaCatalogPair.emplace_back(AZStd::make_pair(tempBundleFilePath, DeltaCatalogName));
 
@@ -515,7 +515,7 @@ namespace AzToolsFramework
         return true;
     }
 
-    bool AssetBundleComponent::AddManifestFileToBundles(const AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>>& bundlePathDeltaCatalogPair, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& bundleFolder, const AzToolsFramework::AssetBundleSettings& assetBundleSettings, const AZStd::vector<AZStd::string>& levelDirs)
+    bool AssetBundleComponent::AddManifestFileToBundles(const AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>>& bundlePathDeltaCatalogPair, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& bundleFolder, const AzToolsFramework::AssetBundleSettings& assetBundleSettings, const AZStd::vector<AZ::IO::Path>& levelDirs)
     {
         if (!MakePath(bundleFolder))
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h
index 17a9dd40f5..a2f7729e4e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.h
@@ -86,7 +86,7 @@ namespace AzToolsFramework
 
         //! Adds the manifest file to all the bundles
         //! The parent bundle manifest file is special since it will contain information of all dependent bundles names.
-        bool AddManifestFileToBundles(const AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>>& bundlePathDeltaCatalogPair, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& bundleFolder, const AzToolsFramework::AssetBundleSettings& assetBundleSettings, const AZStd::vector<AZStd::string>& levelDirs);
+        bool AddManifestFileToBundles(const AZStd::vector<AZStd::pair<AZStd::string, AZStd::string>>& bundlePathDeltaCatalogPair, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& bundleFolder, const AzToolsFramework::AssetBundleSettings& assetBundleSettings, const AZStd::vector<AZ::IO::Path>& levelDirs);
 
         //! Adds the delta catalog and any remaining files to the bundle
         //! We only create the delta catalog once we are sure about what all the files that will go in it. 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp
index a0e21ad589..1025d39e18 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.cpp
@@ -143,7 +143,7 @@ namespace AzToolsFramework
         return AssetCatalog::RemoveDeltaCatalog(deltaCatalog);
     }
 
-    bool PlatformAddressedAssetCatalog::CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZStd::string>& levelDirs)
+    bool PlatformAddressedAssetCatalog::CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZ::IO::Path>& levelDirs)
     {
         return AssetCatalog::CreateBundleManifest(deltaCatalogPath, dependentBundleNames, fileDirectory, bundleVersion, levelDirs);
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h
index a7a19d6d2f..2d65c7e7d3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalog.h
@@ -66,7 +66,7 @@ namespace AzToolsFramework
         bool InsertDeltaCatalogBefore(AZStd::shared_ptr<AzFramework::AssetRegistry> deltaCatalog, AZStd::shared_ptr<AzFramework::AssetRegistry> afterDeltaCatalog) override;
         bool RemoveDeltaCatalog(AZStd::shared_ptr<AzFramework::AssetRegistry> deltaCatalog) override;
 
-        bool CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZStd::string>& levelDirs) override;
+        bool CreateBundleManifest(const AZStd::string& deltaCatalogPath, const AZStd::vector<AZStd::string>& dependentBundleNames, const AZStd::string& fileDirectory, int bundleVersion, const AZStd::vector<AZ::IO::Path>& levelDirs) override;
         bool CreateDeltaCatalog(const AZStd::vector<AZStd::string>& files, const AZStd::string& filePath) override;
         void AddExtension(const char* extension) override;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
index 2cdf409125..dd1ac12a02 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
@@ -23,6 +23,7 @@
 #include <AzToolsFramework/Entity/EditorEntityModelComponent.h>
 #include <AzToolsFramework/Entity/EditorEntitySearchComponent.h>
 #include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.h>
 #include <AzToolsFramework/FocusMode/FocusModeSystemComponent.h>
 #include <AzToolsFramework/PropertyTreeEditor/PropertyTreeEditorComponent.h>
 #include <AzToolsFramework/Render/EditorIntersectorComponent.h>
@@ -75,6 +76,7 @@ namespace AzToolsFramework
             EditorEntityFixupComponent::CreateDescriptor(),
             EntityUtilityComponent::CreateDescriptor(),
             ContainerEntitySystemComponent::CreateDescriptor(),
+            ReadOnlyEntitySystemComponent::CreateDescriptor(),
             FocusModeSystemComponent::CreateDescriptor(),
             SliceMetadataEntityContextComponent::CreateDescriptor(),
             SliceRequestComponent::CreateDescriptor(),
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
index 2cca3804ea..20a15643c6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
@@ -597,11 +597,13 @@ namespace AzToolsFramework
                 pte.SetVisibleEnforcement(true);
             }
 
+            ScopedUndoBatch undo("Modify Entity Property");
             PropertyOutcome result = pte.SetProperty(propertyPath, value);
             if (result.IsSuccess())
             {
                 PropertyEditorEntityChangeNotificationBus::Event(componentInstance.GetEntityId(), &PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged, componentInstance.GetComponentId());
             }
+            undo.MarkEntityDirty(componentInstance.GetEntityId());
 
             return result;
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
index 07e025fc60..f07e87fad2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
@@ -448,7 +448,11 @@ namespace AzToolsFramework
 
                     ViewportUi::ViewportUiRequestBus::Event(
                         ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder,
-                        componentMode.m_componentMode->GetComponentModeName().c_str());
+                        componentMode.m_componentMode->GetComponentModeName().c_str(),
+                        []
+                        {
+                            ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode);
+                        });
                 }
 
                 RefreshActions();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp
index f449478306..e780c38822 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp
@@ -55,8 +55,11 @@ namespace AzToolsFramework
                 GetEntityComponentIdPair(), elementIdsToDisplay);
             // create the component mode border with the specific name for this component mode
             ViewportUi::ViewportUiRequestBus::Event(
-                ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder,
-                GetComponentModeName());
+                ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, GetComponentModeName(),
+                []
+                {
+                    ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode);
+                });
             // set the EntityComponentId for this ComponentMode to active in the ComponentModeViewportUi system
             ComponentModeViewportUiRequestBus::Event(
                 GetComponentType(), &ComponentModeViewportUiRequestBus::Events::SetViewportUiActiveEntityComponentId,
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
index 28d6e2bc08..3e256430a2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
@@ -15,6 +15,7 @@
 #include <AzCore/std/sort.h>
 #include <AzCore/RTTI/AttributeReader.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/Commands/EntityStateCommand.h>
 #include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
@@ -468,6 +469,18 @@ namespace AzToolsFramework
         EntityIdList children;
         EditorEntityInfoRequestBus::EventResult(children, parentId, &EditorEntityInfoRequestBus::Events::GetChildren);
 
+        // If Prefabs are enabled, don't check the order for an invalid parent, just return its children (i.e. the root container entity)
+        // There will currently always be one root container entity, so there's no order to retrieve
+        if (!parentId.IsValid())
+        {
+            bool isPrefabEnabled = false;
+            AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+            if (isPrefabEnabled)
+            {
+                return children;
+            }
+        }
+
         EntityIdList entityChildOrder;
         AZ::EntityId sortEntityId = GetEntityIdForSortInfo(parentId);
         EditorEntitySortRequestBus::EventResult(entityChildOrder, sortEntityId, &EditorEntitySortRequestBus::Events::GetChildEntityOrderArray);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
index eaff64ba2e..e4d4f40bce 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp
@@ -449,16 +449,23 @@ namespace AzToolsFramework
         AZStd::unordered_map<AZ::EntityId, AZStd::pair<AZ::EntityId, AZ::u64>>::const_iterator orderItr = m_savedOrderInfo.find(childId);
         if (orderItr != m_savedOrderInfo.end() && orderItr->second.first == parentId)
         {
-            bool sortOrderUpdated = AzToolsFramework::RecoverEntitySortInfo(parentId, childId, orderItr->second.second);
-            m_savedOrderInfo.erase(childId);
-
-            // force notify the child sort order changed on the parent entity info, but only if the restore didn't actually modify
-            // the order internally (and sent ChildEntityOrderArrayUpdated).  that may seem heavy handed, and it is, but necessary
-            // to combat scenarios when the initial override detection returns a false positive (see comment about IDH comparisons
-            // in OnChildSortOrderChanged) and the slice instance source-to-live mapping hasn't been fully reconstructed yet.
-            if (!sortOrderUpdated)
+            bool isPrefabEnabled = false;
+            AzFramework::ApplicationRequests::Bus::BroadcastResult(
+                isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+            // If prefabs are enabled, rely on the component to do a sanity check instead of restoring the order from the model
+            if (!isPrefabEnabled)
             {
-                parentInfo.OnChildSortOrderChanged();
+                bool sortOrderUpdated = AzToolsFramework::RecoverEntitySortInfo(parentId, childId, orderItr->second.second);
+                m_savedOrderInfo.erase(childId);
+
+                // force notify the child sort order changed on the parent entity info, but only if the restore didn't actually modify
+                // the order internally (and sent ChildEntityOrderArrayUpdated).  that may seem heavy handed, and it is, but necessary
+                // to combat scenarios when the initial override detection returns a false positive (see comment about IDH comparisons
+                // in OnChildSortOrderChanged) and the slice instance source-to-live mapping hasn't been fully reconstructed yet.
+                if (!sortOrderUpdated)
+                {
+                    parentInfo.OnChildSortOrderChanged();
+                }
             }
         }
         else
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp
index b747469f4d..8ade8c470f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp
@@ -8,9 +8,17 @@
 #include "EditorEntitySortComponent.h"
 #include "EditorEntityInfoBus.h"
 #include "EditorEntityHelpers.h"
+#include <AzCore/Component/TransformBus.h>
 #include <AzCore/Debug/Profiler.h>
 #include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Serialization/Json/RegistrationContext.h>
 #include <AzCore/std/sort.h>
+#include <AzFramework/API/ApplicationAPI.h>
+#include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
+#include <AzToolsFramework/Prefab/PrefabPublicRequestBus.h>
+#include <AzToolsFramework/Undo/UndoSystem.h>
+#include <AzCore/Serialization/Json/RegistrationContext.h>
+#include <AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h>
 
 static_assert(sizeof(AZ::u64) == sizeof(AZ::EntityId), "We use AZ::EntityId for Persistent ID, which is a u64 under the hood. These must be the same size otherwise the persistent id will have to be rewritten");
 
@@ -49,6 +57,12 @@ namespace AzToolsFramework
                         ;
                 }
             }
+
+            AZ::JsonRegistrationContext* jsonRegistration = azrtti_cast<AZ::JsonRegistrationContext*>(context);
+            if (jsonRegistration)
+            {
+                jsonRegistration->Serializer<JsonEditorEntitySortComponentSerializer>()->HandlesType<EditorEntitySortComponent>();
+            }
         }
 
         void EditorEntitySortComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
@@ -144,6 +158,12 @@ namespace AzToolsFramework
         bool EditorEntitySortComponent::AddChildEntityInternal(const AZ::EntityId& entityId, bool addToBack, EntityOrderArray::iterator insertPosition)
         {
             AZ_PROFILE_FUNCTION(AzToolsFramework);
+
+            if (m_ignoreIncomingOrderChanges)
+            {
+                return true;
+            }
+
             auto entityItr = m_childEntityOrderCache.find(entityId);
             if (entityItr == m_childEntityOrderCache.end())
             {
@@ -159,9 +179,6 @@ namespace AzToolsFramework
                 }
 
                 MarkDirtyAndSendChangedEvent();
-
-                // Use the ToolsApplication to mark the entity dirty, this will only do something if we already have an undo batch
-                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::AddDirtyEntity, GetEntityId());
                 
                 return true;
             }
@@ -179,6 +196,10 @@ namespace AzToolsFramework
             else
             {
                 EntityOrderArray::iterator insertPosition = GetFirstSelectedEntityPosition();
+                if (insertPosition != m_childEntityOrderArray.end())
+                {
+                    ++insertPosition;
+                }
                 retval = AddChildEntityInternal(entityId, false, insertPosition);
             }
 
@@ -198,6 +219,12 @@ namespace AzToolsFramework
         bool EditorEntitySortComponent::RemoveChildEntity(const AZ::EntityId& entityId)
         {
             AZ_PROFILE_FUNCTION(AzToolsFramework);
+
+            if (m_ignoreIncomingOrderChanges)
+            {
+                return true;
+            }
+
             auto entityItr = m_childEntityOrderCache.find(entityId);
             if (entityItr != m_childEntityOrderCache.end())
             {
@@ -206,9 +233,6 @@ namespace AzToolsFramework
 
                 MarkDirtyAndSendChangedEvent();
 
-                // Use the ToolsApplication to mark the entity dirty, this will only do something if we already have an undo batch
-                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::AddDirtyEntity, GetEntityId());
-
                 return true;
             }
             return false;
@@ -250,11 +274,30 @@ namespace AzToolsFramework
             }
         }
 
+        void EditorEntitySortComponent::OnPrefabInstancePropagationBegin()
+        {
+            m_ignoreIncomingOrderChanges = true;
+        }
+
+        void EditorEntitySortComponent::OnPrefabInstancePropagationEnd()
+        {
+            m_ignoreIncomingOrderChanges = false;
+
+            if (m_shouldSanityCheckStateAfterPropagation)
+            {
+                SanitizeOrderEntryArray();
+                m_shouldSanityCheckStateAfterPropagation = false;
+            }
+        }
+
         void EditorEntitySortComponent::MarkDirtyAndSendChangedEvent()
         {
             // mark the order as dirty before sending the ChildEntityOrderArrayUpdated event in order for PrepareSave to be properly handled in the case 
             // one of the event listeners needs to build the InstanceDataHierarchy
             m_entityOrderIsDirty = true;
+
+            // Use the ToolsApplication to mark the entity dirty, this will only do something if we already have an undo batch
+            ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::AddDirtyEntity, GetEntityId());
             EditorEntitySortNotificationBus::Event(GetEntityId(), &EditorEntitySortNotificationBus::Events::ChildEntityOrderArrayUpdated);
         }
 
@@ -264,10 +307,19 @@ namespace AzToolsFramework
             // This is a special case for certain EditorComponents only!
             EditorEntitySortRequestBus::Handler::BusConnect(GetEntityId());
             EditorEntityContextNotificationBus::Handler::BusConnect();
+            AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusConnect();
         }
 
         void EditorEntitySortComponent::Activate()
         {
+            // Run the post-serialize handler if prefabs are enabled because PostLoad won't be called automatically
+            bool isPrefabEnabled = false;
+            AzFramework::ApplicationRequests::Bus::BroadcastResult(
+                isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+            if (isPrefabEnabled)
+            {
+                m_shouldSanityCheckStateAfterPropagation = true;
+            }
             // Send out that the order for our entity is now updated
             EditorEntitySortNotificationBus::Event(GetEntityId(), &EditorEntitySortNotificationBus::Events::ChildEntityOrderArrayUpdated);
         }
@@ -293,6 +345,73 @@ namespace AzToolsFramework
             m_entityOrderIsDirty = false;
         }
 
+        void EditorEntitySortComponent::SanitizeOrderEntryArray()
+        {
+            bool shouldEmitDirtyState = false;
+
+            // Remove invalid and duplicate entries that point at non-existent entities
+            AZStd::unordered_set<AZ::EntityId> duplicateIds;
+            for (auto it = m_childEntityOrderArray.begin(); it != m_childEntityOrderArray.end();)
+            {
+                if (!it->IsValid() || GetEntityById(*it) == nullptr || duplicateIds.contains(*it))
+                {
+                    it = m_childEntityOrderArray.erase(it);
+                    shouldEmitDirtyState = true;
+                }
+                else
+                {
+                    duplicateIds.insert(*it);
+                    ++it;
+                }
+            }
+
+            // Append any missing children
+            EntityIdList children;
+            AZ::TransformBus::EventResult(children, GetEntityId(), &AZ::TransformBus::Events::GetChildren);
+            for (auto it = m_childEntityOrderArray.begin(); it != m_childEntityOrderArray.end(); ++it)
+            {
+                if (auto removedChildrenIt = AZStd::remove(children.begin(), children.end(), *it); removedChildrenIt != children.end())
+                {
+                    children.erase(removedChildrenIt);
+                }
+            }
+
+            AZStd::sort(children.begin(), children.end(), [](AZ::EntityId lhs, AZ::EntityId rhs)
+            {
+                return GetEntityById(lhs)->GetName() < GetEntityById(rhs)->GetName();
+            });
+
+            if (!children.empty())
+            {
+                shouldEmitDirtyState = true;
+                EntityOrderArray::iterator insertPosition = GetFirstSelectedEntityPosition();
+                if (insertPosition != m_childEntityOrderArray.end())
+                {
+                    ++insertPosition;
+                }
+                m_childEntityOrderArray.insert(insertPosition, children.begin(), children.end());
+            }
+
+            // Clear out the vector to be rebuilt from persistent id
+            m_childEntityOrderEntryArray.resize(m_childEntityOrderArray.size());
+            for (size_t i = 0; i < m_childEntityOrderArray.size(); ++i)
+            {
+                m_childEntityOrderEntryArray[i] = {
+                    m_childEntityOrderArray[i],
+                    static_cast<AZ::u64>(i)
+                };
+            }
+
+            RebuildEntityOrderCache();
+
+            if (shouldEmitDirtyState)
+            {
+                ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::Bus::Events::AddDirtyEntity, GetEntityId());
+            }
+
+            m_entityOrderIsDirty = false;
+        }
+
         void EditorEntitySortComponent::PostLoad()
         {
             // Clear out the vector to be rebuilt from persistent id
@@ -340,7 +459,7 @@ namespace AzToolsFramework
                 firstSelectedEntityPos = selectedEntityPos < firstSelectedEntityPos ? selectedEntityPos : firstSelectedEntityPos;
             }
 
-            return firstSelectedEntityPos == m_childEntityOrderArray.end() ? m_childEntityOrderArray.begin() : firstSelectedEntityPos;
+            return firstSelectedEntityPos;
         }
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
index d728191c64..a4715fb041 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
@@ -10,6 +10,7 @@
 #include "EditorEntitySortBus.h"
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
 namespace AzToolsFramework
@@ -20,7 +21,10 @@ namespace AzToolsFramework
             : public AzToolsFramework::Components::EditorComponentBase
             , public EditorEntitySortRequestBus::Handler
             , public EditorEntityContextNotificationBus::Handler
+            , public AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler
         {
+            friend class JsonEditorEntitySortComponentSerializer;
+
         public:
             AZ_COMPONENT(EditorEntitySortComponent, "{6EA1E03D-68B2-466D-97F7-83998C8C27F0}", EditorComponentBase);
 
@@ -45,6 +49,9 @@ namespace AzToolsFramework
             // EditorEntityContextNotificationBus::Handler
             void OnEntityStreamLoadSuccess() override;
             //////////////////////////////////////////////////////////////////////////
+
+            void OnPrefabInstancePropagationBegin() override;
+            void OnPrefabInstancePropagationEnd() override;
         private:
             void MarkDirtyAndSendChangedEvent();
             bool AddChildEntityInternal(const AZ::EntityId& entityId, bool addToBack, EntityOrderArray::iterator insertPosition);
@@ -59,6 +66,8 @@ namespace AzToolsFramework
             void PrepareSave();
             void PostLoad();
 
+            void SanitizeOrderEntryArray();
+
             class EntitySortSerializationEvents
                 : public AZ::SerializeContext::IEventHandler
             {
@@ -106,6 +115,8 @@ namespace AzToolsFramework
             EntityOrderCache m_childEntityOrderCache; ///< The map of entity id to index for quick look up
 
             bool m_entityOrderIsDirty = true; ///< This flag indicates our stored serialization order data is out of date and must be rebuilt before serialization occurs
+            bool m_ignoreIncomingOrderChanges = false; ///< This is set when prefab propagation occurs so that non-authored order changes can be ignored
+            bool m_shouldSanityCheckStateAfterPropagation = false; //< This is set after activation, to queue a cleanup of any invalid state after the next prefab propagation.
         };
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp
new file mode 100644
index 0000000000..0ec13cedda
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Serialization/Json/JsonSerializationResult.h>
+#include <AzCore/std/sort.h>
+#include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
+#include <AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h>
+
+namespace AzToolsFramework::Components
+{
+    AZ_CLASS_ALLOCATOR_IMPL(JsonEditorEntitySortComponentSerializer, AZ::SystemAllocator, 0);
+
+    AZ::JsonSerializationResult::Result JsonEditorEntitySortComponentSerializer::Load(
+        void* outputValue,
+        [[maybe_unused]] const AZ::Uuid& outputValueTypeId,
+        const rapidjson::Value& inputValue,
+        AZ::JsonDeserializerContext& context)
+    {
+        namespace JSR = AZ::JsonSerializationResult;
+
+        AZ_Assert(
+            azrtti_typeid<EditorEntitySortComponent>() == outputValueTypeId,
+            "Unable to deserialize EditorEntitySortComponent from json because the provided type is %s.",
+            outputValueTypeId.ToString<AZStd::string>().c_str());
+
+        EditorEntitySortComponent* sortComponentInstance = reinterpret_cast<EditorEntitySortComponent*>(outputValue);
+        AZ_Assert(sortComponentInstance, "Output value for JsonEditorEntitySortComponentSerializer can't be null.");
+
+        JSR::ResultCode result(JSR::Tasks::ReadField);
+        {
+            JSR::ResultCode componentIdLoadResult = ContinueLoadingFromJsonObjectField(
+                &sortComponentInstance->m_id, azrtti_typeid<decltype(sortComponentInstance->m_id)>(), inputValue,
+                "Id", context);
+
+            result.Combine(componentIdLoadResult);
+        }
+
+        {
+            sortComponentInstance->m_childEntityOrderArray.clear();
+            JSR::ResultCode enryLoadResult = ContinueLoadingFromJsonObjectField(
+                &sortComponentInstance->m_childEntityOrderArray,
+                azrtti_typeid<decltype(sortComponentInstance->m_childEntityOrderArray)>(), inputValue, "Child Entity Order",
+                context);
+
+            // Migrate ChildEntityOrderEntryArray -> ChildEntityOrderArray
+            if (sortComponentInstance->m_childEntityOrderArray.empty())
+            {
+                enryLoadResult = ContinueLoadingFromJsonObjectField(
+                    &sortComponentInstance->m_childEntityOrderEntryArray,
+                    azrtti_typeid<decltype(sortComponentInstance->m_childEntityOrderEntryArray)>(), inputValue,
+                    "ChildEntityOrderEntryArray", context);
+
+                AZStd::sort(
+                    sortComponentInstance->m_childEntityOrderEntryArray.begin(),
+                    sortComponentInstance->m_childEntityOrderEntryArray.end(),
+                    [](const EditorEntitySortComponent::EntityOrderEntry& lhs,
+                       const EditorEntitySortComponent::EntityOrderEntry& rhs) -> bool
+                    {
+                        return lhs.m_sortIndex < rhs.m_sortIndex;
+                    });
+
+                // Sort by index and copy to the order array, any duplicates or invalid entries will be cleaned up by the sanitization pass
+                sortComponentInstance->m_childEntityOrderArray.resize(sortComponentInstance->m_childEntityOrderEntryArray.size());
+                for (size_t i = 0; i < sortComponentInstance->m_childEntityOrderEntryArray.size(); ++i)
+                {
+                    sortComponentInstance->m_childEntityOrderArray[i] = sortComponentInstance->m_childEntityOrderEntryArray[i].m_entityId;
+                }
+            }
+
+            sortComponentInstance->RebuildEntityOrderCache();
+
+            result.Combine(enryLoadResult);
+        }
+
+        return context.Report(
+            result,
+            result.GetProcessing() != JSR::Processing::Halted ? "Successfully loaded EditorEntitySortComponent information."
+                                                              : "Failed to load EditorEntitySortComponent information.");
+    }
+
+    AZ::JsonSerializationResult::Result JsonEditorEntitySortComponentSerializer::Store(
+        rapidjson::Value& outputValue,
+        const void* inputValue,
+        const void* defaultValue,
+        [[maybe_unused]] const AZ::Uuid& valueTypeId,
+        AZ::JsonSerializerContext& context)
+    {
+        namespace JSR = AZ::JsonSerializationResult;
+
+        AZ_Assert(
+            azrtti_typeid<EditorEntitySortComponent>() == valueTypeId,
+            "Unable to Serialize EditorEntitySortComponent because the provided type is %s.",
+            valueTypeId.ToString<AZStd::string>().c_str());
+
+        const EditorEntitySortComponent* sortComponentInstance = reinterpret_cast<const EditorEntitySortComponent*>(inputValue);
+        AZ_Assert(sortComponentInstance, "Input value for JsonEditorEntitySortComponentSerializer can't be null.");
+        const EditorEntitySortComponent* defaultsortComponentInstance =
+            reinterpret_cast<const EditorEntitySortComponent*>(defaultValue);
+
+        JSR::ResultCode result(JSR::Tasks::WriteValue);
+        {
+            AZ::ScopedContextPath subPathName(context, "m_id");
+            const AZ::ComponentId* componentId = &sortComponentInstance->m_id;
+            const AZ::ComponentId* defaultComponentId =
+                defaultsortComponentInstance ? &defaultsortComponentInstance->m_id : nullptr;
+
+            JSR::ResultCode resultComponentId = ContinueStoringToJsonObjectField(
+                outputValue, "Id", componentId, defaultComponentId, azrtti_typeid<decltype(sortComponentInstance->m_id)>(),
+                context);
+
+            result.Combine(resultComponentId);
+        }
+
+        {
+            AZ::ScopedContextPath subPathName(context, "m_childEntityOrderArray");
+            const EntityOrderArray* childEntityOrderArray = &sortComponentInstance->m_childEntityOrderArray;
+            const EntityOrderArray* defaultChildEntityOrderArray =
+                defaultsortComponentInstance ? &defaultsortComponentInstance->m_childEntityOrderArray : nullptr;
+
+            JSR::ResultCode resultParentEntityId = ContinueStoringToJsonObjectField(
+                outputValue, "Child Entity Order", childEntityOrderArray, defaultChildEntityOrderArray,
+                azrtti_typeid<decltype(sortComponentInstance->m_childEntityOrderArray)>(), context);
+
+            result.Combine(resultParentEntityId);
+        }
+
+        return context.Report(
+            result,
+            result.GetProcessing() != JSR::Processing::Halted ? "Successfully stored EditorEntitySortComponent information."
+                                                              : "Failed to store EditorEntitySortComponent information.");
+    }
+} // namespace AzToolsFramework::Components
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h
new file mode 100644
index 0000000000..29d1f9c14a
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Memory/Memory.h>
+#include <AzCore/Serialization/Json/BaseJsonSerializer.h>
+
+namespace AzToolsFramework::Components
+{
+    class JsonEditorEntitySortComponentSerializer
+        : public AZ::BaseJsonSerializer
+    {
+    public:
+        AZ_RTTI(JsonEditorEntitySortComponentSerializer, "{5104782E-B34F-4D87-B1DF-BDFB1AF20D58}", BaseJsonSerializer);
+        AZ_CLASS_ALLOCATOR_DECL;
+
+        AZ::JsonSerializationResult::Result Load(
+            void* outputValue, const AZ::Uuid& outputValueTypeId, const rapidjson::Value& inputValue,
+            AZ::JsonDeserializerContext& context) override;
+
+        AZ::JsonSerializationResult::Result Store(
+            rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, const AZ::Uuid& valueTypeId,
+            AZ::JsonSerializerContext& context) override;
+    };
+} // namespace AzToolsFramework::Components
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityBus.h
new file mode 100644
index 0000000000..051e87c7e0
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityBus.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/EBus/EBus.h>
+
+#include <AzFramework/Entity/EntityContext.h>
+
+namespace AzToolsFramework
+{
+    //! Used to notify changes of state for read-only entities.
+    class ReadOnlyEntityPublicNotifications
+        : public AZ::EBusTraits
+    {
+    public:
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        using BusIdType = AzFramework::EntityContextId;
+        //////////////////////////////////////////////////////////////////////////
+        
+        //! Triggered when an entity's read-only status changes.
+        //! @param entityId The entity whose status has changed.
+        //! @param readOnly The read-only state the container was changed to.
+        virtual void OnReadOnlyEntityStatusChanged([[maybe_unused]] const AZ::EntityId& entityId, [[maybe_unused]] bool readOnly) {}
+
+    protected:
+        ~ReadOnlyEntityPublicNotifications() = default;
+    };
+    using ReadOnlyEntityPublicNotificationBus = AZ::EBus<ReadOnlyEntityPublicNotifications>;
+
+    //! Used by the ReadOnlyEntitySystemComponent to query the read-only state of entities as set by systems using the API.
+    class ReadOnlyEntityQueryRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        using BusIdType = AzFramework::EntityContextId;
+        //////////////////////////////////////////////////////////////////////////
+        
+        //! Triggered when an entity's read-only status is queried.
+        //! Allows multiple systems to weigh in on the read-only status of an entity.
+        //! @param entityId The entity whose status has changed.
+        //! @param[out] isReadOnly The output of the query. Should only be changed to true, and left untouched if false.
+        virtual void IsReadOnly(const AZ::EntityId& entityId, bool& isReadOnly) = 0;
+
+    protected:
+        ~ReadOnlyEntityQueryRequests() = default;
+    };
+    using ReadOnlyEntityQueryRequestBus = AZ::EBus<ReadOnlyEntityQueryRequests>;
+
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h
new file mode 100644
index 0000000000..15ac04d0fd
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+#include <AzFramework/Entity/EntityContextBus.h>
+
+namespace AzToolsFramework
+{
+    //! An entity registered as read-only cannot be altered in the editor.
+    class ReadOnlyEntityPublicInterface
+    {
+    public:
+        AZ_RTTI(ReadOnlyEntityPublicInterface, "{921FE15B-6EBD-47F0-8238-BC63318DEDEA}");
+
+        //! Returns whether the entity id provided is registered as read-only.
+        virtual bool IsReadOnly(const AZ::EntityId& entityId) = 0;
+    };
+
+    //! An entity registered as read-only cannot be altered in the editor.
+    class ReadOnlyEntityQueryInterface
+    {
+    public:
+        AZ_RTTI(ReadOnlyEntityQueryInterface, "{2ACD63C5-1F3E-4DE8-880E-8115F857D329}");
+
+        //! Refreshes the cached read-only status for the entities provided.
+        //! @param entityIds The entityIds whose read-only state will be queried again.
+        virtual void RefreshReadOnlyState(const EntityIdList& entityIds) = 0;
+
+        //! Refreshes the cached read-only status for all entities.
+        //! Useful when disconnecting a handler at runtime.
+        virtual void RefreshReadOnlyStateForAllEntities() = 0;
+    };
+
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.cpp
new file mode 100644
index 0000000000..f7f36177c9
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.h>
+
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
+
+namespace AzToolsFramework
+{
+    void ReadOnlyEntitySystemComponent::Activate()
+    {
+        AZ::Interface<ReadOnlyEntityQueryInterface>::Register(this);
+        AZ::Interface<ReadOnlyEntityPublicInterface>::Register(this);
+        EditorEntityContextNotificationBus::Handler::BusConnect();
+    }
+
+    void ReadOnlyEntitySystemComponent::Deactivate()
+    {
+        EditorEntityContextNotificationBus::Handler::BusDisconnect();
+        AZ::Interface<ReadOnlyEntityPublicInterface>::Unregister(this);
+        AZ::Interface<ReadOnlyEntityQueryInterface>::Unregister(this);
+    }
+
+    void ReadOnlyEntitySystemComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<ReadOnlyEntitySystemComponent, AZ::Component>()->Version(1);
+        }
+    }
+
+    void ReadOnlyEntitySystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    {
+        provided.push_back(AZ_CRC_CE("ReadOnlyEntityService"));
+    }
+
+    bool ReadOnlyEntitySystemComponent::IsReadOnly(const AZ::EntityId& entityId)
+    {
+        if (!m_readOnlystates.contains(entityId))
+        {
+            QueryReadOnlyStateForEntity(entityId);
+        }
+
+        return m_readOnlystates[entityId];
+    }
+
+    void ReadOnlyEntitySystemComponent::RefreshReadOnlyState(const EntityIdList& entityIds)
+    {
+        for (const AZ::EntityId entityId : entityIds)
+        {
+            bool wasReadOnly = m_readOnlystates[entityId];
+            QueryReadOnlyStateForEntity(entityId);
+
+            if (bool isReadOnly = m_readOnlystates[entityId]; wasReadOnly != isReadOnly)
+            {
+                ReadOnlyEntityPublicNotificationBus::Broadcast(
+                    &ReadOnlyEntityPublicNotificationBus::Events::OnReadOnlyEntityStatusChanged, entityId, isReadOnly);
+            }
+        }
+    }
+
+    void ReadOnlyEntitySystemComponent::RefreshReadOnlyStateForAllEntities()
+    {
+        for (auto elem : m_readOnlystates)
+        {
+            AZ::EntityId entityId = elem.first;
+            bool wasReadOnly = m_readOnlystates[entityId];
+            QueryReadOnlyStateForEntity(entityId);
+
+            if (bool isReadOnly = m_readOnlystates[entityId]; wasReadOnly != isReadOnly)
+            {
+                ReadOnlyEntityPublicNotificationBus::Broadcast(
+                    &ReadOnlyEntityPublicNotificationBus::Events::OnReadOnlyEntityStatusChanged, entityId, isReadOnly);
+            }
+        }
+    }
+
+    void ReadOnlyEntitySystemComponent::OnContextReset()
+    {
+        m_readOnlystates.clear();
+    }
+
+    void ReadOnlyEntitySystemComponent::QueryReadOnlyStateForEntity(const AZ::EntityId& entityId)
+    {
+        bool isReadOnly = false;
+
+        ReadOnlyEntityQueryRequestBus::Broadcast(
+            &ReadOnlyEntityQueryRequestBus::Events::IsReadOnly, entityId, isReadOnly);
+
+        m_readOnlystates[entityId] = isReadOnly;
+    }
+
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.h
new file mode 100644
index 0000000000..efc91e9d89
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/ReadOnly/ReadOnlyEntitySystemComponent.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/Component.h>
+#include <AzCore/Memory/SystemAllocator.h>
+
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h>
+
+namespace AzToolsFramework
+{
+    //! System Component to track read-only entity registration.
+    //! An entity registered as ReadOnly cannot be altered in the Editor.
+    class ReadOnlyEntitySystemComponent final
+        : public AZ::Component
+        , private ReadOnlyEntityPublicInterface
+        , private ReadOnlyEntityQueryInterface
+        , private EditorEntityContextNotificationBus::Handler
+    {
+    public:
+        AZ_COMPONENT(ReadOnlyEntitySystemComponent, "{B32EB03F-D88F-4B3A-9C16-071AF04DA646}");
+
+        ReadOnlyEntitySystemComponent() = default;
+        virtual ~ReadOnlyEntitySystemComponent() = default;
+
+        // AZ::Component overrides ...
+        void Activate() override;
+        void Deactivate() override;
+
+        static void Reflect(AZ::ReflectContext* context);
+        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
+
+        // ReadOnlyEntityPublicNotifications overrides ...
+        bool IsReadOnly(const AZ::EntityId& entityId) override;
+        
+        // ReadOnlyEntityQueryInterface overrides ...
+        void RefreshReadOnlyState(const EntityIdList& entityIds) override;
+        void RefreshReadOnlyStateForAllEntities() override;
+
+        // EditorEntityContextNotificationBus overrides ...
+        void OnContextReset() override;
+
+    private:
+        void QueryReadOnlyStateForEntity(const AZ::EntityId& entityId);
+
+        AZStd::unordered_map<AZ::EntityId, bool> m_readOnlystates;
+    };
+
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
similarity index 99%
rename from Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
rename to Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
index 7ee20997f9..07891188fd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <AzToolsFramework/Input/QtEventToAzInputManager.h>
+#include <AzToolsFramework/Input/QtEventToAzInputMapper.h>
 
 #include <AzCore/std/smart_ptr/make_shared.h>
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h
similarity index 100%
rename from Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.h
rename to Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
index 00f5b1ac47..0c3638412c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
@@ -84,12 +84,12 @@ namespace AzToolsFramework
             break;
         case State::Translating:
             {
-                if (mouseInteraction.m_mouseInteraction.m_mouseButtons.Left() &&
+                if (mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() &&
                     mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down &&
                     mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Shift() &&
                     mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl())
                 {
-                    SnapVerticesToTerrain(mouseInteraction);
+                    SnapVerticesToSurface(mouseInteraction);
                     return true;
                 }
 
@@ -109,29 +109,23 @@ namespace AzToolsFramework
     }
 
     template<typename Vertex>
-    void EditorVertexSelectionBase<Vertex>::SnapVerticesToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    void EditorVertexSelectionBase<Vertex>::SnapVerticesToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
         ScopedUndoBatch surfaceSnapUndo("Snap to Surface");
         ScopedUndoBatch::MarkEntityDirty(GetEntityId());
 
         const int viewportId = mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId;
-        // get unsnapped terrain position (world space)
-        AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero();
-        ;
-        ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            worldSurfacePosition, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
-            mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
+        // get unsnapped surface position (world space)
+        const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(
+            viewportId, mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates, EditorPickRayLength,
+            GetDefaultEntityPlacementDistance());
 
         AZ::Transform worldFromLocal;
         AZ::TransformBus::EventResult(worldFromLocal, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
         const AZ::Transform localFromWorld = worldFromLocal.GetInverse();
 
-        // convert to local space - snap if enabled
-        const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
-        const AZ::Vector3 localFinalSurfacePosition = gridSnapParams.m_gridSnap
-            ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocal, viewportId, gridSnapParams.m_gridSize)
-            : localFromWorld.TransformPoint(worldSurfacePosition);
-
+        // convert to local space
+        const AZ::Vector3 localFinalSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition);
         SetSelectedPosition(localFinalSurfacePosition);
 
         OnEntityComponentPropertyChanged(GetEntityComponentIdPair());
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
index 4894a00df6..7e5523f62a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h
@@ -171,7 +171,7 @@ namespace AzToolsFramework
         //! Snap the selected vertices to the terrain.
         //! Note: With a multi-selection the manipulator will be translated to the picked
         //! terrain position with all vertices moved relative to it.
-        void SnapVerticesToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
+        void SnapVerticesToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 
         //! The Actions provided by the EditorVertexSelection while it is active.
         //! e.g. Vertex deletion, duplication etc.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
index e4f6b3b1ea..5bea383630 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp
@@ -110,30 +110,6 @@ namespace AzToolsFramework
         return unsnappedPosition + CalculateSnappedOffset(unsnappedPosition, snapAxes, snapAxesCount, size);
     }
 
-    AZ::Vector3 CalculateSnappedTerrainPosition(
-        const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal, const int viewportId, const float size)
-    {
-        const AZ::Transform localFromWorld = worldFromLocal.GetInverse();
-        const AZ::Vector3 localSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition);
-
-        // snap in xy plane
-        AZ::Vector3 localSnappedSurfacePosition = localSurfacePosition +
-            CalculateSnappedOffset(localSurfacePosition, AZ::Vector3::CreateAxisX(), size) +
-            CalculateSnappedOffset(localSurfacePosition, AZ::Vector3::CreateAxisY(), size);
-
-        // find terrain height at xy snapped location
-        float terrainHeight = 0.0f;
-        ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            terrainHeight, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::TerrainHeight,
-            Vector3ToVector2(worldFromLocal.TransformPoint(localSnappedSurfacePosition)));
-
-        // set snapped z value to terrain height
-        AZ::Vector3 localTerrainHeight = localFromWorld.TransformPoint(AZ::Vector3(0.0f, 0.0f, terrainHeight));
-        localSnappedSurfacePosition.SetZ(localTerrainHeight.GetZ());
-
-        return localSnappedSurfacePosition;
-    }
-
     bool GridSnapping(const int viewportId)
     {
         bool snapping = false;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
index 660d38ac89..96f49d5276 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
@@ -63,11 +63,6 @@ namespace AzToolsFramework
     AZ::Vector3 CalculateSnappedPosition(
         const AZ::Vector3& unsnappedPosition, const AZ::Vector3* snapAxes, size_t snapAxesCount, float size);
 
-    //! For a given point on the terrain, calculate the closest xy position snapped to the grid
-    //! (z position is aligned to terrain height, not snapped to z grid)
-    AZ::Vector3 CalculateSnappedTerrainPosition(
-        const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal, int viewportId, float size);
-
     //! Wrapper for grid snapping and grid size bus calls.
     GridSnapParameters GridSnapSettings(int viewportId);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
index dd565eb0a8..01b8635406 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
@@ -10,6 +10,7 @@
 
 #include <AzToolsFramework/Manipulators/ManipulatorSnapping.h>
 #include <AzToolsFramework/Manipulators/ManipulatorView.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
 namespace AzToolsFramework
 {
@@ -17,28 +18,16 @@ namespace AzToolsFramework
         const AZ::Transform& worldFromLocal,
         const AZ::Vector3& worldSurfacePosition,
         const AZ::Vector3& localStartPosition,
-        const bool snapping,
-        const float gridSize,
-        const int viewportId)
+        [[maybe_unused]] const bool snapping,
+        [[maybe_unused]] const float gridSize,
+        [[maybe_unused]] const int viewportId)
     {
-        const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal);
-        const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse();
-
-        const AZ::Vector3 localFinalSurfacePosition = snapping
-            // note: gridSize is not scaled by scaleRecip here as localStartPosition is
-            // unscaled itself so the position returned by CalculateSnappedTerrainPosition
-            // must be in the same space (if localStartPosition were also scaled, gridSize
-            // would need to be multiplied by scaleRecip)
-            ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize)
-            : localFromWorldUniform.TransformPoint(worldSurfacePosition);
-
-        // delta/offset between initial vertex position and terrain pick position
-        const AZ::Vector3 localSurfaceOffset = localFinalSurfacePosition - localStartPosition;
+        const AZ::Transform localFromWorld = worldFromLocal.GetInverse();
 
         StartInternal startInternal;
-        startInternal.m_snapOffset = localSurfaceOffset;
-        startInternal.m_localPosition = localStartPosition + localSurfaceOffset;
-        startInternal.m_localHitPosition = localFromWorldUniform.TransformVector(worldSurfacePosition);
+        startInternal.m_snapOffset = AZ::Vector3::CreateZero();
+        startInternal.m_localPosition = localStartPosition;
+        startInternal.m_localHitPosition = localFromWorld.TransformPoint(worldSurfacePosition);
         return startInternal;
     }
 
@@ -46,26 +35,19 @@ namespace AzToolsFramework
         const StartInternal& startInternal,
         const AZ::Transform& worldFromLocal,
         const AZ::Vector3& worldSurfacePosition,
-        const bool snapping,
-        const float gridSize,
+        [[maybe_unused]] const bool snapping,
+        [[maybe_unused]] const float gridSize,
         const ViewportInteraction::KeyboardModifiers keyboardModifiers,
-        const int viewportId)
+        [[maybe_unused]] const int viewportId)
     {
-        const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal);
-        const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse();
-
-        const float scaleRecip = ScaleReciprocal(worldFromLocalUniform);
-
-        const AZ::Vector3 localFinalSurfacePosition = snapping
-            ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize * scaleRecip)
-            : localFromWorldUniform.TransformPoint(worldSurfacePosition);
+        const AZ::Transform localFromWorld = worldFromLocal.GetInverse();
+        const AZ::Vector3 localFinalSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition);
 
         Action action;
         action.m_start.m_localPosition = startInternal.m_localPosition;
-        action.m_start.m_snapOffset = startInternal.m_snapOffset;
+        action.m_start.m_snapOffset = AZ::Vector3::CreateZero();
         action.m_current.m_localOffset = localFinalSurfacePosition - startInternal.m_localPosition;
-        // record what modifier keys are held during this action
-        action.m_modifiers = keyboardModifiers;
+        action.m_modifiers = keyboardModifiers; // record what modifier keys are held during this action
         return action;
     }
 
@@ -78,12 +60,16 @@ namespace AzToolsFramework
     {
         SetSpace(worldFromLocal);
         AttachLeftMouseDownImpl();
+
+        // only cast rays against objects (entities/meshes etc.) we can actually see
+        m_rayRequest.m_onlyVisible = true;
     }
 
     void SurfaceManipulator::InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback)
     {
         m_onLeftMouseDownCallback = onMouseDownCallback;
     }
+
     void SurfaceManipulator::InstallLeftMouseUpCallback(const MouseActionCallback& onMouseUpCallback)
     {
         m_onLeftMouseUpCallback = onMouseUpCallback;
@@ -95,17 +81,30 @@ namespace AzToolsFramework
     }
 
     void SurfaceManipulator::OnLeftMouseDownImpl(
-        const ViewportInteraction::MouseInteraction& interaction, float /*rayIntersectionDistance*/)
+        const ViewportInteraction::MouseInteraction& interaction, [[maybe_unused]] float rayIntersectionDistance)
     {
         const AZ::Transform worldFromLocalUniformScale = TransformUniformScale(GetSpace());
 
-        const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
+        const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId;
 
-        AZ::Vector3 worldSurfacePosition;
-        ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            worldSurfacePosition, interaction.m_interactionId.m_viewportId,
-            &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
-            interaction.m_mousePick.m_screenCoordinates);
+        const auto& entityComponentIdPairs = EntityComponentIdPairs();
+        m_rayRequest.m_entityFilter.m_ignoreEntities.clear();
+        m_rayRequest.m_entityFilter.m_ignoreEntities.reserve(entityComponentIdPairs.size());
+        AZStd::transform(
+            entityComponentIdPairs.begin(), entityComponentIdPairs.end(),
+            AZStd::inserter(m_rayRequest.m_entityFilter.m_ignoreEntities, m_rayRequest.m_entityFilter.m_ignoreEntities.begin()),
+            [](const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+                return entityComponentIdPair.GetEntityId();
+            });
+
+        // calculate the start and end of the ray
+        RefreshRayRequest(
+            m_rayRequest, ViewportInteraction::ViewportScreenToWorldRay(viewportId, interaction.m_mousePick.m_screenCoordinates),
+            EditorPickRayLength);
+
+        const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
+        const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(m_rayRequest, GetDefaultEntityPlacementDistance());
 
         m_startInternal = CalculateManipulationDataStart(
             worldFromLocalUniformScale, worldSurfacePosition, GetLocalPosition(), gridSnapParams.m_gridSnap, gridSnapParams.m_gridSize,
@@ -123,17 +122,14 @@ namespace AzToolsFramework
     {
         if (m_onLeftMouseUpCallback)
         {
-            AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero();
-            ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-                worldSurfacePosition, interaction.m_interactionId.m_viewportId,
-                &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
-                interaction.m_mousePick.m_screenCoordinates);
+            const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId;
 
-            const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
+            const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
+            const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(m_rayRequest, GetDefaultEntityPlacementDistance());
 
             m_onLeftMouseUpCallback(CalculateManipulationDataAction(
                 m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition, gridSnapParams.m_gridSnap,
-                gridSnapParams.m_gridSize, interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId));
+                gridSnapParams.m_gridSize, interaction.m_keyboardModifiers, viewportId));
         }
     }
 
@@ -141,13 +137,15 @@ namespace AzToolsFramework
     {
         if (m_onMouseMoveCallback)
         {
-            AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero();
-            ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-                worldSurfacePosition, interaction.m_interactionId.m_viewportId,
-                &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
-                interaction.m_mousePick.m_screenCoordinates);
+            const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId;
 
-            const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId);
+            // update the start and end of the ray
+            RefreshRayRequest(
+                m_rayRequest, ViewportInteraction::ViewportScreenToWorldRay(viewportId, interaction.m_mousePick.m_screenCoordinates),
+                EditorPickRayLength);
+
+            const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
+            const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(m_rayRequest, GetDefaultEntityPlacementDistance());
 
             m_onMouseMoveCallback(CalculateManipulationDataAction(
                 m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition, gridSnapParams.m_gridSnap,
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
index c9121c49cc..091a71d8da 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
@@ -11,6 +11,7 @@
 #include "BaseManipulator.h"
 
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzFramework/Render/GeometryIntersectionStructures.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 namespace AzToolsFramework
@@ -58,10 +59,12 @@ namespace AzToolsFramework
             Start m_start;
             Current m_current;
             ViewportInteraction::KeyboardModifiers m_modifiers;
+
             AZ::Vector3 LocalPosition() const
             {
                 return m_start.m_localPosition + m_current.m_localOffset;
             }
+
             AZ::Vector3 LocalPositionOffset() const
             {
                 return m_current.m_localOffset;
@@ -106,6 +109,9 @@ namespace AzToolsFramework
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
         MouseActionCallback m_onMouseMoveCallback = nullptr;
 
+        //! Cached ray request initialized at mouse down and updated during mouse move.
+        AzFramework::RenderGeometry::RayRequest m_rayRequest;
+
         static StartInternal CalculateManipulationDataStart(
             const AZ::Transform& worldFromLocal,
             const AZ::Vector3& worldSurfacePosition,
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
index d5cf7a9144..ea1af5cccb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
@@ -20,6 +20,7 @@
 #include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/Template/Template.h>
+#include <AzToolsFramework/Prefab/PrefabPublicRequestBus.h>
 
 namespace AzToolsFramework
 {
@@ -244,10 +245,10 @@ namespace AzToolsFramework
                             selectedEntityIds.erase(entityIdIterator--);
                         }
                     }
-                    ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
 
-                    // Notify Propagation has ended
+                    // Notify Propagation has ended, then update selection (which is frozen during propagation, so this order matters)
                     PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationEnd);
+                    ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
                 }
 
                 m_updatingTemplateInstancesInQueue = false;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h
index 7cab24ad9f..89d1a046e5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h
@@ -28,6 +28,9 @@ namespace AzToolsFramework
             inline static const char* EntityIdName = "Id";
             inline static const char* EntitiesName = "Entities";
             inline static const char* ContainerEntityName = "ContainerEntity";
+            inline static const char* ComponentsName = "Components";
+            inline static const char* EntityOrderName = "Child Entity Order";
+            inline static const char* TypeName = "$type";
 
             /**
             * Find Prefab value from given parent value and target value's name.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
index 8098727177..2ab68bfc10 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
@@ -34,10 +34,12 @@ namespace AzToolsFramework::Prefab
         PrefabPublicNotificationBus::Handler::BusConnect();
         AZ::Interface<PrefabFocusInterface>::Register(this);
         AZ::Interface<PrefabFocusPublicInterface>::Register(this);
+        PrefabFocusPublicRequestBus::Handler::BusConnect();
     }
 
     PrefabFocusHandler::~PrefabFocusHandler()
     {
+        PrefabFocusPublicRequestBus::Handler::BusDisconnect();
         AZ::Interface<PrefabFocusPublicInterface>::Unregister(this);
         AZ::Interface<PrefabFocusInterface>::Unregister(this);
         PrefabPublicNotificationBus::Handler::BusDisconnect();
@@ -45,6 +47,18 @@ namespace AzToolsFramework::Prefab
         EditorEntityInfoNotificationBus::Handler::BusDisconnect();
     }
 
+    void PrefabFocusHandler::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context); behaviorContext)
+        {
+            behaviorContext->EBus<PrefabFocusPublicRequestBus>("PrefabFocusPublicRequestBus")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
+                ->Attribute(AZ::Script::Attributes::Category, "Prefab")
+                ->Attribute(AZ::Script::Attributes::Module, "prefab")
+                ->Event("FocusOnOwningPrefab", &PrefabFocusPublicInterface::FocusOnOwningPrefab);
+        }
+    }
+
     void PrefabFocusHandler::InitializeEditorInterfaces()
     {
         m_containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get();
@@ -98,7 +112,7 @@ namespace AzToolsFramework::Prefab
         }
 
         // Retrieve parent of currently focused prefab.
-        InstanceOptionalReference parentInstance = m_instanceFocusHierarchy[hierarchySize - 2];
+        InstanceOptionalReference parentInstance = GetReferenceFromContainerEntityId(m_instanceFocusHierarchy[hierarchySize - 2]);
 
         // Use container entity of parent Instance for focus operations.
         AZ::EntityId entityId = parentInstance->get().GetContainerEntityId();
@@ -132,7 +146,7 @@ namespace AzToolsFramework::Prefab
             return AZ::Failure(AZStd::string("Prefab Focus Handler: Invalid index on FocusOnPathIndex."));
         }
 
-        InstanceOptionalReference focusedInstance = m_instanceFocusHierarchy[index];
+        InstanceOptionalReference focusedInstance = GetReferenceFromContainerEntityId(m_instanceFocusHierarchy[index]);
 
         return FocusOnOwningPrefab(focusedInstance->get().GetContainerEntityId());
     }
@@ -172,23 +186,18 @@ namespace AzToolsFramework::Prefab
         // Close all container entities in the old path.
         CloseInstanceContainers(m_instanceFocusHierarchy);
 
-        m_focusedInstance = focusedInstance;
+        // Do not store the container for the root instance, use an invalid EntityId instead.
+        m_focusedInstanceContainerEntityId = focusedInstance->get().GetParentInstance().has_value() ? focusedInstance->get().GetContainerEntityId() : AZ::EntityId();
         m_focusedTemplateId = focusedInstance->get().GetTemplateId();
 
-        AZ::EntityId containerEntityId;
-
-        if (focusedInstance->get().GetParentInstance() != AZStd::nullopt)
-        {
-            containerEntityId = focusedInstance->get().GetContainerEntityId();
-        }
-        else
-        {
-            containerEntityId = AZ::EntityId();
-        }
-            
         // Focus on the descendants of the container entity in the Editor, if the interface is initialized.
         if (m_focusModeInterface)
         {
+            const AZ::EntityId containerEntityId =
+                (focusedInstance->get().GetParentInstance() != AZStd::nullopt)
+                ? focusedInstance->get().GetContainerEntityId()
+                : AZ::EntityId();
+
             m_focusModeInterface->SetFocusRoot(containerEntityId);
         }
 
@@ -212,56 +221,65 @@ namespace AzToolsFramework::Prefab
     InstanceOptionalReference PrefabFocusHandler::GetFocusedPrefabInstance(
         [[maybe_unused]] AzFramework::EntityContextId entityContextId) const
     {
-        return m_focusedInstance;
+        return GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId);
     }
 
     AZ::EntityId PrefabFocusHandler::GetFocusedPrefabContainerEntityId([[maybe_unused]] AzFramework::EntityContextId entityContextId) const
     {
-        if (!m_focusedInstance.has_value())
+        if (m_focusedInstanceContainerEntityId.IsValid())
         {
-            // PrefabFocusHandler has not been initialized yet.
-            return AZ::EntityId();
+            return m_focusedInstanceContainerEntityId;
         }
 
-        return m_focusedInstance->get().GetContainerEntityId();
+        if (auto instance = GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId); instance.has_value())
+        {
+            return instance->get().GetContainerEntityId();
+        }
+
+        return AZ::EntityId();
     }
 
     bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId) const
     {
-        if (!m_focusedInstance.has_value())
-        {
-            // PrefabFocusHandler has not been initialized yet.
-            return false;
-        }
-
         if (!entityId.IsValid())
         {
             return false;
         }
 
         InstanceOptionalReference instance = m_instanceEntityMapperInterface->FindOwningInstance(entityId);
+        if (!instance.has_value())
+        {
+            return false;
+        }
 
-        return instance.has_value() && (&instance->get() == &m_focusedInstance->get());
+        // If this is owned by the root instance, that corresponds to an invalid m_focusedInstanceContainerEntityId.
+        if (!instance->get().GetParentInstance().has_value())
+        {
+            return !m_focusedInstanceContainerEntityId.IsValid();
+        }
+
+        return (instance->get().GetContainerEntityId() == m_focusedInstanceContainerEntityId);
     }
 
     bool PrefabFocusHandler::IsOwningPrefabInFocusHierarchy(AZ::EntityId entityId) const
     {
-        if (!m_focusedInstance.has_value())
-        {
-            // PrefabFocusHandler has not been initialized yet.
-            return false;
-        }
-
         if (!entityId.IsValid())
         {
             return false;
         }
 
+        // If the focus is on the root, m_focusedInstanceContainerEntityId will be the invalid id.
+        // In those case all entities are in the focus hierarchy and should return true.
+        if (!m_focusedInstanceContainerEntityId.IsValid())
+        {
+            return true;
+        }
+
         InstanceOptionalReference instance = m_instanceEntityMapperInterface->FindOwningInstance(entityId);
 
         while (instance.has_value())
         {
-            if (&instance->get() == &m_focusedInstance->get())
+            if (instance->get().GetContainerEntityId() == m_focusedInstanceContainerEntityId)
             {
                 return true;
             }
@@ -296,8 +314,9 @@ namespace AzToolsFramework::Prefab
         // Determine if the entityId is the container for any of the instances in the vector.
         auto result = AZStd::find_if(
             m_instanceFocusHierarchy.begin(), m_instanceFocusHierarchy.end(),
-            [entityId](const InstanceOptionalReference& instance)
+            [&, entityId](const AZ::EntityId& containerEntityId)
             {
+                InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
                 return (instance->get().GetContainerEntityId() == entityId);
             }
         );
@@ -322,8 +341,9 @@ namespace AzToolsFramework::Prefab
         // Determine if the templateId matches any of the instances in the vector.
         auto result = AZStd::find_if(
             m_instanceFocusHierarchy.begin(), m_instanceFocusHierarchy.end(),
-            [templateId](const InstanceOptionalReference& instance)
+            [&, templateId](const AZ::EntityId& containerEntityId)
             {
+                InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
                 return (instance->get().GetTemplateId() == templateId);
             }
         );
@@ -342,10 +362,17 @@ namespace AzToolsFramework::Prefab
 
         AZStd::list<InstanceOptionalReference> instanceFocusList;
 
-        InstanceOptionalReference currentInstance = m_focusedInstance;
+        InstanceOptionalReference currentInstance = GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId);
         while (currentInstance.has_value())
         {
-            m_instanceFocusHierarchy.emplace_back(currentInstance);
+            if (currentInstance->get().GetParentInstance().has_value())
+            {
+                m_instanceFocusHierarchy.emplace_back(currentInstance->get().GetContainerEntityId());
+            }
+            else
+            {
+                m_instanceFocusHierarchy.emplace_back(AZ::EntityId());
+            }
 
             currentInstance = currentInstance->get().GetParentInstance();
         }
@@ -363,42 +390,48 @@ namespace AzToolsFramework::Prefab
         size_t index = 0;
         size_t maxIndex = m_instanceFocusHierarchy.size() - 1;
 
-        for (const InstanceOptionalReference& instance : m_instanceFocusHierarchy)
+        for (const AZ::EntityId& containerEntityId : m_instanceFocusHierarchy)
         {
-            AZStd::string prefabName;
-
-            if (index < maxIndex)
+            InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
+            if (instance.has_value())
             {
-                // Get the filename without the extension (stem).
-                prefabName = instance->get().GetTemplateSourcePath().Stem().Native();
-            }
-            else
-            {
-                // Get the full filename.
-                prefabName = instance->get().GetTemplateSourcePath().Filename().Native();
-            }
+                AZStd::string prefabName;
 
-            if (prefabSystemComponentInterface->IsTemplateDirty(instance->get().GetTemplateId()))
-            {
-                prefabName += "*";
-            }
+                if (index < maxIndex)
+                {
+                    // Get the filename without the extension (stem).
+                    prefabName = instance->get().GetTemplateSourcePath().Stem().Native();
+                }
+                else
+                {
+                    // Get the full filename.
+                    prefabName = instance->get().GetTemplateSourcePath().Filename().Native();
+                }
 
-            m_instanceFocusPath.Append(prefabName);
+                if (prefabSystemComponentInterface->IsTemplateDirty(instance->get().GetTemplateId()))
+                {
+                    prefabName += "*";
+                }
+
+                m_instanceFocusPath.Append(prefabName);
+            }
 
             ++index;
         }
     }
 
-    void PrefabFocusHandler::OpenInstanceContainers(const AZStd::vector<InstanceOptionalReference>& instances) const
+    void PrefabFocusHandler::OpenInstanceContainers(const AZStd::vector<AZ::EntityId>& instances) const
     {
         // If this is called outside the Editor, this interface won't be initialized.
         if (!m_containerEntityInterface)
         {
             return;
         }
-
-        for (const InstanceOptionalReference& instance : instances)
+        
+        for (const AZ::EntityId& containerEntityId : instances)
         {
+            InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
+
             if (instance.has_value())
             {
                 m_containerEntityInterface->SetContainerOpen(instance->get().GetContainerEntityId(), true);
@@ -406,7 +439,7 @@ namespace AzToolsFramework::Prefab
         }
     }
 
-    void PrefabFocusHandler::CloseInstanceContainers(const AZStd::vector<InstanceOptionalReference>& instances) const
+    void PrefabFocusHandler::CloseInstanceContainers(const AZStd::vector<AZ::EntityId>& instances) const
     {
         // If this is called outside the Editor, this interface won't be initialized.
         if (!m_containerEntityInterface)
@@ -414,8 +447,10 @@ namespace AzToolsFramework::Prefab
             return;
         }
 
-        for (const InstanceOptionalReference& instance : instances)
+        for (const AZ::EntityId& containerEntityId : instances)
         {
+            InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId);
+
             if (instance.has_value())
             {
                 m_containerEntityInterface->SetContainerOpen(instance->get().GetContainerEntityId(), false);
@@ -423,4 +458,22 @@ namespace AzToolsFramework::Prefab
         }
     }
 
+    InstanceOptionalReference PrefabFocusHandler::GetReferenceFromContainerEntityId(AZ::EntityId containerEntityId) const
+    {
+        if (!containerEntityId.IsValid())
+        {
+            PrefabEditorEntityOwnershipInterface* prefabEditorEntityOwnershipInterface =
+                AZ::Interface<PrefabEditorEntityOwnershipInterface>::Get();
+
+            if (!prefabEditorEntityOwnershipInterface)
+            {
+                return AZStd::nullopt;
+            }
+
+            return prefabEditorEntityOwnershipInterface->GetRootPrefabInstance();
+        }
+
+        return m_instanceEntityMapperInterface->FindOwningInstance(containerEntityId);
+    }
+
 } // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
index 75b9666389..b02106d69d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
@@ -30,8 +30,8 @@ namespace AzToolsFramework::Prefab
 
     //! Handles Prefab Focus mode, determining which prefab file entity changes will target.
     class PrefabFocusHandler final
-        : private PrefabFocusInterface
-        , private PrefabFocusPublicInterface
+        : public PrefabFocusPublicRequestBus::Handler
+        , private PrefabFocusInterface
         , private PrefabPublicNotificationBus::Handler
         , private EditorEntityContextNotificationBus::Handler
         , private EditorEntityInfoNotificationBus::Handler
@@ -42,13 +42,15 @@ namespace AzToolsFramework::Prefab
         PrefabFocusHandler();
         ~PrefabFocusHandler();
 
+        static void Reflect(AZ::ReflectContext* context);
+
         // PrefabFocusInterface overrides ...
         void InitializeEditorInterfaces() override;
         PrefabFocusOperationResult FocusOnPrefabInstanceOwningEntityId(AZ::EntityId entityId) override;
         TemplateId GetFocusedPrefabTemplateId(AzFramework::EntityContextId entityContextId) const override;
         InstanceOptionalReference GetFocusedPrefabInstance(AzFramework::EntityContextId entityContextId) const override;
 
-        // PrefabFocusPublicInterface overrides ...
+        // PrefabFocusPublicInterface and PrefabFocusPublicRequestBus overrides ...
         PrefabFocusOperationResult FocusOnOwningPrefab(AZ::EntityId entityId) override;
         PrefabFocusOperationResult FocusOnParentOfFocusedPrefab(AzFramework::EntityContextId entityContextId) override;
         PrefabFocusOperationResult FocusOnPathIndex(AzFramework::EntityContextId entityContextId, int index) override;
@@ -73,16 +75,19 @@ namespace AzToolsFramework::Prefab
         void RefreshInstanceFocusList();
         void RefreshInstanceFocusPath();
 
-        void OpenInstanceContainers(const AZStd::vector<InstanceOptionalReference>& instances) const;
-        void CloseInstanceContainers(const AZStd::vector<InstanceOptionalReference>& instances) const;
+        void OpenInstanceContainers(const AZStd::vector<AZ::EntityId>& instances) const;
+        void CloseInstanceContainers(const AZStd::vector<AZ::EntityId>& instances) const;
 
-        //! The instance the editor is currently focusing on.
-        InstanceOptionalReference m_focusedInstance;
+        InstanceOptionalReference GetReferenceFromContainerEntityId(AZ::EntityId containerEntityId) const;
+
+        //! The EntityId of the prefab container entity for the instance the editor is currently focusing on.
+        AZ::EntityId m_focusedInstanceContainerEntityId = AZ::EntityId();
         //! The templateId of the focused instance.
         TemplateId m_focusedTemplateId;
-        //! The list of instances going from the root (index 0) to the focused instance.
-        AZStd::vector<InstanceOptionalReference> m_instanceFocusHierarchy;
-        //! A path containing the names of the containers in the instance focus hierarchy, separated with a /.
+        //! The list of instances going from the root (index 0) to the focused instance,
+        //! referenced by their prefab container's EntityId.
+        AZStd::vector<AZ::EntityId> m_instanceFocusHierarchy;
+        //! A path containing the filenames of the instances in the focus hierarchy, separated with a /.
         AZ::IO::Path m_instanceFocusPath;
 
         ContainerEntityInterface* m_containerEntityInterface = nullptr;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h
index 2fc9ef6b9a..2c0e95f1cc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h
@@ -58,4 +58,18 @@ namespace AzToolsFramework::Prefab
         virtual const int GetPrefabFocusPathLength(AzFramework::EntityContextId entityContextId) const = 0;
     };
 
+    /**
+     * The primary purpose of this bus is to facilitate writing automated tests for prefab focus mode.
+     * If you would like to integrate prefabs focus mode into your system, please call PrefabFocusPublicInterface
+     * for better performance.
+     */
+    class PrefabFocusPublicRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
+    };
+
+    using PrefabFocusPublicRequestBus = AZ::EBus<PrefabFocusPublicInterface, PrefabFocusPublicRequests>;
+
 } // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 4d826d9700..e5530b49f4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -9,6 +9,7 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/JSON/stringbuffer.h>
 #include <AzCore/JSON/writer.h>
+#include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/Utils/TypeHash.h>
 
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
@@ -29,6 +30,7 @@
 #include <AzToolsFramework/Prefab/PrefabUndo.h>
 #include <AzToolsFramework/Prefab/PrefabUndoHelpers.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+#include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
 
 #include <QString>
 
@@ -519,21 +521,18 @@ namespace AzToolsFramework
                 nestedInstanceLink.has_value(),
                 "A valid link was not found for one of the instances provided as input for the CreatePrefab operation.");    
 
-            PrefabDomReference nestedInstanceLinkDom = nestedInstanceLink->get().GetLinkDom();
-            AZ_Assert(
-                nestedInstanceLinkDom.has_value(),
-                "A valid DOM was not found for the link corresponding to one of the instances provided as input for the "
-                "CreatePrefab operation.");
-
-            PrefabDomValueReference nestedInstanceLinkPatches =
-                PrefabDomUtils::FindPrefabDomValue(nestedInstanceLinkDom->get(), PrefabDomUtils::PatchesName);
-            AZ_Assert(
-                nestedInstanceLinkPatches.has_value(),
-                "A valid DOM for patches was not found for the link corresponding to one of the instances provided as input for the "
-                "CreatePrefab operation.");
-
             PrefabDom patchesCopyForUndoSupport;
-            patchesCopyForUndoSupport.CopyFrom(nestedInstanceLinkPatches->get(), patchesCopyForUndoSupport.GetAllocator());
+            PrefabDomReference nestedInstanceLinkDom = nestedInstanceLink->get().GetLinkDom();
+            if (nestedInstanceLinkDom.has_value())
+            {
+                PrefabDomValueReference nestedInstanceLinkPatches =
+                    PrefabDomUtils::FindPrefabDomValue(nestedInstanceLinkDom->get(), PrefabDomUtils::PatchesName);
+                if (nestedInstanceLinkPatches.has_value())
+                {
+                    patchesCopyForUndoSupport.CopyFrom(nestedInstanceLinkPatches->get(), patchesCopyForUndoSupport.GetAllocator());
+                }
+            }
+
             PrefabUndoHelpers::RemoveLink(
                 sourceInstance->GetTemplateId(), targetTemplateId, sourceInstance->GetInstanceAlias(), sourceInstance->GetLinkId(),
                 AZStd::move(patchesCopyForUndoSupport), undoBatch);
@@ -595,8 +594,41 @@ namespace AzToolsFramework
             
             Instance& entityOwningInstance = owningInstanceOfParentEntity->get();
 
+            // Get the template for our owning instance from the root prefab DOM and use that to generate our patch
+            AZStd::vector<InstanceOptionalConstReference> pathOfInstances;
+
+            InstanceOptionalReference rootInstance = owningInstanceOfParentEntity;
+            while (rootInstance->get().GetParentInstance() != AZStd::nullopt)
+            {
+                pathOfInstances.emplace_back(rootInstance);
+                rootInstance = rootInstance->get().GetParentInstance();
+            }
+
+            AZStd::string aliasPathResult = "";
+            for (auto instanceIter = pathOfInstances.rbegin(); instanceIter != pathOfInstances.rend(); ++instanceIter)
+            {
+                aliasPathResult.append("/Instances/");
+                aliasPathResult.append((*instanceIter)->get().GetInstanceAlias());
+            }
+
+            PrefabDomPath rootPrefabDomPath(aliasPathResult.c_str());
+
+            PrefabDom& rootPrefabTemplateDom = m_prefabSystemComponentInterface->FindTemplateDom(rootInstance->get().GetTemplateId());
+
+            auto instanceDomFromRootValue = rootPrefabDomPath.Get(rootPrefabTemplateDom);
+            if (!instanceDomFromRootValue)
+            {
+                return AZ::Failure<AZStd::string>("Could not load Instance DOM from the top level ancestor's DOM.");
+            }
+
+            PrefabDomValueReference instanceDomFromRoot = *instanceDomFromRootValue;
+            if (!instanceDomFromRoot.has_value())
+            {
+                return AZ::Failure<AZStd::string>("Could not load Instance DOM from the top level ancestor's DOM.");
+            }
+
             PrefabDom instanceDomBeforeUpdate;
-            m_instanceToTemplateInterface->GenerateDomForInstance(instanceDomBeforeUpdate, entityOwningInstance);
+            instanceDomBeforeUpdate.CopyFrom(instanceDomFromRoot.value().get(), instanceDomBeforeUpdate.GetAllocator());
 
             ScopedUndoBatch undoBatch("Add Entity");
 
@@ -674,6 +706,9 @@ namespace AzToolsFramework
                 bool isInstanceContainerEntity = IsInstanceContainerEntity(entityId) && !IsLevelInstanceContainerEntity(entityId);
                 bool isNewParentOwnedByDifferentInstance = false;
 
+                bool isInFocusTree = m_prefabFocusPublicInterface->IsOwningPrefabInFocusHierarchy(entityId);
+                bool isOwnedByFocusedPrefabInstance = m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId);
+
                 if (beforeParentId != afterParentId)
                 {
                     // If the entity parent changed, verify if the owning instance changed too
@@ -727,7 +762,7 @@ namespace AzToolsFramework
                     }
                 }
 
-                if (isInstanceContainerEntity)
+                if (isInFocusTree && !isOwnedByFocusedPrefabInstance)
                 {
                     if (isNewParentOwnedByDifferentInstance)
                     {
@@ -1144,6 +1179,10 @@ namespace AzToolsFramework
 
             AZ::EntityId firstEntityIdToDelete = entityIdsNoFocusContainer[0];
             InstanceOptionalReference commonOwningInstance = GetOwnerInstanceByEntityId(firstEntityIdToDelete);
+            if (!commonOwningInstance.has_value())
+            {
+                return AZ::Failure(AZStd::string("Cannot delete entities belonging to an invalid instance"));
+            }
 
             // If the first entity id is a container entity id, then we need to mark its parent as the common owning instance because you
             // cannot delete an instance from itself.
@@ -1644,6 +1683,144 @@ namespace AzToolsFramework
             return true;
         }
 
+        void PrefabPublicHandler::AddNewEntityToSortOrder(
+            Instance& owningInstance,
+            PrefabDom& domToAddEntityUnder,
+            const EntityAlias& parentEntityAlias,
+            const EntityAlias& entityToAddAlias)
+        {
+            // Find the parent entity to get its sort order component
+            auto findParentEntity = [&]() -> rapidjson::Value*
+            {
+                if (auto containerEntityIter = domToAddEntityUnder.FindMember(PrefabDomUtils::ContainerEntityName);
+                    containerEntityIter != domToAddEntityUnder.MemberEnd())
+                {
+                    if (parentEntityAlias == containerEntityIter->value[PrefabDomUtils::EntityIdName].GetString())
+                    {
+                        return &containerEntityIter->value;
+                    }
+                }
+
+                if (auto entitiesIter = domToAddEntityUnder.FindMember(PrefabDomUtils::EntitiesName);
+                    entitiesIter != domToAddEntityUnder.MemberEnd())
+                {
+                    for (auto entityIter = entitiesIter->value.MemberBegin(); entityIter != entitiesIter->value.MemberEnd(); ++entityIter)
+                    {
+                        if (parentEntityAlias == entityIter->value[PrefabDomUtils::EntityIdName].GetString())
+                        {
+                            return &entityIter->value;
+                        }
+                    }
+                }
+
+                return nullptr;
+            };
+
+            rapidjson::Value* parentEntityValue = findParentEntity();
+            if (parentEntityValue == nullptr)
+            {
+                return;
+            }
+
+            // Get the list of selected entities, we'll insert our duplicated entities after the last selected
+            // sibling in their parent's list, e.g. for:
+            // - Entity1
+            // - Entity2 (selected)
+            // - Entity3
+            // - Entity4 (selected)
+            // - Entity5
+            // Our duplicate selection command would create duplicate Entity2 and Entity4 and insert them after Entity4:
+            // - Entity1
+            // - Entity2
+            // - Entity3
+            // - Entity4
+            // - Entity2 (new, selected after duplicate)
+            // - Entity4 (new, selected after duplicate)
+            // - Entity5
+            AzToolsFramework::EntityIdList selectedEntities;
+            AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+                selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+
+            // Find the EditorEntitySortComponent DOM
+            auto componentsIter = parentEntityValue->FindMember(PrefabDomUtils::ComponentsName);
+            if (componentsIter == parentEntityValue->MemberEnd())
+            {
+                return;
+            }
+
+            for (auto componentIter = componentsIter->value.MemberBegin(); componentIter != componentIter->value.MemberEnd();
+                 ++componentIter)
+            {
+                // Check the component type
+                auto typeFieldIter = componentIter->value.FindMember(PrefabDomUtils::TypeName);
+                if (typeFieldIter == componentIter->value.MemberEnd())
+                {
+                    continue;
+                }
+
+                AZ::JsonDeserializerSettings jsonDeserializerSettings;
+                AZ::Uuid typeId = AZ::Uuid::CreateNull();
+                AZ::JsonSerialization::LoadTypeId(typeId, typeFieldIter->value);
+
+                if (typeId != azrtti_typeid<Components::EditorEntitySortComponent>())
+                {
+                    continue;
+                }
+
+                // Check for the entity order field
+                auto orderMembersIter = componentIter->value.FindMember(PrefabDomUtils::EntityOrderName);
+                if (orderMembersIter == componentIter->value.MemberEnd() || !orderMembersIter->value.IsArray())
+                {
+                    continue;
+                }
+
+                // Scan for the last selected entity in the list (if any) to determine where to add our entries
+                rapidjson::Value newOrder(rapidjson::kArrayType);
+                auto insertValuesAfter = orderMembersIter->value.End();
+                for (auto orderMemberIter = orderMembersIter->value.Begin(); orderMemberIter != orderMembersIter->value.End();
+                     ++orderMemberIter)
+                {
+                    if (!orderMemberIter->IsString())
+                    {
+                        continue;
+                    }
+                    const char* value = orderMemberIter->GetString();
+                    for (AZ::EntityId selectedEntity : selectedEntities)
+                    {
+                        auto alias = owningInstance.GetEntityAlias(selectedEntity);
+                        if (alias.has_value() && alias.value().get() == value)
+                        {
+                            insertValuesAfter = orderMemberIter;
+                            break;
+                        }
+                    }
+                }
+
+                // Construct our new array with the new order - insertion may happen at end, so check for that in the loop itself
+                for (auto orderMemberIter = orderMembersIter->value.Begin();; ++orderMemberIter)
+                {
+                    if (orderMemberIter != orderMembersIter->value.End())
+                    {
+                        newOrder.PushBack(orderMemberIter->Move(), domToAddEntityUnder.GetAllocator());
+                    }
+                    if (orderMemberIter == insertValuesAfter)
+                    {
+                        newOrder.PushBack(
+                            rapidjson::Value(entityToAddAlias.c_str(), domToAddEntityUnder.GetAllocator()),
+                            domToAddEntityUnder.GetAllocator());
+                    }
+                    if (orderMemberIter == orderMembersIter->value.End())
+                    {
+                        break;
+                    }
+                }
+
+                // Replace the order with our newly constructed one
+                orderMembersIter->value.Swap(newOrder);
+                break;
+            }
+        }
+
         void PrefabPublicHandler::DuplicateNestedEntitiesInInstance(Instance& commonOwningInstance,
             const AZStd::vector<AZ::Entity*>& entities, PrefabDom& domToAddDuplicatedEntitiesUnder,
             EntityIdList& duplicatedEntityIds, AZStd::unordered_map<EntityAlias, EntityAlias>& oldAliasToNewAliasMap)
@@ -1701,6 +1878,73 @@ namespace AzToolsFramework
                 PrefabDom entityDomAfter(&domToAddDuplicatedEntitiesUnder.GetAllocator());
                 entityDomAfter.Parse(newEntityDomString.toUtf8().constData());
 
+                EntityAlias parentEntityAlias;
+                if (auto componentsIter = entityDomAfter.FindMember(PrefabDomUtils::ComponentsName);
+                    componentsIter != entityDomAfter.MemberEnd())
+                {
+                    auto checkComponent = [&](const rapidjson::Value& value) -> bool
+                    {
+                        if (!value.IsObject())
+                        {
+                            return false;
+                        }
+
+                        // Check the component type
+                        auto typeFieldIter = value.FindMember(PrefabDomUtils::TypeName);
+                        if (typeFieldIter == value.MemberEnd())
+                        {
+                            return false;
+                        }
+
+                        AZ::JsonDeserializerSettings jsonDeserializerSettings;
+                        AZ::Uuid typeId = AZ::Uuid::CreateNull();
+                        AZ::JsonSerialization::LoadTypeId(typeId, typeFieldIter->value);
+
+                        // Prefabs get serialized with the Editor transform component type, check for that
+                        if (typeId != azrtti_typeid<Components::TransformComponent>())
+                        {
+                            return false;
+                        }
+
+                        if (auto parentEntityIter = value.FindMember("Parent Entity");
+                            parentEntityIter != value.MemberEnd())
+                        {
+                            parentEntityAlias = parentEntityIter->value.GetString();
+                            return true;
+                        }
+                        return false;
+                    };
+
+                    if (componentsIter->value.IsObject())
+                    {
+                        for (auto componentIter = componentsIter->value.MemberBegin(); componentIter != componentsIter->value.MemberEnd();
+                             ++componentIter)
+                        {
+                            if (checkComponent(componentIter->value))
+                            {
+                                break;
+                            }
+                        }
+                    }
+                    else if (componentsIter->value.IsArray())
+                    {
+                        for (auto componentIter = componentsIter->value.Begin(); componentIter != componentsIter->value.End();
+                             ++componentIter)
+                        {
+                            if (checkComponent(*componentIter))
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // Insert our entity into its parent's sort order
+                if (!parentEntityAlias.empty())
+                {
+                    AddNewEntityToSortOrder(commonOwningInstance, domToAddDuplicatedEntitiesUnder, parentEntityAlias, newEntityAlias);
+                }
+
                 // Add the new Entity DOM to the Entities member of the instance
                 rapidjson::Value aliasName(newEntityAlias.c_str(), static_cast<rapidjson::SizeType>(newEntityAlias.length()), domToAddDuplicatedEntitiesUnder.GetAllocator());
                 entitiesIter->value.AddMember(AZStd::move(aliasName), entityDomAfter, domToAddDuplicatedEntitiesUnder.GetAllocator());
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
index 4961be9d77..dd071ac09f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
@@ -78,6 +78,8 @@ namespace AzToolsFramework
 
             InstanceOptionalReference GetOwnerInstanceByEntityId(AZ::EntityId entityId) const;
             bool EntitiesBelongToSameInstance(const EntityIdList& entityIds) const;
+            void AddNewEntityToSortOrder(Instance& owningInstance, PrefabDom& domToAddEntityUnder,
+                const EntityAlias& parentEntityAlias, const EntityAlias& entityToAddAlias);
 
             /**
              * Duplicate a list of entities owned by a common owning instance by directly
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
index 62d7a6ac1d..ed16606413 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
@@ -60,6 +60,7 @@ namespace AzToolsFramework
             AzToolsFramework::Prefab::PrefabConversionUtils::PrefabCatchmentProcessor::Reflect(context);
             AzToolsFramework::Prefab::PrefabConversionUtils::EditorInfoRemover::Reflect(context);
             PrefabPublicRequestHandler::Reflect(context);
+            PrefabFocusHandler::Reflect(context);
             PrefabLoader::Reflect(context);
             PrefabSystemScriptingHandler::Reflect(context);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
index 655fd27a0f..c2636d6d52 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp
@@ -6,10 +6,10 @@
  *
  */
 
-#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzToolsFramework/Thumbnails/SourceControlThumbnail.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-#include <AzFramework/API/ApplicationAPI.h>
 
 namespace AzToolsFramework
 {
@@ -68,12 +68,12 @@ namespace AzToolsFramework
         SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key)
             : Thumbnail(key)
         {
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            AZ_Assert(engineRoot, "Engine Root not initialized");
+            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
+            AZ_Assert(!engineRoot.empty(), "Engine Root not initialized");
+
+            m_writableIconPath = (engineRoot / WRITABLE_ICON_PATH).String();
+            m_nonWritableIconPath = (engineRoot / NONWRITABLE_ICON_PATH).String();
 
-            AzFramework::StringFunc::Path::Join(engineRoot, WRITABLE_ICON_PATH, m_writableIconPath);
-            AzFramework::StringFunc::Path::Join(engineRoot, NONWRITABLE_ICON_PATH, m_nonWritableIconPath);
 
             BusConnect();
         }
@@ -90,8 +90,8 @@ namespace AzToolsFramework
             AZ_Assert(sourceControlKey, "Incorrect key type, excpected SourceControlThumbnailKey");
 
             AZStd::string myFileName(sourceControlKey->GetFileName());
-            AzFramework::StringFunc::Path::Normalize(myFileName);
-            if (AzFramework::StringFunc::Equal(myFileName.c_str(), filename))
+            AZ::StringFunc::Path::Normalize(myFileName);
+            if (AZ::StringFunc::Equal(myFileName.c_str(), filename))
             {
                 Update();
             }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp
index a9af59f3a8..138f99dc6e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp
@@ -23,7 +23,6 @@ namespace AzToolsFramework
         // save 2k at a time :( need a better way to do this.
         AZStd::size_t pos = 0;
         AZStd::size_t remaining = m_windowState.size();
-        AZ::u8* charData = (AZ::u8*)windowState.begin();
 
         while (remaining > 0)
         {
@@ -31,7 +30,6 @@ namespace AzToolsFramework
             m_serializableWindowState.push_back();
             m_serializableWindowState.back().assign((AZ::u8*)windowState.begin() + pos, (AZ::u8*)windowState.begin() + pos + bytes_this_gulp);
             pos += bytes_this_gulp;
-            charData += bytes_this_gulp;
             remaining -= bytes_this_gulp;
         }
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
index 98e06b77f3..26234f47e2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
@@ -362,23 +362,11 @@ namespace AzToolsFramework
         // Tick the component app.
         AZ::ComponentApplication* pApp = nullptr;
         EBUS_EVENT_RESULT(pApp, AZ::ComponentApplicationBus, GetApplication);
-        if (pApp)
+        if (pApp && m_ptrTicker)
         {
-            AZStd::chrono::system_clock::time_point now = AZStd::chrono::system_clock::now();
-            static AZStd::chrono::system_clock::time_point lastUpdate = now;
-
-            AZStd::chrono::duration<float> delta = now - lastUpdate;
-            float deltaTime = delta.count();
-
-            lastUpdate = now;
-
-            if (m_ptrTicker)
-            {
-                AZ::SystemTickBus::ExecuteQueuedEvents();
-                AZ::SystemTickBus::Broadcast(&AZ::SystemTickEvents::OnSystemTick);
-                pApp->Tick(deltaTime);
-            }
-
+            AZ::SystemTickBus::ExecuteQueuedEvents();
+            AZ::SystemTickBus::Broadcast(&AZ::SystemTickEvents::OnSystemTick);
+            pApp->Tick();
         }
 
         m_bTicking = false;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp
index 920e99665d..c1fc9138d1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp
@@ -64,6 +64,9 @@ namespace AzToolsFramework::Prefab
         );
 
         m_backButton->setToolTip("Up one level (-)");
+
+        // Currently hide this button until we can correctly disable/enable it based on context.
+        m_backButton->hide();
     }
 
     void PrefabViewportFocusPathHandler::OnPrefabFocusChanged()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
index 9ffe8021e3..fa419d5f14 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
@@ -45,6 +45,7 @@ AZ_POP_DISABLE_WARNING
 #include <AzToolsFramework/AssetBrowser/EBusFindAssetTypeByName.h>
 #include <AzToolsFramework/ComponentMode/ComponentModeDelegate.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/Slice/SliceDataFlagsCommand.h>
 #include <AzToolsFramework/Slice/SliceMetadataEntityContextBus.h>
@@ -606,6 +607,7 @@ namespace AzToolsFramework
 
         AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(
             AzToolsFramework::GetEntityContextId());
+        ViewportEditorModeNotificationsBus::Handler::BusConnect(GetEntityContextId());
     }
 
     EntityPropertyEditor::~EntityPropertyEditor()
@@ -618,7 +620,8 @@ namespace AzToolsFramework
         AZ::EntitySystemBus::Handler::BusDisconnect();
         EditorEntityContextNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
-
+        ViewportEditorModeNotificationsBus::Handler::BusDisconnect();
+        
         for (auto& entityId : m_overrideSelectedEntityIds)
         {
             DisconnectFromEntityBuses(entityId);
@@ -892,25 +895,51 @@ namespace AzToolsFramework
     {
         if (!m_prefabsAreEnabled)
         {
-            return m_isLevelEntityEditor ? InspectorLayout::LEVEL : InspectorLayout::ENTITY;
+            return m_isLevelEntityEditor ? InspectorLayout::Level : InspectorLayout::Entity;
         }
 
+        // Prefabs layout logic
+
+        // If this is the container entity for the root instance, treat it like a level entity.
         AZ::EntityId levelContainerEntityId = m_prefabPublicInterface->GetLevelInstanceContainerEntityId();
         if (AZStd::find(m_selectedEntityIds.begin(), m_selectedEntityIds.end(), levelContainerEntityId) != m_selectedEntityIds.end())
         {
             if (m_selectedEntityIds.size() > 1)
             {
-                return InspectorLayout::INVALID;
+                return InspectorLayout::Invalid;
             }
             else
             {
-                return InspectorLayout::LEVEL;
+                return InspectorLayout::Level;
             }
         }
         else
         {
-            return InspectorLayout::ENTITY;
+            // If this is the container entity for the currently focused prefab, utilize a separate layout.
+            if (auto prefabFocusPublicInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabFocusPublicInterface>::Get())
+            {
+                AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+                EditorEntityContextRequestBus::BroadcastResult(
+                    editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+                AZ::EntityId focusedPrefabContainerEntityId =
+                    prefabFocusPublicInterface->GetFocusedPrefabContainerEntityId(editorEntityContextId);
+                if (AZStd::find(m_selectedEntityIds.begin(), m_selectedEntityIds.end(), focusedPrefabContainerEntityId) !=
+                    m_selectedEntityIds.end())
+                {
+                    if (m_selectedEntityIds.size() > 1)
+                    {
+                        return InspectorLayout::Invalid;
+                    }
+                    else
+                    {
+                        return InspectorLayout::ContainerEntityOfFocusedPrefab;
+                    }
+                }
+            }
         }
+
+        return InspectorLayout::Entity;
     }
 
     void EntityPropertyEditor::UpdateEntityDisplay()
@@ -919,7 +948,7 @@ namespace AzToolsFramework
 
         InspectorLayout layout = GetCurrentInspectorLayout();
 
-        if (layout == InspectorLayout::LEVEL)
+        if (!m_prefabsAreEnabled && layout == InspectorLayout::Level)
         {
             AZStd::string levelName;
             AzToolsFramework::EditorRequestBus::BroadcastResult(levelName, &AzToolsFramework::EditorRequests::GetLevelName);
@@ -961,14 +990,19 @@ namespace AzToolsFramework
 
         InspectorLayout layout = GetCurrentInspectorLayout();
 
-        if (layout == InspectorLayout::LEVEL)
+        if (layout == InspectorLayout::Level)
         {
             // The Level Inspector should only have a list of selectable components after the
             // level entity itself is valid (i.e. "selected").
             return selection.empty() ? SelectionEntityTypeInfo::None : SelectionEntityTypeInfo::LevelEntity;
         }
 
-        if (layout == InspectorLayout::INVALID)
+        if (layout == InspectorLayout::ContainerEntityOfFocusedPrefab)
+        {
+            return selection.empty() ? SelectionEntityTypeInfo::None : SelectionEntityTypeInfo::ContainerEntityOfFocusedPrefab;
+        }
+
+        if (layout == InspectorLayout::Invalid)
         {
             return SelectionEntityTypeInfo::Mixed;
         }
@@ -1138,7 +1172,8 @@ namespace AzToolsFramework
             }
         }
 
-        bool isLevelLayout = GetCurrentInspectorLayout() == InspectorLayout::LEVEL;
+        bool isLevelLayout = GetCurrentInspectorLayout() == InspectorLayout::Level;
+        bool isContainerOfFocusedPrefabLayout = GetCurrentInspectorLayout() == InspectorLayout::ContainerEntityOfFocusedPrefab;
 
         m_gui->m_entityDetailsLabel->setText(entityDetailsLabelText);
         m_gui->m_entityDetailsLabel->setVisible(entityDetailsVisible);
@@ -1146,10 +1181,14 @@ namespace AzToolsFramework
         m_gui->m_entityNameLabel->setVisible(hasEntitiesDisplayed);
         m_gui->m_entityIcon->setVisible(hasEntitiesDisplayed);
         m_gui->m_pinButton->setVisible(m_overrideSelectedEntityIds.empty() && hasEntitiesDisplayed && !m_isSystemEntityEditor);
-        m_gui->m_statusLabel->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
-        m_gui->m_statusComboBox->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
-        m_gui->m_entityIdLabel->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
-        m_gui->m_entityIdText->setVisible(hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_statusLabel->setVisible(
+            hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_statusComboBox->setVisible(
+            hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_entityIdLabel->setVisible(
+            hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_entityIdText->setVisible(
+            hasEntitiesDisplayed && !m_isSystemEntityEditor && !isLevelLayout);
 
         bool displayComponentSearchBox = hasEntitiesDisplayed;
         if (hasEntitiesDisplayed)
@@ -1157,7 +1196,9 @@ namespace AzToolsFramework
             // Build up components to display
             SharedComponentArray sharedComponentArray;
             BuildSharedComponentArray(sharedComponentArray,
-                !(selectionEntityTypeInfo == SelectionEntityTypeInfo::OnlyStandardEntities || selectionEntityTypeInfo == SelectionEntityTypeInfo::OnlyPrefabEntities));
+                !(selectionEntityTypeInfo == SelectionEntityTypeInfo::OnlyStandardEntities ||
+                  selectionEntityTypeInfo == SelectionEntityTypeInfo::OnlyPrefabEntities) ||
+                  selectionEntityTypeInfo == SelectionEntityTypeInfo::ContainerEntityOfFocusedPrefab);
 
             if (sharedComponentArray.size() == 0)
             {
@@ -1173,7 +1214,8 @@ namespace AzToolsFramework
             UpdateEntityDisplay();
         }
 
-        m_gui->m_darkBox->setVisible(displayComponentSearchBox && !m_isSystemEntityEditor && !isLevelLayout);
+        m_gui->m_darkBox->setVisible(
+            displayComponentSearchBox && !m_isSystemEntityEditor && !isLevelLayout && !isContainerOfFocusedPrefabLayout);
         m_gui->m_entitySearchBox->setVisible(displayComponentSearchBox);
 
         bool displayAddComponentMenu = CanAddComponentsToSelection(selectionEntityTypeInfo);
@@ -1557,7 +1599,6 @@ namespace AzToolsFramework
         for (size_t entityIndex = 1; entityIndex < m_selectedEntityIds.size(); ++entityIndex)
         {
             entity = GetSelectedEntityById(m_selectedEntityIds[entityIndex]);
-            AZ_Assert(entity, "Entity id selected for display but no such entity exists");
             if (!entity)
             {
                 continue;
@@ -4663,13 +4704,6 @@ namespace AzToolsFramework
     {
         if (mimeData->hasFormat(AssetBrowser::AssetBrowserEntry::GetMimeType()))
         {
-            // extra special case:  MTLs from FBX drags are ignored.  are we dragging a FBX file?
-            bool isDraggingFBXFile = false;
-            AssetBrowser::AssetBrowserEntry::ForEachEntryInMimeData<AssetBrowser::SourceAssetBrowserEntry>(mimeData, [&](const AssetBrowser::SourceAssetBrowserEntry* source)
-            {
-                isDraggingFBXFile = isDraggingFBXFile || AzFramework::StringFunc::Equal(source->GetExtension().c_str(), ".fbx", false);
-            });
-
             // the usual case - we only allow asset browser drops of assets that have actually been associated with a kind of component.
             AssetBrowser::AssetBrowserEntry::ForEachEntryInMimeData<AssetBrowser::ProductAssetBrowserEntry>(mimeData, [&](const AssetBrowser::ProductAssetBrowserEntry* product)
             {
@@ -4681,17 +4715,7 @@ namespace AzToolsFramework
 
                 if (canCreateComponent && !componentTypeId.IsNull())
                 {
-                    // we have a component type that handles this asset.
-                    // but we disallow it if its a MTL file from a FBX and the FBX itself is being dragged.  Its still allowed
-                    // to drag the actual MTL.
-                    EBusFindAssetTypeByName materialAssetTypeResult("Material");
-                    AZ::AssetTypeInfoBus::BroadcastResult(materialAssetTypeResult, &AZ::AssetTypeInfo::GetAssetType);
-                    AZ::Data::AssetType materialAssetType = materialAssetTypeResult.GetAssetType();
-
-                    if ((!isDraggingFBXFile) || (product->GetAssetType() != materialAssetType))
-                    {
-                        callbackFunction(product);
-                    }
+                    callbackFunction(product);
                 }
             });
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
index 5279cefa9f..8dd0ffc4ee 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx
@@ -354,7 +354,8 @@ namespace AzToolsFramework
             OnlyLayerEntities,
             OnlyPrefabEntities,
             Mixed,
-            LevelEntity
+            LevelEntity,
+            ContainerEntityOfFocusedPrefab
         };
         /**
          * Returns what kinds of entities are in the current selection. This is used because mixed selection
@@ -364,7 +365,7 @@ namespace AzToolsFramework
         SelectionEntityTypeInfo GetSelectionEntityTypeInfo(const EntityIdList& selection) const;
 
         /**
-         * Returns true if a selection matching the passed in selection informatation allows components to be added.
+         * Returns true if a selection matching the passed in selection information allows components to be added.
          */
         bool CanAddComponentsToSelection(const SelectionEntityTypeInfo& selectionEntityTypeInfo) const;
 
@@ -581,9 +582,10 @@ namespace AzToolsFramework
 
         enum class InspectorLayout
         {
-            ENTITY = 0,     // All selected entities are regular entities
-            LEVEL,          // The selected entity is the level prefab container entity
-            INVALID         // Other entities are selected alongside the level prefab container entity
+            Entity = 0,                     // All selected entities are regular entities.
+            Level,                          // The selected entity is the prefab container entity for the level prefab, or the slice level entity.
+            ContainerEntityOfFocusedPrefab, // The selected entity is the prefab container entity for the focused prefab.
+            Invalid                         // Other entities are selected alongside the level prefab container entity.
         };
 
         InspectorLayout GetCurrentInspectorLayout() const;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
index c94bec7cc4..bd0cb3844a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
@@ -527,8 +527,8 @@ namespace AzToolsFramework
             m_errorButton = nullptr;
         }
     }
-
-    void PropertyAssetCtrl::UpdateErrorButton(const AZStd::string& errorLog)
+    
+    void PropertyAssetCtrl::UpdateErrorButton()
     {
         if (m_errorButton)
         {
@@ -543,12 +543,17 @@ namespace AzToolsFramework
             m_errorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
             m_errorButton->setFixedSize(QSize(16, 16));
             m_errorButton->setMouseTracking(true);
-            m_errorButton->setIcon(QIcon("Icons/PropertyEditor/error_icon.png"));
+            m_errorButton->setIcon(QIcon(":/PropertyEditor/Resources/error_icon.png"));
             m_errorButton->setToolTip("Show Errors");
 
             // Insert the error button after the asset label
             qobject_cast<QHBoxLayout*>(layout())->insertWidget(1, m_errorButton);
         }
+    }
+
+    void PropertyAssetCtrl::UpdateErrorButtonWithLog(const AZStd::string& errorLog)
+    {
+        UpdateErrorButton();
 
         // Connect pressed to opening the error dialog
         // Must capture this for call to QObject::connect
@@ -587,6 +592,21 @@ namespace AzToolsFramework
             logDialog->show();
         });
     }
+    
+    void PropertyAssetCtrl::UpdateErrorButtonWithMessage(const AZStd::string& message)
+    {
+        UpdateErrorButton();
+        
+        connect(m_errorButton, &QPushButton::clicked, this, [this, message]() {
+            QMessageBox::critical(nullptr, "Error", message.c_str());
+
+            // Without this, the error button would maintain focus after clicking, which left the red error icon in a blue-highlighted state
+            if (parentWidget())
+            {
+                parentWidget()->setFocus();
+            }
+        });
+    }
 
     void PropertyAssetCtrl::ClearAssetInternal()
     {
@@ -960,7 +980,6 @@ namespace AzToolsFramework
         else
         {
             const AZ::Data::AssetId assetID = GetCurrentAssetID();
-            m_currentAssetHint = "";
 
             AZ::Outcome<AssetSystem::JobInfoContainer> jobOutcome = AZ::Failure();
             AssetSystemJobRequestBus::BroadcastResult(jobOutcome, &AssetSystemJobRequestBus::Events::GetAssetJobsInfoByAssetID, assetID, false, false);
@@ -1018,7 +1037,7 @@ namespace AzToolsFramework
                         // In case of failure, render failure icon
                         case AssetSystem::JobStatus::Failed:
                         {
-                            UpdateErrorButton(errorLog);
+                            UpdateErrorButtonWithLog(errorLog);
                         }
                         break;
 
@@ -1043,6 +1062,10 @@ namespace AzToolsFramework
                     m_currentAssetHint = assetPath;
                 }
             }
+            else
+            {
+                UpdateErrorButtonWithMessage(AZStd::string::format("Asset is missing.\n\nID: %s\nHint:%s", assetID.ToString<AZStd::string>().c_str(), GetCurrentAssetHint().c_str()));
+            }
         }
 
         // Get the asset file name
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
index 2017369b6f..d6ff1b8de6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
@@ -168,7 +168,9 @@ namespace AzToolsFramework
 
         bool IsCorrectMimeData(const QMimeData* pData, AZ::Data::AssetId* pAssetId = nullptr, AZ::Data::AssetType* pAssetType = nullptr) const;
         void ClearErrorButton();
-        void UpdateErrorButton(const AZStd::string& errorLog);
+        void UpdateErrorButton();
+        void UpdateErrorButtonWithLog(const AZStd::string& errorLog);
+        void UpdateErrorButtonWithMessage(const AZStd::string& message);
         virtual const AZStd::string GetFolderSelection() const { return AZStd::string(); }
         virtual void SetFolderSelection(const AZStd::string& /* folderPath */) {}
         virtual void ClearAssetInternal();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
index 01675e0044..bb7d03367b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
@@ -169,6 +169,10 @@ namespace AzToolsFramework
         {
             AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Events::RequestWrite, newCtrl);
         });
+        this->connect(newCtrl, &PropertyControl::editingFinished, this, [newCtrl]()
+        {
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, newCtrl);
+        });
         // note:  Qt automatically disconnects objects from each other when either end is destroyed, no need to worry about delete.
 
         // Set the value range to that of ValueType as clamped to the range of QtWidgetValueType
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx
index e5a6b5803c..cc61593154 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx
@@ -150,10 +150,7 @@ namespace AzToolsFramework
             TypeBeingHandled actualValue = instance;
             for (int idx = 0; idx < m_common.GetElementCount(); ++idx)
             {
-                if (elements[idx]->wasValueEditedByUser())
-                {
-                    actualValue.SetElement(idx, static_cast<float>(elements[idx]->getValue()));
-                }
+                actualValue.SetElement(idx, static_cast<float>(elements[idx]->getValue()));
             }
             instance = actualValue;
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
index 76f91b438e..ce6ee7ead7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
@@ -1201,8 +1201,6 @@ namespace AzToolsFramework
                     .arg((item->parent() == nullptr) ? item->m_entity->GetName().c_str() : GetNodeDisplayName(*item->m_node).c_str()));
             }
 
-            SliceTargetTreeItem* parent = nullptr;
-
             AZStd::vector<SliceAssetPtr> validSliceAssets = GetValidTargetAssetsForField(*item);
 
             // For the selected item populate the tree of all valid slice targets.
@@ -1274,7 +1272,6 @@ namespace AzToolsFramework
                     selectButton->setChecked(true);
                 }
 
-                parent = sliceItem;
                 ++level;
             }
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
index 4a7039423c..1e29f1dbce 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
@@ -158,7 +158,10 @@ namespace UnitTest
             {
                 // Create & Start a new ToolsApplication if there's no existing one
                 m_app = CreateTestApplication();
-                m_app->Start(AzFramework::Application::Descriptor());
+                AZ::ComponentApplication::StartupParameters startupParameters;
+                startupParameters.m_loadAssetCatalog = false;
+
+                m_app->Start(AzFramework::Application::Descriptor(), startupParameters);
             }
 
             // without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
index 4dde676511..c0562025b6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
@@ -23,11 +23,11 @@ namespace AzToolsFramework
     /// @name Reverse URLs.
     /// Used to identify common actions and override them when necessary.
     //@{
-    static const AZ::Crc32 s_backAction = AZ_CRC("com.o3de.action.common.back", 0xd772a2af);
-    static const AZ::Crc32 s_deleteAction = AZ_CRC("com.o3de.action.common.delete", 0x5731f6cb);
-    static const AZ::Crc32 s_duplicateAction = AZ_CRC("com.o3de.action.common.duplicate", 0x08ccf461);
-    static const AZ::Crc32 s_nextComponentMode = AZ_CRC("com.o3de.action.common.nextComponentMode", 0xcc26094f);
-    static const AZ::Crc32 s_previousComponentMode = AZ_CRC("com.o3de.action.common.previousComponentMode", 0x0d18ff39);
+    static const AZ::Crc32 s_backAction = AZ_CRC("com.o3de.action.common.back", 0x80c3030f);
+    static const AZ::Crc32 s_deleteAction = AZ_CRC("com.o3de.action.common.delete", 0x58e78eed);
+    static const AZ::Crc32 s_duplicateAction = AZ_CRC("com.o3de.action.common.duplicate", 0xbc5a4a23);
+    static const AZ::Crc32 s_nextComponentMode = AZ_CRC("com.o3de.action.common.nextComponentMode", 0xf9aca3a8);
+    static const AZ::Crc32 s_previousComponentMode = AZ_CRC("com.o3de.action.common.previousComponentMode", 0x0580eaec);
     //@}
 
     /// Specific Action properties to be sent to a type implementing
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp
index e3b45aca2b..df96836bde 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp
@@ -6,6 +6,7 @@
  *
  */
 
+#include <AzFramework/Render/IntersectorInterface.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
 namespace AzToolsFramework
@@ -62,4 +63,47 @@ namespace AzToolsFramework
 
         return circleBoundWidth;
     }
+
+    AZ::Vector3 FindClosestPickIntersection(const AzFramework::RenderGeometry::RayRequest& rayRequest, const float defaultDistance)
+    {
+        AzFramework::RenderGeometry::RayResult renderGeometryIntersectionResult;
+        AzFramework::RenderGeometry::IntersectorBus::EventResult(
+            renderGeometryIntersectionResult, AzToolsFramework::GetEntityContextId(),
+            &AzFramework::RenderGeometry::IntersectorBus::Events::RayIntersect, rayRequest);
+
+        // attempt a ray intersection with any visible mesh and return the intersection position if successful
+        if (renderGeometryIntersectionResult)
+        {
+            return renderGeometryIntersectionResult.m_worldPosition;
+        }
+        else
+        {
+            const AZ::Vector3 rayDirection = (rayRequest.m_endWorldPosition - rayRequest.m_startWorldPosition).GetNormalized();
+            return rayRequest.m_startWorldPosition + rayDirection * defaultDistance;
+        }
+    }
+
+    void RefreshRayRequest(
+        AzFramework::RenderGeometry::RayRequest& rayRequest,
+        const ViewportInteraction::ProjectedViewportRay& viewportRay,
+        const float rayLength)
+    {
+        AZ_Assert(rayLength > 0.0f, "Invalid ray length passed to RefreshRayRequest");
+        rayRequest.m_startWorldPosition = viewportRay.origin;
+        rayRequest.m_endWorldPosition = viewportRay.origin + viewportRay.direction * rayLength;
+    }
+
+    AZ::Vector3 FindClosestPickIntersection(
+        const AzFramework::ViewportId viewportId,
+        const AzFramework::ScreenPoint& screenPoint,
+        const float rayLength,
+        const float defaultDistance)
+    {
+        AzFramework::RenderGeometry::RayRequest ray;
+        ray.m_onlyVisible = true; // only consider visible objects
+
+        RefreshRayRequest(ray, ViewportInteraction::ViewportScreenToWorldRay(viewportId, screenPoint), rayLength);
+
+        return FindClosestPickIntersection(ray, defaultDistance);
+    }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index 8ec772f0da..aec2d3fbca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -15,13 +15,19 @@
 #include <AzFramework/Viewport/CameraState.h>
 #include <AzFramework/Viewport/ClickDetector.h>
 #include <AzFramework/Viewport/ViewportId.h>
+#include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/Viewport/ViewportTypes.h>
 
 namespace AzFramework
 {
     struct ScreenPoint;
-}
+
+    namespace RenderGeometry
+    {
+        struct RayRequest;
+    }
+} // namespace AzFramework
 
 namespace AzToolsFramework
 {
@@ -162,12 +168,11 @@ namespace AzToolsFramework
             //! Multiply by DeviceScalingFactor to get the position in viewport pixel space.
             virtual AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) = 0;
             //! Transforms 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;
+            virtual AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) = 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;
+            virtual 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;
 
@@ -178,6 +183,26 @@ namespace AzToolsFramework
         //! Type to inherit to implement ViewportInteractionRequests.
         using ViewportInteractionRequestBus = AZ::EBus<ViewportInteractionRequests, ViewportEBusTraits>;
 
+        //! Utility function to return a viewport ray.
+        inline ProjectedViewportRay ViewportScreenToWorldRay(
+            const AzFramework::CameraState& cameraState, const AzFramework::ScreenPoint& screenPoint)
+        {
+            const AZ::Vector3 rayOrigin = AzFramework::ScreenToWorld(screenPoint, cameraState);
+            const AZ::Vector3 rayDirection = (rayOrigin - cameraState.m_position).GetNormalized();
+            return AzToolsFramework::ViewportInteraction::ProjectedViewportRay{ rayOrigin, rayDirection };
+        }
+
+        //! Utility function to return a viewport ray using the ViewportInteractionRequestBus.
+        inline ProjectedViewportRay ViewportScreenToWorldRay(
+            const AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint)
+        {
+            ProjectedViewportRay viewportRay{};
+            ViewportInteractionRequestBus::EventResult(
+                viewportRay, viewportId, &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPoint);
+
+            return viewportRay;
+        }
+
         //! Interface to return only viewport specific settings (e.g. snapping).
         class ViewportSettingsRequests
         {
@@ -229,13 +254,6 @@ namespace AzToolsFramework
         class MainEditorViewportInteractionRequests
         {
         public:
-            //! Given a point in screen space, return the picked entity (if any).
-            //! Picked EntityId will be returned, InvalidEntityId will be returned on failure.
-            virtual AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) = 0;
-            //! Given a point in screen space, return the terrain position in world space.
-            virtual AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) = 0;
-            //! Return the terrain height given a world position in 2d (xy plane).
-            virtual float TerrainHeight(const AZ::Vector2& position) = 0;
             //! Is the user holding a modifier key to move the manipulator space from local to world.
             virtual bool ShowingWorldSpace() = 0;
             //! Return the widget to use as the parent for the viewport context menu.
@@ -266,7 +284,6 @@ namespace AzToolsFramework
         {
         public:
             static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 
             //! Returns the current state of the keyboard modifier keys.
             virtual KeyboardModifiers QueryKeyboardModifiers() = 0;
@@ -290,7 +307,6 @@ namespace AzToolsFramework
         {
         public:
             static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-            static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 
             //! Returns the current time in seconds.
             //! This interface can be overridden for the purposes of testing to simplify viewport input requests.
@@ -340,6 +356,21 @@ namespace AzToolsFramework
         return entityContextId;
     }
 
+    //! Performs an intersection test against meshes in the scene, if there is a hit (the ray intersects
+    //! a mesh), that position is returned, otherwise a point projected defaultDistance from the
+    //! origin of the ray will be returned.
+    //! @note The intersection will only consider visible objects.
+    AZ::Vector3 FindClosestPickIntersection(
+        AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint, float rayLength, float defaultDistance);
+
+    //! Overload of FindClosestPickIntersection taking a RenderGeometry::RayRequest directly.
+    //! @note rayRequest must contain a valid ray/line segment (start/endWorldPosition must not be at the same position).
+    AZ::Vector3 FindClosestPickIntersection(const AzFramework::RenderGeometry::RayRequest& rayRequest, float defaultDistance);
+
+    //! Update the in/out parameter rayRequest based on the latest viewport ray.
+    void RefreshRayRequest(
+        AzFramework::RenderGeometry::RayRequest& rayRequest, const ViewportInteraction::ProjectedViewportRay& viewportRay, float rayLength);
+
     //! Maps a mouse interaction event to a ClickDetector event.
     //! @note Function only cares about up or down events, all other events are mapped to Nil (ignored).
     AzFramework::ClickDetector::ClickEvent ClickDetectorEventFromViewportInteraction(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
index 0f94b95e5f..ee30b9e29d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
@@ -148,7 +148,6 @@ namespace AzToolsFramework
         return false;
     }
 
-
     EditorHelpers::EditorHelpers(const EditorVisibleEntityDataCache* entityDataCache)
         : m_entityDataCache(entityDataCache)
     {
@@ -190,7 +189,10 @@ namespace AzToolsFramework
             if (helpersVisible)
             {
                 // some components choose to hide their icons (e.g. meshes)
-                if (!m_entityDataCache->IsVisibleEntityIconHidden(entityCacheIndex))
+                // we also do not want to test against icons that may not be showing as they're inside a 'closed' entity container
+                // (these icons only become visible when it is opened for editing)
+                if (!m_entityDataCache->IsVisibleEntityIconHidden(entityCacheIndex) &&
+                    m_entityDataCache->IsVisibleEntityIndividuallySelectableInViewport(entityCacheIndex))
                 {
                     const AZ::Vector3& entityPosition = m_entityDataCache->GetVisibleEntityPosition(entityCacheIndex);
 
@@ -235,7 +237,7 @@ namespace AzToolsFramework
                     viewportId, &ViewportInteraction::ViewportMouseCursorRequestBus::Events::SetOverrideCursor,
                     ViewportInteraction::CursorStyleOverride::Forbidden);
             }
-                
+
             if (mouseInteraction.m_mouseInteraction.m_mouseButtons.Left() &&
                     mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down ||
                 mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::DoubleClick)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
index a5ef66e7a3..31ea0c3985 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp
@@ -9,6 +9,7 @@
 #include "EditorSelectionUtil.h"
 
 #include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Console/IConsole.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Math/Aabb.h>
 #include <AzCore/Math/IntersectSegment.h>
@@ -16,10 +17,20 @@
 #include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
+AZ_CVAR(
+    float,
+    ed_defaultEntityPlacementDistance,
+    10.0f,
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
+    "The default distance to place an entity from the camera if no intersection is found");
+
 namespace AzToolsFramework
 {
-    // default ray length for picking in the viewport
-    static const float EditorPickRayLength = 1000.0f;
+    float GetDefaultEntityPlacementDistance()
+    {
+        return ed_defaultEntityPlacementDistance;
+    }
 
     AZ::Vector3 CalculateCenterOffset(const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot)
     {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
index d58549b329..b3a6c6afd4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h
@@ -26,6 +26,9 @@ namespace AzFramework
 
 namespace AzToolsFramework
 {
+    //! Default ray length for picking in the viewport.
+    inline constexpr float EditorPickRayLength = 1000.0f;
+
     //! Is the pivot at the center of the object (middle of extents) or at the
     //! exported authored object root position.
     inline bool Centered(const EditorTransformComponentSelectionRequests::Pivot pivot)
@@ -57,6 +60,9 @@ namespace AzToolsFramework
     //! Wrapper for EBus call to return the DPI scaling for a given viewport.
     float GetScreenDisplayScaling(int viewportId);
 
+    //! The default distance an entity is placed from the camera if there is no intersection.
+    float GetDefaultEntityPlacementDistance();
+
     //! A utility to return the center of several points.
     //! Take several positions and store the min and max of each in
     //! turn - when all points have been added return the center/midpoint.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 39c882b766..d3cfed4665 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -28,6 +28,7 @@
 #include <AzToolsFramework/Manipulators/TranslationManipulators.h>
 #include <AzToolsFramework/Maths/TransformUtils.h>
 #include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
 #include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
@@ -230,8 +231,8 @@ namespace AzToolsFramework
         {
             return mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() &&
                 mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down &&
-                mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl() &&
-                !mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt();
+                !mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt() &&
+                mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl();
         }
 
         static bool IndividualDitto(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
@@ -242,12 +243,12 @@ namespace AzToolsFramework
                 mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl();
         }
 
-        static bool SnapTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+        static bool SnapSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
         {
             return mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() &&
                 mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down &&
-                (mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt() ||
-                 mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl());
+                mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Shift() &&
+                mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl();
         }
 
         static bool ManipulatorDitto(
@@ -408,7 +409,7 @@ namespace AzToolsFramework
             const AzFramework::CameraState cameraState = GetCameraState(viewportId);
             for (size_t entityCacheIndex = 0; entityCacheIndex < entityDataCache.VisibleEntityDataCount(); ++entityCacheIndex)
             {
-                if (!entityDataCache.IsVisibleEntitySelectableInViewport(entityCacheIndex))
+                if (!entityDataCache.IsVisibleEntityIndividuallySelectableInViewport(entityCacheIndex))
                 {
                     continue;
                 }
@@ -891,60 +892,37 @@ namespace AzToolsFramework
         prevModifiers = action.m_modifiers;
     }
 
-    static void HandleAccents(
-        const bool hasSelectedEntities,
-        const AZ::EntityId entityIdUnderCursor,
-        const bool ctrlHeld,
-        AZ::EntityId& hoveredEntityId,
+    void HandleAccents(
+        const AZ::EntityId currentEntityIdUnderCursor,
+        AZ::EntityId& hoveredEntityIdUnderCursor,
+        const HandleAccentsContext& handleAccentsContext,
         const ViewportInteraction::MouseButtons mouseButtons,
-        const bool usingBoxSelect)
+        const AZStd::function<void(AZ::EntityId, bool)>& setEntityAccentedFn)
     {
-        AZ_PROFILE_FUNCTION(AzToolsFramework);
-
         const bool invalidMouseButtonHeld = mouseButtons.Middle() || mouseButtons.Right();
+        const bool hasSelectedEntities = handleAccentsContext.m_hasSelectedEntities;
+        const bool ctrlHeld = handleAccentsContext.m_ctrlHeld;
+        const bool boxSelect = handleAccentsContext.m_usingBoxSelect;
+        const bool stickySelect = handleAccentsContext.m_usingStickySelect;
+        const bool canSelect = stickySelect ? !hasSelectedEntities || ctrlHeld : true;
 
-        if ((hoveredEntityId.IsValid() && hoveredEntityId != entityIdUnderCursor) ||
-            (hasSelectedEntities && !ctrlHeld && hoveredEntityId.IsValid()) || invalidMouseButtonHeld)
+        const bool removePreviousAccent =
+            (currentEntityIdUnderCursor != hoveredEntityIdUnderCursor && hoveredEntityIdUnderCursor.IsValid()) || invalidMouseButtonHeld;
+        const bool addNextAccent = currentEntityIdUnderCursor.IsValid() && canSelect && !invalidMouseButtonHeld && !boxSelect;
+
+        if (removePreviousAccent)
         {
-            if (hoveredEntityId.IsValid())
-            {
-                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, hoveredEntityId, false);
-
-                hoveredEntityId.SetInvalid();
-            }
+            setEntityAccentedFn(hoveredEntityIdUnderCursor, false);
+            hoveredEntityIdUnderCursor.SetInvalid();
         }
 
-        if (!invalidMouseButtonHeld && !usingBoxSelect && (!hasSelectedEntities || ctrlHeld))
+        if (addNextAccent)
         {
-            if (entityIdUnderCursor.IsValid())
-            {
-                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, entityIdUnderCursor, true);
-
-                hoveredEntityId = entityIdUnderCursor;
-            }
+            setEntityAccentedFn(currentEntityIdUnderCursor, true);
+            hoveredEntityIdUnderCursor = currentEntityIdUnderCursor;
         }
     }
 
-    static AZ::Vector3 PickTerrainPosition(const ViewportInteraction::MouseInteraction& mouseInteraction)
-    {
-        AZ_PROFILE_FUNCTION(AzToolsFramework);
-
-        const int viewportId = mouseInteraction.m_interactionId.m_viewportId;
-        // get unsnapped terrain position (world space)
-        AZ::Vector3 worldSurfacePosition;
-        ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult(
-            worldSurfacePosition, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain,
-            mouseInteraction.m_mousePick.m_screenCoordinates);
-
-        // convert to local space - snap if enabled
-        const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId);
-        const AZ::Vector3 finalSurfacePosition = gridSnapParams.m_gridSnap
-            ? CalculateSnappedTerrainPosition(worldSurfacePosition, AZ::Transform::CreateIdentity(), viewportId, gridSnapParams.m_gridSize)
-            : worldSurfacePosition;
-
-        return finalSurfacePosition;
-    }
-
     // is the passed entity id contained with in the entity id list
     template<typename EntityIdContainer>
     static bool IsEntitySelectedInternal(AZ::EntityId entityId, const EntityIdContainer& selectedEntityIds)
@@ -982,7 +960,7 @@ namespace AzToolsFramework
     {
         if (auto entityIndex = entityDataCache.GetVisibleEntityIndexFromId(entityId))
         {
-            if (entityDataCache.IsVisibleEntitySelectableInViewport(*entityIndex))
+            if (entityDataCache.IsVisibleEntityIndividuallySelectableInViewport(*entityIndex))
             {
                 return *entityIndex;
             }
@@ -1013,6 +991,15 @@ namespace AzToolsFramework
         ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values);
     }
 
+    // leaves focus mode by focusing on the parent of the current perfab in the entity outliner
+    static void LeaveFocusMode()
+    {
+        if (auto prefabFocusPublicInterface = AZ::Interface<Prefab::PrefabFocusPublicInterface>::Get())
+        {
+            prefabFocusPublicInterface->FocusOnParentOfFocusedPrefab(GetEntityContextId());
+        }
+    }
+
     EditorTransformComponentSelection::EditorTransformComponentSelection(const EditorVisibleEntityDataCache* entityDataCache)
         : m_entityDataCache(entityDataCache)
     {
@@ -1177,8 +1164,10 @@ namespace AzToolsFramework
                         continue;
                     }
 
-                    const AZ::Aabb bound = CalculateEditorEntitySelectionBounds(entityId, viewportInfo);
-                    debugDisplay.DrawSolidBox(bound.GetMin(), bound.GetMax());
+                    if (const AZ::Aabb bound = CalculateEditorEntitySelectionBounds(entityId, viewportInfo); bound.IsValid())
+                    {
+                        debugDisplay.DrawSolidBox(bound.GetMin(), bound.GetMax());
+                    }
                 }
 
                 debugDisplay.DepthTestOn();
@@ -1277,7 +1266,7 @@ namespace AzToolsFramework
                 m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
                 m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-                // [ref 1.]
+                // see comment [ref 1.] above
                 BeginRecordManipulatorCommand();
             });
 
@@ -1312,7 +1301,7 @@ namespace AzToolsFramework
                 m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
                 m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-                // [ref 1.]
+                // see comment [ref 1.] above
                 BeginRecordManipulatorCommand();
             });
 
@@ -1345,7 +1334,7 @@ namespace AzToolsFramework
                 m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
                 m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-                // [ref 1.]
+                // see comment [ref 1.] above
                 BeginRecordManipulatorCommand();
             });
 
@@ -1419,7 +1408,7 @@ namespace AzToolsFramework
                 m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation();
                 m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform());
 
-                // [ref 1.]
+                // see comment [ref 1.] above
                 BeginRecordManipulatorCommand();
             });
 
@@ -1801,7 +1790,7 @@ namespace AzToolsFramework
         const AzFramework::CameraState cameraState = GetCameraState(viewportId);
 
         const auto cursorEntityIdQuery = m_editorHelpers->FindEntityIdUnderCursor(cameraState, mouseInteraction);
-        m_cachedEntityIdUnderCursor = cursorEntityIdQuery.ContainerAncestorEntityId();
+        m_currentEntityIdUnderCursor = cursorEntityIdQuery.ContainerAncestorEntityId();
 
         const auto selectClickEvent = ClickDetectorEventFromViewportInteraction(mouseInteraction);
         m_cursorState.SetCurrentPosition(mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates);
@@ -1822,7 +1811,7 @@ namespace AzToolsFramework
                         mouseInteraction.m_mouseInteraction,
                         AZ::Aabb::CreateFromMinMax(boxPosition - scaledSize, boxPosition + scaledSize)))
                 {
-                    m_cachedEntityIdUnderCursor = entityId;
+                    m_currentEntityIdUnderCursor = entityId;
                 }
             }
         }
@@ -1842,7 +1831,7 @@ namespace AzToolsFramework
             return true;
         }
 
-        const AZ::EntityId entityIdUnderCursor = m_cachedEntityIdUnderCursor;
+        const AZ::EntityId entityIdUnderCursor = m_currentEntityIdUnderCursor;
 
         if (mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::DoubleClick &&
             mouseInteraction.m_mouseInteraction.m_mouseButtons.Left())
@@ -1891,6 +1880,13 @@ namespace AzToolsFramework
 
         if (!m_selectedEntityIds.empty())
         {
+            // try snapping to a surface (mesh) if in Translation mode
+            if (Input::SnapSurface(mouseInteraction))
+            {
+                PerformSnapToSurface(mouseInteraction);
+                return false;
+            }
+
             // group copying/alignment to specific entity - 'ditto' position/orientation for group
             if (Input::GroupDitto(mouseInteraction) && PerformGroupDitto(entityIdUnderCursor))
             {
@@ -1903,13 +1899,6 @@ namespace AzToolsFramework
                 return false;
             }
 
-            // try snapping to the terrain (if in Translation mode) and entity wasn't picked
-            if (Input::SnapTerrain(mouseInteraction))
-            {
-                PerformSnapToTerrain(mouseInteraction);
-                return false;
-            }
-
             // set manipulator pivot override translation or orientation (update manipulators)
             if (Input::ManipulatorDitto(clickOutcome, mouseInteraction))
             {
@@ -1997,25 +1986,28 @@ namespace AzToolsFramework
         return false;
     }
 
-    void EditorTransformComponentSelection::PerformSnapToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
+    void EditorTransformComponentSelection::PerformSnapToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction)
     {
-        for (AZ::EntityId entityId : m_selectedEntityIds)
+        for (const AZ::EntityId& entityId : m_selectedEntityIds)
         {
             ScopedUndoBatch::MarkEntityDirty(entityId);
         }
 
         if (m_mode == Mode::Translation)
         {
-            const AZ::Vector3 finalSurfacePosition = PickTerrainPosition(mouseInteraction.m_mouseInteraction);
+            const AZ::Vector3 worldPosition = FindClosestPickIntersection(
+                mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId,
+                mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates, AzToolsFramework::EditorPickRayLength,
+                GetDefaultEntityPlacementDistance());
 
             // handle modifier alternatives
             if (Input::IndividualDitto(mouseInteraction))
             {
-                CopyTranslationToSelectedEntitiesIndividual(finalSurfacePosition);
+                CopyTranslationToSelectedEntitiesIndividual(worldPosition);
             }
             else if (Input::GroupDitto(mouseInteraction))
             {
-                CopyTranslationToSelectedEntitiesGroup(finalSurfacePosition);
+                CopyTranslationToSelectedEntitiesGroup(worldPosition);
             }
         }
         else if (m_mode == Mode::Rotation)
@@ -3361,9 +3353,23 @@ namespace AzToolsFramework
 
         m_cursorState.Update();
 
+        bool stickySelect = false;
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            stickySelect, viewportInfo.m_viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::StickySelectEnabled);
+
+        HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = keyboardModifiers.Ctrl();
+        handleAccentsContext.m_hasSelectedEntities = !m_selectedEntityIds.empty();
+        handleAccentsContext.m_usingBoxSelect = m_boxSelect.Active();
+        handleAccentsContext.m_usingStickySelect = stickySelect;
+
         HandleAccents(
-            !m_selectedEntityIds.empty(), m_cachedEntityIdUnderCursor, keyboardModifiers.Ctrl(), m_hoveredEntityId,
-            ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()), m_boxSelect.Active());
+            m_currentEntityIdUnderCursor, m_hoveredEntityId, handleAccentsContext,
+            ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()),
+            [](const AZ::EntityId entityId, bool highlighted)
+            {
+                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, entityId, highlighted);
+            });
 
         const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(keyboardModifiers));
 
@@ -3507,7 +3513,7 @@ namespace AzToolsFramework
         // get the editor cameras current orientation
         const int viewportId = viewportInfo.m_viewportId;
         const AzFramework::CameraState editorCameraState = GetCameraState(viewportId);
-        const AZ::Matrix3x3& editorCameraOrientation = AZ::Matrix3x3::CreateFromMatrix4x4(AzFramework::CameraTransform(editorCameraState));
+        const AZ::Matrix3x3& editorCameraOrientation = AZ::Matrix3x3::CreateFromMatrix3x4(AzFramework::CameraTransform(editorCameraState));
 
         // create a gizmo camera transform about the origin matching the orientation of the editor camera
         // (10 units back in the y axis to produce an orbit effect)
@@ -3604,6 +3610,17 @@ namespace AzToolsFramework
         m_selectedEntityIds.clear();
         m_selectedEntityIds.reserve(selectedEntityIds.size());
         AZStd::copy(selectedEntityIds.begin(), selectedEntityIds.end(), AZStd::inserter(m_selectedEntityIds, m_selectedEntityIds.end()));
+
+        // Do not create manipulators for the container entity of the focused prefab.
+        if (auto prefabFocusPublicInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabFocusPublicInterface>::Get())
+        {
+            AzFramework::EntityContextId editorEntityContextId = GetEntityContextId();
+            if (AZ::EntityId focusRoot = prefabFocusPublicInterface->GetFocusedPrefabContainerEntityId(editorEntityContextId);
+                focusRoot.IsValid())
+            {
+                m_selectedEntityIds.erase(focusRoot);
+            }
+        }
     }
 
     void EditorTransformComponentSelection::OnTransformChanged(
@@ -3694,7 +3711,8 @@ namespace AzToolsFramework
         case ViewportEditorMode::Focus:
             {
                 ViewportUi::ViewportUiRequestBus::Event(
-                    ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode");
+                    ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode",
+                    LeaveFocusMode);
             }
             break;
         case ViewportEditorMode::Default:
@@ -3723,7 +3741,8 @@ namespace AzToolsFramework
                 if (editorModeState.IsModeActive(ViewportEditorMode::Focus))
                 {
                     ViewportUi::ViewportUiRequestBus::Event(
-                        ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode");
+                        ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode",
+                        LeaveFocusMode);
                 }
             }
             break;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
index 1e1cc6d2e1..afc290380b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
@@ -308,7 +308,7 @@ namespace AzToolsFramework
         bool PerformGroupDitto(AZ::EntityId entityId);
         bool PerformIndividualDitto(AZ::EntityId entityId);
         void PerformManipulatorDitto(AZ::EntityId entityId);
-        void PerformSnapToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
+        void PerformSnapToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction);
 
         //! Responsible for keeping the space cluster in sync with the current reference frame.
         void UpdateSpaceCluster(ReferenceFrame referenceFrame);
@@ -317,7 +317,7 @@ namespace AzToolsFramework
         void SetAllViewportUiVisible(bool visible);
 
         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_currentEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
         AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set.
         EntityIdSet m_selectedEntityIds; //!< Represents the current entities in the selection.
 
@@ -357,6 +357,23 @@ namespace AzToolsFramework
         bool m_viewportUiVisible = true; //!< Used to hide/show the viewport ui elements.
     };
 
+    //! Bundles viewport state that impacts how accents are added/removed in HandleAccents.
+    struct HandleAccentsContext
+    {
+        bool m_hasSelectedEntities;
+        bool m_ctrlHeld;
+        bool m_usingBoxSelect;
+        bool m_usingStickySelect;
+    };
+
+    //! Updates whether accents (icon highlights) are added/removed for a given entity based on the cursor position.
+    void HandleAccents(
+        AZ::EntityId currentEntityIdUnderCursor,
+        AZ::EntityId& hoveredEntityIdUnderCursor,
+        const HandleAccentsContext& handleAccentsContext,
+        ViewportInteraction::MouseButtons mouseButtons,
+        const AZStd::function<void(AZ::EntityId, bool)>& setEntityAccentedFn);
+
     //! The ETCS (EntityTransformComponentSelection) namespace contains functions and data used exclusively by
     //! the EditorTransformComponentSelection type. Functions in this namespace are exposed to facilitate testing
     //! and should not be used outside of EditorTransformComponentSelection or EditorTransformComponentSelectionTests.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
index 328cfc3ae5..58c25b944c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp
@@ -293,12 +293,10 @@ namespace AzToolsFramework
         return m_impl->m_visibleEntityDatas[index].m_iconHidden;
     }
 
-    bool EditorVisibleEntityDataCache::IsVisibleEntitySelectableInViewport(size_t index) const
+    bool EditorVisibleEntityDataCache::IsVisibleEntityIndividuallySelectableInViewport(const size_t index) const
     {
-        return m_impl->m_visibleEntityDatas[index].m_visible
-            && !m_impl->m_visibleEntityDatas[index].m_locked
-            && m_impl->m_visibleEntityDatas[index].m_inFocus
-            && !m_impl->m_visibleEntityDatas[index].m_descendantOfClosedContainer;
+        return m_impl->m_visibleEntityDatas[index].m_visible && !m_impl->m_visibleEntityDatas[index].m_locked &&
+            m_impl->m_visibleEntityDatas[index].m_inFocus && !m_impl->m_visibleEntityDatas[index].m_descendantOfClosedContainer;
     }
 
     AZStd::optional<size_t> EditorVisibleEntityDataCache::GetVisibleEntityIndexFromId(const AZ::EntityId entityId) const
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
index 16fa1b6d14..4262d334df 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
@@ -55,7 +55,10 @@ namespace AzToolsFramework
         bool IsVisibleEntityVisible(size_t index) const;
         bool IsVisibleEntitySelected(size_t index) const;
         bool IsVisibleEntityIconHidden(size_t index) const;
-        bool IsVisibleEntitySelectableInViewport(size_t index) const;
+        //! Returns true if the entity is individually selectable (none of its ancestors are a closed container entity).
+        //! @note It may still be desirable to be able to 'click' an entity that is a descendant of a closed container
+        //! to select the container itself, not the individual entity.
+        bool IsVisibleEntityIndividuallySelectableInViewport(size_t index) const;
 
         AZStd::optional<size_t> GetVisibleEntityIndexFromId(AZ::EntityId entityId) const;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index bc299f9985..365ba237db 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -62,9 +62,6 @@ namespace AzToolsFramework::ViewportUi::Internal
             return;
         }
 
-        // set hover to true by default
-        action->setProperty("IconHasHoverEffect", true);
-
         // add the action
         addAction(action);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index b948a18578..c1bddbe3c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -20,7 +20,9 @@
 namespace AzToolsFramework::ViewportUi::Internal
 {
     const static int HighlightBorderSize = 5;
-    const static char* HighlightBorderColor = "#4A90E2";
+    const static char* const HighlightBorderColor = "#4A90E2";
+    const static int HighlightBorderBackButtonIconSize = 20;
+    const static char* const HighlightBorderBackButtonIconFile = "X_axis.svg";
 
     static void UnparentWidgets(ViewportUiElementIdInfoLookup& viewportUiElementIdInfoLookup)
     {
@@ -62,6 +64,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         , m_fullScreenLayout(&m_uiOverlay)
         , m_uiOverlayLayout()
         , m_viewportBorderText(&m_uiOverlay)
+        , m_viewportBorderBackButton(&m_uiOverlay)
     {
     }
 
@@ -254,7 +257,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
         if (viewportUiMapElement != m_viewportUiElements.end())
         {
-            viewportUiMapElement->second.m_widget->setVisible(false);
+            viewportUiMapElement->second.m_widget->hide();
             viewportUiMapElement->second.m_widget->setParent(nullptr);
             m_viewportUiElements.erase(viewportUiMapElement);
         }
@@ -269,7 +272,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
-            element.m_widget->setVisible(true);
+            element.m_widget->show();
         }
     }
 
@@ -277,7 +280,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
-            element.m_widget->setVisible(false);
+            element.m_widget->hide();
         }
     }
 
@@ -291,27 +294,34 @@ namespace AzToolsFramework::ViewportUi::Internal
         return false;
     }
 
-    void ViewportUiDisplay::CreateViewportBorder(const AZStd::string& borderTitle)
+    void ViewportUiDisplay::CreateViewportBorder(
+        const AZStd::string& borderTitle, AZStd::optional<ViewportUiBackButtonCallback> backButtonCallback)
     {
-        const AZStd::string styleSheet = AZStd::string::format(
-            "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize, HighlightBorderColor, ViewportUiTopBorderSize,
-            HighlightBorderColor);
-        m_uiOverlay.setStyleSheet(styleSheet.c_str());
+        m_uiOverlay.setStyleSheet(QString("border: %1px solid %2; border-top: %3px solid %4;")
+                                      .arg(
+                                          QString::number(HighlightBorderSize), HighlightBorderColor,
+                                          QString::number(ViewportUiTopBorderSize), HighlightBorderColor));
         m_uiOverlayLayout.setContentsMargins(
             HighlightBorderSize + ViewportUiOverlayMargin, ViewportUiTopBorderSize + ViewportUiOverlayMargin,
             HighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin);
-        m_viewportBorderText.setVisible(true);
+        m_viewportBorderText.show();
         m_viewportBorderText.setText(borderTitle.c_str());
         UpdateUiOverlayGeometry();
+
+        // only display the back button if a callback was provided
+        m_viewportBorderBackButtonCallback = backButtonCallback;
+        m_viewportBorderBackButton.setVisible(m_viewportBorderBackButtonCallback.has_value());
     }
 
     void ViewportUiDisplay::RemoveViewportBorder()
     {
-        m_viewportBorderText.setVisible(false);
+        m_viewportBorderText.hide();
         m_uiOverlay.setStyleSheet("border: none;");
         m_uiOverlayLayout.setContentsMargins(
             ViewportUiOverlayMargin, ViewportUiOverlayMargin + ViewportUiOverlayTopMarginPadding, ViewportUiOverlayMargin,
             ViewportUiOverlayMargin);
+        m_viewportBorderBackButtonCallback.reset();
+        m_viewportBorderBackButton.hide();
     }
 
     void ViewportUiDisplay::PositionViewportUiElementFromWorldSpace(ViewportUiElementId elementId, const AZ::Vector3& pos)
@@ -350,23 +360,46 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         m_uiMainWindow.setObjectName(QString("ViewportUiWindow"));
         ConfigureWindowForViewportUi(&m_uiMainWindow);
-        m_uiMainWindow.setVisible(false);
+        m_uiMainWindow.hide();
 
         m_uiOverlay.setObjectName(QString("ViewportUiOverlay"));
         m_uiMainWindow.setCentralWidget(&m_uiOverlay);
-        m_uiOverlay.setVisible(false);
+        m_uiOverlay.hide();
 
         // remove any spacing and margins from the UI Overlay Layout
         m_fullScreenLayout.setSpacing(0);
         m_fullScreenLayout.setContentsMargins(0, 0, 0, 0);
         m_fullScreenLayout.addLayout(&m_uiOverlayLayout, 0, 0, 1, 1);
 
-        // format the label which will appear on top of the highlight border
-        AZStd::string styleSheet = AZStd::string::format("background-color: %s; border: none;", HighlightBorderColor);
-        m_viewportBorderText.setStyleSheet(styleSheet.c_str());
+        // style the label which will appear on top of the highlight border
+        m_viewportBorderText.setStyleSheet(QString("background-color: %1; border: none").arg(HighlightBorderColor));
         m_viewportBorderText.setFixedHeight(ViewportUiTopBorderSize);
-        m_viewportBorderText.setVisible(false);
+        m_viewportBorderText.hide();
         m_fullScreenLayout.addWidget(&m_viewportBorderText, 0, 0, Qt::AlignTop | Qt::AlignHCenter);
+
+        m_viewportBorderBackButton.setAutoRaise(true); // hover highlight
+        m_viewportBorderBackButton.hide();
+
+        QIcon backButtonIcon(QString(":/stylesheet/img/UI20/toolbar/%1").arg(HighlightBorderBackButtonIconFile));
+        m_viewportBorderBackButton.setIcon(backButtonIcon);
+        m_viewportBorderBackButton.setIconSize(QSize(HighlightBorderBackButtonIconSize, HighlightBorderBackButtonIconSize));
+
+        // setup the handler for the back button to call the user provided callback (if any)
+        QObject::connect(
+            &m_viewportBorderBackButton, &QToolButton::clicked,
+            [this]
+            {
+                if (m_viewportBorderBackButtonCallback.has_value())
+                {
+                    // we need to swap out the existing back button callback because it will be reset in RemoveViewportBorder()
+                    // so preserve the lifetime with this temporary callback until after the call to RemoveViewportBorder()
+                    AZStd::optional<ViewportUiBackButtonCallback> backButtonCallback;
+                    m_viewportBorderBackButtonCallback.swap(backButtonCallback);
+                    RemoveViewportBorder();
+                    (*backButtonCallback)();
+                }
+            });
+        m_fullScreenLayout.addWidget(&m_viewportBorderBackButton, 0, 0, Qt::AlignTop | Qt::AlignRight);
     }
 
     void ViewportUiDisplay::PrepareWidgetForViewportUi(QPointer<QWidget> widget)
@@ -414,16 +447,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         region += m_uiOverlay.childrenRegion();
 
         // set viewport ui visibility depending on if elements are present
-        if (region.isEmpty() || !UiDisplayEnabled())
-        {
-            m_uiMainWindow.setVisible(false);
-            m_uiOverlay.setVisible(false);
-        }
-        else
-        {
-            m_uiMainWindow.setVisible(true);
-            m_uiOverlay.setVisible(true);
-        }
+        const bool visible = !region.isEmpty() && UiDisplayEnabled();
+        m_uiMainWindow.setVisible(visible);
+        m_uiOverlay.setVisible(visible);
 
         m_uiMainWindow.setMask(region);
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
index 32b746a1ac..dba0f25830 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
@@ -17,6 +17,7 @@
 #include <QLabel>
 #include <QMainWindow>
 #include <QPointer>
+#include <QToolButton>
 
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
 #include <QGridLayout>
@@ -89,7 +90,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         AZStd::shared_ptr<QWidget> GetViewportUiElement(ViewportUiElementId elementId);
         bool IsViewportUiElementVisible(ViewportUiElementId elementId);
 
-        void CreateViewportBorder(const AZStd::string& borderTitle);
+        void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional<ViewportUiBackButtonCallback> backButtonCallback);
         void RemoveViewportBorder();
 
     private:
@@ -113,7 +114,10 @@ namespace AzToolsFramework::ViewportUi::Internal
         QWidget m_uiOverlay; //!< The UI Overlay which displays Viewport UI Elements.
         QGridLayout m_fullScreenLayout; //!< The layout which extends across the full screen.
         ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements.
-        QLabel m_viewportBorderText; //!< The text used for the viewport border.
+        QLabel m_viewportBorderText; //!< The text used for the viewport highlight border.
+        QToolButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border (only displayed if callback provided).
+        //! The optional callback for when the viewport highlight border back button is pressed.
+        AZStd::optional<ViewportUiBackButtonCallback> m_viewportBorderBackButtonCallback;
 
         QWidget* m_renderOverlay;
         QPointer<QWidget> m_fullScreenWidget; //!< Reference to the widget attached to m_fullScreenLayout if any.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
index 1f14b12b7d..143da34074 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
@@ -240,9 +240,10 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    void ViewportUiManager::CreateViewportBorder(const AZStd::string& borderTitle)
+    void ViewportUiManager::CreateViewportBorder(
+        const AZStd::string& borderTitle, AZStd::optional<ViewportUiBackButtonCallback> backButtonCallback)
     {
-        m_viewportUi->CreateViewportBorder(borderTitle);
+        m_viewportUi->CreateViewportBorder(borderTitle, backButtonCallback);
     }
 
     void ViewportUiManager::RemoveViewportBorder()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
index ce7e5aafe9..54f1eb5a57 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
@@ -50,7 +50,8 @@ namespace AzToolsFramework::ViewportUi
         void RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) override;
         void RemoveTextField(TextFieldId textFieldId) override;
         void SetTextFieldVisible(TextFieldId textFieldId, bool visible) override;
-        void CreateViewportBorder(const AZStd::string& borderTitle) override;
+        void CreateViewportBorder(
+            const AZStd::string& borderTitle, AZStd::optional<ViewportUiBackButtonCallback> backButtonCallback) override;
         void RemoveViewportBorder() override;
         void PressButton(ClusterId clusterId, ButtonId buttonId) override;
         void PressButton(SwitcherId switcherId, ButtonId buttonId) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
index 3c6f7094cb..9ac6feb8c8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h
@@ -22,6 +22,9 @@ namespace AzToolsFramework::ViewportUi
     using SwitcherId = IdType<struct SwitcherIdType>;
     using TextFieldId = IdType<struct TextFieldIdType>;
 
+    //! Callback function for viewport UI back button.
+    using ViewportUiBackButtonCallback = AZStd::function<void()>;
+
     inline const ViewportUiElementId InvalidViewportUiElementId = ViewportUiElementId(0);
     inline const ButtonId InvalidButtonId = ButtonId(0);
     inline const ClusterId InvalidClusterId = ClusterId(0);
@@ -95,9 +98,9 @@ namespace AzToolsFramework::ViewportUi
         virtual void RemoveTextField(TextFieldId textFieldId) = 0;
         //! Sets the visibility of the text field.
         virtual void SetTextFieldVisible(TextFieldId textFieldId, bool visible) = 0;
-        //! Create the highlight border for Component Mode.
-        virtual void CreateViewportBorder(const AZStd::string& borderTitle) = 0;
-        //! Remove the highlight border for Component Mode.
+        //! Create the highlight border with optional back button to exit the given editor mode.
+        virtual void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional<ViewportUiBackButtonCallback> backButtonCallback) = 0;
+        //! Remove the highlight border.
         virtual void RemoveViewportBorder() = 0;
         //! Invoke a button press on a cluster.
         virtual void PressButton(ClusterId clusterId, ButtonId buttonId) = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
index 6b8b1873f7..c4be11ac66 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
@@ -22,8 +22,6 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         // Add am empty active button (is set in the call to SetActiveMode)
         m_activeButton = new QToolButton();
-        // No hover effect for the main button as it's not clickable
-        m_activeButton->setProperty("IconHasHoverEffect", false);
         m_activeButton->setCheckable(false);
         m_activeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         addWidget(m_activeButton);
@@ -56,9 +54,6 @@ namespace AzToolsFramework::ViewportUi::Internal
             return;
         }
 
-        // set hover to true by default
-        action->setProperty("IconHasHoverEffect", true);
-
         // add the action
         addAction(action);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index 286ef97418..a6c9adb19e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -47,6 +47,7 @@ set(FILES
     API/EntityCompositionRequestBus.h
     API/EntityCompositionNotificationBus.h
     API/EditorViewportIconDisplayInterface.h
+    API/PythonLoader.h
     API/ViewPaneOptions.h
     API/ViewportEditorModeTrackerInterface.h
     Application/Ticker.h
@@ -147,6 +148,8 @@ set(FILES
     Entity/EditorEntitySortBus.h
     Entity/EditorEntitySortComponent.cpp
     Entity/EditorEntitySortComponent.h
+    Entity/EditorEntitySortComponentSerializer.cpp
+    Entity/EditorEntitySortComponentSerializer.h
     Entity/EditorEntityTransformBus.h
     Entity/PrefabEditorEntityOwnershipInterface.h
     Entity/PrefabEditorEntityOwnershipService.h
@@ -156,6 +159,10 @@ set(FILES
     Entity/SliceEditorEntityOwnershipServiceBus.h
     Entity/EntityUtilityComponent.h
     Entity/EntityUtilityComponent.cpp
+    Entity/ReadOnly/ReadOnlyEntityInterface.h
+    Entity/ReadOnly/ReadOnlyEntityBus.h
+    Entity/ReadOnly/ReadOnlyEntitySystemComponent.cpp
+    Entity/ReadOnly/ReadOnlyEntitySystemComponent.h
     Fingerprinting/TypeFingerprinter.h
     Fingerprinting/TypeFingerprinter.cpp
     FocusMode/FocusModeInterface.h
@@ -768,8 +775,8 @@ set(FILES
     PythonTerminal/ScriptTermDialog.cpp
     PythonTerminal/ScriptTermDialog.h
     PythonTerminal/ScriptTermDialog.ui
-    Input/QtEventToAzInputManager.h
-    Input/QtEventToAzInputManager.cpp
+    Input/QtEventToAzInputMapper.h
+    Input/QtEventToAzInputMapper.cpp
     Script/LuaSymbolsReporterBus.h
     Script/LuaSymbolsReporterSystemComponent.h
     Script/LuaSymbolsReporterSystemComponent.cpp
diff --git a/Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp b/Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp
new file mode 100644
index 0000000000..42fef21db6
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp
@@ -0,0 +1,20 @@
+/*
+* Copyright (c) Contributors to the Open 3D Engine Project.
+* For complete copyright and license terms please see the LICENSE at the root of this distribution.
+*
+* SPDX-License-Identifier: Apache-2.0 OR MIT
+*
+*/
+
+#include <AzToolsFramework/API/PythonLoader.h>
+
+namespace AzToolsFramework::EmbeddedPython
+{
+    PythonLoader::PythonLoader()
+    {
+    }
+
+    PythonLoader::~PythonLoader()
+    {
+    }
+}
diff --git a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp
new file mode 100644
index 0000000000..351cf69c15
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzToolsFramework/API/PythonLoader.h>
+#include <AzCore/Debug/Trace.h>
+#include <dlfcn.h>
+
+namespace AzToolsFramework::EmbeddedPython
+{
+    PythonLoader::PythonLoader()
+    {
+        constexpr char libPythonName[] = "libpython3.7m.so.1.0";
+        m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL);
+        if (m_embeddedLibPythonHandle == nullptr)
+        {
+            [[maybe_unused]] const char* err = dlerror();
+            AZ_Error("PythonLoader", false, "Failed to load %s with error: %s\n", libPythonName, err ? err : "Unknown Error");
+        }
+    }
+
+    PythonLoader::~PythonLoader()
+    {
+        if (m_embeddedLibPythonHandle)
+        {
+            dlclose(m_embeddedLibPythonHandle);
+        }
+    }
+    
+} // namespace AzToolsFramework::EmbeddedPython
diff --git a/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake
index c2c5a11c4c..3b04a903a4 100644
--- a/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake
@@ -7,4 +7,5 @@
 #
 
 set(FILES
+    AzToolsFramework/API/PythonLoader_Linux.cpp
 )
diff --git a/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake
index c2c5a11c4c..6342747a38 100644
--- a/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake
@@ -7,4 +7,5 @@
 #
 
 set(FILES
+    ../Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp
 )
diff --git a/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake
index c2c5a11c4c..6342747a38 100644
--- a/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake
+++ b/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake
@@ -7,4 +7,5 @@
 #
 
 set(FILES
+    ../Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp
 )
diff --git a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp
index 1aa7b39593..0b3c574e16 100644
--- a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp
@@ -8,6 +8,8 @@
 
 #include <Tests/BoundsTestComponent.h>
 
+#include <AzCore/Math/Obb.h>
+#include <AzCore/Math/IntersectSegment.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 
 namespace UnitTest
@@ -40,6 +42,9 @@ namespace UnitTest
     {
         AzFramework::BoundsRequestBus::Handler::BusConnect(GetEntityId());
         AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(GetEntityId());
+
+        // default local bounds to unit cube
+        m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f));
     }
 
     void BoundsTestComponent::Deactivate()
@@ -57,7 +62,53 @@ namespace UnitTest
 
     AZ::Aabb BoundsTestComponent::GetLocalBounds()
     {
-        return AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f));
+        return m_localBounds;
     }
 
+    void RenderGeometryIntersectionTestComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<RenderGeometryIntersectionTestComponent, BoundsTestComponent>()->Version(1);
+        }
+    }
+
+    void RenderGeometryIntersectionTestComponent::Activate()
+    {
+        BoundsTestComponent::Activate();
+
+        const AZ::EntityId entityId = GetEntityId();
+        AzFramework::EntityContextId contextId = AzFramework::EntityContextId::CreateNull();
+        AzFramework::EntityIdContextQueryBus::EventResult(contextId, entityId, &AzFramework::EntityIdContextQueries::GetOwningContextId);
+        AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusConnect({entityId, contextId});
+    }
+
+    void RenderGeometryIntersectionTestComponent::Deactivate()
+    {
+        AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusDisconnect();
+        BoundsTestComponent::Deactivate();
+    }
+
+    AzFramework::RenderGeometry::RayResult RenderGeometryIntersectionTestComponent::RenderGeometryIntersect(
+        const AzFramework::RenderGeometry::RayRequest& ray)
+    {
+        AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
+        AZ::TransformBus::EventResult(worldFromLocal, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
+
+        AzFramework::RenderGeometry::RayResult rayResult;
+
+        float t = 0.0f;
+        const AZ::Obb obb = GetLocalBounds().GetTransformedObb(worldFromLocal);
+        const AZ::Vector3 rayDirection = ray.m_endWorldPosition - ray.m_startWorldPosition;
+        if (AZ::Intersect::IntersectRayObb(ray.m_startWorldPosition, rayDirection, obb, t))
+        {
+            rayResult.m_worldPosition = ray.m_startWorldPosition + rayDirection * t;
+            rayResult.m_entityAndComponent = AZ::EntityComponentIdPair(GetEntityId(), GetId());
+            rayResult.m_distance = t;
+            rayResult.m_uv = AZ::Vector2::CreateZero();
+            rayResult.m_worldNormal = AZ::Vector3::CreateZero();
+        }
+
+        return rayResult;
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h
index 036f9c8798..2eee3c0a66 100644
--- a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h
+++ b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzFramework/Render/GeometryIntersectionBus.h>
 #include <AzFramework/Visibility/BoundsBus.h>
 #include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
@@ -41,5 +42,24 @@ namespace UnitTest
         // BoundsRequestBus overrides ...
         AZ::Aabb GetWorldBounds() override;
         AZ::Aabb GetLocalBounds() override;
+
+        AZ::Aabb m_localBounds; //!< Local bounds that can be modified for certain tests (defaults to unit cube).
+    };
+
+    class RenderGeometryIntersectionTestComponent
+        : public BoundsTestComponent
+        , public AzFramework::RenderGeometry::IntersectionRequestBus::Handler
+    {
+    public:
+        AZ_EDITOR_COMPONENT(RenderGeometryIntersectionTestComponent, "{6F46B5BF-60DF-4BDD-9BA7-9658E85B99C2}", BoundsTestComponent);
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        // AZ::Component overrides ...
+        void Activate() override;
+        void Deactivate() override;
+
+        // IntersectionRequestBus overrides ...
+        AzFramework::RenderGeometry::RayResult RenderGeometryIntersect(const AzFramework::RenderGeometry::RayRequest& ray) override;
     };
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp
index 9d6c8a4bff..06353b17c5 100644
--- a/Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp
@@ -1116,7 +1116,6 @@ namespace UnitTest
         SerializeContext* GetSerializeContext() override { return m_serializeContext.get(); }
         BehaviorContext*  GetBehaviorContext() override { return nullptr; }
         JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
index 81909ac511..859cc67c41 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
@@ -38,7 +38,7 @@
 #include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 
-#include<Tests/BoundsTestComponent.h>
+#include <Tests/BoundsTestComponent.h>
 
 namespace AZ
 {
@@ -493,12 +493,8 @@ namespace UnitTest
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Then
-        AzToolsFramework::EntityIdList selectedEntities;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            selectedEntities, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetSelectedEntities);
-
-        AzToolsFramework::EntityIdList expectedSelectedEntities = { entity4, entity5, entity6 };
-
+        const AzToolsFramework::EntityIdList selectedEntities = SelectedEntities();
+        const AzToolsFramework::EntityIdList expectedSelectedEntities = { entity4, entity5, entity6 };
         EXPECT_THAT(selectedEntities, UnorderedElementsAreArray(expectedSelectedEntities));
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
     }
@@ -527,12 +523,8 @@ namespace UnitTest
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Then
-        AzToolsFramework::EntityIdList selectedEntities;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            selectedEntities, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetSelectedEntities);
-
-        AzToolsFramework::EntityIdList expectedSelectedEntities = { m_entityId1, entity2, entity3, entity4 };
-
+        const AzToolsFramework::EntityIdList selectedEntities = SelectedEntities();
+        const AzToolsFramework::EntityIdList expectedSelectedEntities = { m_entityId1, entity2, entity3, entity4 };
         EXPECT_THAT(selectedEntities, UnorderedElementsAreArray(expectedSelectedEntities));
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
     }
@@ -946,6 +938,42 @@ namespace UnitTest
         EXPECT_THAT(selectedEntitiesAfter, UnorderedElementsAre(m_entityId1));
     }
 
+    TEST_F(
+        EditorTransformComponentSelectionViewportPickingManipulatorTestFixture, BoundsBetweenCameraAndNearClipPlaneDoesNotIntersectMouseRay)
+    {
+        // move camera to 10 units along the y-axis
+        AzFramework::SetCameraTransform(m_cameraState, AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(10.0f)));
+
+        // send a very narrow bounds for entity1
+        AZ::Entity* entity1 = AzToolsFramework::GetEntityById(m_entityId1);
+        auto* boundTestComponent = entity1->FindComponent<BoundsTestComponent>();
+        boundTestComponent->m_localBounds =
+            AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f, -0.0025f, -0.5f), AZ::Vector3(0.5f, 0.0025f, 0.5f));
+
+        // move entity1 in front of the camera between it and the near clip plane
+        AZ::TransformBus::Event(
+            m_entityId1, &AZ::TransformBus::Events::SetWorldTM, AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(10.05f)));
+        // move entity2 behind entity1
+        AZ::TransformBus::Event(
+            m_entityId2, &AZ::TransformBus::Events::SetWorldTM, AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(15.0f)));
+
+        const auto entity2ScreenPosition = AzFramework::WorldToScreen(AzToolsFramework::GetWorldTranslation(m_entityId2), m_cameraState);
+
+        // click the entity in the viewport
+        m_actionDispatcher->SetStickySelect(true)
+            ->CameraState(m_cameraState)
+            ->MousePosition(entity2ScreenPosition)
+            ->CameraState(m_cameraState)
+            ->MouseLButtonDown()
+            ->MouseLButtonUp();
+
+        // ensure entity1 is not selected as it is before the near clip plane
+        using ::testing::UnorderedElementsAreArray;
+        const AzToolsFramework::EntityIdList selectedEntities = SelectedEntities();
+        const AzToolsFramework::EntityIdList expectedSelectedEntities = { m_entityId2 };
+        EXPECT_THAT(selectedEntities, UnorderedElementsAreArray(expectedSelectedEntities));
+    }
+
     class EditorTransformComponentSelectionViewportPickingManipulatorTestFixtureParam
         : public EditorTransformComponentSelectionViewportPickingManipulatorTestFixture
         , public ::testing::WithParamInterface<bool>
@@ -1635,7 +1663,7 @@ namespace UnitTest
         const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityId1);
 
         // ensure final world positions match
-        EXPECT_TRUE(finalEntityTransform.IsClose(finalTransformWorld, 0.01f));
+        EXPECT_THAT(finalEntityTransform, IsCloseTolerance(finalTransformWorld, 0.01f));
     }
 
     TEST_F(EditorTransformComponentSelectionManipulatorTestFixture, TranslatingEntityWithLinearManipulatorNotifiesOnEntityTransformChanged)
@@ -2753,4 +2781,368 @@ namespace UnitTest
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
     }
 
+    TEST(HandleAccents, CurrentValidEntityIdBecomesHoveredWithNoSelectionAndUnstickySelect)
+    {
+        namespace azvi = AzToolsFramework::ViewportInteraction;
+
+        const AZ::EntityId currentEntityId = AZ::EntityId(12345);
+        AZ::EntityId hoveredEntityEntityId;
+
+        AzToolsFramework::HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = false;
+        handleAccentsContext.m_hasSelectedEntities = false;
+        handleAccentsContext.m_usingBoxSelect = false;
+        handleAccentsContext.m_usingStickySelect = false;
+
+        bool currentEntityIdAccentAdded = false;
+        AzToolsFramework::HandleAccents(
+            currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None),
+            [&currentEntityIdAccentAdded, currentEntityId](const AZ::EntityId entityId, const bool accent)
+            {
+                if (entityId == currentEntityId && accent)
+                {
+                    currentEntityIdAccentAdded = true;
+                }
+            });
+
+        using ::testing::Eq;
+        using ::testing::IsTrue;
+        EXPECT_THAT(currentEntityId, Eq(hoveredEntityEntityId));
+        EXPECT_THAT(currentEntityIdAccentAdded, IsTrue());
+    }
+
+    TEST(HandleAccents, CurrentValidEntityIdBecomesHoveredWithSelectionAndUnstickySelect)
+    {
+        namespace azvi = AzToolsFramework::ViewportInteraction;
+
+        const AZ::EntityId currentEntityId = AZ::EntityId(12345);
+        AZ::EntityId hoveredEntityEntityId;
+
+        AzToolsFramework::HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = false;
+        handleAccentsContext.m_hasSelectedEntities = true;
+        handleAccentsContext.m_usingBoxSelect = false;
+        handleAccentsContext.m_usingStickySelect = false;
+
+        bool currentEntityIdAccentAdded = false;
+        AzToolsFramework::HandleAccents(
+            currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None),
+            [&currentEntityIdAccentAdded, currentEntityId](const AZ::EntityId entityId, const bool accent)
+            {
+                if (entityId == currentEntityId && accent)
+                {
+                    currentEntityIdAccentAdded = true;
+                }
+            });
+
+        using ::testing::Eq;
+        using ::testing::IsTrue;
+        EXPECT_THAT(currentEntityId, Eq(hoveredEntityEntityId));
+        EXPECT_THAT(currentEntityIdAccentAdded, IsTrue());
+    }
+
+    TEST(HandleAccents, CurrentValidEntityIdDoesNotBecomeHoveredWithSelectionUnstickySelectAndInvalidButton)
+    {
+        namespace azvi = AzToolsFramework::ViewportInteraction;
+
+        const AZ::EntityId currentEntityId = AZ::EntityId(12345);
+        AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321);
+
+        AzToolsFramework::HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = false;
+        handleAccentsContext.m_hasSelectedEntities = false;
+        handleAccentsContext.m_usingBoxSelect = false;
+        handleAccentsContext.m_usingStickySelect = false;
+
+        bool hoveredEntityIdAccentRemoved = false;
+        AzToolsFramework::HandleAccents(
+            currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::Middle),
+            [&hoveredEntityIdAccentRemoved, hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent)
+            {
+                if (entityId == hoveredEntityEntityId && !accent)
+                {
+                    hoveredEntityIdAccentRemoved = true;
+                }
+            });
+
+        using ::testing::Eq;
+        using ::testing::IsFalse;
+        using ::testing::IsTrue;
+        EXPECT_THAT(hoveredEntityEntityId.IsValid(), IsFalse());
+        EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue());
+    }
+
+    TEST(HandleAccents, CurrentValidEntityIdDoesNotBecomeHoveredWithSelectionUnstickySelectAndDoingBoxSelect)
+    {
+        namespace azvi = AzToolsFramework::ViewportInteraction;
+
+        const AZ::EntityId currentEntityId = AZ::EntityId(12345);
+        AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321);
+
+        AzToolsFramework::HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = false;
+        handleAccentsContext.m_hasSelectedEntities = false;
+        handleAccentsContext.m_usingBoxSelect = true;
+        handleAccentsContext.m_usingStickySelect = false;
+
+        bool hoveredEntityIdAccentRemoved = false;
+        AzToolsFramework::HandleAccents(
+            currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None),
+            [&hoveredEntityIdAccentRemoved, hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent)
+            {
+                if (entityId == hoveredEntityEntityId && !accent)
+                {
+                    hoveredEntityIdAccentRemoved = true;
+                }
+            });
+
+        using ::testing::Eq;
+        using ::testing::IsFalse;
+        using ::testing::IsTrue;
+        EXPECT_THAT(hoveredEntityEntityId.IsValid(), IsFalse());
+        EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue());
+    }
+
+    // mimics the mouse moving off of hovered entity onto a new entity with sticky select enabled
+    TEST(HandleAccents, CurrentValidEntityIdDoesNotBecomeHoveredWithSelectionAndStickySelect)
+    {
+        namespace azvi = AzToolsFramework::ViewportInteraction;
+
+        const AZ::EntityId currentEntityId = AZ::EntityId(12345);
+        AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321);
+
+        AzToolsFramework::HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = false;
+        handleAccentsContext.m_hasSelectedEntities = true;
+        handleAccentsContext.m_usingBoxSelect = false;
+        handleAccentsContext.m_usingStickySelect = true;
+
+        bool hoveredEntityIdAccentRemoved = false;
+        AzToolsFramework::HandleAccents(
+            currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None),
+            [&hoveredEntityIdAccentRemoved, hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent)
+            {
+                if (entityId == hoveredEntityEntityId && !accent)
+                {
+                    hoveredEntityIdAccentRemoved = true;
+                }
+            });
+
+        using ::testing::Eq;
+        using ::testing::IsFalse;
+        using ::testing::IsTrue;
+        EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue());
+        EXPECT_THAT(hoveredEntityEntityId.IsValid(), IsFalse());
+    }
+
+    TEST(HandleAccents, CurrentValidEntityIdDoesBecomeHoveredWithSelectionAndStickySelectAndCtrl)
+    {
+        namespace azvi = AzToolsFramework::ViewportInteraction;
+
+        const AZ::EntityId currentEntityId = AZ::EntityId(12345);
+        AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321);
+
+        AzToolsFramework::HandleAccentsContext handleAccentsContext;
+        handleAccentsContext.m_ctrlHeld = true;
+        handleAccentsContext.m_hasSelectedEntities = true;
+        handleAccentsContext.m_usingBoxSelect = false;
+        handleAccentsContext.m_usingStickySelect = true;
+
+        bool currentEntityIdAccentAdded = false;
+        bool hoveredEntityIdAccentRemoved = false;
+        AzToolsFramework::HandleAccents(
+            currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None),
+            [&hoveredEntityIdAccentRemoved, &currentEntityIdAccentAdded, currentEntityId,
+             hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent)
+            {
+                if (entityId == currentEntityId && accent)
+                {
+                    currentEntityIdAccentAdded = true;
+                }
+
+                if (entityId == hoveredEntityEntityId && !accent)
+                {
+                    hoveredEntityIdAccentRemoved = true;
+                }
+            });
+
+        using ::testing::Eq;
+        using ::testing::IsFalse;
+        using ::testing::IsTrue;
+        EXPECT_THAT(currentEntityIdAccentAdded, IsTrue());
+        EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue());
+        EXPECT_THAT(hoveredEntityEntityId, Eq(AZ::EntityId(12345)));
+    }
+
+    class EditorTransformComponentSelectionRenderGeometryIntersectionFixture : public ToolsApplicationFixture
+    {
+    public:
+        void SetUpEditorFixtureImpl() override
+        {
+            auto* app = GetApplication();
+            // register a simple component implementing BoundsRequestBus and EditorComponentSelectionRequestsBus
+            app->RegisterComponentDescriptor(BoundsTestComponent::CreateDescriptor());
+            // register a component implementing RenderGeometry::IntersectionRequestBus
+            app->RegisterComponentDescriptor(RenderGeometryIntersectionTestComponent::CreateDescriptor());
+
+            auto createEntityWithGeometryIntersectionFn = [](const char* entityName)
+            {
+                AZ::Entity* entity = nullptr;
+                AZ::EntityId entityId = CreateDefaultEditorEntity(entityName, &entity);
+
+                entity->Deactivate();
+                entity->CreateComponent<RenderGeometryIntersectionTestComponent>();
+                entity->Activate();
+
+                return entityId;
+            };
+
+            m_entityIdGround = createEntityWithGeometryIntersectionFn("Entity1");
+            m_entityIdBox = createEntityWithGeometryIntersectionFn("Entity2");
+
+            if (auto* ground = AzToolsFramework::GetEntityById(m_entityIdGround)->FindComponent<RenderGeometryIntersectionTestComponent>())
+            {
+                ground->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-10.0f, -10.0f, -0.5f), AZ::Vector3(10.0f, 10.0f, 0.5f));
+            }
+
+            AzToolsFramework::SetWorldTransform(m_entityIdGround, AZ::Transform::CreateTranslation(AZ::Vector3(0.0f, 10.0f, 5.0f)));
+
+            if (auto* box = AzToolsFramework::GetEntityById(m_entityIdBox)->FindComponent<RenderGeometryIntersectionTestComponent>())
+            {
+                box->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f));
+            }
+
+            AzToolsFramework::SetWorldTransform(
+                m_entityIdBox,
+                AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                    AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(45.0f)), AZ::Vector3(0.0f, 10.0f, 7.0f)));
+        }
+
+        AZ::EntityId m_entityIdGround;
+        AZ::EntityId m_entityIdBox;
+    };
+
+    using EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture =
+        IndirectCallManipulatorViewportInteractionFixtureMixin<EditorTransformComponentSelectionRenderGeometryIntersectionFixture>;
+
+    TEST_F(
+        EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture, BoxCanBePlacedOnMeshSurfaceUsingSurfaceManipulator)
+    {
+        // camera (go to position format) - 0.00, 20.00, 12.00, -35.00, -180.00
+        m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f);
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-180.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-35.0f)),
+                AZ::Vector3(0.0f, 20.0f, 12.0f)));
+
+        // the initial starting position of the entity
+        const auto initialTransformWorld = AzToolsFramework::GetWorldTransform(m_entityIdBox);
+        // where the entity should end up (snapped to the larger ground surface)
+        const auto finalTransformWorld =
+            AZ::Transform::CreateFromQuaternionAndTranslation(initialTransformWorld.GetRotation(), AZ::Vector3(2.5f, 12.5f, 5.5f));
+
+        // calculate the position in screen space of the initial position of the entity
+        const auto initialPositionScreen = AzFramework::WorldToScreen(initialTransformWorld.GetTranslation(), m_cameraState);
+        // calculate the position in screen space of the final position of the entity
+        const auto finalPositionScreen = AzFramework::WorldToScreen(finalTransformWorld.GetTranslation(), m_cameraState);
+
+        // select the entity (this will cause the manipulators to appear in EditorTransformComponentSelection)
+        AzToolsFramework::SelectEntity(m_entityIdBox);
+
+        // press and drag the mouse (starting where the surface manipulator is)
+        m_actionDispatcher->CameraState(m_cameraState)
+            ->MousePosition(initialPositionScreen)
+            ->MouseLButtonDown()
+            ->MousePosition(finalPositionScreen)
+            ->MouseLButtonUp();
+
+        // read back the position of the entity now
+        const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox);
+
+        // ensure final world positions match
+        EXPECT_THAT(finalEntityTransform, IsCloseTolerance(finalTransformWorld, 0.01f));
+    }
+
+    TEST_F(
+        EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture,
+        SurfaceManipulatorFollowsMouseAtDefaultEditorDistanceFromCameraWhenNoMeshIntersection)
+    {
+        // camera (go to position format) - 0.00, 25.00, 12.00, 0.00, -180.00
+        m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f);
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-180.0f)), AZ::Vector3(0.0f, 25.0f, 12.0f)));
+
+        // the initial starting position of the entity
+        const auto initialTransformWorld = AzToolsFramework::GetWorldTransform(m_entityIdBox);
+        // where the entity should end up (default distance away from the camera/near clip under where the mouse is)
+        const auto finalTransformWorld =
+            AZ::Transform::CreateFromQuaternionAndTranslation(initialTransformWorld.GetRotation(), AZ::Vector3(0.0f, 14.9f, 12.0f));
+
+        // calculate the position in screen space of the initial position of the entity
+        const auto initialPositionScreen = AzFramework::WorldToScreen(initialTransformWorld.GetTranslation(), m_cameraState);
+        // calculate the position in screen space of the final position of the entity
+        const auto finalPositionScreen = AzFramework::WorldToScreen(finalTransformWorld.GetTranslation(), m_cameraState);
+
+        // select the entity (this will cause the manipulators to appear in EditorTransformComponentSelection)
+        AzToolsFramework::SelectEntity(m_entityIdBox);
+
+        // press and drag the mouse (starting where the surface manipulator is)
+        m_actionDispatcher->CameraState(m_cameraState)
+            ->MousePosition(initialPositionScreen)
+            ->MouseLButtonDown()
+            ->MousePosition(finalPositionScreen)
+            ->MouseLButtonUp();
+
+        // read back the position of the entity now
+        const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox);
+
+        const auto viewportRay = AzToolsFramework::ViewportInteraction::ViewportScreenToWorldRay(m_cameraState, initialPositionScreen);
+        const auto distanceAway = (finalEntityTransform.GetTranslation() - viewportRay.origin).GetLength();
+
+        // ensure final world positions match
+        EXPECT_THAT(finalEntityTransform, IsCloseTolerance(finalTransformWorld, 0.01f));
+        // ensure distance away is what we expect
+        EXPECT_NEAR(distanceAway, AzToolsFramework::GetDefaultEntityPlacementDistance(), 0.001f);
+    }
+
+    TEST_F(
+        EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture,
+        MiddleMouseButtonWithShiftAndCtrlHeldOnMeshSurfaceWillSnapSelectedEntityToIntersectionPoint)
+    {
+        // camera (go to position format) - 21.00, 8.00, 11.00, -22.00, 150.00
+        m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f);
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(150.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-22.0f)),
+                AZ::Vector3(21.0f, 8.0f, 11.0f)));
+
+        // position the ground entity
+        AzToolsFramework::SetWorldTransform(
+            m_entityIdGround,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(40.0f)) * AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(60.0f)),
+                AZ::Vector3(14.0f, -6.0f, 5.0f)));
+
+        // select the other entity (a 1x1x1 box)
+        AzToolsFramework::SelectEntity(m_entityIdBox);
+
+        // expected world position (value taken from editor scenario)
+        const auto expectedWorldPosition = AZ::Vector3(13.606657f, -2.6753534f, 5.9827675f);
+        const auto screenPosition = AzFramework::WorldToScreen(expectedWorldPosition, m_cameraState);
+
+        // perform snap action
+        m_actionDispatcher->CameraState(m_cameraState)
+            ->MousePosition(screenPosition)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Shift)
+            ->MouseMButtonDown();
+
+        // read back the current entity transform after placement
+        const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox);
+        EXPECT_THAT(finalEntityTransform.GetTranslation(), IsCloseTolerance(expectedWorldPosition, 0.01f));
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp
index d08c9646a2..228dea6b7c 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp
@@ -10,21 +10,23 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h>
+#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
+#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
 #include <AzTest/AzTest.h>
 #include <AzToolsFramework/Application/ToolsApplication.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/Manipulators/EditorVertexSelection.h>
 #include <AzToolsFramework/Manipulators/HoverSelection.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/TranslationManipulators.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
-#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
-#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h>
-#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
-#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
-#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
+#include <Tests/Utils/Printers.h>
 
-using namespace AzToolsFramework;
+#include <Tests/BoundsTestComponent.h>
 
 namespace UnitTest
 {
@@ -41,20 +43,65 @@ namespace UnitTest
         void Disconnect();
 
         // FixedVerticesRequestBus/VariableVerticesRequestBus ...
-        bool GetVertex(size_t index, AZ::Vector3& vertex) const override { return m_vertexContainer.GetVertex(index, vertex); }
-        bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override { return m_vertexContainer.UpdateVertex(index, vertex); };
-        void AddVertex(const AZ::Vector3& vertex) override { m_vertexContainer.AddVertex(vertex); }
-        bool InsertVertex(size_t index, const AZ::Vector3& vertex) override { return m_vertexContainer.InsertVertex(index, vertex); }
-        bool RemoveVertex(size_t index) override { return m_vertexContainer.RemoveVertex(index); }
-        void SetVertices(const AZStd::vector<AZ::Vector3>& vertices) override { m_vertexContainer.SetVertices(vertices); };
-        void ClearVertices() override { m_vertexContainer.Clear(); }
-        size_t Size() const override { return m_vertexContainer.Size(); }
-        bool Empty() const override { return m_vertexContainer.Empty(); }
+        bool GetVertex(size_t index, AZ::Vector3& vertex) const override;
+        bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override;
+        void AddVertex(const AZ::Vector3& vertex) override;
+        bool InsertVertex(size_t index, const AZ::Vector3& vertex) override;
+        bool RemoveVertex(size_t index) override;
+        void SetVertices(const AZStd::vector<AZ::Vector3>& vertices) override;
+        void ClearVertices() override;
+        size_t Size() const override;
+        bool Empty() const override;
 
     private:
         AZ::VertexContainer<AZ::Vector3> m_vertexContainer;
     };
 
+    bool TestVariableVerticesVertexContainer::GetVertex(size_t index, AZ::Vector3& vertex) const
+    {
+        return m_vertexContainer.GetVertex(index, vertex);
+    }
+
+    bool TestVariableVerticesVertexContainer::UpdateVertex(size_t index, const AZ::Vector3& vertex)
+    {
+        return m_vertexContainer.UpdateVertex(index, vertex);
+    }
+
+    void TestVariableVerticesVertexContainer::AddVertex(const AZ::Vector3& vertex)
+    {
+        m_vertexContainer.AddVertex(vertex);
+    }
+
+    bool TestVariableVerticesVertexContainer::InsertVertex(size_t index, const AZ::Vector3& vertex)
+    {
+        return m_vertexContainer.InsertVertex(index, vertex);
+    }
+
+    bool TestVariableVerticesVertexContainer::RemoveVertex(size_t index)
+    {
+        return m_vertexContainer.RemoveVertex(index);
+    }
+
+    void TestVariableVerticesVertexContainer::SetVertices(const AZStd::vector<AZ::Vector3>& vertices)
+    {
+        m_vertexContainer.SetVertices(vertices);
+    }
+
+    void TestVariableVerticesVertexContainer::ClearVertices()
+    {
+        m_vertexContainer.Clear();
+    }
+
+    size_t TestVariableVerticesVertexContainer::Size() const
+    {
+        return m_vertexContainer.Size();
+    }
+
+    bool TestVariableVerticesVertexContainer::Empty() const
+    {
+        return m_vertexContainer.Empty();
+    }
+
     void TestVariableVerticesVertexContainer::Connect(const AZ::EntityId entityId)
     {
         AZ::VariableVerticesRequestBus<AZ::Vector3>::Handler::BusConnect(entityId);
@@ -67,17 +114,18 @@ namespace UnitTest
         AZ::VariableVerticesRequestBus<AZ::Vector3>::Handler::BusDisconnect();
     }
 
-    class TestEditorVertexSelectionVariable
-        : public EditorVertexSelectionVariable<AZ::Vector3>
+    class TestEditorVertexSelectionVariable : public AzToolsFramework::EditorVertexSelectionVariable<AZ::Vector3>
     {
     public:
         AZ_CLASS_ALLOCATOR(TestEditorVertexSelectionVariable, AZ::SystemAllocator, 0)
 
-        void ShowVertexDeletionWarning() override { /*noop*/ }
+        void ShowVertexDeletionWarning() override
+        {
+            // noop
+        }
     };
 
-    class EditorVertexSelectionFixture
-        : public ToolsApplicationFixture
+    class EditorVertexSelectionFixture : public ToolsApplicationFixture
     {
     public:
         void SetUpEditorFixtureImpl() override
@@ -111,26 +159,25 @@ namespace UnitTest
 
     void EditorVertexSelectionFixture::RecreateVertexSelection()
     {
+        namespace aztf = AzToolsFramework;
         m_vertexSelection.Create(
-            AZ::EntityComponentIdPair(m_entityId, TestComponentId),
-            g_mainManipulatorManagerId, AZStd::make_unique<NullHoverSelection>(),
-            TranslationManipulators::Dimensions::Three, ConfigureTranslationManipulatorAppearance3d);
+            AZ::EntityComponentIdPair(m_entityId, TestComponentId), aztf::g_mainManipulatorManagerId,
+            AZStd::make_unique<aztf::NullHoverSelection>(), aztf::TranslationManipulators::Dimensions::Three,
+            aztf::ConfigureTranslationManipulatorAppearance3d);
     }
 
     void EditorVertexSelectionFixture::PopulateVertices()
     {
         for (size_t vertIndex = 0; vertIndex < EditorVertexSelectionFixture::VertexCount; ++vertIndex)
         {
-            InsertVertexAfter(
-                AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0, AZ::Vector3::CreateZero());
+            AzToolsFramework::InsertVertexAfter(AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0, AZ::Vector3::CreateZero());
         }
     }
     void EditorVertexSelectionFixture::ClearVertices()
     {
         for (size_t vertIndex = 0; vertIndex < EditorVertexSelectionFixture::VertexCount; ++vertIndex)
         {
-            SafeRemoveVertex<AZ::Vector3>(
-                AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0);
+            AzToolsFramework::SafeRemoveVertex<AZ::Vector3>(AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0);
         }
     }
 
@@ -187,7 +234,7 @@ namespace UnitTest
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // When
         // just provide a placeholder mouse interaction event in this case
-        m_vertexSelection.SnapVerticesToTerrain(ViewportInteraction::MouseInteractionEvent{});
+        m_vertexSelection.SnapVerticesToSurface(AzToolsFramework::ViewportInteraction::MouseInteractionEvent{});
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -196,8 +243,7 @@ namespace UnitTest
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
     }
 
-    using EditorVertexSelectionManipulatorFixture =
-        IndirectCallManipulatorViewportInteractionFixtureMixin<EditorVertexSelectionFixture>;
+    using EditorVertexSelectionManipulatorFixture = IndirectCallManipulatorViewportInteractionFixtureMixin<EditorVertexSelectionFixture>;
 
     TEST_F(EditorVertexSelectionManipulatorFixture, CannotDeleteAllVertices)
     {
@@ -205,25 +251,23 @@ namespace UnitTest
 
         const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, TestComponentId);
 
-        const float horizontalPositions[] = {-1.5f, -0.5f, 0.5f, 1.5f};
-        for (size_t vertIndex = 0; vertIndex < std::size(horizontalPositions); ++vertIndex)
+        const float horizontalPositions[] = { -1.5f, -0.5f, 0.5f, 1.5f };
+        for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex)
         {
-            InsertVertexAfter(
-                entityComponentIdPair, vertIndex, AZ::Vector3(horizontalPositions[vertIndex], 5.0f, 0.0f));
+            AzToolsFramework::InsertVertexAfter(entityComponentIdPair, vertIndex, AZ::Vector3(horizontalPositions[vertIndex], 5.0f, 0.0f));
         }
 
-        // rebuild the vertex selection after adding the new verts
+        // rebuild the vertex selection after adding the new vertices
         RecreateVertexSelection();
 
         // build a vector of the vertex positions in screen space
         AZStd::vector<AzFramework::ScreenPoint> vertexScreenPositions;
-        for (size_t vertIndex = 0; vertIndex < std::size(horizontalPositions); ++vertIndex)
+        for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex)
         {
-            AZ::Vector3 localVertex;
+            AZ::Vector3 localVertex = AZ::Vector3::CreateZero();
             bool found = false;
             AZ::FixedVerticesRequestBus<AZ::Vector3>::EventResult(
-                found, m_entityId, &AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::GetVertex,
-                vertIndex, localVertex);
+                found, m_entityId, &AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::GetVertex, vertIndex, localVertex);
 
             if (found)
             {
@@ -266,9 +310,9 @@ namespace UnitTest
         const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, TestComponentId);
 
         // add a single vertex (in front of the camera)
-        InsertVertexAfter(entityComponentIdPair, 0, AZ::Vector3::CreateAxisY(5.0f));
+        AzToolsFramework::InsertVertexAfter(entityComponentIdPair, 0, AZ::Vector3::CreateAxisY(5.0f));
 
-        // rebuild the vertex selection after adding the new verts
+        // rebuild the vertex selection after adding the new vertices
         RecreateVertexSelection();
 
         AzFramework::ScreenPoint vertexScreenPosition;
@@ -299,4 +343,132 @@ namespace UnitTest
         // deleting the last vertex through a manipulator is disallowed - size should remain the same
         EXPECT_THAT(vertexCountAfter, Eq(1));
     }
+
+    static AZ::EntityId CreateEntityForVertexIntersectionPlacement(EditorVertexSelectionManipulatorFixture& fixture)
+    {
+        auto* app = fixture.GetApplication();
+        app->RegisterComponentDescriptor(BoundsTestComponent::CreateDescriptor());
+        app->RegisterComponentDescriptor(RenderGeometryIntersectionTestComponent::CreateDescriptor());
+
+        AZ::Entity* entityGround = nullptr;
+        AZ::EntityId entityIdGround = CreateDefaultEditorEntity("EntityGround", &entityGround);
+
+        entityGround->Deactivate();
+        auto ground = entityGround->CreateComponent<RenderGeometryIntersectionTestComponent>();
+        entityGround->Activate();
+
+        ground->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-10.0f, -10.0f, -0.5f), AZ::Vector3(10.0f, 10.0f, 0.5f));
+
+        return entityIdGround;
+    }
+
+    static AZStd::vector<AzFramework::ScreenPoint> SetupVertices(
+        const AZ::EntityId entityId, EditorVertexSelectionManipulatorFixture& fixture)
+    {
+        const auto entityComponentIdPair = AZ::EntityComponentIdPair(entityId, TestComponentId);
+        const float horizontalPositions[] = { -3.0f, -1.0f, 1.0f, 3.0f };
+        for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex)
+        {
+            AzToolsFramework::InsertVertexAfter(entityComponentIdPair, vertIndex, AZ::Vector3(horizontalPositions[vertIndex], 0.0f, 0.0f));
+        }
+
+        // rebuild the vertex selection after adding the new vertices
+        fixture.RecreateVertexSelection();
+
+        // build a vector of the vertex positions in screen space
+        AZStd::vector<AzFramework::ScreenPoint> vertexScreenPositions;
+        for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex)
+        {
+            AZ::Vector3 localVertex;
+            bool found = false;
+            AZ::FixedVerticesRequestBus<AZ::Vector3>::EventResult(
+                found, entityId, &AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::GetVertex, vertIndex, localVertex);
+
+            if (found)
+            {
+                const AZ::Vector3 worldVertex = AzToolsFramework::GetWorldTransform(entityId).TransformPoint(localVertex);
+                vertexScreenPositions.push_back(AzFramework::WorldToScreen(worldVertex, fixture.m_cameraState));
+            }
+        }
+
+        return vertexScreenPositions;
+    }
+
+    AzToolsFramework::ViewportInteraction::MouseInteractionEvent BuildMiddleMouseDownEvent(
+        const AzFramework::ScreenPoint& screenPosition, const AzFramework::ViewportId viewportId)
+    {
+        AzToolsFramework::ViewportInteraction::MousePick mousePick;
+        mousePick.m_screenCoordinates = screenPosition;
+
+        AzToolsFramework::ViewportInteraction::MouseInteraction mouseInteraction;
+        mouseInteraction.m_interactionId.m_cameraId = AZ::EntityId();
+        mouseInteraction.m_interactionId.m_viewportId = viewportId;
+        mouseInteraction.m_mouseButtons =
+            AzToolsFramework::ViewportInteraction::MouseButtonsFromButton(AzToolsFramework::ViewportInteraction::MouseButton::Middle);
+        mouseInteraction.m_mousePick = mousePick;
+        mouseInteraction.m_keyboardModifiers = AzToolsFramework::ViewportInteraction::KeyboardModifiers(
+            static_cast<AZ::u32>(AzToolsFramework::ViewportInteraction::KeyboardModifier::Shift) |
+            static_cast<AZ::u32>(AzToolsFramework::ViewportInteraction::KeyboardModifier::Ctrl));
+
+        return AzToolsFramework::ViewportInteraction::MouseInteractionEvent(
+            mouseInteraction, AzToolsFramework::ViewportInteraction::MouseEvent::Down, /*captured=*/false);
+    }
+
+    TEST_F(EditorVertexSelectionManipulatorFixture, VertexPlacedWhereIntersectionPointIsFoundWithCustomReferenceSpace)
+    {
+        const AZ::EntityId entityIdGround = CreateEntityForVertexIntersectionPlacement(*this);
+
+        // position ground
+        AzToolsFramework::SetWorldTransform(
+            entityIdGround,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-20.0f)) * AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(-40.0f)) *
+                    AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(60.0f)),
+                AZ::Vector3(14.0f, -6.0f, 5.0f)));
+
+        // camera (go to position format) - 12.00, 18.00, 16.00, -38.00, -175.00
+        m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f);
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-175.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-38.0f)),
+                AZ::Vector3(12.0f, 18.0f, 16.0f)));
+
+        // create orientated and scaled transform for vertex selection entity transform
+        auto vertexSelectionTransform = AZ::Transform::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(45.0f)), AZ::Vector3(14.0f, 7.0f, 5.0f));
+        vertexSelectionTransform.MultiplyByUniformScale(3.0f);
+
+        // set the initial starting position of the vertex selection
+        AzToolsFramework::SetWorldTransform(m_entityId, vertexSelectionTransform);
+
+        auto vertexScreenPositions = SetupVertices(m_entityId, *this);
+
+        // press and drag the mouse (starting where the surface manipulator is)
+        // select each vertex (by holding ctrl)
+        m_actionDispatcher->CameraState(m_cameraState)->MousePosition(vertexScreenPositions[0])->MouseLButtonDown()->MouseLButtonUp();
+
+        const auto finalPositionWorld = AZ::Vector3(14.3573294f, -8.94695091f, 7.08627319f);
+        // calculate the position in screen space of the final position of the entity
+        const auto finalPositionScreen = AzFramework::WorldToScreen(finalPositionWorld, m_cameraState);
+
+        auto middleMouseDownEvent =
+            BuildMiddleMouseDownEvent(finalPositionScreen, m_viewportManipulatorInteraction->GetViewportInteraction().GetViewportId());
+
+        // explicitly handle mouse event in vertex selection instance
+        m_vertexSelection.HandleMouse(middleMouseDownEvent);
+
+        // read back the position of the vertex now
+        AZ::Vector3 localVertex = AZ::Vector3::CreateZero();
+        bool found = false;
+        AZ::FixedVerticesRequestBus<AZ::Vector3>::EventResult(
+            found, m_entityId, &AZ::FixedVerticesRequestBus<AZ::Vector3>::Handler::GetVertex, 0, localVertex);
+
+        // transform to world space
+        const AZ::Vector3 worldVertex = vertexSelectionTransform.TransformPoint(localVertex);
+
+        EXPECT_THAT(found, ::testing::IsTrue());
+        // ensure final world positions match
+        EXPECT_THAT(worldVertex, IsCloseTolerance(finalPositionWorld, 0.01f));
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityFixture.cpp
new file mode 100644
index 0000000000..d80ecebce0
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityFixture.cpp
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Tests/Entity/ReadOnly/ReadOnlyEntityFixture.h>
+
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+
+namespace AzToolsFramework
+{
+    void ReadOnlyEntityFixture::SetUpEditorFixtureImpl()
+    {
+        // 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 
+        // in the unit tests.
+        AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
+
+        m_readOnlyEntityPublicInterface = AZ::Interface<ReadOnlyEntityPublicInterface>::Get();
+        ASSERT_TRUE(m_readOnlyEntityPublicInterface != nullptr);
+
+        GenerateTestHierarchy();
+    }
+
+    void ReadOnlyEntityFixture::TearDownEditorFixtureImpl()
+    {
+    }
+
+    void ReadOnlyEntityFixture::GenerateTestHierarchy() 
+    {
+        /*
+        *   Root
+        *   |_  Child
+        *       |_  GrandChild1
+        *       |_  GrandChild2
+        */
+
+        m_entityMap[RootEntityName] =           CreateEditorEntity(RootEntityName, AZ::EntityId());
+        m_entityMap[ChildEntityName] =          CreateEditorEntity(ChildEntityName, m_entityMap[RootEntityName]);
+        m_entityMap[GrandChild1EntityName] =    CreateEditorEntity(GrandChild1EntityName, m_entityMap[ChildEntityName]);
+        m_entityMap[GrandChild2EntityName] =    CreateEditorEntity(GrandChild2EntityName, m_entityMap[ChildEntityName]);
+    }
+
+    AZ::EntityId ReadOnlyEntityFixture::CreateEditorEntity(const char* name, AZ::EntityId parentId)
+    {
+        AZ::Entity* entity = nullptr;
+        UnitTest::CreateDefaultEditorEntity(name, &entity);
+
+        // Parent
+        AZ::TransformBus::Event(entity->GetId(), &AZ::TransformInterface::SetParent, parentId);
+
+        return entity->GetId();
+    }
+
+    ReadOnlyHandlerAlwaysTrue::ReadOnlyHandlerAlwaysTrue()
+    {
+        auto editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+        EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+        ReadOnlyEntityQueryRequestBus::Handler::BusConnect(editorEntityContextId);
+    }
+
+    ReadOnlyHandlerAlwaysTrue::~ReadOnlyHandlerAlwaysTrue()
+    {
+        ReadOnlyEntityQueryRequestBus::Handler::BusDisconnect();
+
+        if (auto readOnlyEntityQueryInterface = AZ::Interface<ReadOnlyEntityQueryInterface>::Get())
+        {
+            readOnlyEntityQueryInterface->RefreshReadOnlyStateForAllEntities();
+        }
+    }
+
+    void ReadOnlyHandlerAlwaysTrue::IsReadOnly([[maybe_unused]] const AZ::EntityId& entityId, bool& isReadOnly)
+    {
+        isReadOnly = true;
+    }
+
+    ReadOnlyHandlerAlwaysFalse::ReadOnlyHandlerAlwaysFalse()
+    {
+        auto editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+        EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+        ReadOnlyEntityQueryRequestBus::Handler::BusConnect(editorEntityContextId);
+    }
+
+    ReadOnlyHandlerAlwaysFalse::~ReadOnlyHandlerAlwaysFalse()
+    {
+        ReadOnlyEntityQueryRequestBus::Handler::BusDisconnect();
+
+        if (auto readOnlyEntityQueryInterface = AZ::Interface<ReadOnlyEntityQueryInterface>::Get())
+        {
+            readOnlyEntityQueryInterface->RefreshReadOnlyStateForAllEntities();
+        }
+    }
+
+    ReadOnlyHandlerEntityId::ReadOnlyHandlerEntityId(AZ::EntityId entityId)
+        : m_entityId(entityId)
+    {
+        auto editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+        EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+        ReadOnlyEntityQueryRequestBus::Handler::BusConnect(editorEntityContextId);
+    }
+
+    ReadOnlyHandlerEntityId::~ReadOnlyHandlerEntityId()
+    {
+        ReadOnlyEntityQueryRequestBus::Handler::BusDisconnect();
+
+        if (auto readOnlyEntityQueryInterface = AZ::Interface<ReadOnlyEntityQueryInterface>::Get())
+        {
+            readOnlyEntityQueryInterface->RefreshReadOnlyStateForAllEntities();
+        }
+    }
+
+    void ReadOnlyHandlerEntityId::IsReadOnly(const AZ::EntityId& entityId, bool& isReadOnly)
+    {
+        if (entityId == m_entityId)
+        {
+            isReadOnly = true;
+        }
+    }
+}
diff --git a/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityFixture.h b/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityFixture.h
new file mode 100644
index 0000000000..72fff56c6a
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityFixture.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/UnitTest/TestTypes.h>
+
+#include <AzTest/AzTest.h>
+
+#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityBus.h>
+#include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h>
+
+namespace AzToolsFramework
+{
+    class ReadOnlyEntityFixture
+        : public UnitTest::ToolsApplicationFixture
+    {
+    protected:
+        void SetUpEditorFixtureImpl() override;
+        void TearDownEditorFixtureImpl() override;
+
+        void GenerateTestHierarchy();
+        AZ::EntityId CreateEditorEntity(const char* name, AZ::EntityId parentId);
+
+        AZStd::unordered_map<AZStd::string, AZ::EntityId> m_entityMap;
+
+        ReadOnlyEntityPublicInterface* m_readOnlyEntityPublicInterface = nullptr;
+
+    public:
+        inline static const char* RootEntityName = "Root";
+        inline static const char* ChildEntityName = "Child";
+        inline static const char* GrandChild1EntityName = "GrandChild1";
+        inline static const char* GrandChild2EntityName = "GrandChild2";
+    };
+
+    class ReadOnlyHandlerAlwaysTrue
+        : public ReadOnlyEntityQueryRequestBus::Handler
+    {
+    public:
+        ReadOnlyHandlerAlwaysTrue();
+        ~ReadOnlyHandlerAlwaysTrue();
+
+        // ReadOnlyEntityQueryNotificationBus overrides ...
+        void IsReadOnly(const AZ::EntityId& entityId, bool& isReadOnly) override;
+    };
+
+    class ReadOnlyHandlerAlwaysFalse
+        : public ReadOnlyEntityQueryRequestBus::Handler
+    {
+    public:
+        ReadOnlyHandlerAlwaysFalse();
+        ~ReadOnlyHandlerAlwaysFalse();
+
+        // ReadOnlyEntityQueryNotificationBus overrides ...
+        void IsReadOnly([[maybe_unused]] const AZ::EntityId& entityId, [[maybe_unused]] bool& isReadOnly) override {}
+    };
+
+    class ReadOnlyHandlerEntityId
+        : public ReadOnlyEntityQueryRequestBus::Handler
+    {
+    public:
+        ReadOnlyHandlerEntityId(AZ::EntityId entityId);
+        ~ReadOnlyHandlerEntityId();
+
+        // ReadOnlyEntityQueryNotificationBus overrides ...
+        void IsReadOnly(const AZ::EntityId& entityId, bool& isReadOnly) override;
+
+    private:
+        AZ::EntityId m_entityId;
+    };
+}
diff --git a/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityTests.cpp b/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityTests.cpp
new file mode 100644
index 0000000000..532325e208
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/Entity/ReadOnly/ReadOnlyEntityTests.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Tests/Entity/ReadOnly/ReadOnlyEntityFixture.h>
+
+namespace AzToolsFramework
+{
+    TEST_F(ReadOnlyEntityFixture, NoHandlerEntityIsNotReadOnlyByDefault)
+    {
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+    }
+
+    TEST_F(ReadOnlyEntityFixture, SingleHandlerEntityIsReadOnly)
+    {
+        // Create a handler that sets all entities to read-only.
+        ReadOnlyHandlerAlwaysTrue alwaysTrueHandler;
+
+        // All entities should be marked read-only now.
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[RootEntityName]));
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild1EntityName]));
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild2EntityName]));
+    }
+
+    TEST_F(ReadOnlyEntityFixture, SingleHandlerEntityIsNotReadOnly)
+    {
+        // Create a handler that sets all entities to read-only.
+        ReadOnlyHandlerAlwaysFalse alwaysFalseHandler;
+
+        // All entities should not be marked read-only now.
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[RootEntityName]));
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild1EntityName]));
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild2EntityName]));
+    }
+
+    TEST_F(ReadOnlyEntityFixture, SingleHandlerWithLogic)
+    {
+        // Create a handler that sets just the child entity to read-only.
+        ReadOnlyHandlerEntityId entityIdHandler(m_entityMap[ChildEntityName]);
+
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[RootEntityName]));
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild1EntityName]));
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild2EntityName]));
+    }
+
+    TEST_F(ReadOnlyEntityFixture, TwoHandlersCanOverlap)
+    {
+        // Create two handlers that set different entities to read-only.
+        ReadOnlyHandlerEntityId entityIdHandler1(m_entityMap[ChildEntityName]);
+        ReadOnlyHandlerEntityId entityIdHandler2(m_entityMap[GrandChild2EntityName]);
+
+        // Both entities should be marked as read-only, while others aren't.
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[RootEntityName]));
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild1EntityName]));
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[GrandChild2EntityName]));
+    }
+
+    TEST_F(ReadOnlyEntityFixture, EnsureCacheIsRefreshedCorrectly)
+    {
+        // Verify the child entity is not marked as read-only
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+
+        // Create a handler that sets the child entity to read-only.
+        ReadOnlyHandlerEntityId entityIdHandler(m_entityMap[ChildEntityName]);
+
+        // Communicate to the ReadOnlyEntitySystemComponent that the read-only state for the child entity may have changed.
+        // Note that this operation would usually be executed by the handler, hence the Query interface call.
+        if (auto readOnlyEntityQueryInterface = AZ::Interface<ReadOnlyEntityQueryInterface>::Get())
+        {
+            readOnlyEntityQueryInterface->RefreshReadOnlyState({ m_entityMap[ChildEntityName] });
+        }
+
+        // Verify the child entity is marked as read-only
+        EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+    }
+
+    TEST_F(ReadOnlyEntityFixture, EnsureCacheIsClearedCorrectly)
+    {
+        {
+            // Create a handler that sets the child entity to read-only.
+            ReadOnlyHandlerEntityId entityIdHandler(m_entityMap[ChildEntityName]);
+
+            // Verify the child entity is marked as read-only
+            EXPECT_TRUE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+        }
+        // When the handler goes out of scope, it calls RefreshReadOnlyStateForAllEntities and refreshes the cache.
+
+        // Verify the child entity is no longer marked as read-only
+        EXPECT_FALSE(m_readOnlyEntityPublicInterface->IsReadOnly(m_entityMap[ChildEntityName]));
+    }
+}
diff --git a/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp b/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp
index 4d144d0d1b..88966ef994 100644
--- a/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp
@@ -710,7 +710,7 @@ namespace UnitTest
 
             auto getEnumData = [&ec](const AzToolsFramework::InstanceDataNode& node) -> Uuid
             {
-                Uuid id;
+                Uuid id = Uuid::CreateNull();
                 auto attribute = node.GetElementMetadata()->FindAttribute(AZ_CRC("EnumType"));
                 auto attributeData = azrtti_cast<AttributeData<AZ::TypeId>*>(attribute);
                 if (attributeData)
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDeleteTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDeleteTests.cpp
new file mode 100644
index 0000000000..0ef328b2ca
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDeleteTests.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
+
+#include <Prefab/PrefabTestComponent.h>
+#include <Prefab/PrefabTestDomUtils.h>
+#include <Prefab/PrefabTestFixture.h>
+
+namespace UnitTest
+{
+    using PrefabDeleteTest = PrefabTestFixture;
+
+    TEST_F(PrefabDeleteTest, DeleteEntitiesInInstance_DeleteSingleEntitySucceeds)
+    {
+        PrefabEntityResult createEntityResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
+
+        // Verify that a valid entity is created.
+        AZ::EntityId testEntityId = createEntityResult.GetValue();
+        ASSERT_TRUE(testEntityId.IsValid());
+        AZ::Entity* testEntity = AzToolsFramework::GetEntityById(testEntityId);
+        ASSERT_TRUE(testEntity != nullptr);
+
+        m_prefabPublicInterface->DeleteEntitiesInInstance(AzToolsFramework::EntityIdList{ testEntityId });
+
+        // Verify that entity can't be found after deletion.
+        testEntity = AzToolsFramework::GetEntityById(testEntityId);
+        EXPECT_TRUE(testEntity == nullptr);
+    }
+
+    TEST_F(PrefabDeleteTest, DeleteEntitiesInInstance_DeleteSinglePrefabSucceeds)
+    {
+        PrefabEntityResult createEntityResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
+
+        // Verify that a valid entity is created.
+        AZ::EntityId createdEntityId = createEntityResult.GetValue();
+        ASSERT_TRUE(createdEntityId.IsValid());
+        AZ::Entity* createdEntity = AzToolsFramework::GetEntityById(createdEntityId);
+        ASSERT_TRUE(createdEntity != nullptr);
+
+        // Rather than hardcode a path, use a path from settings registry since that will work on all platforms.
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        AZ::IO::FixedMaxPath path;
+        registry->Get(path.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        CreatePrefabResult createPrefabResult =
+            m_prefabPublicInterface->CreatePrefabInMemory(AzToolsFramework::EntityIdList{ createdEntityId }, path);
+
+        AZ::EntityId createdPrefabContainerId = createPrefabResult.GetValue();
+        ASSERT_TRUE(createdPrefabContainerId.IsValid());
+        AZ::Entity* prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
+        ASSERT_TRUE(prefabContainerEntity != nullptr);
+
+        // Verify that the prefab container entity and the entity within are deleted.
+        m_prefabPublicInterface->DeleteEntitiesInInstance(AzToolsFramework::EntityIdList{ createdPrefabContainerId });
+        prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
+        EXPECT_TRUE(prefabContainerEntity == nullptr);
+        createdEntity = AzToolsFramework::GetEntityById(createdEntityId);
+        EXPECT_TRUE(createdEntity == nullptr);
+    }
+
+    TEST_F(PrefabDeleteTest, DeleteEntitiesAndAllDescendantsInInstance_DeletingEntityDeletesChildEntityToo)
+    {
+        PrefabEntityResult parentEntityCreationResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
+
+        // Verify that valid parent entity is created.
+        AZ::EntityId parentEntityId = parentEntityCreationResult.GetValue();
+        ASSERT_TRUE(parentEntityId.IsValid());
+        AZ::Entity* parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
+        ASSERT_TRUE(parentEntity != nullptr);
+
+        // Verify that valid child entity is created.
+        PrefabEntityResult childEntityCreationResult = m_prefabPublicInterface->CreateEntity(parentEntityId, AZ::Vector3());
+        AZ::EntityId childEntityId = childEntityCreationResult.GetValue();
+        ASSERT_TRUE(childEntityId.IsValid());
+        AZ::Entity* childEntity = AzToolsFramework::GetEntityById(childEntityId);
+        ASSERT_TRUE(childEntity != nullptr);
+
+        // PrefabTestFixture won't add required editor components by default. Hence we add them here.
+        AddRequiredEditorComponents(childEntity);
+        AddRequiredEditorComponents(parentEntity);
+
+        // Parent the child entity under the parent entity.
+        AZ::TransformBus::Event(childEntityId, &AZ::TransformBus::Events::SetParent, parentEntityId);
+
+        // Delete parent entity and its children.
+        m_prefabPublicInterface->DeleteEntitiesAndAllDescendantsInInstance(AzToolsFramework::EntityIdList{ parentEntityId });
+
+        // Verify that both the parent and child entities are deleted.
+        parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
+        EXPECT_TRUE(parentEntity == nullptr);
+        childEntity = AzToolsFramework::GetEntityById(childEntityId);
+        EXPECT_TRUE(childEntity == nullptr);
+    }
+
+    TEST_F(PrefabDeleteTest, DeleteEntitiesAndAllDescendantsInInstance_DeletingEntityDeletesChildPrefabToo)
+    {
+        PrefabEntityResult entityToBePutUnderPrefabResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
+
+        // Verify that a valid entity is created that will be put in a prefab later.
+        AZ::EntityId entityToBePutUnderPrefabId = entityToBePutUnderPrefabResult.GetValue();
+        ASSERT_TRUE(entityToBePutUnderPrefabId.IsValid());
+        AZ::Entity* entityToBePutUnderPrefab = AzToolsFramework::GetEntityById(entityToBePutUnderPrefabId);
+        ASSERT_TRUE(entityToBePutUnderPrefab != nullptr);
+
+        // Verify that a valid parent entity is created.
+        PrefabEntityResult parentEntityCreationResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
+        AZ::EntityId parentEntityId = parentEntityCreationResult.GetValue();
+        ASSERT_TRUE(parentEntityId.IsValid());
+        AZ::Entity* parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
+        ASSERT_TRUE(parentEntity != nullptr);
+
+        // Rather than hardcode a path, use a path from settings registry since that will work on all platforms.
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        AZ::IO::FixedMaxPath path;
+        registry->Get(path.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        CreatePrefabResult createPrefabResult =
+            m_prefabPublicInterface->CreatePrefabInMemory(AzToolsFramework::EntityIdList{ entityToBePutUnderPrefabId }, path);
+
+        // Verify that a valid prefab container entity is created.
+        AZ::EntityId createdPrefabContainerId = createPrefabResult.GetValue();
+        ASSERT_TRUE(createdPrefabContainerId.IsValid());
+        AZ::Entity* prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
+        ASSERT_TRUE(prefabContainerEntity != nullptr);
+
+        // PrefabTestFixture won't add required editor components by default. Hence we add them here.
+        AddRequiredEditorComponents(parentEntity);
+        AddRequiredEditorComponents(prefabContainerEntity);
+
+        // Parent the prefab under the parent entity.
+        AZ::TransformBus::Event(createdPrefabContainerId, &AZ::TransformBus::Events::SetParent, parentEntityId);
+
+        // Delete the parent entity.
+        m_prefabPublicInterface->DeleteEntitiesAndAllDescendantsInInstance(AzToolsFramework::EntityIdList{ parentEntityId });
+
+        // Validate that the parent and the prefab under it and the entity inside the prefab are all deleted.
+        parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
+        ASSERT_TRUE(parentEntity == nullptr);
+        entityToBePutUnderPrefab = AzToolsFramework::GetEntityById(entityToBePutUnderPrefabId);
+        ASSERT_TRUE(entityToBePutUnderPrefab == nullptr);
+        prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
+        EXPECT_TRUE(prefabContainerEntity == nullptr);
+    }
+} // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
index 86c73e72e5..6bf964f038 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
@@ -106,7 +106,9 @@ namespace UnitTest
         inline static const char* Passenger2EntityName = "Passenger2";
     };
 
-    TEST_F(PrefabFocusTests, PrefabFocus_FocusOnOwningPrefab_RootContainer)
+    // Test was disabled because the implementation of GetFocusedPrefabInstance now relies on the Prefab EOS,
+    // which is not used by our test environment. This can be restored once Instance handles are implemented.
+    TEST_F(PrefabFocusTests, DISABLED_PrefabFocus_FocusOnOwningPrefab_RootContainer)
     {
         // Verify FocusOnOwningPrefab works when passing the container entity of the root prefab.
         {
@@ -121,7 +123,9 @@ namespace UnitTest
         }
     }
 
-    TEST_F(PrefabFocusTests, PrefabFocus_FocusOnOwningPrefab_RootEntity)
+    // Test was disabled because the implementation of GetFocusedPrefabInstance now relies on the Prefab EOS,
+    // which is not used by our test environment. This can be restored once Instance handles are implemented.
+    TEST_F(PrefabFocusTests, DISABLED_PrefabFocus_FocusOnOwningPrefab_RootEntity)
     {
         // Verify FocusOnOwningPrefab works when passing a nested entity of the root prefab.
         {
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
index ed30de09c4..494f635a9f 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
@@ -57,6 +57,11 @@ namespace UnitTest
         return AZStd::make_unique<PrefabTestToolsApplication>("PrefabTestApplication");
     }
 
+    void PrefabTestFixture::PropagateAllTemplateChanges()
+    {
+        m_prefabSystemComponent->OnSystemTick();
+    }
+
     AZ::Entity* PrefabTestFixture::CreateEntity(const char* entityName, const bool shouldActivate)
     {
         // Circumvent the EntityContext system and generate a new entity with a transformcomponent
@@ -125,4 +130,13 @@ namespace UnitTest
             EXPECT_EQ(entityInInstance->GetState(), AZ::Entity::State::Active);
         }
     }
+
+    void PrefabTestFixture::AddRequiredEditorComponents(AZ::Entity* entity)
+    {
+        ASSERT_TRUE(entity != nullptr);
+        entity->Deactivate();
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+            &AzToolsFramework::EditorEntityContextRequests::AddRequiredComponents, *entity);
+        entity->Activate();
+    }
 }
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
index 0a78ded1a6..e7fe771610 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
@@ -52,6 +52,8 @@ namespace UnitTest
 
         AZStd::unique_ptr<ToolsTestApplication> CreateTestApplication() override;
 
+        void PropagateAllTemplateChanges();
+
         AZ::Entity* CreateEntity(const char* entityName, const bool shouldActivate = true);
 
         void CompareInstances(const Instance& instanceA, const Instance& instanceB, bool shouldCompareLinkIds = true,
@@ -62,6 +64,8 @@ namespace UnitTest
         //! Validates that all entities within a prefab instance are in 'Active' state.
         void ValidateInstanceEntitiesActive(Instance& instance);
 
+        void AddRequiredEditorComponents(AZ::Entity* entity);
+
         PrefabSystemComponent* m_prefabSystemComponent = nullptr;
         PrefabLoaderInterface* m_prefabLoaderInterface = nullptr;
         PrefabPublicInterface* m_prefabPublicInterface = nullptr;
diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp
index 67f764d1b3..d95451441f 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp
@@ -6,7 +6,9 @@
  *
  */
 
-#include "IntegerPrimtitiveTestConfig.h"
+#include <AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h>
+#include <AzToolsFramework/UI/PropertyEditor/QtWidgetLimits.h>
+#include <Tests/IntegerPrimtitiveTestConfig.h>
 
 namespace UnitTest
 {
diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h
index 10aed57ebd..712eeb99b7 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h
@@ -156,6 +156,16 @@ namespace UnitTest
             EXPECT_STREQ(tooltip.toStdString().c_str(), expected.str().c_str());
         }
 
+        void EmitWidgetValueChanged()
+        {
+            emit m_widget->valueChanged(ValueType(0));
+        }
+
+        void EmitWidgetEditingFinished()
+        {
+            emit m_widget->editingFinished();
+        }
+
         AZStd::unique_ptr<QWidget> m_dummyWidget;
         AZStd::unique_ptr<HandlerAPI> m_handler;
         WidgetType* m_widget;
diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp
index 01f314bcc2..d7616e6bb8 100644
--- a/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp
@@ -47,4 +47,71 @@ namespace UnitTest
     {
         this->HandlerMinMaxLessLimit_ModifyHandler_ExpectSuccessAndValidLessLimitToolTipString();
     }
+
+    struct PropertyEditorHandler
+        : public AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler
+    {
+        PropertyEditorHandler()
+        {
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::BusConnect();
+        }
+
+        ~PropertyEditorHandler()
+        {
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::BusDisconnect();
+        }
+
+        // AzToolsFramework::PropertyEditorGUIMessages::Bus overrides ...
+        void RequestWrite([[maybe_unused]] QWidget* editorGUI) override
+        {
+            m_requestWriteCallCount++;
+        }
+
+        void RequestRefresh([[maybe_unused]] PropertyModificationRefreshLevel level) override
+        {
+        }
+
+        void AddElementsToParentContainer(
+            [[maybe_unused]] QWidget* editorGUI,
+            [[maybe_unused]] size_t numElements,
+            [[maybe_unused]] const InstanceDataNode::FillDataClassCallback& fillDataCallback) override
+        {
+        }
+
+        void RequestPropertyNotify([[maybe_unused]] QWidget* editorGUI) override
+        {
+        }
+
+        void OnEditingFinished([[maybe_unused]]QWidget* editorGUI) override
+        {
+            m_onEditingFinishedCallCount++;
+        }
+
+        int m_requestWriteCallCount = 0;
+        int m_onEditingFinishedCallCount = 0;
+    };
+
+    TYPED_TEST(PropertySpinCtrlFixture, SpinBoxWidgetValueChangedInvokesPropertyEditorGUIMessages)
+    {
+        // setup the event handler
+        PropertyEditorHandler eventHandler;
+
+        // trigger the QT signal
+        this->EmitWidgetValueChanged();
+
+        // there should be at least 1 call to RequestWrite.
+        EXPECT_GT(eventHandler.m_requestWriteCallCount, 0);
+    }
+
+    TYPED_TEST(PropertySpinCtrlFixture, SpinBoxWidgetEditingFinishedInvokesPropertyEditorGUIMessages)
+    {
+        // setup the event handler
+        PropertyEditorHandler eventHandler;
+
+        // trigger the QT signal
+        this->EmitWidgetEditingFinished();
+
+        // there should be at least 1 call to OnEditingFinished.
+        EXPECT_GT(eventHandler.m_onEditingFinishedCallCount, 0);
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp b/Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
index 78cdcf9d38..eb7d87fb78 100644
--- a/Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
@@ -128,7 +128,7 @@ namespace UnitTest
         void ProcessDeferredUpdates()
         {
             // Force a prefab propagation for updates that are deferred to the next tick.
-            m_prefabSystemComponent->OnSystemTick();
+            PropagateAllTemplateChanges();
 
             // Ensure the model process its entity update queue
             m_model->ProcessEntityUpdates();
diff --git a/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp b/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp
index c24bab9299..a3c6666a40 100644
--- a/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp
@@ -36,11 +36,6 @@ namespace UnitTest
         : public ComponentApplication
     {
     public:
-        void SetExecutableFolder(const char* path)
-        {
-            m_exeDirectory = path;
-        }
-
         void SetSettingsRegistrySpecializations(SettingsRegistryInterface::Specializations& specializations) override
         {
             ComponentApplication::SetSettingsRegistrySpecializations(specializations);
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp
new file mode 100644
index 0000000000..fdcc8553f2
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzFramework/Viewport/ViewportScreen.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkUtils.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+#include <Tests/BoundsTestComponent.h>
+
+namespace UnitTest
+{
+    class IndirectCallViewportInteractionIntersectionFixture : public ToolsApplicationFixture
+    {
+    public:
+        void SetUpEditorFixtureImpl() override
+        {
+            auto* app = GetApplication();
+            // register a simple component implementing BoundsRequestBus and EditorComponentSelectionRequestsBus
+            app->RegisterComponentDescriptor(BoundsTestComponent::CreateDescriptor());
+            // register a component implementing RenderGeometry::IntersectionRequestBus
+            app->RegisterComponentDescriptor(RenderGeometryIntersectionTestComponent::CreateDescriptor());
+
+            AZ::Entity* entityGround = nullptr;
+            m_entityIdGround = CreateDefaultEditorEntity("EntityGround", &entityGround);
+
+            entityGround->Deactivate();
+            auto ground = entityGround->CreateComponent<RenderGeometryIntersectionTestComponent>();
+            entityGround->Activate();
+
+            ground->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-10.0f, -10.0f, -0.5f), AZ::Vector3(10.0f, 10.0f, 0.5f));
+        }
+
+        AZ::EntityId m_entityIdGround;
+    };
+
+    using IndirectCallManipulatorViewportInteractionIntersectionFixture =
+        IndirectCallManipulatorViewportInteractionFixtureMixin<IndirectCallViewportInteractionIntersectionFixture>;
+
+    TEST_F(IndirectCallManipulatorViewportInteractionIntersectionFixture, FindClosestPickIntersectionReturnsExpectedSurfacePoint)
+    {
+        // camera - 21.00, 8.00, 11.00, -22.00, 150.00
+        m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f);
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(150.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-22.0f)),
+                AZ::Vector3(21.0f, 8.0f, 11.0f)));
+
+        m_actionDispatcher->CameraState(m_cameraState);
+
+        AzToolsFramework::SetWorldTransform(
+            m_entityIdGround,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(40.0f)) * AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(60.0f)),
+                AZ::Vector3(14.0f, -6.0f, 5.0f)));
+
+        // expected world position (value taken from editor scenario)
+        const auto expectedWorldPosition = AZ::Vector3(13.606657f, -2.6753534f, 5.9827675f);
+        const auto screenPosition = AzFramework::WorldToScreen(expectedWorldPosition, m_cameraState);
+
+        // perform ray intersection against mesh
+        const auto worldIntersectionPoint = AzToolsFramework::FindClosestPickIntersection(
+            m_viewportManipulatorInteraction->GetViewportInteraction().GetViewportId(), screenPosition,
+            AzToolsFramework::EditorPickRayLength, AzToolsFramework::GetDefaultEntityPlacementDistance());
+
+        EXPECT_THAT(worldIntersectionPoint, IsCloseTolerance(expectedWorldPosition, 0.01f));
+    }
+} // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp
index e8fce6653f..58c28f8568 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp
@@ -17,6 +17,7 @@
 #include <AzTest/AzTest.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <AzToolsFramework/Viewport/ViewportTypes.h>
+#include <Tests/Utils/Printers.h>
 
 namespace UnitTest
 {
@@ -35,6 +36,7 @@ namespace UnitTest
         const auto worldResult = AzFramework::ScreenToWorld(screenPoint, cameraState);
         return AzFramework::WorldToScreen(worldResult, cameraState);
     }
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////////
     // ScreenPoint tests
     TEST(ViewportScreen, WorldToScreenAndScreenToWorldReturnsTheSameValueIdentityCameraOffsetFromOrigin)
@@ -102,8 +104,8 @@ namespace UnitTest
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // NDC tests
-    TEST(ViewportScreen, WorldToScreenNDCAndScreenNDCToWorldReturnsTheSameValueIdentityCameraOffsetFromOrigin)
+    // Ndc tests
+    TEST(ViewportScreen, WorldToScreenNdcAndScreenNdcToWorldReturnsTheSameValueIdentityCameraOffsetFromOrigin)
     {
         using NdcPoint = AZ::Vector2;
 
@@ -136,7 +138,7 @@ namespace UnitTest
         }
     }
 
-    TEST(ViewportScreen, WorldToScreenNDCAndScreenNDCToWorldReturnsTheSameValueOrientatedCamera)
+    TEST(ViewportScreen, WorldToScreenNdcAndScreenNdcToWorldReturnsTheSameValueOrientatedCamera)
     {
         using NdcPoint = AZ::Vector2;
 
@@ -153,7 +155,7 @@ namespace UnitTest
 
     // note: nearClip is 0.1 - the world space value returned will be aligned to the near clip
     // plane of the camera so use that to confirm the mapping to/from is correct
-    TEST(ViewportScreen, ScreenNDCToWorldReturnsPositionOnNearClipPlaneInWorldSpace)
+    TEST(ViewportScreen, ScreenNdcToWorldReturnsPositionOnNearClipPlaneInWorldSpace)
     {
         using NdcPoint = AZ::Vector2;
 
diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
index 99a998abb8..1a8819b188 100644
--- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
+++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
@@ -28,6 +28,9 @@ set(FILES
     Entity/EditorEntitySearchComponentTests.cpp
     Entity/EditorEntitySelectionTests.cpp
     Entity/EntityUtilityComponentTests.cpp
+    Entity/ReadOnly/ReadOnlyEntityFixture.cpp
+    Entity/ReadOnly/ReadOnlyEntityFixture.h
+    Entity/ReadOnly/ReadOnlyEntityTests.cpp
     EntityIdQLabelTests.cpp
     EntityInspectorTests.cpp
     EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp
@@ -66,6 +69,7 @@ set(FILES
     Prefab/PrefabFocus/PrefabFocusTests.cpp
     Prefab/MockPrefabFileIOActionValidator.cpp
     Prefab/MockPrefabFileIOActionValidator.h
+    Prefab/PrefabDeleteTests.cpp
     Prefab/PrefabDuplicateTests.cpp
     Prefab/PrefabEntityAliasTests.cpp
     Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
@@ -100,6 +104,7 @@ set(FILES
     Prefab/SpawnableSortEntitiesTests.cpp
     Prefab/PrefabScriptingTests.cpp
     Prefab/ProceduralPrefabAssetTests.cpp
+    PropertyIntCtrlCommonTests.cpp
     PropertyIntCtrlCommonTests.h
     PropertyIntSliderCtrlTests.cpp
     PropertyIntSpinCtrlTests.cpp
@@ -135,5 +140,6 @@ set(FILES
     Viewport/ViewportUiDisplayTests.cpp
     Viewport/ViewportUiManagerTests.cpp
     Viewport/ViewportUiWidgetManagerTests.cpp
+    Viewport/ViewportInteractionTests.cpp
     Visibility/EditorVisibilityTests.cpp
 )
diff --git a/Code/LauncherUnified/Launcher.cpp b/Code/LauncherUnified/Launcher.cpp
index c37f70c3b7..ed01a67f39 100644
--- a/Code/LauncherUnified/Launcher.cpp
+++ b/Code/LauncherUnified/Launcher.cpp
@@ -26,7 +26,6 @@
 #include <AzGameFramework/Application/GameApplication.h>
 
 #include <ISystem.h>
-#include <ITimer.h>
 #include <LegacyAllocator.h>
 
 #include <Launcher_Traits_Platform.h>
@@ -113,7 +112,7 @@ namespace
             }
 
             // Update the AzFramework application tick bus
-            gameApplication.Tick(gEnv->pTimer->GetFrameTime());
+            gameApplication.Tick();
 
             // Post-update CrySystem
             if (system)
@@ -228,7 +227,6 @@ namespace O3DELauncher
         }
     }
 
-    void CompileCriticalAssets();
     void CreateRemoteFileIO();
 
     bool ConnectToAssetProcessor()
@@ -256,29 +254,11 @@ namespace O3DELauncher
         {
             AZ_TracePrintf("Launcher", "Connected to Asset Processor\n");
             CreateRemoteFileIO();
-            CompileCriticalAssets();
         }
 
         return connectedToAssetProcessor;
     }
 
-    //! Compiles the critical assets that are within the Engine directory of Open 3D Engine
-    //! This code should be in a centralized location, but doesn't belong in AzFramework
-    //! since it is specific to how Open 3D Engine projects has assets setup
-    void CompileCriticalAssets()
-    {
-        // VERY early on, as soon as we can, request that the asset system make sure the following assets take priority over others,
-        // so that by the time we ask for them there is a greater likelihood that they're already good to go.
-        // these can be loaded later but are still important:
-        AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "/texturemsg/");
-        AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "engineassets/materials");
-        AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "engineassets/geomcaches");
-        AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetBySearchTerm, "engineassets/objects");
-
-        // some are specifically extra important and will cause issues if missing completely:
-        AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::CompileAssetSync, "engineassets/objects/default.cgf");
-    }
-
     //! Remote FileIO to use as a Virtual File System
     //! Communication of FileIOBase operations occur through an AssetProcessor connection
     void CreateRemoteFileIO()
diff --git a/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp
index b873f30c6d..4e121f149c 100644
--- a/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp
+++ b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp
@@ -49,18 +49,17 @@ namespace
         rlimit limit;
         if (getrlimit(resource, &limit) != 0)
         {
-            AZ_Error("Launcher", false, "[ERROR] Failed to get limit for resource %d.  Error: %s", resource, strerror(errno));
-            return false;
+            AZ_Warning("Launcher", false, "[WARNING] Unable to get limit for resource %d.  Error: %s", resource, strerror(errno));
         }
 
         if (updateLimit(limit))
         {
             if (setrlimit(resource, &limit) != 0)
             {
-                AZ_Error("Launcher", false, "[ERROR] Failed to update resource limit for resource %d.  Error: %s", resource, strerror(errno));
-                return false;
+                AZ_Warning("Launcher", false, "[WARNING] Unable to update resource limit for resource %d.  Error: %s", resource, strerror(errno));
             }
         }
+
         return true;
     }
 }
diff --git a/Code/Legacy/CryCommon/AppleSpecific.h b/Code/Legacy/CryCommon/AppleSpecific.h
index e4c4fadb89..2645ec2270 100644
--- a/Code/Legacy/CryCommon/AppleSpecific.h
+++ b/Code/Legacy/CryCommon/AppleSpecific.h
@@ -141,11 +141,6 @@ typedef uint8                               byte;
 #endif
 
 
-#ifndef SAFE_RELEASE_FORCE
-#define SAFE_RELEASE_FORCE(p)       { if (p) { (p)->ReleaseForce();  (p) = NULL; } \
-}
-#endif
-
 #define MAKEWORD(a, b)      ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | ((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8))
 #define MAKELONG(a, b)      ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | ((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))
 #define LOWORD(l)           ((WORD)((DWORD_PTR)(l) & 0xffff))
@@ -472,22 +467,6 @@ inline int64 CryGetTicks()
     return counter.QuadPart;
 }
 
-inline int64 CryGetTicksPerSec()
-{
-    LARGE_INTEGER li;
-    QueryPerformanceFrequency(&li);
-    return li.QuadPart;
-}
-/*
- inline uint32 GetTickCount()
- {
- LARGE_INTEGER count, freq;
- QueryPerformanceCounter(&count);
- QueryPerformanceFrequency(&freq);
- return uint32(count.QuadPart * 1000 / freq.QuadPart);
- }
- */
-
 #ifdef _RELEASE
 #define __debugbreak()
 #else
diff --git a/Code/Legacy/CryCommon/Cry_Camera.h b/Code/Legacy/CryCommon/Cry_Camera.h
deleted file mode 100644
index 6ccae5bce1..0000000000
--- a/Code/Legacy/CryCommon/Cry_Camera.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Common Camera class implementation
-#pragma once
-
-
-//DOC-IGNORE-BEGIN
-#include <Cry_Math.h>
-#include <Cry_Geo.h>
-//DOC-IGNORE-END
-
-//////////////////////////////////////////////////////////////////////
-#define CAMERA_MIN_NEAR         0.001f
-#define DEFAULT_NEAR            0.2f
-#define DEFAULT_FAR     1024.0f
-#define DEFAULT_FOV     (75.0f * gf_PI / 180.0f)
-#define MIN_FOV 0.0000001f
-
-//////////////////////////////////////////////////////////////////////
-
-enum
-{
-    FR_PLANE_NEAR,
-    FR_PLANE_FAR,
-    FR_PLANE_RIGHT,
-    FR_PLANE_LEFT,
-    FR_PLANE_TOP,
-    FR_PLANE_BOTTOM,
-    FRUSTUM_PLANES
-};
-
-//////////////////////////////////////////////////////////////////////
-
-enum cull
-{
-    CULL_EXCLUSION,     // The whole object is outside of frustum.
-    CULL_OVERLAP,           // The object &  frustum overlap.
-    CULL_INCLUSION      // The whole object is inside frustum.
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Implements essential operations like calculation of a view-matrix and
-// frustum-culling with simple geometric primitives (Point, Sphere, AABB, OBB).
-// All calculation are based on the CryENGINE coordinate-system
-//
-// We are using a "right-handed" coordinate systems, where the positive X-Axis points
-// to the right, the positive Y-Axis points away from the viewer and the positive
-// Z-Axis points up. The following illustration shows our coordinate system.
-//
-// <PRE>
-//  z-axis
-//    ^
-//    |
-//    |   y-axis
-//    |  /
-//    | /
-//    |/
-//    +---------------->   x-axis
-// </PRE>
-//
-// This same system is also used in 3D-Studio-MAX. It is not unusual for 3D-APIs like D3D9 or
-// OpenGL to use a different coordinate system.  Currently in D3D9 we use a coordinate system
-// in which the X-Axis points to the right, the Y-Axis points down and the Z-Axis points away
-// from the viewer. To convert from the CryEngine system into D3D9 we are just doing a clockwise
-// rotation of pi/2 about the X-Axis. This conversion happens in the renderer.
-//
-// The 6 DOFs (degrees-of-freedom) are stored in one single 3x4 matrix ("m_Matrix"). The 3
-// orientation-DOFs are stored in the 3x3 part and the 3 position-DOFs are stored in the translation-
-// vector. You can use the member-functions "GetMatrix()" or "SetMatrix(Matrix34(orientation,positon))"
-// to change or access the 6 DOFs.
-//
-// There are helper-function in Cry_Math.h to create the orientation:
-//
-// This function builds a 3x3 orientation matrix using a view-direction and a radiant to rotate about Y-axis.
-//  Matrix33 orientation=Matrix33::CreateOrientation( Vec3(0,1,0), 0 );
-//
-// This function builds a 3x3 orientation matrix using Yaw-Pitch-Roll angles.
-//  Matrix33 orientation=CCamera::CreateOrientationYPR( Ang3(1.234f,0.342f,0) );
-//
-///////////////////////////////////////////////////////////////////////////////
-class CCamera
-{
-public:
-    ILINE static Matrix33 CreateOrientationYPR(const Ang3& ypr);
-    ILINE static Ang3 CreateAnglesYPR(const Matrix33& m);
-    ILINE static Ang3 CreateAnglesYPR(const Vec3& vdir, f32 r = 0);
-
-    ILINE void SetMatrix(const Matrix34& mat) { assert(mat.IsOrthonormal()); m_Matrix = mat; UpdateFrustum(); };
-    ILINE const Matrix34& GetMatrix() const { return m_Matrix; };
-    ILINE Vec3 GetViewdir() const { return m_Matrix.GetColumn1(); };
-
-    ILINE Vec3 GetPosition() const { return m_Matrix.GetTranslation(); }
-    ILINE void SetPosition(const Vec3& p)   { m_Matrix.SetTranslation(p); UpdateFrustum(); }
-
-    //------------------------------------------------------------
-
-    void SetFrustum(int nWidth, int nHeight, f32 FOV = DEFAULT_FOV, f32 nearplane = DEFAULT_NEAR, f32 farplane = DEFAULT_FAR, f32 fPixelAspectRatio = 1.0f);
-
-    ILINE int GetViewSurfaceZ() const { return m_Height; }
-    ILINE f32 GetFov() const { return m_fov; }
-    ILINE f32 GetPixelAspectRatio() const { return m_PixelAspectRatio; }
-
-    //////////////////////////////////////////////////////////////////////////
-
-    //-----------------------------------------------------------------------------------
-    //--------                Frustum-Culling                ----------------------------
-    //-----------------------------------------------------------------------------------
-
-    // AABB-frustum test
-    // Fast
-    bool IsAABBVisible_F(const ::AABB& aabb) const;
-
-    //## constructor/destructor
-    CCamera()
-    {
-        m_Matrix.SetIdentity();
-        m_asymRight = 0;
-        m_asymLeft = 0;
-        m_asymBottom = 0;
-        m_asymTop = 0;
-        SetFrustum(640, 480);
-        m_nPosX = m_nPosY = m_nSizeX = m_nSizeY = 0;
-        m_entityPos = Vec3(0, 0, 0);
-    }
-    ~CCamera() {}
-
-    void SetJustActivated([[maybe_unused]] const bool justActivated) {}
-
-    void UpdateFrustum();
-
-private:
-    Matrix34 m_Matrix;              // world space-matrix
-
-    f32     m_fov;                          // vertical fov in radiants [0..1*PI[
-    int     m_Width;                        // surface width-resolution
-    int     m_Height;                       // surface height-resolution
-    f32     m_PixelAspectRatio; // accounts for aspect ratio and non-square pixels
-
-    Vec3    m_entityPos;                //The position of this camera's entity (does not include HMD position or stereo offsets)
-
-    Vec3    m_edge_nlt;                 // this is the left/upper vertex of the near-plane
-    Vec3    m_edge_plt;                 // this is the left/upper vertex of the projection-plane
-    Vec3    m_edge_flt;                 // this is the left/upper vertex of the far-clip-plane
-
-    f32     m_asymLeft, m_asymRight, m_asymBottom, m_asymTop;   // Shift to create asymmetric frustum (only used for GPU culling of tessellated objects)
-    f32     m_asymLeftProj, m_asymRightProj, m_asymBottomProj, m_asymTopProj;
-    f32     m_asymLeftFar, m_asymRightFar, m_asymBottomFar, m_asymTopFar;
-
-    //usually we update these values every frame (they depend on m_Matrix)
-    Vec3    m_cltp, m_crtp, m_clbp, m_crbp;        //this are the 4 vertices of the projection-plane in cam-space
-    Vec3    m_cltn, m_crtn, m_clbn, m_crbn;        //this are the 4 vertices of the near-plane in cam-space
-    Vec3    m_cltf, m_crtf, m_clbf, m_crbf;        //this are the 4 vertices of the farclip-plane in cam-space
-
-    Plane_tpl<f32>   m_fp [FRUSTUM_PLANES]; //
-    uint32  m_idx1[FRUSTUM_PLANES], m_idy1[FRUSTUM_PLANES], m_idz1[FRUSTUM_PLANES]; //
-    uint32  m_idx2[FRUSTUM_PLANES], m_idy2[FRUSTUM_PLANES], m_idz2[FRUSTUM_PLANES]; //
-
-    int m_nPosX, m_nPosY, m_nSizeX, m_nSizeY;
-};
-
-// Description
-//  This function builds a 3x3 orientation matrix using YPR-angles
-//  Rotation order for the orientation-matrix is Z-X-Y. (Zaxis=YAW / Xaxis=PITCH / Yaxis=ROLL)
-//
-// <PRE>
-//  COORDINATE-SYSTEM
-//
-//  z-axis
-//    ^
-//    |
-//    |  y-axis
-//    |  /
-//    | /
-//    |/
-//    +--------------->   x-axis
-// </PRE>
-//
-//  Example:
-//      Matrix33 orientation=CCamera::CreateOrientationYPR( Ang3(1,2,3) );
-inline Matrix33 CCamera::CreateOrientationYPR(const Ang3& ypr)
-{
-    f32 sz, cz;
-    sincos_tpl(ypr.x, &sz, &cz);            //Zaxis = YAW
-    f32 sx, cx;
-    sincos_tpl(ypr.y, &sx, &cx);            //Xaxis = PITCH
-    f32 sy, cy;
-    sincos_tpl(ypr.z, &sy, &cy);            //Yaxis = ROLL
-    Matrix33 c;
-    c.m00 = cy * cz - sy * sz * sx;
-    c.m01 = -sz * cx;
-    c.m02 = sy * cz + cy * sz * sx;
-    c.m10 = cy * sz + sy * sx * cz;
-    c.m11 = cz * cx;
-    c.m12 = sy * sz - cy * sx * cz;
-    c.m20 = -sy * cx;
-    c.m21 = sx;
-    c.m22 = cy * cx;
-    return c;
-}
-
-// Description
-//   <PRE>
-//   x-YAW
-//   y-PITCH (negative=looking down / positive=looking up)
-//   z-ROLL
-//   </PRE>
-// Note: If we are looking along the z-axis, its not possible to specify the x and z-angle
-inline Ang3 CCamera::CreateAnglesYPR(const Matrix33& m)
-{
-    assert(m.IsOrthonormal());
-    float l = Vec3(m.m01, m.m11, 0.0f).GetLength();
-    if (l > 0.0001)
-    {
-        return Ang3(atan2f(-m.m01 / l, m.m11 / l), atan2f(m.m21, l), atan2f(-m.m20 / l, m.m22 / l));
-    }
-    else
-    {
-        return Ang3(0, atan2f(m.m21, l), 0);
-    }
-}
-
-// Description
-//   <PRE>
-//x-YAW
-//y-PITCH (negative=looking down / positive=looking up)
-//z-ROLL (its not possile to extract a "roll" from a view-vector)
-// </PRE>
-// Note: if we are looking along the z-axis, its not possible to specify the rotation about the z-axis
-ILINE Ang3 CCamera::CreateAnglesYPR(const Vec3& vdir, f32 r)
-{
-    assert((fabs_tpl(1 - (vdir | vdir))) < 0.001);        //check if unit-vector
-    f32 l = Vec3(vdir.x, vdir.y, 0.0f).GetLength(); //check if not zero
-    if (l > 0.0001)
-    {
-        return Ang3(atan2f(-vdir.x / l, vdir.y / l), atan2f(vdir.z, l), r);
-    }
-    else
-    {
-        return Ang3(0, atan2f(vdir.z, l), r);
-    }
-}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-inline void CCamera::SetFrustum(int nWidth, int nHeight, f32 FOV, f32 nearplane, f32 farplane, f32 fPixelAspectRatio)
-{
-    assert (nearplane >= CAMERA_MIN_NEAR);     //check if near-plane is valid
-    assert (farplane >= 0.1f);              //check if far-plane is valid
-    assert (farplane >= nearplane);     //check if far-plane bigger then near-plane
-    assert (FOV >= MIN_FOV && FOV < gf_PI);    //check if specified FOV is valid
-
-    m_fov = FOV;
-
-    m_Width = nWidth;           //surface x-resolution
-    m_Height = nHeight;     //surface z-resolution
-
-    f32 fWidth  = (((f32)nWidth) / fPixelAspectRatio);
-    f32 fHeight = (f32) nHeight;
-
-    m_PixelAspectRatio = fPixelAspectRatio;
-
-    //-------------------------------------------------------------------------
-    //---  calculate the Left/Top edge of the Projection-Plane in EYE-SPACE ---
-    //-------------------------------------------------------------------------
-    f32 projLeftTopX = -fWidth * 0.5f;
-    f32 projLeftTopY = static_cast<f32>((1.0f / tan_tpl(m_fov * 0.5f)) * (fHeight * 0.5f));
-    f32 projLeftTopZ = fHeight * 0.5f;
-
-    m_edge_plt.x = projLeftTopX;
-    m_edge_plt.y = projLeftTopY;
-    m_edge_plt.z = projLeftTopZ;
-
-    float invProjLeftTopY = 1.0f / projLeftTopY;
-
-    //Apply asym shift to the camera frustum - Necessary for properly culling tessellated objects in VR
-    //These are applied in UpdateFrustum to the camera space frustum planes
-    //Can't apply asym shift to frustum edges here. That would only apply to the top left corner
-    //rather than the whole frustum. It would also interfere with shadow map application
-
-    //m_asym is at the near plane, we want it at the projection plane too
-    m_asymLeftProj = (m_asymLeft / nearplane) * projLeftTopY;
-    m_asymTopProj = (m_asymTop / nearplane) * projLeftTopY;
-    m_asymRightProj = (m_asymRight / nearplane) * projLeftTopY;
-    m_asymBottomProj = (m_asymBottom / nearplane) * projLeftTopY;
-
-    //Also want m_asym at the far plane
-    m_asymLeftFar = m_asymLeftProj * (farplane * invProjLeftTopY);
-    m_asymTopFar = m_asymTopProj * (farplane * invProjLeftTopY);
-    m_asymRightFar = m_asymRightProj * (farplane * invProjLeftTopY);
-    m_asymBottomFar = m_asymBottomProj * (farplane * invProjLeftTopY);
-
-    m_edge_nlt.x    = nearplane * projLeftTopX * invProjLeftTopY;
-    m_edge_nlt.y    = nearplane;
-    m_edge_nlt.z    = nearplane * projLeftTopZ * invProjLeftTopY;
-
-    //calculate the left/upper edge of the far-plane (=not rotated)
-    m_edge_flt.x    = projLeftTopX  * (farplane * invProjLeftTopY);
-    m_edge_flt.y    = farplane;
-    m_edge_flt.z    = projLeftTopZ  * (farplane * invProjLeftTopY);
-
-    UpdateFrustum();
-}
-
-/*!
- *
- *  Updates all parameters required by the render-engine:
- *
- *  3d-view-frustum and all matrices
- *
- */
-inline void CCamera::UpdateFrustum()
-{
-    //-------------------------------------------------------------------
-    //--- calculate frustum-edges of projection-plane in CAMERA-SPACE ---
-    //-------------------------------------------------------------------
-    Matrix33 m33 = Matrix33(m_Matrix);
-    m_cltp = m33 * Vec3(+m_edge_plt.x + m_asymLeftProj, +m_edge_plt.y, +m_edge_plt.z + m_asymTopProj);
-    m_crtp = m33 * Vec3(-m_edge_plt.x + m_asymRightProj, +m_edge_plt.y, +m_edge_plt.z + m_asymTopProj);
-    m_clbp = m33 * Vec3(+m_edge_plt.x + m_asymLeftProj, +m_edge_plt.y, -m_edge_plt.z + m_asymBottomProj);
-    m_crbp = m33 * Vec3(-m_edge_plt.x + m_asymRightProj, +m_edge_plt.y, -m_edge_plt.z + m_asymBottomProj);
-
-    m_cltn = m33 * Vec3(+m_edge_nlt.x + m_asymLeft, +m_edge_nlt.y, +m_edge_nlt.z + m_asymTop);
-    m_crtn = m33 * Vec3(-m_edge_nlt.x + m_asymRight, +m_edge_nlt.y, +m_edge_nlt.z + m_asymTop);
-    m_clbn = m33 * Vec3(+m_edge_nlt.x + m_asymLeft, +m_edge_nlt.y, -m_edge_nlt.z + m_asymBottom);
-    m_crbn = m33 * Vec3(-m_edge_nlt.x + m_asymRight, +m_edge_nlt.y, -m_edge_nlt.z + m_asymBottom);
-
-    m_cltf = m33 * Vec3(+m_edge_flt.x + m_asymLeftFar, +m_edge_flt.y, +m_edge_flt.z + m_asymTopFar);
-    m_crtf = m33 * Vec3(-m_edge_flt.x + m_asymRightFar, +m_edge_flt.y, +m_edge_flt.z + m_asymTopFar);
-    m_clbf = m33 * Vec3(+m_edge_flt.x + m_asymLeftFar, +m_edge_flt.y, -m_edge_flt.z + m_asymBottomFar);
-    m_crbf = m33 * Vec3(-m_edge_flt.x + m_asymRightFar, +m_edge_flt.y, -m_edge_flt.z + m_asymBottomFar);
-
-    //-------------------------------------------------------------------------------
-    //---  calculate the six frustum-planes using the frustum edges in world-space ---
-    //-------------------------------------------------------------------------------
-    m_fp[FR_PLANE_NEAR  ]   = Plane_tpl<f32>::CreatePlane(m_crtn + GetPosition(), m_cltn + GetPosition(), m_crbn + GetPosition());
-    m_fp[FR_PLANE_RIGHT ]   = Plane_tpl<f32>::CreatePlane(m_crbf + GetPosition(), m_crtf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_LEFT  ]   = Plane_tpl<f32>::CreatePlane(m_cltf + GetPosition(), m_clbf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_TOP   ]   = Plane_tpl<f32>::CreatePlane(m_crtf + GetPosition(), m_cltf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_BOTTOM]   = Plane_tpl<f32>::CreatePlane(m_clbf + GetPosition(), m_crbf + GetPosition(), GetPosition());
-    m_fp[FR_PLANE_FAR   ]   = Plane_tpl<f32>::CreatePlane(m_crtf + GetPosition(), m_crbf + GetPosition(), m_cltf + GetPosition());  //clip-plane
-
-    uint32 rh = m_Matrix.IsOrthonormalRH();
-    if (rh == 0)
-    {
-        m_fp[FR_PLANE_NEAR  ] = -m_fp[FR_PLANE_NEAR  ];
-        m_fp[FR_PLANE_RIGHT ] = -m_fp[FR_PLANE_RIGHT ];
-        m_fp[FR_PLANE_LEFT  ] = -m_fp[FR_PLANE_LEFT  ];
-        m_fp[FR_PLANE_TOP   ] = -m_fp[FR_PLANE_TOP   ];
-        m_fp[FR_PLANE_BOTTOM] = -m_fp[FR_PLANE_BOTTOM];
-        m_fp[FR_PLANE_FAR   ] = -m_fp[FR_PLANE_FAR   ];  //clip-plane
-    }
-
-    union f32_u
-    {
-        float floatVal;
-        uint32 uintVal;
-    };
-
-    for (int i = 0; i < FRUSTUM_PLANES; i++)
-    {
-        f32_u ux;
-        ux.floatVal = m_fp[i].n.x;
-        f32_u uy;
-        uy.floatVal = m_fp[i].n.y;
-        f32_u uz;
-        uz.floatVal = m_fp[i].n.z;
-        uint32 bitX =   ux.uintVal >> 31;
-        uint32 bitY =   uy.uintVal >> 31;
-        uint32 bitZ =   uz.uintVal >> 31;
-        m_idx1[i] = bitX * 3 + 0;
-        m_idx2[i] = (1 - bitX) * 3 + 0;
-        m_idy1[i] = bitY * 3 + 1;
-        m_idy2[i] = (1 - bitY) * 3 + 1;
-        m_idz1[i] = bitZ * 3 + 2;
-        m_idz2[i] = (1 - bitZ) * 3 + 2;
-    }
-}
-
-// Description
-//   Simple approach to check if an AABB and the camera-frustum overlap. The AABB
-//   is assumed to be in world-space. This is a very fast method, just one single
-//   dot-product is necessary to check an AABB against a plane. Actually there
-//   is no significant speed-different between culling a sphere or an AABB.
-//
-// Example
-//   bool InOut=camera.IsAABBVisible_F(aabb);
-//
-// return values
-//   CULL_EXCLUSION   = AABB outside of frustum (very fast rejection-test)
-//   CULL_OVERLAP     = AABB either intersects the borders of the frustum or is totally inside
-
-inline bool CCamera::IsAABBVisible_F(const AABB& aabb) const
-{
-    const f32* p = &aabb.min.x;
-    uint32 x, y, z;
-    x = m_idx1[0];
-    y = m_idy1[0];
-    z = m_idz1[0];
-    if ((m_fp[0] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    x = m_idx1[1];
-    y = m_idy1[1];
-    z = m_idz1[1];
-    if ((m_fp[1] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    x = m_idx1[2];
-    y = m_idy1[2];
-    z = m_idz1[2];
-    if ((m_fp[2] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    x = m_idx1[3];
-    y = m_idy1[3];
-    z = m_idz1[3];
-    if ((m_fp[3] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    x = m_idx1[4];
-    y = m_idy1[4];
-    z = m_idz1[4];
-    if ((m_fp[4] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    x = m_idx1[5];
-    y = m_idy1[5];
-    z = m_idz1[5];
-    if ((m_fp[5] | Vec3(p[x], p[y], p[z])) > 0)
-    {
-        return CULL_EXCLUSION;
-    }
-    return CULL_OVERLAP;
-}
diff --git a/Code/Legacy/CryCommon/Cry_Math.h b/Code/Legacy/CryCommon/Cry_Math.h
index a96b83a1bf..b09e29ce90 100644
--- a/Code/Legacy/CryCommon/Cry_Math.h
+++ b/Code/Legacy/CryCommon/Cry_Math.h
@@ -17,6 +17,7 @@
 #include <CryEndian.h>  // eLittleEndian
 #include <CryHalf.inl>
 #include <float.h>
+#include <limits>
 ///////////////////////////////////////////////////////////////////////////////
 // Forward declarations                                                      //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Code/Legacy/CryCommon/Cry_Matrix34.h b/Code/Legacy/CryCommon/Cry_Matrix34.h
index eb9c22086b..747d0c7db9 100644
--- a/Code/Legacy/CryCommon/Cry_Matrix34.h
+++ b/Code/Legacy/CryCommon/Cry_Matrix34.h
@@ -799,11 +799,6 @@ struct Matrix34_tpl
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef Matrix34_tpl<f32>  Matrix34; //always 32 bit
-#if AZ_COMPILER_MSVC
-    typedef __declspec(align(16)) Matrix34_tpl<f32> Matrix34A;
-#elif AZ_COMPILER_CLANG
-    typedef Matrix34_tpl<f32> __attribute__((aligned(16))) Matrix34A;
-#endif
 
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
diff --git a/Code/Legacy/CryCommon/Cry_Matrix44.h b/Code/Legacy/CryCommon/Cry_Matrix44.h
index 4da8475260..de721b4e1f 100644
--- a/Code/Legacy/CryCommon/Cry_Matrix44.h
+++ b/Code/Legacy/CryCommon/Cry_Matrix44.h
@@ -276,30 +276,6 @@ struct Matrix44_tpl
         m32 = m.m32;
         m33 = m.m33;
     }
-    //CONSTRUCTOR for identical types which converts between double/float
-    //Matrix44 m=m44r;
-    //Matrix44r m=m44;
-    template<class F1>
-    ILINE Matrix44_tpl<F>(const Matrix44_tpl<F1>&m)
-    {
-        assert(m.IsValid());
-        m00 = F(m.m00);
-        m01 = F(m.m01);
-        m02 = F(m.m02);
-        m03 = F(m.m03);
-        m10 = F(m.m10);
-        m11 = F(m.m11);
-        m12 = F(m.m12);
-        m13 = F(m.m13);
-        m20 = F(m.m20);
-        m21 = F(m.m21);
-        m22 = F(m.m22);
-        m23 = F(m.m23);
-        m30 = F(m.m30);
-        m31 = F(m.m31);
-        m32 = F(m.m32);
-        m33 = F(m.m33);
-    }
 
     //---------------------------------------------------------------------
 
@@ -662,13 +638,6 @@ struct Matrix44_tpl
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef Matrix44_tpl<f32>  Matrix44;   //always 32 bit
-typedef Matrix44_tpl<f64>  Matrix44d;  //always 64 bit
-typedef Matrix44_tpl<real> Matrix44r;  //variable float precision. depending on the target system it can be between 32, 64 or 80 bit
-#if AZ_COMPILER_MSVC
-    typedef __declspec(align(16)) Matrix44_tpl<f32> Matrix44A;
-#elif AZ_COMPILER_CLANG
-    typedef Matrix44_tpl<f32> __attribute__((aligned(16))) Matrix44A;
-#endif
 
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
diff --git a/Code/Legacy/CryCommon/Cry_Vector2.h b/Code/Legacy/CryCommon/Cry_Vector2.h
index 81a8c10e49..5bf47d0642 100644
--- a/Code/Legacy/CryCommon/Cry_Vector2.h
+++ b/Code/Legacy/CryCommon/Cry_Vector2.h
@@ -8,10 +8,6 @@
 
 
 // Description : Common matrix class
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
-#define CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
 #pragma once
 
 #include <AzCore/RTTI/TypeInfo.h>
@@ -68,9 +64,7 @@ struct Vec2_tpl
         : x((F)v.x)
         , y((F)v.y) { assert(this->IsValid()); }
 
-    ILINE Vec2_tpl& operator=(const Vec2_tpl& src) { x = src.x; y = src.y; return *this; }
-    //template<class F1> Vec2_tpl& operator=(const Vec2_tpl<F1>& src) { x=F(src.x); y=F(src.y); return *this; }
-    //template<class F1> Vec2_tpl& operator=(const Vec3_tpl<F1>& src) { x=F(src.x); y=F(src.y); return *this; }
+    Vec2_tpl& operator=(const Vec2_tpl& src) = default;
 
     ILINE int operator!() const { return x == 0 && y == 0; }
 
@@ -372,4 +366,3 @@ namespace AZ
 {
     AZ_TYPE_INFO_SPECIALIZE(Vec2, "{844131BA-9565-42F3-8482-6F65A6D5FC59}");
 }
-#endif // CRYINCLUDE_CRYCOMMON_CRY_VECTOR2_H
diff --git a/Code/Legacy/CryCommon/HMDBus.h b/Code/Legacy/CryCommon/HMDBus.h
deleted file mode 100644
index dab4c28668..0000000000
--- a/Code/Legacy/CryCommon/HMDBus.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <ISystem.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/RTTI/ReflectContext.h>
-#include <VRCommon.h>
-
-struct IRenderAuxGeom;
-
-namespace AZ
-{
-    namespace VR
-    {
-        /**
-        * Bus for reacting to events triggered by the VR systems
-        */
-        class VREvents : public AZ::EBusTraits
-        {
-        public:
-            virtual ~VREvents() {}
-
-            /**
-            * Event triggered when an HMD initializes successfully
-            */
-            virtual void OnHMDInitialized() {}
-
-            /**
-            * Event triggered when an HMD shuts down
-            */
-            virtual void OnHMDShutdown() {}
-        };
-
-        using VREventBus = AZ::EBus<VREvents>;
-
-        ///
-        /// Device initialization bus. Each HMD device SDK should connect to this bus during startup in order to be initialized by the LY engine.
-        /// Any devices that successfully initialize will be connected to the HMDDeviceBus for actual use in VR rendering.
-        ///
-        class HMDInitBus : public AZ::EBusTraits
-        {
-        public:
-
-            virtual ~HMDInitBus() {}
-
-            ///
-            /// Attempt to initialize this device. If initialization is initially successful (device exists and is able to startup) then this device should connect to the
-            /// HMDDeviceRequestBus in order to be used as an HMD from the main Open 3D Engine system.
-            ///
-            /// @return If true, initialization fully succeeded.
-            ///
-            virtual bool AttemptInit() = 0;
-
-            ///
-            /// Shutdown this device and destroy any internal context/state information that it may contain. Once this function has returned, the device should be in a
-            /// totally clean state and able to re-initialized if necessary.
-            ///
-            virtual void Shutdown() = 0;
-
-            ///
-            /// Priority values for the HMD to set. A higher priority value means that the HMD will be be initialized before
-            /// other HMDs with lower priority values.
-            ///
-            enum HMDInitPriority
-            {
-                kNullVR = -100,
-                kLowest = 0,
-                kMiddle = 50,
-                kHighest = 100
-            };
-
-            ///
-            /// Specify the initialization priority for this HMD device. Typically SDKs that have only one device that they support (e.g. Oculus) should have the highest
-            /// priority so that other VR Gems don't take the device context. For example, OpenVR is capable of driving an Oculus Rift and if initialized first will control
-            /// the device as opposed to the Oculus runtime.
-            ///
-            virtual HMDInitPriority GetInitPriority() const = 0;
-        };
-
-        using HMDInitRequestBus = AZ::EBus<HMDInitBus>;
-
-        ///
-        /// HMD device bus used to communicate with the rest of the engine. Every device supported by the engine lives in its own GEM and supports this bus. A device
-        /// wraps the underlying SDK into a single object for easy use by the rest of the system. Every device created should register with the EBus in order to be picked up as
-        /// a usable device during initialization via the EBus function BusConnect().
-        ///
-        class HMDDeviceBus
-            : public AZ::EBusTraits
-        {
-        public:
-
-            //////////////////////////////////////////////////////////////////////////
-            // EBus Traits
-            static const EBusHandlerPolicy HandlerPolicy = EBusHandlerPolicy::Multiple;
-            static const EBusAddressPolicy AddressPolicy = EBusAddressPolicy::Single;
-            using MutexType = AZStd::recursive_mutex;
-            //////////////////////////////////////////////////////////////////////////
-
-            virtual ~HMDDeviceBus() {}
-
-            ///
-            /// Simple texture descriptor to pass to the device during render target creation.
-            ///
-            struct TextureDesc
-            {
-                uint32 width;
-                uint32 height;
-            };
-
-            ///
-            /// Update the HMD's internal state and handle events
-            /// This is NOT where tracking is updated. This is for game-time
-            /// events such as controllers connecting/disconnecting or
-            /// certain compositor events being triggered.
-            ///
-            virtual void UpdateInternalState() {}
-
-            ///
-            /// Create the render targets for a rendering device. Note that this will create all necessary render targets but the render targets will be destroyed one at a time in DestroyRenderTargets.
-            ///
-            /// @param renderDevice The render device to use when creating the render target.
-            /// @param desc TextureDesc object denoting texture options to use during creation.
-            /// @param eyeCount The number of HMDRenderTargets to be created in this function.
-            /// @param renderTargets Array of pointers to HMDRenderTargets of size eyeCount created upon successful return of this function. See struct RenderTarget for more info.
-            ///
-            /// @returns If true, the render targets were successfully created.
-            ///
-            virtual bool CreateRenderTargets([[maybe_unused]] void* renderDevice, [[maybe_unused]] const TextureDesc& desc, [[maybe_unused]] size_t eyeCount, [[maybe_unused]] HMDRenderTarget* renderTargets[]) { return false; }
-
-            ///
-            /// Destroy the passed-in render target. Any device-specific texture data will be cleaned up after this function has finished executing.
-            ///
-            virtual void DestroyRenderTarget([[maybe_unused]] HMDRenderTarget& renderTarget) {}
-
-            ///
-            /// Take care of any frame preparations that may be necessary BEFORE rendering begins on either eye. This could be things like synchronization,
-            /// clearing old state, etc.
-            ///
-            virtual void PrepareFrame() {}
-
-            ///
-            /// Retrieve the latest tracking state that was cached since the last call
-            /// to UpdateTrackingStates.
-            ///
-            /// TODO: Differentiate between tracking states viable for rendering and
-            /// tracking states viable for game simulation.
-            ///
-            virtual TrackingState* GetTrackingState() { return nullptr; }
-
-            ///
-            /// Per-eye target to submit to the device for final composition and rendering.
-            ///
-            struct EyeTarget
-            {
-                void*  renderTarget;     ///< The device render target.
-                Vec2i  viewportPosition; ///< Position of the viewport pertaining to this render target.
-                Vec2i  viewportSize;     ///< Size of the viewport pertaining to this render target.
-            };
-
-            ///
-            /// Submit a new frame to the HMD device. Each eye should be fully rendered by this point. The device will automatically correlate the proper
-            /// tracking information with this frame.
-            ///
-            /// @param left A reference to the left EyeTarget to present
-            /// @param right A reference to the right EyeTarget to present
-            ///
-            virtual void SubmitFrame([[maybe_unused]] const EyeTarget& left, [[maybe_unused]] const EyeTarget& right) {}
-
-            ///
-            /// Recent the current pose for the HMD based on the current direction that the viewer is looking.
-            ///
-            virtual void RecenterPose() {}
-
-            ///
-            /// Set the current tracking level of the HMD. Supported tracking levels are defined in struct TrackingLevel.
-            ///
-            /// @param level The tracking level we want to use with this HMD
-            ///
-            virtual void SetTrackingLevel([[maybe_unused]] const AZ::VR::HMDTrackingLevel level) {}
-
-            ///
-            /// Write any HMD info to the console/log file(s). At a minimum this function should print the info contained in the HMDDeviceInfo object.
-            ///
-            virtual void OutputHMDInfo() {}
-
-            ///
-            /// Enable/disable debugging for this device. The device can decide what the most appropriate debugging information is
-            /// displayed to the user (e.g. HMD position, performance info, latency timing, etc.).
-            ///
-            /// @param enable Set to true to enable debugging
-            ///
-            virtual void EnableDebugging([[maybe_unused]] bool enable) {}
-
-            ///
-            /// Draw any custom debug info for this device. This function is invoked by the HMDDebugger.
-            ///
-            /// @param transform Local to world-space transform.
-            /// @param auxGeom A pointer to the auxiliary geometry renderer
-            ///
-            virtual void DrawDebugInfo([[maybe_unused]] const AZ::Transform& transform, [[maybe_unused]] IRenderAuxGeom* auxGeom) {}
-
-            ///
-            /// Get the device info object for this particular HMD. See struct HMDDeviceInfo for more details.
-            ///
-            /// @return A pointer to this HMD's HMDDeviceInfo struct
-            ///
-            virtual HMDDeviceInfo* GetDeviceInfo() { return nullptr; }
-
-            ///
-            /// Get whether or not the HMD has been initialized. The HMD has been initialized when it has fully established an interface
-            /// with its necessary SDK and is ready to be used.
-            ///
-            /// @return True if the device has been initialized and is usable
-            ///
-            virtual bool IsInitialized() { return false; }
-
-            ///
-            /// Get the play space of the device, if exists
-            ///
-            /// @return True if the device has been initialized and is usable
-            ///
-            virtual const Playspace* GetPlayspace() { return nullptr; }
-
-            ///
-            /// Ask the HMD to update its internal tracking state; must be called once per frame.
-            /// Must be called from the render thread (the same thread that the device submits on).
-            /// This will calculate the internal tracking states fit for rendering the upcoming frame.
-            ///
-            virtual void UpdateTrackingStates() {}
-
-        protected:
-        };
-
-        using HMDDeviceRequestBus = AZ::EBus<HMDDeviceBus>;
-
-        ///
-        /// Bus to define HMD debugging. This includes visualization of any HMD-specific objects as well as any
-        /// VR performance metrics displayed in the HMD.
-        ///
-        class HMDDebuggerBus
-            : public AZ::EBusTraits
-        {
-        public:
-
-            virtual ~HMDDebuggerBus() {}
-
-            ///
-            /// Enable/disable the debugger.
-            ///
-            /// @param enable Pass in true to enable info debugging
-            ///
-            virtual void EnableInfo(bool enable) = 0;
-
-            ///
-            /// Enable/disable the camera debugger.
-            ///
-            /// @param enable Pass in true to enable camera debugging
-            ///
-            virtual void EnableCamera(bool enable) = 0;
-        };
-
-        using HMDDebuggerRequestBus = AZ::EBus<HMDDebuggerBus>;
-
-    } // namespace VR
-} // namespace AZ
diff --git a/Code/Legacy/CryCommon/ICmdLine.h b/Code/Legacy/CryCommon/ICmdLine.h
index 6071671b02..80561fd85c 100644
--- a/Code/Legacy/CryCommon/ICmdLine.h
+++ b/Code/Legacy/CryCommon/ICmdLine.h
@@ -71,6 +71,14 @@ public:
     //      The value of the argument as integer number.
     virtual const int GetIValue() const = 0;
     // </interfuscator:shuffle>
+
+    // Description:
+    //      Retrieve the value of the argument.
+    // Arguments:
+    //      cmdLineValue. The cmdline value will be filled out if a valid boolean is found.
+    // Return Value:
+    //      Returns true if the cmdline arg is actually a boolean string matching "true" or "false"; otherwise return false.
+    virtual const bool GetBoolValue(bool& cmdLineValue) const = 0;
 };
 
 // Command line interface
diff --git a/Code/Legacy/CryCommon/IEntityRenderState.h b/Code/Legacy/CryCommon/IEntityRenderState.h
deleted file mode 100644
index 42e485cd1e..0000000000
--- a/Code/Legacy/CryCommon/IEntityRenderState.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-#include <CryCommon/Cry_Matrix34.h>
-
-struct IStatObj;
-
-struct IRenderNode
-{
-    // Gives access to object components.
-    IStatObj* GetEntityStatObj(unsigned int  = 0, unsigned int  = 0, Matrix34* = nullptr, bool  = false) {
-        return nullptr;
-    }
-
-    int GetSlotCount() const { return 1; }
-
-    // Max view distance settings.
-    static constexpr int VIEW_DISTANCE_MULTIPLIER_MAX = 100;
-
-};
diff --git a/Code/Legacy/CryCommon/IFunctorBase.h b/Code/Legacy/CryCommon/IFunctorBase.h
deleted file mode 100644
index 6fb3a5d981..0000000000
--- a/Code/Legacy/CryCommon/IFunctorBase.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Base header for multi DLL functors.
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H
-#define CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H
-#pragma once
-
-#include <AzCore/std/parallel/atomic.h>
-
-// Base class for functor storage.
-// Not intended for direct usage.
-class IFunctorBase
-{
-public:
-    IFunctorBase()
-        : m_nReferences(0){}
-    virtual ~IFunctorBase(){};
-    virtual void Call() = 0;
-
-    void AddRef()
-    {
-        m_nReferences.fetch_add(1, AZStd::memory_order_acq_rel);
-    }
-
-    void Release()
-    {
-        if (m_nReferences.fetch_sub(1, AZStd::memory_order_acq_rel) == 1)
-        {
-            delete this;
-        }
-    }
-
-protected:
-    AZStd::atomic_int m_nReferences;
-};
-
-// Base Template for specialization.
-// Not intended for direct usage.
-template<typename tType>
-class TFunctor
-    : public IFunctorBase
-{
-};
-
-#endif // CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H
diff --git a/Code/Legacy/CryCommon/IIndexedMesh.h b/Code/Legacy/CryCommon/IIndexedMesh.h
index 8d3ee64c71..eaa47473f0 100644
--- a/Code/Legacy/CryCommon/IIndexedMesh.h
+++ b/Code/Legacy/CryCommon/IIndexedMesh.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "Cry_Color.h"
-#include <VertexFormats.h>
 #include <Vertex.h>
 
 // Description:
@@ -53,119 +52,3 @@ public:
         a = othera;
     }
 };
-
-
-// Description:
-//    Defines a single triangle face in the CMesh topology.
-struct SMeshFace
-{
-    int v[3]; // indices to vertex, normals and optionally tangent basis arrays
-    unsigned char nSubset; // index to mesh subsets array.
-};
-
-// Description:
-//    3D Normal Vector used by CMesh.
-struct SMeshNormal
-{
-    SMeshNormal() {}
-
-private:
-    Vec3 Normal;
-
-public:
-    explicit SMeshNormal(const Vec3& othern)
-    {
-        Normal = othern;
-    }
-
-    Vec3 GetN() const { return Normal; }
-
-};
-
-// Subset of mesh is a continuous range of vertices and indices that share same material.
-struct SMeshSubset
-{
-    Vec3 vCenter;
-    float fRadius;
-    float fTexelDensity;
-
-    int nFirstIndexId;
-    int nNumIndices;
-
-    int nFirstVertId;
-    int nNumVerts;
-
-    int nMatID; // Material Sub-object id.
-    int nMatFlags; // Special Material flags.
-    int nPhysicalizeType; // Type of physicalization for this subset.
-
-    AZ::Vertex::Format vertexFormat;
-
-    SMeshSubset()
-        : vCenter(0, 0, 0)
-        , fRadius(0)
-        , fTexelDensity(0)
-        , nFirstIndexId(0)
-        , nNumIndices(0)
-        , nFirstVertId(0)
-        , nNumVerts(0)
-        , nMatID(0)
-        , nMatFlags(0)
-        , nPhysicalizeType(0x1000)
-        , vertexFormat(eVF_P3S_C4B_T2S)
-    {
-    }
-
-};
-
-// Description:
-//    Editable mesh interface.
-//    IndexedMesh can be created directly or loaded from CGF file, before rendering it is converted into IRenderMesh.
-//    IStatObj is used to host IIndexedMesh, and corresponding IRenderMesh.
-struct IIndexedMesh
-{
-    /*! Structure used for read-only access to mesh data. Used by GetMesh() function */
-    struct SMeshDescription
-    {
-        const SMeshFace*     m_pFaces;    // pointer to array of faces
-        const Vec3*          m_pVerts;    // pointer to array of vertices in f32 format
-        const Vec3f16*       m_pVertsF16; // pointer to array of vertices in f16 format
-        const SMeshNormal*   m_pNorms;    // pointer to array of normals
-        const SMeshColor*    m_pColor;    // pointer to array of vertex colors
-        const SMeshTexCoord* m_pTexCoord; // pointer to array of texture coordinates
-        const vtx_idx*   m_pIndices;  // pointer to array of indices
-        int m_nFaceCount;  // number of elements m_pFaces array
-        int m_nVertCount;  // number of elements in m_pVerts, m_pNorms and m_pColor arrays
-        int m_nCoorCount;  // number of elements in m_pTexCoord array
-        int m_nIndexCount; // number of elements in m_pIndices array
-    };
-
-    virtual ~IIndexedMesh() {}
-
-    // Release indexed mesh.
-    virtual void Release() = 0;
-
-    //! Gives read-only access to mesh data
-    virtual void GetMeshDescription(SMeshDescription& meshDesc) const = 0;
-
-    //! Return number of allocated faces
-    virtual int GetFaceCount() const = 0;
-
-    //! Return number of allocated vertices, normals and colors
-    virtual int GetVertexCount() const = 0;
-
-    /*! Reallocates vertices, normals and colors. Calling this function invalidates SMeshDescription pointers */
-    virtual void SetVertexCount(int nNewCount) = 0;
-
-    //! Return number of allocated texture coordinates
-    virtual int GetTexCoordCount() const = 0;
-
-    // Get number of indices in the mesh.
-    virtual int GetIndexCount() const = 0;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Subset access.
-    //////////////////////////////////////////////////////////////////////////
-    virtual int GetSubSetCount() const = 0;
-    virtual const SMeshSubset& GetSubSet(int nIndex) const = 0;
-};
diff --git a/Code/Legacy/CryCommon/IMovieSystem.h b/Code/Legacy/CryCommon/IMovieSystem.h
index 4da08d3bbf..79c000bfca 100644
--- a/Code/Legacy/CryCommon/IMovieSystem.h
+++ b/Code/Legacy/CryCommon/IMovieSystem.h
@@ -18,7 +18,9 @@
 #include <Range.h>
 #include <AnimKey.h>
 #include <ISplines.h>
-#include <Cry_Camera.h>
+
+#define DEFAULT_NEAR 0.2f
+#define DEFAULT_FOV (75.0f * gf_PI / 180.0f)
 
 // forward declaration.
 struct IAnimTrack;
diff --git a/Code/Legacy/CryCommon/IRenderAuxGeom.h b/Code/Legacy/CryCommon/IRenderAuxGeom.h
index 6627c41530..a07bba83e4 100644
--- a/Code/Legacy/CryCommon/IRenderAuxGeom.h
+++ b/Code/Legacy/CryCommon/IRenderAuxGeom.h
@@ -10,6 +10,8 @@
 
 #include "Cry_Color.h"
 #include "IRenderer.h"
+#include <Cry_Math.h>
+#include <Cry_Geo.h>
 
 struct SAuxGeomRenderFlags;
 
diff --git a/Code/Legacy/CryCommon/IRenderer.h b/Code/Legacy/CryCommon/IRenderer.h
index 495c885e44..d457b234e4 100644
--- a/Code/Legacy/CryCommon/IRenderer.h
+++ b/Code/Legacy/CryCommon/IRenderer.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include "Cry_Camera.h"
 #include "VertexFormats.h"
 
 #include <AzCore/Casting/numeric_cast.h>
diff --git a/Code/Legacy/CryCommon/IShader.h b/Code/Legacy/CryCommon/IShader.h
index 208af79ece..c425bfecc0 100644
--- a/Code/Legacy/CryCommon/IShader.h
+++ b/Code/Legacy/CryCommon/IShader.h
@@ -52,7 +52,6 @@ enum EParamType
 };
 
 struct IShader;
-class CCamera;
 
 union UParamVal
 {
@@ -64,7 +63,6 @@ union UParamVal
     char* m_String;
     float m_Color[4];
     float m_Vector[3];
-    CCamera* m_pCamera;
 };
 
 struct SShaderParam
diff --git a/Code/Legacy/CryCommon/IStatObj.h b/Code/Legacy/CryCommon/IStatObj.h
deleted file mode 100644
index a809064bcc..0000000000
--- a/Code/Legacy/CryCommon/IStatObj.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Cry_Math.h"
-#include "Cry_Geo.h"
-#include "IMaterial.h"
-
-// General forward declaration.
-struct SRenderingPassInfo;
-
-//////////////////////////////////////////////////////////////////////////
-// Type of static sub object.
-//////////////////////////////////////////////////////////////////////////
-enum EStaticSubObjectType
-{
-    STATIC_SUB_OBJECT_MESH,         // This simple geometry part of the multi-sub object geometry.
-    STATIC_SUB_OBJECT_HELPER_MESH,  // Special helper mesh, not rendered usually, used for broken pieces.
-};
-
-// used for on-CPU voxelization
-struct SRayHitInfo
-{
-    SRayHitInfo()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-    //////////////////////////////////////////////////////////////////////////
-    // Input parameters.
-    Vec3    inReferencePoint;
-    Ray     inRay;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Output parameters.
-    Vec3 vHitPos;
-    Vec3 vHitNormal;
-
-    // More inputs
-    bool    bInFirstHit;
-    bool    bUseCache;
-};
-
-// Summary:
-//     Interface to hold static object data
-struct IStatObj
-{
-    //////////////////////////////////////////////////////////////////////////
-    // SubObject
-    //////////////////////////////////////////////////////////////////////////
-    struct SSubObject
-    {
-        EStaticSubObjectType nType;
-        Matrix34 localTM;     // Local transformation matrix, relative to parent.
-        IStatObj* pStatObj;   // Static object for sub part of CGF.
-    };
-    //////////////////////////////////////////////////////////////////////////
-
-    virtual ~IStatObj() {}
-    // Description:
-    //     Provide access to the faces, vertices, texture coordinates, normals and
-    //     colors of the object used later for CRenderMesh construction.
-    // Return Value:
-    //
-    // Summary:
-    //     Get the object source geometry
-    virtual struct IIndexedMesh* GetIndexedMesh(bool bCreateIfNone = false) = 0;
-
-    // Summary:
-    //     Get the bounding box
-    // Arguments:
-    //     Mins - Position of the bottom left close corner of the bounding box
-    //     Maxs - Position of the top right far corner of the bounding box
-    virtual AABB GetAABB() = 0;
-
-    // Description:
-    //     Returns the LOD object, if present.
-    // Arguments:
-    //     nLodLevel - Level of the LOD
-    //     bReturnNearest - if true will return nearest available LOD to nLodLevel.
-    // Return Value:
-    //     A static object with the desired LOD. The value NULL will be return if there isn't any LOD object for the level requested.
-    // Summary:
-    //     Get the LOD object
-    virtual IStatObj* GetLodObject(int nLodLevel, bool bReturnNearest = false) = 0;
-
-    // Summary:
-    //     Returns a pointer to the object
-    // Return Value:
-    //     A pointer to the current object, which is simply done like this "return this;"
-    virtual struct IStatObj* GetIStatObj() { return this; }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Interface to the Sub Objects.
-    //////////////////////////////////////////////////////////////////////////
-    // Summary:
-    //    Retrieve number of sub-objects.
-    virtual int GetSubObjectCount() const = 0;
-    // Summary:
-    //    Retrieve sub object by index, where 0 <= nIndex < GetSubObjectCount()
-    virtual SSubObject* GetSubObject(int nIndex) = 0;
-
-    // Intersect ray with static object.
-    // Ray must be in object local space.
-    virtual bool RayIntersection(SRayHitInfo& hitInfo, IMaterial* pCustomMtl = nullptr) = 0;
-};
diff --git a/Code/Legacy/CryCommon/ISystem.h b/Code/Legacy/CryCommon/ISystem.h
index a243f00ea2..6fdc8b52fe 100644
--- a/Code/Legacy/CryCommon/ISystem.h
+++ b/Code/Legacy/CryCommon/ISystem.h
@@ -47,7 +47,6 @@ struct IConsole;
 struct IRemoteConsole;
 struct IRenderer;
 struct IProcess;
-struct ITimer;
 struct ICryFont;
 struct IMovieSystem;
 namespace Audio
@@ -57,7 +56,6 @@ namespace Audio
 struct SFileVersion;
 struct INameTable;
 struct ILevelSystem;
-struct IViewSystem;
 class IXMLBinarySerializer;
 struct IAVI_Reader;
 class CPNoise3;
@@ -75,7 +73,6 @@ namespace AZ
 
 typedef void* WIN_HWND;
 
-class CCamera;
 struct CLoadingTimeProfiler;
 
 class ICmdLine;
@@ -430,7 +427,7 @@ struct ISystemUserCallback
 
     // Description:
     //   Show message by provider.
-    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType) { return CryMessageBox(text, caption, uType); }
+    virtual void ShowMessage(const char* text, const char* caption, unsigned int uType) { CryMessageBox(text, caption, uType); }
 
     // </interfuscator:shuffle>
 
@@ -612,7 +609,6 @@ struct SSystemGlobalEnvironment
 {
     AZ::IO::IArchive*          pCryPak;
     AZ::IO::FileIOBase*        pFileIO;
-    ITimer*                    pTimer;
     ICryFont*                  pCryFont;
     ::IConsole*                  pConsole;
     ISystem*                   pSystem = nullptr;
@@ -815,16 +811,13 @@ struct ISystem
     // Description:
     //   Report message by provider or by using CryMessageBox.
     //   Doesn't terminate the execution.
-    virtual int ShowMessage(const char* text, const char* caption, unsigned int uType) = 0;
+    virtual void ShowMessage(const char* text, const char* caption, unsigned int uType) = 0;
 
     // Summary:
     //   Compare specified verbosity level to the one currently set.
     virtual bool CheckLogVerbosity(int verbosity) = 0;
 
     // return the related subsystem interface
-
-    //
-    virtual IViewSystem* GetIViewSystem() = 0;
     virtual ILevelSystem* GetILevelSystem() = 0;
     virtual ICmdLine* GetICmdLine() = 0;
     virtual ILog* GetILog() = 0;
@@ -835,15 +828,6 @@ struct ISystem
     virtual IRemoteConsole* GetIRemoteConsole() = 0;
     virtual ISystemEventDispatcher* GetISystemEventDispatcher() = 0;
 
-    virtual ITimer* GetITimer() = 0;
-
-    // Arguments:
-    //   bValue - Set to true when running on a cheat protected server or a client that is connected to it (not used in singleplayer).
-    virtual void SetForceNonDevMode(bool bValue) = 0;
-    // Return Value:
-    //   True when running on a cheat protected server or a client that is connected to it (not used in singleplayer).
-    virtual bool GetForceNonDevMode() const = 0;
-    virtual bool WasInDevMode() const = 0;
     virtual bool IsDevMode() const = 0;
     //////////////////////////////////////////////////////////////////////////
 
@@ -868,18 +852,6 @@ struct ISystem
     //   When ignore update sets to true, system will ignore and updates and render calls.
     virtual void IgnoreUpdates(bool bIgnore) = 0;
 
-    // Summary:
-    //   Sets the active process
-    // Arguments:
-    //   process - A pointer to a class that implement the IProcess interface.
-    virtual void SetIProcess(IProcess* process) = 0;
-
-    // Summary:
-    //   Gets the active process.
-    // Return Value:
-    //   A pointer to the current active process.
-    virtual IProcess* GetIProcess() = 0;
-
     // Return Value:
     //   True if system running in Test mode.
     virtual bool IsTestMode() const = 0;
@@ -919,8 +891,6 @@ struct ISystem
     //   pCallback - 0 means normal LoadConfigVar behaviour is used
     virtual void LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink = 0, bool warnIfMissing = true) = 0;
 
-    virtual ESystemConfigSpec GetMaxConfigSpec() const = 0;
-
     //////////////////////////////////////////////////////////////////////////
 
     // Summary:
@@ -945,10 +915,6 @@ struct ISystem
     //   Retrieves the perlin noise singleton instance.
     virtual CPNoise3* GetNoiseGen() = 0;
 
-    // Summary:
-    //   Retrieves system update counter.
-    virtual uint64 GetUpdateCounter() = 0;
-
     //////////////////////////////////////////////////////////////////////////
     // Error callback handling
 
@@ -981,13 +947,6 @@ struct ISystem
     virtual void SetAssertVisible(bool bAssertVisble) = 0;
     //////////////////////////////////////////////////////////////////////////
 
-    // Summary:
-    //  Enable/Disable drawing the console
-    virtual void SetConsoleDrawEnabled(bool enabled) = 0;
-
-    //  Enable/Disable drawing the UI
-    virtual void SetUIDrawEnabled(bool enabled) = 0;
-
     // Summary:
     //   Get the index of the currently running O3DE application. (0 = first instance, 1 = second instance, etc)
     virtual int GetApplicationInstance() = 0;
@@ -1035,12 +994,6 @@ struct ISystem
     virtual bool IsSavingResourceList() const = 0;
 #endif
 
-    // Summary:
-    //      Gets the root window message handler function
-    //      The returned pointer is platform-specific:
-    //      For Windows OS, the pointer is of type WNDPROC
-    virtual void* GetRootWindowMessageHandler() = 0;
-
     // Summary:
     //      Register a IWindowMessageHandler that will be informed about window messages
     //      The delivered messages are platform-specific
@@ -1050,10 +1003,6 @@ struct ISystem
     //      Unregister an IWindowMessageHandler that was previously registered using RegisterWindowMessageHandler
     virtual void UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler) = 0;
 
-    // Create an instance of a Local File IO object (which reads directly off the local filesystem, instead of,
-    // for example, reading from the network or a pack or USB or such.
-    virtual std::shared_ptr<AZ::IO::FileIOBase> CreateLocalFileIO() = 0;
-
     ////////////////////////////////////////////////////////////////////////////////////////////////
     // EBus interface used to listen for cry system notifications
     class CrySystemNotifications : public AZ::EBusTraits
diff --git a/Code/Legacy/CryCommon/ITimer.h b/Code/Legacy/CryCommon/ITimer.h
deleted file mode 100644
index 06bdab61e7..0000000000
--- a/Code/Legacy/CryCommon/ITimer.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_ITIMER_H
-#define CRYINCLUDE_CRYCOMMON_ITIMER_H
-#pragma once
-
-
-#include "TimeValue.h"              // CTimeValue
-#include "SerializeFwd.h"
-
-struct tm;
-
-// Summary:
-// Interface to the Timer System.
-struct ITimer
-{
-    enum ETimer
-    {
-        ETIMER_GAME = 0, // Pausable, serialized, frametime is smoothed/scaled/clamped.
-        ETIMER_UI,       // Non-pausable, non-serialized, frametime unprocessed.
-        ETIMER_LAST
-    };
-
-    enum ETimeScaleChannels
-    {
-        eTSC_Trackview = 0,
-        eTSC_GameStart
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~ITimer() {};
-
-    // Summary:
-    //   Resets the timer
-    // Notes:
-    //   Only needed because float precision wasn't last that long - can be removed if 64bit is used everywhere.
-    virtual void ResetTimer() = 0;
-
-    // Summary:
-    //   Updates the timer every frame, needs to be called by the system.
-    virtual void UpdateOnFrameStart() = 0;
-
-    // Summary:
-    //   Returns the absolute time at the last UpdateOnFrameStart() call.
-    // Todo:
-    //   Remove, use GetFrameStartTime() instead.
-    // See also:
-    //   UpdateOnFrameStart(),GetFrameStartTime()
-    virtual float GetCurrTime(ETimer which = ETIMER_GAME) const = 0;
-
-    // Summary:
-    //   Returns the absolute time at the last UpdateOnFrameStart() call.
-    // See also:
-    //   UpdateOnFrameStart()
-    //virtual const CTimeValue& GetFrameStartTime(ETimer which = ETIMER_GAME) const = 0;
-    virtual const CTimeValue& GetFrameStartTime(ETimer which = ETIMER_GAME) const = 0;
-
-    // Summary:
-    //   Returns the absolute current time.
-    // Notes:
-    //   The value continuously changes, slower than GetFrameStartTime().
-    // See also:
-    //   GetFrameStartTime()
-    virtual CTimeValue GetAsyncTime() const = 0;
-
-    // Summary:
-    //  Returns the absolute current time at the moment of the call.
-    virtual float GetAsyncCurTime() = 0;
-
-    // Summary:
-    //   Returns the relative time passed from the last UpdateOnFrameStart() in seconds.
-    // See also:
-    //   UpdateOnFrameStart()
-    virtual float GetFrameTime(ETimer which = ETIMER_GAME) const = 0;
-
-    // Description:
-    //   Returns the relative time passed from the last UpdateOnFrameStart() in seconds without any dilation, smoothing, clamping, etc...
-    // See also:
-    //   UpdateOnFrameStart()
-    virtual float GetRealFrameTime() const = 0;
-
-    // Summary:
-    //   Returns the time scale applied to time values.
-    virtual float GetTimeScale() const = 0;
-
-    // Summary:
-    //  Returns the time scale factor for the given channel
-    virtual float GetTimeScale(uint32 channel) const = 0;
-
-    // Summary:
-    //  Clears all current time scale requests
-    virtual void ClearTimeScales() = 0;
-
-    // Summary:
-    //  Sets the time scale applied to time values.
-    virtual void SetTimeScale(float s, uint32 channel = 0) = 0;
-
-    // Summary:
-    //   Enables/disables timer.
-    virtual void EnableTimer(bool bEnable) = 0;
-
-    // Return Value:
-    //   True if timer is enabled
-    virtual bool IsTimerEnabled() const = 0;
-
-    // Summary:
-    //   Returns the current framerate in frames/second.
-    virtual float   GetFrameRate() = 0;
-
-    // Summary:
-    //   Returns the fraction to blend current frame in profiling stats.
-    virtual float GetProfileFrameBlending(float* pfBlendTime = 0, int* piBlendMode = 0) = 0;
-
-    // Summary:
-    //   Serialization.
-    virtual void Serialize(TSerialize ser) = 0;
-
-    // Summary:
-    //   Tries to pause/unpause a timer.
-    // Return Value:
-    //   True if successfully paused/unpaused, false otherwise.
-    virtual bool PauseTimer(ETimer which, bool bPause) = 0;
-
-    // Summary:
-    //   Determines if a timer is paused.
-    // Returns:
-    //   True if paused, false otherwise.
-    virtual bool IsTimerPaused(ETimer which) = 0;
-
-    // Summary:
-    //   Tries to set a timer.
-    // Returns:
-    //   True if successful, false otherwise.
-    virtual bool SetTimer(ETimer which, float timeInSeconds) = 0;
-
-    // Summary:
-    //   Makes a tm struct from a time_t in UTC
-    // Example:
-    //   Like gmtime.
-    virtual void SecondsToDateUTC(time_t time, struct tm& outDateUTC) = 0;
-
-    // Summary:
-    //   Makes a UTC time from a tm.
-    // Example:
-    //   Like timegm, but not available on all platforms.
-    virtual time_t DateToSecondsUTC(struct tm& timePtr) = 0;
-
-
-    // Summary
-    //  Convert from ticks (CryGetTicks()) to seconds
-    //
-    virtual float TicksToSeconds(int64 ticks) = 0;
-
-    // Summary
-    //  Get number of ticks per second
-    //
-    virtual int64 GetTicksPerSecond() = 0;
-
-    // Summary
-    //  Create a new timer of the same type
-    //
-    virtual ITimer* CreateNewTimer() = 0;
-
-    /*!
-        This is similar to the cvar t_FixedStep. However it is stronger, and will cause even GetRealFrameTime to follow the fixed time stamp.
-        GetRealFrameTime will always return the same value as GetFrameTime. This mode is mostly intended for Feature tests that have strict requirements
-        for determinism. It will cause even fps counters to return a fixed value that does not match the actual fps. I could see this also being useful
-        if rendering a video.
-    */
-    virtual void EnableFixedTimeMode(bool enable, float timeStep) = 0;
-    // </interfuscator:shuffle>
-};
-
-// Description:
-//   This class is used for automatic profiling of a section of the code.
-//   Creates an instance of this class, and upon exiting from the code section.
-template <typename time>
-class CITimerAutoProfiler
-{
-public:
-    CITimerAutoProfiler (ITimer* pTimer, time& rTime)
-        : m_pTimer (pTimer)
-        , m_rTime (rTime)
-    {
-        rTime -= pTimer->GetAsyncCurTime();
-    }
-
-    ~CITimerAutoProfiler ()
-    {
-        m_rTime += m_pTimer->GetAsyncCurTime();
-    }
-
-protected:
-    ITimer* m_pTimer;
-    time& m_rTime;
-};
-
-// Description:
-//   Include this string AUTO_PROFILE_SECTION(pITimer, g_fTimer) for the section of code where the profiler timer must be turned on and off.
-//   The profiler timer is just some global or static float or double value that accumulates the time (in seconds) spent in the given block of code.
-//   pITimer is a pointer to the ITimer interface, g_fTimer is the global accumulator.
-#define AUTO_PROFILE_SECTION(pITimer, g_fTimer) CITimerAutoProfiler<double> __section_auto_profiler(pITimer, g_fTimer)
-
-#endif // CRYINCLUDE_CRYCOMMON_ITIMER_H
diff --git a/Code/Legacy/CryCommon/IViewSystem.h b/Code/Legacy/CryCommon/IViewSystem.h
deleted file mode 100644
index d8514aadf6..0000000000
--- a/Code/Legacy/CryCommon/IViewSystem.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : View System interfaces.
-
-#pragma once
-
-#include <Cry_Camera.h>
-#include <AzCore/Component/EntityId.h>
-
-//
-#define VIEWID_NORMAL 0
-#define VIEWID_FOLLOWHEAD 1
-#define VIEWID_VEHICLE 2
-#define VIEWID_RAGDOLL 3
-
-//Forward declaration of AZ::Entity
-namespace AZ {
-    class Entity;
-}
-
-enum EMotionBlurType
-{
-    eMBT_None = 0,
-    eMBT_Accumulation = 1,
-    eMBT_Velocity = 2
-};
-
-struct SViewParams
-{
-    SViewParams()
-        : position(ZERO)
-        , rotation(IDENTITY)
-        , localRotationLast(IDENTITY)
-        , nearplane(0.0f)
-        , farplane(0.0f)
-        , fov(0.0f)
-        , viewID(0)
-        , groundOnly(false)
-        , shakingRatio(0.0f)
-        , currentShakeQuat(IDENTITY)
-        , currentShakeShift(ZERO)
-        , targetPos(ZERO)
-        , frameTime(0.0f)
-        , angleVel(0.0f)
-        , vel(0.0f)
-        , dist(0.0f)
-        , blend(true)
-        , blendPosSpeed(5.0f)
-        , blendRotSpeed(10.0f)
-        , blendFOVSpeed(5.0f)
-        , blendPosOffset(ZERO)
-        , blendRotOffset(IDENTITY)
-        , blendFOVOffset(0)
-        , justActivated(false)
-        , viewIDLast(0)
-        , positionLast(ZERO)
-        , rotationLast(IDENTITY)
-        , FOVLast(0)
-    {
-    }
-
-    void SetViewID(uint8 id, bool shouldBlend = true)
-    {
-        viewID = id;
-        if (!shouldBlend)
-        {
-            viewIDLast = id;
-        }
-    }
-
-    void UpdateBlending(float curFrameTime)
-    {
-        //if necessary blend the view
-        if (blend)
-        {
-            if (viewIDLast != viewID)
-            {
-                blendPosOffset = positionLast - position;
-                blendRotOffset = (rotationLast / rotation).GetNormalized();
-                blendFOVOffset = FOVLast - fov;
-            }
-            else
-            {
-                blendPosOffset -= blendPosOffset * min(1.0f, blendPosSpeed * curFrameTime);
-                blendRotOffset = Quat::CreateSlerp(blendRotOffset, IDENTITY, min(1.0f, curFrameTime * blendRotSpeed));
-                blendFOVOffset -= blendFOVOffset * min(1.0f, blendFOVSpeed * curFrameTime);
-            }
-
-            position += blendPosOffset;
-            rotation *= blendRotOffset;
-            fov += blendFOVOffset;
-        }
-        else
-        {
-            blendPosOffset.zero();
-            blendRotOffset.SetIdentity();
-            blendFOVOffset = 0.0f;
-        }
-
-        viewIDLast = viewID;
-    }
-
-    void BlendFrom(const SViewParams& params)
-    {
-        positionLast = params.position;
-        rotationLast = params.rotation;
-        FOVLast = params.fov;
-        localRotationLast = params.localRotationLast;
-        blend = true;
-        viewIDLast = 0xff;
-    }
-
-    void SaveLast()
-    {
-        if (viewIDLast != 0xff)
-        {
-            positionLast = position;
-            rotationLast = rotation;
-            FOVLast = fov;
-        }
-        else
-        {
-            viewIDLast = 0xfe;
-        }
-    }
-
-    void ResetBlending()
-    {
-        blendPosOffset.zero();
-        blendRotOffset.SetIdentity();
-    }
-
-    const Vec3& GetPositionLast() { return positionLast; }
-    const Quat& GetRotationLast() { return rotationLast; }
-
-    //
-    Vec3 position;//view position
-    Quat rotation;//view orientation
-    Quat localRotationLast;
-
-    float nearplane;//custom near clipping plane, 0 means use engine defaults
-    float farplane;//custom far clipping plane, 0 means use engine defaults
-    float   fov;
-
-    uint8 viewID;
-
-    //view shake status
-    bool  groundOnly;
-    float shakingRatio;//whats the ammount of shake, from 0.0 to 1.0
-    Quat currentShakeQuat;//what the current angular shake
-    Vec3 currentShakeShift;//what is the current translational shake
-
-    // For damping camera movement.
-    Vec3 targetPos;     // Where the target was.
-    float frameTime;    // current dt.
-    float angleVel;     // previous rate of change of angle.
-    float vel;          // previous rate of change of dist between target and camera.
-    float dist;         // previous dist of cam from target
-
-    //blending
-    bool    blend;
-    float   blendPosSpeed;
-    float   blendRotSpeed;
-    float   blendFOVSpeed;
-    Vec3    blendPosOffset;
-    Quat    blendRotOffset;
-    float   blendFOVOffset;
-    bool    justActivated;
-
-private:
-    uint8 viewIDLast;
-    Vec3 positionLast;//last view position
-    Quat rotationLast;//last view orientation
-    float FOVLast;
-};
-
-struct IAnimSequence;
-struct SCameraParams;
-
-struct IView
-{
-    virtual ~IView() {}
-    struct SShakeParams
-    {
-        Ang3 shakeAngle;
-        Vec3 shakeShift;
-        float sustainDuration;
-        float fadeInDuration;
-        float fadeOutDuration;
-        float frequency;
-        float randomness;
-        int shakeID;
-        bool bFlipVec;
-        bool bUpdateOnly;
-        bool bGroundOnly;
-        bool bPermanent; // if true, sustainDuration is ignored
-        bool isSmooth;
-
-        SShakeParams()
-            : shakeAngle(0, 0, 0)
-            , shakeShift(0, 0, 0)
-            , sustainDuration(0)
-            , fadeInDuration(0)
-            , fadeOutDuration(2.f)
-            , frequency(0)
-            , randomness(0)
-            , shakeID(0)
-            , bFlipVec(true)
-            , bUpdateOnly(false)
-            , bGroundOnly(false)
-            , bPermanent(false)
-            , isSmooth(false)
-        {
-        }
-    };
-
-    virtual void Release() = 0;
-    virtual void Update(float frameTime, bool isActive) = 0;
-    virtual void LinkTo(AZ::Entity* follow) = 0;
-    virtual void Unlink() = 0;
-    virtual AZ::EntityId GetLinkedId() = 0;
-    virtual CCamera& GetCamera() = 0;
-    virtual const CCamera& GetCamera() const = 0;
-
-    virtual void PostSerialize() = 0;
-    virtual void SetCurrentParams(SViewParams& params) = 0;
-    virtual const SViewParams* GetCurrentParams() = 0;
-    virtual void SetViewShake(Ang3 shakeAngle, Vec3 shakeShift, float duration, float frequency, float randomness, int shakeID, bool bFlipVec = true, bool bUpdateOnly = false, bool bGroundOnly = false) = 0;
-    virtual void SetViewShakeEx(const SShakeParams& params) = 0;
-    virtual void StopShake(int shakeID) = 0;
-    virtual void ResetShaking() = 0;
-    virtual void ResetBlending() = 0;
-    virtual void SetFrameAdditiveCameraAngles(const Ang3& addFrameAngles) = 0;
-    virtual void SetScale(const float scale) = 0;
-    virtual void SetZoomedScale(const float scale) = 0;
-    virtual void SetActive(const bool bActive) = 0;
-};
-
-struct IViewSystemListener
-{
-    virtual ~IViewSystemListener() {}
-    virtual bool OnBeginCutScene(IAnimSequence* pSeq, bool bResetFX) = 0;
-    virtual bool OnEndCutScene(IAnimSequence* pSeq) = 0;
-    virtual bool OnCameraChange(const SCameraParams& cameraParams) = 0;
-};
-
-struct IViewSystem
-{
-    virtual ~IViewSystem() {}
-    virtual void Release() = 0;
-    virtual void Update(float frameTime) = 0;
-    virtual IView* CreateView() = 0;
-    virtual unsigned int AddView(IView* pView) = 0;
-    virtual void RemoveView(IView* pView) = 0;
-    virtual void RemoveView(unsigned int viewId) = 0;
-
-    virtual void SetActiveView(IView* pView) = 0;
-    virtual void SetActiveView(unsigned int viewId) = 0;
-
-    //utility functions
-    virtual IView* GetView(unsigned int viewId) = 0;
-    virtual IView* GetActiveView() = 0;
-
-    virtual unsigned int GetViewId(IView* pView) = 0;
-    virtual unsigned int GetActiveViewId() = 0;
-
-    virtual IView* GetViewByEntityId(const AZ::EntityId& id, bool forceCreate = false) = 0;
-
-    virtual bool AddListener(IViewSystemListener* pListener) = 0;
-    virtual bool RemoveListener(IViewSystemListener* pListener) = 0;
-
-    virtual void PostSerialize() = 0;
-
-    // Get default distance to near clipping plane.
-    virtual float GetDefaultZNear() = 0;
-
-    virtual void SetBlendParams(float fBlendPosSpeed, float fBlendRotSpeed, bool performBlendOut) = 0;
-
-    // Used by time demo playback.
-    virtual void SetOverrideCameraRotation(bool bOverride, Quat rotation) = 0;
-
-    virtual bool IsPlayingCutScene() const = 0;
-
-    virtual void SetDeferredViewSystemUpdate(bool const bDeferred) = 0;
-    virtual bool UseDeferredViewSystemUpdate() const = 0;
-    virtual void SetControlAudioListeners(bool const bActive) = 0;
-    virtual void ForceUpdate(float elapsed) = 0;
-};
diff --git a/Code/Legacy/CryCommon/IXml.h b/Code/Legacy/CryCommon/IXml.h
index be2bdcd5ab..6c30789efd 100644
--- a/Code/Legacy/CryCommon/IXml.h
+++ b/Code/Legacy/CryCommon/IXml.h
@@ -87,7 +87,7 @@ class XmlString
 public:
     XmlString() {};
     XmlString(const char* str)
-        : AZStd::string(str) {};
+        : AZStd::string(str) {}
 
     size_t GetAllocatedMemory() const
     {
@@ -243,15 +243,6 @@ public:
     //   Removes child node.
     virtual void removeChild(const XmlNodeRef& node) = 0;
 
-    // Summary:
-    //   Inserts child node.
-    virtual void insertChild(int nIndex, const XmlNodeRef& node) = 0;
-
-    // Summary:
-    //   Replaces a specified child with the passed one
-    //   Not supported by all node implementations
-    virtual void replaceChild(int nIndex, const XmlNodeRef& fromNode) = 0;
-
     // Summary:
     //   Removes all child nodes.
     virtual void removeAllChilds() = 0;
@@ -283,13 +274,6 @@ public:
     //   Sets content of this node.
     virtual void setContent(const char* str) = 0;
 
-    // Summary:
-    //   Deep clone of this and all child xml nodes.
-    virtual XmlNodeRef clone() = 0;
-
-    // Summary:
-    //   Returns line number for XML tag.
-    virtual int getLine() const = 0;
     // Summary:
     //   Set line number in xml.
     virtual void setLine(int line) = 0;
@@ -385,20 +369,6 @@ public:
     }
 #endif
 
-    // Summary:
-    //   Copies children to this node from a given node.
-    //   Children are reference copied (shallow copy) and the children's parent is NOT set to this
-    //   node, but left with its original parent (which is still the parent)
-    virtual void shareChildren(const XmlNodeRef& fromNode) = 0;
-
-    // Summary:
-    //   Removes child node at known position.
-    virtual void deleteChildAt(int nIndex) = 0;
-
-    // Summary:
-    //   Returns XML of this node and sub nodes into tmpBuffer without XML checks (much faster)
-    virtual XmlString getXMLUnsafe(int level, [[maybe_unused]] char* tmpBuffer, [[maybe_unused]] uint32 sizeOfTmpBuffer) const { return getXML(level); }
-
     // Notes:
     //   Save in small memory chunks.
     virtual bool saveToFile(const char* fileName, size_t chunkSizeBytes, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle) = 0;
@@ -413,28 +383,22 @@ public:
     bool getAttr(const char* key, long& value) const
     {
         int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<long>(v);
-            return true;
-        }
-        else
+        if (!getAttr(key, v))
         {
             return false;
         }
+        value = static_cast<long>(v);
+        return true;
     }
     bool getAttr(const char* key, unsigned long& value) const
     {
         int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<unsigned long>(v);
-            return true;
-        }
-        else
+        if (!getAttr(key, v))
         {
             return false;
         }
+        value = static_cast<unsigned long>(v);
+        return true;
     }
     void setAttr(const char* key, unsigned long value) { setAttr(key, (unsigned int)value); };
     void setAttr(const char* key, long value) { setAttr(key, (int)value); };
@@ -442,54 +406,42 @@ public:
     bool getAttr(const char* key, unsigned short& value) const
     {
         int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<unsigned short>(v);
-            return true;
-        }
-        else
+        if (!getAttr(key, v))
         {
             return false;
         }
+        value = static_cast<unsigned short>(v);
+        return true;
     }
     bool getAttr(const char* key, unsigned char& value) const
     {
         int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<unsigned char>(v);
-            return true;
-        }
-        else
+        if (!getAttr(key, v))
         {
             return false;
         }
+        value = static_cast<unsigned char>(v);
+        return true;
     }
     bool getAttr(const char* key, short& value) const
     {
         int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<short>(v);
-            return true;
-        }
-        else
+        if (!getAttr(key, v))
         {
             return false;
         }
+        value = static_cast<short>(v);
+        return true;
     }
     bool getAttr(const char* key, char& value) const
     {
         int v;
-        if (getAttr(key, v))
-        {
-            value = static_cast<char>(v);
-            return true;
-        }
-        else
+        if (!getAttr(key, v))
         {
             return false;
         }
+        value = static_cast<char>(v);
+        return true;
     }
     //##@}
 
diff --git a/Code/Legacy/CryCommon/LinuxSpecific.h b/Code/Legacy/CryCommon/LinuxSpecific.h
index b3e75476c9..0062119a30 100644
--- a/Code/Legacy/CryCommon/LinuxSpecific.h
+++ b/Code/Legacy/CryCommon/LinuxSpecific.h
@@ -102,11 +102,6 @@ typedef float FLOAT;
 #endif
 
 
-#ifndef SAFE_RELEASE_FORCE
-#define SAFE_RELEASE_FORCE(p)       { if (p) { (p)->ReleaseForce();  (p) = NULL; } \
-}
-#endif
-
 #define MAKEWORD(a, b)      ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | ((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8))
 #define MAKELONG(a, b)      ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | ((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))
 #define LOWORD(l)           ((WORD)((DWORD_PTR)(l) & 0xffff))
@@ -462,13 +457,6 @@ inline int64 CryGetTicks()
     return counter.QuadPart;
 }
 
-inline int64 CryGetTicksPerSec()
-{
-    LARGE_INTEGER li;
-    QueryPerformanceFrequency(&li);
-    return li.QuadPart;
-}
-
 #endif //__cplusplus
 
 inline int _CrtCheckMemory() { return 1; };
diff --git a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
index 7157bc4a78..0e3ce80bfe 100644
--- a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
+++ b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
@@ -5,10 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H
-#define CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H
 #pragma once
 
 #include <CryAssert.h>
@@ -326,57 +322,6 @@ inline uint32 GetTickCount()
 #define _strlwr_s(BUF, SIZE) strlwr(BUF)
 #define _strups strupr
 
-typedef struct __finddata64_t
-{
-    //!< atributes set by find request
-    unsigned    int attrib;         //!< attributes, only directory and readonly flag actually set
-    int64  time_create;        //!< creation time, cannot parse under linux, last modification time is used instead (game does nowhere makes decision based on this values)
-    int64  time_access;        //!< last access time
-    int64  time_write;         //!< last modification time
-    int64  size;                       //!< file size (for a directory it will be the block size)
-    char        name[256];          //!< file/directory name
-
-private:
-    int                                 m_LastIndex;                    //!< last index for findnext
-    char                                m_DirectoryName[260];           //!< directory name, needed when getting file attributes on the fly
-    char                                m_ToMatch[260];                     //!< pattern to match with
-    DIR*                                m_Dir;                                  //!< directory handle
-    std::vector<AZStd::string> m_Entries;                      //!< all file entries in the current directories
-public:
-
-    inline __finddata64_t()
-        : attrib(0)
-        , time_create(0)
-        , time_access(0)
-        , time_write(0)
-        , size(0)
-        , m_LastIndex(-1)
-        , m_Dir(NULL)
-    {
-        memset(name, '0', 256);
-    }
-    ~__finddata64_t();
-
-    //!< copies and retrieves the data for an actual match (to not waste any effort retrioeving data for unused files)
-    void CopyFoundData(const char* rMatchedFileName);
-
-public:
-    //!< global _findfirst64 function using struct above, can't be a member function due to required semantic match
-    friend intptr_t _findfirst64(const char* pFileName, __finddata64_t* pFindData);
-    //!< global _findnext64 function using struct above, can't be a member function due to required semantic match
-    friend int _findnext64(intptr_t last, __finddata64_t* pFindData);
-}__finddata64_t;
-
-typedef struct _finddata_t
-        : public __finddata64_t
-{}_finddata_t;//!< need inheritance since in many places it get used as struct _finddata_t
-extern int _findnext64(intptr_t last, __finddata64_t* pFindData);
-extern intptr_t _findfirst64(const char* pFileName, __finddata64_t* pFindData);
-
-extern DWORD GetFileAttributesW(LPCWSTR lpFileName);
-
-extern const bool GetFilenameNoCase(const char* file, char*, const bool cCreateNew = false);
-
 extern BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize);
 
 //error code stuff
@@ -646,8 +591,3 @@ inline unsigned long long   _byteswap_uint64(unsigned long long input)
             ((input & 0x000000000000ff00ull) << 40) |
             ((input & 0x00000000000000ffull) << 56));
 }
-
-#endif // CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H
-
-// vim:ts=2
-
diff --git a/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h b/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
index be449bb6ad..a678e238e2 100644
--- a/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
+++ b/Code/Legacy/CryCommon/LyShine/Animation/IUiAnimation.h
@@ -9,7 +9,6 @@
 
 #include <Range.h>
 #include <AnimKey.h>
-#include <ITimer.h>
 #include <LyShine/ILyShine.h>
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
diff --git a/Code/Legacy/CryCommon/Mocks/ICryPakMock.h b/Code/Legacy/CryCommon/Mocks/ICryPakMock.h
index 50cae45991..d32f31e5b8 100644
--- a/Code/Legacy/CryCommon/Mocks/ICryPakMock.h
+++ b/Code/Legacy/CryCommon/Mocks/ICryPakMock.h
@@ -11,9 +11,10 @@
 #include <AzTest/AzTest.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzFramework/Archive/ArchiveVars.h>
 #include <AzFramework/Archive/INestedArchive.h>
 #include <AzFramework/Archive/IArchive.h>
-
+#include <CryCommon/platform.h>
 
 struct CryPakMock
     : AZ::IO::IArchive
@@ -52,11 +53,11 @@ struct CryPakMock
     MOCK_METHOD1(PoolMalloc, void*(size_t size));
     MOCK_METHOD1(PoolFree, void(void* p));
     MOCK_METHOD3(PoolAllocMemoryBlock, AZStd::intrusive_ptr<AZ::IO::MemoryBlock> (size_t nSize, const char* sUsage, size_t nAlign));
-    MOCK_METHOD2(FindFirst, AZ::IO::ArchiveFileIterator(AZStd::string_view pDir, AZ::IO::IArchive::EFileSearchType));
+    MOCK_METHOD2(FindFirst, AZ::IO::ArchiveFileIterator(AZStd::string_view pDir, AZ::IO::FileSearchLocation));
     MOCK_METHOD1(FindNext, AZ::IO::ArchiveFileIterator(AZ::IO::ArchiveFileIterator handle));
     MOCK_METHOD1(FindClose, bool(AZ::IO::ArchiveFileIterator));
     MOCK_METHOD1(GetModificationTime, AZ::IO::IArchive::FileTime(AZ::IO::HandleType f));
-    MOCK_METHOD2(IsFileExist, bool(AZStd::string_view sFilename, EFileSearchLocation));
+    MOCK_METHOD2(IsFileExist, bool(AZStd::string_view sFilename, AZ::IO::FileSearchLocation));
     MOCK_METHOD1(IsFolder, bool(AZStd::string_view sPath));
     MOCK_METHOD1(GetFileSizeOnDisk, AZ::IO::IArchive::SignedFileSize(AZStd::string_view filename));
     MOCK_METHOD4(OpenArchive, AZStd::intrusive_ptr<AZ::IO::INestedArchive> (AZStd::string_view szPath, AZStd::string_view bindRoot, uint32_t nFlags, AZStd::intrusive_ptr<AZ::IO::MemoryBlock> pData));
@@ -72,7 +73,7 @@ struct CryPakMock
     MOCK_METHOD1(UnregisterFileAccessSink, void(AZ::IO::IArchiveFileAccessSink * pSink));
     MOCK_METHOD1(DisableRuntimeFileAccess, void(bool status));
     MOCK_METHOD2(DisableRuntimeFileAccess, bool(bool status, AZStd::thread_id threadId));
-    MOCK_CONST_METHOD0(GetPakPriority, AZ::IO::ArchiveLocationPriority());
+    MOCK_CONST_METHOD0(GetPakPriority, AZ::IO::FileSearchPriority());
     MOCK_CONST_METHOD1(GetFileOffsetOnMedia, uint64_t(AZStd::string_view szName));
     MOCK_CONST_METHOD1(GetFileMediaType, EStreamSourceMediaType(AZStd::string_view szName));
     MOCK_METHOD0(GetLevelPackOpenEvent, auto()->LevelPackOpenEvent*);
diff --git a/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h b/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h
deleted file mode 100644
index 21786a322c..0000000000
--- a/Code/Legacy/CryCommon/Mocks/IRemoteConsoleMock.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "IConsole.h"
-
-// Auto-generated by gmock_gen.py
-
-class IRemoteConsoleMock 
-    : public IRemoteConsole 
-{
-public:
-    MOCK_METHOD0(RegisterConsoleVariables, void());
-    MOCK_METHOD0(UnregisterConsoleVariables, void());
-    MOCK_METHOD0(Start, void());
-    MOCK_METHOD0(Stop, void());
-    MOCK_CONST_METHOD0(IsStarted, bool());
-    MOCK_METHOD1(AddLogMessage, void(const char* log));
-    MOCK_METHOD1(AddLogWarning, void(const char* log));
-    MOCK_METHOD1(AddLogError, void(const char* log));
-    MOCK_METHOD0(Update, void());
-    MOCK_METHOD2(RegisterListener, void(IRemoteConsoleListener* pListener, const char* name));
-    MOCK_METHOD1(UnregisterListener, void(IRemoteConsoleListener* pListener));
-};
diff --git a/Code/Legacy/CryCommon/Mocks/ISystemMock.h b/Code/Legacy/CryCommon/Mocks/ISystemMock.h
index a11b60fe68..e1c0e0d206 100644
--- a/Code/Legacy/CryCommon/Mocks/ISystemMock.h
+++ b/Code/Legacy/CryCommon/Mocks/ISystemMock.h
@@ -7,7 +7,6 @@
  */
 #pragma once
 #include <ISystem.h>
-#include <Cry_Camera.h>
 
 #ifdef GetUserName
 #undef GetUserName
@@ -53,11 +52,9 @@ public:
     void Warning([[maybe_unused]] EValidatorModule module, [[maybe_unused]] EValidatorSeverity severity, [[maybe_unused]] int flags, [[maybe_unused]] const char* file, [[maybe_unused]] const char* format, ...) override {}
 
     MOCK_METHOD3(ShowMessage,
-        int(const char* text, const char* caption, unsigned int uType));
+        void(const char* text, const char* caption, unsigned int uType));
     MOCK_METHOD1(CheckLogVerbosity,
         bool(int verbosity));
-    MOCK_METHOD0(GetIViewSystem,
-        IViewSystem * ());
     MOCK_METHOD0(GetILevelSystem,
         ILevelSystem * ());
     MOCK_METHOD0(GetICmdLine,
@@ -78,14 +75,6 @@ public:
         IRemoteConsole * ());
     MOCK_METHOD0(GetISystemEventDispatcher,
         ISystemEventDispatcher * ());
-    MOCK_METHOD0(GetITimer,
-        ITimer * ());
-    MOCK_METHOD1(SetForceNonDevMode,
-        void(bool bValue));
-    MOCK_CONST_METHOD0(GetForceNonDevMode,
-        bool());
-    MOCK_CONST_METHOD0(WasInDevMode,
-        bool());
     MOCK_CONST_METHOD0(IsDevMode,
         bool());
     MOCK_METHOD3(CreateXmlNode,
@@ -98,10 +87,6 @@ public:
         IXmlUtils * ());
     MOCK_METHOD1(IgnoreUpdates,
         void(bool bIgnore));
-    MOCK_METHOD1(SetIProcess,
-        void(IProcess * process));
-    MOCK_METHOD0(GetIProcess,
-        IProcess * ());
     MOCK_CONST_METHOD0(IsTestMode,
         bool());
     MOCK_METHOD3(SetFrameProfiler,
@@ -120,8 +105,6 @@ public:
     MOCK_METHOD3(LoadConfiguration,
         void(const char*, ILoadConfigurationEntrySink*, bool));
 
-    MOCK_CONST_METHOD0(GetMaxConfigSpec,
-        ESystemConfigSpec());
     MOCK_CONST_METHOD0(GetConfigPlatform,
         ESystemConfigPlatform());
     MOCK_METHOD1(SetConfigPlatform,
@@ -132,8 +115,6 @@ public:
         ILocalizationManager * ());
     MOCK_METHOD0(GetNoiseGen,
         CPNoise3 * ());
-    MOCK_METHOD0(GetUpdateCounter,
-        uint64());
     MOCK_METHOD1(RegisterErrorObserver,
         bool(IErrorObserver * errorObserver));
     MOCK_METHOD1(UnregisterErrorObserver,
@@ -144,10 +125,6 @@ public:
         bool());
     MOCK_METHOD1(SetAssertVisible,
         void(bool bAssertVisble));
-    MOCK_METHOD1(SetConsoleDrawEnabled,
-        void(bool enabled));
-    MOCK_METHOD1(SetUIDrawEnabled,
-        void(bool enabled));
     MOCK_METHOD0(GetApplicationInstance,
         int());
     MOCK_METHOD1(GetApplicationLogInstance,
@@ -172,14 +149,10 @@ public:
         bool());
 #endif
 
-    MOCK_METHOD0(GetRootWindowMessageHandler,
-        void*());
     MOCK_METHOD1(RegisterWindowMessageHandler,
         void(IWindowMessageHandler * pHandler));
     MOCK_METHOD1(UnregisterWindowMessageHandler,
         void(IWindowMessageHandler * pHandler));
-    MOCK_METHOD0(CreateLocalFileIO,
-        std::shared_ptr<AZ::IO::FileIOBase>());
 
     MOCK_METHOD2(ForceMaxFps, void(bool, int));
 };
diff --git a/Code/Legacy/CryCommon/Mocks/ITextureMock.h b/Code/Legacy/CryCommon/Mocks/ITextureMock.h
deleted file mode 100644
index 8dc657195c..0000000000
--- a/Code/Legacy/CryCommon/Mocks/ITextureMock.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <ITexture.h>
-#include <AzTest/AzTest.h>
-
-class ITextureMock
-    : public ITexture
-{
-public:
-    MOCK_METHOD0(AddRef,
-        int());
-    MOCK_METHOD0(Release,
-        int());
-    MOCK_METHOD0(ReleaseForce,
-        int());
-    MOCK_CONST_METHOD0(GetName,
-        const char*());
-};
diff --git a/Code/Legacy/CryCommon/Mocks/ITimerMock.h b/Code/Legacy/CryCommon/Mocks/ITimerMock.h
deleted file mode 100644
index 13cf5ef73a..0000000000
--- a/Code/Legacy/CryCommon/Mocks/ITimerMock.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_CRYSYSTEM_ITIMERMOCK_H
-#define CRYINCLUDE_CRYSYSTEM_ITIMERMOCK_H
-#pragma once
-
-#include <ISerialize.h>
-#include <ITimer.h>
-#include <AzTest/AzTest.h>
-
-// Implements all common timing routines
-class TimerMock
-    : public ITimer
-{
-public:
-    MOCK_METHOD0(ResetTimer, void());
-    MOCK_METHOD0(UpdateOnFrameStart, void());
-    MOCK_CONST_METHOD1(GetCurrTime, float(ETimer which));
-    MOCK_CONST_METHOD0(GetAsyncTime, CTimeValue());
-    MOCK_METHOD0(GetAsyncCurTime, float());
-    MOCK_CONST_METHOD1(GetFrameTime, float(ETimer which));
-    MOCK_CONST_METHOD0(GetRealFrameTime, float());
-    MOCK_CONST_METHOD0(GetTimeScale, float());
-    MOCK_CONST_METHOD1(GetTimeScale, float(uint32 channel));
-    MOCK_METHOD2(SetTimeScale, void(float scale, uint32 channel));
-    MOCK_METHOD0(ClearTimeScales, void());
-    MOCK_METHOD1(EnableTimer, void(bool bEnable));
-    MOCK_METHOD0(GetFrameRate, float());
-    MOCK_METHOD2(GetProfileFrameBlending, float(float* pfBlendTime, int* piBlendMode));
-    MOCK_METHOD1(Serialize, void(TSerialize ser));
-    MOCK_CONST_METHOD0(IsTimerEnabled, bool());
-    MOCK_METHOD2(PauseTimer, bool(ETimer which, bool bPause));
-    MOCK_METHOD1(IsTimerPaused, bool(ETimer which));
-    MOCK_METHOD2(SetTimer, bool(ETimer which, float timeInSeconds));
-    MOCK_METHOD2(SecondsToDateUTC, void(time_t time, struct tm& outDateUTC));
-    MOCK_METHOD1(DateToSecondsUTC, time_t(struct tm& timePtr));
-    MOCK_METHOD1(TicksToSeconds, float(int64 ticks));
-    MOCK_METHOD0(GetTicksPerSecond, int64());
-
-    MOCK_CONST_METHOD1(GetFrameStartTime, const CTimeValue&(ETimer which));
-    MOCK_METHOD0(CreateNewTimer, ITimer * ());
-
-    MOCK_METHOD2(EnableFixedTimeMode, void(bool enable, float timeStep));
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_ITIMERMOCK_H
diff --git a/Code/Legacy/CryCommon/Mocks/StubTimer.h b/Code/Legacy/CryCommon/Mocks/StubTimer.h
deleted file mode 100644
index 95df46a49d..0000000000
--- a/Code/Legacy/CryCommon/Mocks/StubTimer.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <CryCommon/ITimer.h>
-#include <CryCommon/ISerialize.h>
-
-//! Simple stub timer that exposes a single simple interface for setting the current time.
-class StubTimer
-    : public ITimer
-{
-public:
-    // Stub methods
-    void SetTime(float seconds)
-    {
-        m_frameStartTime.SetSeconds(seconds);
-    }
-    //~Stub methods
-
-    StubTimer(float frameTime)
-        : m_frameTime(frameTime)
-        , m_frameRate(1.0f / frameTime)
-        , m_frameStartTime(0.0f)
-    {
-    }
-    virtual ~StubTimer() {};
-
-    // ITimer
-    void ResetTimer() override {}
-    void UpdateOnFrameStart() override {}
-    float GetCurrTime([[maybe_unused]] ETimer which = ETIMER_GAME) const override
-    {
-        // return the same as the frame start time
-        return m_frameStartTime.GetSeconds();
-    }
-    const CTimeValue& GetFrameStartTime([[maybe_unused]] ETimer which = ETIMER_GAME) const override
-    {
-        return m_frameStartTime;
-    }
-    CTimeValue GetAsyncTime() const override
-    {
-        return m_frameStartTime;
-    }
-    float GetAsyncCurTime() override
-    {
-        return m_frameStartTime.GetSeconds();
-    }
-    float GetFrameTime([[maybe_unused]] ETimer which = ETIMER_GAME) const override
-    {
-        return m_frameTime;
-    }
-    float GetRealFrameTime() const override
-    {
-        return m_frameTime;
-    }
-    float GetTimeScale() const override
-    {
-        return 1.0f;
-    }
-    float GetTimeScale([[maybe_unused]] uint32 channel) const override
-    {
-        return 1.0f;
-    }
-    void ClearTimeScales() override {}
-    void SetTimeScale([[maybe_unused]] float s, [[maybe_unused]] uint32 channel = 0) override {}
-    void EnableTimer([[maybe_unused]] bool bEnable) override {}
-    bool IsTimerEnabled() const override
-    {
-        return true;
-    }
-    float GetFrameRate() override
-    {
-        return m_frameRate;
-    }
-    float GetProfileFrameBlending([[maybe_unused]] float* pfBlendTime = 0, [[maybe_unused]] int* piBlendMode = 0) override
-    {
-        return 0.0f;
-    }
-    void Serialize([[maybe_unused]] TSerialize ser) override {}
-    bool PauseTimer([[maybe_unused]] ETimer which, [[maybe_unused]] bool bPause) override { return false; }
-    bool IsTimerPaused([[maybe_unused]] ETimer which) override { return false; }
-    bool SetTimer([[maybe_unused]] ETimer which, [[maybe_unused]] float timeInSeconds) override { return false; }
-    void SecondsToDateUTC([[maybe_unused]] time_t time, [[maybe_unused]] struct tm& outDateUTC) override {}
-    time_t DateToSecondsUTC([[maybe_unused]] struct tm& timePtr) override
-    {
-        return 0;
-    }
-    float TicksToSeconds([[maybe_unused]] int64 ticks) override
-    {
-        return 0.0f;
-    }
-    int64 GetTicksPerSecond() override
-    {
-        return 0;
-    }
-    ITimer* CreateNewTimer() override
-    {
-        return nullptr;
-    }
-    void EnableFixedTimeMode([[maybe_unused]] bool enable, [[maybe_unused]] float timeStep) override {}
-    // ~ITimer
-
-private:
-    CTimeValue m_frameStartTime;
-    float m_frameTime;
-    float m_frameRate;
-};
diff --git a/Code/Legacy/CryCommon/StatObjBus.h b/Code/Legacy/CryCommon/StatObjBus.h
deleted file mode 100644
index 5a05440cb0..0000000000
--- a/Code/Legacy/CryCommon/StatObjBus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/std/containers/unordered_set.h>
-
-//////////////////////////////////////////////////////////////////////////
-//
-// EBUS support for triggering necessary updates when IStatObj instances
-// caches should be updated when 3D Engine events happen during level loads,
-// shutting down the application, and so forth
-//
-//////////////////////////////////////////////////////////////////////////
-class InstanceStatObjEvents
-    : public AZ::EBusTraits
-{
-public:
-    virtual ~InstanceStatObjEvents() = default;
-
-    // AZ::EBusTraits
-    static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-    using MutexType = AZStd::recursive_mutex;
-
-    virtual void ReleaseData()
-    {
-    }
-};
-
-using InstanceStatObjEventBus = AZ::EBus<InstanceStatObjEvents>;
diff --git a/Code/Legacy/CryCommon/Timer.h b/Code/Legacy/CryCommon/Timer.h
deleted file mode 100644
index c8c4857971..0000000000
--- a/Code/Legacy/CryCommon/Timer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_CRYCOMMON_TIMER_H
-#define CRYINCLUDE_CRYCOMMON_TIMER_H
-
-struct Timer
-{
-    Timer()
-        : endTime(-1.0f)
-    {
-    }
-
-    void Reset(float duration, float variation = 0.0f)
-    {
-        endTime = gEnv->pSystem->GetITimer()->GetFrameStartTime() + CTimeValue(duration) + CTimeValue(cry_random(0.0f, variation));
-    }
-
-    bool Elapsed() const
-    {
-        return endTime >= 0.0f && gEnv->pSystem->GetITimer()->GetFrameStartTime() >= endTime;
-    }
-
-    float GetSecondsLeft() const
-    {
-        return (endTime - gEnv->pSystem->GetITimer()->GetFrameStartTime()).GetSeconds();
-    }
-
-    CTimeValue endTime;
-};
-#endif // CRYINCLUDE_CRYCOMMON_TIMER_H
diff --git a/Code/Legacy/CryCommon/VRCommon.h b/Code/Legacy/CryCommon/VRCommon.h
deleted file mode 100644
index 408da8453c..0000000000
--- a/Code/Legacy/CryCommon/VRCommon.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/RTTI/TypeInfo.h>
-#include <AzCore/RTTI/ReflectContext.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Quaternion.h>
-#include <AzCore/std/containers/array.h>
-
-#include <Cry_Math.h>
-
-#include <cstdint>
-
-namespace AZ 
-{
-    namespace VR 
-    {
-        ///
-        /// Enum to describe the stereo layout of content
-        ///
-        enum class StereoLayout : AZ::u32
-        {
-            TOP_BOTTOM = 0,     //Top is Left, Bottom is Right
-            BOTTOM_TOP,         //Bottom is Left, Top is Right
-            //TODO: Figure out how to support LEFT_RIGHT and RIGHT_LEFT
-            //TOP_BOTTOM is preferred because of the way that scan lines are ordered
-            //LEFT_RIGHT,         //Left is Left, Right is Right
-            //RIGHT_LEFT,         //Right is Left, Left is Right
-            UNKNOWN             //This content is either not stereo or its stereo format cannot be determined             
-        };
-
-
-        ///
-        /// Eye-specific camera info.
-        ///
-        struct PerEyeCameraInfo
-        {
-            float fov;             ///< Field-of-view of this eye. Note that each eye may have different fields-of-view.
-            float aspectRatio;     ///< Aspect-ratio of this eye. Note that each eye may have different aspect ratios.
-            AZ::Vector3 eyeOffset; ///< Camera-space offset for this eye relative to the non-stereo view.
-
-            struct AsymmetricFrustumPlane
-            {
-                float horizontalDistance; ///< Horizontal frustum shift relative to the non-stereo frustum.
-                float verticalDistance;   ///< Vertical frustum shift relative to the non-stereo frustum.
-
-                AsymmetricFrustumPlane()
-                    : horizontalDistance(1.6f)
-                    , verticalDistance(0.9f)
-                {
-                }
-            };
-
-            AsymmetricFrustumPlane frustumPlane;
-
-            PerEyeCameraInfo()
-                : aspectRatio(16.0f / 9.0f)
-                , fov(DEG2RAD(1.5f))
-                , eyeOffset(0.65f, 0.0f, 0.0f)
-            {
-            }
-        };
-
-        ///
-        /// Types of social screens supported by the engine.
-        ///
-        enum class HMDSocialScreen
-        {
-            Off = -1,
-            UndistortedLeftEye,
-            UndistortedRightEye,
-        };
-
-        ///
-        /// Supported tracking levels.
-        ///
-        enum class HMDTrackingLevel
-        {
-            kHead, ///< The sensor reads as if the player is standing.
-            kFloor, ///< Sensor reads as if the player is seated/on the floor.
-            kFixed ///< Translation information is ignored, the view appears at the HMD origin
-        };
-
-        ///
-        /// Human-readable info about the connected device. This info is printed to the screen when a new device is detected.
-        ///
-        struct HMDDeviceInfo
-        {
-            AZ_TYPE_INFO(HMDDeviceInfo, "{DB83AF23-CF4E-491D-A346-F5DC834D1C74}")
-
-            static void Reflect(AZ::ReflectContext* context);
-
-            const char* productName;
-            const char* manufacturer;
-
-            // Rendering resolution is defined as containing just a single eye.
-            unsigned int renderWidth;
-            unsigned int renderHeight;
-
-            // Field of view is defined as the total field of view of the device which includes both eyes.
-            float fovH;
-            float fovV;
-            
-            HMDDeviceInfo()
-                : productName(nullptr)
-                , manufacturer(nullptr)
-                , renderWidth(0)
-                , renderHeight(0)
-                , fovH(0.0f)
-                , fovV(0.0f)
-            {
-            }
-        };
-
-        enum HMDStatus
-        {
-            HMDStatus_OrientationTracked = BIT(1),
-            HMDStatus_PositionTracked = BIT(2),
-            HMDStatus_CameraPoseTracked = BIT(3),
-            HMDStatus_PositionConnected = BIT(4),
-            HMDStatus_HmdConnected = BIT(5),
-
-            HMDStatus_IsUsable = HMDStatus_HmdConnected | HMDStatus_OrientationTracked,
-            HMDStatus_ControllerValid = HMDStatus_OrientationTracked | HMDStatus_PositionConnected,
-        };
-
-        ///
-        /// Single device render target created and managed by the device. The renderer should make use of this render target in order to properly display
-        /// the rendered content to this HMD.
-        ///
-        struct HMDRenderTarget
-        {
-            void* deviceSwapTextureSet; ///< Device-represented texture. These textures are created and maintained by the HMD's specific SDK.
-            uint32 numTextures; ///< Number of textures inside of the swap set.
-            void** textures;    ///< Access to the internal device textures. This array is exactly numTextures long.
-
-            HMDRenderTarget()
-                : deviceSwapTextureSet(nullptr)
-                , numTextures(0)
-                , textures(nullptr)
-            {
-            }
-        };
-
-        enum class ControllerIndex
-            : uint32_t
-        {
-            LeftHand = 0,
-            RightHand,
-            MaxNumControllers
-        };
-
-        ///
-        /// A specific pose of the HMD. Every HMD device has their own way of representing their
-        /// current pose in 3D space. This structure acts as a common data set between any connected
-        /// device and the rest of the system.
-        ///
-        struct PoseState
-        {
-            AZ_TYPE_INFO(PoseState, "{040F18D7-1163-477B-8908-47CC35737DCE}")
-
-            static void Reflect(AZ::ReflectContext* context);
-
-            AZ::Quaternion orientation; ///< The current orientation of the HMD.
-            AZ::Vector3 position;       ///< The current position of the HMD in local space as an offset from the centered pose.
-            
-            PoseState()
-                : orientation(AZ::Quaternion::CreateIdentity())
-                , position(AZ::Vector3::CreateZero())
-            {
-            }
-        };
-
-        ///
-        /// Dynamics (accelerations and velocities) of the current HMD. Many HMDs have the ability to track the current movements
-        /// of the VR device(s) for prediction. Note that not all devices may support velocities/accelerations.
-        ///
-        struct DynamicsState
-        {
-            AZ_TYPE_INFO(DynamicsState, "{5C5E2249-8844-4790-9F7A-88703A9C18DD}")
-
-            static void Reflect(AZ::ReflectContext* context);
-
-            /// Angular velocity/acceleration reported in local space.
-            AZ::Vector3 angularVelocity;
-            AZ::Vector3 angularAcceleration;
-
-            /// Linear velocity/acceleration reported in local space.
-            AZ::Vector3 linearVelocity;
-            AZ::Vector3 linearAcceleration;
-            
-            DynamicsState()
-                : angularVelocity(0)
-                , angularAcceleration(0)
-                , linearVelocity(0)
-                , linearAcceleration(0)
-            {
-            }
-        };
-
-        ///
-        /// While tracking the HMD, certain parts of the devices may go off/online. For example,
-        /// a controller may be disconnected or the HMD may lose rotational tracking temporarily. This
-        /// struct stores a tracked state meaning a pose as well as flags that denote what part of the pose
-        /// is currently valid.
-        ///
-        struct TrackingState
-        {
-            AZ_TYPE_INFO(TrackingState, "{E9CB08E8-9996-478B-AABB-EC8CCCF3B403}")
-
-            typedef uint32 StatusFlags;
-
-            bool CheckStatusFlags(StatusFlags flags) const
-            {
-                // Multiple flags can be checked simultaneously.
-                return (statusFlags & flags) == flags;
-            }
-
-            static void Reflect(AZ::ReflectContext* context);
-
-            PoseState pose;         ///< Current pose relating to this tracked state.
-            DynamicsState dynamics; ///< Current state of the physics dynamics for this device.
-            StatusFlags statusFlags;   ///< Bitfield denoting current tracking status. Flags defined in the enum HMDStatus.
-
-            TrackingState()
-                : statusFlags(0)
-            {
-            }
-        };
-
-        ///
-        /// Rectangle storing the playspace defined by the user when
-        /// setting up VR device.
-        ///
-        struct Playspace
-        {
-            AZ_TYPE_INFO(Playspace, "{05934537-80AA-4ABA-AB2C-71096FA7DC74}")
-            AZ_CLASS_ALLOCATOR_DECL
-
-            static void Reflect(AZ::ReflectContext* context);
-
-            bool isValid = false;                   ///< The playspace data is valid (calibrated).
-            AZStd::array<AZ::Vector3, 4> corners;   ///< Playspace corners defined in device-local space. The center of the playspace is 0.
-        };
-
-    }//namespace VR
-    AZ_TYPE_INFO_SPECIALIZE(VR::ControllerIndex, "{90D4C80E-A1CC-4DBF-A131-0082C75835E8}");
-}//namespace AZ
diff --git a/Code/Legacy/CryCommon/WinBase.cpp b/Code/Legacy/CryCommon/WinBase.cpp
index cb1b2aadfd..3445637d28 100644
--- a/Code/Legacy/CryCommon/WinBase.cpp
+++ b/Code/Legacy/CryCommon/WinBase.cpp
@@ -53,21 +53,8 @@
 #include <mach/mach_host.h>
 #endif
 
-#if defined(ANDROID)
-#define FIX_FILENAME_CASE 0 // everything is lower case on android
-#elif defined(LINUX) || defined(APPLE)
-#define FIX_FILENAME_CASE 1
-#endif
-
 #include <sys/time.h>
 
-
-
-#if !defined(_RELEASE) || defined(_DEBUG)
-#include <set>
-unsigned int g_EnableMultipleAssert = 0;//set to something else than 0 if to enable already reported asserts
-#endif
-
 #if defined(LINUX) || defined(APPLE)
 #include <sys/types.h>
 #include <unistd.h>
@@ -81,106 +68,11 @@ unsigned int g_EnableMultipleAssert = 0;//set to something else than 0 if to ena
 
 #if AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE
 typedef int FS_ERRNO_TYPE;
-#if AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE
-typedef struct stat FS_STAT_TYPE;
-#else
-typedef struct stat64 FS_STAT_TYPE;
-#endif
 
 #include <mutex>
 
-#elif AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE
-#error cannot request AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE if AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE is zero
 #endif
 
-#if AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE && (!defined(_RELEASE) || defined(_DEBUG))
-struct SAssertData
-{
-    int line;
-    char fileName[256 - sizeof(int)];
-    const bool operator==(const SAssertData& crArg) const
-    {
-        return crArg.line == line && (strcmp(fileName, crArg.fileName) == 0);
-    }
-
-    const bool operator<(const SAssertData& crArg) const
-    {
-        if (line == crArg.line)
-        {
-            return strcmp(fileName, crArg.fileName) < 0;
-        }
-        else
-        {
-            return line < crArg.line;
-        }
-    }
-
-    SAssertData()
-        : line(-1){}
-    SAssertData(const int cLine, const char* cpFile)
-        : line(cLine)
-    {
-        azstrcpy(fileName, AZ_ARRAY_SIZE(fileName), cpFile);
-    }
-
-    SAssertData(const SAssertData& crAssertData)
-    {
-        memcpy((void*)this, &crAssertData, sizeof(SAssertData));
-    }
-
-    void operator=(const SAssertData& crAssertData)
-    {
-        memcpy((void*)this, &crAssertData, sizeof(SAssertData));
-    }
-};
-
-
-//#define OUTPUT_ASSERT_TO_FILE
-
-void HandleAssert(const char* cpMessage, const char* cpFunc, const char* cpFile, const int cLine)
-{
-#if defined(OUTPUT_ASSERT_TO_FILE)
-    static FILE* pAssertLogFile = nullptr;
-    if (!pAssertLogFile)
-    {
-        azfopen(&pAssertLogFile, "Assert.log", "w+");
-    }
-#endif
-    bool report = true;
-    static std::set<SAssertData> assertSet;
-    SAssertData assertData(cLine, cpFile);
-    if (!g_EnableMultipleAssert)
-    {
-        std::set<SAssertData>::const_iterator it = assertSet.find(assertData);
-        if (it != assertSet.end())
-        {
-            report = false;
-        }
-        else
-        {
-            assertSet.insert(assertData);
-        }
-    }
-    else
-    {
-        assertSet.insert(assertData);
-    }
-    if (report)
-    {
-        //added function to be able to place a breakpoint here or to print out to other consoles
-        printf("ASSERT: %s in %s (%s : %d)\n", cpMessage, cpFunc, cpFile, cLine);
-#if defined(OUTPUT_ASSERT_TO_FILE)
-        if (pAssertLogFile)
-        {
-            fprintf(pAssertLogFile, "ASSERT: %s in %s (%s : %d)\n", cpMessage, cpFunc, cpFile, cLine);
-            fflush(pAssertLogFile);
-        }
-#endif
-    }
-}
-#endif
-
-
 bool IsBadReadPtr(void* ptr, unsigned int size)
 {
     //too complicated to really support it
@@ -232,9 +124,9 @@ char* strupr (char* str)
 
 char* ltoa (long i, char* a, int radix)
 {
-    if (a == NULL)
+    if (a == nullptr)
     {
-        return NULL;
+        return nullptr;
     }
     strcpy (a, "0");
     if (i && radix > 1 && radix < 37)
@@ -369,9 +261,9 @@ void _makepath(char* path, const char* drive, const char* dir, const char* filen
 
 char* _ui64toa(unsigned long long value,   char* str, int radix)
 {
-    if (str == 0)
+    if (str == nullptr)
     {
-        return 0;
+        return nullptr;
     }
 
     char buffer[65];
@@ -401,7 +293,7 @@ char* _ui64toa(unsigned long long value,   char* str, int radix)
 
 long long _atoi64(const char* str)
 {
-    if (str == 0)
+    if (str == nullptr)
     {
         return -1;
     }
@@ -550,22 +442,6 @@ void _splitpath(const char* inpath, char* drv, char* dir, char* fname, char* ext
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-int memicmp(LPCSTR s1, LPCSTR s2, DWORD len)
-{
-    int ret = 0;
-    while (len--)
-    {
-        if ((ret = tolower(*s1) - tolower(*s2)))
-        {
-            break;
-        }
-        s1++;
-        s2++;
-    }
-    return ret;
-}
-
 //-----------------------------------------other stuff-------------------------------------------------------------------
 
 void GlobalMemoryStatus(LPMEMORYSTATUS lpmem)
@@ -697,7 +573,7 @@ static void NormalizeTimeFields(short* FieldToNormalize, short* CarryField, int
     *CarryField = (short) (*CarryField + 1);
 }
 
-bool TimeFieldsToTime(PTIME_FIELDS tfTimeFields, PLARGE_INTEGER Time)
+static bool TimeFieldsToTime(PTIME_FIELDS tfTimeFields, PLARGE_INTEGER Time)
 {
     #define SECSPERMIN         60
     #define MINSPERHOUR        60
@@ -775,119 +651,6 @@ BOOL SystemTimeToFileTime(const SYSTEMTIME* syst, LPFILETIME ft)
     return TRUE;
 }
 
-void adaptFilenameToLinux(AZStd::string& rAdjustedFilename)
-{
-    //first replace all \\ by /
-    AZStd::string::size_type loc = 0;
-    while ((loc = rAdjustedFilename.find("\\", loc)) != AZStd::string::npos)
-    {
-        rAdjustedFilename.replace(loc, 1, "/");
-    }
-    loc = 0;
-    //remove /./
-    while ((loc = rAdjustedFilename.find("/./", loc)) != AZStd::string::npos)
-    {
-        rAdjustedFilename.replace(loc, 3, "/");
-    }
-}
-
-void replaceDoublePathFilename(char* szFileName)
-{
-    //replace "\.\" by "\"
-    AZStd::string s(szFileName);
-    AZStd::string::size_type loc = 0;
-    //remove /./
-    while ((loc = s.find("/./", loc)) != AZStd::string::npos)
-    {
-        s.replace(loc, 3, "/");
-    }
-    loc = 0;
-    //remove "\.\"
-    while ((loc = s.find("\\.\\", loc)) != AZStd::string::npos)
-    {
-        s.replace(loc, 3, "\\");
-    }
-    azstrcpy((char*)szFileName, AZ_MAX_PATH_LEN, s.c_str());
-}
-
-#if FIX_FILENAME_CASE
-static bool FixOnePathElement(char* path)
-{
-    if (*path == '\0')
-    {
-        return true;
-    }
-
-    if ((path[0] == '/') && (path[1] == '\0'))
-    {
-        return true;  // root dir always exists.
-    }
-    if (strchr(path, '*') || strchr(path, '?'))
-    {
-        return true; // wildcard...stop correcting path.
-    }
-    struct stat statbuf;
-    if (stat(path, &statbuf) != -1)      // current case exists.
-    {
-        return true;
-    }
-
-    char* name = path;
-    char* ptr = strrchr(path, '/');
-    if (ptr)
-    {
-        name = ptr + 1;
-        *ptr = '\0';
-    }
-
-    if (*name == '\0')      // trailing '/' ?
-    {
-        *ptr = '/';
-        return true;
-    }
-
-    const char* parent;
-    if (ptr == path)
-    {
-        parent = "/";
-    }
-    else if (ptr == NULL)
-    {
-        parent = ".";
-    }
-    else
-    {
-        parent = path;
-    }
-
-    DIR* dirp = opendir(parent);
-    if (ptr)
-    {
-        *ptr = '/';
-    }
-
-    if (dirp == NULL)
-    {
-        return false;
-    }
-
-    struct dirent* dent;
-    bool found = false;
-    while ((dent = readdir(dirp)) != NULL)
-    {
-        if (strcasecmp(dent->d_name, name) == 0)
-        {
-            azstrcpy(name, AZ_MAX_PATH_LEN, dent->d_name);
-            found = true;
-            break;
-        }
-    }
-
-    closedir(dirp);
-    return found;
-}
-#endif
-
 #define Int32x32To64(a, b) ((uint64)((uint64)(a)) * (uint64)((uint64)(b)))
 
 //////////////////////////////////////////////////////////////////////////
@@ -904,24 +667,14 @@ threadID GetCurrentThreadId()
 }
 #endif
 
+#include <chrono>
+#include <thread>
+
 //////////////////////////////////////////////////////////////////////////
 DWORD Sleep(DWORD dwMilliseconds)
 {
 #if defined(LINUX) || defined(APPLE)
-    timespec req;
-    timespec rem;
-
-    memset(&req, 0, sizeof(req));
-    memset(&rem, 0, sizeof(rem));
-
-    time_t sec = (int)(dwMilliseconds / 1000);
-    req.tv_sec = sec;
-    req.tv_nsec = (dwMilliseconds - (sec * 1000)) * 1000000L;
-    if (nanosleep(&req, &rem) == -1)
-    {
-        nanosleep(&rem, 0);
-    }
-
+    std::this_thread::sleep_for(std::chrono::milliseconds(dwMilliseconds));
     return 0;
 #define AZ_RESTRICTED_SECTION_IMPLEMENTED
 #elif defined(AZ_RESTRICTED_PLATFORM)
@@ -960,7 +713,7 @@ DWORD Sleep(DWORD dwMilliseconds)
 }
 
 //////////////////////////////////////////////////////////////////////////
-DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable)
+DWORD SleepEx(DWORD dwMilliseconds, BOOL /*bAlertable*/)
 {
     //TODO: implement
     //  CRY_ASSERT_MESSAGE(0, "SleepEx not implemented yet");
@@ -1006,7 +759,7 @@ void CrySleep(unsigned int dwMilliseconds)
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
-int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType)
+void CryMessageBox(const char* lpText, const char* lpCaption, [[maybe_unused]] unsigned int uType)
 {
 #ifdef WIN32
 #   error WIN32 is defined in WinBase.cpp (it is a non-Windows file)
@@ -1087,63 +840,8 @@ int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType)
         CFRelease(strText);
     }
 
-    if (kResult == kCFUserNotificationDefaultResponse)
-    {
-        switch (uType & 0xf)
-        {
-            case MB_OK:
-            case MB_OKCANCEL:
-            default:
-                return IDOK;
-            case MB_ABORTRETRYIGNORE:
-                return IDABORT;
-            case MB_YESNOCANCEL:
-            case MB_YESNO:
-                return IDYES;
-            case MB_RETRYCANCEL:
-                return IDRETRY;
-            case MB_CANCELTRYCONTINUE:
-                return IDCANCEL;
-        }
-    }
-    else if (kResult == kCFUserNotificationAlternateResponse)
-    {
-        switch (uType & 0xf)
-        {
-            case MB_OKCANCEL:
-            case MB_RETRYCANCEL:
-                return IDCANCEL;
-            case MB_ABORTRETRYIGNORE:
-                return IDRETRY;
-            case MB_YESNOCANCEL:
-            case MB_YESNO:
-                return IDNO;
-            case MB_CANCELTRYCONTINUE:
-                return IDTRYAGAIN;
-            default:
-                assert(false);
-                return IDCANCEL;
-        }
-    }
-    else if (kResult == kCFUserNotificationOtherResponse)
-    {
-        switch (uType & 0xf)
-        {
-            case MB_ABORTRETRYIGNORE:
-                return IDIGNORE;
-            case MB_YESNOCANCEL:
-                return IDCANCEL;
-            case MB_CANCELTRYCONTINUE:
-                return IDCONTINUE;
-            default:
-                assert(false);
-                return IDCANCEL;
-        }
-    }
-    return 0;
 #else
     printf("Messagebox: cap: %s  text:%s\n", lpCaption ? lpCaption : " ", lpText ? lpText : " ");
-    return 0;
 #endif
 }
 
@@ -1171,21 +869,6 @@ DLL_EXPORT void OutputDebugString(const char* outputString)
 // This code does not have a long life span and will be replaced soon
 #if defined(APPLE) || defined(LINUX) || defined(DEFINE_LEGACY_CRY_FILE_OPERATIONS)
 
-typedef DIR* FS_DIR_TYPE;
-typedef dirent FS_DIRENT_TYPE;
-static const FS_ERRNO_TYPE FS_ENOENT = ENOENT;
-static const FS_DIR_TYPE FS_DIR_NULL = NULL;
-
-typedef int FS_ERRNO_TYPE;
-
-#if defined(APPLE)
-typedef struct stat FS_STAT_TYPE;
-#else
-typedef struct stat64 FS_STAT_TYPE;
-#endif
-
-#include <mutex>
-
 bool CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes)
 {
     //TODO: implement
@@ -1194,201 +877,7 @@ bool CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes)
 }
 
 
-ILINE void FS_OPEN(const char* szFileName, int iFlags, int& iFileDesc, mode_t uMode, FS_ERRNO_TYPE& rErr)
-{
-    rErr = ((iFileDesc = open(szFileName, iFlags, uMode)) != -1) ? 0 : errno;
-}
 
-ILINE void FS_CLOSE(int iFileDesc, FS_ERRNO_TYPE& rErr)
-{
-    rErr = close(iFileDesc) != -1 ? 0 : errno;
-}
-
-ILINE void FS_CLOSE_NOERR(int iFileDesc)
-{
-    close(iFileDesc);
-}
-
-ILINE void FS_OPENDIR(const char* szDirName, FS_DIR_TYPE& pDir, FS_ERRNO_TYPE& rErr)
-{
-    rErr = (pDir = opendir(szDirName)) != NULL ? 0 : errno;
-}
-
-ILINE void FS_READDIR(FS_DIR_TYPE pDir, FS_DIRENT_TYPE& kEnt, uint64_t& uEntSize, FS_ERRNO_TYPE& rErr)
-{
-    errno = 0;  // errno is used to determine if readdir succeeds after
-    FS_DIRENT_TYPE* pDirent(readdir(pDir));
-    if (pDirent == NULL)
-    {
-        uEntSize = 0;
-        rErr = (errno == FS_ENOENT) ? 0 : errno;
-    }
-    else
-    {
-        kEnt = *pDirent;
-        uEntSize = static_cast<uint64_t>(sizeof(FS_DIRENT_TYPE));
-        rErr = 0;
-    }
-}
-
-ILINE void FS_STAT(const char* szFileName, FS_STAT_TYPE& kStat, FS_ERRNO_TYPE& rErr)
-{
-#if defined(APPLE)
-    rErr = stat(szFileName, &kStat) != -1 ? 0 : errno;
-#else
-    rErr = stat64(szFileName, &kStat) != -1 ? 0 : errno;
-#endif
-}
-
-ILINE void FS_FSTAT(int iFileDesc, FS_STAT_TYPE& kStat, FS_ERRNO_TYPE& rErr)
-{
-#if defined(APPLE)
-    rErr = fstat(iFileDesc, &kStat) != -1 ? 0 : errno;
-#else
-    rErr = fstat64(iFileDesc, &kStat) != -1 ? 0 : errno;
-#endif
-}
-
-ILINE void FS_CLOSEDIR(FS_DIR_TYPE pDir, FS_ERRNO_TYPE& rErr)
-{
-    errno = 0;
-    rErr = closedir(pDir) == 0 ? 0 : errno;
-}
-
-ILINE void FS_CLOSEDIR_NOERR(FS_DIR_TYPE pDir)
-{
-    closedir(pDir);
-}
-
-const bool GetFilenameNoCase
-(
-    const char* file,
-    char* pAdjustedFilename,
-    const bool cCreateNew
-)
-{
-    assert(file);
-    assert(pAdjustedFilename);
-    azstrcpy(pAdjustedFilename, AZ_MAX_PATH_LEN, file);
-
-    // Fix the dirname case.
-    const int cLen = strlen(file);
-    for (int i = 0; i < cLen; ++i)
-    {
-        if (pAdjustedFilename[i] == '\\')
-        {
-            pAdjustedFilename[i] = '/';
-        }
-    }
-
-    char* slash;
-    const char* dirname;
-    char* name;
-
-    if ((pAdjustedFilename) == (char*)-1)
-    {
-        return false;
-    }
-
-    slash = strrchr(pAdjustedFilename, '/');
-    if (slash)
-    {
-        dirname = pAdjustedFilename;
-        name = slash + 1;
-        *slash = 0;
-    }
-    else
-    {
-        dirname = ".";
-        name = pAdjustedFilename;
-    }
-
-#if !defined(LINUX) && !defined(APPLE) && !defined(DEFINE_SKIP_WILDCARD_CHECK)      // fix the parent path anyhow.
-    // Check for wildcards. We'll always return true if the specified filename is
-    // a wildcard pattern.
-    if (strchr(name, '*') || strchr(name, '?'))
-    {
-        if (slash)
-        {
-            *slash = '/';
-        }
-        return true;
-    }
-#endif
-
-    // Scan for the file.
-    if (slash)
-    {
-        *slash = '/';
-    }
-
-#if FIX_FILENAME_CASE
-    char* path = pAdjustedFilename;
-    char* sep;
-    while ((sep = strchr(path, '/')) != NULL)
-    {
-        *sep = '\0';
-        const bool exists = FixOnePathElement(pAdjustedFilename);
-        *sep = '/';
-        if (!exists)
-        {
-            return false;
-        }
-
-        path = sep + 1;
-    }
-    if (!FixOnePathElement(pAdjustedFilename)) // catch last filename.
-    {
-        return false;
-    }
-
-#else
-    for (char* c = pAdjustedFilename; *c; ++c)
-    {
-        *c = tolower(*c);
-    }
-#endif
-
-    return true;
-}
-
-DWORD GetFileAttributes(LPCWSTR lpFileNameW)
-{
-    AZStd::string lpFileName;
-    AZStd::to_string(lpFileName, lpFileNameW);
-    struct stat fileStats;
-    const int success = stat(lpFileName.c_str(), &fileStats);
-    if (success == -1)
-    {
-        char adjustedFilename[MAX_PATH];
-        GetFilenameNoCase(lpFileName.c_str(), adjustedFilename);
-        if (stat(adjustedFilename, &fileStats) == -1)
-        {
-            return (DWORD)INVALID_FILE_ATTRIBUTES;
-        }
-    }
-    DWORD ret = 0;
-
-    const int acc = (fileStats.st_mode & S_IWRITE);
-
-    if (acc != 0)
-    {
-        if (S_ISDIR(fileStats.st_mode) != 0)
-        {
-            ret |= FILE_ATTRIBUTE_DIRECTORY;
-        }
-    }
-    return (ret == 0) ? FILE_ATTRIBUTE_NORMAL : ret;//return file attribute normal as the default value, must only be set if no other attributes have been found
-}
-
-__finddata64_t::~__finddata64_t()
-{
-    if (m_Dir != FS_DIR_NULL)
-    {
-        FS_CLOSEDIR_NOERR(m_Dir);
-        m_Dir = FS_DIR_NULL;
-    }
-}
 #endif //defined(APPLE) || defined(LINUX)
 
 #endif // AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS
diff --git a/Code/Legacy/CryCommon/crycommon_files.cmake b/Code/Legacy/CryCommon/crycommon_files.cmake
index b3db694ca1..68cf579ca8 100644
--- a/Code/Legacy/CryCommon/crycommon_files.cmake
+++ b/Code/Legacy/CryCommon/crycommon_files.cmake
@@ -11,9 +11,7 @@ set(FILES
     IAudioSystem.h
     ICmdLine.h
     IConsole.h
-    IEntityRenderState.h
     IFont.h
-    IFunctorBase.h
     IGem.h
     IIndexedMesh.h
     ILevelSystem.h
@@ -30,18 +28,12 @@ set(FILES
     ISerialize.h
     IShader.h
     ISplines.h
-    IStatObj.h
-    StatObjBus.h
     ISystem.h
     ITexture.h
-    ITimer.h
     IValidator.h
-    IViewSystem.h
     IWindowMessageHandler.h
     IXml.h
     MicrophoneBus.h
-    HMDBus.h
-    VRCommon.h
     INavigationSystem.h
     IMNM.h
     SerializationTypes.h
@@ -71,7 +63,6 @@ set(FILES
     SimpleSerialize.h
     smartptr.h
     StlUtils.h
-    Timer.h
     TimeValue.h
     VectorMap.h
     VertexFormats.h
@@ -81,7 +72,6 @@ set(FILES
     Cry_Matrix34.h
     Cry_Matrix44.h
     Cry_Vector4.h
-    Cry_Camera.h
     Cry_Color.h
     Cry_Geo.h
     Cry_GeoDistance.h
diff --git a/Code/Legacy/CryCommon/crycommon_testing_files.cmake b/Code/Legacy/CryCommon/crycommon_testing_files.cmake
index 9c3427d529..42deecd576 100644
--- a/Code/Legacy/CryCommon/crycommon_testing_files.cmake
+++ b/Code/Legacy/CryCommon/crycommon_testing_files.cmake
@@ -12,8 +12,5 @@ set(FILES
     Mocks/ICryPakMock.h
     Mocks/ILogMock.h
     Mocks/ISystemMock.h
-    Mocks/ITimerMock.h
     Mocks/ICVarMock.h
-    Mocks/ITextureMock.h
-    Mocks/IRemoteConsoleMock.h
 )
diff --git a/Code/Legacy/CryCommon/platform.h b/Code/Legacy/CryCommon/platform.h
index 2baddaafd5..d67c0b902c 100644
--- a/Code/Legacy/CryCommon/platform.h
+++ b/Code/Legacy/CryCommon/platform.h
@@ -249,7 +249,7 @@ ILINE DestinationType alias_cast(SourceType pPtr)
 // Mostly used only for debugging!
 //////////////////////////////////////////////////////////////////////////
 void   CrySleep(unsigned int dwMilliseconds);
-int    CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType);
+void   CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType);
 
 //---------------------------------------------------------------------------
 // Useful function to clean the structure.
diff --git a/Code/Legacy/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp
index 6e61e64c4b..64aa7ce1ca 100644
--- a/Code/Legacy/CryCommon/platform_impl.cpp
+++ b/Code/Legacy/CryCommon/platform_impl.cpp
@@ -178,21 +178,21 @@ void CrySleep(unsigned int dwMilliseconds)
 }
 
 //////////////////////////////////////////////////////////////////////////
-int CryMessageBox([[maybe_unused]] const char* lpText, [[maybe_unused]] const char* lpCaption, [[maybe_unused]] unsigned int uType)
+void CryMessageBox([[maybe_unused]] const char* lpText, [[maybe_unused]] const char* lpCaption, [[maybe_unused]] unsigned int uType)
 {
 #ifdef WIN32
     ICVar* const pCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL;
     if ((pCVar && pCVar->GetIVal() != 0) || (gEnv && gEnv->bNoAssertDialog))
     {
-        return 0;
+        return;
     }
     AZStd::wstring lpTextW;
     AZStd::to_wstring(lpTextW, lpText);
     AZStd::wstring lpCaptionW;
     AZStd::to_wstring(lpCaptionW, lpCaption);
-    return MessageBoxW(NULL, lpTextW.c_str(), lpCaptionW.c_str(), uType);
+    MessageBoxW(NULL, lpTextW.c_str(), lpCaptionW.c_str(), uType);
 #else
-    return 0;
+    return;
 #endif
 }
 
@@ -281,12 +281,6 @@ int64 CryGetTicks()
     return li.QuadPart;
 }
 
-int64 CryGetTicksPerSec()
-{
-    LARGE_INTEGER li;
-    QueryPerformanceFrequency(&li);
-    return li.QuadPart;
-}
 #endif
 
 
diff --git a/Code/Legacy/CrySystem/AZCoreLogSink.h b/Code/Legacy/CrySystem/AZCoreLogSink.h
index 1b09c3198d..9d732b3dd4 100644
--- a/Code/Legacy/CrySystem/AZCoreLogSink.h
+++ b/Code/Legacy/CrySystem/AZCoreLogSink.h
@@ -36,9 +36,10 @@ public:
         Disconnect();
     }
 
-    inline static void Connect()
+    inline static void Connect(bool suppressSystemOutput)
     {
         GetInstance().m_ignoredAsserts = new IgnoredAssertMap();
+        GetInstance().m_suppressSystemOutput = suppressSystemOutput;
         GetInstance().BusConnect();
     }
 
@@ -126,7 +127,7 @@ public:
             CryLogAlways("%s", message);
         }
 
-        return true; // suppress default AzCore behavior.
+        return m_suppressSystemOutput;
 #else
         AZ_UNUSED(fileName);
         AZ_UNUSED(line);
@@ -146,7 +147,7 @@ public:
             return false; // allow AZCore to do its default behavior.
         }
         gEnv->pLog->LogError("(%s) - %s", window, message);
-        return true; // suppress default AzCore behavior.
+        return m_suppressSystemOutput;
     }
 
     bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override
@@ -161,7 +162,7 @@ public:
         }
 
         CryWarning(VALIDATOR_MODULE_UNKNOWN, VALIDATOR_WARNING, "(%s) - %s", window, message);
-        return true; // suppress default AzCore behavior.
+        return m_suppressSystemOutput;
     }
 
     bool OnOutput(const char* window, const char* message)  override
@@ -179,12 +180,13 @@ public:
         {
             CryLog("(%s) - %s", window, message);
         }
-
-        return true; // suppress default AzCore behavior.
+        
+        return m_suppressSystemOutput;
     }
 
 private:
 
     using IgnoredAssertMap = AZStd::unordered_map<AZ::Crc32, bool, AZStd::hash<AZ::Crc32>, AZStd::equal_to<AZ::Crc32>, AZ::OSStdAllocator>;
     IgnoredAssertMap* m_ignoredAsserts;
+    bool m_suppressSystemOutput = true;
 };
diff --git a/Code/Legacy/CrySystem/CmdLineArg.cpp b/Code/Legacy/CrySystem/CmdLineArg.cpp
index 79d23ddae7..554e734055 100644
--- a/Code/Legacy/CrySystem/CmdLineArg.cpp
+++ b/Code/Legacy/CrySystem/CmdLineArg.cpp
@@ -42,5 +42,22 @@ const int CCmdLineArg::GetIValue() const
 {
     return atoi(m_value.c_str());
 }
+const bool CCmdLineArg::GetBoolValue(bool& cmdLineValue) const
+{
+    AZStd::string lowercaseValue(m_value);
+    AZStd::to_lower(lowercaseValue.begin(), lowercaseValue.end());
+    if (lowercaseValue == "true")
+    {
+        cmdLineValue = true;
+        return true;
+    }
 
+    if (lowercaseValue == "false")
+    {
+        cmdLineValue = false;
+        return true;
+    }
+    
+    return false;
+}
 
diff --git a/Code/Legacy/CrySystem/CmdLineArg.h b/Code/Legacy/CrySystem/CmdLineArg.h
index 5e3a629e7c..66d56be132 100644
--- a/Code/Legacy/CrySystem/CmdLineArg.h
+++ b/Code/Legacy/CrySystem/CmdLineArg.h
@@ -30,6 +30,7 @@ public:
     const ECmdLineArgType GetType() const;
     const float GetFValue() const;
     const int GetIValue() const;
+    const bool GetBoolValue(bool& cmdLineValue) const;
 
 private:
 
diff --git a/Code/Legacy/CrySystem/CrySystem_precompiled.h b/Code/Legacy/CrySystem/CrySystem_precompiled.h
index 3ececa6514..41090ff321 100644
--- a/Code/Legacy/CrySystem/CrySystem_precompiled.h
+++ b/Code/Legacy/CrySystem/CrySystem_precompiled.h
@@ -71,7 +71,6 @@
 // CRY Stuff ////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 #include "Cry_Math.h"
-#include <Cry_Camera.h>
 #include <smartptr.h>
 #include <Range.h>
 #include <StlUtils.h>
@@ -90,7 +89,6 @@ inline int RoundToClosestMB(size_t memSize)
 #include <IRenderer.h>
 #include <CryFile.h>
 #include <ISystem.h>
-#include <ITimer.h>
 #include <IXml.h>
 #include <ICmdLine.h>
 #include <IConsole.h>
diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
index 3a2bba64d3..8945761184 100644
--- a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
@@ -19,6 +19,7 @@
 #include <CryCommon/StaticInstance.h>
 
 #include <AzCore/Debug/AssetTracking.h>
+#include <AzCore/Time/ITime.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/IO/FileOperations.h>
 #include <AzFramework/Entity/GameEntityContextBus.h>
@@ -202,24 +203,22 @@ CLevelSystem::CLevelSystem(ISystem* pSystem, const char* levelsFolder)
     {
         return;
     }
-    auto pPak = gEnv->pCryPak;
+    auto archive = AZ::Interface<AZ::IO::IArchive>::Get();
 
-    if (AZ::IO::IArchive::LevelPackOpenEvent* levelPakOpenEvent = pPak->GetLevelPackOpenEvent())
+    if (AZ::IO::IArchive::LevelPackOpenEvent* levelPakOpenEvent = archive->GetLevelPackOpenEvent())
     {
-        m_levelPackOpenHandler = AZ::IO::IArchive::LevelPackOpenEvent::Handler([this](const AZStd::vector<AZStd::string>& levelDirs)
+        m_levelPackOpenHandler = AZ::IO::IArchive::LevelPackOpenEvent::Handler([this](const AZStd::vector<AZ::IO::Path>& levelDirs)
         {
-            for (AZStd::string dir : levelDirs)
+            for (AZ::IO::Path levelDir : levelDirs)
             {
-                AZ::StringFunc::Path::StripComponent(dir, true);
-                AZStd::string searchPattern = dir + AZ_FILESYSTEM_SEPARATOR_WILDCARD;
                 bool modFolder = false;
-                PopulateLevels(searchPattern, dir, gEnv->pCryPak, modFolder, false);
+                PopulateLevels((levelDir / "*").Native(), levelDir.Native(), AZ::Interface<AZ::IO::IArchive>::Get(), modFolder, false);
             }
         });
         m_levelPackOpenHandler.Connect(*levelPakOpenEvent);
     }
 
-    if (AZ::IO::IArchive::LevelPackCloseEvent* levelPakCloseEvent = pPak->GetLevelPackCloseEvent())
+    if (AZ::IO::IArchive::LevelPackCloseEvent* levelPakCloseEvent = archive->GetLevelPackCloseEvent())
     {
         m_levelPackCloseHandler = AZ::IO::IArchive::LevelPackCloseEvent::Handler([this](AZStd::string_view)
         {
@@ -287,7 +286,7 @@ void CLevelSystem::ScanFolder(const char* subfolder, bool modFolder)
 
     AZStd::unordered_set<AZStd::string> pakList;
 
-    AZ::IO::ArchiveFileIterator handle = pPak->FindFirst(search.c_str(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskOnly);
+    AZ::IO::ArchiveFileIterator handle = pPak->FindFirst(search.c_str(), AZ::IO::FileSearchLocation::OnDisk);
 
     if (handle)
     {
@@ -334,86 +333,85 @@ void CLevelSystem::ScanFolder(const char* subfolder, bool modFolder)
 }
 
 void CLevelSystem::PopulateLevels(
-    AZStd::string searchPattern, AZStd::string& folder, AZ::IO::IArchive* pPak, bool& modFolder, bool fromFileSystemOnly)
+    AZStd::string searchPattern, const AZStd::string& folder, AZ::IO::IArchive* pPak, bool& modFolder, bool fromFileSystemOnly)
 {
+    // allow this find first to actually touch the file system
+    // (causes small overhead but with minimal amount of levels this should only be around 150ms on actual DVD Emu)
+    AZ::IO::ArchiveFileIterator handle = pPak->FindFirst(searchPattern.c_str(),
+        fromFileSystemOnly ? AZ::IO::FileSearchLocation::OnDisk : AZ::IO::FileSearchLocation::InPak);
+
+    if (handle)
     {
-        // allow this find first to actually touch the file system
-        // (causes small overhead but with minimal amount of levels this should only be around 150ms on actual DVD Emu)
-        AZ::IO::ArchiveFileIterator handle = pPak->FindFirst(searchPattern.c_str(), AZ::IO::IArchive::eFileSearchType_AllowOnDiskOnly);
-
-        if (handle)
+        do
         {
-            do
+            if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory ||
+                handle.m_filename == "." || handle.m_filename == "..")
             {
-                if ((handle.m_fileDesc.nAttrib & AZ::IO::FileDesc::Attribute::Subdirectory) != AZ::IO::FileDesc::Attribute::Subdirectory ||
-                    handle.m_filename == "." || handle.m_filename == "..")
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                AZStd::string levelFolder;
-                if (fromFileSystemOnly)
-                {
-                    levelFolder =
-                        (folder.empty() ? "" : (folder + "/")) + AZStd::string(handle.m_filename.data(), handle.m_filename.size());
-                }
-                else
-                {
-                    AZStd::string levelName(AZ::IO::PathView(handle.m_filename).Filename().Native());
-                    levelFolder = (folder.empty() ? "" : (folder + "/")) + levelName;
-                }
+            AZStd::string levelFolder;
+            if (fromFileSystemOnly)
+            {
+                levelFolder =
+                    (folder.empty() ? "" : (folder + "/")) + AZStd::string(handle.m_filename.data(), handle.m_filename.size());
+            }
+            else
+            {
+                AZStd::string levelName(AZ::IO::PathView(handle.m_filename).Filename().Native());
+                levelFolder = (folder.empty() ? "" : (folder + "/")) + levelName;
+            }
 
-                AZStd::string levelPath;
-                if (AZ::StringFunc::StartsWith(levelFolder.c_str(), m_levelsFolder.c_str()))
+            AZStd::string levelPath;
+            if (AZ::StringFunc::StartsWith(levelFolder.c_str(), m_levelsFolder.c_str()))
+            {
+                levelPath = levelFolder;
+            }
+            else
+            {
+                levelPath = m_levelsFolder + "/" + levelFolder;
+            }
+
+            const AZStd::string levelPakName = levelPath + "/" + LevelPakName;
+            const AZStd::string levelInfoName = levelPath + "/levelinfo.xml";
+
+            if (!pPak->IsFileExist(
+                levelPakName.c_str(),
+                fromFileSystemOnly ? AZ::IO::FileSearchLocation::OnDisk : AZ::IO::FileSearchLocation::InPak) &&
+                !pPak->IsFileExist(
+                    levelInfoName.c_str(),
+                    fromFileSystemOnly ? AZ::IO::FileSearchLocation::OnDisk : AZ::IO::FileSearchLocation::InPak))
+            {
+                ScanFolder(levelFolder.c_str(), modFolder);
+                continue;
+            }
+
+            // With the level.pak workflow, levelPath and levelName will point to a directory.
+            // levelPath: levels/mylevel
+            // levelName: mylevel
+            CLevelInfo levelInfo;
+            levelInfo.m_levelPath = levelPath;
+            levelInfo.m_levelName = levelFolder;
+            levelInfo.m_isPak = !fromFileSystemOnly;
+
+            CLevelInfo* pExistingInfo = GetLevelInfoInternal(levelInfo.m_levelName);
+
+            // Don't add the level if it is already in the list
+            if (pExistingInfo == NULL)
+            {
+                m_levelInfos.push_back(levelInfo);
+            }
+            else
+            {
+                // Levels in bundles take priority over levels outside bundles.
+                if (!pExistingInfo->m_isPak && levelInfo.m_isPak)
                 {
-                    levelPath = levelFolder;
-                }
-                else
-                {
-                    levelPath = m_levelsFolder + "/" + levelFolder;
+                    *pExistingInfo = levelInfo;
                 }
+            }
+        } while (handle = pPak->FindNext(handle));
 
-                const AZStd::string levelPakName = levelPath + "/" + LevelPakName;
-                const AZStd::string levelInfoName = levelPath + "/levelinfo.xml";
-
-                if (!pPak->IsFileExist(
-                        levelPakName.c_str(),
-                        fromFileSystemOnly ? AZ::IO::IArchive::eFileLocation_OnDisk : AZ::IO::IArchive::eFileLocation_InPak) &&
-                    !pPak->IsFileExist(
-                        levelInfoName.c_str(),
-                        fromFileSystemOnly ? AZ::IO::IArchive::eFileLocation_OnDisk : AZ::IO::IArchive::eFileLocation_InPak))
-                {
-                    ScanFolder(levelFolder.c_str(), modFolder);
-                    continue;
-                }
-
-                // With the level.pak workflow, levelPath and levelName will point to a directory.
-                // levelPath: levels/mylevel
-                // levelName: mylevel
-                CLevelInfo levelInfo;
-                levelInfo.m_levelPath = levelPath;
-                levelInfo.m_levelName = levelFolder;
-                levelInfo.m_isPak = !fromFileSystemOnly;
-
-                CLevelInfo* pExistingInfo = GetLevelInfoInternal(levelInfo.m_levelName);
-
-                // Don't add the level if it is already in the list
-                if (pExistingInfo == NULL)
-                {
-                    m_levelInfos.push_back(levelInfo);
-                }
-                else
-                {
-                    // Levels in bundles take priority over levels outside bundles.
-                    if (!pExistingInfo->m_isPak && levelInfo.m_isPak)
-                    {
-                        *pExistingInfo = levelInfo;
-                    }
-                }
-            } while (handle = pPak->FindNext(handle));
-
-            pPak->FindClose(handle);
-        }
+        pPak->FindClose(handle);
     }
 }
 
@@ -553,8 +551,6 @@ ILevel* CLevelSystem::LoadLevelInternal(const char* _levelName)
 
     // Not remove a scope!!!
     {
-        //m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
-
         CLevelInfo* pLevelInfo = GetLevelInfoInternal(levelName);
 
         if (!pLevelInfo)
@@ -693,7 +689,9 @@ void CLevelSystem::PrepareNextLevel(const char* levelName)
     // This work not required in-editor.
     if (!gEnv || !gEnv->IsEditor())
     {
-        m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
+        const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+        const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+        m_levelLoadStartTime = CTimeValue(timeSec);
 
         // Open pak file for a new level.
         pLevelInfo->OpenLevelPak();
@@ -726,7 +724,8 @@ void CLevelSystem::OnLoadingStart(const char* levelName)
         gEnv->pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
     }
 
-    m_fLastTime = gEnv->pTimer->GetAsyncCurTime();
+    const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+    m_fLastTime = AZ::TimeMsToSeconds(timeMs);
 
     GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START, 0, 0);
 
@@ -757,7 +756,9 @@ void CLevelSystem::OnLoadingError(const char* levelName, const char* error)
 //------------------------------------------------------------------------
 void CLevelSystem::OnLoadingComplete(const char* levelName)
 {
-    CTimeValue t = gEnv->pTimer->GetAsyncTime();
+    const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+    const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+    const CTimeValue t(timeSec);
     m_fLastLevelLoadTime = (t - m_levelLoadStartTime).GetSeconds();
 
     LogLoadingTime();
@@ -851,7 +852,7 @@ void CLevelSystem::UnloadLevel()
         gEnv->pCryPak->DisableRuntimeFileAccess(false);
     }
 
-    CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
+    const AZ::TimeMs beginTimeMs = AZ::GetRealElapsedTimeMs();
 
     // Clear level entities and prefab instances.
     EBUS_EVENT(AzFramework::GameEntityContextRequestBus, ResetGameContext);
@@ -889,8 +890,8 @@ void CLevelSystem::UnloadLevel()
 
     m_bLevelLoaded = false;
 
-    CTimeValue tUnloadTime = gEnv->pTimer->GetAsyncTime() - tBegin;
-    CryLog("UnloadLevel End: %.1f sec", tUnloadTime.GetSeconds());
+    [[maybe_unused]] const AZ::TimeMs unloadTimeMs = AZ::GetRealElapsedTimeMs() - beginTimeMs;
+    CryLog("UnloadLevel End: %.1f sec", AZ::TimeMsToSeconds(unloadTimeMs));
 
     // Must be sent last.
     // Cleanup all containers
diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
index d7230347e9..d0a39f30b0 100644
--- a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.h
@@ -11,6 +11,7 @@
 
 #include "ILevelSystem.h"
 #include <AzFramework/Archive/IArchive.h>
+#include <CryCommon/TimeValue.h>
 
 // [LYN-2376] Remove the entire file once legacy slice support is removed
 
@@ -115,7 +116,7 @@ private:
 
     void ScanFolder(const char* subfolder, bool modFolder);
     void PopulateLevels(
-        AZStd::string searchPattern, AZStd::string& folder, AZ::IO::IArchive* pPak, bool& modFolder, bool fromFileSystemOnly);
+        AZStd::string searchPattern, const AZStd::string& folder, AZ::IO::IArchive* pPak, bool& modFolder, bool fromFileSystemOnly);
     void PrepareNextLevel(const char* levelName);
     ILevel* LoadLevelInternal(const char* _levelName);
 
diff --git a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
index b2b67c3b75..b91c8f2ca9 100644
--- a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
+++ b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
@@ -24,8 +24,8 @@
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryVisitorUtils.h>
 #include <AzCore/StringFunc/StringFunc.h>
-
 #include <AzCore/Script/ScriptSystemBus.h>
+#include <AzCore/Time/ITime.h>
 
 namespace LegacyLevelSystem
 {
@@ -368,7 +368,9 @@ namespace LegacyLevelSystem
         // This work not required in-editor.
         if (!gEnv || !gEnv->IsEditor())
         {
-            m_levelLoadStartTime = gEnv->pTimer->GetAsyncTime();
+            const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+            const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+            m_levelLoadStartTime = CTimeValue(timeSec);
 
             // switched to level heap, so now imm start the loading screen (renderer will be reinitialized in the levelheap)
             gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN, 0, 0);
@@ -409,7 +411,8 @@ namespace LegacyLevelSystem
             gEnv->pCryPak->RecordFileOpen(AZ::IO::IArchive::RFOM_Level);
         }
 
-        m_fLastTime = gEnv->pTimer->GetAsyncCurTime();
+        const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+        m_fLastTime = AZ::TimeMsToSeconds(timeMs);
 
         GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START, 0, 0);
 
@@ -433,7 +436,9 @@ namespace LegacyLevelSystem
     //------------------------------------------------------------------------
     void SpawnableLevelSystem::OnLoadingComplete(const char* levelName)
     {
-        CTimeValue t = gEnv->pTimer->GetAsyncTime();
+        const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+        const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+        const CTimeValue t(timeSec);
         m_fLastLevelLoadTime = (t - m_levelLoadStartTime).GetSeconds();
 
         LogLoadingTime();
@@ -532,7 +537,7 @@ namespace LegacyLevelSystem
             gEnv->pCryPak->DisableRuntimeFileAccess(false);
         }
 
-        CTimeValue tBegin = gEnv->pTimer->GetAsyncTime();
+        const AZ::TimeMs beginTimeMs = AZ::GetRealElapsedTimeMs();
 
         // Clear level entities and prefab instances.
         EBUS_EVENT(AzFramework::GameEntityContextRequestBus, ResetGameContext);
@@ -561,8 +566,8 @@ namespace LegacyLevelSystem
 
         m_bLevelLoaded = false;
 
-        CTimeValue tUnloadTime = gEnv->pTimer->GetAsyncTime() - tBegin;
-        AZ_TracePrintf("LevelSystem", "UnloadLevel End: %.1f sec\n", tUnloadTime.GetSeconds());
+        [[maybe_unused]] const AZ::TimeMs unloadTimeMs = AZ::GetRealElapsedTimeMs() - beginTimeMs;
+        AZ_TracePrintf("LevelSystem", "UnloadLevel End: %.1f sec\n", AZ::TimeMsToSeconds(unloadTimeMs));
 
         // Must be sent last.
         // Cleanup all containers
diff --git a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
index 0a7b821262..b2e74530ac 100644
--- a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
+++ b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.h
@@ -12,6 +12,7 @@
 #include <AzCore/Console/IConsole.h>
 #include <AzFramework/Archive/IArchive.h>
 #include <AzFramework/Spawnable/RootSpawnableInterface.h>
+#include <CryCommon/TimeValue.h>
 
 namespace LegacyLevelSystem
 {
diff --git a/Code/Legacy/CrySystem/LocalizedStringManager.cpp b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
index a87800899d..c48baa95a7 100644
--- a/Code/Legacy/CrySystem/LocalizedStringManager.cpp
+++ b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
@@ -136,6 +136,44 @@ static const char* PLATFORM_INDEPENDENT_LANGUAGE_NAMES[ ILocalizationManager::eP
     "da-DK"   // Danish (Denmark)
 };
 
+#if defined(WIN32) || defined(WIN64)
+namespace
+{
+#if defined(WIN32)
+    time_t gmt_to_local_win32(void)
+    {
+        TIME_ZONE_INFORMATION tzinfo;
+        DWORD dwStandardDaylight;
+        long bias;
+
+        dwStandardDaylight = GetTimeZoneInformation(&tzinfo);
+        bias = tzinfo.Bias;
+
+        if (dwStandardDaylight == TIME_ZONE_ID_STANDARD)
+        {
+            bias += tzinfo.StandardBias;
+        }
+
+        if (dwStandardDaylight == TIME_ZONE_ID_DAYLIGHT)
+        {
+            bias += tzinfo.DaylightBias;
+        }
+
+        return (-bias * 60);
+    }
+#endif // #if defined(WIN32)
+
+    time_t DateToSecondsUTC(struct tm& inDate)
+    {
+#if defined(WIN32)
+        return mktime(&inDate) + gmt_to_local_win32();
+#else
+        return mktime(&inDate);
+#endif // #if defined(WIN32)
+    }
+}
+#endif // #if defined(WIN32) || defined(WIN64)
+
 //////////////////////////////////////////////////////////////////////////
 #if !defined(_RELEASE)
 static void ReloadDialogData([[maybe_unused]] IConsoleCmdArgs* pArgs)
@@ -989,8 +1027,6 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
     // key CRC
     uint32 keyCRC;
 
-    size_t nMemSize = 0;
-
     for (;; )
     {
         int nRowIndex = -1;
@@ -1471,30 +1507,6 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
             pEntry->flags |= SLocalizedStringEntry::IS_INTERCEPTED;
         }
 
-        nMemSize += sizeof(*pEntry) + pEntry->sCharacterName.length() * sizeof(char);
-        if (m_cvarLocalizationEncode == 0)
-        {
-            //Note that this isn't accurate if we're using encoding/compression to shrink the string as the encoding step hasn't happened yet
-            if (pEntry->TranslatedText.psUtf8Uncompressed)
-            {
-                nMemSize += pEntry->TranslatedText.psUtf8Uncompressed->length() * sizeof(char);
-            }
-        }
-        if (pEntry->pEditorExtension != NULL)
-        {
-            nMemSize += pEntry->pEditorExtension->sKey.length()
-                + pEntry->pEditorExtension->sOriginalActorLine.length()
-                + pEntry->pEditorExtension->sUtf8TranslatedActorLine.length() * sizeof(char)
-                + pEntry->pEditorExtension->sOriginalText.length()
-                + pEntry->pEditorExtension->sOriginalCharacterName.length();
-        }
-
-
-        // Compression Preparation
-        //unsigned int nSourceSize = pEntry->swTranslatedText.length()*sizeof(wchar_t);
-        //if (nSourceSize)
-        //  int zResult = Compress(pDest, nDestLen, pEntry->swTranslatedText.c_str(), nSourceSize);
-
         AddLocalizedString(m_pLanguage, pEntry, keyCRC);
     }
 
@@ -1502,10 +1514,7 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
     {
         pEncoder->Finalize();
 
-        {
             uint8 compressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH];
-            //uint8 decompressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH];
-            size_t uncompressedTotal = 0, compressedTotal = 0;
             for (size_t stringToCompress = startOfStringsToCompress; stringToCompress < m_pLanguage->m_vLocalizedStrings.size(); stringToCompress++)
             {
                 SLocalizedStringEntry* pStringToCompress = m_pLanguage->m_vLocalizedStrings[stringToCompress];
@@ -1513,30 +1522,19 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
                 {
                     size_t compBufSize = COMPRESSION_FIXED_BUFFER_LENGTH;
                     memset(compressionBuffer, 0, COMPRESSION_FIXED_BUFFER_LENGTH);
-                    //CryLogAlways("%u Compressing %s (%p)", stringToCompress, pStringToCompress->szCompressedTranslatedText, pStringToCompress->szCompressedTranslatedText);
                     size_t inputStringLength = strlen((const char*)(pStringToCompress->TranslatedText.szCompressed));
                     pEncoder->CompressInput(pStringToCompress->TranslatedText.szCompressed, inputStringLength, compressionBuffer, &compBufSize);
                     compressionBuffer[compBufSize] = 0;
                     pStringToCompress->huffmanTreeIndex = iEncoder;
                     pEncoder->AddRef();
-                    //CryLogAlways("Compressed %s (%u) to %s (%u)", pStringToCompress->szCompressedTranslatedText, strlen((const char*)pStringToCompress->szCompressedTranslatedText), compressionBuffer, compBufSize);
-                    uncompressedTotal += inputStringLength;
-                    compressedTotal += compBufSize;
 
                     uint8* szCompressedString = new uint8[compBufSize];
                     SAFE_DELETE_ARRAY(pStringToCompress->TranslatedText.szCompressed);
 
                     memcpy(szCompressedString, compressionBuffer, compBufSize);
                     pStringToCompress->TranslatedText.szCompressed = szCompressedString;
-
-                    //Testing code
-                    //memset( decompressionBuffer, 0, COMPRESSION_FIXED_BUFFER_LENGTH );
-                    //size_t decompBufSize = pEncoder->UncompressInput(compressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH, decompressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH);
-                    //CryLogAlways("Decompressed %s (%u) to %s (%u)", compressionBuffer, compBufSize, decompressionBuffer, decompBufSize);
                 }
             }
-            //CryLogAlways("[LOC PROFILING] %s, %u, Uncompressed %u, Compressed %u", sFileName, m_pLanguage->m_vLocalizedStrings.size() - startOfStringsToCompress, uncompressedTotal, compressedTotal);
-        }
     }
 
     pXmlTableReader->Release();
@@ -1546,11 +1544,7 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
 
 bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8 nTagID, bool bReload)
 {
-    if (!sFileName)
-    {
-        return false;
-    }
-    if (!m_pLanguage)
+    if (!sFileName|| !m_pLanguage)
     {
         return false;
     }
@@ -1693,7 +1687,6 @@ bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8
         }
         {
             uint8 compressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH] = {};
-            size_t uncompressedTotal = 0, compressedTotal = 0;
             for (size_t stringToCompress = startOfStringsToCompress; stringToCompress < m_pLanguage->m_vLocalizedStrings.size(); stringToCompress++)
             {
                 SLocalizedStringEntry* pStringToCompress = m_pLanguage->m_vLocalizedStrings[stringToCompress];
@@ -1706,8 +1699,6 @@ bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8
                     compressionBuffer[compBufSize] = 0;
                     pStringToCompress->huffmanTreeIndex = iEncoder;
                     pEncoder->AddRef();
-                    uncompressedTotal += inputStringLength;
-                    compressedTotal += compBufSize;
                     uint8* szCompressedString = new uint8[compBufSize];
                     SAFE_DELETE_ARRAY(pStringToCompress->TranslatedText.szCompressed);
                     memcpy(szCompressedString, compressionBuffer, compBufSize);
@@ -1772,7 +1763,7 @@ bool CLocalizedStringsManager::LocalizeString_s(const AZStd::string& sString, AZ
 bool CLocalizedStringsManager::LocalizeStringInternal(const char* pStr, size_t len, AZStd::string& outLocalizedString, bool bEnglish)
 {
     assert (m_pLanguage);
-    if (m_pLanguage == 0)
+    if (m_pLanguage == nullptr)
     {
         CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "LocalizeString: No language set.");
         outLocalizedString.assign(pStr, pStr + len);
@@ -2656,7 +2647,7 @@ void CLocalizedStringsManager::LocalizeTime(time_t t, bool bMakeLocalTime, bool
     {
         struct tm thetime;
         localtime_s(&thetime, &t);
-        t = gEnv->pTimer->DateToSecondsUTC(thetime);
+        t = DateToSecondsUTC(thetime);
     }
     outTimeString.clear();
     LCID lcID = g_currentLanguageID.lcID ? g_currentLanguageID.lcID : LOCALE_USER_DEFAULT;
@@ -2680,7 +2671,7 @@ void CLocalizedStringsManager::LocalizeDate(time_t t, bool bMakeLocalTime, bool
     {
         struct tm thetime;
         localtime_s(&thetime, &t);
-        t = gEnv->pTimer->DateToSecondsUTC(thetime);
+        t = DateToSecondsUTC(thetime);
     }
     outDateString.resize(0);
     LCID lcID = g_currentLanguageID.lcID ? g_currentLanguageID.lcID : LOCALE_USER_DEFAULT;
diff --git a/Code/Legacy/CrySystem/Log.cpp b/Code/Legacy/CrySystem/Log.cpp
index c08d5870e9..2b2fa65dda 100644
--- a/Code/Legacy/CrySystem/Log.cpp
+++ b/Code/Legacy/CrySystem/Log.cpp
@@ -22,6 +22,7 @@
 #include <AzFramework/IO/FileOperations.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzCore/Time/ITime.h>
 
 #ifdef WIN32
 #include <time.h>
@@ -503,7 +504,8 @@ void CLog::LogV(const ELogType type, [[maybe_unused]]int flags, const char* szFo
     {
         const int sz = sizeof(m_history) / sizeof(m_history[0]);
         int i, j;
-        float time = m_pSystem->GetITimer()->GetCurrTime();
+        const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+        const float time = AZ::TimeMsToSeconds(realTimeMs);
         for (i = m_iLastHistoryItem, j = 0; m_history[i].time > time - dt && j < sz; j++, i = i - 1 & sz - 1)
         {
             if (m_history[i].type != type)
@@ -908,7 +910,7 @@ void CLog::LogStringToFile(const char* szString, ELogType logType, bool bAdd, [[
     }
 #endif
 
-    if (m_pLogIncludeTime && gEnv && gEnv->pTimer)
+    if (m_pLogIncludeTime)
     {
         uint32 dwCVarState = m_pLogIncludeTime->GetIVal();
         //      char szTemp[MAX_TEMP_LENGTH_SIZE];
@@ -933,12 +935,12 @@ void CLog::LogStringToFile(const char* szString, ELogType logType, bool bAdd, [[
         }
         else if (dwCVarState == 2)     // Log_IncludeTime
         {
-            static CTimeValue lasttime;
-            CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
-            if (lasttime != CTimeValue())
+            static AZ::TimeMs lasttime = AZ::Time::ZeroTimeMs;
+            const AZ::TimeMs currenttime = AZ::GetRealElapsedTimeMs();
+            if (lasttime != AZ::Time::ZeroTimeMs)
             {
                 timeStr.clear();
-                uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
+                uint32 dwMs = aznumeric_cast<uint32>(currenttime - lasttime);
                 timeStr = AZStd::string::format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
                 tempString = timeStr + tempString;
             }
@@ -960,12 +962,12 @@ void CLog::LogStringToFile(const char* szString, ELogType logType, bool bAdd, [[
 #endif
             tempString = LogStringType(sTime) + tempString;
 
-            static CTimeValue lasttime;
-            CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
-            if (lasttime != CTimeValue())
+            static AZ::TimeMs lasttime = AZ::Time::ZeroTimeMs;
+            const AZ::TimeMs currenttime = AZ::GetRealElapsedTimeMs();
+            if (lasttime != AZ::Time::ZeroTimeMs)
             {
                 timeStr.clear();
-                uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
+                uint32 dwMs = (uint32)(currenttime - lasttime);
                 timeStr = AZStd::string::format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
                 tempString = timeStr + tempString;
             }
@@ -975,22 +977,19 @@ void CLog::LogStringToFile(const char* szString, ELogType logType, bool bAdd, [[
         {
             static bool bFirst = true;
 
-            if (gEnv->pTimer)
+            static AZ::TimeMs lasttime = AZ::Time::ZeroTimeMs;
+            const AZ::TimeMs currenttime = AZ::GetRealElapsedTimeMs();
+            if (lasttime != AZ::Time::ZeroTimeMs)
             {
-                static CTimeValue lasttime;
-                CTimeValue currenttime = gEnv->pTimer->GetAsyncTime();
-                if (lasttime != CTimeValue())
-                {
-                    timeStr.clear();
-                    uint32 dwMs = (uint32)((currenttime - lasttime).GetMilliSeconds());
-                    timeStr = AZStd::string::format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
-                    tempString = timeStr + tempString;
-                }
-                if (bFirst)
-                {
-                    lasttime = currenttime;
-                    bFirst = false;
-                }
+                timeStr.clear();
+                uint32 dwMs = (uint32)(currenttime - lasttime);
+                timeStr = AZStd::string::format("<%3d.%.3d>: ", dwMs / 1000, dwMs % 1000);
+                tempString = timeStr + tempString;
+            }
+            if (bFirst)
+            {
+                lasttime = currenttime;
+                bFirst = false;
             }
         }
         else if (dwCVarState == 5)             // Log_IncludeTime
@@ -1465,9 +1464,10 @@ void CLog::Update()
 
         if (LogCVars::s_log_tick != 0)
         {
-            static CTimeValue t0 = GetISystem()->GetITimer()->GetAsyncTime();
-            CTimeValue t1 = GetISystem()->GetITimer()->GetAsyncTime();
-            if (fabs((t1 - t0).GetSeconds()) > LogCVars::s_log_tick)
+            static AZ::TimeUs t0 = AZ::GetElapsedTimeUs();
+            const AZ::TimeUs t1 = AZ::GetElapsedTimeUs();
+            const float tSec = AZ::TimeUsToSeconds(t1 - t0);
+            if (tSec > LogCVars::s_log_tick)
             {
                 t0 = t1;
 
diff --git a/Code/Legacy/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp
index a6ffdec4e8..6b985a3f6f 100644
--- a/Code/Legacy/CrySystem/System.cpp
+++ b/Code/Legacy/CrySystem/System.cpp
@@ -29,6 +29,7 @@
 #include <AzCore/Debug/IEventLogger.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/std/algorithm.h>
+#include <AzCore/Time/ITime.h>
 #include <AzFramework/Logging/MissingAssetLogger.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzCore/Interface/Interface.h>
@@ -128,7 +129,6 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 #include "LocalizedStringManager.h"
 #include "XML/XmlUtils.h"
 #include "SystemEventDispatcher.h"
-#include "HMDBus.h"
 
 #include "RemoteConsole/RemoteConsole.h"
 
@@ -153,12 +153,20 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 // Define global cvars.
 SSystemCVars g_cvars;
 
-#include <IViewSystem.h>
-
 #include <AzCore/Module/Environment.h>
 #include <AzCore/Component/ComponentApplication.h>
 #include "AZCoreLogSink.h"
 
+namespace
+{
+    float GetMovieFrameDeltaTime()
+    {
+        // Use GetRealTickDeltaTimeUs for CryMovie, because it should not be affected by pausing game time
+        const AZ::TimeUs delta = AZ::GetRealTickDeltaTimeUs();
+        return AZ::TimeUsToSeconds(delta);
+    }
+}
+
 /////////////////////////////////////////////////////////////////////////////////
 // System Implementation.
 //////////////////////////////////////////////////////////////////////////
@@ -195,47 +203,23 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
     //////////////////////////////////////////////////////////////////////////
     // Initialize global environment interface pointers.
     m_env.pSystem = this;
-    m_env.pTimer = &m_Time;
     m_env.bIgnoreAllAsserts = false;
     m_env.bNoAssertDialog = false;
 
     m_env.pSharedEnvironment = pSharedEnvironment;
     //////////////////////////////////////////////////////////////////////////
 
-    m_pIFont = NULL;
-    m_pIFontUi = NULL;
-    m_rWidth = NULL;
-    m_rHeight = NULL;
-    m_rWidthAndHeightAsFractionOfScreenSize = NULL;
-    m_rMaxWidth = NULL;
-    m_rMaxHeight = NULL;
-    m_rColorBits = NULL;
-    m_rDepthBits = NULL;
-    m_cvSSInfo = NULL;
-    m_rStencilBits = NULL;
-    m_rFullscreen = NULL;
     m_sysNoUpdate = NULL;
-    m_pProcess = NULL;
     m_pCmdLine = NULL;
     m_pLevelSystem = NULL;
-    m_pViewSystem = NULL;
     m_pLocalizationManager = NULL;
 #if defined(AZ_RESTRICTED_PLATFORM)
 #define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_2
 #include AZ_RESTRICTED_FILE(System_cpp)
 #endif
-    m_sys_min_step = 0;
-    m_sys_max_step = 0;
-
-    m_cvAIUpdate = NULL;
 
     m_pUserCallback = NULL;
-    m_sys_memory_debug = NULL;
-    m_sysWarnings = NULL;
-    m_sysKeyboard = NULL;
     m_sys_firstlaunch = NULL;
-    m_sys_enable_budgetmonitoring = NULL;
-    m_sys_preload = NULL;
 
     //  m_sys_filecache = NULL;
     m_gpu_particle_physics = NULL;
@@ -250,22 +234,11 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
     m_bNoCrashDialog = false;
     m_bNoErrorReportWindow = false;
 
-    m_pCVarQuit = NULL;
-
-    m_bForceNonDevMode = false;
-    m_bWasInDevMode = false;
     m_bInDevMode = false;
     m_bGameFolderWritable = false;
 
-    m_bDrawConsole = true;
-    m_bDrawUI = true;
-
-    m_nServerConfigSpec = CONFIG_VERYHIGH_SPEC;
-    m_nMaxConfigSpec = CONFIG_VERYHIGH_SPEC;
-
     m_bPaused = false;
     m_bNoUpdate = false;
-    m_nUpdateCounter = 0;
     m_iApplicationInstance = -1;
 
 
@@ -287,7 +260,6 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
 
     m_bHasRenderedErrorMessage = false;
 
-    m_pDataProbe = nullptr;
 #if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
     RegisterWindowMessageHandler(this);
 #endif
@@ -333,48 +305,15 @@ void CSystem::Release()
     delete this;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CSystem::FreeLib(AZStd::unique_ptr<AZ::DynamicModuleHandle>& hLibModule)
-{
-    if (hLibModule)
-    {
-        if (hLibModule->IsLoaded())
-        {
-            hLibModule->Unload();
-        }
-        hLibModule.release();
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 IRemoteConsole* CSystem::GetIRemoteConsole()
 {
     return CRemoteConsole::GetInst();
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CSystem::SetForceNonDevMode(const bool bValue)
-{
-    m_bForceNonDevMode = bValue;
-    if (bValue)
-    {
-        SetDevMode(false);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CSystem::GetForceNonDevMode() const
-{
-    return m_bForceNonDevMode;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CSystem::SetDevMode(bool bEnable)
 {
-    if (bEnable)
-    {
-        m_bWasInDevMode = true;
-    }
     m_bInDevMode = bEnable;
 }
 
@@ -434,9 +373,6 @@ void CSystem::ShutDown()
         m_pSystemEventDispatcher->OnSystemEvent(ESYSTEM_EVENT_FULL_SHUTDOWN, 0, 0);
     }
 
-    // Shutdown any running VR devices.
-    EBUS_EVENT(AZ::VR::HMDInitRequestBus, Shutdown);
-
     if (gEnv && gEnv->pLyShine)
     {
         gEnv->pLyShine->Release();
@@ -450,7 +386,6 @@ void CSystem::ShutDown()
     {
         ((CXConsole*)m_env.pConsole)->FreeRenderResources();
     }
-    SAFE_RELEASE(m_pViewSystem);
     SAFE_RELEASE(m_pLevelSystem);
 
     if (m_env.pLog)
@@ -462,31 +397,13 @@ void CSystem::ShutDown()
 
     // Release console variables.
 
-    SAFE_RELEASE(m_pCVarQuit);
-    SAFE_RELEASE(m_rWidth);
-    SAFE_RELEASE(m_rHeight);
-    SAFE_RELEASE(m_rWidthAndHeightAsFractionOfScreenSize);
-    SAFE_RELEASE(m_rMaxWidth);
-    SAFE_RELEASE(m_rMaxHeight);
-    SAFE_RELEASE(m_rColorBits);
-    SAFE_RELEASE(m_rDepthBits);
-    SAFE_RELEASE(m_cvSSInfo);
-    SAFE_RELEASE(m_rStencilBits);
-    SAFE_RELEASE(m_rFullscreen);
-
-    SAFE_RELEASE(m_sysWarnings);
-    SAFE_RELEASE(m_sysKeyboard);
     SAFE_RELEASE(m_sys_firstlaunch);
-    SAFE_RELEASE(m_sys_enable_budgetmonitoring);
 
 #if defined(AZ_RESTRICTED_PLATFORM)
 #define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_3
 #include AZ_RESTRICTED_FILE(System_cpp)
 #endif
 
-    SAFE_RELEASE(m_sys_min_step);
-    SAFE_RELEASE(m_sys_max_step);
-
     SAFE_DELETE(m_pLocalizationManager);
 
     delete m_pCmdLine;
@@ -554,14 +471,6 @@ bool CSystem::IsQuitting() const
     return wasExitMainLoopRequested;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CSystem::SetIProcess(IProcess* process)
-{
-    m_pProcess = process;
-    //if (m_pProcess)
-    //m_pProcess->SetPMessage("");
-}
-
 //////////////////////////////////////////////////////////////////////////
 ISystem* CSystem::GetCrySystem()
 {
@@ -571,14 +480,15 @@ ISystem* CSystem::GetCrySystem()
 //////////////////////////////////////////////////////////////////////////
 void CSystem::SleepIfNeeded()
 {
-    ITimer* const pTimer = gEnv->pTimer;
     static bool firstCall = true;
 
     typedef MiniQueue<CTimeValue, 32> PrevNow;
     static PrevNow prevNow;
     if (firstCall)
     {
-        m_lastTickTime = pTimer->GetAsyncTime();
+        const AZ::TimeMs timeMs = AZ::GetRealElapsedTimeMs();
+        const double timeSec = AZ::TimeMsToSecondsDouble(timeMs);
+        m_lastTickTime = CTimeValue(timeSec);
         prevNow.Push(m_lastTickTime);
         firstCall = false;
         return;
@@ -586,8 +496,10 @@ void CSystem::SleepIfNeeded()
 
     const float maxRate = m_svDedicatedMaxRate->GetFVal();
     const float minTime = 1.0f / maxRate;
-    CTimeValue now = pTimer->GetAsyncTime();
-    float elapsed = (now - m_lastTickTime).GetSeconds();
+    const AZ::TimeMs nowTimeMs = AZ::GetRealElapsedTimeMs();
+    const double nowTimeSec = AZ::TimeMsToSecondsDouble(nowTimeMs);
+    const CTimeValue now = CTimeValue(nowTimeSec);
+    const float elapsed = (now - m_lastTickTime).GetSeconds();
 
     if (prevNow.Full())
     {
@@ -599,7 +511,9 @@ void CSystem::SleepIfNeeded()
     if (elapsed > minTime && allowStallCatchup)
     {
         allowStallCatchup = false;
-        m_lastTickTime = pTimer->GetAsyncTime();
+        const AZ::TimeMs lastTimeMs = AZ::GetRealElapsedTimeMs();
+        const double lastTimeSec = AZ::TimeMsToSecondsDouble(lastTimeMs);
+        m_lastTickTime = CTimeValue(lastTimeSec);
         return;
     }
     allowStallCatchup = true;
@@ -615,7 +529,9 @@ void CSystem::SleepIfNeeded()
         Sleep(sleepMS);
     }
 
-    m_lastTickTime = pTimer->GetAsyncTime();
+    const AZ::TimeMs lastTimeMs = AZ::GetRealElapsedTimeMs();
+    const double lastTimeSec = AZ::TimeMsToSecondsDouble(lastTimeMs);
+    m_lastTickTime = CTimeValue(lastTimeSec);
 }
 
 extern DWORD g_idDebugThreads[];
@@ -650,7 +566,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
 
     AZ_TRACE_METHOD();
 
-    m_nUpdateCounter++;
 #ifndef EXCLUDE_UPDATE_ON_CONSOLE
     if (m_pUserCallback)
     {
@@ -742,24 +657,21 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
 
             if (maxFPS > 0 && vSync == 0)
             {
-                CTimeValue timeFrameMax;
                 const float safeMarginFPS = 0.5f;//save margin to not drop below 30 fps
-                static CTimeValue sTimeLast = gEnv->pTimer->GetAsyncTime();
-                timeFrameMax.SetMilliSeconds((int64)(1000.f / ((float)maxFPS + safeMarginFPS)));
-                const CTimeValue timeLast = timeFrameMax + sTimeLast;
-                while (timeLast.GetValue() > gEnv->pTimer->GetAsyncTime().GetValue())
+                static AZ::TimeMs sTimeLast = AZ::GetRealElapsedTimeMs();
+                const AZ::TimeMs timeFrameMax(static_cast<AZ::TimeMs>(
+                    (int64)(1000.f / ((float)maxFPS + safeMarginFPS))
+                    ));
+                const AZ::TimeMs timeLast = timeFrameMax + sTimeLast;
+                while (timeLast > AZ::GetRealElapsedTimeMs())
                 {
                     CrySleep(0);
                 }
-                sTimeLast = gEnv->pTimer->GetAsyncTime();
+                sTimeLast = AZ::GetRealElapsedTimeMs();
             }
         }
     }
 
-    //////////////////////////////////////////////////////////////////////
-    //update time subsystem
-    m_Time.UpdateOnFrameStart();
-
     //////////////////////////////////////////////////////////////////////
     //update console system
     if (m_env.pConsole)
@@ -773,13 +685,10 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
         return false;
     }
 
-    // Use UI timer for CryMovie, because it should not be affected by pausing game time
-    const float fMovieFrameTime = m_Time.GetFrameTime(ITimer::ETIMER_UI);
-
     // Run movie system pre-update
     if (!bNoUpdate)
     {
-        UpdateMovieSystem(updateFlags, fMovieFrameTime, true);
+        UpdateMovieSystem(updateFlags, GetMovieFrameDeltaTime(), true);
     }
 
     return !IsQuitting();
@@ -788,13 +697,14 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
 //////////////////////////////////////////////////////////////////////
 bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
 {
-    CTimeValue updateStart = gEnv->pTimer->GetAsyncTime();
+    const AZ::TimeMs updateStartTimeMs = AZ::GetRealElapsedTimeMs();
+    const double updateStartTimeSec = AZ::TimeMsToSecondsDouble(updateStartTimeMs);
+    const CTimeValue updateStart(updateStartTimeSec);
 
     // Run movie system post-update
     if (!m_bNoUpdate)
     {
-        const float fMovieFrameTime = m_Time.GetFrameTime(ITimer::ETIMER_UI);
-        UpdateMovieSystem(updateFlags, fMovieFrameTime, false);
+        UpdateMovieSystem(updateFlags, GetMovieFrameDeltaTime(), false);
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -805,7 +715,9 @@ bool CSystem::UpdatePostTickBus(int updateFlags, int /*nPauseMode*/)
     }
 
     //Now update frame statistics
-    CTimeValue cur_time = gEnv->pTimer->GetAsyncTime();
+    const AZ::TimeMs curTimeMs = AZ::GetRealElapsedTimeMs();
+    const double curTimeSec = AZ::TimeMsToSecondsDouble(curTimeMs);
+    const CTimeValue cur_time(curTimeSec);
 
     CTimeValue a_second(g_cvars.sys_update_profile_time);
     std::vector< std::pair<CTimeValue, float> >::iterator it = m_updateTimes.begin();
@@ -946,13 +858,16 @@ void CSystem::Warning(EValidatorModule module, EValidatorSeverity severity, int
 }
 
 //////////////////////////////////////////////////////////////////////////
-int CSystem::ShowMessage(const char* text, const char* caption, unsigned int uType)
+void CSystem::ShowMessage(const char* text, const char* caption, unsigned int uType)
 {
     if (m_pUserCallback)
     {
-        return m_pUserCallback->ShowMessage(text, caption, uType);
+        m_pUserCallback->ShowMessage(text, caption, uType);
+    }
+    else
+    {
+        CryMessageBox(text, caption, uType);
     }
-    return CryMessageBox(text, caption, uType);
 }
 
 inline const char* ValidatorModuleToString(EValidatorModule module)
@@ -1029,22 +944,18 @@ void CSystem::WarningV(EValidatorModule module, EValidatorSeverity severity, int
     default:
         break;
     }
-    char szBuffer[MAX_WARNING_LENGTH];
-    vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, format, args);
+
+    AZStd::fixed_string<MAX_WARNING_LENGTH> fmt;
+    vsnprintf_s(fmt.data(), MAX_WARNING_LENGTH, MAX_WARNING_LENGTH - 1, format, args);
 
     if (file && *file)
     {
-        AZStd::fixed_string<MAX_WARNING_LENGTH> fmt = szBuffer;
         fmt += " [File=";
         fmt += file;
         fmt += "]";
 
-        m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", fmt.c_str());
-    }
-    else
-    {
-        m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", szBuffer);
     }
+    m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", fmt.c_str());
 
     if (bDbgBreak && g_cvars.sys_error_debugbreak)
     {
@@ -1129,34 +1040,6 @@ ILocalizationManager* CSystem::GetLocalizationManager()
     return m_pLocalizationManager;
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CSystem::debug_GetCallStackRaw(void** callstack, uint32& callstackLength)
-{
-    memset(callstack, 0, sizeof(void*) * callstackLength);
-
-#if !defined(ANDROID)
-    callstackLength = 0;
-#endif
-
-#if AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK
-    uint32 nNumStackFramesToSkip = 1;
-    uint32 callstackCapacity = callstackLength;
-    if (callstackCapacity > 0x40)
-    {
-        callstackCapacity = 0x40;
-    }
-    callstackLength = RtlCaptureStackBackTrace(nNumStackFramesToSkip, callstackCapacity, callstack, NULL);
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_7
-#include AZ_RESTRICTED_FILE(System_cpp)
-#endif
-
-    if (callstackLength > 0)
-    {
-        std::reverse(callstack, callstack + callstackLength);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CSystem::ExecuteCommandLine(bool deferred)
 {
@@ -1195,12 +1078,6 @@ void CSystem::ExecuteCommandLine(bool deferred)
     //gEnv->pConsole->ExecuteString("sys_RestoreSpec test*"); // to get useful debugging information about current spec settings to the log file
 }
 
-//////////////////////////////////////////////////////////////////////////
-ESystemConfigSpec CSystem::GetMaxConfigSpec() const
-{
-    return m_nMaxConfigSpec;
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CSystem::SetConfigPlatform(const ESystemConfigPlatform platform)
 {
@@ -1374,19 +1251,16 @@ const char* CSystem::GetSystemGlobalStateName(const ESystemGlobalState systemGlo
 
 void CSystem::SetSystemGlobalState(const ESystemGlobalState systemGlobalState)
 {
-    static CTimeValue s_startTime = CTimeValue();
+    static AZ::TimeMs s_startTime = AZ::Time::ZeroTimeMs;
     if (systemGlobalState != m_systemGlobalState)
     {
-        if (gEnv && gEnv->pTimer)
-        {
-            const CTimeValue endTime = gEnv->pTimer->GetAsyncTime();
-            [[maybe_unused]] const float numSeconds = endTime.GetDifferenceInSeconds(s_startTime);
-            CryLog("SetGlobalState %d->%d '%s'->'%s' %3.1f seconds",
-                m_systemGlobalState, systemGlobalState,
-                CSystem::GetSystemGlobalStateName(m_systemGlobalState), CSystem::GetSystemGlobalStateName(systemGlobalState),
-                numSeconds);
-            s_startTime = gEnv->pTimer->GetAsyncTime();
-        }
+        const AZ::TimeMs endTime = AZ::GetRealElapsedTimeMs();
+        [[maybe_unused]] const double numSeconds = AZ::TimeMsToSecondsDouble(endTime - s_startTime);
+        CryLog("SetGlobalState %d->%d '%s'->'%s' %3.1f seconds",
+            m_systemGlobalState, systemGlobalState,
+            CSystem::GetSystemGlobalStateName(m_systemGlobalState), CSystem::GetSystemGlobalStateName(systemGlobalState),
+            numSeconds);
+        s_startTime = AZ::GetRealElapsedTimeMs();
     }
     m_systemGlobalState = systemGlobalState;
 
@@ -1398,23 +1272,6 @@ void CSystem::SetSystemGlobalState(const ESystemGlobalState systemGlobalState)
 #endif // if AZ_LOADSCREENCOMPONENT_ENABLED
 }
 
-//////////////////////////////////////////////////////////////////////////
-void* CSystem::GetRootWindowMessageHandler()
-{
-#if defined(AZ_RESTRICTED_PLATFORM)
-    #define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_9
-    #include AZ_RESTRICTED_FILE(System_cpp)
-#endif
-#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
-#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
-#elif defined(WIN32)
-    return reinterpret_cast<void*>(&WndProc);
-#else
-    CRY_ASSERT(false && "This platform does not support window message handlers");
-    return NULL;
-#endif
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CSystem::RegisterWindowMessageHandler(IWindowMessageHandler* pHandler)
 {
@@ -1598,16 +1455,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam
 
 #endif
 
-std::shared_ptr<AZ::IO::FileIOBase> CSystem::CreateLocalFileIO()
-{
-    return std::make_shared<AZ::IO::LocalFileIO>();
-}
-
-IViewSystem* CSystem::GetIViewSystem()
-{
-    return m_pViewSystem;
-}
-
 ILevelSystem* CSystem::GetILevelSystem()
 {
     return m_pLevelSystem;
diff --git a/Code/Legacy/CrySystem/System.h b/Code/Legacy/CrySystem/System.h
index fd5c917a94..664f5385fa 100644
--- a/Code/Legacy/CrySystem/System.h
+++ b/Code/Legacy/CrySystem/System.h
@@ -13,7 +13,6 @@
 #include <IRenderer.h>
 #include <IWindowMessageHandler.h>
 
-#include "Timer.h"
 #include <CryVersion.h>
 #include "CmdLine.h"
 
@@ -23,6 +22,8 @@
 #include <AzCore/Module/DynamicModuleHandle.h>
 #include <AzCore/Math/Crc.h>
 
+#include <CryCommon/TimeValue.h>
+
 #include <list>
 #include <map>
 
@@ -77,9 +78,6 @@ class CWatchdogThread;
 #if defined(WIN32)
 #define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER 1
 #endif
-#if defined(WIN64) || defined(WIN32)
-#define AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK 1
-#endif
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -97,30 +95,12 @@ namespace Audio
     struct IAudioSystem;
     struct IMusicSystem;
 } // namespace Audio
-struct IDataProbe;
 
 #define PHSYICS_OBJECT_ENTITY 0
 
-#define MAX_STREAMING_POOL_INDEX 6
-#define MAX_THREAD_POOL_INDEX 6
-
 struct SSystemCVars
 {
-    int sys_streaming_requests_grouping_time_period;
-    int sys_streaming_sleep;
-    int sys_streaming_memory_budget;
-    int sys_streaming_max_finalize_per_frame;
-    float sys_streaming_max_bandwidth;
-    int sys_streaming_cpu;
-    int sys_streaming_cpu_worker;
-    int sys_streaming_debug;
-    int sys_streaming_resetstats;
-    int sys_streaming_debug_filter;
-    float sys_streaming_debug_filter_min_time;
-    int sys_streaming_use_optical_drive_thread;
-    ICVar* sys_streaming_debug_filter_file_name;
     ICVar* sys_localization_folder;
-    int sys_streaming_in_blocks;
 
     int sys_float_exceptions;
     int sys_no_crash_dialog;
@@ -128,33 +108,16 @@ struct SSystemCVars
     int sys_dump_aux_threads;
     int sys_WER;
     int sys_dump_type;
-    int sys_ai;
-    int sys_entitysystem;
     int sys_trackview;
     float sys_update_profile_time;
-    int sys_limit_phys_thread_count;
     int sys_MaxFPS;
     float sys_maxTimeStepForMovieSystem;
-    int sys_force_installtohdd_mode;
     int sys_report_files_not_found_in_paks = 0;
 
-#ifdef USE_HTTP_WEBSOCKETS
-    int sys_simple_http_base_port;
-#endif
-
     int sys_asserts;
     int sys_error_debugbreak;
 
-    int sys_FilesystemCaseSensitivity;
-
     AZ::IO::ArchiveVars archiveVars;
-
-#if defined(WIN32)
-    int sys_display_threads;
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_2
-#include AZ_RESTRICTED_FILE(System_h)
-#endif
 };
 extern SSystemCVars g_cvars;
 
@@ -226,7 +189,6 @@ public:
     int GetApplicationInstance() override;
     int GetApplicationLogInstance(const char* logFilePath) override;
 
-    ITimer* GetITimer() override{ return m_env.pTimer; }
     AZ::IO::IArchive* GetIPak() override { return m_env.pCryPak; };
     IConsole* GetIConsole() override { return m_env.pConsole; };
     IRemoteConsole* GetIRemoteConsole() override;
@@ -234,15 +196,13 @@ public:
     ICryFont* GetICryFont() override{ return m_env.pCryFont; }
     ILog* GetILog() override{ return m_env.pLog; }
     ICmdLine* GetICmdLine() override{ return m_pCmdLine; }
-    IViewSystem* GetIViewSystem() override;
     ILevelSystem* GetILevelSystem() override;
     ISystemEventDispatcher* GetISystemEventDispatcher() override { return m_pSystemEventDispatcher; }
     //////////////////////////////////////////////////////////////////////////
     // retrieves the perlin noise singleton instance
     CPNoise3* GetNoiseGen() override;
-    uint64 GetUpdateCounter() override { return m_nUpdateCounter; };
 
-    void        DetectGameFolderAccessRights();
+    void DetectGameFolderAccessRights();
 
     void ExecuteCommandLine(bool deferred=true) override;
 
@@ -257,9 +217,6 @@ public:
 
     void IgnoreUpdates(bool bIgnore) override { m_bIgnoreUpdates = bIgnore; };
 
-    void SetIProcess(IProcess* process) override;
-    IProcess* GetIProcess() override{ return m_pProcess; }
-
     bool IsTestMode() const override { return m_bTestMode; }
     //@}
 
@@ -270,7 +227,7 @@ public:
     // Validator Warning.
     void WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args) override;
     void Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...) override;
-    int ShowMessage(const char* text, const char* caption, unsigned int uType) override;
+    void ShowMessage(const char* text, const char* caption, unsigned int uType) override;
     bool CheckLogVerbosity(int verbosity) override;
 
     //! Return pointer to user defined callback.
@@ -279,7 +236,6 @@ public:
     //////////////////////////////////////////////////////////////////////////
     void SaveConfiguration() override;
     void LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink = nullptr, bool warnIfMissing = true) override;
-    ESystemConfigSpec GetMaxConfigSpec() const override;
     ESystemConfigPlatform GetConfigPlatform() const override;
     void SetConfigPlatform(ESystemConfigPlatform platform) override;
     //////////////////////////////////////////////////////////////////////////
@@ -289,9 +245,6 @@ public:
     ILocalizationManager* GetLocalizationManager() override;
     void debug_GetCallStack(const char** pFunctions, int& nCount) override;
     void debug_LogCallStack(int nMaxFuncs = 32, int nFlags = 0) override;
-    // Get the current callstack in raw address form (more lightweight than the above functions)
-    // static as memReplay needs it before CSystem has been setup - expose a ISystem interface to this function if you need it outside CrySystem
-    static  void debug_GetCallStackRaw(void** callstack, uint32& callstackLength);
 
 public:
 #if !defined(RELEASE)
@@ -301,7 +254,6 @@ public:
 #if defined(WIN32)
     friend LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 #endif
-    void* GetRootWindowMessageHandler() override;
     void RegisterWindowMessageHandler(IWindowMessageHandler* pHandler) override;
     void UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler) override;
 
@@ -331,8 +283,6 @@ private:
     void CreateSystemVars();
     void CreateAudioVars();
 
-    void FreeLib(AZStd::unique_ptr<AZ::DynamicModuleHandle>& hLibModule);
-
     void QueryVersionInfo();
     void LogVersion();
     void LogBuildInfo();
@@ -342,7 +292,6 @@ private:
     static void SystemVersionChanged(ICVar* pCVar);
 #endif // #ifndef _RELEASE
 
-    bool ReLaunchMediaCenter();
     void UpdateAudioSystems();
 
     void AddCVarGroupDirectory(const AZStd::string& sPath) override;
@@ -358,14 +307,7 @@ public:
     void EnableFloatExceptions(int type);
 
     // interface ISystem -------------------------------------------
-    virtual IDataProbe* GetIDataProbe() { return m_pDataProbe; };
-    void SetForceNonDevMode(bool bValue) override;
-    bool GetForceNonDevMode() const override;
-    bool WasInDevMode() const override { return m_bWasInDevMode; };
-    bool IsDevMode() const override { return m_bInDevMode && !GetForceNonDevMode(); }
-
-    void SetConsoleDrawEnabled(bool enabled) override { m_bDrawConsole = enabled; }
-    void SetUIDrawEnabled(bool enabled) override { m_bDrawUI = enabled; }
+    bool IsDevMode() const override { return m_bInDevMode; }
 
     // -------------------------------------------------------------
 
@@ -374,58 +316,33 @@ public:
     ICVar* attachVariable (const char* szVarName, int* pContainer, const char* szComment, int dwFlags = 0);
 
     const CTimeValue& GetLastTickTime() const { return m_lastTickTime; }
-    const ICVar* GetDedicatedMaxRate() const { return m_svDedicatedMaxRate; }
-
-    std::shared_ptr<AZ::IO::FileIOBase> CreateLocalFileIO() override;
 
 private: // ------------------------------------------------------
 
     // System environment.
     SSystemGlobalEnvironment m_env;
 
-    CTimer                m_Time;                       //!<
-    bool                  m_bInitializedSuccessfully;   //!< true if the system completed all initialization steps
-    bool                  m_bRelaunch;                  //!< relaunching the app or not (true beforerelaunch)
-    int                   m_iLoadingMode;               //!< Game is loading w/o changing context (0 not, 1 quickloading, 2 full loading)
-    bool                  m_bTestMode;                    //!< If running in testing mode.
-    bool                  m_bEditor;                      //!< If running in Editor.
-    bool                  m_bNoCrashDialog;
-    bool                  m_bNoErrorReportWindow;
-    bool                  m_bPreviewMode;       //!< If running in Preview mode.
-    bool                  m_bDedicatedServer;     //!< If running as Dedicated server.
-    bool                  m_bIgnoreUpdates;           //!< When set to true will ignore Update and Render calls,
-    bool                  m_bForceNonDevMode;     //!< true when running on a cheat protected server or a client that is connected to it (not used in singlplayer)
-    bool                  m_bWasInDevMode;            //!< Set to true if was in dev mode.
-    bool                  m_bInDevMode;                   //!< Set to true if was in dev mode.
-    bool                  m_bGameFolderWritable;//!< True when verified that current game folder have write access.
-    int                   m_ttMemStatSS;              //!< Time to memstat screenshot
-    bool                  m_bDrawConsole;              //!< Set to true if OK to draw the console.
-    bool                  m_bDrawUI;                   //!< Set to true if OK to draw UI.
-
-    //! current active process
-    IProcess* m_pProcess;
-
-    CCamera m_PhysRendererCamera;
-    ICVar* m_p_draw_helpers_str;
-    int m_iJumpToPhysProfileEnt;
+    bool m_bInitializedSuccessfully; //!< true if the system completed all initialization steps
+    bool m_bRelaunch; //!< relaunching the app or not (true beforerelaunch)
+    int m_iLoadingMode; //!< Game is loading w/o changing context (0 not, 1 quickloading, 2 full loading)
+    bool m_bTestMode; //!< If running in testing mode.
+    bool m_bEditor; //!< If running in Editor.
+    bool m_bNoCrashDialog;
+    bool m_bNoErrorReportWindow;
+    bool m_bPreviewMode; //!< If running in Preview mode.
+    bool m_bDedicatedServer; //!< If running as Dedicated server.
+    bool m_bIgnoreUpdates; //!< When set to true will ignore Update and Render calls,
+    bool m_bInDevMode; //!< Set to true if was in dev mode.
+    bool m_bGameFolderWritable; //!< True when verified that current game folder have write access.
 
     CTimeValue m_lastTickTime;
 
     //! system event dispatcher
     ISystemEventDispatcher* m_pSystemEventDispatcher;
 
-    //! The default mono-spaced font for internal usage (profiling, debug info, etc.)
-    IFFont* m_pIFont;
-
-    //! The default font for end-user UI interfaces
-    IFFont* m_pIFontUi;
-
     //! System to manage levels.
     ILevelSystem* m_pLevelSystem;
 
-    //! System to manage views.
-    IViewSystem* m_pViewSystem;
-
     // XML Utils interface.
     class CXmlUtils* m_pXMLUtils;
 
@@ -441,12 +358,6 @@ private: // ------------------------------------------------------
     // System console variables.
     //////////////////////////////////////////////////////////////////////////
 
-    // DLL names
-    ICVar* m_sys_dll_response_system;
-#if !defined(_RELEASE)
-    ICVar* m_sys_resource_cache_folder;
-#endif
-
 #if AZ_LOADSCREENCOMPONENT_ENABLED
     ICVar* m_game_load_screen_uicanvas_path;
     ICVar* m_level_load_screen_uicanvas_path;
@@ -460,37 +371,9 @@ private: // ------------------------------------------------------
     ICVar* m_level_load_screen_minimum_time{};
 #endif // if AZ_LOADSCREENCOMPONENT_ENABLED
 
-    ICVar* m_sys_initpreloadpacks;
-    ICVar* m_sys_menupreloadpacks;
-
-    ICVar* m_cvAIUpdate;
-    ICVar* m_rWidth;
-    ICVar* m_rHeight;
-    ICVar* m_rWidthAndHeightAsFractionOfScreenSize;
-    ICVar* m_rTabletWidthAndHeightAsFractionOfScreenSize;
-    ICVar* m_rHDRDolby;
-    ICVar* m_rMaxWidth;
-    ICVar* m_rMaxHeight;
-    ICVar* m_rColorBits;
-    ICVar* m_rDepthBits;
-    ICVar* m_rStencilBits;
-    ICVar* m_rFullscreen;
-    ICVar* m_rFullscreenWindow;
-    ICVar* m_rFullscreenNativeRes;
-    ICVar* m_rDisplayInfo;
-    ICVar* m_rOverscanBordersDrawDebugView;
     ICVar* m_sysNoUpdate;
-    ICVar* m_cvEntitySuppressionLevel;
-    ICVar* m_pCVarQuit;
-    ICVar* m_cvMemStats;
-    ICVar* m_cvMemStatsThreshold;
-    ICVar* m_cvMemStatsMaxDepth;
-    ICVar* m_sysKeyboard;
-    ICVar* m_sysWarnings;                                       //!< might be 0, "sys_warnings" - Treat warning as errors.
-    ICVar* m_cvSSInfo;                                          //!< might be 0, "sys_SSInfo" 0/1 - get file sourcesafe info
     ICVar* m_svDedicatedMaxRate;
     ICVar* m_sys_firstlaunch;
-    ICVar* m_sys_asset_processor;
     ICVar* m_sys_load_files_to_memory;
 
 #if defined(AZ_RESTRICTED_PLATFORM)
@@ -500,13 +383,6 @@ private: // ------------------------------------------------------
 
     ICVar* m_sys_audio_disable;
 
-    ICVar* m_sys_min_step;
-    ICVar* m_sys_max_step;
-    ICVar* m_sys_enable_budgetmonitoring;
-    ICVar* m_sys_memory_debug;
-    ICVar* m_sys_preload;
-
-    //  ICVar *m_sys_filecache;
     ICVar* m_gpu_particle_physics;
 
     AZStd::string  m_sSavedRDriver;                                //!< to restore the driver when quitting the dedicated server
@@ -518,28 +394,20 @@ private: // ------------------------------------------------------
     SFileVersion m_fileVersion;
     SFileVersion m_productVersion;
     SFileVersion m_buildVersion;
-    IDataProbe* m_pDataProbe;
 
     class CLocalizedStringsManager* m_pLocalizationManager;
 
-    ESystemConfigSpec m_nServerConfigSpec;
-    ESystemConfigSpec m_nMaxConfigSpec;
     ESystemConfigPlatform m_ConfigPlatform;
 
     // Pause mode.
     bool m_bPaused;
     bool m_bNoUpdate;
 
-    uint64 m_nUpdateCounter;
-
     bool m_executedCommandLine = false;
 
     AZStd::unique_ptr<AzFramework::MissingAssetLogger> m_missingAssetLogger;
 
 public:
-    ICVar* m_sys_main_CPU;
-    ICVar* m_sys_streaming_CPU;
-    ICVar* m_sys_TaskThread_CPU[MAX_THREAD_POOL_INDEX];
 
     //////////////////////////////////////////////////////////////////////////
     // File version.
diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
index cd46fc8a04..e0986d3ec9 100644
--- a/Code/Legacy/CrySystem/SystemInit.cpp
+++ b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -78,7 +78,6 @@
 #include <ICmdLine.h>
 #include <IProcess.h>
 #include <LyShine/ILyShine.h>
-#include <HMDBus.h>
 
 #include <AzFramework/Archive/Archive.h>
 #include "XConsole.h"
@@ -88,7 +87,6 @@
 #include "SystemEventDispatcher.h"
 #include "LevelSystem/LevelSystem.h"
 #include "LevelSystem/SpawnableLevelSystem.h"
-#include "ViewSystem/ViewSystem.h"
 #include <CrySystemBus.h>
 #include <AzCore/Jobs/JobFunction.h>
 #include <AzCore/Jobs/JobManagerBus.h>
@@ -172,14 +170,6 @@ void CryEngineSignalHandler(int signal)
 extern HMODULE gDLLHandle;
 #endif
 
-namespace
-{
-#if defined(AZ_PLATFORM_WINDOWS)
-    // on windows, we lock our cache using a lockfile.  On other platforms this is not necessary since devices like ios, android, consoles cannot
-    // run more than one game process that uses the same folder anyway.
-    HANDLE g_cacheLock = INVALID_HANDLE_VALUE;
-#endif
-}
 
 //static int g_sysSpecChanged = false;
 
@@ -341,9 +331,6 @@ bool CSystem::InitFileSystem()
         m_pUserCallback->OnInitProgress("Initializing File System...");
     }
 
-    // get the DirectInstance FileIOBase which should be the AZ::LocalFileIO
-    m_env.pFileIO = AZ::IO::FileIOBase::GetDirectInstance();
-
     m_env.pCryPak = AZ::Interface<AZ::IO::IArchive>::Get();
     m_env.pFileIO = AZ::IO::FileIOBase::GetInstance();
     AZ_Assert(m_env.pCryPak, "CryPak has not been initialized on AZ::Interface");
@@ -367,33 +354,6 @@ bool CSystem::InitFileSystem()
 
 void CSystem::ShutdownFileSystem()
 {
-#if defined(AZ_PLATFORM_WINDOWS)
-    if (g_cacheLock != INVALID_HANDLE_VALUE)
-    {
-        CloseHandle(g_cacheLock);
-        g_cacheLock = INVALID_HANDLE_VALUE;
-    }
-#endif
-
-    using namespace AZ::IO;
-
-    FileIOBase* directInstance = FileIOBase::GetDirectInstance();
-    FileIOBase* pakInstance = FileIOBase::GetInstance();
-
-    if (directInstance == m_env.pFileIO)
-    {
-        // we only mess with file io if we own the instance that we installed.
-        // if we dont' own the instance, then we never configured fileIO and we should not alter it.
-        delete directInstance;
-        FileIOBase::SetDirectInstance(nullptr);
-
-        if (pakInstance != directInstance)
-        {
-            delete pakInstance;
-            FileIOBase::SetInstance(nullptr);
-        }
-    }
-
     m_env.pFileIO = nullptr;
 }
 
@@ -777,7 +737,17 @@ bool CSystem::Init(const SSystemInitParams& startupParams)
 
     m_pCmdLine = new CCmdLine(startupParams.szSystemCmdLine);
 
-    AZCoreLogSink::Connect();
+    // Init AZCoreLogSink. Don't suppress system output if we're running as an editor-server
+    bool suppressSystemOutput = true;
+    if (const ICmdLineArg* isEditorServerArg = m_pCmdLine->FindArg(eCLAT_Pre, "editorsv_isDedicated"))
+    {
+        bool editorsv_isDedicated = false;
+        if (isEditorServerArg->GetBoolValue(editorsv_isDedicated) && editorsv_isDedicated)
+        {
+            suppressSystemOutput = false;
+        }
+    }
+    AZCoreLogSink::Connect(suppressSystemOutput);
 
     // Registers all AZ Console Variables functors specified within CrySystem
     if (auto azConsole = AZ::Interface<AZ::IConsole>::Get(); azConsole)
@@ -1101,17 +1071,6 @@ AZ_POP_DISABLE_WARNING
                                                             AzFramework::SystemCursorState::ConstrainedAndHidden);
         }
 
-        //////////////////////////////////////////////////////////////////////////
-        // TIME
-        //////////////////////////////////////////////////////////////////////////
-        AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Time initialization");
-        if (!m_Time.Init())
-        {
-            AZ_Assert(false, "Failed to initialize CTimer instance.");
-            return false;
-        }
-        m_Time.ResetTimer();
-
         // CONSOLE
         //////////////////////////////////////////////////////////////////////////
         if (!InitConsole())
@@ -1146,12 +1105,6 @@ AZ_POP_DISABLE_WARNING
 
         InlineInitializationProcessing("CSystem::Init Level System");
 
-        //////////////////////////////////////////////////////////////////////////
-        // VIEW SYSTEM (must be created after m_pLevelSystem)
-        m_pViewSystem = new LegacyViewSystem::CViewSystem(this);
-
-        InlineInitializationProcessing("CSystem::Init View System");
-
         if (m_env.pLyShine)
         {
             m_env.pLyShine->PostInit();
@@ -1244,38 +1197,12 @@ static AZStd::string ConcatPath(const char* szPart1, const char* szPart2)
     return ret;
 }
 
-// Helper to maintain backwards compatibility with our CVar but not force our new code to
-// pull in CryCommon by routing through an environment variable
-void CmdSetAwsLogLevel(IConsoleCmdArgs* pArgs)
-{
-    static const char* const logLevelEnvVar = "sys_SetLogLevel";
-    static AZ::EnvironmentVariable<int> logVar = AZ::Environment::CreateVariable<int>(logLevelEnvVar);
-    if (pArgs->GetArgCount() > 1)
-    {
-        int logLevel = atoi(pArgs->GetArg(1));
-        *logVar = logLevel;
-        AZ_TracePrintf("AWSLogging", "Log level set to %d", *logVar);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CSystem::CreateSystemVars()
 {
     assert(gEnv);
     assert(gEnv->pConsole);
 
-    // Register DLL names as cvars before we load them
-    //
-    EVarFlags dllFlags = (EVarFlags)0;
-    m_sys_dll_response_system = REGISTER_STRING("sys_dll_response_system", 0, dllFlags,                 "Specifies the DLL to load for the dynamic response system");
-
-    m_sys_initpreloadpacks = REGISTER_STRING("sys_initpreloadpacks", "", 0,     "Specifies the paks for an engine initialization");
-    m_sys_menupreloadpacks = REGISTER_STRING("sys_menupreloadpacks", 0, 0,      "Specifies the paks for a main menu loading");
-
-#ifndef _RELEASE
-    m_sys_resource_cache_folder = REGISTER_STRING("sys_resource_cache_folder", "Editor\\ResourceCache", 0, "Folder for resource compiled locally. Managed by Sandbox.");
-#endif
-
 #if AZ_LOADSCREENCOMPONENT_ENABLED
     m_game_load_screen_uicanvas_path = REGISTER_STRING("game_load_screen_uicanvas_path", "", 0, "Game load screen UiCanvas path.");
     m_level_load_screen_uicanvas_path = REGISTER_STRING("level_load_screen_uicanvas_path", "", 0, "Level load screen UiCanvas path.");
@@ -1291,8 +1218,6 @@ void CSystem::CreateSystemVars()
 
     REGISTER_INT("cvDoVerboseWindowTitle", 0, VF_NULL, "");
 
-    m_pCVarQuit = REGISTER_INT("ExitOnQuit", 1, VF_NULL, "");
-
     // Register an AZ Console command to quit the engine.
     // The command is available even in Release builds.
     static AZ::ConsoleFunctor<void, false> s_functorQuit
@@ -1313,52 +1238,14 @@ void CSystem::CreateSystemVars()
     REGISTER_STRING_CB("sys_version", "", VF_CHEAT, "Override system file/product version", SystemVersionChanged);
 #endif // #ifndef _RELEASE
 
-    m_cvAIUpdate = REGISTER_INT("ai_NoUpdate", 0, VF_CHEAT, "Disables AI system update when 1");
-
-    m_cvMemStats = REGISTER_INT("MemStats", 0, 0,
-            "0/x=refresh rate in milliseconds\n"
-            "Use 1000 to switch on and 0 to switch off\n"
-            "Usage: MemStats [0..]");
-    m_cvMemStatsThreshold = REGISTER_INT ("MemStatsThreshold", 32000, VF_NULL, "");
-    m_cvMemStatsMaxDepth = REGISTER_INT("MemStatsMaxDepth", 4, VF_NULL, "");
-
-    attachVariable("sys_PakReadSlice", &g_cvars.archiveVars.nReadSlice, "If non-0, means number of kilobytes to use to read files in portions. Should only be used on Win9x kernels");
-
-    attachVariable("sys_PakInMemorySizeLimit", &g_cvars.archiveVars.nInMemoryPerPakSizeLimit, "Individual pak size limit for being loaded into memory (MB)");
-    attachVariable("sys_PakTotalInMemorySizeLimit", &g_cvars.archiveVars.nTotalInMemoryPakSizeLimit, "Total limit (in MB) for all in memory paks");
-    attachVariable("sys_PakLoadCache", &g_cvars.archiveVars.nLoadCache, "Load in memory paks from _LoadCache folder");
-    attachVariable("sys_PakLoadModePaks", &g_cvars.archiveVars.nLoadModePaks, "Load mode switching paks from modes folder");
-    attachVariable("sys_PakStreamCache", &g_cvars.archiveVars.nStreamCache, "Load in memory paks for faster streaming (cgf_cache.pak,dds_cache.pak)");
-    attachVariable("sys_PakSaveTotalResourceList", &g_cvars.archiveVars.nSaveTotalResourceList, "Save resource list");
     attachVariable("sys_PakSaveLevelResourceList", &g_cvars.archiveVars.nSaveLevelResourceList, "Save resource list when loading level");
-    attachVariable("sys_PakSaveFastLoadResourceList", &g_cvars.archiveVars.nSaveFastloadResourceList, "Save resource list during initial loading");
-    attachVariable("sys_PakSaveMenuCommonResourceList", &g_cvars.archiveVars.nSaveMenuCommonResourceList, "Save resource list during front end menu flow");
-    attachVariable("sys_PakMessageInvalidFileAccess", &g_cvars.archiveVars.nMessageInvalidFileAccess, "Message Box synchronous file access when in game");
     attachVariable("sys_PakLogInvalidFileAccess", &g_cvars.archiveVars.nLogInvalidFileAccess, "Log synchronous file access when in game");
-#ifndef _RELEASE
-    attachVariable("sys_PakLogAllFileAccess", &g_cvars.archiveVars.nLogAllFileAccess, "Log all file access allowing you to easily see whether a file has been loaded directly, or which pak file.");
-#endif
-    attachVariable("sys_PakValidateFileHash", &g_cvars.archiveVars.nValidateFileHashes, "Validate file hashes in pak files for collisions");
-    attachVariable("sys_UncachedStreamReads", &g_cvars.archiveVars.nUncachedStreamReads, "Enable stream reads via an uncached file handle");
-    attachVariable("sys_PakDisableNonLevelRelatedPaks", &g_cvars.archiveVars.nDisableNonLevelRelatedPaks, "Disables all paks that are not required by specific level; This is used with per level splitted assets.");
-    attachVariable("sys_PakWarnOnPakAccessFailures", &g_cvars.archiveVars.nWarnOnPakAccessFails, "If 1, access failure for Paks is treated as a warning, if zero it is only a log message.");
-
-    static const int fileSystemCaseSensitivityDefault = 0;
-    REGISTER_CVAR2("sys_FilesystemCaseSensitivity", &g_cvars.sys_FilesystemCaseSensitivity, fileSystemCaseSensitivityDefault, VF_NULL,
-        "0 - CryPak lowercases all input file names\n"
-        "1 - CryPak preserves file name casing\n"
-        "Default is 1");
 
     m_sysNoUpdate = REGISTER_INT("sys_noupdate", 0, VF_CHEAT,
             "Toggles updating of system with sys_script_debugger.\n"
             "Usage: sys_noupdate [0/1]\n"
             "Default is 0 (system updates during debug).");
 
-    m_sysWarnings = REGISTER_INT("sys_warnings", 0, 0,
-            "Toggles printing system warnings.\n"
-            "Usage: sys_warnings [0/1]\n"
-            "Default is 0 (off).");
-
 #if defined(_RELEASE) && defined(CONSOLE) && !defined(ENABLE_LW_PROFILERS)
     enum
     {
@@ -1370,10 +1257,6 @@ void CSystem::CreateSystemVars()
         e_sysKeyboardDefault = 1
     };
 #endif
-    m_sysKeyboard = REGISTER_INT("sys_keyboard", e_sysKeyboardDefault, 0,
-            "Enables keyboard.\n"
-            "Usage: sys_keyboard [0/1]\n"
-            "Default is 1 (on).");
 
     m_svDedicatedMaxRate = REGISTER_FLOAT("sv_DedicatedMaxRate", 30.0f, 0,
             "Sets the maximum update rate when running as a dedicated server.\n"
@@ -1389,55 +1272,14 @@ void CSystem::CreateSystemVars()
         "Usage: sv_DedicatedCPUVariance [5..50]\n"
         "Default is 10.");
 
-    m_cvSSInfo =  REGISTER_INT("sys_SSInfo", 0, 0,
-            "Show SourceSafe information (Name,Comment,Date) for file errors."
-            "Usage: sys_SSInfo [0/1]\n"
-            "Default is 0 (off)");
-
-    m_cvEntitySuppressionLevel = REGISTER_INT("e_EntitySuppressionLevel", 0, 0,
-            "Defines the level at which entities are spawned.\n"
-            "Entities marked with lower level will not be spawned - 0 means no level.\n"
-            "Usage: e_EntitySuppressionLevel [0-infinity]\n"
-            "Default is 0 (off)");
-
     m_sys_firstlaunch = REGISTER_INT("sys_firstlaunch", 0, 0,
             "Indicates that the game was run for the first time.");
 
-    m_sys_main_CPU = REGISTER_INT("sys_main_CPU", 0, 0,
-            "Specifies the physical CPU index main will run on");
-
-    m_sys_TaskThread_CPU[0] = REGISTER_INT("sys_TaskThread0_CPU", 3, 0,
-            "Specifies the physical CPU index taskthread0 will run on");
-
-    m_sys_TaskThread_CPU[1] = REGISTER_INT("sys_TaskThread1_CPU", 5, 0,
-            "Specifies the physical CPU index taskthread1 will run on");
-
-    m_sys_TaskThread_CPU[2] = REGISTER_INT("sys_TaskThread2_CPU", 4, 0,
-            "Specifies the physical CPU index taskthread2 will run on");
-
-    m_sys_TaskThread_CPU[3] = REGISTER_INT("sys_TaskThread3_CPU", 3, 0,
-            "Specifies the physical CPU index taskthread3 will run on");
-
-    m_sys_TaskThread_CPU[4] = REGISTER_INT("sys_TaskThread4_CPU", 2, 0,
-            "Specifies the physical CPU index taskthread4 will run on");
-
-    m_sys_TaskThread_CPU[5] = REGISTER_INT("sys_TaskThread5_CPU", 1, 0,
-            "Specifies the physical CPU index taskthread5 will run on");
-
 #if defined(AZ_RESTRICTED_PLATFORM)
 #define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_12
 #include AZ_RESTRICTED_FILE(SystemInit_cpp)
 #endif
 
-    m_sys_min_step = REGISTER_FLOAT("sys_min_step", 0.01f, 0,
-            "Specifies the minimum physics step in a separate thread");
-    m_sys_max_step = REGISTER_FLOAT("sys_max_step", 0.05f, 0,
-            "Specifies the maximum physics step in a separate thread");
-
-    // used in define MEMORY_DEBUG_POINT()
-    m_sys_memory_debug = REGISTER_INT("sys_memory_debug", 0, VF_CHEAT,
-            "Enables to activate low memory situation is specific places in the code (argument defines which place), 0=off");
-
 #if defined(AZ_RESTRICTED_PLATFORM)
 #define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_17
 #include AZ_RESTRICTED_FILE(SystemInit_cpp)
@@ -1448,40 +1290,7 @@ void CSystem::CreateSystemVars()
 #   define SYS_STREAMING_CPU_DEFAULT_VALUE 1
 #   define SYS_STREAMING_CPU_WORKER_DEFAULT_VALUE 5
 #endif
-    REGISTER_CVAR2("sys_streaming_CPU", &g_cvars.sys_streaming_cpu, SYS_STREAMING_CPU_DEFAULT_VALUE, VF_NULL, "Specifies the physical CPU file IO thread run on");
-    REGISTER_CVAR2("sys_streaming_CPU_worker", &g_cvars.sys_streaming_cpu_worker, SYS_STREAMING_CPU_WORKER_DEFAULT_VALUE, VF_NULL, "Specifies the physical CPU file IO worker thread/s run on");
-    REGISTER_CVAR2("sys_streaming_memory_budget", &g_cvars.sys_streaming_memory_budget, 10 * 1024, VF_NULL, "Temp memory streaming system can use in KB");
-    REGISTER_CVAR2("sys_streaming_max_finalize_per_frame", &g_cvars.sys_streaming_max_finalize_per_frame, 0, VF_NULL,
-        "Maximum stream finalizing calls per frame to reduce the CPU impact on main thread (0 to disable)");
-    REGISTER_CVAR2("sys_streaming_max_bandwidth", &g_cvars.sys_streaming_max_bandwidth, 0, VF_NULL, "Enables capping of max streaming bandwidth in MB/s");
-    REGISTER_CVAR2("sys_streaming_debug", &g_cvars.sys_streaming_debug, 0, VF_NULL, "Enable streaming debug information\n"
-        "0=off\n"
-        "1=Streaming Stats\n"
-        "2=File IO\n"
-        "3=Request Order\n"
-        "4=Write to Log\n"
-        "5=Stats per extension\n"
-        );
-    REGISTER_CVAR2("sys_streaming_requests_grouping_time_period", &g_cvars.sys_streaming_requests_grouping_time_period, 2, VF_NULL, // Vlad: 2 works better than 4 visually, should be be re-tested when streaming pak's activated
-        "Streaming requests are grouped by request time and then sorted by disk offset");
-    REGISTER_CVAR2("sys_streaming_debug_filter", &g_cvars.sys_streaming_debug_filter, 0, VF_NULL, "Set streaming debug information filter.\n"
-        "0=all\n"
-        "1=Texture\n"
-        "2=Geometry\n"
-        "3=Terrain\n"
-        "4=Animation\n"
-        "5=Music\n"
-        "6=Sound\n"
-        "7=Shader\n"
-        );
-    g_cvars.sys_streaming_debug_filter_file_name = REGISTER_STRING("sys_streaming_debug_filter_file_name", "", VF_CHEAT,
-            "Set streaming debug information filter");
-    REGISTER_CVAR2("sys_streaming_debug_filter_min_time", &g_cvars.sys_streaming_debug_filter_min_time, 0.f, VF_NULL, "Show only slow items.");
-    REGISTER_CVAR2("sys_streaming_resetstats", &g_cvars.sys_streaming_resetstats, 0, VF_NULL,
-        "Reset all the streaming stats");
 #define DEFAULT_USE_OPTICAL_DRIVE_THREAD (gEnv->IsDedicated() ? 0 : 1)
-    REGISTER_CVAR2("sys_streaming_use_optical_drive_thread", &g_cvars.sys_streaming_use_optical_drive_thread, DEFAULT_USE_OPTICAL_DRIVE_THREAD, VF_NULL,
-        "Allow usage of an extra optical drive thread for faster streaming from 2 medias");
 
     const char* localizeFolder = "Localization";
     g_cvars.sys_localization_folder = REGISTER_STRING_CB("sys_localization_folder", localizeFolder, VF_NULL,
@@ -1491,9 +1300,6 @@ void CSystem::CreateSystemVars()
             "Default: Localization\n",
             CSystem::OnLocalizationFolderCVarChanged);
 
-    REGISTER_CVAR2("sys_streaming_in_blocks", &g_cvars.sys_streaming_in_blocks, 1, VF_NULL,
-        "Streaming of large files happens in blocks");
-
 #if (defined(WIN32) || defined(WIN64)) && defined(_DEBUG)
     REGISTER_CVAR2("sys_float_exceptions", &g_cvars.sys_float_exceptions, 2, 0, "Use or not use floating point exceptions.");
 #else // Float exceptions by default disabled for console builds.
@@ -1512,11 +1318,6 @@ void CSystem::CreateSystemVars()
     REGISTER_CVAR2("sys_WER", &g_cvars.sys_WER, 0, 0, "Enables Windows Error Reporting");
 #endif
 
-#ifdef USE_HTTP_WEBSOCKETS
-    REGISTER_CVAR2("sys_simple_http_base_port", &g_cvars.sys_simple_http_base_port, 1880, VF_REQUIRE_APP_RESTART,
-        "sets the base port for the simple http server to run on, defaults to 1880");
-#endif
-
     const int DEFAULT_DUMP_TYPE = 2;
 
     REGISTER_CVAR2("sys_dump_type", &g_cvars.sys_dump_type, DEFAULT_DUMP_TYPE, VF_NULL,
@@ -1528,8 +1329,6 @@ void CSystem::CreateSystemVars()
         );
     REGISTER_CVAR2("sys_dump_aux_threads", &g_cvars.sys_dump_aux_threads, 1, VF_NULL, "Dumps callstacks of other threads in case of a crash");
 
-    REGISTER_CVAR2("sys_limit_phys_thread_count", &g_cvars.sys_limit_phys_thread_count, 1, VF_NULL, "Limits p_num_threads to physical CPU count - 1");
-
 #if (defined(WIN32) || defined(WIN64)) && defined(_RELEASE)
     const int DEFAULT_SYS_MAX_FPS = 0;
 #else
@@ -1541,11 +1340,8 @@ void CSystem::CreateSystemVars()
 
     REGISTER_CVAR2("sys_maxTimeStepForMovieSystem", &g_cvars.sys_maxTimeStepForMovieSystem, 0.1f, VF_NULL, "Caps the time step for the movie system so that a cut-scene won't be jumped in the case of an extreme stall.");
 
-    REGISTER_CVAR2("sys_force_installtohdd_mode", &g_cvars.sys_force_installtohdd_mode, 0, VF_NULL, "Forces install to HDD mode even when doing DVD emulation");
-
     REGISTER_CVAR2("sys_report_files_not_found_in_paks", &g_cvars.sys_report_files_not_found_in_paks, 0, VF_NULL, "Reports when files are searched for in paks and not found. 1 = log, 2 = warning, 3 = error");
 
-    m_sys_preload = REGISTER_INT("sys_preload", 0, 0, "Preload Game Resources");
     REGISTER_COMMAND("sys_crashtest", CmdCrashTest, VF_CHEAT, "Make the game crash\n"
         "0=off\n"
         "1=null pointer exception\n"
@@ -1584,20 +1380,11 @@ void CSystem::CreateSystemVars()
             "To speed up loading from non HD media\n"
             "0=off / 1=enabled");
     */
-    REGISTER_CVAR2("sys_AI", &g_cvars.sys_ai, 1, 0, "Enables AI Update");
-    REGISTER_CVAR2("sys_entities", &g_cvars.sys_entitysystem, 1, 0, "Enables Entities Update");
     REGISTER_CVAR2("sys_trackview", &g_cvars.sys_trackview, 1, 0, "Enables TrackView Update");
 
     //Defines selected language.
     REGISTER_STRING_CB("g_language", "", VF_NULL, "Defines which language pak is loaded", CSystem::OnLanguageCVarChanged);
 
-#if defined(WIN32)
-    REGISTER_CVAR2("sys_display_threads", &g_cvars.sys_display_threads, 0, 0, "Displays Thread info");
-#elif defined(AZ_RESTRICTED_PLATFORM)
-#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_13
-#include AZ_RESTRICTED_FILE(SystemInit_cpp)
-#endif
-
     // adding CVAR to toggle assert verbosity level
     const int defaultAssertValue = 1;
     REGISTER_CVAR2_CB("sys_asserts", &g_cvars.sys_asserts, defaultAssertValue, VF_CHEAT,
@@ -1620,8 +1407,6 @@ void CSystem::CreateSystemVars()
     // Since the UI Canvas Editor is incomplete, we have a variable to enable it.
     // By default it is now enabled. Modify system.cfg or game.cfg to disable it
     REGISTER_INT("sys_enableCanvasEditor", 1, VF_NULL, "Enables the UI Canvas Editor");
-
-    REGISTER_COMMAND("sys_SetLogLevel", CmdSetAwsLogLevel, 0, "Set AWS log level [0 - 6].");
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Legacy/CrySystem/SystemWin32.cpp b/Code/Legacy/CrySystem/SystemWin32.cpp
index 2303ff286e..270cbbcb9f 100644
--- a/Code/Legacy/CrySystem/SystemWin32.cpp
+++ b/Code/Legacy/CrySystem/SystemWin32.cpp
@@ -383,45 +383,6 @@ void CSystem::debug_LogCallStack(int nMaxFuncs, [[maybe_unused]] int nFlags)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-// Support relaunching for windows media center edition.
-//////////////////////////////////////////////////////////////////////////
-#if defined(WIN32)
-#if (_WIN32_WINNT < 0x0501)
-#define SM_MEDIACENTER          87
-#endif
-bool CSystem::ReLaunchMediaCenter()
-{
-    // Skip if not running on a Media Center
-    if (GetSystemMetrics(SM_MEDIACENTER) == 0)
-    {
-        return false;
-    }
-
-    // Get the path to Media Center
-    wchar_t szExpandedPath[AZ_MAX_PATH_LEN];
-    if (!ExpandEnvironmentStringsW(L"%SystemRoot%\\ehome\\ehshell.exe", szExpandedPath, AZ_MAX_PATH_LEN))
-    {
-        return false;
-    }
-
-    // Skip if ehshell.exe doesn't exist
-    if (GetFileAttributesW(szExpandedPath) == 0xFFFFFFFF)
-    {
-        return false;
-    }
-
-    // Launch ehshell.exe
-    INT_PTR result = (INT_PTR)ShellExecuteW(NULL, TEXT("open"), szExpandedPath, NULL, NULL, SW_SHOWNORMAL);
-    return (result > 32);
-}
-#else
-bool CSystem::ReLaunchMediaCenter()
-{
-    return false;
-}
-#endif //defined(WIN32)
-
 #if (defined(WIN32) || defined(WIN64))
 //////////////////////////////////////////////////////////////////////////
 bool CSystem::GetWinGameFolder(char* szMyDocumentsPath, int maxPathSize)
diff --git a/Code/Legacy/CrySystem/Timer.cpp b/Code/Legacy/CrySystem/Timer.cpp
deleted file mode 100644
index 1e1b6859e1..0000000000
--- a/Code/Legacy/CrySystem/Timer.cpp
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-#include "Timer.h"
-#include <time.h>
-#include <ISystem.h>
-#include <IConsole.h>
-#include <ILog.h>
-#include <ISerialize.h>
-/////////////////////////////////////////////////////
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-#include "Mmsystem.h"
-#endif
-
-//#define PROFILING 1
-#ifdef PROFILING
-static int64 g_lCurrentTime = 0;
-#endif
-
-//! Profile smoothing time in seconds (original default was .8 / log(10) ~= .35 s)
-static const float fDEFAULT_PROFILE_SMOOTHING = 1.0f;
-
-
-
-#define DEFAULT_FRAME_SMOOTHING 1
-
-/////////////////////////////////////////////////////
-CTimer::CTimer()
-{
-    // Default CVar values
-    m_fixed_time_step = 0;
-    m_max_time_step = 0.25f;
-    m_cvar_time_scale = 1.0f;
-    m_TimeSmoothing = DEFAULT_FRAME_SMOOTHING; // note: frame numbers (old version - commented out) are not used but is based on time
-    m_TimeDebug = 0;
-
-    m_profile_smooth_time = fDEFAULT_PROFILE_SMOOTHING;
-    m_profile_weighting = 1;
-
-    // Persistant state
-    m_bEnabled = true;
-    //m_fixedTimeModeEnabled = false;
-    m_nFrameCounter = 0;
-
-    m_lTicksPerSec = CryGetTicksPerSec();
-    m_fSecsPerTick = 1.0 / m_lTicksPerSec;
-
-    m_fAverageFrameTime = 1.0f / 30.0f;
-    for (int i = 0; i < MAX_FRAME_AVERAGE; i++)
-    {
-        m_arrFrameTimes[i] = m_fAverageFrameTime;
-    }
-
-    m_fAvgFrameTime = 0.0f;
-    m_fProfileBlend = 1.0f;
-    m_fSmoothTime = 0;
-
-    m_totalTimeScale = 1.0f;
-    ClearTimeScales();
-
-    ResetTimer();
-}
-
-/////////////////////////////////////////////////////
-bool CTimer::Init()
-{
-    // if game code was accessing them by name there was something wrong anyway
-
-    REGISTER_CVAR2("t_Smoothing", &m_TimeSmoothing, DEFAULT_FRAME_SMOOTHING, 0,
-        "time smoothing\n"
-        "0=off, 1=on");
-
-    REGISTER_CVAR2("t_FixedStep", &m_fixed_time_step, 0, VF_NET_SYNCED | VF_DEV_ONLY,
-        "Game updated with this fixed frame time\n"
-        "0=off, number specifies the frame time in seconds\n"
-        "e.g. 0.033333(30 fps), 0.1(10 fps), 0.01(100 fps)");
-
-    REGISTER_CVAR2("t_MaxStep", &m_max_time_step, 0.25f, 0,
-        "Game systems clamped to this frame time");
-
-    // todo: reconsider exposing that as cvar (negative time, same value is used by Trackview, better would be another value multipled with the internal one)
-    REGISTER_CVAR2("t_Scale", &m_cvar_time_scale, 1.0f, VF_NET_SYNCED | VF_DEV_ONLY,
-        "Game time scaled by this - for variable slow motion");
-
-    REGISTER_CVAR2("t_Debug", &m_TimeDebug, 0, 0, "Timer debug: 0 = off, 1 = events, 2 = verbose");
-
-    // -----------------
-
-    REGISTER_CVAR2("profile_smooth", &m_profile_smooth_time, fDEFAULT_PROFILE_SMOOTHING, 0,
-        "Profiler exponential smoothing interval (seconds)");
-
-    REGISTER_CVAR2("profile_weighting", &m_profile_weighting, 1, 0,
-        "Profiler smoothing mode: 0 = legacy, 1 = average, 2 = peak weighted, 3 = peak hold");
-
-    return true;
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetFrameTime(ETimer which) const
-{
-    float result = 0.0f;
-    if (m_bEnabled)
-    {
-        if (which != ETIMER_GAME || !m_bGameTimerPaused)
-        {
-            if (which == ETIMER_UI)
-            {
-                result = m_fRealFrameTime;
-            }
-            else
-            {
-                result = m_fFrameTime;
-            }
-        }
-    }
-    return result;
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetCurrTime(ETimer which) const
-{
-    assert(which >= 0 && which < ETIMER_LAST && "Bad timer index");
-    return m_CurrTime[which].GetSeconds();
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetRealFrameTime() const
-{
-    return m_bEnabled ? m_fRealFrameTime : 0.0f;
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetTimeScale() const
-{
-    return m_cvar_time_scale * m_totalTimeScale;
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetTimeScale(uint32 channel) const
-{
-    assert(channel < NUM_TIME_SCALE_CHANNELS);
-    if (channel >= NUM_TIME_SCALE_CHANNELS)
-    {
-        return GetTimeScale();
-    }
-    return m_cvar_time_scale * m_timeScaleChannels[channel];
-}
-
-/////////////////////////////////////////////////////
-void CTimer::SetTimeScale(float scale, uint32 channel /* = 0 */)
-{
-    assert(channel < NUM_TIME_SCALE_CHANNELS);
-    if (channel >= NUM_TIME_SCALE_CHANNELS)
-    {
-        return;
-    }
-
-    const float currentScale = m_timeScaleChannels[channel];
-
-    if (scale != currentScale)
-    {
-        // Need to adjust previous frame times for time scale to have immediate effect
-        const float adjustFactor = scale / currentScale;
-        for (uint32 i = 0; i < MAX_FRAME_AVERAGE; ++i)
-        {
-            m_arrFrameTimes[i] *= adjustFactor;
-        }
-
-        // Update total time scale immediately
-        m_totalTimeScale *= adjustFactor;
-    }
-
-    m_timeScaleChannels[channel] = scale;
-}
-
-/////////////////////////////////////////////////////
-void CTimer::ClearTimeScales()
-{
-    if (m_totalTimeScale != 1.0f)
-    {
-        // Need to adjust previous frame times for time scale to have immediate effect
-        const float adjustFactor = 1.0f / m_totalTimeScale;
-        for (uint32 i = 0; i < MAX_FRAME_AVERAGE; ++i)
-        {
-            m_arrFrameTimes[i] *= adjustFactor;
-        }
-    }
-
-    for (int i = 0; i < NUM_TIME_SCALE_CHANNELS; ++i)
-    {
-        m_timeScaleChannels[i] = 1.0f;
-    }
-    m_totalTimeScale = 1.0f;
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetAsyncCurTime()
-{
-    //int64 llNow = CryGetTicks() - m_lBaseTime_Async;
-    int64 llNow = CryGetTicks() - m_lBaseTime;
-    return TicksToSeconds(llNow);
-}
-
-/////////////////////////////////////////////////////
-float CTimer::GetFrameRate()
-{
-    // Use real frame time.
-    if (m_fRealFrameTime != 0.f)
-    {
-        return 1.f / m_fRealFrameTime;
-    }
-    return 0.f;
-}
-
-void CTimer::UpdateBlending()
-{
-    // Accumulate smoothing time up to specified max.
-    float fFrameTime = m_fRealFrameTime;
-    m_fSmoothTime = min(m_fSmoothTime + fFrameTime, m_profile_smooth_time);
-
-    if (m_fSmoothTime <= fFrameTime)
-    {
-        m_fAvgFrameTime = fFrameTime;
-        m_fProfileBlend = 1.f;
-        return;
-    }
-
-    if (m_profile_weighting <= 2)
-    {
-        // Update average frame time.
-        if (m_fSmoothTime < m_fAvgFrameTime)
-        {
-            m_fAvgFrameTime = m_fSmoothTime;
-        }
-        m_fAvgFrameTime *= m_fSmoothTime / (m_fSmoothTime - fFrameTime + m_fAvgFrameTime);
-
-        if (m_profile_weighting == 1)
-        {
-            // Weight all frames equally.
-            m_fProfileBlend = m_fAvgFrameTime / m_fSmoothTime;
-        }
-        else
-        {
-            // Weight frames by time.
-            m_fProfileBlend = fFrameTime / m_fSmoothTime;
-        }
-    }
-    else
-    {
-        // Decay avg frame time, set as new peak.
-        m_fAvgFrameTime *= 1.f - fFrameTime / m_fSmoothTime;
-        if (fFrameTime > m_fAvgFrameTime)
-        {
-            m_fAvgFrameTime = fFrameTime;
-            m_fProfileBlend = 1.f;
-        }
-        else
-        {
-            m_fProfileBlend = 0.f;
-        }
-    }
-}
-
-float CTimer::GetProfileFrameBlending(float* pfBlendTime, int* piBlendMode)
-{
-    if (piBlendMode)
-    {
-        *piBlendMode = m_profile_weighting;
-    }
-    if (pfBlendTime)
-    {
-        *pfBlendTime = m_fSmoothTime;
-    }
-    return m_fProfileBlend;
-}
-
-/////////////////////////////////////////////////////
-void CTimer::RefreshGameTime(int64 curTime)
-{
-    assert(curTime + m_lOffsetTime >= 0);
-    m_CurrTime[ETIMER_GAME].SetSeconds(TicksToSeconds(curTime + m_lOffsetTime));
-}
-
-/////////////////////////////////////////////////////
-void CTimer::RefreshUITime(int64 curTime)
-{
-    assert(curTime >= 0);
-    m_CurrTime[ETIMER_UI].SetSeconds(TicksToSeconds(curTime));
-}
-
-
-/////////////////////////////////////////////////////
-void CTimer::UpdateOnFrameStart()
-{
-    if (!m_bEnabled)
-    {
-        return;
-    }
-
-    //int64 now;
-
-    //if (m_fixedTimeModeEnabled)
-    //{
-    //    m_nFrameCounter++;
-    //    m_fRealFrameTime = m_fFrameTime = m_fixedTimeModeStep;
-    //    m_lCurrentTime += m_fixedTimeModeStep*m_lTicksPerSec;
-    //    now = m_lCurrentTime;
-    //}
-    //else
-    //{
-    // On Windows before Vista, frequency can change (even though it should be impossible),
-    // See also: https://msdn.microsoft.com/en-us/library/windows/desktop/dn553408(v=vs.85).aspx
-    // Win2000, WinXP: Uses RDTSC, which may not be monotonic across all cores (a bug), costs in the order of 10~100 cycles (cheap).
-    // WinVista: Uses HPET or ACPI timer (a kernel call, and much more expensive than RDTSC, but it's not bugged).
-    // Win7+: RDTSC if the CPU feature bit for monotonic is set, HPET or ACPI otherwise (not bugged).
-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
-    if ((m_nFrameCounter & 127) == 0)
-    {
-        // every bunch of frames, check frequency to adapt to
-        // CPU power management clock rate changes
-        LARGE_INTEGER TTicksPerSec;
-        if (QueryPerformanceFrequency(&TTicksPerSec))
-        {
-            // if returns false, no performance counter is available
-            m_lTicksPerSec = TTicksPerSec.QuadPart;
-            m_fSecsPerTick = 1.0 / m_lTicksPerSec;
-        }
-    }
-
-    m_nFrameCounter++;
-#endif
-    //}
-
-#ifdef PROFILING
-    m_fRealFrameTime = m_fFrameTime = 0.020f; // 20ms = 50fps
-    g_lCurrentTime += (int)(m_fFrameTime * (float)(CTimeValue::TIMEVALUE_PRECISION));
-    m_lLastTime = g_lCurrentTime;
-    RefreshGameTime(m_lLastTime);
-    RefreshUITime(m_lLastTime);
-    return;
-#endif
-
-    if (m_fixed_time_step < 0.0f)
-    {
-        // Enforce real framerate by sleeping.
-        const int64 elapsedTicks = CryGetTicks() - m_lBaseTime - m_lLastTime;
-        const int64 minTicks = SecondsToTicks(-m_fixed_time_step);
-        if (elapsedTicks < minTicks)
-        {
-            const int64 ms = (minTicks - elapsedTicks) * 1000 / m_lTicksPerSec;
-            CrySleep((unsigned int)ms);
-        }
-    }
-
-    const int64 now = CryGetTicks();
-    assert(now + 1 >= m_lBaseTime && "Invalid base time"); //+1 margin because QPC may be one off across cores
-
-    m_fRealFrameTime = TicksToSeconds(now - m_lBaseTime - m_lLastTime);
-
-    if (0.0f != m_fixed_time_step)
-    {
-        // Apply fixed_time_step
-        m_fFrameTime = abs(m_fixed_time_step);
-    }
-    else
-    {
-        // Clamp to max_time_step
-        m_fFrameTime = min(m_fRealFrameTime, m_max_time_step);
-    }
-
-    // Dilate time.
-    m_fFrameTime *= GetTimeScale();
-
-    if (m_TimeSmoothing > 0)
-    {
-        m_fFrameTime = GetAverageFrameTime();
-    }
-
-    // Time can only go forward.
-    if (m_fFrameTime < 0.0f)
-    {
-        m_fFrameTime = 0.0f;
-    }
-    if (m_fRealFrameTime < 0.0f)
-    {
-        m_fRealFrameTime = 0.0;
-    }
-
-    // Adjust the base time so that time actually seems to have moved forward m_fFrameTime
-    const int64 frameTicks = SecondsToTicks(m_fFrameTime);
-    const int64 realTicks = SecondsToTicks(m_fRealFrameTime);
-    m_lBaseTime += realTicks - frameTicks;
-    if (m_lBaseTime > now)
-    {
-        // Guard against rounding errors due to float <-> int64 precision
-        assert(m_lBaseTime - now <= 10 && "Bad base time or adjustment, too much difference for a rounding error");
-        m_lBaseTime = now;
-    }
-    const int64 currentTime = now - m_lBaseTime;
-
-    assert(fabsf(TicksToSeconds(currentTime - m_lLastTime) - m_fFrameTime) < 0.01f && "Bad calculation");
-    assert(currentTime >= m_lLastTime && "Bad adjustment in previous frame");
-    assert(currentTime + m_lOffsetTime >= 0 && "Sum of game time is negative");
-
-    // Update timers
-    RefreshUITime(currentTime);
-    if (!m_bGameTimerPaused)
-    {
-        RefreshGameTime(currentTime);
-    }
-
-    m_lLastTime = currentTime;
-
-    UpdateBlending();
-
-    if (m_TimeDebug > 1)
-    {
-        CryLogAlways("[CTimer]: Cur=%lld Now=%lld Off=%lld Async=%f CurrTime=%f UI=%f", (long long)currentTime, (long long)now, (long long)m_lOffsetTime, GetAsyncCurTime(), GetCurrTime(ETIMER_GAME), GetCurrTime(ETIMER_UI));
-    }
-}
-
-//------------------------------------------------------------------------
-//--  average frame-times to avoid stalls and peaks in framerate
-//--    note that is is time-base averaging and not frame-based
-//------------------------------------------------------------------------
-float CTimer::GetAverageFrameTime()
-{
-    f32 LastAverageFrameTime = m_fAverageFrameTime;
-    f32 FrameTime = m_fFrameTime;
-
-    uint32 numFT = MAX_FRAME_AVERAGE;
-    for (int32 i = (numFT - 2); i > -1; i--)
-    {
-        m_arrFrameTimes[i + 1] = m_arrFrameTimes[i];
-    }
-
-    if (FrameTime > 0.4f)
-    {
-        FrameTime = 0.4f;
-    }
-    if (FrameTime < 0.0f)
-    {
-        FrameTime = 0.0f;
-    }
-    m_arrFrameTimes[0] = FrameTime;
-
-    //get smoothed frame
-    uint32 avrg_ftime = 1;
-    if (LastAverageFrameTime)
-    {
-        avrg_ftime = uint32(0.25f / LastAverageFrameTime + 0.5f); //average the frame-times for a certain time-period (sec)
-        if (avrg_ftime > numFT)
-        {
-            avrg_ftime = numFT;
-        }
-        if (avrg_ftime < 1)
-        {
-            avrg_ftime = 1;
-        }
-    }
-
-    f32 AverageFrameTime = 0;
-    for (uint32 i = 0; i < avrg_ftime; i++)
-    {
-        AverageFrameTime += m_arrFrameTimes[i];
-    }
-    AverageFrameTime /= avrg_ftime;
-
-    //don't smooth if we pause the game
-    if (FrameTime < 0.0001f)
-    {
-        AverageFrameTime = FrameTime;
-    }
-
-    m_fAverageFrameTime = AverageFrameTime;
-    return AverageFrameTime;
-}
-
-
-/////////////////////////////////////////////////////
-void CTimer::ResetTimer()
-{
-    m_lBaseTime = CryGetTicks();
-    //m_lBaseTime_Async = CryGetTicks();
-    m_lLastTime = 0;
-    m_lOffsetTime = 0;
-
-    m_fFrameTime = 0.0f;
-    m_fRealFrameTime = 0.0f;
-
-    RefreshGameTime(0);
-    RefreshUITime(0);
-
-    m_bGameTimerPaused = false;
-    m_lGameTimerPausedTime = 0;
-}
-
-/////////////////////////////////////////////////////
-void CTimer::EnableTimer(bool bEnable)
-{
-    m_bEnabled = bEnable;
-}
-
-bool CTimer::IsTimerEnabled() const
-{
-    return m_bEnabled;
-}
-
-/////////////////////////////////////////////////////
-CTimeValue CTimer::GetAsyncTime() const
-{
-    int64 llNow = CryGetTicks();
-    double fConvert = CTimeValue::TIMEVALUE_PRECISION * m_fSecsPerTick;
-    return CTimeValue(int64(llNow * fConvert));
-}
-
-/////////////////////////////////////////////////////
-void CTimer::Serialize(TSerialize ser)
-{
-    // cannot change m_lBaseTime, as this is used for async time (which shouldn't be affected by save games)
-    if (ser.IsWriting())
-    {
-        int64 currentGameTime = m_lLastTime + m_lOffsetTime;
-
-        ser.Value("curTime", currentGameTime);
-        ser.Value("ticksPerSecond", m_lTicksPerSec);
-    }
-    else
-    {
-        int64 ticksPerSecond = 1, curTime = 1;
-        ser.Value("curTime", curTime);
-        ser.Value("ticksPerSecond", ticksPerSecond);
-
-        // Adjust curTime for ticksPerSecond on this machine.
-        // Some precision will be lost if the frequencies are not identical.
-        const double multiplier = (double)m_lTicksPerSec / (double)ticksPerSecond;
-        curTime = (int64)((double)curTime * multiplier);
-
-        SetOffsetToMatchGameTime(curTime);
-
-        if (m_TimeDebug)
-        {
-            [[maybe_unused]] const int64 now = CryGetTicks();
-            CryLogAlways("[CTimer]: Serialize: Last=%lld Now=%lld Off=%lld Async=%f CurrTime=%f UI=%f", (long long)m_lLastTime, (long long)now, (long long)m_lOffsetTime, GetAsyncCurTime(), GetCurrTime(ETIMER_GAME), GetCurrTime(ETIMER_UI));
-        }
-    }
-}
-
-//! try to pause/unpause a timer
-//  returns true if successfully paused/unpaused, false otherwise
-bool CTimer::PauseTimer(ETimer which, bool bPause)
-{
-    if (which != ETIMER_GAME)
-    {
-        return false;
-    }
-
-    if (m_bGameTimerPaused == bPause)
-    {
-        return false;
-    }
-
-    m_bGameTimerPaused = bPause;
-
-    if (bPause)
-    {
-        m_lGameTimerPausedTime = m_lLastTime + m_lOffsetTime;
-        if (m_TimeDebug)
-        {
-            CryLogAlways("[CTimer]: Pausing ON: Last=%lld Off=%lld Async=%f CurrTime=%f UI=%f", (long long)m_lLastTime, (long long)m_lOffsetTime, GetAsyncCurTime(), GetCurrTime(ETIMER_GAME), GetCurrTime(ETIMER_UI));
-        }
-    }
-    else
-    {
-        SetOffsetToMatchGameTime(m_lGameTimerPausedTime);
-        m_lGameTimerPausedTime = 0;
-        if (m_TimeDebug)
-        {
-            CryLogAlways("[CTimer]: Pausing OFF: Last=%lld Off=%lld Async=%f CurrTime=%f UI=%f", (long long)m_lLastTime, (long long)m_lOffsetTime, GetAsyncCurTime(), GetCurrTime(ETIMER_GAME), GetCurrTime(ETIMER_UI));
-        }
-    }
-
-    return true;
-}
-
-//! determine if a timer is paused
-//  returns true if paused, false otherwise
-bool CTimer::IsTimerPaused(ETimer which)
-{
-    if (which != ETIMER_GAME)
-    {
-        return false;
-    }
-    return m_bGameTimerPaused;
-}
-
-//! try to set a timer
-//  return true if successful, false otherwise
-bool CTimer::SetTimer(ETimer which, float timeInSeconds)
-{
-    if (which != ETIMER_GAME)
-    {
-        return false;
-    }
-
-    SetOffsetToMatchGameTime(SecondsToTicks(timeInSeconds));
-    return true;
-}
-
-ITimer* CTimer::CreateNewTimer()
-{
-    return new CTimer();
-}
-
-void CTimer::SecondsToDateUTC(time_t inTime, struct tm& outDateUTC)
-{
-#ifdef AZ_COMPILER_MSVC
-    gmtime_s(&outDateUTC, &inTime);
-#else
-    outDateUTC = *gmtime(&inTime); 
-#endif
-}
-
-#if defined (WIN32) || defined(WIN64)
-time_t gmt_to_local_win32(void)
-{
-    TIME_ZONE_INFORMATION tzinfo;
-    DWORD dwStandardDaylight;
-    long bias;
-
-    dwStandardDaylight = GetTimeZoneInformation(&tzinfo);
-    bias = tzinfo.Bias;
-
-    if (dwStandardDaylight == TIME_ZONE_ID_STANDARD)
-    {
-        bias += tzinfo.StandardBias;
-    }
-
-    if (dwStandardDaylight == TIME_ZONE_ID_DAYLIGHT)
-    {
-        bias += tzinfo.DaylightBias;
-    }
-
-    return (-bias * 60);
-}
-#endif
-
-time_t CTimer::DateToSecondsUTC(struct tm& inDate)
-{
-#if defined (WIN32)
-    return mktime(&inDate) + gmt_to_local_win32();
-#elif defined (LINUX)
-#if defined (HAVE_TIMEGM)
-    // return timegm(&inDate);
-#else
-    // craig: temp disabled the +tm.tm_gmtoff because i can't see the intention here
-    // and it doesn't compile anymore
-    // alexl: tm_gmtoff is the offset to greenwhich mean time, whereas mktime uses localtime
-    //        but not all linux distributions have it...
-    return mktime(&inDate) /*+ tm.tm_gmtoff*/;
-#endif
-#else
-    return mktime(&inDate);
-#endif
-}
-
-void CTimer::EnableFixedTimeMode([[maybe_unused]] bool enable, [[maybe_unused]] float timeStep)
-{
-    //if (enable)
-    //{
-    //    m_fixedTimeModeEnabled = true;
-    //    m_fixedTimeModeStep = timeStep;
-
-    //    m_lBaseTime =0;
-    //    m_lBaseTime_Async = 0;
-    //    m_lLastTime = m_lCurrentTime = 0;
-    //    m_fRealFrameTime = m_fFrameTime = timeStep;
-    //    RefreshGameTime(m_lCurrentTime);
-    //    RefreshUITime(m_lCurrentTime);
-    //    m_lForcedGameTime = -1;
-    //    m_bGameTimerPaused = false;
-    //    m_lGameTimerPausedTime = 0;
-    //}
-    //else
-    //{
-    //    m_fixedTimeModeEnabled = false;
-    //    ResetTimer();
-    //}
-}
-
-void CTimer::SetOffsetToMatchGameTime(int64 ticks)
-{
-    [[maybe_unused]] const int64 previousOffset = m_lOffsetTime;
-    [[maybe_unused]] const float previousGameTime = GetCurrTime(ETIMER_GAME);
-
-    m_lOffsetTime = ticks - m_lLastTime;
-    RefreshGameTime(m_lLastTime);
-
-    if (m_bGameTimerPaused)
-    {
-        // On un-pause, we will restore the specified time.
-        // If we don't do this, the un-pause will over-write the offset again.
-        m_lGameTimerPausedTime = ticks;
-    }
-
-    if (m_TimeDebug)
-    {
-        CryLogAlways("[CTimer] SetOffset: Offset %lld -> %lld, GameTime %f -> %f", (long long)previousOffset, (long long)m_lOffsetTime, GetCurrTime(ETIMER_GAME), previousGameTime);
-    }
-}
-
-int64 CTimer::SecondsToTicks(double seconds) const
-{
-    return (int64)(seconds * (double)m_lTicksPerSec);
-}
diff --git a/Code/Legacy/CrySystem/Timer.h b/Code/Legacy/CrySystem/Timer.h
deleted file mode 100644
index 69fd2357e0..0000000000
--- a/Code/Legacy/CrySystem/Timer.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_TIMER_H
-#define CRYINCLUDE_CRYSYSTEM_TIMER_H
-
-# pragma once
-#include <ITimer.h>
-
-// Implements all common timing routines
-class CTimer
-    : public ITimer
-{
-public:
-    // constructor
-    CTimer();
-    // destructor
-    ~CTimer() = default;
-
-    bool Init();
-
-    // interface ITimer ----------------------------------------------------------
-
-    // TODO: Review m_time usage in System.cpp
-    //       if it wants Game Time / UI Time or a new Render Time?
-
-    void ResetTimer() override;
-    void UpdateOnFrameStart() override;
-    float GetCurrTime(ETimer which = ETIMER_GAME) const override;
-    CTimeValue GetAsyncTime() const override;
-    float GetAsyncCurTime() override; // retrieve the actual wall clock time passed since the game started, in seconds
-    float GetFrameTime(ETimer which = ETIMER_GAME) const override;
-    float GetRealFrameTime() const override;
-    float GetTimeScale() const override;
-    float GetTimeScale(uint32 channel) const override;
-    void SetTimeScale(float scale, uint32 channel = 0) override;
-    void ClearTimeScales() override;
-    void EnableTimer(bool bEnable) override;
-    float GetFrameRate() override;
-    float GetProfileFrameBlending(float* pfBlendTime = nullptr, int* piBlendMode = nullptr) override;
-    void Serialize(TSerialize ser) override;
-    bool IsTimerEnabled() const override;
-
-    //! try to pause/unpause a timer
-    //  returns true if successfully paused/unpaused, false otherwise
-    bool PauseTimer(ETimer which, bool bPause) override;
-
-    //! determine if a timer is paused
-    //  returns true if paused, false otherwise
-    bool IsTimerPaused(ETimer which) override;
-
-    //! try to set a timer
-    //  return true if successful, false otherwise
-    bool SetTimer(ETimer which, float timeInSeconds) override;
-
-    //! make a tm struct from a time_t in UTC (like gmtime)
-    void SecondsToDateUTC(time_t time, struct tm& outDateUTC) override;
-
-    //! make a UTC time from a tm (like timegm, but not available on all platforms)
-    time_t DateToSecondsUTC(struct tm& timePtr) override;
-
-    //! Convert from Tics to Seconds
-    float TicksToSeconds(int64 ticks) override
-    {
-        return float((double)ticks * m_fSecsPerTick);
-    }
-
-    //! Get number of ticks per second
-    int64 GetTicksPerSecond() override
-    {
-        return m_lTicksPerSec;
-    }
-
-    const CTimeValue& GetFrameStartTime(ETimer which = ETIMER_GAME) const override { return m_CurrTime[(int)which]; }
-    ITimer* CreateNewTimer() override;
-
-    void EnableFixedTimeMode(bool enable, float timeStep) override;
-
-private: // ---------------------------------------------------------------------
-
-    // ---------------------------------------------------------------------------
-
-    // updates m_CurrTime (either pass m_lCurrentTime or custom curTime)
-    void RefreshGameTime(int64 curTime);
-    void RefreshUITime(int64 curTime);
-    void UpdateBlending();
-    float GetAverageFrameTime();
-
-    // Updates the game-time offset to match the the specified time.
-    // The argument is the new number of ticks since the last Reset().
-    void SetOffsetToMatchGameTime(int64 ticks);
-
-    // Convert seconds to ticks using the timer frequency.
-    // Note: Loss of precision may occur, especially if magnitude of argument or timer frequency is large.
-    int64 SecondsToTicks(double seconds) const;
-
-    enum
-    {
-        MAX_FRAME_AVERAGE  = 100,
-        NUM_TIME_SCALE_CHANNELS = 8,
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // Dynamic state, reset by ResetTimer()
-    //////////////////////////////////////////////////////////////////////////
-    CTimeValue m_CurrTime[ETIMER_LAST]; // Time since last Reset(), cached during Update()
-
-    int64 m_lBaseTime; // Ticks elapsed since system boot, all other tick-unit variables are relative to this.
-    int64 m_lLastTime; // Ticks since last Reset(). This is the base for UI time. UI time is monotonic, it always moves forward at a constant rate until the timer is Reset()).
-    int64 m_lOffsetTime; // Additional ticks for Game time (relative to UI time). Game time can be affected by loading, pausing, time smoothing and time clamping, as well as SetTimer().
-
-    //// the GetcurAsyncTime function appears to want to return the actual wall clock time delta
-    //// but its using the base time (above) which is adjusted when there is a frame skip.
-    //int64 m_lBaseTime_Async;
-
-    float m_fFrameTime; // In seconds since the last Update(), clamped/smoothed etc.
-    float m_fRealFrameTime; // In real seconds since the last Update(), non-clamped/un-smoothed etc.
-
-    bool  m_bGameTimerPaused; // Set if the game is paused. GetFrameTime() will return 0, GetCurrTime(ETIMER_GAME) will not progress.
-    int64 m_lGameTimerPausedTime; // The UI time when the game timer was paused. On un-pause, offset will be adjusted to match.
-
-    //////////////////////////////////////////////////////////////////////////
-    // Persistant state, kept by ResetTimer()
-    //////////////////////////////////////////////////////////////////////////
-    bool m_bEnabled;
-    unsigned int m_nFrameCounter;
-
-    int64 m_lTicksPerSec; // Ticks per second
-    double m_fSecsPerTick; // Seconds per tick
-
-    // smoothing
-    float m_arrFrameTimes[MAX_FRAME_AVERAGE];
-    float m_fAverageFrameTime; // used for smoothing (AverageFrameTime())
-
-    float m_fAvgFrameTime;     // used for blend weighting (UpdateBlending())
-    float m_fProfileBlend;     // current blending amount for profile.
-    float m_fSmoothTime;       // smoothing interval (up to m_profile_smooth_time).
-
-    // time scale
-    float m_timeScaleChannels[NUM_TIME_SCALE_CHANNELS];
-    float m_totalTimeScale;
-
-    //////////////////////////////////////////////////////////////////////////
-    // Console vars, always have default value on secondary CTimer instances
-    //////////////////////////////////////////////////////////////////////////
-    float m_fixed_time_step;   // in seconds
-    float m_max_time_step;     // in seconds
-    float m_cvar_time_scale;   // slow down time cvar
-    int   m_TimeSmoothing;     // Console Variable, 0=off, otherwise on
-    int             m_TimeDebug;                                // Console Variable, 0=off, otherwise on
-
-    // Profile averaging help.
-    float m_profile_smooth_time;  // seconds to exponentially smooth profile results.
-    int   m_profile_weighting;    // weighting mode (see RegisterVar desc).
-
-    //bool m_fixedTimeModeEnabled;
-    //float m_fixedTimeModeStep;
-};
-
-#endif // CRYINCLUDE_CRYSYSTEM_TIMER_H
diff --git a/Code/Legacy/CrySystem/ViewSystem/DebugCamera.cpp b/Code/Legacy/CrySystem/ViewSystem/DebugCamera.cpp
deleted file mode 100644
index 6eab555ac4..0000000000
--- a/Code/Legacy/CrySystem/ViewSystem/DebugCamera.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "CrySystem_precompiled.h"
-#include "DebugCamera.h"
-#include "ISystem.h"
-#include "Cry_Camera.h"
-#include "IViewSystem.h"
-
-#include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
-#include <AzFramework/Input/Devices/Gamepad/InputDeviceGamepad.h>
-#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
-
-using namespace AzFramework;
-
-namespace LegacyViewSystem
-{
-const float g_moveScaleIncrement = 0.1f;
-const float g_moveScaleMin = 0.01f;
-const float g_moveScaleMax = 10.0f;
-const float g_mouseMoveScale = 0.1f;
-const float g_gamepadRotationSpeed = 5.0f;
-const float g_mouseMaxRotationSpeed = 270.0f;
-const float g_moveSpeed = 10.0f;
-const float g_maxPitch = 85.0f;
-const float g_boostMultiplier = 10.0f;
-const float g_minRotationSpeed = 15.0f;
-const float g_maxRotationSpeed = 70.0f;
-
-///////////////////////////////////////////////////////////////////////////////
-DebugCamera::DebugCamera()
-    : m_mouseMoveMode(0)
-    , m_isYInverted(0)
-    , m_cameraMode(DebugCamera::ModeOff)
-    , m_cameraYawInput(0.0f)
-    , m_cameraPitchInput(0.0f)
-    , m_cameraYaw(0.0f)
-    , m_cameraPitch(0.0f)
-    , m_moveInput(ZERO)
-    , m_moveScale(1.0f)
-    , m_oldMoveScale(1.0f)
-    , m_position(ZERO)
-    , m_view(IDENTITY)
-{
-    InputChannelEventListener::Connect();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-DebugCamera::~DebugCamera()
-{
-    InputChannelEventListener::Disconnect();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::OnEnable()
-{
-    m_position = Vec3_Zero;
-    m_moveInput = Vec3_Zero;
-
-    Ang3 cameraAngles = Ang3(ZERO);
-    m_cameraYaw = RAD2DEG(cameraAngles.z);
-    m_cameraPitch = RAD2DEG(cameraAngles.x);
-    m_view = Matrix33(Ang3(DEG2RAD(m_cameraPitch), 0.0f, DEG2RAD(m_cameraYaw)));
-
-    m_cameraYawInput = 0.0f;
-    m_cameraPitchInput = 0.0f;
-
-    m_mouseMoveMode = 0;
-    m_cameraMode = DebugCamera::ModeFree;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::OnDisable()
-{
-    m_mouseMoveMode = 0;
-    m_cameraMode = DebugCamera::ModeOff;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::OnInvertY()
-{
-    m_isYInverted = !m_isYInverted;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::OnNextMode()
-{
-    if (m_cameraMode == DebugCamera::ModeFree)
-    {
-        m_cameraMode = DebugCamera::ModeFixed;
-    }
-    // ...
-    else if (m_cameraMode == DebugCamera::ModeFixed)
-    {
-        // this is the last mode, go to disabled.
-        OnDisable();
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::Update()
-{
-    if (m_cameraMode == DebugCamera::ModeOff)
-    {
-        return;
-    }
-
-    float rotationSpeed = clamp_tpl(m_moveScale, g_minRotationSpeed, g_maxRotationSpeed);
-    UpdateYaw(m_cameraYawInput * rotationSpeed * gEnv->pTimer->GetFrameTime());
-    UpdatePitch(m_cameraPitchInput * rotationSpeed * gEnv->pTimer->GetFrameTime());
-
-    m_view = Matrix33(Ang3(DEG2RAD(m_cameraPitch), 0.0f, DEG2RAD(m_cameraYaw)));
-    UpdatePosition(m_moveInput);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::PostUpdate()
-{
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool DebugCamera::OnInputChannelEventFiltered(const InputChannel& inputChannel)
-{
-    if (!IsEnabled() || m_cameraMode == DebugCamera::ModeFixed || gEnv->pConsole->IsOpened())
-    {
-        return false;
-    }
-
-    const InputDeviceId& deviceId = inputChannel.GetInputDevice().GetInputDeviceId();
-    const InputChannelId& channelId = inputChannel.GetInputChannelId();
-    const float eventValue = inputChannel.GetValue();
-    if (InputDeviceKeyboard::IsKeyboardDevice(deviceId))
-    {
-        if (channelId == InputDeviceKeyboard::Key::AlphanumericW)
-        {
-            m_moveInput.y = eventValue;
-        }
-        else if (channelId == InputDeviceKeyboard::Key::AlphanumericS)
-        {
-            m_moveInput.y = -eventValue;
-        }
-        else if (channelId == InputDeviceKeyboard::Key::AlphanumericA)
-        {
-            m_moveInput.x = -eventValue;
-        }
-        else if (channelId == InputDeviceKeyboard::Key::AlphanumericD)
-        {
-            m_moveInput.x = eventValue;
-        }
-        else if (channelId == InputDeviceKeyboard::Key::ModifierShiftL)
-        {
-            if (inputChannel.IsStateEnded())
-            {
-                m_moveScale = m_oldMoveScale;
-            }
-            else if (inputChannel.IsStateBegan())
-            {
-                m_oldMoveScale = m_moveScale;
-                m_moveScale = clamp_tpl(m_moveScale * g_boostMultiplier, g_moveScaleMin, g_moveScaleMax);
-            }
-        }
-    }
-    else if (InputDeviceMouse::IsMouseDevice(deviceId))
-    {
-        if (channelId == InputDeviceMouse::Movement::Z)
-        {
-            if (inputChannel.GetValue() > 0)
-            {
-                m_moveScale = clamp_tpl(m_moveScale + g_moveScaleIncrement, g_moveScaleMin, g_moveScaleMax);
-            }
-            else
-            {
-                m_moveScale = clamp_tpl(m_moveScale - g_moveScaleIncrement, g_moveScaleMin, g_moveScaleMax);
-            }
-        }
-        else if (channelId == InputDeviceMouse::Movement::X)
-        {
-            //KC: If both left and right mouse buttons are pressed then use
-            //the mouse movement for horizontal movement.
-            if (2 != m_mouseMoveMode)
-            {
-                UpdateYaw(fsgnf(-eventValue) * clamp_tpl(fabs_tpl(eventValue) * m_moveScale, 0.0f, g_mouseMaxRotationSpeed) * gEnv->pTimer->GetFrameTime());
-            }
-            else
-            {
-                UpdatePosition(Vec3(eventValue * g_mouseMoveScale, 0.0f, 0.0f));
-            }
-        }
-        else if (channelId == InputDeviceMouse::Movement::Y)
-        {
-            //KC: If both left and right mouse buttons are pressed then use
-            //the mouse movement for vertical movement.
-            if (2 != m_mouseMoveMode)
-            {
-                UpdatePitch(fsgnf(-eventValue) * clamp_tpl(fabs_tpl(eventValue) * m_moveScale, 0.0f, g_mouseMaxRotationSpeed) * gEnv->pTimer->GetFrameTime());
-            }
-            else
-            {
-                UpdatePosition(Vec3(0.0f, 0.0f, -eventValue * g_mouseMoveScale));
-            }
-        }
-        else if (channelId == InputDeviceMouse::Button::Left)
-        {
-            if (inputChannel.IsStateEnded())
-            {
-                m_mouseMoveMode = clamp_tpl(m_mouseMoveMode - 1, 0, 2);
-            }
-            else
-            {
-                m_mouseMoveMode = clamp_tpl(m_mouseMoveMode + 1, 0, 2);
-            }
-        }
-        else if (channelId == InputDeviceMouse::Button::Right)
-        {
-            if (inputChannel.IsStateEnded())
-            {
-                m_mouseMoveMode = clamp_tpl(m_mouseMoveMode - 1, 0, 2);
-            }
-            else
-            {
-                m_mouseMoveMode = clamp_tpl(m_mouseMoveMode + 1, 0, 2);
-            }
-        }
-    }
-    else if (InputDeviceGamepad::IsGamepadDevice(deviceId))
-    {
-        if (channelId == InputDeviceGamepad::Button::DU)
-        {
-            m_moveScale = clamp_tpl(m_moveScale + g_moveScaleIncrement, g_moveScaleMin, g_moveScaleMax);
-        }
-        else if (channelId == InputDeviceGamepad::Button::DD)
-        {
-            m_moveScale = clamp_tpl(m_moveScale - g_moveScaleIncrement, g_moveScaleMin, g_moveScaleMax);
-        }
-        else if (channelId == InputDeviceGamepad::Trigger::L2)
-        {
-            m_moveInput.z = -eventValue;
-        }
-        else if (channelId == InputDeviceGamepad::Trigger::R2)
-        {
-            m_moveInput.z = eventValue;
-        }
-        else if (channelId == InputDeviceGamepad::ThumbStickAxis1D::LX)
-        {
-            m_moveInput.x = eventValue;
-        }
-        else if (channelId == InputDeviceGamepad::ThumbStickAxis1D::LY)
-        {
-            m_moveInput.y = eventValue;
-        }
-        else if (channelId == InputDeviceGamepad::ThumbStickAxis1D::RX)
-        {
-            m_cameraYawInput = -eventValue * g_gamepadRotationSpeed;
-        }
-        else if (channelId == InputDeviceGamepad::ThumbStickAxis1D::RY)
-        {
-            m_cameraPitchInput = eventValue * g_gamepadRotationSpeed;
-        }
-        //KC: Use the shoulder buttons to temporarily boost or reduce the scale.
-        else if (channelId == InputDeviceGamepad::Button::L1)
-        {
-            if (inputChannel.IsStateEnded())
-            {
-                m_moveScale = m_oldMoveScale;
-            }
-            else if (inputChannel.IsStateBegan())
-            {
-                m_oldMoveScale = m_moveScale;
-                m_moveScale = clamp_tpl(m_moveScale / g_boostMultiplier, g_moveScaleMin, g_moveScaleMax);
-            }
-        }
-        else if (channelId == InputDeviceGamepad::Button::R1)
-        {
-            if (inputChannel.IsStateEnded())
-            {
-                m_moveScale = m_oldMoveScale;
-            }
-            else if (inputChannel.IsStateBegan())
-            {
-                m_oldMoveScale = m_moveScale;
-                m_moveScale = clamp_tpl(m_moveScale * g_boostMultiplier, g_moveScaleMin, g_moveScaleMax);
-            }
-        }
-    }
-
-    return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::UpdatePitch(float amount)
-{
-    if (m_isYInverted)
-    {
-        amount = -amount;
-    }
-
-    m_cameraPitch += amount;
-    m_cameraPitch = clamp_tpl(m_cameraPitch, -g_maxPitch, g_maxPitch);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::UpdateYaw(float amount)
-{
-    m_cameraYaw += amount;
-    if (m_cameraYaw < 0.0f)
-    {
-        m_cameraYaw += 360.0f;
-    }
-    else if (m_cameraYaw >= 360.0f)
-    {
-        m_cameraYaw -= 360.0f;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DebugCamera::UpdatePosition(const Vec3& amount)
-{
-    Vec3 diff = amount * g_moveSpeed * m_moveScale * gEnv->pTimer->GetFrameTime();
-    MovePosition(diff);
-}
-
-void DebugCamera::MovePosition(const Vec3& offset)
-{
-    m_position += m_view.GetColumn0() * offset.x;
-    m_position += m_view.GetColumn1() * offset.y;
-    m_position += m_view.GetColumn2() * offset.z;
-}
-
-} // namespace LegacyViewSystem
diff --git a/Code/Legacy/CrySystem/ViewSystem/DebugCamera.h b/Code/Legacy/CrySystem/ViewSystem/DebugCamera.h
deleted file mode 100644
index c170b73c96..0000000000
--- a/Code/Legacy/CrySystem/ViewSystem/DebugCamera.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Input/Events/InputChannelEventListener.h>
-
-namespace LegacyViewSystem
-{
-///////////////////////////////////////////////////////////////////////////////
-class DebugCamera
-    : public AzFramework::InputChannelEventListener
-{
-public:
-    enum Mode
-    {
-        ModeOff,    // no debug cam
-        ModeFree,   // free-fly
-        ModeFixed,  // fixed cam, control goes back to game
-    };
-
-    DebugCamera();
-    ~DebugCamera() override;
-
-    void Update();
-    void PostUpdate();
-    bool IsEnabled();
-    bool IsFixed();
-    bool IsFree();
-
-    // AzFramework::InputChannelEventListener
-    bool OnInputChannelEventFiltered(const AzFramework::InputChannel& inputChannel) override;
-
-    void OnEnable();
-    void OnDisable();
-    void OnInvertY();
-    void OnNextMode();
-    void UpdatePitch(float amount);
-    void UpdateYaw(float amount);
-    void UpdatePosition(const Vec3& amount);
-    void MovePosition(const Vec3& offset);
-
-protected:
-    int m_mouseMoveMode;
-    int m_isYInverted;
-    int m_cameraMode;
-    float m_cameraYawInput;
-    float m_cameraPitchInput;
-    float m_cameraYaw;
-    float m_cameraPitch;
-    Vec3 m_moveInput;
-
-    float m_moveScale;
-    float m_oldMoveScale;
-    Vec3 m_position;
-    Matrix33 m_view;
-};
-
-
-inline bool DebugCamera::IsEnabled()
-{
-    return m_cameraMode != DebugCamera::ModeOff;
-}
-
-inline bool DebugCamera::IsFixed()
-{
-    return m_cameraMode == DebugCamera::ModeFixed;
-}
-
-inline bool DebugCamera::IsFree()
-{
-    return m_cameraMode == DebugCamera::ModeFree;
-}
-
-} // namespace LegacyViewSystem
diff --git a/Code/Legacy/CrySystem/ViewSystem/View.cpp b/Code/Legacy/CrySystem/ViewSystem/View.cpp
deleted file mode 100644
index ca5ef3892b..0000000000
--- a/Code/Legacy/CrySystem/ViewSystem/View.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-
-#include <Cry_Camera.h>
-#include <HMDBus.h>
-#include "View.h"
-#include <AzCore/Math/MathUtils.h>
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Component/Entity.h>
-#include <Random.h>
-#include <MathConversion.h>
-
-namespace LegacyViewSystem
-{
-
-static ICVar* pCamShakeMult = 0;
-static ICVar* pHmdReferencePoint = 0;
-
-//------------------------------------------------------------------------
-CView::CView(ISystem* pSystem)
-    : m_pSystem(pSystem)
-    , m_linkedTo(0)
-    , m_frameAdditiveAngles(0.0f, 0.0f, 0.0f)
-    , m_scale(1.0f)
-    , m_zoomedScale(1.0f)
-{
-    if (!pCamShakeMult)
-    {
-        pCamShakeMult = gEnv->pConsole->GetCVar("c_shakeMult");
-    }
-    if (!pHmdReferencePoint)
-    {
-        pHmdReferencePoint = gEnv->pConsole->GetCVar("hmd_reference_point");
-    }
-}
-
-//------------------------------------------------------------------------
-CView::~CView()
-{
-}
-
-//-----------------------------------------------------------------------
-void CView::Release()
-{
-    delete this;
-}
-
-//------------------------------------------------------------------------
-void CView::Update([[maybe_unused]] float frameTime, [[maybe_unused]] bool isActive)
-{
-    AZ_ErrorOnce("CryLegacy", false, "CryLegacy view system no longer available (CView::Update)");
-}
-
-//-----------------------------------------------------------------------
-void CView::ApplyFrameAdditiveAngles(Quat& cameraOrientation)
-{
-    if ((m_frameAdditiveAngles.x != 0.f) || (m_frameAdditiveAngles.y != 0.f) || (m_frameAdditiveAngles.z != 0.f))
-    {
-        Ang3 cameraAngles(cameraOrientation);
-        cameraAngles += m_frameAdditiveAngles;
-
-        cameraOrientation.SetRotationXYZ(cameraAngles);
-
-        m_frameAdditiveAngles.Set(0.0f, 0.0f, 0.0f);
-    }
-}
-
-//------------------------------------------------------------------------
-void CView::SetViewShake(Ang3 shakeAngle, Vec3 shakeShift, float duration, float frequency, float randomness, int shakeID, bool bFlipVec, bool bUpdateOnly, bool bGroundOnly)
-{
-    SShakeParams params;
-    params.shakeAngle = shakeAngle;
-    params.shakeShift = shakeShift;
-    params.frequency = frequency;
-    params.randomness = randomness;
-    params.shakeID = shakeID;
-    params.bFlipVec = bFlipVec;
-    params.bUpdateOnly = bUpdateOnly;
-    params.bGroundOnly = bGroundOnly;
-    params.fadeInDuration = 0;                  //
-    params.fadeOutDuration = duration;  // originally it was faded out from start. that is why the values are set this way here, to preserve compatibility.
-    params.sustainDuration = 0;             //
-
-    SetViewShakeEx(params);
-}
-
-
-//------------------------------------------------------------------------
-void CView::SetViewShakeEx(const SShakeParams& params)
-{
-    float shakeMult = GetScale();
-    if (shakeMult < 0.001f)
-    {
-        return;
-    }
-
-    int shakes = static_cast<int>(m_shakes.size());
-    SShake* pSetShake(NULL);
-
-    for (int i = 0; i < shakes; ++i)
-    {
-        SShake* pShake = &m_shakes[i];
-        if (pShake->ID == params.shakeID)
-        {
-            pSetShake = pShake;
-            break;
-        }
-    }
-
-    if (!pSetShake)
-    {
-        m_shakes.push_back(SShake(params.shakeID));
-        pSetShake = &m_shakes.back();
-    }
-
-    if (pSetShake)
-    {
-        // this can be set dynamically
-        pSetShake->frequency = max(0.00001f, params.frequency);
-
-        // the following are set on a 'new' shake as well
-        if (params.bUpdateOnly == false)
-        {
-            pSetShake->amount = params.shakeAngle * shakeMult;
-            pSetShake->amountVector = params.shakeShift * shakeMult;
-            pSetShake->randomness = params.randomness;
-            pSetShake->doFlip = params.bFlipVec;
-            pSetShake->groundOnly = params.bGroundOnly;
-            pSetShake->isSmooth = params.isSmooth;
-            pSetShake->permanent = params.bPermanent;
-            pSetShake->fadeInDuration = params.fadeInDuration;
-            pSetShake->sustainDuration = params.sustainDuration;
-            pSetShake->fadeOutDuration = params.fadeOutDuration;
-            pSetShake->timeDone = 0;
-            pSetShake->updating = true;
-            pSetShake->interrupted = false;
-            pSetShake->goalShake = Quat(ZERO);
-            pSetShake->goalShakeSpeed = Quat(ZERO);
-            pSetShake->goalShakeVector = Vec3(ZERO);
-            pSetShake->goalShakeVectorSpeed = Vec3(ZERO);
-            pSetShake->nextShake = 0.0f;
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-void CView::SetScale(const float scale)
-{
-    CRY_ASSERT_MESSAGE(scale == 1.0f || m_scale == 1.0f, "Attempting to CView::SetScale but has already been set!");
-    m_scale = scale;
-}
-
-void CView::SetZoomedScale(const float scale)
-{
-    CRY_ASSERT_MESSAGE(scale == 1.0f || m_zoomedScale == 1.0f, "Attempting to CView::SetZoomedScale but has already been set!");
-    m_zoomedScale = scale;
-}
-
-//------------------------------------------------------------------------
-const float CView::GetScale()
-{
-    float shakeMult(pCamShakeMult->GetFVal());
-    return m_scale * shakeMult * m_zoomedScale;
-}
-
-//------------------------------------------------------------------------
-void CView::ProcessShaking(float frameTime)
-{
-    m_viewParams.currentShakeQuat.SetIdentity();
-    m_viewParams.currentShakeShift.zero();
-    m_viewParams.shakingRatio = 0;
-    m_viewParams.groundOnly = false;
-
-    int shakes = static_cast<int>(m_shakes.size());
-    for (int i = 0; i < shakes; ++i)
-    {
-        ProcessShake(&m_shakes[i], frameTime);
-    }
-}
-
-//------------------------------------------------------------------------
-void CView::ProcessShake(SShake* pShake, float frameTime)
-{
-    if (!pShake->updating)
-    {
-        return;
-    }
-
-    pShake->timeDone += frameTime;
-
-    if (pShake->isSmooth)
-    {
-        ProcessShakeSmooth(pShake, frameTime);
-    }
-    else
-    {
-        ProcessShakeNormal(pShake, frameTime);
-    }
-}
-
-//------------------------------------------------------------------------
-void CView::ProcessShakeNormal(SShake* pShake, float frameTime)
-{
-    float endSustain = pShake->fadeInDuration + pShake->sustainDuration;
-    float totalDuration = endSustain + pShake->fadeOutDuration;
-
-    bool finalDamping = (!pShake->permanent && pShake->timeDone > totalDuration) || (pShake->interrupted && pShake->ratio < 0.05f);
-
-    if (finalDamping)
-    {
-        ProcessShakeNormal_FinalDamping(pShake, frameTime);
-    }
-    else
-    {
-        ProcessShakeNormal_CalcRatio(pShake, frameTime, endSustain);
-        ProcessShakeNormal_DoShaking(pShake, frameTime);
-
-        //for the global shaking ratio keep the biggest
-        if (pShake->groundOnly)
-        {
-            m_viewParams.groundOnly = true;
-        }
-        m_viewParams.shakingRatio = max(m_viewParams.shakingRatio, pShake->ratio);
-        m_viewParams.currentShakeQuat *= pShake->shakeQuat;
-        m_viewParams.currentShakeShift += pShake->shakeVector;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::ProcessShakeSmooth(SShake* pShake, float frameTime)
-{
-    assert(pShake->timeDone >= 0);
-
-    float endTimeFadeIn = pShake->fadeInDuration;
-    float endTimeSustain = pShake->sustainDuration + endTimeFadeIn;
-    float totalTime = endTimeSustain + pShake->fadeOutDuration;
-
-    if (pShake->interrupted && endTimeFadeIn <= pShake->timeDone && pShake->timeDone < endTimeSustain)
-    {
-        pShake->timeDone = endTimeSustain;
-    }
-
-    float damping = 1.f;
-    if (pShake->timeDone < endTimeFadeIn)
-    {
-        damping = pShake->timeDone / endTimeFadeIn;
-    }
-    else if (endTimeSustain < pShake->timeDone && pShake->timeDone < totalTime)
-    {
-        damping = (totalTime - pShake->timeDone) / (totalTime - endTimeSustain);
-    }
-    else if (totalTime <= pShake->timeDone)
-    {
-        pShake->shakeQuat.SetIdentity();
-        pShake->shakeVector.zero();
-        pShake->ratio = 0.0f;
-        pShake->nextShake = 0.0f;
-        pShake->flip = false;
-        pShake->updating = false;
-        return;
-    }
-
-    ProcessShakeSmooth_DoShaking(pShake, frameTime);
-
-    if (pShake->groundOnly)
-    {
-        m_viewParams.groundOnly = true;
-    }
-    pShake->ratio = (3.f - 2.f * damping) * damping * damping; // smooth ration change
-    m_viewParams.shakingRatio = max(m_viewParams.shakingRatio, pShake->ratio);
-    m_viewParams.currentShakeQuat *= Quat::CreateSlerp(IDENTITY, pShake->shakeQuat, pShake->ratio);
-    m_viewParams.currentShakeShift += Vec3::CreateLerp(ZERO, pShake->shakeVector, pShake->ratio);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::GetRandomQuat(Quat& quat, SShake* pShake)
-{
-    quat.SetRotationXYZ(pShake->amount);
-    float randomAmt(pShake->randomness);
-    float len(fabs(pShake->amount.x) + fabs(pShake->amount.y) + fabs(pShake->amount.z));
-    len /= 3.f;
-    float r = len * randomAmt;
-    quat *= Quat::CreateRotationXYZ(Ang3(cry_random(-r, r), cry_random(-r, r), cry_random(-r, r)));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::GetRandomVector(Vec3& vec, SShake* pShake)
-{
-    vec = pShake->amountVector;
-    float randomAmt(pShake->randomness);
-    float len = fabs(pShake->amountVector.x) + fabs(pShake->amountVector.y) + fabs(pShake->amountVector.z);
-    len /= 3.f;
-    float r = len * randomAmt;
-    vec += Vec3(cry_random(-r, r), cry_random(-r, r), cry_random(-r, r));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::CubeInterpolateQuat(float t, SShake* pShake)
-{
-    Quat p0 = pShake->startShake;
-    Quat p1 = pShake->goalShake;
-    Quat v0 = pShake->startShakeSpeed * 0.5f;
-    Quat v1 = pShake->goalShakeSpeed * 0.5f;
-
-    pShake->shakeQuat = (((p0 *  2.f + p1 * -2.f + v0 + v1) * t
-        + (p0 * -3.f + p1 *  3.f + v0 * -2.f - v1)) * t
-        + (v0)) * t
-        + p0;
-
-    pShake->shakeQuat.Normalize();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::CubeInterpolateVector(float t, SShake* pShake)
-{
-    Vec3 p0 = pShake->startShakeVector;
-    Vec3 p1 = pShake->goalShakeVector;
-    Vec3 v0 = pShake->startShakeVectorSpeed * 0.8f;
-    Vec3 v1 = pShake->goalShakeVectorSpeed * 0.8f;
-
-    pShake->shakeVector = (((p0 *  2.f + p1 * -2.f + v0 + v1) * t
-        + (p0 * -3.f + p1 *  3.f + v0 * -2.f - v1)) * t
-        + (v0)) * t
-        + p0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::ProcessShakeSmooth_DoShaking(SShake* pShake, float frameTime)
-{
-    if (pShake->nextShake <= 0.0f)
-    {
-        pShake->nextShake = pShake->frequency;
-
-        pShake->startShake              = pShake->goalShake;
-        pShake->startShakeSpeed         = pShake->goalShakeSpeed;
-        pShake->startShakeVector        = pShake->goalShakeVector;
-        pShake->startShakeVectorSpeed   = pShake->goalShakeVectorSpeed;
-
-        GetRandomQuat(pShake->goalShake, pShake);
-        GetRandomQuat(pShake->goalShakeSpeed, pShake);
-        GetRandomVector(pShake->goalShakeVector, pShake);
-        GetRandomVector(pShake->goalShakeVectorSpeed, pShake);
-
-        if (pShake->flip)
-        {
-            pShake->goalShake.Invert();
-            pShake->goalShakeSpeed.Invert();
-            pShake->goalShakeVector = -pShake->goalShakeVector;
-            pShake->goalShakeVectorSpeed = -pShake->goalShakeVectorSpeed;
-        }
-
-        if (pShake->doFlip)
-        {
-            pShake->flip = !pShake->flip;
-        }
-    }
-
-    pShake->nextShake -= frameTime;
-
-    float t = (pShake->frequency - pShake->nextShake) / pShake->frequency;
-    CubeInterpolateQuat(t, pShake);
-    CubeInterpolateVector(t, pShake);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::ProcessShakeNormal_FinalDamping(SShake* pShake, float frameTime)
-{
-    pShake->shakeQuat = Quat::CreateSlerp(pShake->shakeQuat, IDENTITY, frameTime * 5.0f);
-    m_viewParams.currentShakeQuat *= pShake->shakeQuat;
-
-    pShake->shakeVector = Vec3::CreateLerp(pShake->shakeVector, ZERO, frameTime * 5.0f);
-    m_viewParams.currentShakeShift += pShake->shakeVector;
-
-    float svlen2(pShake->shakeVector.len2());
-    bool quatIsIdentity(Quat::IsEquivalent(IDENTITY, pShake->shakeQuat, 0.0001f));
-
-    if (quatIsIdentity && svlen2 < 0.01f)
-    {
-        pShake->shakeQuat.SetIdentity();
-        pShake->shakeVector.zero();
-
-        pShake->ratio = 0.0f;
-        pShake->nextShake = 0.0f;
-        pShake->flip = false;
-
-        pShake->updating = false;
-    }
-}
-
-
-// "ratio" is the amplitude of the shaking
-void CView::ProcessShakeNormal_CalcRatio(SShake* pShake, float frameTime, float endSustain)
-{
-    const float FADEOUT_TIME_WHEN_INTERRUPTED = 0.5f;
-
-    if (pShake->interrupted)
-    {
-        pShake->ratio = max(0.f, pShake->ratio - (frameTime / FADEOUT_TIME_WHEN_INTERRUPTED));    // fadeout after interrupted
-    }
-    else
-        if (pShake->timeDone >= endSustain && pShake->fadeOutDuration > 0)
-        {
-            float timeFading = pShake->timeDone - endSustain;
-            pShake->ratio = clamp_tpl(1.f - timeFading / pShake->fadeOutDuration, 0.f, 1.f);   // fadeOut
-        }
-        else
-            if (pShake->timeDone >= pShake->fadeInDuration)
-            {
-                pShake->ratio = 1.f; // sustain
-            }
-            else
-            {
-                pShake->ratio = min(1.f, pShake->timeDone / pShake->fadeInDuration);   // fadeIn
-            }
-
-    if (pShake->permanent && pShake->timeDone >= pShake->fadeInDuration && !pShake->interrupted)
-    {
-        pShake->ratio = 1.f; // permanent standing
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::ProcessShakeNormal_DoShaking(SShake* pShake, float frameTime)
-{
-    float t;
-    if (pShake->nextShake <= 0.0f)
-    {
-        //angular
-        pShake->goalShake.SetRotationXYZ(pShake->amount);
-        if (pShake->flip)
-        {
-            pShake->goalShake.Invert();
-        }
-
-        //translational
-        pShake->goalShakeVector = pShake->amountVector;
-        if (pShake->flip)
-        {
-            pShake->goalShakeVector = -pShake->goalShakeVector;
-        }
-
-        if (pShake->doFlip)
-        {
-            pShake->flip = !pShake->flip;
-        }
-
-        //randomize it a little
-        float randomAmt(pShake->randomness);
-        float len(fabs(pShake->amount.x) + fabs(pShake->amount.y) + fabs(pShake->amount.z));
-        len /= 3.0f;
-        float r = len * randomAmt;
-        pShake->goalShake *= Quat::CreateRotationXYZ(Ang3(cry_random(-r, r), cry_random(-r, r), cry_random(-r, r)));
-
-        //translational randomization
-        len = fabs(pShake->amountVector.x) + fabs(pShake->amountVector.y) + fabs(pShake->amountVector.z);
-        len /= 3.0f;
-        r = len * randomAmt;
-        pShake->goalShakeVector += Vec3(cry_random(-r, r), cry_random(-r, r), cry_random(-r, r));
-
-        //damp & bounce it in a non linear fashion
-        t = 1.0f - (pShake->ratio * pShake->ratio);
-        pShake->goalShake = Quat::CreateSlerp(pShake->goalShake, IDENTITY, t);
-        pShake->goalShakeVector = Vec3::CreateLerp(pShake->goalShakeVector, ZERO, t);
-
-        pShake->nextShake = pShake->frequency;
-    }
-
-    pShake->nextShake = max(0.0f, pShake->nextShake - frameTime);
-
-    t = min(1.0f, frameTime * (1.0f / pShake->frequency));
-    pShake->shakeQuat = Quat::CreateSlerp(pShake->shakeQuat, pShake->goalShake, t);
-    pShake->shakeQuat.Normalize();
-    pShake->shakeVector = Vec3::CreateLerp(pShake->shakeVector, pShake->goalShakeVector, t);
-}
-
-
-//------------------------------------------------------------------------
-void CView::StopShake(int shakeID)
-{
-    uint32 num = static_cast<int>(m_shakes.size());
-    for (uint32 i = 0; i < num; ++i)
-    {
-        if (m_shakes[i].ID == shakeID && m_shakes[i].updating)
-        {
-            m_shakes[i].interrupted = true;
-        }
-    }
-}
-
-
-//------------------------------------------------------------------------
-void CView::ResetShaking()
-{
-    // disable shakes
-    std::vector<SShake>::iterator iter = m_shakes.begin();
-    std::vector<SShake>::iterator iterEnd = m_shakes.end();
-    while (iter != iterEnd)
-    {
-        SShake& shake = *iter;
-        shake.updating = false;
-        shake.timeDone = 0;
-        ++iter;
-    }
-}
-
-//------------------------------------------------------------------------
-void CView::LinkTo(AZ::Entity* follow)
-{
-    CRY_ASSERT(follow);
-    m_azEntity = follow;
-    m_linkedTo = follow->GetId();
-    m_viewParams.targetPos = Vec3();// This should be quickly overwritten by the camera's acutal position from its matrix
-}
-
-//------------------------------------------------------------------------
-void CView::Unlink()
-{
-    m_azEntity = nullptr;
-    m_linkedTo.SetInvalid();
-    m_viewParams.targetPos = Vec3();
-}
-
-//------------------------------------------------------------------------
-void CView::SetFrameAdditiveCameraAngles(const Ang3& addFrameAngles)
-{
-    m_frameAdditiveAngles = addFrameAngles;
-}
-
-void CView::PostSerialize()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CView::SetActive([[maybe_unused]] bool const bActive)
-{
-}
-
-} // namespace LegacyViewSystem
diff --git a/Code/Legacy/CrySystem/ViewSystem/View.h b/Code/Legacy/CrySystem/ViewSystem/View.h
deleted file mode 100644
index 001bf694fd..0000000000
--- a/Code/Legacy/CrySystem/ViewSystem/View.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : View System interfaces.
-
-# pragma once
-
-#include "IViewSystem.h"
-#include <Cry_Camera.h>
-
-class CGameObject;
-struct ISystem;
-
-namespace LegacyViewSystem
-{
-
-class CView
-    : public IView
-{
-public:
-
-    CView(ISystem* pSystem);
-    ~CView() override;
-
-    //shaking
-    struct SShake
-    {
-        bool updating;
-        bool flip;
-        bool doFlip;
-        bool groundOnly;
-        bool permanent;
-        bool interrupted; // when forcefully stopped
-        bool isSmooth;
-
-        int ID;
-
-        float nextShake;
-        float timeDone;
-        float sustainDuration;
-        float fadeInDuration;
-        float fadeOutDuration;
-
-        float frequency;
-        float ratio;
-
-        float randomness;
-
-        Quat startShake;
-        Quat startShakeSpeed;
-        Vec3 startShakeVector;
-        Vec3 startShakeVectorSpeed;
-
-        Quat goalShake;
-        Quat goalShakeSpeed;
-        Vec3 goalShakeVector;
-        Vec3 goalShakeVectorSpeed;
-
-        Ang3 amount;
-        Vec3 amountVector;
-
-        Quat shakeQuat;
-        Vec3 shakeVector;
-
-        SShake(int shakeID)
-        {
-            memset(this, 0, sizeof(SShake));
-
-            startShake.SetIdentity();
-            startShakeSpeed.SetIdentity();
-            goalShake.SetIdentity();
-            shakeQuat.SetIdentity();
-
-            randomness = 0.5f;
-
-            ID = shakeID;
-        }
-    };
-
-
-    // IView
-    void Release() override;
-    void Update(float frameTime, bool isActive) override;
-    virtual void ProcessShaking(float frameTime);
-    virtual void ProcessShake(SShake* pShake, float frameTime);
-    void ResetShaking() override;
-    void ResetBlending() override { m_viewParams.ResetBlending(); }
-    void LinkTo(AZ::Entity* follow) override;
-    void Unlink() override;
-    AZ::EntityId GetLinkedId() override {return m_linkedTo; };
-    void SetCurrentParams(SViewParams& params) override { m_viewParams = params; };
-    const SViewParams* GetCurrentParams() override {return &m_viewParams; }
-    void SetViewShake(Ang3 shakeAngle, Vec3 shakeShift, float duration, float frequency, float randomness, int shakeID, bool bFlipVec = true, bool bUpdateOnly = false, bool bGroundOnly = false) override;
-    void SetViewShakeEx(const SShakeParams& params) override;
-    void StopShake(int shakeID) override;
-    void SetFrameAdditiveCameraAngles(const Ang3& addFrameAngles) override;
-    void SetScale(const float scale) override;
-    void SetZoomedScale(const float scale) override;
-    void SetActive(const bool bActive) override;
-    // ~IView
-
-    void PostSerialize() override;
-    CCamera& GetCamera() override { return m_camera; }
-    const CCamera& GetCamera() const override { return m_camera; }
-
-protected:
-
-    void ProcessShakeNormal(SShake* pShake, float frameTime);
-    void ProcessShakeNormal_FinalDamping(SShake* pShake, float frameTime);
-    void ProcessShakeNormal_CalcRatio(SShake* pShake, float frameTime, float endSustain);
-    void ProcessShakeNormal_DoShaking(SShake* pShake, float frameTime);
-
-    void ProcessShakeSmooth(SShake* pShake, float frameTime);
-    void ProcessShakeSmooth_DoShaking(SShake* pShake, float frameTime);
-
-    void ApplyFrameAdditiveAngles(Quat& cameraOrientation);
-
-    const float GetScale();
-
-private:
-
-    void GetRandomQuat(Quat& quat, SShake* pShake);
-    void GetRandomVector(Vec3& vec3, SShake* pShake);
-    void CubeInterpolateQuat(float t, SShake* pShake);
-    void CubeInterpolateVector(float t, SShake* pShake);
-
-protected:
-
-    bool m_active;
-    AZ::EntityId m_linkedTo;
-    AZ::Entity* m_azEntity = nullptr;
-
-    SViewParams m_viewParams;
-    CCamera m_camera;
-
-    ISystem* m_pSystem;
-
-    std::vector<SShake> m_shakes;
-
-    Ang3     m_frameAdditiveAngles; // Used mainly for cinematics, where the game can slightly override camera orientation
-
-    float m_scale;
-    float m_zoomedScale;
-};
-
-} // namespace LegacyViewSystem
diff --git a/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
deleted file mode 100644
index d7e5c081c0..0000000000
--- a/Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "CrySystem_precompiled.h"
-
-#include <AzCore/Component/ComponentApplicationBus.h>
-
-#include <Cry_Camera.h>
-#include <ILevelSystem.h>
-#include "ViewSystem.h"
-#include "PNoise3.h"
-#include "DebugCamera.h"
-#include <MathConversion.h>
-
-#include <AzCore/Casting/lossy_cast.h>
-
-#define VS_CALL_LISTENERS(func)                                                                                     \
-    {                                                                                                               \
-        size_t count = m_listeners.size();                                                                          \
-        if (count > 0)                                                                                              \
-        {                                                                                                           \
-            const size_t memSize = count * sizeof(IViewSystemListener*);                                            \
-            IViewSystemListener* *pArray = (IViewSystemListener**) alloca(memSize);                                 \
-            memcpy(pArray, &*m_listeners.begin(), memSize);                                                         \
-            while (count--)                                                                                         \
-            {                                                                                                       \
-                (*pArray)->func; ++pArray;                                                                          \
-            }                                                                                                       \
-        }                                                                                                           \
-    }
-
-namespace LegacyViewSystem
-{
-
-void ToggleDebugCamera([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-#if !defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        DebugCamera* debugCamera = CViewSystem::s_debugCamera;
-        if (debugCamera)
-        {
-            if (!debugCamera->IsEnabled())
-            {
-                debugCamera->OnEnable();
-            }
-            else
-            {
-                debugCamera->OnNextMode();
-            }
-        }
-    }
-#endif
-}
-
-void ToggleDebugCameraInvertY([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-#if !defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        DebugCamera* debugCamera = CViewSystem::s_debugCamera;
-        if (debugCamera)
-        {
-            debugCamera->OnInvertY();
-        }
-    }
-#endif
-}
-
-void DebugCameraMove([[maybe_unused]] IConsoleCmdArgs* pArgs)
-{
-#if !defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        if (pArgs->GetArgCount() != 4)
-        {
-            CryLogAlways("debugCameraMove requires 3 args, not %d.", pArgs->GetArgCount() - 1);
-            return;
-        }
-
-        DebugCamera* debugCamera = CViewSystem::s_debugCamera;
-        if (debugCamera && debugCamera->IsFree())
-        {
-            Vec3::value_type x = azlossy_cast<float>(atof(pArgs->GetArg(1)));
-            Vec3::value_type y = azlossy_cast<float>(atof(pArgs->GetArg(2)));
-            Vec3::value_type z = azlossy_cast<float>(atof(pArgs->GetArg(3)));
-            Vec3 newPos(x, y, z);
-            debugCamera->MovePosition(newPos);
-        }
-    }
-#endif
-}
-
-DebugCamera* CViewSystem::s_debugCamera = nullptr;
-
-//------------------------------------------------------------------------
-CViewSystem::CViewSystem(ISystem* pSystem)
-    : m_pSystem(pSystem)
-    , m_activeViewId(0)
-    , m_nextViewIdToAssign(1000)
-    , m_preSequenceViewId(0)
-    , m_cutsceneViewId(0)
-    , m_cutsceneCount(0)
-    , m_bOverridenCameraRotation(false)
-    , m_bActiveViewFromSequence(false)
-    , m_fBlendInPosSpeed(0.0f)
-    , m_fBlendInRotSpeed(0.0f)
-    , m_bPerformBlendOut(false)
-    , m_useDeferredViewSystemUpdate(false)
-    , m_bControlsAudioListeners(true)
-{
-#if !defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        if (!s_debugCamera)
-        {
-            s_debugCamera = new DebugCamera;
-        }
-
-        REGISTER_COMMAND("debugCameraToggle", ToggleDebugCamera, VF_DEV_ONLY, "Toggle the debug camera.\n");
-        REGISTER_COMMAND("debugCameraInvertY", ToggleDebugCameraInvertY, VF_DEV_ONLY, "Toggle debug camera Y-axis inversion.\n");
-        REGISTER_COMMAND("debugCameraMove", DebugCameraMove, VF_DEV_ONLY, "Move the debug camera the specified distance (x y z).\n");
-        gEnv->pConsole->CreateKeyBind("ctrl_keyboard_key_punctuation_backslash", "debugCameraToggle");
-        gEnv->pConsole->CreateKeyBind("alt_keyboard_key_punctuation_backslash", "debugCameraInvertY");
-    }
-#endif
-
-    REGISTER_CVAR2("cl_camera_noise", &m_fCameraNoise, -1, 0,
-        "Adds hand-held like camera noise to the camera view. \n The higher the value, the higher the noise.\n A value <= 0 disables it.");
-    REGISTER_CVAR2("cl_camera_noise_freq", &m_fCameraNoiseFrequency, 2.5326173f, 0,
-        "Defines camera noise frequency for the camera view. \n The higher the value, the higher the noise.");
-
-    REGISTER_CVAR2("cl_ViewSystemDebug", &m_nViewSystemDebug, 0, VF_CHEAT,
-        "Sets Debug information of the ViewSystem.");
-
-    REGISTER_CVAR2("cl_DefaultNearPlane", &m_fDefaultCameraNearZ, DEFAULT_NEAR, VF_CHEAT,
-        "The default camera near plane. ");
-
-    //Register as level system listener
-    if (m_pSystem->GetILevelSystem())
-    {
-        m_pSystem->GetILevelSystem()->AddListener(this);
-    }
-
-    Camera::CameraSystemRequestBus::Handler::BusConnect();
-}
-
-//------------------------------------------------------------------------
-CViewSystem::~CViewSystem()
-{
-    Camera::CameraSystemRequestBus::Handler::BusDisconnect();
-
-    ClearAllViews();
-
-    IConsole* pConsole = gEnv->pConsole;
-    CRY_ASSERT(pConsole);
-    pConsole->UnregisterVariable("cl_camera_noise", true);
-    pConsole->UnregisterVariable("cl_camera_noise_freq", true);
-    pConsole->UnregisterVariable("cl_ViewSystemDebug", true);
-    pConsole->UnregisterVariable("cl_DefaultNearPlane", true);
-
-    //Remove as level system listener
-    if (m_pSystem->GetILevelSystem())
-    {
-        m_pSystem->GetILevelSystem()->RemoveListener(this);
-    }
-
-#if !defined(_RELEASE)
-    if (!gEnv->IsDedicated())
-    {
-        UNREGISTER_COMMAND("debugCameraToggle");
-        UNREGISTER_COMMAND("debugCameraInvertY");
-        UNREGISTER_COMMAND("debugCameraMove");
-
-        if (s_debugCamera)
-        {
-            delete s_debugCamera;
-            s_debugCamera = nullptr;
-        }
-    }
-#endif
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::Update(float frameTime)
-{
-    if (gEnv->IsDedicated())
-    {
-        return;
-    }
-
-    if (s_debugCamera)
-    {
-        s_debugCamera->Update();
-    }
-
-    CView* const pActiveView = static_cast<CView*>(GetActiveView());
-
-    TViewMap::const_iterator Iter(m_views.begin());
-    TViewMap::const_iterator const IterEnd(m_views.end());
-
-    for (; Iter != IterEnd; ++Iter)
-    {
-        IView* const pView = Iter->second;
-
-        bool const bIsActive = (pView == pActiveView);
-
-        pView->Update(frameTime, bIsActive);
-
-        if (bIsActive)
-        {
-            CCamera& rCamera = pView->GetCamera();
-            if (const SViewParams* currentParams = pView->GetCurrentParams())
-            {
-                SViewParams copyCurrentParams = *currentParams;
-                rCamera.SetJustActivated(copyCurrentParams.justActivated);
-
-                copyCurrentParams.justActivated = false;
-                pView->SetCurrentParams(copyCurrentParams);
-            }
-
-            if (m_bOverridenCameraRotation)
-            {
-                // When camera rotation is overridden.
-                Vec3 pos = rCamera.GetMatrix().GetTranslation();
-                Matrix34 camTM(m_overridenCameraRotation);
-                camTM.SetTranslation(pos);
-                rCamera.SetMatrix(camTM);
-            }
-            else
-            {
-                // Normal setting of the camera
-
-                if (m_fCameraNoise > 0)
-                {
-                    Matrix33 m = Matrix33(rCamera.GetMatrix());
-                    m.OrthonormalizeFast();
-                    Ang3 aAng1 = Ang3::GetAnglesXYZ(m);
-                    //Ang3 aAng2 = RAD2DEG(aAng1);
-
-                    Matrix34 camTM = rCamera.GetMatrix();
-                    Vec3 pos = camTM.GetTranslation();
-                    camTM.SetIdentity();
-
-                    const float fScale = 0.1f;
-                    CPNoise3* pNoise = m_pSystem->GetNoiseGen();
-                    float fRes = pNoise->Noise1D(gEnv->pTimer->GetCurrTime() * m_fCameraNoiseFrequency);
-                    aAng1.x += fRes * m_fCameraNoise * fScale;
-                    pos.z -= fRes * m_fCameraNoise * fScale;
-                    fRes = pNoise->Noise1D(17 + gEnv->pTimer->GetCurrTime() * m_fCameraNoiseFrequency);
-                    aAng1.y -= fRes * m_fCameraNoise * fScale;
-
-                    //aAng1.z+=fRes*0.025f; // left / right movement should be much less visible
-
-                    camTM.SetRotationXYZ(aAng1);
-                    camTM.SetTranslation(pos);
-                    rCamera.SetMatrix(camTM);
-                }
-            }
-
-            AZ_ErrorOnce("CryLegacy", false, "CryLegacy view system no longer available (CViewSystem::Update)");
-        }
-    }
-
-    if (s_debugCamera)
-    {
-        s_debugCamera->PostUpdate();
-    }
-
-    // Display debug info on screen
-    if (m_nViewSystemDebug)
-    {
-        DebugDraw();
-    }
-}
-
-//------------------------------------------------------------------------
-IView* CViewSystem::CreateView()
-{
-    CView* newView = new CView(m_pSystem);
-
-    if (newView)
-    {
-        AddView(newView);
-    }
-
-    return newView;
-}
-
-unsigned int CViewSystem::AddView(IView* pView)
-{
-    assert(pView);
-
-    m_views.insert(TViewMap::value_type(m_nextViewIdToAssign, pView));
-    return m_nextViewIdToAssign++;
-}
-
-void CViewSystem::RemoveView(IView* pView)
-{
-    RemoveViewById(GetViewId(pView));
-}
-
-void CViewSystem::RemoveView(unsigned int viewId)
-{
-    RemoveViewById(viewId);
-}
-
-void CViewSystem::RemoveViewById(unsigned int viewId)
-{
-    TViewMap::iterator iter = m_views.find(viewId);
-
-    if (iter != m_views.end())
-    {
-        if (viewId == m_activeViewId)
-        {
-            m_activeViewId = 0;
-        }
-        if (viewId == m_preSequenceViewId)
-        {
-            m_preSequenceViewId = 0;
-        }
-        SAFE_RELEASE(iter->second);
-        m_views.erase(iter);
-    }
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::SetActiveView(IView* pView)
-{
-    if (pView != NULL)
-    {
-        IView* const pPrevView = GetView(m_activeViewId);
-
-        if (pPrevView != pView)
-        {
-            if (pPrevView != NULL)
-            {
-                pPrevView->SetActive(false);
-            }
-
-            pView->SetActive(true);
-            m_activeViewId = GetViewId(pView);
-        }
-    }
-    else
-    {
-        m_activeViewId = ~0u;
-    }
-
-    m_bActiveViewFromSequence = false;
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::SetActiveView(unsigned int viewId)
-{
-    IView* const pPrevView = GetView(m_activeViewId);
-
-    if (pPrevView != NULL)
-    {
-        pPrevView->SetActive(false);
-    }
-
-    IView* const pView = GetView(viewId);
-
-    if (pView != NULL)
-    {
-        pView->SetActive(true);
-        m_activeViewId = viewId;
-        m_bActiveViewFromSequence = false;
-    }
-}
-
-//------------------------------------------------------------------------
-IView* CViewSystem::GetView(unsigned int viewId)
-{
-    TViewMap::iterator it = m_views.find(viewId);
-
-    if (it != m_views.end())
-    {
-        return it->second;
-    }
-
-    return NULL;
-}
-
-//------------------------------------------------------------------------
-IView* CViewSystem::GetActiveView()
-{
-    return GetView(m_activeViewId);
-}
-
-//------------------------------------------------------------------------
-unsigned int CViewSystem::GetViewId(IView* pView)
-{
-    for (TViewMap::iterator it = m_views.begin(); it != m_views.end(); ++it)
-    {
-        IView* tView = it->second;
-
-        if (tView == pView)
-        {
-            return it->first;
-        }
-    }
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-unsigned int CViewSystem::GetActiveViewId()
-{
-    // cutscene can override the games id of the active view
-    if (m_cutsceneCount && m_cutsceneViewId)
-    {
-        return m_cutsceneViewId;
-    }
-    return m_activeViewId;
-}
-
-//------------------------------------------------------------------------
-IView* CViewSystem::GetViewByEntityId(const AZ::EntityId& id, bool forceCreate)
-{
-    for (TViewMap::iterator it = m_views.begin(); it != m_views.end(); ++it)
-    {
-        IView* tView = it->second;
-
-        if (tView && tView->GetLinkedId() == id)
-        {
-            return tView;
-        }
-    }
-
-    if (forceCreate)
-    {
-        // Component Camera
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
-        if (entity)
-        {
-            if (IView* pNew = CreateView())
-            {
-                pNew->LinkTo(entity);
-                return pNew;
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::SetActiveCamera(const SCameraParams& params)
-{
-    IView* pView = NULL;
-
-    if (params.cameraEntityId.IsValid())
-    {
-        pView = GetViewByEntityId(params.cameraEntityId, true);
-        if (pView)
-        {
-            SViewParams viewParams = *pView->GetCurrentParams();
-            viewParams.fov = params.fov;
-            viewParams.nearplane = params.nearZ;
-
-            if (m_bActiveViewFromSequence == false && m_preSequenceViewId == 0)
-            {
-                m_preSequenceViewId = m_activeViewId;
-                IView* pPrevView = GetView(m_activeViewId);
-                if (pPrevView && m_fBlendInPosSpeed > 0.0f && m_fBlendInRotSpeed > 0.0f)
-                {
-                    viewParams.blendPosSpeed = m_fBlendInPosSpeed;
-                    viewParams.blendRotSpeed = m_fBlendInRotSpeed;
-                    viewParams.BlendFrom(*pPrevView->GetCurrentParams());
-                }
-            }
-
-            if (m_activeViewId != GetViewId(pView) && params.justActivated)
-            {
-                viewParams.justActivated = true;
-            }
-
-            pView->SetCurrentParams(viewParams);
-            // make this one the active view
-            SetActiveView(pView);
-            m_bActiveViewFromSequence = true;
-        }
-    }
-    else
-    {
-        if (m_preSequenceViewId != 0)
-        {
-            // Restore m_preSequenceViewId view
-
-            IView* pActiveView = GetView(m_activeViewId);
-            IView* pNewView = GetView(m_preSequenceViewId);
-            if (pActiveView && pNewView && m_bPerformBlendOut)
-            {
-                SViewParams activeViewParams = *pActiveView->GetCurrentParams();
-                SViewParams newViewParams = *pNewView->GetCurrentParams();
-                newViewParams.BlendFrom(activeViewParams);
-                newViewParams.blendPosSpeed = activeViewParams.blendPosSpeed;
-                newViewParams.blendRotSpeed = activeViewParams.blendRotSpeed;
-
-                if (m_activeViewId != m_preSequenceViewId && params.justActivated)
-                {
-                    newViewParams.justActivated = true;
-                }
-
-                pNewView->SetCurrentParams(newViewParams);
-                SetActiveView(m_preSequenceViewId);
-            }
-            else if (pActiveView && m_activeViewId != m_preSequenceViewId && params.justActivated)
-            {
-                SViewParams activeViewParams = *pActiveView->GetCurrentParams();
-                activeViewParams.justActivated = true;
-
-                if (pNewView)
-                {
-                    pNewView->SetCurrentParams(activeViewParams);
-                    SetActiveView(m_preSequenceViewId);
-                }
-            }
-
-            m_preSequenceViewId = 0;
-            m_bActiveViewFromSequence = false;
-        }
-    }
-    m_cutsceneViewId = GetViewId(pView);
-
-    VS_CALL_LISTENERS(OnCameraChange(params));
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::BeginCutScene(IAnimSequence* pSeq, [[maybe_unused]] unsigned long dwFlags, bool bResetFX)
-{
-    m_cutsceneCount++;
-
-    VS_CALL_LISTENERS(OnBeginCutScene(pSeq, bResetFX));
-}
-
-//------------------------------------------------------------------------
-void CViewSystem::EndCutScene(IAnimSequence* pSeq, [[maybe_unused]] unsigned long dwFlags)
-{
-    m_cutsceneCount -= (m_cutsceneCount > 0);
-
-    ClearCutsceneViews();
-
-    VS_CALL_LISTENERS(OnEndCutScene(pSeq));
-}
-
-void CViewSystem::SendGlobalEvent([[maybe_unused]] const char* pszEvent)
-{
-    // TODO: broadcast to script system
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewSystem::SetOverrideCameraRotation(bool bOverride, Quat rotation)
-{
-    m_bOverridenCameraRotation = bOverride;
-    m_overridenCameraRotation = rotation;
-}
-
-//////////////////////////////////////////////////////////////////
-void CViewSystem::OnLoadingStart([[maybe_unused]] const char* levelName)
-{
-    //If the level is being restarted (IsSerializingFile() == 1)
-    //views should not be cleared, because the main view (player one) won't be recreated in this case
-    //Views will only be cleared when loading a new map, or loading a saved game (IsSerizlizingFile() == 2)
-    bool shouldClearViews = gEnv->pSystem ? (gEnv->pSystem->IsSerializingFile() != 1) : false;
-
-    if (shouldClearViews)
-    {
-        ClearAllViews();
-    }
-}
-
-/////////////////////////////////////////////////////////////////////
-void CViewSystem::OnUnloadComplete([[maybe_unused]] const char* levelName)
-{
-    bool shouldClearViews = gEnv->pSystem ? (gEnv->pSystem->IsSerializingFile() != 1) : false;
-
-    if (shouldClearViews)
-    {
-        ClearAllViews();
-    }
-
-    assert(m_listeners.empty());
-    stl::free_container(m_listeners);
-}
-
-/////////////////////////////////////////////////////////////////////
-void CViewSystem::ClearCutsceneViews()
-{
-    //First switch to previous camera if available
-    //In practice, the camera should be already restored before reaching this point, but just in case.
-    if (m_preSequenceViewId != 0)
-    {
-        SCameraParams camParams;
-        camParams.cameraEntityId.SetInvalid();  //Setting to invalid will try to switch to previous camera
-        camParams.fov = 60.0f;
-        camParams.nearZ = DEFAULT_NEAR;
-        camParams.justActivated = true;
-        SetActiveCamera(camParams);
-    }
-}
-
-///////////////////////////////////////////
-void CViewSystem::ClearAllViews()
-{
-    TViewMap::iterator end = m_views.end();
-    for (TViewMap::iterator it = m_views.begin(); it != end; ++it)
-    {
-        SAFE_RELEASE(it->second);
-    }
-    stl::free_container(m_views);
-    m_preSequenceViewId = 0;
-    m_activeViewId = 0;
-}
-
-////////////////////////////////////////////////////////////////////
-void CViewSystem::DebugDraw()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CViewSystem::PostSerialize()
-{
-    TViewMap::iterator iter = m_views.begin();
-    TViewMap::iterator iterEnd = m_views.end();
-    while (iter != iterEnd)
-    {
-        iter->second->PostSerialize();
-        ++iter;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-void CViewSystem::SetControlAudioListeners(bool bActive)
-{
-    m_bControlsAudioListeners = bActive;
-
-    TViewMap::const_iterator Iter(m_views.begin());
-    TViewMap::const_iterator const IterEnd(m_views.end());
-
-    for (; Iter != IterEnd; ++Iter)
-    {
-        Iter->second->SetActive(bActive);
-    }
-}
-
-} // namespace LegacyViewSystem
diff --git a/Code/Legacy/CrySystem/ViewSystem/ViewSystem.h b/Code/Legacy/CrySystem/ViewSystem/ViewSystem.h
deleted file mode 100644
index 80d1faed15..0000000000
--- a/Code/Legacy/CrySystem/ViewSystem/ViewSystem.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : View System interfaces.
-
-#pragma once
-
-#include "View.h"
-#include "IMovieSystem.h"
-#include <ILevelSystem.h>
-#include <AzFramework/Components/CameraBus.h>
-
-namespace LegacyViewSystem
-{
-
-class DebugCamera;
-
-class CViewSystem
-    : public IViewSystem
-    , public IMovieUser
-    , public ILevelSystemListener
-    , public Camera::CameraSystemRequestBus::Handler
-{
-private:
-
-    using TViewMap = std::map<unsigned int, IView*>;
-    using TViewIdVector = std::vector<unsigned int>;
-
-public:
-
-    //IViewSystem
-    IView* CreateView() override;
-    unsigned int AddView(IView* pView) override;
-    void RemoveView(IView* pView) override;
-    void RemoveView(unsigned int viewId) override;
-
-    void SetActiveView(IView* pView) override;
-    void SetActiveView(unsigned int viewId) override;
-
-    //CameraSystemRequestBus
-    AZ::EntityId GetActiveCamera() override { return m_activeViewId ? GetActiveView()->GetLinkedId() : AZ::EntityId(); }
-
-    //utility functions
-    IView* GetView(unsigned int viewId) override;
-    IView* GetActiveView() override;
-
-    unsigned int GetViewId(IView* pView) override;
-    unsigned int GetActiveViewId() override;
-
-    void PostSerialize() override;
-
-    IView* GetViewByEntityId(const AZ::EntityId& id, bool forceCreate) override;
-
-    float GetDefaultZNear() override { return m_fDefaultCameraNearZ; };
-    void SetBlendParams(float fBlendPosSpeed, float fBlendRotSpeed, bool performBlendOut) override { m_fBlendInPosSpeed = fBlendPosSpeed; m_fBlendInRotSpeed = fBlendRotSpeed; m_bPerformBlendOut = performBlendOut; };
-    void SetOverrideCameraRotation(bool bOverride, Quat rotation) override;
-    bool IsPlayingCutScene() const override
-    {
-        return m_cutsceneCount > 0;
-    }
-    void SetDeferredViewSystemUpdate(bool const bDeferred) override{ m_useDeferredViewSystemUpdate = bDeferred; }
-    bool UseDeferredViewSystemUpdate() const override { return m_useDeferredViewSystemUpdate; }
-    void SetControlAudioListeners(bool const bActive) override;
-    //~IViewSystem
-
-    //IMovieUser
-    void SetActiveCamera(const SCameraParams& Params) override;
-    void BeginCutScene(IAnimSequence* pSeq, unsigned long dwFlags, bool bResetFX) override;
-    void EndCutScene(IAnimSequence* pSeq, unsigned long dwFlags) override;
-    void SendGlobalEvent(const char* pszEvent) override;
-    //~IMovieUser
-
-    // ILevelSystemListener
-    void OnLevelNotFound([[maybe_unused]] const char* levelName) override {};
-    void OnLoadingStart([[maybe_unused]] const char* levelName) override;
-    void OnLoadingComplete([[maybe_unused]] const char* levelName) override{};
-    void OnLoadingError([[maybe_unused]] const char* levelName, [[maybe_unused]] const char* error) override{};
-    void OnLoadingProgress([[maybe_unused]] const char* levelName, [[maybe_unused]] int progressAmount) override{};
-    void OnUnloadComplete([[maybe_unused]] const char* levelName) override;
-    //~ILevelSystemListener
-
-    CViewSystem(ISystem* pSystem);
-    ~CViewSystem();
-
-    void Release() override { delete this; };
-    void Update(float frameTime) override;
-
-    void ForceUpdate(float elapsed) override { Update(elapsed); }
-
-    //void RegisterViewClass(const char *name, IView *(*func)());
-
-    bool AddListener(IViewSystemListener* pListener) override
-    {
-        return stl::push_back_unique(m_listeners, pListener);
-    }
-
-    bool RemoveListener(IViewSystemListener* pListener) override
-    {
-        return stl::find_and_erase(m_listeners, pListener);
-    }
-
-    void ClearAllViews();
-
-private:
-
-    void RemoveViewById(unsigned int viewId);
-    void ClearCutsceneViews();
-    void DebugDraw();
-
-    ISystem* m_pSystem;
-
-    //TViewClassMap m_viewClasses;
-    TViewMap m_views;
-
-    // Listeners
-    std::vector<IViewSystemListener*> m_listeners;
-
-    unsigned int m_activeViewId;
-    unsigned int m_nextViewIdToAssign;  // next id which will be assigned
-    unsigned int m_preSequenceViewId; // viewId before a movie cam dropped in
-
-    unsigned int m_cutsceneViewId;
-    unsigned int m_cutsceneCount;
-
-    bool m_bActiveViewFromSequence;
-
-    bool m_bOverridenCameraRotation;
-    Quat m_overridenCameraRotation;
-    float m_fCameraNoise;
-    float m_fCameraNoiseFrequency;
-
-    float m_fDefaultCameraNearZ;
-    float m_fBlendInPosSpeed;
-    float m_fBlendInRotSpeed;
-    bool m_bPerformBlendOut;
-    int m_nViewSystemDebug;
-
-    bool m_useDeferredViewSystemUpdate;
-    bool m_bControlsAudioListeners;
-
-public:
-    static DebugCamera* s_debugCamera;
-};
-
-} // namespace LegacyViewSystem
diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp
index 22c61d3f22..df82e34abe 100644
--- a/Code/Legacy/CrySystem/XConsole.cpp
+++ b/Code/Legacy/CrySystem/XConsole.cpp
@@ -16,7 +16,6 @@
 #include "System.h"
 #include "ConsoleBatchFile.h"
 
-#include <ITimer.h>
 #include <IRenderer.h>
 #include <ISystem.h>
 #include <ILog.h>
@@ -28,6 +27,7 @@
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/std/algorithm.h>
+#include <AzCore/Time/ITime.h>
 
 #include <LyShine/Bus/UiCursorBus.h>
 //#define DEFENCE_CVAR_HASH_LOGGING
@@ -105,7 +105,8 @@ void Command_SetWaitSeconds(IConsoleCmdArgs* pCmd)
     if (pCmd->GetArgCount() > 1)
     {
         pConsole->m_waitSeconds.SetSeconds(atof(pCmd->GetArg(1)));
-        pConsole->m_waitSeconds += gEnv->pTimer->GetFrameStartTime();
+        const AZ::TimeMs elaspedTimeMs = AZ::GetRealElapsedTimeMs();
+        pConsole->m_waitSeconds += CTimeValue(AZ::TimeMsToSecondsDouble(elaspedTimeMs));
     }
 }
 
@@ -305,7 +306,6 @@ void CXConsole::Init(ISystem* pSystem)
     {
         m_pFont = pSystem->GetICryFont()->GetFont("default");
     }
-    m_pTimer = pSystem->GetITimer();
 
     AzFramework::InputChannelEventListener::Connect();
     AzFramework::InputTextEventListener::Connect();
@@ -934,8 +934,8 @@ void CXConsole::Update()
         const float fRepeatDelay = 1.0f / 40.0f;          // in sec (similar to Windows default but might differ from actual setting)
         const float fHitchDelay = 1.0f / 10.0f;               // in sec. Very low, but still reasonable frame-rate (debug builds)
 
-        m_fRepeatTimer -= gEnv->pTimer->GetRealFrameTime();                                         // works even when time is manipulated
-        //      m_fRepeatTimer -= gEnv->pTimer->GetFrameTime(ITimer::ETIMER_UI);            // can be used once ETIMER_UI works even with t_FixedTime
+        const AZ::TimeUs delta = AZ::GetRealTickDeltaTimeUs(); // works even when time is manipulated
+        m_fRepeatTimer -= AZ::TimeUsToSeconds(delta); 
 
         if (m_fRepeatTimer <= 0.0f)
         {
@@ -1961,7 +1961,9 @@ void CXConsole::ExecuteDeferredCommands()
 
     if (m_waitSeconds.GetValue())
     {
-        if (m_waitSeconds > gEnv->pTimer->GetFrameStartTime())
+        const AZ::TimeMs elaspsedTimeMs = AZ::GetRealElapsedTimeMs();
+        const double elaspedTimeSec = AZ::TimeMsToSecondsDouble(elaspsedTimeMs);
+        if (m_waitSeconds > CTimeValue(elaspedTimeSec))
         {
             return;
         }
diff --git a/Code/Legacy/CrySystem/XConsole.h b/Code/Legacy/CrySystem/XConsole.h
index a10adda97b..535f5b8650 100644
--- a/Code/Legacy/CrySystem/XConsole.h
+++ b/Code/Legacy/CrySystem/XConsole.h
@@ -13,8 +13,8 @@
 #pragma once
 
 #include <IConsole.h>
-#include "Timer.h"
 #include <CryCommon/StlUtils.h>
+#include <CryCommon/TimeValue.h>
 #include <AzFramework/Components/ConsoleBus.h>
 #include <AzFramework/CommandLine/CommandRegistrationBus.h>
 
@@ -377,7 +377,6 @@ private: // ----------------------------------------------------------
 
     CSystem*                                               m_pSystem;
     IFFont*                                                m_pFont;
-    ITimer*                                                m_pTimer;
 
     ICVar*                                                 m_pSysDeactivateConsole;
 
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp b/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
index 528e3dbcc5..f58d8c7fcf 100644
--- a/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
@@ -10,6 +10,7 @@
 #include "CrySystem_precompiled.h"
 #include "SerializeXMLReader.h"
 #include <ISystem.h>
+#include <AzCore/Time/ITime.h>
 
 #define TAG_SCRIPT_VALUE "v"
 #define TAG_SCRIPT_TYPE "t"
@@ -21,7 +22,6 @@
 CSerializeXMLReaderImpl::CSerializeXMLReaderImpl(const XmlNodeRef& nodeRef)
     : m_nErrors(0)
 {
-    //m_curTime = gEnv->pTimer->GetFrameStartTime();
     assert(!!nodeRef);
     m_nodeStack.push_back(CParseState());
     m_nodeStack.back().Init(nodeRef);
@@ -87,18 +87,21 @@ bool CSerializeXMLReaderImpl::Value(const char* name, CTimeValue& value)
     }
     else
     {
+        const AZ::TimeMs elaspsedTimeMs = AZ::GetRealElapsedTimeMs();
+        const double elaspedTimeSec = AZ::TimeMsToSecondsDouble(elaspsedTimeMs);
+        const CTimeValue elaspedTime(elaspedTimeSec);
         float delta;
         if (!GetAttr(nodeRef, name, delta))
         {
             //CryWarning( VALIDATOR_MODULE_SYSTEM,VALIDATOR_WARNING,"Failed to read time value %s", name);
             //Failed();
-            value = gEnv->pTimer->GetFrameStartTime(); // in case we don't find the node, it was assumed to be the default value (0.0)
+            value = elaspedTime; // in case we don't find the node, it was assumed to be the default value (0.0)
             // 0.0 means current time, whereas "zero" really means CTimeValue(0.0), see above
             return false;
         }
         else
         {
-            value = CTimeValue(gEnv->pTimer->GetFrameStartTime() + delta);
+            value = CTimeValue(elaspedTime + delta);
         }
     }
     return true;
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLReader.h b/Code/Legacy/CrySystem/XML/SerializeXMLReader.h
index 58c150db24..39f3230521 100644
--- a/Code/Legacy/CrySystem/XML/SerializeXMLReader.h
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLReader.h
@@ -11,7 +11,6 @@
 #include "SimpleSerialize.h"
 #include <stack>
 #include <IXml.h>
-#include <ITimer.h>
 #include "xml.h"
 
 class CSerializeXMLReaderImpl
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
index 5a3e403218..ee5fe21797 100644
--- a/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.cpp
@@ -10,6 +10,8 @@
 #include "CrySystem_precompiled.h"
 #include "SerializeXMLWriter.h"
 
+#include <AzCore/Time/ITime.h>
+
 static const size_t MAX_NODE_STACK_DEPTH = 40;
 
 #define TAG_SCRIPT_VALUE "v"
@@ -18,7 +20,9 @@ static const size_t MAX_NODE_STACK_DEPTH = 40;
 
 CSerializeXMLWriterImpl::CSerializeXMLWriterImpl(const XmlNodeRef& nodeRef)
 {
-    m_curTime = gEnv->pTimer->GetFrameStartTime();
+    const AZ::TimeMs elaspsedTimeMs = AZ::GetRealElapsedTimeMs();
+    const double elaspedTimeSec = AZ::TimeMsToSecondsDouble(elaspsedTimeMs);
+    m_curTime = CTimeValue(elaspedTimeSec);
     assert(!!nodeRef);
     m_nodeStack.push_back(nodeRef);
 
diff --git a/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
index 26fbe4b29c..822045a3f5 100644
--- a/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
+++ b/Code/Legacy/CrySystem/XML/SerializeXMLWriter.h
@@ -13,7 +13,6 @@
 
 
 #include <ISystem.h>
-#include <ITimer.h>
 #include <IXml.h>
 #include "SimpleSerialize.h"
 
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
index a13759e82b..14ca936472 100644
--- a/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
@@ -11,20 +11,6 @@
 #include "Cry_Color.h"
 #include "XMLBinaryNode.h"
 
-//////////////////////////////////////////////////////////////////////////
-CBinaryXmlData::CBinaryXmlData()
-    : pNodes(0)
-    , pAttributes(0)
-    , pChildIndices(0)
-    , pStringData(0)
-    , pFileContents(0)
-    , nFileSize(0)
-    , bOwnsFileContentsMemory(true)
-    , pBinaryNodes(0)
-    , nRefCount(0)
-{
-}
-
 //////////////////////////////////////////////////////////////////////////
 CBinaryXmlData::~CBinaryXmlData()
 {
@@ -32,10 +18,10 @@ CBinaryXmlData::~CBinaryXmlData()
     {
         delete [] pFileContents;
     }
-    pFileContents = 0;
+    pFileContents = nullptr;
 
     delete [] pBinaryNodes;
-    pBinaryNodes = 0;
+    pBinaryNodes = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -56,7 +42,7 @@ XmlNodeRef CBinaryXmlNode::getParent() const
 XmlNodeRef CBinaryXmlNode::createNode([[maybe_unused]] const char* tag)
 {
     assert(0);
-    return 0;
+    return nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -93,7 +79,7 @@ bool CBinaryXmlNode::getAttr(const char* key, const char** value) const
 
 bool CBinaryXmlNode::haveAttr(const char* key) const
 {
-    return (GetValue(key) != 0);
+    return (GetValue(key) != nullptr);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -113,7 +99,7 @@ bool CBinaryXmlNode::getAttr(const char* key, unsigned int& value) const
     const char* svalue = GetValue(key);
     if (svalue)
     {
-        value = strtoul(svalue, NULL, 10);
+        value = strtoul(svalue, nullptr, 10);
         return true;
     }
     return false;
@@ -290,7 +276,7 @@ XmlNodeRef CBinaryXmlNode::findChild(const char* tag) const
             return m_pData->pBinaryNodes + m_pData->pChildIndices[i];
         }
     }
-    return 0;
+    return nullptr;
 }
 
 //! Get XML Node child nodes.
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryNode.h b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h
index b4706f1b85..09126b92f9 100644
--- a/Code/Legacy/CrySystem/XML/XMLBinaryNode.h
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h
@@ -6,13 +6,8 @@
  *
  */
 
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
 #pragma once
 
-
-#include <algorithm>
 #include "IXml.h"
 #include "XMLBinaryHeaders.h"
 
@@ -26,20 +21,20 @@ class CBinaryXmlNode;
 class CBinaryXmlData
 {
 public:
-    const XMLBinary::Node*       pNodes;
-    const XMLBinary::Attribute*  pAttributes;
-    const XMLBinary::NodeIndex*  pChildIndices;
-    const char*                  pStringData;
+    const XMLBinary::Node* pNodes = nullptr;
+    const XMLBinary::Attribute* pAttributes = nullptr;
+    const XMLBinary::NodeIndex* pChildIndices = nullptr;
+    const char* pStringData = nullptr;
 
-    const char*                  pFileContents;
-    size_t                       nFileSize;
-    bool                         bOwnsFileContentsMemory;
+    const char* pFileContents = nullptr;
+    size_t nFileSize = 0;
+    bool bOwnsFileContentsMemory = true;
 
-    CBinaryXmlNode*              pBinaryNodes;
+    CBinaryXmlNode* pBinaryNodes = nullptr;
 
-    int                          nRefCount;
+    int nRefCount = 0;
 
-    CBinaryXmlData();
+    CBinaryXmlData() = default;
     ~CBinaryXmlData();
 };
 
@@ -96,7 +91,6 @@ public:
     virtual bool getAttributeByIndex(int index, XmlString& key, XmlString& value);
 
 
-    void shareChildren([[maybe_unused]] const XmlNodeRef& fromNode) override { assert(0); };
     void copyAttributes(XmlNodeRef fromNode) override { assert(0); };
 
     //! Get XML Node attribute for specified key.
@@ -110,8 +104,6 @@ public:
     bool haveAttr(const char* key) const override;
 
     XmlNodeRef newChild([[maybe_unused]] const char* tagName) override { assert(0); return 0; };
-    void replaceChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) override { assert(0); };
-    void insertChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) override { assert(0); };
     void addChild([[maybe_unused]] const XmlNodeRef& node) override { assert(0); };
     void removeChild([[maybe_unused]] const XmlNodeRef& node) override { assert(0); };
 
@@ -127,7 +119,6 @@ public:
     //! Find node with specified tag.
     XmlNodeRef findChild(const char* tag) const override;
     void deleteChild([[maybe_unused]] const char* tag) { assert(0); };
-    void deleteChildAt([[maybe_unused]] int nIndex) override { assert(0); };
 
     //! Get parent XML node.
     XmlNodeRef  getParent() const override;
@@ -136,10 +127,6 @@ public:
     const char* getContent() const override { return _string(_node()->nContentStringOffset); };
     void setContent([[maybe_unused]] const char* str) override { assert(0); };
 
-    XmlNodeRef  clone() override  { assert(0); return 0; };
-
-    //! Returns line number for XML tag.
-    int getLine() const override { return 0; };
     //! Set line number in xml.
     void setLine([[maybe_unused]] int line) override { assert(0); };
 
@@ -225,5 +212,3 @@ private:
 
     friend class XMLBinary::XMLBinaryReader;
 };
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H
diff --git a/Code/Legacy/CrySystem/XML/XmlUtils.cpp b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
index 3e6a49f266..26d6f2336b 100644
--- a/Code/Legacy/CrySystem/XML/XmlUtils.cpp
+++ b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
@@ -79,22 +79,16 @@ void GetMD5(const char* pSrcBuffer, int nSrcSize, char signatureMD5[16])
 }
 
 //////////////////////////////////////////////////////////////////////////
-class CXmlSerializer
-    : public IXmlSerializer
+class CXmlSerializer final : public IXmlSerializer
 {
 public:
-    CXmlSerializer()
-        : m_nRefCount(0)
-        , m_pReaderImpl(nullptr)
-        , m_pReaderSer(nullptr)
-        , m_pWriterSer(nullptr)
-        , m_pWriterImpl(nullptr)
-    {
-    }
+    CXmlSerializer() = default;
+
     ~CXmlSerializer()
     {
         ClearAll();
     }
+
     void ClearAll()
     {
         SAFE_DELETE(m_pReaderSer);
@@ -104,7 +98,11 @@ public:
     }
 
     //////////////////////////////////////////////////////////////////////////
-    void AddRef() override { ++m_nRefCount; }
+    void AddRef() override
+    {
+        ++m_nRefCount;
+    }
+
     void Release() override
     {
         if (--m_nRefCount <= 0)
@@ -120,6 +118,7 @@ public:
         m_pWriterSer = new CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>(*m_pWriterImpl);
         return m_pWriterSer;
     }
+
     ISerialize* GetReader(XmlNodeRef& node) override
     {
         ClearAll();
@@ -130,12 +129,12 @@ public:
 
     //////////////////////////////////////////////////////////////////////////
 private:
-    int m_nRefCount;
-    CSerializeXMLReaderImpl* m_pReaderImpl;
-    CSimpleSerializeWithDefaults<CSerializeXMLReaderImpl>* m_pReaderSer;
+    int m_nRefCount = 0;
+    CSerializeXMLReaderImpl* m_pReaderImpl = nullptr;
+    CSimpleSerializeWithDefaults<CSerializeXMLReaderImpl>* m_pReaderSer = nullptr;
 
-    CSerializeXMLWriterImpl* m_pWriterImpl;
-    CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>* m_pWriterSer;
+    CSerializeXMLWriterImpl* m_pWriterImpl = nullptr;
+    CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>* m_pWriterSer = nullptr;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -145,8 +144,7 @@ IXmlSerializer* CXmlUtils::CreateXmlSerializer()
 }
 
 //////////////////////////////////////////////////////////////////////////
-class CXmlBinaryDataWriterFile
-    : public XMLBinary::IDataWriter
+class CXmlBinaryDataWriterFile final : public XMLBinary::IDataWriter
 {
 public:
     CXmlBinaryDataWriterFile(const char* file)
@@ -177,8 +175,7 @@ private:
 };
 
 //////////////////////////////////////////////////////////////////////////
-class CXmlTableReader
-    : public IXmlTableReader
+class CXmlTableReader final : public IXmlTableReader
 {
 public:
     CXmlTableReader();
diff --git a/Code/Legacy/CrySystem/XML/xml.cpp b/Code/Legacy/CrySystem/XML/xml.cpp
index 65a2cb6ffd..95755d78fe 100644
--- a/Code/Legacy/CrySystem/XML/xml.cpp
+++ b/Code/Legacy/CrySystem/XML/xml.cpp
@@ -626,20 +626,6 @@ void CXmlNode::deleteChild(const char* tag)
     }
 }
 
-//////////////////////////////////////////////////////////////////////////
-void CXmlNode::deleteChildAt(int nIndex)
-{
-    if (m_pChilds)
-    {
-        XmlNodes& childs = *m_pChilds;
-        if (nIndex >= 0 && nIndex < (int)childs.size())
-        {
-            ReleaseChild(childs[nIndex]);
-            childs.erase(childs.begin() + nIndex);
-        }
-    }
-}
-
 //! Adds new child node.
 void CXmlNode::addChild(const XmlNodeRef& node)
 {
@@ -655,74 +641,12 @@ void CXmlNode::addChild(const XmlNodeRef& node)
     pNode->setParent(this);
 };
 
-void CXmlNode::shareChildren(const XmlNodeRef& inFromMe)
-{
-    int     numChildren = inFromMe->getChildCount();
-
-    removeAllChilds();
-
-    if (numChildren > 0)
-    {
-        XmlNodeRef      child;
-
-        m_pChilds = new XmlNodes;
-        m_pChilds->reserve(numChildren);
-        for (int i = 0; i < numChildren; i++)
-        {
-            child = inFromMe->getChild(i);
-
-            child->AddRef();
-            // not overwriting parent assignment of child, we share the node but do not exclusively own it
-            m_pChilds->push_back(child);
-        }
-    }
-}
-
 void CXmlNode::setParent(const XmlNodeRef& inNewParent)
 {
     // note, parent ptrs are not ref counted
     m_parent = inNewParent;
 }
 
-void CXmlNode::insertChild(int inIndex, const XmlNodeRef& inNewChild)
-{
-    assert(inIndex >= 0 && inIndex <= getChildCount());
-    assert(inNewChild != 0);
-    if (inIndex >= 0 && inIndex <= getChildCount() && inNewChild)
-    {
-        if (getChildCount() == 0)
-        {
-            addChild(inNewChild);
-        }
-        else
-        {
-            IXmlNode* pNode = ((IXmlNode*)inNewChild);
-            pNode->AddRef();
-            m_pChilds->insert(m_pChilds->begin() + inIndex, pNode);
-            pNode->setParent(this);
-        }
-    }
-}
-
-void CXmlNode::replaceChild(int inIndex, const XmlNodeRef& inNewChild)
-{
-    assert(inIndex >= 0 && inIndex < getChildCount());
-    assert(inNewChild != 0);
-    if (inIndex >= 0 && inIndex < getChildCount() && inNewChild)
-    {
-        IXmlNode* wasChild = (*m_pChilds)[inIndex];
-
-        if (wasChild->getParent() == this)
-        {
-            wasChild->setParent(XmlNodeRef());          // child is orphaned, will be freed by Release() below if this parent is last holding a reference to it
-        }
-        wasChild->Release();
-        inNewChild->AddRef();
-        (*m_pChilds)[inIndex] = inNewChild;
-        inNewChild->setParent(this);
-    }
-}
-
 XmlNodeRef CXmlNode::newChild(const char* tagName)
 {
     XmlNodeRef node = createNode(tagName);
@@ -817,34 +741,6 @@ bool CXmlNode::getAttributeByIndex(int index, XmlString& key, XmlString& value)
     }
     return false;
 }
-//////////////////////////////////////////////////////////////////////////
-XmlNodeRef CXmlNode::clone()
-{
-    CXmlNode* node = new CXmlNode;
-    XmlNodeRef  result(node);
-    node->m_pStringPool = m_pStringPool;
-    m_pStringPool->AddRef();
-    node->m_tag = m_tag;
-    node->m_content = m_content;
-    // Clone attributes.
-    CXmlNode* n = (CXmlNode*)(IXmlNode*)node;
-    n->copyAttributes(this);
-    // Clone sub nodes.
-
-    if (m_pChilds)
-    {
-        const XmlNodes& childs = *m_pChilds;
-
-        node->m_pChilds = new XmlNodes;
-        node->m_pChilds->reserve(childs.size());
-        for (int i = 0, num = static_cast<int>(childs.size()); i < num; ++i)
-        {
-            node->addChild(childs[i]->clone());
-        }
-    }
-
-    return result;
-}
 
 //////////////////////////////////////////////////////////////////////////
 static void AddTabsToString(XmlString& xml, int level)
@@ -1206,16 +1102,6 @@ XmlString CXmlNode::getXML(int level) const
     return xml;
 }
 
-XmlString CXmlNode::getXMLUnsafe(int level, char* tmpBuffer, uint32 sizeOfTmpBuffer) const
-{
-    char* endPtr = tmpBuffer + sizeOfTmpBuffer - 1;
-    char* endOfBuffer = AddToXmlStringUnsafe(tmpBuffer, level, endPtr);
-    endOfBuffer[0] = '\0';
-    XmlString ret(tmpBuffer);
-    return ret;
-}
-
-
 // TODO: those 2 saving functions are a bit messy. should probably make a separate one for the use of PlatformAPI
 bool CXmlNode::saveToFile(const char* fileName)
 {
@@ -1247,9 +1133,7 @@ bool CXmlNode::saveToFile(const char* fileName)
 
 bool CXmlNode::saveToFile([[maybe_unused]] const char* fileName, size_t chunkSize, AZ::IO::HandleType fileHandle)
 {
-#ifdef WIN32
-    CrySetFileAttributes(fileName, 0x00000080);  // FILE_ATTRIBUTE_NORMAL
-#endif //WIN32
+    CrySetFileAttributes(fileName, FILE_ATTRIBUTE_NORMAL);
 
     if (chunkSize < 256 * 1024)   // make at least 256k
     {
diff --git a/Code/Legacy/CrySystem/XML/xml.h b/Code/Legacy/CrySystem/XML/xml.h
index 0605142b9f..039ca0b92f 100644
--- a/Code/Legacy/CrySystem/XML/xml.h
+++ b/Code/Legacy/CrySystem/XML/xml.h
@@ -46,14 +46,14 @@ class XmlParser
 {
 public:
     explicit XmlParser(bool bReuseStrings);
-    ~XmlParser();
+    ~XmlParser() override;
 
-    void AddRef()
+    void AddRef() override
     {
         ++m_nRefCount;
     }
 
-    void Release()
+    void Release() override
     {
         if (--m_nRefCount <= 0)
         {
@@ -61,9 +61,9 @@ public:
         }
     }
 
-    virtual XmlNodeRef ParseFile(const char* filename, bool bCleanPools);
+    XmlNodeRef ParseFile(const char* filename, bool bCleanPools) override;
 
-    virtual XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false);
+    XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false) override;
 
     const char* getErrorString() const { return m_errorString; }
 
@@ -112,7 +112,7 @@ public:
     CXmlNode();
     CXmlNode(const char* tag, bool bReuseStrings, bool bIsProcessingInstruction = false);
     //! Destructor.
-    ~CXmlNode();
+    ~CXmlNode() override;
 
     //////////////////////////////////////////////////////////////////////////
     // Custom new/delete with pool allocator.
@@ -120,125 +120,118 @@ public:
     //void* operator new( size_t nSize );
     //void operator delete( void *ptr );
 
-    virtual void DeleteThis();
+    void DeleteThis() override;
 
     //! Create new XML node.
-    XmlNodeRef createNode(const char* tag);
+    XmlNodeRef createNode(const char* tag) override;
 
     //! Get XML node tag.
-    const char* getTag() const { return m_tag; };
-    void    setTag(const char* tag);
+    const char* getTag() const override
+    { return m_tag; };
+    void    setTag(const char* tag) override;
 
     //! Return true if given tag equal to node tag.
-    bool isTag(const char* tag) const;
+    bool isTag(const char* tag) const override;
 
     //! Get XML Node attributes.
-    virtual int getNumAttributes() const { return m_pAttributes ? (int)m_pAttributes->size() : 0; };
+    int getNumAttributes() const override
+    { return m_pAttributes ? (int)m_pAttributes->size() : 0; };
     //! Return attribute key and value by attribute index.
-    virtual bool getAttributeByIndex(int index, const char** key, const char** value);
+    bool getAttributeByIndex(int index, const char** key, const char** value) override;
 
     //! Return attribute key and value by attribute index, string version.
     virtual bool getAttributeByIndex(int index, XmlString& key, XmlString& value);
 
-
-    virtual void copyAttributes(XmlNodeRef fromNode);
-    virtual void shareChildren(const XmlNodeRef& fromNode);
+    void copyAttributes(XmlNodeRef fromNode) override;
 
     //! Get XML Node attribute for specified key.
-    const char* getAttr(const char* key) const;
+    const char* getAttr(const char* key) const override;
 
     //! Get XML Node attribute for specified key.
     // Returns true if the attribute existes, alse otherwise.
-    bool                getAttr(const char* key, const char** value) const;
+    bool                getAttr(const char* key, const char** value) const override;
 
     //! Check if attributes with specified key exist.
-    bool haveAttr(const char* key) const;
+    bool haveAttr(const char* key) const override;
 
     //! Creates new xml node and add it to childs list.
-    XmlNodeRef newChild(const char* tagName);
+    XmlNodeRef newChild(const char* tagName) override;
 
     //! Adds new child node.
-    void addChild(const XmlNodeRef& node);
+    void addChild(const XmlNodeRef& node) override;
     //! Remove child node.
-    void removeChild(const XmlNodeRef& node);
-
-    void insertChild(int nIndex, const XmlNodeRef& node);
-    void replaceChild(int nIndex, const XmlNodeRef& node);
+    void removeChild(const XmlNodeRef& node) override;
 
     //! Remove all child nodes.
-    void removeAllChilds();
+    void removeAllChilds() override;
 
     //! Get number of child XML nodes.
-    int getChildCount() const { return m_pChilds ? (int)m_pChilds->size() : 0; };
+    int getChildCount() const override { return m_pChilds ? (int)m_pChilds->size() : 0; }
 
     //! Get XML Node child nodes.
-    XmlNodeRef getChild(int i) const;
+    XmlNodeRef getChild(int i) const override;
 
     //! Find node with specified tag.
-    XmlNodeRef findChild(const char* tag) const;
+    XmlNodeRef findChild(const char* tag) const override;
     void deleteChild(const char* tag);
-    void deleteChildAt(int nIndex);
 
     //! Get parent XML node.
-    XmlNodeRef  getParent() const { return m_parent; }
-    void                setParent(const XmlNodeRef& inRef);
+    XmlNodeRef  getParent() const override { return m_parent; }
+    void setParent(const XmlNodeRef& inRef) override;
 
 
     //! Returns content of this node.
-    const char* getContent() const { return m_content; };
-    void setContent(const char* str);
+    const char* getContent() const override
+    { return m_content; };
+    void setContent(const char* str) override;
 
-    XmlNodeRef  clone();
-
-    //! Returns line number for XML tag.
-    int getLine() const { return m_line; };
     //! Set line number in xml.
-    void setLine(int line) { m_line = line; };
+    void setLine(int line) override { m_line = line; }
 
     //! Returns XML of this node and sub nodes.
-    virtual IXmlStringData* getXMLData(int nReserveMem = 0) const;
-    XmlString getXML(int level = 0) const;
-    XmlString getXMLUnsafe(int level, char* tmpBuffer, uint32 sizeOfTmpBuffer) const;
-    bool saveToFile(const char* fileName);   // saves in one huge chunk
-    bool saveToFile(const char* fileName, size_t chunkSizeBytes, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle); // save in small memory chunks
+    IXmlStringData* getXMLData(int nReserveMem = 0) const override;
+    XmlString getXML(int level = 0) const override;
+    bool saveToFile(const char* fileName) override;   // saves in one huge chunk
+    bool saveToFile(const char* fileName, size_t chunkSizeBytes, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle) override; // save in small memory chunks
 
     //! Set new XML Node attribute (or override attribute with same key).
     using IXmlNode::setAttr;
-    void setAttr(const char* key, const char* value);
-    void setAttr(const char* key, int value);
-    void setAttr(const char* key, unsigned int value);
-    void setAttr(const char* key, int64 value);
-    void setAttr(const char* key, uint64 value, bool useHexFormat = true);
-    void setAttr(const char* key, float value);
-    void setAttr(const char* key, double value);
-    void setAttr(const char* key, const Vec2& value);
-    void setAttr(const char* key, const Ang3& value);
-    void setAttr(const char* key, const Vec3& value);
-    void setAttr(const char* key, const Vec4& value);
-    void setAttr(const char* key, const Quat& value);
+    void setAttr(const char* key, const char* value) override;
+    void setAttr(const char* key, int value) override;
+    void setAttr(const char* key, unsigned int value) override;
+    void setAttr(const char* key, int64 value) override;
+    void setAttr(const char* key, uint64 value, bool useHexFormat = true) override;
+    void setAttr(const char* key, float value) override;
+    void setAttr(const char* key, double value) override;
+    void setAttr(const char* key, const Vec2& value) override;
+    void setAttr(const char* key, const Ang3& value) override;
+    void setAttr(const char* key, const Vec3& value) override;
+    void setAttr(const char* key, const Vec4& value) override;
+    void setAttr(const char* key, const Quat& value) override;
 
     //! Delete attrbute.
-    void delAttr(const char* key);
+    void delAttr(const char* key) override;
     //! Remove all node attributes.
-    void removeAllAttributes();
+    void removeAllAttributes() override;
 
     //! Get attribute value of node.
-    bool getAttr(const char* key, int& value) const;
-    bool getAttr(const char* key, unsigned int& value) const;
-    bool getAttr(const char* key, int64& value) const;
-    bool getAttr(const char* key, uint64& value, bool useHexFormat = true  /*ignored*/) const;
-    bool getAttr(const char* key, float& value) const;
-    bool getAttr(const char* key, double& value) const;
-    bool getAttr(const char* key, bool& value) const;
+    bool getAttr(const char* key, int& value) const override;
+    bool getAttr(const char* key, unsigned int& value) const override;
+    bool getAttr(const char* key, int64& value) const override;
+    bool getAttr(const char* key, uint64& value, bool useHexFormat = true  /*ignored*/) const override;
+    bool getAttr(const char* key, float& value) const override;
+    bool getAttr(const char* key, double& value) const override;
+    bool getAttr(const char* key, bool& value) const override;
 
-    bool getAttr(const char* key, XmlString& value) const  {const char*    v(NULL); bool  boHasAttribute(getAttr(key, &v)); value = v; return boHasAttribute; }
+    bool getAttr(const char* key, XmlString& value) const override
+    {const char*    v(NULL); bool  boHasAttribute(getAttr(key, &v)); value = v; return boHasAttribute; }
 
-    bool getAttr(const char* key, Vec2& value) const;
-    bool getAttr(const char* key, Ang3& value) const;
-    bool getAttr(const char* key, Vec3& value) const;
-    bool getAttr(const char* key, Vec4& value) const;
-    bool getAttr(const char* key, Quat& value) const;
-    bool getAttr(const char* key, ColorB& value) const;
+    bool getAttr(const char* key, Vec2& value) const override;
+    bool getAttr(const char* key, Ang3& value) const override;
+    bool getAttr(const char* key, Vec3& value) const override;
+    bool getAttr(const char* key, Vec4& value) const override;
+    bool getAttr(const char* key, Quat& value) const override;
+    bool getAttr(const char* key, ColorB& value) const override;
 
 protected:
 
@@ -356,7 +349,7 @@ class CXmlNodeReuse
 {
 public:
     CXmlNodeReuse(const char* tag, CXmlNodePool* pPool);
-    virtual void Release();
+    void Release() override;
 
 protected:
     CXmlNodePool* m_pPool;
diff --git a/Code/Legacy/CrySystem/crysystem_files.cmake b/Code/Legacy/CrySystem/crysystem_files.cmake
index fc923705f2..6e8f9978fb 100644
--- a/Code/Legacy/CrySystem/crysystem_files.cmake
+++ b/Code/Legacy/CrySystem/crysystem_files.cmake
@@ -20,7 +20,6 @@ set(FILES
     SystemEventDispatcher.cpp
     SystemInit.cpp
     SystemWin32.cpp
-    Timer.cpp
     XConsole.cpp
     XConsoleVariable.cpp
     AZCrySystemInitLogSink.h
@@ -36,7 +35,6 @@ set(FILES
     CrySystem_precompiled.h
     System.h
     SystemEventDispatcher.h
-    Timer.h
     XConsole.h
     XConsoleVariable.h
     XML/SerializeXMLReader.cpp
@@ -59,11 +57,5 @@ set(FILES
     LevelSystem/LevelSystem.h
     LevelSystem/SpawnableLevelSystem.cpp
     LevelSystem/SpawnableLevelSystem.h
-    ViewSystem/DebugCamera.cpp
-    ViewSystem/DebugCamera.h
-    ViewSystem/View.cpp
-    ViewSystem/View.h
-    ViewSystem/ViewSystem.cpp
-    ViewSystem/ViewSystem.h
     WindowsErrorReporting.cpp
 )
diff --git a/Code/Tools/AWSNativeSDKInit/CMakeLists.txt b/Code/Tools/AWSNativeSDKInit/CMakeLists.txt
index d571f0d9e3..57ee31d30d 100644
--- a/Code/Tools/AWSNativeSDKInit/CMakeLists.txt
+++ b/Code/Tools/AWSNativeSDKInit/CMakeLists.txt
@@ -24,3 +24,30 @@ ly_add_target(
             3rdParty::AWSNativeSDK::Core
             AZ::AzCore
 )
+
+################################################################################
+# Tests
+################################################################################
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+    ly_add_target(
+        NAME AWSNativeSDKInit.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+        NAMESPACE AZ
+        FILES_CMAKE
+            aws_native_sdk_init_tests_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                include
+                tests
+                source
+        BUILD_DEPENDENCIES
+            PRIVATE
+                AZ::AzCore
+                AZ::AzFramework
+                AZ::AzTest
+                AZ::AWSNativeSDKInit
+                3rdParty::AWSNativeSDK::Core
+    )
+    ly_add_googletest(
+        NAME AZ::AWSNativeSDKInit.Tests
+    )
+endif()
diff --git a/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_tests_files.cmake b/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_tests_files.cmake
new file mode 100644
index 0000000000..9029a1198a
--- /dev/null
+++ b/Code/Tools/AWSNativeSDKInit/aws_native_sdk_init_tests_files.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    tests/AWSLogSystemInterfaceTest.cpp
+    tests/AWSNativeSDKInitTest.cpp
+)
diff --git a/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp b/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp
index 113e513743..0ccfc43ba4 100644
--- a/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp
+++ b/Code/Tools/AWSNativeSDKInit/source/AWSLogSystemInterface.cpp
@@ -10,6 +10,8 @@
 #include <AWSNativeSDKInit/AWSLogSystemInterface.h>
 
 #include <AzCore/base.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Interface/Interface.h>
 #include <AzCore/Module/Environment.h>
 
 #include <stdarg.h>
@@ -24,6 +26,9 @@ AZ_POP_DISABLE_WARNING
 
 namespace AWSNativeSDKInit
 {
+    AZ_CVAR(int, bg_awsLogLevel, -1, nullptr, AZ::ConsoleFunctorFlags::Null,
+        "AWSLogLevel used to control verbosity of logging system. Off = 0, Fatal = 1, Error = 2, Warn = 3, Info = 4, Debug = 5, Trace = 6");
+
     const char* AWSLogSystemInterface::AWS_API_LOG_PREFIX = "AwsApi-";
     const int AWSLogSystemInterface::MAX_MESSAGE_LENGTH = 4096;
     const char* AWSLogSystemInterface::MESSAGE_FORMAT = "[AWS] %s - %s";
@@ -40,15 +45,16 @@ namespace AWSNativeSDKInit
     Aws::Utils::Logging::LogLevel AWSLogSystemInterface::GetLogLevel() const
     {
         Aws::Utils::Logging::LogLevel newLevel = m_logLevel;
-        static const char* const logLevelEnvVar = "sys_SetLogLevel";
-        auto logVar = AZ::Environment::FindVariable<int>(logLevelEnvVar);
-
-        if (logVar)
+        if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
         {
-            newLevel = (Aws::Utils::Logging::LogLevel) *logVar;
+            int awsLogLevel = -1;
+            console->GetCvarValue("bg_awsLogLevel", awsLogLevel);
+            if (awsLogLevel >= 0)
+            {
+                newLevel = static_cast<Aws::Utils::Logging::LogLevel>(awsLogLevel);
+            }
         }
-
-        return newLevel != m_logLevel ? newLevel : m_logLevel;
+        return newLevel;
     }
 
     /**
@@ -78,14 +84,12 @@ namespace AWSNativeSDKInit
     */
     void AWSLogSystemInterface::LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream)
     {
-
         if(!ShouldLog(logLevel)) 
         {
             return;
         }
 
         ForwardAwsApiLogMessage(logLevel, tag, messageStream.str().c_str());
-
     }
 
     bool AWSLogSystemInterface::ShouldLog(Aws::Utils::Logging::LogLevel logLevel)
@@ -93,7 +97,7 @@ namespace AWSNativeSDKInit
 #if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
         Aws::Utils::Logging::LogLevel newLevel = GetLogLevel();
 
-        if (newLevel > Aws::Utils::Logging::LogLevel::Info && newLevel <= Aws::Utils::Logging::LogLevel::Trace && newLevel != m_logLevel)
+        if (newLevel != m_logLevel)
         {
             SetLogLevel(newLevel);
         }
@@ -124,7 +128,7 @@ namespace AWSNativeSDKInit
             break;
 
         case Aws::Utils::Logging::LogLevel::Error:
-            AZ::Debug::Trace::Instance().Warning(__FILE__, __LINE__, AZ_FUNCTION_SIGNATURE, AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
+            AZ::Debug::Trace::Instance().Error(__FILE__, __LINE__, AZ_FUNCTION_SIGNATURE, AWSLogSystemInterface::ERROR_WINDOW_NAME, MESSAGE_FORMAT, tag, message);
             break;
 
         case Aws::Utils::Logging::LogLevel::Warn:
diff --git a/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp b/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp
index 815fc1bbf0..ca63859945 100644
--- a/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp
+++ b/Code/Tools/AWSNativeSDKInit/source/AWSNativeSDKInit.cpp
@@ -64,10 +64,10 @@ namespace AWSNativeSDKInit
     {
 #if defined(PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
         Aws::Utils::Logging::LogLevel logLevel;
-#ifdef _DEBUG
+#if defined(AZ_DEBUG_BUILD) || defined(AZ_PROFILE_BUILD)
         logLevel = Aws::Utils::Logging::LogLevel::Warn;
 #else
-        logLevel = Aws::Utils::Logging::LogLevel::Warn;
+        logLevel = Aws::Utils::Logging::LogLevel::Error;
 #endif
         m_awsSDKOptions.loggingOptions.logLevel = logLevel;
         m_awsSDKOptions.loggingOptions.logger_create_fn = [logLevel]()
diff --git a/Code/Tools/AWSNativeSDKInit/tests/AWSLogSystemInterfaceTest.cpp b/Code/Tools/AWSNativeSDKInit/tests/AWSLogSystemInterfaceTest.cpp
new file mode 100644
index 0000000000..02b6cbebc1
--- /dev/null
+++ b/Code/Tools/AWSNativeSDKInit/tests/AWSLogSystemInterfaceTest.cpp
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Console/Console.h>
+#include <AzCore/Console/IConsole.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/UnitTest/TestTypes.h>
+
+#include <AWSNativeSDKInit/AWSLogSystemInterface.h>
+
+#include <aws/core/utils/logging/LogLevel.h>
+
+using namespace AWSNativeSDKInit;
+
+class AWSLogSystemInterfaceTest
+    : public UnitTest::ScopedAllocatorSetupFixture
+    , public AZ::Debug::TraceMessageBus::Handler
+{
+public:
+    bool OnPreAssert(const char*, int, const char*, const char*) override
+    {
+        return true;
+    }
+
+    bool OnPreError(const char*, const char*, int, const char*, const char*) override
+    {
+        m_error = true;
+        return true;
+    }
+
+    bool OnPreWarning(const char*, const char*, int, const char*, const char*) override
+    {
+        m_warning = true;
+        return true;
+    }
+
+    bool OnPrintf(const char*, const char*) override
+    {
+        m_printf = true;
+        return true;
+    }
+
+    void SetUp() override
+    {
+        BusConnect();
+        if (!AZ::Interface<AZ::IConsole>::Get())
+        {
+            m_console = AZStd::make_unique<AZ::Console>();
+            m_console->LinkDeferredFunctors(AZ::ConsoleFunctorBase::GetDeferredHead());
+            AZ::Interface<AZ::IConsole>::Register(m_console.get());
+        }
+    }
+
+    void TearDown() override
+    {
+        if (m_console)
+        {
+            AZ::Interface<AZ::IConsole>::Unregister(m_console.get());
+            m_console.reset();
+        }
+        BusDisconnect();
+    }
+
+    bool m_error = false;
+    bool m_warning = false;
+    bool m_printf = false;
+
+private:
+    AZStd::unique_ptr<AZ::Console> m_console;
+};
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_LogFatalMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Fatal, "test", testString);
+    ASSERT_TRUE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_FALSE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_LogErrorMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Error, "test", testString);
+    ASSERT_TRUE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_FALSE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_LogWarningMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Warn, "test", testString);
+    ASSERT_FALSE(m_error);
+    ASSERT_TRUE(m_warning);
+    ASSERT_FALSE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_LogInfoMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Info, "test", testString);
+    ASSERT_FALSE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_TRUE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_LogDebugMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Debug, "test", testString);
+    ASSERT_FALSE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_TRUE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_LogTraceMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Trace, "test", testString);
+    ASSERT_FALSE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_TRUE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_OverrideWarnAndLogInfoMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("bg_awsLogLevel 3");
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Info, "test", testString);
+    ASSERT_FALSE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_FALSE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_OverrideWarnAndLogeErrorMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("bg_awsLogLevel 3");
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Error, "test", testString);
+    ASSERT_TRUE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_FALSE(m_printf);
+}
+
+TEST_F(AWSLogSystemInterfaceTest, LogStream_OverrideOffAndLogInfoMessage_GetExpectedNotification)
+{
+    AWSLogSystemInterface logSystem(Aws::Utils::Logging::LogLevel::Trace);
+    Aws::OStringStream testString;
+    AZ::Interface<AZ::IConsole>::Get()->PerformCommand("bg_awsLogLevel 0");
+    logSystem.LogStream(Aws::Utils::Logging::LogLevel::Info, "test", testString);
+    ASSERT_FALSE(m_error);
+    ASSERT_FALSE(m_warning);
+    ASSERT_FALSE(m_printf);
+}
diff --git a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h b/Code/Tools/AWSNativeSDKInit/tests/AWSNativeSDKInitTest.cpp
similarity index 76%
rename from Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h
rename to Code/Tools/AWSNativeSDKInit/tests/AWSNativeSDKInitTest.cpp
index 5a80afe271..40217ff9bc 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h
+++ b/Code/Tools/AWSNativeSDKInit/tests/AWSNativeSDKInitTest.cpp
@@ -6,6 +6,6 @@
  *
  */
 
-#pragma once
+#include <AzTest/AzTest.h>
 
-#define STREAM_CACHE_DEFAULT 0
+AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
diff --git a/Code/Tools/AssetBundler/CMakeLists.txt b/Code/Tools/AssetBundler/CMakeLists.txt
index dcc62595c9..28245b67ba 100644
--- a/Code/Tools/AssetBundler/CMakeLists.txt
+++ b/Code/Tools/AssetBundler/CMakeLists.txt
@@ -77,6 +77,10 @@ ly_add_target(
             ${additional_dependencies}
 )
 
+if(LY_DEFAULT_PROJECT_PATH)
+    set_property(TARGET AssetBundler AssetBundlerBatch APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
+endif()
+
 # Adds a specialized .setreg to identify gems enabled in the active project.
 # This associates the AssetBundler target with the .Builders gem variants.
 ly_set_gem_variant_to_load(TARGETS AssetBundler VARIANTS Builders)
diff --git a/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
index b17832526f..17e621f7d6 100644
--- a/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
+++ b/Code/Tools/AssetBundler/source/utils/GUIApplicationManager.cpp
@@ -346,9 +346,7 @@ namespace AssetBundler
         }
 
         // Determine the enabled platforms
-        const char* appRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetAppRoot);
-        m_enabledPlatforms = GetEnabledPlatformFlags(GetEngineRoot(), appRoot, AZ::Utils::GetProjectPath().c_str());
+        m_enabledPlatforms = GetEnabledPlatformFlags(GetEngineRoot(), AZStd::string_view(AZ::Utils::GetProjectPath()));
 
         // Determine which Gems are enabled for the current project
         if (!AzFramework::GetGemsInfo(m_gemInfoList, *m_settingsRegistry))
diff --git a/Code/Tools/AssetBundler/source/utils/applicationManager.cpp b/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
index 0388570fdd..2df9e64ac5 100644
--- a/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
+++ b/Code/Tools/AssetBundler/source/utils/applicationManager.cpp
@@ -1401,7 +1401,6 @@ namespace AssetBundler
 
         // If no platform was specified, defaulting to platforms specified in the asset processor config files
         AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(
-            AZStd::string_view{ AZ::Utils::GetEnginePath() },
             AZStd::string_view{ AZ::Utils::GetEnginePath() },
             AZStd::string_view{ AZ::Utils::GetProjectPath() });
         [[maybe_unused]] auto platformsString = AzFramework::PlatformHelper::GetCommaSeparatedPlatformList(platformFlags);
diff --git a/Code/Tools/AssetBundler/source/utils/utils.cpp b/Code/Tools/AssetBundler/source/utils/utils.cpp
index 6daf3c571b..7e56f5450e 100644
--- a/Code/Tools/AssetBundler/source/utils/utils.cpp
+++ b/Code/Tools/AssetBundler/source/utils/utils.cpp
@@ -377,7 +377,6 @@ namespace AssetBundler
 
     AzFramework::PlatformFlags GetEnabledPlatformFlags(
         AZStd::string_view engineRoot,
-        AZStd::string_view assetRoot,
         AZStd::string_view projectPath)
     {
         auto settingsRegistry = AZ::SettingsRegistry::Get();
@@ -387,7 +386,7 @@ namespace AssetBundler
             return AzFramework::PlatformFlags::Platform_NONE;
         }
 
-        auto configFiles = AzToolsFramework::AssetUtils::GetConfigFiles(engineRoot, assetRoot, projectPath, true, true, settingsRegistry);
+        auto configFiles = AzToolsFramework::AssetUtils::GetConfigFiles(engineRoot, projectPath, true, true, settingsRegistry);
         auto enabledPlatformList = AzToolsFramework::AssetUtils::GetEnabledPlatforms(*settingsRegistry, configFiles);
         AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_NONE;
         for (const auto& enabledPlatform : enabledPlatformList)
diff --git a/Code/Tools/AssetBundler/source/utils/utils.h b/Code/Tools/AssetBundler/source/utils/utils.h
index bfdf252014..0986d70ca8 100644
--- a/Code/Tools/AssetBundler/source/utils/utils.h
+++ b/Code/Tools/AssetBundler/source/utils/utils.h
@@ -221,7 +221,6 @@ namespace AssetBundler
     //! Please note that the game project could be in a different location to the engine therefore we need the assetRoot param.
     AzFramework::PlatformFlags GetEnabledPlatformFlags(
         AZStd::string_view enginePath,
-        AZStd::string_view assetRoot,
         AZStd::string_view projectPath);
 
     QJsonObject ReadJson(const AZStd::string& filePath);
diff --git a/Code/Tools/AssetBundler/tests/UtilsTests.cpp b/Code/Tools/AssetBundler/tests/UtilsTests.cpp
index 560d399613..60fc79579b 100644
--- a/Code/Tools/AssetBundler/tests/UtilsTests.cpp
+++ b/Code/Tools/AssetBundler/tests/UtilsTests.cpp
@@ -67,7 +67,7 @@ namespace AssetBundler
         void NormalizePathKeepCase(AZStd::string& /*path*/) override {}
         void CalculateBranchTokenForEngineRoot(AZStd::string& /*token*/) const override {}
 
-        const char* GetEngineRoot() const override
+        const char* GetTempDir() const
         {
             return m_tempDir->GetDirectory();
         }
@@ -83,7 +83,7 @@ namespace AssetBundler
     TEST_F(MockUtilsTest, DISABLED_TestFilePath_StartsWithAFileSeparator_Valid)
     {
         AZ::IO::Path relFilePath = "Foo/foo.xml";
-        AZ::IO::Path absoluteFilePath = AZ::IO::PathView(GetEngineRoot()).RootPath();
+        AZ::IO::Path absoluteFilePath = AZ::IO::PathView(GetTempDir()).RootPath();
         absoluteFilePath /= relFilePath;
         absoluteFilePath = absoluteFilePath.LexicallyNormal();
 
@@ -95,7 +95,7 @@ namespace AssetBundler
     TEST_F(MockUtilsTest, TestFilePath_RelativePath_Valid)
     {
         AZ::IO::Path relFilePath = "Foo\\foo.xml";
-        AZ::IO::Path absoluteFilePath = (AZ::IO::Path(GetEngineRoot()) / relFilePath).LexicallyNormal();
+        AZ::IO::Path absoluteFilePath = (AZ::IO::Path(GetTempDir()) / relFilePath).LexicallyNormal();
         FilePath filePath(relFilePath.Native());
         EXPECT_EQ(AZ::IO::PathView{ filePath.AbsolutePath() }, absoluteFilePath);
     }
@@ -107,8 +107,8 @@ namespace AssetBundler
         AZ::IO::Path relFilePath = "Foo\\Foo.xml";
         AZ::IO::Path wrongCaseRelFilePath = "Foo\\foo.xml";
 
-        AZ::IO::Path correctAbsoluteFilePath = (AZ::IO::Path(GetEngineRoot()) / relFilePath).LexicallyNormal();
-        AZ::IO::Path wrongCaseAbsoluteFilePath = (AZ::IO::Path(GetEngineRoot()) / wrongCaseRelFilePath).LexicallyNormal();
+        AZ::IO::Path correctAbsoluteFilePath = (AZ::IO::Path(GetTempDir()) / relFilePath).LexicallyNormal();
+        AZ::IO::Path wrongCaseAbsoluteFilePath = (AZ::IO::Path(GetTempDir()) / wrongCaseRelFilePath).LexicallyNormal();
 
         AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
         AZ::IO::FileIOBase::GetInstance()->Open(correctAbsoluteFilePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath, fileHandle);
@@ -121,7 +121,7 @@ namespace AssetBundler
     TEST_F(MockUtilsTest, TestFilePath_NoFileExists_NoError_valid)
     {
         AZ::IO::Path relFilePath = "Foo\\Foo.xml";
-        AZ::IO::Path absoluteFilePath = (AZ::IO::Path(GetEngineRoot()) / relFilePath).LexicallyNormal();
+        AZ::IO::Path absoluteFilePath = (AZ::IO::Path(GetTempDir()) / relFilePath).LexicallyNormal();
 
         FilePath filePath(absoluteFilePath.Native(), true, false);
         EXPECT_TRUE(filePath.IsValid());
@@ -132,8 +132,8 @@ namespace AssetBundler
     {
         AZStd::string relFilePath = "Foo\\Foo.xml";
         AZStd::string wrongCaseRelFilePath = "Foo\\foo.xml";
-        AZ::IO::Path correctAbsoluteFilePath = (AZ::IO::Path(GetEngineRoot()) / relFilePath).LexicallyNormal();
-        AZ::IO::Path wrongCaseAbsoluteFilePath = (AZ::IO::Path(GetEngineRoot()) / wrongCaseRelFilePath).LexicallyNormal();
+        AZ::IO::Path correctAbsoluteFilePath = (AZ::IO::Path(GetTempDir()) / relFilePath).LexicallyNormal();
+        AZ::IO::Path wrongCaseAbsoluteFilePath = (AZ::IO::Path(GetTempDir()) / wrongCaseRelFilePath).LexicallyNormal();
 
         AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle;
         AZ::IO::FileIOBase::GetInstance()->Open(correctAbsoluteFilePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath, fileHandle);
diff --git a/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp b/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
index 07eae67a81..fd587195af 100644
--- a/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
+++ b/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
@@ -16,6 +16,7 @@
 #include <AzCore/Settings/SettingsRegistryImpl.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
+#include <AzCore/Utils/Utils.h>
 
 #include <source/utils/utils.h>
 #include <source/utils/applicationManager.h>
@@ -84,10 +85,9 @@ namespace AssetBundler
             // in the unit tests.
             AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
 
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            ASSERT_TRUE(engineRoot) << "Unable to locate engine root.\n";
-            AzFramework::StringFunc::Path::Join(engineRoot, RelativeTestFolder, m_data->m_testEngineRoot);
+            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
+            ASSERT_TRUE(!engineRoot.empty()) << "Unable to locate engine root.\n";
+            m_data->m_testEngineRoot = (engineRoot / RelativeTestFolder).String();
 
             m_data->m_localFileIO = aznew AZ::IO::LocalFileIO();
             m_data->m_priorFileIO = AZ::IO::FileIOBase::GetInstance();
@@ -150,7 +150,8 @@ namespace AssetBundler
 
         EXPECT_EQ(0, gemsNameMap.size());
 
-        AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(m_data->m_testEngineRoot.c_str(), m_data->m_testEngineRoot.c_str(), DummyProjectName);
+        const auto testProjectPath = AZ::IO::Path(m_data->m_testEngineRoot) / DummyProjectName;
+        AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(m_data->m_testEngineRoot, testProjectPath.Native());
         AzFramework::PlatformFlags hostPlatformFlag = AzFramework::PlatformHelper::GetPlatformFlag(AzToolsFramework::AssetSystem::GetHostAssetPlatform());
         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/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
index 62b063c83b..b5323dd419 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
@@ -23,6 +23,8 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 //////////////////////////////////////////////////////////////////////////
 
+#include <xxhash/xxhash.h>
+
 namespace AssetBuilderSDK
 {
     const char* const ErrorWindow = "Error"; //Use this window name to log error messages.
@@ -690,7 +692,6 @@ namespace AssetBuilderSDK
     static const char* textureExtensions = ".dds";
     static const char* staticMeshExtensions = ".cgf";
     static const char* skinnedMeshExtensions = ".skin";
-    static const char* materialExtensions = ".mtl";
 
     // MIPS
     static const int c_MaxMipsCount = 11; // 11 is for 8k textures non-compressed. When not compressed it is using one file per mip.
@@ -699,7 +700,6 @@ namespace AssetBuilderSDK
 
     // XML files may contain generic data (avoid this in new builders - use a custom extension!)
     static const char* xmlExtensions = ".xml";
-    static const char* geomCacheExtensions = ".cax";
     static const char* skeletonExtensions = ".chr";
 
     static AZ::Data::AssetType unknownAssetType = AZ::Data::AssetType::CreateNull();
@@ -710,7 +710,6 @@ namespace AssetBuilderSDK
     static AZ::Data::AssetType textureMipsAssetType("{3918728C-D3CA-4D9E-813E-A5ED20C6821E}");
     static AZ::Data::AssetType skinnedMeshLodsAssetType("{58E5824F-C27B-46FD-AD48-865BA41B7A51}");
     static AZ::Data::AssetType staticMeshLodsAssetType("{9AAE4926-CB6A-4C60-9948-A1A22F51DB23}");
-    static AZ::Data::AssetType geomCacheAssetType("{EBC96071-E960-41B6-B3E3-328F515AE5DA}");
     static AZ::Data::AssetType skeletonAssetType("{60161B46-21F0-4396-A4F0-F2CCF0664CDE}");
     static AZ::Data::AssetType entityIconAssetType("{3436C30E-E2C5-4C3B-A7B9-66C94A28701B}");
 
@@ -807,11 +806,6 @@ namespace AssetBuilderSDK
             return textureAssetType;
         }
 
-        if (AzFramework::StringFunc::Find(materialExtensions, extension.c_str()) != AZStd::string::npos)
-        {
-            return materialAssetType;
-        }
-
         if (AzFramework::StringFunc::Find(staticMeshExtensions, extension.c_str()) != AZStd::string::npos)
         {
             return meshAssetType;
@@ -822,11 +816,6 @@ namespace AssetBuilderSDK
             return skinnedMeshAssetType;
         }
 
-        if (AzFramework::StringFunc::Find(geomCacheExtensions, extension.c_str()) != AZStd::string::npos)
-        {
-            return geomCacheAssetType;
-        }
-
         if (AzFramework::StringFunc::Find(skeletonExtensions, extension.c_str()) != AZStd::string::npos)
         {
             return skeletonAssetType;
@@ -1612,4 +1601,70 @@ namespace AssetBuilderSDK
     {
         return m_errorsOccurred;
     }
+
+    AZ::u64 GetHashFromIOStream(AZ::IO::GenericStream& readStream, AZ::IO::SizeType* bytesReadOut, int hashMsDelay)
+    {        
+        constexpr AZ::u64 HashBufferSize = 1024 * 64;
+        char buffer[HashBufferSize];
+
+        if(readStream.IsOpen() && readStream.CanRead())
+        {
+            AZ::IO::SizeType bytesRead;
+
+            auto* state = XXH64_createState();
+
+            if(state == nullptr)
+            {
+                AZ_Assert(false, "Failed to create hash state");
+                return 0;
+            }
+
+            if (XXH64_reset(state, 0) == XXH_ERROR)
+            {
+                AZ_Assert(false, "Failed to reset hash state");
+                return 0;
+            }
+
+            do
+            {
+                // In edge cases where another process is writing to this file while this hashing is occuring and that file wasn't locked,
+                // the following read check can fail because it performs an end of file check, and asserts and shuts down if the read size
+                // was smaller than the buffer and the read is not at the end of the file. The logic used to check end of file internal to read
+                // will be out of date in the edge cases where another process is actively writing to this file while this hash is running.
+                // The stream's length ends up more accurate in this case, preventing this assert and shut down.
+                // One area this occurs is the navigation mesh file (mnmnavmission0.bai) that's temporarily created when exporting a level,
+                // the navigation system can still be writing to this file when hashing begins, causing the EoF marker to change.
+                AZ::IO::SizeType remainingToRead = AZStd::min(readStream.GetLength() - readStream.GetCurPos(), aznumeric_cast<AZ::IO::SizeType>(AZ_ARRAY_SIZE(buffer)));
+                bytesRead = readStream.Read(remainingToRead, buffer);
+
+                if(bytesReadOut)
+                {
+                    *bytesReadOut += bytesRead;
+                }
+
+                XXH64_update(state, buffer, bytesRead);
+
+                // Used by unit tests to force the race condition mentioned above, to verify the crash fix.
+                if(hashMsDelay > 0)
+                {
+                    AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(hashMsDelay));
+                }
+
+            } while (bytesRead > 0);
+
+            auto hash = XXH64_digest(state);
+
+            XXH64_freeState(state);
+
+            return hash;
+        }
+        return 0;
+    }
+
+    AZ::u64 GetFileHash(const char* filePath, AZ::IO::SizeType* bytesReadOut, int hashMsDelay)
+    {
+        constexpr bool ErrorOnReadFailure = true;
+        AZ::IO::FileIOStream readStream(filePath, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, ErrorOnReadFailure);
+        return GetHashFromIOStream(readStream, bytesReadOut, hashMsDelay);
+    }
 }
diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
index 5a57fa1e72..f977e15be9 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
@@ -911,6 +911,19 @@ namespace AssetBuilderSDK
         //! There can be multiple builders running at once, so we need to filter out ones coming from other builders
         AZStd::thread_id m_jobThreadId;
     };
+
+    //! Get hash for a whole file
+    //! @filePath the path for the file
+    //! @bytesReadOut output the read file size in bytes
+    //! @hashMsDelay [Do not use except for unit test] add a delay in ms for between each block reading.
+    AZ::u64 GetFileHash(const char* filePath, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0);
+
+    //! Get hash for a generic IO stream
+    //! @readStream the input readable stream
+    //! @bytesReadOut output the read size in bytes
+    //! @hashMsDelay [Do not use except for unit test] add a delay in ms for between each block reading.
+    AZ::u64 GetHashFromIOStream(AZ::IO::GenericStream& readStream, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0);
+
 } // namespace AssetBuilderSDK
 
 namespace AZ
diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt b/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt
index 635cd55f6c..bfbcc35663 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt
@@ -32,6 +32,7 @@ ly_add_target(
         PUBLIC
             AZ::AzFramework
             AZ::AzToolsFramework
+            3rdParty::xxhash
 )
 ly_add_source_properties(
     SOURCES AssetBuilderSDK/AssetBuilderSDK.cpp
diff --git a/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp b/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
index 2d3e671999..b7f7affd6d 100644
--- a/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
+++ b/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp
@@ -32,7 +32,8 @@ struct FolderRootWatch::PlatformImplementation
     {
         if (m_iNotifyHandle < 0)
         {
-            m_iNotifyHandle = inotify_init();
+            // The CLOEXEC flag prevents the inotify watchers from copying on fork/exec
+            m_iNotifyHandle = inotify_init1(IN_CLOEXEC);
         }
         return (m_iNotifyHandle >= 0);
     }
diff --git a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
index 0c1347517f..400a3f7ba5 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
@@ -29,6 +29,9 @@ set(FILES
     native/AssetManager/SourceFileRelocator.h
     native/AssetManager/ControlRequestHandler.cpp
     native/AssetManager/ControlRequestHandler.h
+    native/AssetManager/ExcludedFolderCache.cpp
+    native/AssetManager/ExcludedFolderCache.h
+    native/AssetManager/ExcludedFolderCacheInterface.h
     native/assetprocessor.h
     native/connection/connection.cpp
     native/connection/connection.h
@@ -89,8 +92,6 @@ set(FILES
     native/utilities/BuilderManager.inl
     native/utilities/ByteArrayStream.cpp
     native/utilities/ByteArrayStream.h
-    native/utilities/CommunicatorTracePrinter.cpp
-    native/utilities/CommunicatorTracePrinter.h
     native/utilities/IniConfiguration.cpp
     native/utilities/IniConfiguration.h
     native/utilities/JobDiagnosticTracker.cpp
@@ -102,6 +103,8 @@ set(FILES
     native/utilities/PlatformConfiguration.cpp
     native/utilities/PlatformConfiguration.h
     native/utilities/PotentialDependencies.h
+    native/utilities/StatsCapture.cpp
+    native/utilities/StatsCapture.h
     native/utilities/SpecializedDependencyScanner.h
     native/utilities/ThreadHelper.cpp
     native/utilities/ThreadHelper.h
diff --git a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
index 6aebc8bc25..3a336ce97b 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
@@ -36,6 +36,7 @@ set(FILES
     native/tests/platformconfiguration/platformconfigurationtests.h
     native/tests/utilities/JobModelTest.cpp
     native/tests/utilities/JobModelTest.h
+    native/tests/utilities/StatsCaptureTest.cpp
     native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
     native/tests/assetscanner/AssetScannerTests.h
     native/tests/assetscanner/AssetScannerTests.cpp
diff --git a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
index 9be991eb0b..cf33e559ac 100644
--- a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp
@@ -2610,15 +2610,8 @@ namespace AssetProcessor
     {
         ScopedTransaction transaction(m_databaseConnection);
 
-        const char* statementName = INSERT_NEW_LEGACYSUBID;
-
         bool creatingNew = entry.m_subIDsEntryID == InvalidEntryId;
 
-        if (!creatingNew)
-        {
-            statementName = OVERWRITE_EXISTING_LEGACYSUBID;
-        }
-
         if (creatingNew)
         {
             if (!s_InsertNewLegacysubidQuery.BindAndStep(*m_databaseConnection, entry.m_productPK, entry.m_subID))
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCache.cpp b/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCache.cpp
new file mode 100644
index 0000000000..2c8dc844dd
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCache.cpp
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <QDirIterator>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <native/AssetManager/ExcludedFolderCache.h>
+#include <utilities/assetUtils.h>
+#include <utilities/PlatformConfiguration.h>
+#include <AzCore/IO/Path/Path.h>
+
+namespace AssetProcessor
+{
+    ExcludedFolderCache::ExcludedFolderCache(const PlatformConfiguration* platformConfig) : m_platformConfig(platformConfig)
+    {
+        AZ::Interface<ExcludedFolderCacheInterface>::Register(this);
+    }
+
+    ExcludedFolderCache::~ExcludedFolderCache()
+    {
+        AZ::Interface<ExcludedFolderCacheInterface>::Unregister(this);
+    }
+
+    const AZStd::unordered_set<AZStd::string>& ExcludedFolderCache::GetExcludedFolders()
+    {
+        if (!m_builtCache)
+        {
+            for (int i = 0; i < m_platformConfig->GetScanFolderCount(); ++i)
+            {
+                const auto& scanFolderInfo = m_platformConfig->GetScanFolderAt(i);
+                QDir rooted(scanFolderInfo.ScanPath());
+                QString absolutePath = rooted.absolutePath();
+                AZStd::stack<QString> dirs;
+                dirs.push(absolutePath);
+                
+                while (!dirs.empty())
+                {
+                    absolutePath = dirs.top();
+                    dirs.pop();
+
+                    // Scan only folders, do not recurse so we have the chance to ignore a subfolder before going deeper
+                    QDirIterator dirIterator(absolutePath, QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+
+                    // Loop all the folders in this directory
+                    while (dirIterator.hasNext())
+                    {
+                        dirIterator.next();
+                        QString pathMatch = rooted.absoluteFilePath(dirIterator.filePath());
+
+                        if (m_platformConfig->IsFileExcluded(pathMatch))
+                        {
+                            // Add the folder to the list and do not proceed any deeper
+                            m_excludedFolders.emplace(pathMatch.toUtf8().constData());
+                        }
+                        else if (scanFolderInfo.RecurseSubFolders())
+                        {
+                            // Folder is not excluded and recurse is enabled, add to the list of folders to check
+                            dirs.push(pathMatch);
+                        }
+                    }
+                }
+            }
+
+            // Add the cache to the list as well
+            AZStd::string projectCacheRootValue;
+            AZ::SettingsRegistry::Get()->Get(projectCacheRootValue, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheProjectRootFolder);
+            projectCacheRootValue = AssetUtilities::NormalizeFilePath(projectCacheRootValue.c_str()).toUtf8().constData();
+            m_excludedFolders.emplace(projectCacheRootValue);
+
+            // Register to be notified about deletes so we can remove old ignored folders
+            auto fileStateCache = AZ::Interface<IFileStateRequests>::Get();
+
+            if (fileStateCache)
+            {
+                m_handler = AZ::Event<FileStateInfo>::Handler([this](FileStateInfo fileInfo)
+                {
+                    if (fileInfo.m_isDirectory)
+                    {
+                        AZStd::scoped_lock lock(m_pendingNewFolderMutex);
+
+                        m_pendingDeletes.emplace(fileInfo.m_absolutePath.toUtf8().constData());
+                    }
+                });
+
+                fileStateCache->RegisterForDeleteEvent(m_handler);
+            }
+            else
+            {
+                AZ_Error("ExcludedFolderCache", false, "Failed to find IFileStateRequests interface");
+            }
+
+            m_builtCache = true;
+        }
+
+        // Incorporate any pending folders
+        AZStd::unordered_set<AZStd::string> pendingAdds;
+        AZStd::unordered_set<AZStd::string> pendingDeletes;
+        
+        {
+            AZStd::scoped_lock lock(m_pendingNewFolderMutex);
+            pendingAdds.swap(m_pendingNewFolders);
+            pendingDeletes.swap(m_pendingDeletes);
+        }
+
+        if (!pendingAdds.empty())
+        {
+            m_excludedFolders.insert(pendingAdds.begin(), pendingAdds.end());
+        }
+
+        if (!pendingDeletes.empty())
+        {
+            for (const auto& pendingDelete : pendingDeletes)
+            {
+                m_excludedFolders.erase(pendingDelete);
+            }
+        }
+
+        return m_excludedFolders;
+    }
+
+    void ExcludedFolderCache::FileAdded(QString path)
+    {
+        QString relativePath, scanFolderPath;
+        
+        if (!m_platformConfig->ConvertToRelativePath(path, relativePath, scanFolderPath))
+        {
+            AZ_Error("ExcludedFolderCache", false, "Failed to get relative path for newly added file %s", path.toUtf8().constData());
+            return;
+        }
+
+        AZ::IO::Path azPath(relativePath.toUtf8().constData());
+        AZ::IO::Path absolutePath(scanFolderPath.toUtf8().constData());
+        
+        for (const auto& pathPart : azPath)
+        {
+            absolutePath /= pathPart;
+
+            QString normalized = AssetUtilities::NormalizeFilePath(absolutePath.c_str());
+
+            if (m_platformConfig->IsFileExcluded(normalized))
+            {
+                // Add the folder to a pending list, since this callback runs on another thread
+                AZStd::scoped_lock lock(m_pendingNewFolderMutex);
+
+                m_pendingNewFolders.emplace(normalized.toUtf8().constData());
+                break;
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCache.h b/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCache.h
new file mode 100644
index 0000000000..b0c70946b6
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCache.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AssetManager/ExcludedFolderCacheInterface.h>
+#include <AssetManager/FileStateCache.h>
+
+namespace AssetProcessor
+{
+    class PlatformConfiguration;
+
+    struct ExcludedFolderCache : ExcludedFolderCacheInterface
+    {
+        explicit ExcludedFolderCache(const PlatformConfiguration* platformConfig);
+        ~ExcludedFolderCache() override;
+
+        // Gets a set of absolute paths to folder which have been excluded according to the platform configuration rules
+        // Note - not thread safe
+        const AZStd::unordered_set<AZStd::string>& GetExcludedFolders() override;
+
+        void FileAdded(QString path) override;
+
+    private:
+        bool m_builtCache = false;
+        const PlatformConfiguration* m_platformConfig{};
+        AZStd::unordered_set<AZStd::string> m_excludedFolders;
+
+        AZStd::recursive_mutex m_pendingNewFolderMutex;
+        AZStd::unordered_set<AZStd::string> m_pendingNewFolders; // Newly ignored folders waiting to be added to m_excludedFolders
+        AZStd::unordered_set<AZStd::string> m_pendingDeletes;
+        AZ::Event<FileStateInfo>::Handler m_handler;
+    };
+}
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCacheInterface.h b/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCacheInterface.h
new file mode 100644
index 0000000000..1bdc4cc855
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/AssetManager/ExcludedFolderCacheInterface.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/std/containers/unordered_set.h>
+#include <QString>
+
+namespace AssetProcessor
+{
+    class PlatformConfiguration;
+
+    struct ExcludedFolderCacheInterface
+    {
+        AZ_RTTI(ExcludedFolderCacheInterface, "{3AC471B6-C9F8-49CF-9E9D-237BDF63328C}");
+        AZ_DISABLE_COPY_MOVE(ExcludedFolderCacheInterface);
+
+        ExcludedFolderCacheInterface() = default;
+        virtual ~ExcludedFolderCacheInterface() = default;
+
+        virtual const AZStd::unordered_set<AZStd::string>& GetExcludedFolders() = 0;
+        virtual void FileAdded(QString path) = 0;
+    };
+}
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp
index d21aca35f5..e49d1bbb47 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.cpp
@@ -63,6 +63,11 @@ namespace AssetProcessor
         return true;
     }
 
+    void FileStateCache::RegisterForDeleteEvent(AZ::Event<FileStateInfo>::Handler& handler)
+    {
+        handler.Connect(m_deleteEvent);
+    }
+
     void FileStateCache::AddInfoSet(QSet<AssetFileInfo> infoSet)
     {
         LockGuardType scopeLock(m_mapMutex);
@@ -103,6 +108,8 @@ namespace AssetProcessor
 
         if (itr != m_fileInfoMap.end())
         {
+            m_deleteEvent.Signal(itr.value());
+
             bool isDirectory = itr.value().m_isDirectory;
             QString parentPath = itr.value().m_absolutePath;
             m_fileInfoMap.erase(itr);
@@ -205,6 +212,21 @@ namespace AssetProcessor
         return true;
     }
 
+    void FileStatePassthrough::RegisterForDeleteEvent(AZ::Event<FileStateInfo>::Handler& handler)
+    {
+        handler.Connect(m_deleteEvent);
+    }
+
+    void FileStatePassthrough::SignalDeleteEvent(const QString& absolutePath) const
+    {
+        FileStateInfo info;
+
+        if (GetFileInfo(absolutePath, &info))
+        {
+            m_deleteEvent.Signal(info);
+        }
+    }
+
     bool FileStateInfo::operator==(const FileStateInfo& rhs) const
     {
         return m_absolutePath == rhs.m_absolutePath
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h
index ba663aef0e..56ec03aa7d 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/FileStateCache.h
@@ -14,6 +14,7 @@
 #include <QSet>
 #include <QFileInfo>
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/EBus/Event.h>
 
 namespace AssetProcessor
 {
@@ -51,10 +52,11 @@ namespace AssetProcessor
         /// Convenience function to check if a file or directory exists.
         virtual bool Exists(const QString& absolutePath) const = 0;
         virtual bool GetHash(const QString& absolutePath, FileHash* foundHash) = 0;
+        virtual void RegisterForDeleteEvent(AZ::Event<FileStateInfo>::Handler& handler) = 0;
 
         AZ_DISABLE_COPY_MOVE(IFileStateRequests);
     };
-    
+
     class FileStateBase
         : public IFileStateRequests
     {
@@ -89,11 +91,11 @@ namespace AssetProcessor
     {
     public:
 
-
         // FileStateRequestBus implementation
         bool GetFileInfo(const QString& absolutePath, FileStateInfo* foundFileInfo) const override;
         bool Exists(const QString& absolutePath) const override;
         bool GetHash(const QString& absolutePath, FileHash* foundHash) override;
+        void RegisterForDeleteEvent(AZ::Event<FileStateInfo>::Handler& handler) override;
 
         void AddInfoSet(QSet<AssetFileInfo> infoSet) override;
         void AddFile(const QString& absolutePath) override;
@@ -116,9 +118,11 @@ namespace AssetProcessor
 
         mutable AZStd::recursive_mutex m_mapMutex;
         QHash<QString, FileStateInfo> m_fileInfoMap;
-        
+
         QHash<QString, FileHash> m_fileHashMap;
 
+        AZ::Event<FileStateInfo> m_deleteEvent;
+
         using LockGuardType = AZStd::lock_guard<decltype(m_mapMutex)>;
     };
 
@@ -131,5 +135,10 @@ namespace AssetProcessor
         bool GetFileInfo(const QString& absolutePath, FileStateInfo* foundFileInfo) const override;
         bool Exists(const QString& absolutePath) const override;
         bool GetHash(const QString& absolutePath, FileHash* foundHash) override;
+        void RegisterForDeleteEvent(AZ::Event<FileStateInfo>::Handler& handler) override;
+
+        void SignalDeleteEvent(const QString& absolutePath) const;
+    protected:
+        AZ::Event<FileStateInfo> m_deleteEvent;
     };
 } // namespace AssetProcessor
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
index 367a296bd4..8867f2379f 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp
@@ -18,13 +18,14 @@
 
 #include <AzToolsFramework/Debug/TraceContext.h>
 
-
 #include "native/AssetManager/assetProcessorManager.h"
+
 #include <AzCore/std/sort.h>
 #include <AzToolsFramework/API/AssetDatabaseBus.h>
 
 #include <native/AssetManager/PathDependencyManager.h>
 #include <native/utilities/BuilderConfigurationBus.h>
+#include <native/utilities/StatsCapture.h>
 
 #include "AssetRequestHandler.h"
 
@@ -66,8 +67,10 @@ namespace AssetProcessor
 
         m_sourceFileRelocator = AZStd::make_unique<SourceFileRelocator>(m_stateData, m_platformConfig);
 
-        PopulateJobStateCache();
+        m_excludedFolderCache = AZStd::make_unique<ExcludedFolderCache>(m_platformConfig);
 
+        PopulateJobStateCache();
+        
         AssetProcessor::ProcessingJobInfoBus::Handler::BusConnect();
     }
 
@@ -121,6 +124,9 @@ namespace AssetProcessor
     {
         if (status == AssetProcessor::AssetScanningStatus::Started)
         {
+            // capture scanning stats:
+            AssetProcessor::StatsCapture::BeginCaptureStat("AssetScanning");
+           
             // Ensure that the source file list is populated before a scan begins
             m_sourceFilesInDatabase.clear();
             m_fileModTimes.clear();
@@ -174,6 +180,8 @@ namespace AssetProcessor
                  (status == AssetProcessor::AssetScanningStatus::Stopped))
         {
             m_isCurrentlyScanning = false;
+            AssetProcessor::StatsCapture::EndCaptureStat("AssetScanning");
+            
             // we cannot invoke this immediately - the scanner might be done, but we aren't actually ready until we've processed all remaining messages:
             QMetaObject::invokeMethod(this, "CheckMissingFiles", Qt::QueuedConnection);
         }
@@ -207,13 +215,24 @@ namespace AssetProcessor
         }
         else
         {
+            QString statKey = QString("ProcessJob,%1,%2,%3").arg(jobEntry.m_databaseSourceName).arg(jobEntry.m_jobKey).arg(jobEntry.m_platformInfo.m_identifier.c_str());
+            
             if (status == JobStatus::InProgress)
             {
                 //update to in progress status
                 m_jobRunKeyToJobInfoMap[jobEntry.m_jobRunKey].m_status = JobStatus::InProgress;
+                // stats tracking.  Start accumulating time.
+                AssetProcessor::StatsCapture::BeginCaptureStat(statKey.toUtf8().constData());
+
             }
             else //if failed or succeeded remove from the map
             {
+                // note that sometimes this gets called twice, once by the RCJobs thread and once by the AP itself,
+                // because sometimes jobs take a short cut from "started" -> "failed" or "started" -> "complete
+                // without going thru the RC.
+                // as such, all the code in this block should be crafted to work regardless of whether its double called.
+                AssetProcessor::StatsCapture::EndCaptureStat(statKey.toUtf8().constData());
+                
                 m_jobRunKeyToJobInfoMap.erase(jobEntry.m_jobRunKey);
                 Q_EMIT SourceFinished(sourceUUID, legacySourceUUID);
                 Q_EMIT JobComplete(jobEntry, status);
@@ -255,11 +274,9 @@ namespace AssetProcessor
         }
 
         //look for the job in flight first
-        bool found = false;
         auto foundElement = m_jobRunKeyToJobInfoMap.find(request.m_jobRunKey);
         if (foundElement != m_jobRunKeyToJobInfoMap.end())
         {
-            found = true;
             jobInfo = foundElement->second;
         }
         else
@@ -277,7 +294,6 @@ namespace AssetProcessor
 
             AZ_Assert(jobInfos.size() == 1, "Should only have found one jobInfo!!!");
             jobInfo = AZStd::move(jobInfos[0]);
-            found = true;
         }
 
         if (jobInfo.m_status == JobStatus::Failed_InvalidSourceNameExceedsMaxLimit)
@@ -3353,8 +3369,13 @@ namespace AssetProcessor
             AZStd::string logFileName = AssetUtilities::ComputeJobLogFileName(createJobsRequest);
             {
                 AssetUtilities::JobLogTraceListener jobLogTraceListener(logFileName, runKey, true);
+                // track the time it takes to createJobs.  We can perform analysis later to present it by extension and other stats.
+                QString statKey = QString("CreateJobs,%1,%2").arg(actualRelativePath).arg(builderInfo.m_name.c_str());
+                AssetProcessor::StatsCapture::BeginCaptureStat(statKey.toUtf8().constData());
                 builderInfo.m_createJobFunction(createJobsRequest, createJobsResponse);
+                AssetProcessor::StatsCapture::EndCaptureStat(statKey.toUtf8().constData());
             }
+            
             AssetProcessor::SetThreadLocalJobId(0);
 
             bool isBuilderMissingFingerprint = (createJobsResponse.m_result == AssetBuilderSDK::CreateJobsResultCode::Success
@@ -3573,6 +3594,8 @@ namespace AssetProcessor
                     QString knownPathBeforeWildcard = encodedFileData.left(slashBeforeWildcardIndex + 1); // include the slash
                     QString relativeSearch = encodedFileData.mid(slashBeforeWildcardIndex + 1); // skip the slash
 
+                    const auto& excludedFolders = m_excludedFolderCache->GetExcludedFolders();
+
                     // Absolute path, just check the 1 scan folder
                     if (AZ::IO::PathView(encodedFileData.toUtf8().constData()).IsAbsolute())
                     {
@@ -3592,7 +3615,8 @@ namespace AssetProcessor
                             QString scanFolderAndKnownSubPath = rooted.absoluteFilePath(knownPathBeforeWildcard);
 
                             resolvedDependencyList.append(m_platformConfig->FindWildcardMatches(
-                                scanFolderAndKnownSubPath, relativeSearch, false, scanFolderInfo->RecurseSubFolders()));
+                                scanFolderAndKnownSubPath, relativeSearch,
+                                excludedFolders, false, scanFolderInfo->RecurseSubFolders()));
                         }
                     }
                     else // Relative path, check every scan folder
@@ -3610,7 +3634,21 @@ namespace AssetProcessor
                             QString absolutePath = rooted.absoluteFilePath(knownPathBeforeWildcard);
 
                             resolvedDependencyList.append(m_platformConfig->FindWildcardMatches(
-                                absolutePath, relativeSearch, false, scanFolderInfo->RecurseSubFolders()));
+                                absolutePath, relativeSearch,
+                                excludedFolders, false, scanFolderInfo->RecurseSubFolders()));
+                        }
+                    }
+
+                    // Filter out any excluded files
+                    for (auto itr = resolvedDependencyList.begin(); itr != resolvedDependencyList.end();)
+                    {
+                        if (m_platformConfig->IsFileExcluded(*itr))
+                        {
+                            itr = resolvedDependencyList.erase(itr);
+                        }
+                        else
+                        {
+                            ++itr;
                         }
                     }
 
@@ -4820,5 +4858,7 @@ namespace AssetProcessor
         }
         return filesFound;
     }
+
+    
 } // namespace AssetProcessor
 
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
index 891e091f91..fe77396760 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
@@ -40,6 +40,8 @@
 #include "AssetRequestHandler.h"
 #include "native/utilities/JobDiagnosticTracker.h"
 #include "SourceFileRelocator.h"
+
+#include <AssetManager/ExcludedFolderCache.h>
 #endif
 
 class FileWatcher;
@@ -341,7 +343,8 @@ namespace AssetProcessor
         void CleanEmptyFolder(QString folder, QString root);
 
         void ProcessBuilders(QString normalizedPath, QString relativePathToFile, const ScanFolderInfo* scanFolder, const AssetProcessor::BuilderInfoList& builderInfoList);
-        
+        AZStd::vector<AZStd::string> GetExcludedFolders();
+
         struct SourceInfo
         {
             QString m_watchFolder;
@@ -552,6 +555,8 @@ namespace AssetProcessor
         // when true, a flag will be sent to builders process job indicating debug output/mode should be used
         bool m_builderDebugFlag = false;
 
+        AZStd::unique_ptr<ExcludedFolderCache> m_excludedFolderCache{};
+
 protected Q_SLOTS:
         void FinishAnalysis(AZStd::string fileToCheck);
         //////////////////////////////////////////////////////////
diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
index 27210685fc..c463f2320e 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
@@ -20,7 +20,6 @@
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzFramework/Application/Application.h>
 
-#include <AzFramework/Process/ProcessCommunicator.h>
 #include <AzFramework/Process/ProcessWatcher.h>
 #include <AzToolsFramework/Application/ToolsApplication.h>
 
@@ -31,7 +30,6 @@
 
 #include "native/utilities/assetUtils.h"
 #include "native/utilities/AssetBuilderInfo.h"
-#include "native/utilities/CommunicatorTracePrinter.h"
 
 #include <AssetProcessor_Traits_Platform.h>
 
diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp
index a64e3bf5b9..1fddf15547 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp
@@ -177,11 +177,9 @@ namespace AssetProcessor
         AZ_TracePrintf(AssetProcessor::DebugChannel, "JobTrace AddNewJob(%i  %s,%s,%s)\n", rcJob, rcJob->GetInputFileAbsolutePath().toUtf8().constData(), rcJob->GetPlatformInfo().m_identifier.c_str(), rcJob->GetJobKey().toUtf8().constData());
 #endif
 
-        bool isPending = false;
         if (rcJob->GetState() == RCJob::pending)
         {
             m_jobsInQueueLookup.insert(rcJob->GetElementID(), rcJob);
-            isPending = true;
         }
         endInsertRows();
     }
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
index 8f26155fd3..fcfd831d0b 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
@@ -26,7 +26,7 @@ namespace AssetProcessor
     {
     protected:
         AZStd::unique_ptr<UnitTestUtils::AssertAbsorber> m_errorAbsorber{};
-        FileStatePassthrough m_fileStateCache;
+        AZStd::unique_ptr<FileStatePassthrough> m_fileStateCache{};
 
         void SetUp() override
         {
@@ -40,9 +40,10 @@ namespace AssetProcessor
                 m_ownsSysAllocator = true;
                 AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
             }
-            m_errorAbsorber = AZStd::make_unique<UnitTestUtils::AssertAbsorber>();
 
+            m_errorAbsorber = AZStd::make_unique<UnitTestUtils::AssertAbsorber>();
             m_application = AZStd::make_unique<AzFramework::Application>();
+            m_fileStateCache = AZStd::make_unique<FileStatePassthrough>();
 
             // Inject the AutomatedTesting project as a project path into test fixture
             using FixedValueString = AZ::SettingsRegistryInterface::FixedValueString;
@@ -60,7 +61,8 @@ namespace AssetProcessor
         void TearDown() override
         {
             AssetUtilities::ResetAssetRoot();
-            
+
+            m_fileStateCache.reset();
             m_application.reset();
             m_errorAbsorber.reset();
 
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
index 93344caf6e..58f76f8da6 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
@@ -5364,13 +5364,29 @@ AZStd::vector<AZStd::string> WildcardSourceDependencyTest::FileAddedTest(const Q
 void WildcardSourceDependencyTest::SetUp()
 {
     AssetProcessorManagerTest::SetUp();
-
+    
     QDir tempPath(m_tempDir.path());
 
     // Add a non-recursive scan folder.  Only files directly inside of this folder should be picked up, subfolders are ignored
     m_config->AddScanFolder(ScanFolderInfo(tempPath.filePath("no_recurse"), "no_recurse",
         "no_recurse", false, false, m_config->GetEnabledPlatforms(), 1));
 
+    {
+        ExcludeAssetRecognizer excludeFolder;
+        excludeFolder.m_name = "Exclude ignored Folder";
+        excludeFolder.m_patternMatcher =
+            AssetBuilderSDK::FilePatternMatcher(R"REGEX(^(.*\/)?ignored(\/.*)?$)REGEX", AssetBuilderSDK::AssetBuilderPattern::Regex);
+        m_config->AddExcludeRecognizer(excludeFolder);
+    }
+
+    {
+        ExcludeAssetRecognizer excludeFile;
+        excludeFile.m_name = "Exclude z.foo Files";
+        excludeFile.m_patternMatcher =
+            AssetBuilderSDK::FilePatternMatcher(R"REGEX(^(.*\/)?z\.foo$)REGEX", AssetBuilderSDK::AssetBuilderPattern::Regex);
+        m_config->AddExcludeRecognizer(excludeFile);
+    }
+
     UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder1/1a.foo"));
     UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder1/1b.foo"));
     UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder2/redirected/a.foo"));
@@ -5384,6 +5400,19 @@ void WildcardSourceDependencyTest::SetUp()
     // Add a file in the non-recursive scanfolder.  Since its not directly in the scan folder, it should always be ignored
     UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("no_recurse/one/two/three/f.foo"));
 
+    // Add a file to an ignored folder
+    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder2/redirected/folder/ignored/g.foo"));
+
+    // Add an ignored file
+    UnitTestUtils::CreateDummyFile(tempPath.absoluteFilePath("subfolder2/redirected/folder/one/z.foo"));
+
+    // Add a file in the cache
+    AZStd::string projectCacheRootValue;
+    AZ::SettingsRegistry::Get()->Get(projectCacheRootValue, AZ::SettingsRegistryMergeUtils::FilePathKey_CacheProjectRootFolder);
+    projectCacheRootValue = AssetUtilities::NormalizeFilePath(projectCacheRootValue.c_str()).toUtf8().constData();
+    auto path = AZ::IO::Path(projectCacheRootValue) / "cache.foo";
+    UnitTestUtils::CreateDummyFile(path.c_str());
+
     AzToolsFramework::AssetDatabase::SourceFileDependencyEntryContainer dependencies;
 
     // Relative path wildcard dependency
@@ -5518,6 +5547,102 @@ TEST_F(WildcardSourceDependencyTest, Absolute_NoWildcard)
     ASSERT_THAT(resolvedPaths, ::testing::UnorderedElementsAre());
 }
 
+TEST_F(WildcardSourceDependencyTest, Relative_IgnoredFolder)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+
+    ASSERT_TRUE(Test("*g.foo", resolvedPaths));
+    ASSERT_THAT(resolvedPaths, ::testing::UnorderedElementsAre());
+}
+
+TEST_F(WildcardSourceDependencyTest, Absolute_IgnoredFolder)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+    QDir tempPath(m_tempDir.path());
+
+    ASSERT_TRUE(Test(tempPath.absoluteFilePath("*g.foo").toUtf8().constData(), resolvedPaths));
+    ASSERT_THAT(resolvedPaths, ::testing::UnorderedElementsAre());
+}
+
+TEST_F(WildcardSourceDependencyTest, Relative_IgnoredFile)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+
+    ASSERT_TRUE(Test("*z.foo", resolvedPaths));
+    ASSERT_THAT(resolvedPaths, ::testing::UnorderedElementsAre());
+}
+
+TEST_F(WildcardSourceDependencyTest, Absolute_IgnoredFile)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+    QDir tempPath(m_tempDir.path());
+
+    ASSERT_TRUE(Test(tempPath.absoluteFilePath("*z.foo").toUtf8().constData(), resolvedPaths));
+    ASSERT_THAT(resolvedPaths, ::testing::UnorderedElementsAre());
+}
+
+TEST_F(WildcardSourceDependencyTest, Relative_CacheFolder)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+    QDir tempPath(m_tempDir.path());
+    
+    ASSERT_TRUE(Test("*cache.foo", resolvedPaths));
+    ASSERT_THAT(resolvedPaths, ::testing::UnorderedElementsAre());
+}
+
+TEST_F(WildcardSourceDependencyTest, FilesAddedAfterInitialCache)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+    QDir tempPath(m_tempDir.path());
+
+    auto excludedFolderCacheInterface = AZ::Interface<ExcludedFolderCacheInterface>::Get();
+
+    ASSERT_TRUE(excludedFolderCacheInterface);
+
+    {
+        const auto& excludedFolders = excludedFolderCacheInterface->GetExcludedFolders();
+
+        ASSERT_EQ(excludedFolders.size(), 2);
+    }
+
+    // Add a file to a new ignored folder
+    QString newFilePath = tempPath.absoluteFilePath("subfolder2/redirected/folder/two/ignored/three/new.foo");
+    UnitTestUtils::CreateDummyFile(newFilePath);
+
+    excludedFolderCacheInterface->FileAdded(newFilePath);
+
+    const auto& excludedFolders = excludedFolderCacheInterface->GetExcludedFolders();
+
+    ASSERT_EQ(excludedFolders.size(), 3);
+    ASSERT_THAT(excludedFolders, ::testing::Contains(AZStd::string(tempPath.absoluteFilePath("subfolder2/redirected/folder/two/ignored").toUtf8().constData())));
+}
+
+TEST_F(WildcardSourceDependencyTest, FilesRemovedAfterInitialCache)
+{
+    AZStd::vector<AZStd::string> resolvedPaths;
+    QDir tempPath(m_tempDir.path());
+
+    // Add a file to a new ignored folder
+    QString newFilePath = tempPath.absoluteFilePath("subfolder2/redirected/folder/two/ignored/three/new.foo");
+    UnitTestUtils::CreateDummyFile(newFilePath);
+
+    auto excludedFolderCacheInterface = AZ::Interface<ExcludedFolderCacheInterface>::Get();
+
+    ASSERT_TRUE(excludedFolderCacheInterface);
+
+    {
+        const auto& excludedFolders = excludedFolderCacheInterface->GetExcludedFolders();
+
+        ASSERT_EQ(excludedFolders.size(), 3);
+    }
+    
+    m_fileStateCache->SignalDeleteEvent(tempPath.absoluteFilePath("subfolder2/redirected/folder/two/ignored"));
+
+    const auto& excludedFolders = excludedFolderCacheInterface->GetExcludedFolders();
+
+    ASSERT_EQ(excludedFolders.size(), 2);
+}
+
 TEST_F(WildcardSourceDependencyTest, NewFile_MatchesSavedRelativeDependency)
 {
     QDir tempPath(m_tempDir.path());
diff --git a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
index 6fd05fa948..624fa3d06b 100644
--- a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
@@ -52,11 +52,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_BadPlatform)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_broken_badplatform");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_GT(m_absorber.m_numErrorsAbsorbed, 0);
 }
 
@@ -67,11 +68,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_NoPlatform)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_broken_noplatform");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_GT(m_absorber.m_numErrorsAbsorbed, 0);
 }
 
@@ -81,11 +83,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_NoScanFolders)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_broken_noscans");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_GT(m_absorber.m_numErrorsAbsorbed, 0);
 }
 
@@ -95,11 +98,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_BrokenRecognizers)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_broken_recognizers");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_GT(m_absorber.m_numErrorsAbsorbed, 0);
 }
 
@@ -109,11 +113,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Regular_Platforms)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     // verify the data.
@@ -322,12 +327,13 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolder)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
     AssetUtilities::ComputeProjectName(EmptyDummyProjectName, true);
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     ASSERT_EQ(config.GetScanFolderCount(), 3); // the two, and then the one that has the same data as prior but different identifier.
@@ -356,11 +362,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolderP
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular_platform_scanfolder");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     ASSERT_EQ(config.GetScanFolderCount(), 5);
@@ -402,13 +409,14 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularExcludes)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     
     config.AddScanFolder(ScanFolderInfo("blahblah", "Blah ScanFolder", "sf2", true, true), true);
     m_absorber.Clear();
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     ASSERT_TRUE(config.IsFileExcluded("blahblah/$tmp_01.test"));
@@ -429,11 +437,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
 #endif
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     const AssetProcessor::RecognizerContainer& recogs = config.GetAssetRecognizerContainer();
@@ -520,12 +529,13 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Overrides)
     using namespace AzToolsFramework::AssetSystem;
     using namespace AssetProcessor;
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / DummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
 
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), DummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     const AssetProcessor::RecognizerContainer& recogs = config.GetAssetRecognizerContainer();
@@ -627,11 +637,12 @@ TEST_F(PlatformConfigurationUnitTests, ReadCheckServer_FromConfig_Valid)
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_regular");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_TRUE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_EQ(m_absorber.m_numErrorsAbsorbed, 0);
 
     const AssetProcessor::RecognizerContainer& recogs = config.GetAssetRecognizerContainer();
@@ -676,11 +687,12 @@ TEST_F(PlatformConfigurationUnitTests, Test_MetaFileTypes_AssetImporterExtension
     using namespace AssetProcessor;
 
     const auto testExeFolder = AZ::IO::FileIOBase::GetInstance()->ResolvePath(TestAppRoot);
+    const AZ::IO::FixedMaxPath projectPath = (*testExeFolder) / EmptyDummyProjectName;
     auto configRoot = AZ::IO::FileIOBase::GetInstance()->ResolvePath("@exefolder@/testdata/config_metadata");
     ASSERT_TRUE(configRoot);
     UnitTestPlatformConfiguration config;
     m_absorber.Clear();
-    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), EmptyDummyProjectName, false, false));
+    ASSERT_FALSE(config.InitializeFromConfigFiles(configRoot->c_str(), testExeFolder->c_str(), projectPath.c_str(), false, false));
     ASSERT_GT(m_absorber.m_numErrorsAbsorbed, 0);
     ASSERT_TRUE(config.MetaDataFileTypesCount() == 2);
 
diff --git a/Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp b/Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp
new file mode 100644
index 0000000000..ed7177e841
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <native/tests/AssetProcessorTest.h>
+#include <native/utilities/StatsCapture.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/StringFunc/StringFunc.h>
+
+// the simple stats capture system has a trivial interface and only writes to printf.
+// So the simplest tests we can do is make sure it only asserts when it should
+// and doesn't assert in cases when it shouldn't, and that the stats are reasonable
+// in printf format.
+
+namespace AssetProcessor
+{
+// Its okay to talk to this system when unintialized, you can gain some perf
+// by not intializing it at all
+TEST_F(AssetProcessorTest, StatsCaptureTest_UninitializedSystemDoesNotAssert)
+{
+    AssetProcessor::StatsCapture::BeginCaptureStat("Test");
+    AssetProcessor::StatsCapture::EndCaptureStat("Test");
+    AssetProcessor::StatsCapture::Dump();
+    AssetProcessor::StatsCapture::Shutdown();
+}
+
+// Double-intiailize is an error
+TEST_F(AssetProcessorTest, StatsCaptureTest_DoubleInitializeIsAnAssert)
+{
+    m_errorAbsorber->Clear();
+    
+    AssetProcessor::StatsCapture::Initialize();
+    AssetProcessor::StatsCapture::Initialize();
+    
+    EXPECT_EQ(m_errorAbsorber->m_numErrorsAbsorbed, 0);
+    EXPECT_EQ(m_errorAbsorber->m_numAssertsAbsorbed, 1); // not allowed to assert on this
+
+    AssetProcessor::StatsCapture::BeginCaptureStat("Test");
+    AssetProcessor::StatsCapture::Shutdown();
+}
+
+class StatsCaptureOutputTest : public AssetProcessorTest, public AZ::Debug::TraceMessageBus::Handler
+{
+public:
+    void SetUp() override
+    {
+        AssetProcessorTest::SetUp();
+        AssetProcessor::StatsCapture::Initialize();
+    }
+    
+    // dump but also capture the dump as a vector of lines:
+    void Dump()
+    {
+        AZ::Debug::TraceMessageBus::Handler::BusConnect();
+        AssetProcessor::StatsCapture::Dump();
+        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+    }
+    
+    virtual bool OnPrintf(const char* /*window*/, const char* message)
+    {
+        m_gatheredMessages.emplace_back(message);
+        AZ::StringFunc::TrimWhiteSpace(m_gatheredMessages.back(), true, true);
+        return false;
+    }
+    
+    void TearDown() override
+    {
+        m_gatheredMessages = {};
+        
+        AssetProcessor::StatsCapture::Shutdown();
+        AssetProcessorTest::TearDown();
+    }
+    
+    AZStd::vector<AZStd::string> m_gatheredMessages;
+};
+
+// turning off machine and human readable mode, should not dump anything.
+TEST_F(StatsCaptureOutputTest, StatsCaptureTest_DisabledByRegset_DumpsNothing)
+{
+    auto registry = AZ::SettingsRegistry::Get();
+    ASSERT_NE(registry, nullptr);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", false);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", false);
+    AssetProcessor::StatsCapture::BeginCaptureStat("Test");
+    AssetProcessor::StatsCapture::EndCaptureStat("Test");
+    Dump();
+    EXPECT_EQ(m_gatheredMessages.size(), 0);
+}
+
+// turning on Human Readable, turn off Machine Readable, should not output any machine readable stats.
+TEST_F(StatsCaptureOutputTest, StatsCaptureTest_HumanReadableOnly_DumpsNoMachineReadable)
+{
+    auto registry = AZ::SettingsRegistry::Get();
+    ASSERT_NE(registry, nullptr);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", true);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", false);
+    AssetProcessor::StatsCapture::BeginCaptureStat("Test");
+    AssetProcessor::StatsCapture::EndCaptureStat("Test");
+    Dump();
+    EXPECT_GT(m_gatheredMessages.size(), 0);
+    for (const auto& message : m_gatheredMessages)
+    {
+        // we expect to see ZERO "Machine Readable" lines
+        EXPECT_FALSE(message.contains("MachineReadableStat:")) << "Found unexpected line in output: " << message.c_str();
+    }
+}
+
+// Turn on Machine Readable, Turn off Human Readable, ensure only Machine Readable stats emitted.
+TEST_F(StatsCaptureOutputTest, StatsCaptureTest_MachineReadableOnly_DumpsNoHumanReadable)
+{
+    auto registry = AZ::SettingsRegistry::Get();
+    ASSERT_NE(registry, nullptr);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", false);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", true);
+    AssetProcessor::StatsCapture::BeginCaptureStat("Test");
+    AssetProcessor::StatsCapture::EndCaptureStat("Test");
+    Dump();
+    for (const auto& message : m_gatheredMessages)
+    {
+        // we expect to see ONLY "Machine Readable" lines
+        EXPECT_TRUE(message.contains("MachineReadableStat:")) << "Found unexpected line in output: " << message.c_str();
+    }
+    EXPECT_GT(m_gatheredMessages.size(), 0);
+}
+
+
+// The interface for StatsCapture just captures and then dumps.  
+// For us to test this, we thus have to capture and parse the dump output.
+TEST_F(StatsCaptureOutputTest, StatsCaptureTest_Sanity)
+{
+    auto registry = AZ::SettingsRegistry::Get();
+    ASSERT_NE(registry, nullptr);
+    
+    // Make it output in "machine raadable" format so that it is simpler to parse.
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", false);
+    registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", true);
+    AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo,mybuilder");
+    AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo,mybuilder");
+    
+    // Intentionally not using sleeps in this test.  It means that the 
+    // captured duration will be likely 0 but its not worth it to slow down tests.
+    // If the durations end up 0 its going to be extremely noticable in day-to-day use.
+    AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo,mybuilder");
+    AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo,mybuilder");
+    
+    // for the second stat, we'll double capture and double end, in order to test debounce
+    AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo2,mybuilder");
+    AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo2,mybuilder");
+    AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo2,mybuilder2");
+    AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo2,mybuilder2");
+    
+    m_gatheredMessages.clear();
+    Dump();
+    EXPECT_GT(m_gatheredMessages.size(), 0);
+
+    // We'll parse the machine readable stat lines here and make sure that the following is true
+    // mybuilder appears
+    // mybuilder appears only once but count is 2
+    bool foundFoo = false;
+    bool foundFoo2 = false;
+    
+    for (const auto& stat : m_gatheredMessages)
+    {
+        if (stat.contains("MachineReadableStat:"))
+        {
+            AZStd::vector<AZStd::string> tokens;
+            AZ::StringFunc::Tokenize(stat, tokens, ":", false, false);
+            ASSERT_EQ(tokens.size(), 5); // should be "MachineReadableStat:time:count:average:name)
+            const auto& countData = tokens[2];
+            const auto& nameData = tokens[4];
+            
+            if (AZ::StringFunc::Equal(nameData, "CreateJobs,foo,mybuilder"))
+            {
+                EXPECT_FALSE(foundFoo); // should only find one of these
+                foundFoo = true;
+                EXPECT_STREQ(countData.c_str(), "2");
+            }
+            
+            if (AZ::StringFunc::Equal(nameData, "CreateJobs,foo2,mybuilder2"))
+            {
+                EXPECT_FALSE(foundFoo2); // should only find one of these
+                foundFoo2 = true;
+                EXPECT_STREQ(countData.c_str(), "1");
+            }
+        }
+    }
+    
+    EXPECT_TRUE(foundFoo) << "The expected token CreateJobs,foo,mybuilder did not appear in the output.";
+    EXPECT_TRUE(foundFoo2) << "The expected CreateJobs.foo2.mybuilder2 did not appear in the output";
+}
+
+}
+
diff --git a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
index a8bc714698..ce531a4796 100644
--- a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
@@ -152,7 +152,6 @@ void RCcontrollerUnitTests::RunRCControllerTests()
     }
 
     QModelIndex rcJobIndex;
-    int rcJobJobIndex;
     QString rcJobCommand;
     QString rcJobState;
 
@@ -172,7 +171,6 @@ void RCcontrollerUnitTests::RunRCControllerTests()
             return;
         }
 
-        rcJobJobIndex = rcJobListModel->data(rcJobIndex, RCJobListModel::jobIndexRole).toInt();
         rcJobCommand = rcJobListModel->data(rcJobIndex, RCJobListModel::displayNameRole).toString();
         rcJobState = rcJobListModel->data(rcJobIndex, RCJobListModel::stateRole).toString();
     }
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
index a024ce6c7a..7a14f158d6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
@@ -16,7 +16,8 @@
 #include <AzFramework/Logging/LoggingComponent.h>
 #include <AzFramework/Asset/AssetSystemComponent.h>
 
-#include "native/resourcecompiler/RCBuilder.h"
+#include <native/resourcecompiler/RCBuilder.h>
+#include <native/utilities/StatsCapture.h>
 
 #include <QLocale>
 #include <QTranslator>
@@ -200,6 +201,10 @@ ApplicationManager::~ApplicationManager()
         delete m_appDependencies[idx];
     }
 
+    // end stats capture (dump and shutdown)
+    AssetProcessor::StatsCapture::Dump();
+    AssetProcessor::StatsCapture::Shutdown();
+
     qInstallMessageHandler(nullptr);
 
     //deleting QCoreApplication/QApplication
@@ -571,6 +576,8 @@ bool ApplicationManager::StartAZFramework()
 
 bool ApplicationManager::ActivateModules()
 {
+     AssetProcessor::StatsCapture::BeginCaptureStat("LoadingModules");
+
     // we load the editor xml for our modules since it contains the list of gems we need for tools to function (not just runtime)
     connect(&m_frameworkApp, &AssetProcessorAZApplication::AssetProcessorStatus, this,
         [this](AssetProcessor::AssetProcessorStatusEntry entry)
@@ -587,6 +594,8 @@ bool ApplicationManager::ActivateModules()
     }
 
     m_frameworkApp.LoadDynamicModules();
+
+    AssetProcessor::StatsCapture::EndCaptureStat("LoadingModules");
     return true;
 }
 
@@ -618,6 +627,9 @@ ApplicationManager::BeforeRunStatus ApplicationManager::BeforeRun()
         return ApplicationManager::BeforeRunStatus::Status_Failure;
     }
 
+    // enable stats capture from this point on
+    AssetProcessor::StatsCapture::Initialize();
+
     return ApplicationManager::BeforeRunStatus::Status_Success;
 }
 
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
index 4e0bc7e434..499e5fe4f7 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
@@ -454,6 +454,8 @@ void ApplicationManagerBase::InitFileMonitor()
         QObject::connect(newFolderWatch, &FolderWatchCallbackEx::fileModified, [this](QString path) { m_fileStateCache->UpdateFile(path); });
         QObject::connect(newFolderWatch, &FolderWatchCallbackEx::fileRemoved, [this](QString path) { m_fileStateCache->RemoveFile(path); });
 
+        QObject::connect(newFolderWatch, &FolderWatchCallbackEx::fileAdded, [](QString path) { AZ::Interface<AssetProcessor::ExcludedFolderCacheInterface>::Get()->FileAdded(path); });
+
         QObject::connect(newFolderWatch, &FolderWatchCallbackEx::fileAdded,
             m_fileProcessor.get(), &AssetProcessor::FileProcessor::AssessAddedFile);
         QObject::connect(newFolderWatch, &FolderWatchCallbackEx::fileRemoved,
@@ -1171,6 +1173,7 @@ void ApplicationManagerBase::InitBuilderManager()
         {
             m_builderManager->ConnectionLost(connId);
         });
+    
 }
 
 void ApplicationManagerBase::ShutdownBuilderManager()
@@ -1479,7 +1482,7 @@ bool ApplicationManagerBase::WaitForBuilderExit(AzFramework::ProcessWatcher* pro
     AZ::u32 exitCode = 0;
     bool finishedOK = false;
     QElapsedTimer ticker;
-    CommunicatorTracePrinter tracer(processWatcher->GetCommunicator(), "AssetBuilder");
+    ProcessCommunicatorTracePrinter tracer(processWatcher->GetCommunicator(), "AssetBuilder");
 
     ticker.start();
 
diff --git a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp
index 751afc1a5d..aa462f7590 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp
@@ -164,7 +164,7 @@ namespace AssetProcessor
             return false;
         }
 
-        m_tracePrinter = AZStd::make_unique<CommunicatorTracePrinter>(m_processWatcher->GetCommunicator(), "AssetBuilder");
+        m_tracePrinter = AZStd::make_unique<ProcessCommunicatorTracePrinter>(m_processWatcher->GetCommunicator(), "AssetBuilder");
 
         return WaitForConnection();
     }
diff --git a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h
index 657e4c7788..440f0b3709 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h
+++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h
@@ -10,11 +10,11 @@
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/parallel/binary_semaphore.h>
 #include <AzFramework/Process/ProcessWatcher.h>
+#include <AzFramework/Process/ProcessCommunicatorTracePrinter.h>
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <QString>
 #include <QByteArray>
-#include <native/utilities/CommunicatorTracePrinter.h>
 #include <native/utilities/assetUtils.h>
 #include <QDir>  // used in the inl file.
 
@@ -127,7 +127,7 @@ namespace AssetProcessor
         AZStd::unique_ptr<AzFramework::ProcessWatcher> m_processWatcher = nullptr;
 
         //! Optional communicator, only available if we have a process watcher
-        AZStd::unique_ptr<CommunicatorTracePrinter> m_tracePrinter = nullptr;
+        AZStd::unique_ptr<ProcessCommunicatorTracePrinter> m_tracePrinter = nullptr;
 
         const AssetUtilities::QuitListener& m_quitListener;
     };
diff --git a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
index bcadd0f103..7543e9ec8b 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.cpp
@@ -749,7 +749,7 @@ namespace AssetProcessor
         }
 
         AZStd::vector<AZ::IO::Path> configFiles = AzToolsFramework::AssetUtils::GetConfigFiles(absoluteSystemRoot.toUtf8().constData(),
-            absoluteAssetRoot.toUtf8().constData(), projectPath.toUtf8().constData(),
+            projectPath.toUtf8().constData(),
             addPlatformConfigs, addGemsConfigs && !noGemScanFolders, settingsRegistry);
 
         // First Merge all Engine, Gem and Project specific AssetProcessor*Config.setreg/.inifiles
@@ -1285,6 +1285,13 @@ namespace AssetProcessor
         return m_scanFolders[index];
     }
 
+    const AssetProcessor::ScanFolderInfo& PlatformConfiguration::GetScanFolderAt(int index) const
+    {
+        Q_ASSERT(index >= 0);
+        Q_ASSERT(index < m_scanFolders.size());
+        return m_scanFolders[index];
+    }
+
     void PlatformConfiguration::AddScanFolder(const AssetProcessor::ScanFolderInfo& source, bool isUnitTesting)
     {
         if (isUnitTesting)
@@ -1436,7 +1443,10 @@ namespace AssetProcessor
     }
 
     QStringList PlatformConfiguration::FindWildcardMatches(
-        const QString& sourceFolder, QString relativeName, bool includeFolders, bool recursiveSearch) const
+        const QString& sourceFolder,
+        QString relativeName,
+        bool includeFolders,
+        bool recursiveSearch) const
     {
         if (relativeName.isEmpty())
         {
@@ -1469,6 +1479,67 @@ namespace AssetProcessor
         return returnList;
     }
 
+    QStringList PlatformConfiguration::FindWildcardMatches(
+        const QString& sourceFolder,
+        QString relativeName,
+        const AZStd::unordered_set<AZStd::string>& excludedFolders,
+        bool includeFolders,
+        bool recursiveSearch) const
+    {
+        if (relativeName.isEmpty())
+        {
+            return QStringList();
+        }
+
+        QDir sourceFolderDir(sourceFolder);
+
+        QString posixRelativeName = QDir::fromNativeSeparators(relativeName);
+
+        QStringList returnList;
+        QRegExp nameMatch{ posixRelativeName, Qt::CaseInsensitive, QRegExp::Wildcard };
+        AZStd::stack<QString> dirs;
+        dirs.push(sourceFolderDir.absolutePath());
+        
+        while (!dirs.empty())
+        {
+            QString absolutePath = dirs.top();
+            dirs.pop();
+
+            if (excludedFolders.contains(absolutePath.toUtf8().constData()))
+            {
+                continue;
+            }
+
+            QDirIterator dirIterator(absolutePath, QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+
+            while (dirIterator.hasNext())
+            {
+                dirIterator.next();
+
+                if (!dirIterator.fileInfo().isFile())
+                {
+                    if (recursiveSearch)
+                    {
+                        dirs.push(dirIterator.filePath());
+                    }
+
+                    if (!includeFolders)
+                    {
+                        continue;
+                    }
+                }
+                
+                QString pathMatch{ sourceFolderDir.relativeFilePath(dirIterator.filePath()) };
+                if (nameMatch.exactMatch(pathMatch))
+                {
+                    returnList.append(QDir::fromNativeSeparators(dirIterator.filePath()));
+                }
+            }
+        }
+
+        return returnList;
+    }
+
     const AssetProcessor::ScanFolderInfo* PlatformConfiguration::GetScanFolderForFile(const QString& fullFileName) const
     {
         QString normalized = AssetUtilities::NormalizeFilePath(fullFileName);
diff --git a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
index 2c04ca1fad..a57416da10 100644
--- a/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
+++ b/Code/Tools/AssetProcessor/native/utilities/PlatformConfiguration.h
@@ -256,6 +256,9 @@ namespace AssetProcessor
         //! Retrieve the scan folder at a given index.
         AssetProcessor::ScanFolderInfo& GetScanFolderAt(int index);
 
+        //! Retrieve the scan folder at a given index.
+        const AssetProcessor::ScanFolderInfo& GetScanFolderAt(int index) const;
+
         //!  Manually add a scan folder.  Also used for testing.
         void AddScanFolder(const AssetProcessor::ScanFolderInfo& source, bool isUnitTesting = false);
 
@@ -298,7 +301,16 @@ namespace AssetProcessor
         QString FindFirstMatchingFile(QString relativeName) const;
 
         //! given a relative name with wildcard characters (* allowed) find a set of matching files or optionally folders
-        QStringList FindWildcardMatches(const QString& sourceFolder, QString relativeName, bool includeFolders = false, bool recursiveSearch = true) const;
+        QStringList FindWildcardMatches(const QString& sourceFolder, QString relativeName, bool includeFolders = false,
+            bool recursiveSearch = true) const;
+
+        //! given a relative name with wildcard characters (* allowed) find a set of matching files or optionally folders
+        QStringList FindWildcardMatches(
+            const QString& sourceFolder,
+            QString relativeName,
+            const AZStd::unordered_set<AZStd::string>& excludedFolders,
+            bool includeFolders = false,
+            bool recursiveSearch = true) const;
 
         //! given a fileName (as a full path), return the database source name which includes the output prefix.
         //!
diff --git a/Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp
new file mode 100644
index 0000000000..f6b7c07a91
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp
@@ -0,0 +1,400 @@
+ /*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <native/utilities/StatsCapture.h>
+#include <native/assetprocessor.h>
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/std/chrono/chrono.h>
+#include <AzCore/std/chrono/clocks.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/sort.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/containers/unordered_set.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/StringFunc/StringFunc.h>
+
+#include <inttypes.h>
+
+namespace AssetProcessor
+{
+    namespace StatsCapture
+    {
+        // This class captures stats by storing them in a map of type
+        // [name of stat] -> Stat struct
+        // It can then analyze these stats and produce more stats from the original
+        // Captures, before dumping.
+        class StatsCaptureImpl final
+        {
+        public:
+            AZ_CLASS_ALLOCATOR(StatsCaptureImpl, AZ::SystemAllocator, 0);
+
+            void BeginCaptureStat(AZStd::string_view statName);
+            void EndCaptureStat(AZStd::string_view statName);
+            void Dump();
+        private:
+            using timepoint = AZStd::chrono::high_resolution_clock::time_point;
+            using duration = AZStd::chrono::milliseconds;
+            struct StatsEntry
+            {
+                duration m_cumulativeTime = {};    // The total amount of time spent on this.
+                timepoint m_operationStartTime = {}; // Async tracking - the last time stamp an operation started.
+                int64_t m_operationCount = 0; // In case there's more than one sample.  Used to calc average.
+            };
+            
+            AZStd::unordered_map<AZStd::string, StatsEntry> m_stats;
+            bool m_dumpMachineReadableStats = false;
+            bool m_dumpHumanReadableStats = true;
+
+            // Make a friendly time string of the format nnHnnMhhS.xxxms
+            AZStd::string FormatDuration(const duration& duration)
+            {
+                int64_t milliseconds = duration.count();
+                constexpr int64_t millisecondsInASecond = 1000;
+                constexpr int64_t millisecondsInAMinute = millisecondsInASecond * 60;
+                constexpr int64_t millisecondsInAnHour = millisecondsInAMinute * 60;
+                
+                int64_t hours = milliseconds / millisecondsInAnHour;
+                milliseconds -= hours * millisecondsInAnHour;
+                
+                int64_t minutes = milliseconds / millisecondsInAMinute;
+                milliseconds -= minutes * millisecondsInAMinute;
+                
+                int64_t seconds = milliseconds / millisecondsInASecond;
+                milliseconds -= seconds * millisecondsInASecond;
+                
+                // omit the sections which dont make sense for readability
+                if (hours)
+                {
+                    return AZStd::string::format("%02" PRId64 "h%02" PRId64 "m%02" PRId64 "s%03" PRId64 "ms" , hours, minutes, seconds, milliseconds);
+                }
+                else if (minutes)
+                {
+                    return AZStd::string::format("   %02" PRId64 "m%02" PRId64 "s%03" PRId64 "ms", minutes, seconds, milliseconds);
+                }
+                else if (seconds)
+                {
+                    return AZStd::string::format("      %02" PRId64 "s%03" PRId64 "ms", seconds, milliseconds);
+                }
+                
+                return AZStd::string::format("         %03" PRId64 "ms", milliseconds);
+            }
+
+            // Prints out a single stat. 
+            void PrintStat([[maybe_unused]] const char* name, duration milliseconds, int64_t count)
+            {
+                // note that name may be unused as it only appears in Trace macros, which are
+                // stripped out in release builds.
+                if (count <= 1)
+                {
+                    count = 1;
+                }
+
+                duration average(static_cast<int64_t>(static_cast<double>(milliseconds.count()) / static_cast<double>(count)));
+
+                if (m_dumpHumanReadableStats)
+                {
+                    if (count > 1)
+                    {
+                        AZ_TracePrintf(AssetProcessor::ConsoleChannel, "    Time: %s, Count: %4" PRId64 ", Average: %s, EventName: %s\n",
+                            FormatDuration(milliseconds).c_str(),
+                            count,
+                            FormatDuration(average).c_str(),
+                            name);
+                    }
+                    else
+                    {
+                        AZ_TracePrintf(AssetProcessor::ConsoleChannel, "    Time: %s, EventName: %s\n",
+                            FormatDuration(milliseconds).c_str(),
+                            name);
+                    }
+                }
+                if (m_dumpMachineReadableStats)
+                {
+                    // machine Readable mode prints raw milliseconds and uses a CSV-like format
+                    // note that the stat itself may contain commas, so we dont acutally separate with comma
+                    // instead we separate with :
+                    // and each "interesting line" is 'MachineReadableStat:milliseconds:count:average:name'
+                    AZ_TracePrintf(AssetProcessor::ConsoleChannel, "MachineReadableStat:%" PRId64 ":%" PRId64 ":%" PRId64 ":%s\n",
+                            milliseconds.count(),
+                            count,
+                            count > 1 ? average.count() : milliseconds.count(),
+                            name);
+                }
+            }
+            
+            // calls PrintStat on each element in the vector.
+            void PrintStatsArray(AZStd::vector<AZStd::string>& keys, int maxToPrint, const char* header)
+            {
+                // don't print anything out at all, not even a header, if the keys are empty.
+                if (keys.empty())
+                {
+                    return;
+                }
+
+                if ((m_dumpHumanReadableStats)&&(header))
+                {
+                    AZ_TracePrintf(AssetProcessor::ConsoleChannel,"Top %i %s\n", maxToPrint, header);
+                }
+                   
+                auto sortByTimeDescending = [&](const AZStd::string& s1, const AZStd::string& s2)
+                {
+                    return this->m_stats[s1].m_cumulativeTime > this->m_stats[s2].m_cumulativeTime;
+                };
+        
+                AZStd::sort(keys.begin(), keys.end(), sortByTimeDescending);
+                
+                for (int idx = 0; idx < maxToPrint; ++idx)
+                {
+                    if (idx < keys.size())
+                    {
+                        PrintStat(keys[idx].c_str(), m_stats[keys[idx]].m_cumulativeTime, m_stats[keys[idx]].m_operationCount);
+                    }
+                }
+            }
+        };
+
+
+        void StatsCaptureImpl::BeginCaptureStat(AZStd::string_view statName)
+        {
+            StatsEntry& existingStat = m_stats[statName];
+            if (existingStat.m_operationStartTime != timepoint())
+            {
+                // prevent double 'Begins'
+                return;
+            }
+            existingStat.m_operationStartTime = AZStd::chrono::high_resolution_clock::now();
+        }
+
+        void StatsCaptureImpl::EndCaptureStat(AZStd::string_view statName)
+        {
+            StatsEntry& existingStat = m_stats[statName];
+            if (existingStat.m_operationStartTime != timepoint())
+            {
+                existingStat.m_cumulativeTime = AZStd::chrono::high_resolution_clock::now() - existingStat.m_operationStartTime;
+                existingStat.m_operationCount = existingStat.m_operationCount + 1;
+                existingStat.m_operationStartTime = timepoint(); // reset the start time so that double 'Ends' are ignored.
+            }
+        }
+
+        void StatsCaptureImpl::Dump()
+        {
+            timepoint startTimeStamp = AZStd::chrono::high_resolution_clock::now();
+
+            auto settingsRegistry = AZ::SettingsRegistry::Get();
+
+            int maxCumulativeStats = 5; // default max cumulative stats to show
+            int maxIndividualStats = 5; // default max individual files to show
+
+            if (settingsRegistry)
+            {
+                AZ::u64 cumulativeStats = static_cast<AZ::u64>(maxCumulativeStats);
+                AZ::u64 individualStats = static_cast<AZ::u64>(maxIndividualStats);
+                settingsRegistry->Get(m_dumpHumanReadableStats,   "/Amazon/AssetProcessor/Settings/Stats/HumanReadable");
+                settingsRegistry->Get(m_dumpMachineReadableStats, "/Amazon/AssetProcessor/Settings/Stats/MachineReadable");
+                settingsRegistry->Get(cumulativeStats,          "/Amazon/AssetProcessor/Settings/Stats/MaxCumulativeStats");
+                settingsRegistry->Get(individualStats,          "/Amazon/AssetProcessor/Settings/Stats/MaxIndividualStats");
+                maxCumulativeStats = static_cast<int>(cumulativeStats);
+                maxIndividualStats = static_cast<int>(individualStats);
+            }
+
+            if ((!m_dumpHumanReadableStats)&&(!m_dumpMachineReadableStats))
+            {
+                return;
+            }
+
+            AZStd::vector<AZStd::string> allCreateJobs; // individual
+            AZStd::vector<AZStd::string> allCreateJobsByBuilder; // bucketed by builder
+            AZStd::vector<AZStd::string> allProcessJobs;  // individual
+            AZStd::vector<AZStd::string> allProcessJobsByPlatform; // bucketed by platform
+            AZStd::vector<AZStd::string> allProcessJobsByJobKey; // bucketed by type of job (job key)
+            AZStd::vector<AZStd::string> allHashFiles;
+
+            // capture only existing keys as we will be expanding the stats
+            // this approach avoids mutating an iterator.   
+            AZStd::vector<AZStd::string> statKeys;
+            for (const auto& element : m_stats)
+            {
+                statKeys.push_back(element.first);
+            }
+
+            for (const AZStd::string& statKey : statKeys)
+            {
+                const StatsEntry& statistic = m_stats[statKey];
+                // Createjobs stats encode like (CreateJobs,sourcefilepath,builderid)
+                if (AZ::StringFunc::StartsWith(statKey, "CreateJobs,", true))
+                {
+                    allCreateJobs.push_back(statKey);
+                    AZStd::vector<AZStd::string> tokens;
+                    AZ::StringFunc::Tokenize(statKey, tokens, ",", false, false);
+
+                    // look up the builder so you can get its name:
+                    AZStd::string_view builderName = tokens[2];
+                
+                    // synthesize a stat to track per-builder createjobs times:
+                    {
+                        AZStd::string newStatKey = AZStd::string::format("CreateJobsByBuilder,%.*s", AZ_STRING_ARG(builderName));
+
+                        auto insertion = m_stats.insert(newStatKey);
+                        StatsEntry& statToSynth = insertion.first->second;
+                        statToSynth.m_cumulativeTime += statistic.m_cumulativeTime;
+                        statToSynth.m_operationCount += statistic.m_operationCount;
+                        if (insertion.second)
+                        {
+                            allCreateJobsByBuilder.push_back(newStatKey);
+                        }
+                    }
+                    // synthesize a stat to track total createjobs times:
+                    {
+                        StatsEntry& statToSynth = m_stats["CreateJobsTotal"];
+                        statToSynth.m_cumulativeTime += statistic.m_cumulativeTime;
+                        statToSynth.m_operationCount += statistic.m_operationCount;
+                    }
+                }
+                else if (AZ::StringFunc::StartsWith(statKey, "ProcessJob,", true))
+                {
+                    allProcessJobs.push_back(statKey);
+                    // processjob has the format ProcessJob,sourcename,jobkey,platformname
+                    AZStd::vector<AZStd::string> tokens;
+                    AZ::StringFunc::Tokenize(statKey, tokens, ",", false, false);
+                    AZStd::string_view jobKey = tokens[2];
+                    AZStd::string_view platformName = tokens[3];
+
+                    // synthesize a stat to record process time accumulated by job key platform
+                    {
+                        AZStd::string newStatKey = AZStd::string::format("ProcessJobsByPlatform,%.*s", AZ_STRING_ARG(platformName));
+                        auto insertion = m_stats.insert(newStatKey);
+                        StatsEntry& statToSynth = insertion.first->second;
+                        statToSynth.m_cumulativeTime += statistic.m_cumulativeTime;
+                        statToSynth.m_operationCount += statistic.m_operationCount;
+                        if (insertion.second)
+                        {
+                            allProcessJobsByPlatform.push_back(newStatKey);
+                        }
+                    }
+
+                    // synthesize a stat to record process time accumulated job key total across all platforms
+                    {
+                        AZStd::string newStatKey = AZStd::string::format("ProcessJobsByJobKey,%.*s", AZ_STRING_ARG(jobKey));
+                        auto insertion = m_stats.insert(newStatKey);
+                        StatsEntry& statToSynth = insertion.first->second;
+                        statToSynth.m_cumulativeTime += statistic.m_cumulativeTime;
+                        statToSynth.m_operationCount += statistic.m_operationCount;
+                        if (insertion.second)
+                        {
+                            allProcessJobsByJobKey.push_back(newStatKey);
+                        }
+                    }
+                    // synthesize a stat to track total processjob times:
+                    {
+                        StatsEntry& statToSynth = m_stats["ProcessJobsTotal"];
+                        statToSynth.m_cumulativeTime += statistic.m_cumulativeTime;
+                        statToSynth.m_operationCount += statistic.m_operationCount;
+                    }
+                }
+                else if (AZ::StringFunc::StartsWith(statKey, "HashFile,", true))
+                {
+                    allHashFiles.push_back(statKey);
+                    // processjob has the format ProcessJob,sourcename,jobkey,platformname
+                    // synthesize a stat to track total hash times:
+                    StatsEntry& statToSynth = m_stats["HashFileTotal"];
+                    statToSynth.m_cumulativeTime += statistic.m_cumulativeTime;
+                    statToSynth.m_operationCount += statistic.m_operationCount;
+                }
+            }
+            
+            StatsEntry& gemLoadStat = m_stats["LoadingModules"];
+            PrintStat("LoadingGems", gemLoadStat.m_cumulativeTime, 1);
+            // analysis-related stats
+
+            StatsEntry& totalScanTime = m_stats["AssetScanning"];
+            PrintStat("AssetScanning", totalScanTime.m_cumulativeTime, totalScanTime.m_operationCount);
+            StatsEntry& totalHashTime = m_stats["HashFileTotal"];
+            PrintStat("HashFileTotal", totalHashTime.m_cumulativeTime, totalHashTime.m_operationCount);
+            PrintStatsArray(allHashFiles, maxIndividualStats, "longest individual file hashes:");
+        
+            // CreateJobs stats
+            StatsEntry& totalCreateJobs = m_stats["CreateJobsTotal"];
+            if (totalCreateJobs.m_operationCount)
+            {
+                PrintStat("CreateJobsTotal", totalCreateJobs.m_cumulativeTime, totalCreateJobs.m_operationCount);
+                PrintStatsArray(allCreateJobs, maxIndividualStats, "longest individual CreateJobs");
+                PrintStatsArray(allCreateJobsByBuilder, maxCumulativeStats, "longest CreateJobs By builder");
+            }
+            
+            // ProcessJobs stats
+            StatsEntry& totalProcessJobs = m_stats["ProcessJobsTotal"];
+            if (totalProcessJobs.m_operationCount)
+            {
+                PrintStat("ProcessJobsTotal", totalProcessJobs.m_cumulativeTime, totalProcessJobs.m_operationCount);
+                PrintStatsArray(allProcessJobs, maxIndividualStats, "longest individual ProcessJob");
+                PrintStatsArray(allProcessJobsByJobKey, maxCumulativeStats, "cumulative time spent in ProcessJob by JobKey");
+                PrintStatsArray(allProcessJobsByPlatform, maxCumulativeStats, "cumulative time spent in ProcessJob by Platform");
+            }
+            duration costToGenerateStats =  AZStd::chrono::high_resolution_clock::now() - startTimeStamp;
+            PrintStat("ComputeStatsTime", costToGenerateStats, 1);
+        }
+
+        // Public interface:
+        static StatsCaptureImpl* g_instance = nullptr;
+
+        //! call this one time before capturing stats.
+        void Initialize()
+        {
+            if (g_instance)
+            {
+                AZ_Assert(false, "An instance of StatsCaptureImpl already exists.");
+                return;
+            }
+            g_instance = aznew StatsCaptureImpl();
+        }
+
+        //! Call this one time as part of shutting down.
+        //! note that while it is an error to double-initialize, it is intentionally
+        //! not an error to call any other function when uninitialized, allowing this system
+        //! to essentially be "turned off" just by not initializing it in the first place.
+        void Shutdown()
+        {
+            if (g_instance)
+            {
+                delete g_instance;
+                g_instance = nullptr;
+            }
+        }
+
+        //! Start the clock running for a particular stat name.
+        void BeginCaptureStat(AZStd::string_view statName)
+        {
+            if (g_instance)
+            {
+                g_instance->BeginCaptureStat(statName);
+            }
+        }
+
+        //! Stop the clock running for a particular stat name.
+        void EndCaptureStat(AZStd::string_view statName)
+        {
+            if (g_instance)
+            {
+                g_instance->EndCaptureStat(statName);
+            }
+        }
+
+        //! Do additional processing and then write the cumulative stats to log.
+        //! Note that since this is an AP-specific system, the analysis done in the dump function
+        //! is going to make a lot of assumptions about the way the data is encoded.
+        void Dump()
+        {
+            if (g_instance)
+            {
+                g_instance->Dump();
+            }
+        }
+    }
+}
diff --git a/Code/Tools/AssetProcessor/native/utilities/StatsCapture.h b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.h
new file mode 100644
index 0000000000..dd3c9abccf
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+// This is an AssetProcessor-only stats capture system.  Its kept out-of-band
+// from the rest of the Asset Processor systems so that it can avoid interfering
+// with the rest of the processing decision making and other parts of AssetProcessor.
+// This is not meant to be used anywhere except in AssetProcessor.
+
+#pragma once
+
+#include <AzCore/std/string/string_view.h>
+
+namespace AssetProcessor
+{
+    namespace StatsCapture
+    {
+        //! call this one time before capturing stats.
+        void Initialize();
+
+        //! Call this one time as part of shutting down.
+        void Shutdown();
+
+        //! Start the clock running for a particular stat name.
+        void BeginCaptureStat(AZStd::string_view statName);
+
+        //! Stop the clock running for a particular stat name.
+        void EndCaptureStat(AZStd::string_view statName);
+
+        //! Do additional processing and then write the cumulative stats to log.
+        //! Note that since this is an AP-specific system, the analysis done in the dump function
+        //! is going to make a lot of assumptions about the way the data is encoded.
+        void Dump();
+    }
+    
+}
diff --git a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
index cacd6c4cc9..6bcd0dec01 100644
--- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
@@ -10,9 +10,10 @@
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/Math/Sha1.h>
 
-#include "native/utilities/PlatformConfiguration.h"
-#include "native/AssetManager/FileStateCache.h"
-#include "native/AssetDatabase/AssetDatabase.h"
+#include <native/utilities/PlatformConfiguration.h>
+#include <native/utilities/StatsCapture.h>
+#include <native/AssetManager/FileStateCache.h>
+#include <native/AssetDatabase/AssetDatabase.h>
 #include <utilities/ThreadHelper.h>
 #include <QCoreApplication>
 #include <QElapsedTimer>
@@ -1161,7 +1162,7 @@ namespace AssetUtilities
     {
 #ifndef AZ_TESTS_ENABLED
         // Only used for unit tests, speed is critical for GetFileHash.
-        AZ_UNUSED(hashMsDelay);
+        hashMsDelay = 0;
 #endif
         bool useFileHashing = ShouldUseFileHashing();
 
@@ -1170,10 +1171,10 @@ namespace AssetUtilities
             return 0;
         }
 
+        AZ::u64 hash = 0;
         if(!force)
         {
             auto* fileStateInterface = AZ::Interface<AssetProcessor::IFileStateRequests>::Get();
-            AZ::u64 hash = 0;
 
             if (fileStateInterface && fileStateInterface->GetHash(filePath, &hash))
             {
@@ -1181,64 +1182,12 @@ namespace AssetUtilities
             }
         }
 
-        char buffer[FileHashBufferSize];
-
-        constexpr bool ErrorOnReadFailure = true;
-        AZ::IO::FileIOStream readStream(filePath, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, ErrorOnReadFailure);
-
-        if(readStream.IsOpen() && readStream.CanRead())
-        {
-            AZ::IO::SizeType bytesRead;
-
-            auto* state = XXH64_createState();
-
-            if(state == nullptr)
-            {
-                AZ_Assert(false, "Failed to create hash state");
-                return 0;
-            }
-
-            if (XXH64_reset(state, 0) == XXH_ERROR)
-            {
-                AZ_Assert(false, "Failed to reset hash state");
-                return 0;
-            }
-
-            do
-            {
-                // In edge cases where another process is writing to this file while this hashing is occuring and that file wasn't locked,
-                // the following read check can fail because it performs an end of file check, and asserts and shuts down if the read size
-                // was smaller than the buffer and the read is not at the end of the file. The logic used to check end of file internal to read
-                // will be out of date in the edge cases where another process is actively writing to this file while this hash is running.
-                // The stream's length ends up more accurate in this case, preventing this assert and shut down.
-                // One area this occurs is the navigation mesh file (mnmnavmission0.bai) that's temporarily created when exporting a level,
-                // the navigation system can still be writing to this file when hashing begins, causing the EoF marker to change.
-                AZ::IO::SizeType remainingToRead = AZStd::min(readStream.GetLength() - readStream.GetCurPos(), aznumeric_cast<AZ::IO::SizeType>(AZ_ARRAY_SIZE(buffer)));
-                bytesRead = readStream.Read(remainingToRead, buffer);
-
-                if(bytesReadOut)
-                {
-                    *bytesReadOut += bytesRead;
-                }
-
-                XXH64_update(state, buffer, bytesRead);
-#ifdef AZ_TESTS_ENABLED
-                // Used by unit tests to force the race condition mentioned above, to verify the crash fix.
-                if(hashMsDelay > 0)
-                {
-                    AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(hashMsDelay));
-                }
-#endif
-
-            } while (bytesRead > 0);
-
-            auto hash = XXH64_digest(state);
-
-            XXH64_freeState(state);
-
-            return hash;
-        }
-        return 0;
+        // keep track of how much time we spend actually hashing files.
+        AZStd::string statName = AZStd::string::format("HashFile,%s", filePath);
+        AssetProcessor::StatsCapture::BeginCaptureStat(statName.c_str());
+        hash = AssetBuilderSDK::GetFileHash(filePath, bytesReadOut, hashMsDelay);
+        AssetProcessor::StatsCapture::EndCaptureStat(statName.c_str());
+        return hash;
     }
 
     AZ::u64 AdjustTimestamp(QDateTime timestamp)
diff --git a/Code/Tools/AssetProcessor/native/utilities/assetUtils.h b/Code/Tools/AssetProcessor/native/utilities/assetUtils.h
index 2145c3e0e6..46ec5d6145 100644
--- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.h
+++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.h
@@ -238,7 +238,6 @@ namespace AssetUtilities
     // hashMsDelay is only for automated tests to test that writing to a file while it's hashing does not cause a crash.
     // hashMsDelay is not used in non-unit test builds.
     AZ::u64 GetFileHash(const char* filePath, bool force = false, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0);
-    inline constexpr AZ::u64 FileHashBufferSize = 1024 * 64;
 
     //! Adjusts a timestamp to fix timezone settings and account for any precision adjustment needed
     AZ::u64 AdjustTimestamp(QDateTime timestamp);
diff --git a/Code/Tools/ProjectManager/CMakeLists.txt b/Code/Tools/ProjectManager/CMakeLists.txt
index a47ccb62c9..9974125ffb 100644
--- a/Code/Tools/ProjectManager/CMakeLists.txt
+++ b/Code/Tools/ProjectManager/CMakeLists.txt
@@ -92,6 +92,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzTest
                 AZ::AzFramework
                 AZ::AzFrameworkTestShared
+                AZ::AzQtComponents
                 AZ::ProjectManager.Static
     )
 
diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp
index 2987fc4dc2..5cade609d7 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp
+++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp
@@ -19,29 +19,15 @@ namespace O3DE::ProjectManager
     {
         // Attempt to use the Ninja build system if it is installed (described in the o3de documentation) if possible,
         // otherwise default to the the default for Linux (Unix Makefiles)
-        auto    whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"}, QProcessEnvironment::systemEnvironment());
+        auto    whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"});
         QString cmakeGenerator = (whichNinjaResult.IsSuccess()) ? "Ninja Multi-Config" : "Unix Makefiles";
         bool    compileProfileOnBuild = (whichNinjaResult.IsSuccess());
 
-        // On Linux the default compiler is gcc. For O3DE, it is clang, so we need to specify the version of clang that is detected
-        // in order to get the compiler option.
-        auto compilerOptionResult = ProjectUtils::FindSupportedCompilerForPlatform();
-        if (!compilerOptionResult.IsSuccess())
-        {
-            return AZ::Failure(compilerOptionResult.GetError());
-        }
-        auto clangCompilers = compilerOptionResult.GetValue().split('|');
-        AZ_Assert(clangCompilers.length()==2, "Invalid clang compiler pair specification");
-
-        QString clangCompilerOption = clangCompilers[0];
-        QString clangPPCompilerOption = clangCompilers[1];
         QString targetBuildPath = QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix);
         QStringList generateProjectArgs = QStringList{ProjectCMakeCommand,
                                                       "-B", ProjectBuildPathPostfix,
                                                       "-S", ".",
                                                       QString("-G%1").arg(cmakeGenerator),
-                                                      QString("-DCMAKE_C_COMPILER=").append(clangCompilerOption),
-                                                      QString("-DCMAKE_CXX_COMPILER=").append(clangPPCompilerOption),
                                                       QString("-DLY_3RDPARTY_PATH=").append(thirdPartyPath)};
         if (!compileProfileOnBuild)
         {
@@ -52,7 +38,7 @@ namespace O3DE::ProjectManager
 
     AZ::Outcome<QStringList, QString> ProjectBuilderWorker::ConstructCmakeBuildCommandArguments() const
     {
-        auto    whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"}, QProcessEnvironment::systemEnvironment());
+        auto    whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"});
         bool    compileProfileOnBuild = (whichNinjaResult.IsSuccess());
         QString targetBuildPath = QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix);
         QString launcherTargetName = m_projectInfo.m_projectName + ".GameLauncher";
diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Traits_Linux.h b/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Traits_Linux.h
index 7c0543361f..d7edcfcf12 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Traits_Linux.h
+++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectManager_Traits_Linux.h
@@ -9,3 +9,4 @@
 #pragma once
 
 #define AZ_TRAIT_PROJECT_MANAGER_CUSTOM_TITLEBAR false
+#define AZ_TRAIT_PROJECT_MANAGER_CREATE_DESKTOP_SHORTCUT false
diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp
index e901d807b4..f0603dc23f 100644
--- a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp
+++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
@@ -10,6 +10,8 @@
 #include <QProcessEnvironment>
 #include <QDir>
 
+#include <AzCore/Settings/SettingsRegistryImpl.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
 
 namespace O3DE::ProjectManager
@@ -17,20 +19,17 @@ namespace O3DE::ProjectManager
     namespace ProjectUtils
     {
         // The list of clang C/C++ compiler command lines to validate on the host Linux system
-        const QStringList SupportedClangCommands = {"clang-12|clang++-12"};
+        const QStringList SupportedClangVersions = {"13", "12", "11", "10", "9", "8", "7", "6.0"};
 
-        AZ::Outcome<QProcessEnvironment, QString> GetCommandLineProcessEnvironment()
+        AZ::Outcome<void, QString> SetupCommandLineProcessEnvironment()
         {
-            QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment());
-            currentEnvironment.insert("CC", "clang-12");
-            currentEnvironment.insert("CXX", "clang++-12");
-            return AZ::Success(currentEnvironment);
+            return AZ::Success();
         }
 
         AZ::Outcome<QString, QString> FindSupportedCompilerForPlatform()
         {
             // Validate that cmake is installed and is in the command line
-            auto whichCMakeResult = ProjectUtils::ExecuteCommandResult("which", QStringList{ProjectCMakeCommand}, QProcessEnvironment::systemEnvironment());
+            auto whichCMakeResult = ProjectUtils::ExecuteCommandResult("which", QStringList{ProjectCMakeCommand});
             if (!whichCMakeResult.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("CMake not found. <br><br>"
@@ -39,16 +38,13 @@ namespace O3DE::ProjectManager
             }
 
             // Look for the first compatible version of clang. The list below will contain the known clang compilers that have been tested for O3DE.
-            for (const QString& supportClangCommand : SupportedClangCommands)
+            for (const QString& supportClangVersion : SupportedClangVersions)
             {
-                auto clangCompilers = supportClangCommand.split('|');
-                AZ_Assert(clangCompilers.length()==2, "Invalid clang compiler pair specification");
-
-                auto whichClangResult = ProjectUtils::ExecuteCommandResult("which", QStringList{clangCompilers[0]}, QProcessEnvironment::systemEnvironment());
-                auto whichClangPPResult = ProjectUtils::ExecuteCommandResult("which", QStringList{clangCompilers[1]}, QProcessEnvironment::systemEnvironment());
+                auto whichClangResult = ProjectUtils::ExecuteCommandResult("which", QStringList{QString("clang-%1").arg(supportClangVersion)});
+                auto whichClangPPResult = ProjectUtils::ExecuteCommandResult("which", QStringList{QString("clang++-%1").arg(supportClangVersion)});
                 if (whichClangResult.IsSuccess() && whichClangPPResult.IsSuccess())
                 {
-                    return AZ::Success(supportClangCommand);
+                    return AZ::Success(QString("clang-%1").arg(supportClangVersion));
                 }
             }
             return AZ::Failure(QObject::tr("Clang not found. <br><br>"
@@ -59,7 +55,7 @@ namespace O3DE::ProjectManager
 
         AZ::Outcome<void, QString> OpenCMakeGUI(const QString& projectPath)
         {
-            AZ::Outcome processEnvResult = GetCommandLineProcessEnvironment();
+            AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment();
             if (!processEnvResult.IsSuccess())
             {
                 return AZ::Failure(processEnvResult.GetError());
@@ -73,9 +69,8 @@ namespace O3DE::ProjectManager
             }
 
             QProcess process;
-            process.setProcessEnvironment(processEnvResult.GetValue());
 
-            // if the project build path is relative, it should be relative to the project path 
+            // if the project build path is relative, it should be relative to the project path
             process.setWorkingDirectory(projectPath);
 
             process.setProgram("cmake-gui");
@@ -87,19 +82,67 @@ namespace O3DE::ProjectManager
 
             return AZ::Success();
         }
-        
+
         AZ::Outcome<QString, QString> RunGetPythonScript(const QString& engineRoot)
         {
             return ExecuteCommandResultModalDialog(
                 QString("%1/python/get_python.sh").arg(engineRoot),
                 {},
-                QProcessEnvironment::systemEnvironment(),
                 QObject::tr("Running get_python script..."));
         }
 
-        AZ::IO::FixedMaxPath GetEditorDirectory()
+        AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath)
         {
-            return AZ::Utils::GetExecutableDirectory();
+            AZ::IO::FixedMaxPath editorPath;
+            AZ::IO::FixedMaxPath fixedProjectPath{ projectPath };
+            // First attempt to launch the Editor.exe within the project build directory if it exists
+            AZ::IO::FixedMaxPath buildPathSetregPath = fixedProjectPath
+                / AZ::SettingsRegistryInterface::DevUserRegistryFolder
+                / "Platform" / AZ_TRAIT_OS_PLATFORM_CODENAME / "build_path.setreg";
+            if (AZ::IO::SystemFile::Exists(buildPathSetregPath.c_str()))
+            {
+                AZ::SettingsRegistryImpl settingsRegistry;
+                // Merge the build_path.setreg into the local SettingsRegistry instance
+                if (AZ::IO::FixedMaxPath projectBuildPath;
+                    settingsRegistry.MergeSettingsFile(buildPathSetregPath.Native(),
+                        AZ::SettingsRegistryInterface::Format::JsonMergePatch)
+                    && settingsRegistry.Get(projectBuildPath.Native(), AZ::SettingsRegistryMergeUtils::ProjectBuildPath))
+                {
+                    // local Settings Registry will be used to merge the build_path.setreg for the supplied projectPath
+                    AZ::IO::FixedMaxPath buildConfigurationPath = (fixedProjectPath / projectBuildPath).LexicallyNormal();
+
+                    // First try <project-build-path>/bin/$<CONFIG> and if that path doesn't exist
+                    // try <project-build-path>/bin/$<PLATFORM>/$<CONFIG>
+                    buildConfigurationPath /= "bin";
+                    if (editorPath = (buildConfigurationPath / AZ_BUILD_CONFIGURATION_TYPE / "Editor").
+                        ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+                        AZ::IO::SystemFile::Exists(editorPath.c_str()))
+                    {
+                        return editorPath;
+                    }
+                    else if (editorPath = (buildConfigurationPath / AZ_TRAIT_OS_PLATFORM_CODENAME
+                    / AZ_BUILD_CONFIGURATION_TYPE / "Editor").
+                        ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+                        AZ::IO::SystemFile::Exists(editorPath.c_str()))
+                    {
+                        return editorPath;
+                    }
+                }
+            }
+
+            // Fall back to checking if an Editor exists in O3DE executable directory
+            editorPath = AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) / "Editor";
+            editorPath.ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+            if (AZ::IO::SystemFile::Exists(editorPath.c_str()))
+            {
+                return editorPath;
+            }
+            return {};
+        }
+
+        AZ::Outcome<QString, QString> CreateDesktopShortcut([[maybe_unused]] const QString& filename, [[maybe_unused]] const QString& targetPath, [[maybe_unused]] const QStringList& arguments)
+        {
+            return AZ::Failure(QObject::tr("Creating desktop shortcuts functionality not implemented for this platform yet."));
         }
     } // namespace ProjectUtils
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp
index ab412d84d8..2a8bbf4839 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp
+++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp
@@ -19,16 +19,14 @@ namespace O3DE::ProjectManager
     {
         AZ::Outcome<QString, QString> QueryInstalledCmakeFullPath()
         {
-            auto environmentRequest = ProjectUtils::GetCommandLineProcessEnvironment();
+            auto environmentRequest = ProjectUtils::SetupCommandLineProcessEnvironment();
             if (!environmentRequest.IsSuccess())
             {
                 return AZ::Failure(environmentRequest.GetError());
             }
-            auto currentEnvironment = environmentRequest.GetValue();
 
             auto queryCmakeInstalled = ProjectUtils::ExecuteCommandResult("which",
-                                                                          QStringList{ProjectCMakeCommand}, 
-                                                                          currentEnvironment);
+                                                                          QStringList{ProjectCMakeCommand});
             if (!queryCmakeInstalled.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("Unable to detect CMake on this host."));
diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Traits_Mac.h b/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Traits_Mac.h
index 7c0543361f..d7edcfcf12 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Traits_Mac.h
+++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectManager_Traits_Mac.h
@@ -9,3 +9,4 @@
 #pragma once
 
 #define AZ_TRAIT_PROJECT_MANAGER_CUSTOM_TITLEBAR false
+#define AZ_TRAIT_PROJECT_MANAGER_CREATE_DESKTOP_SHORTCUT false
diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp
index b768200398..2b5556fa88 100644
--- a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp
+++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
@@ -11,35 +11,44 @@
 #include <QStandardPaths>
 #include <QDir>
 
-#include <AzCore/Utils/Utils.h>
+#include <AzCore/Settings/SettingsRegistryImpl.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/Utils/Utils.h>
 
 namespace O3DE::ProjectManager
 {
     namespace ProjectUtils
     {
-        AZ::Outcome<QProcessEnvironment, QString> GetCommandLineProcessEnvironment()
+        AZ::Outcome<void, QString> SetupCommandLineProcessEnvironment()
         {
             // For CMake on Mac, if its installed through home-brew, then it will be installed
-            // under /usr/local/bin, which may not be in the system PATH environment. 
+            // under /usr/local/bin, which may not be in the system PATH environment.
             // Add that path for the command line process so that it will be able to locate
             // a home-brew installed version of CMake
-            QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment());
-            QString pathValue = currentEnvironment.value("PATH");
-            pathValue += ":/usr/local/bin";
-            currentEnvironment.insert("PATH", pathValue);
-            return AZ::Success(currentEnvironment);
+            QString pathEnv = qEnvironmentVariable("PATH");
+            QStringList pathEnvList = pathEnv.split(":");
+            if (!pathEnvList.contains("/usr/local/bin"))
+            {
+                pathEnv += ":/usr/local/bin";
+                if (!qputenv("PATH", pathEnv.toStdString().c_str()))
+                {
+                    return AZ::Failure(QObject::tr("Failed to set PATH environment variable"));
+                }
+            }
+
+            return AZ::Success();
         }
 
         AZ::Outcome<QString, QString> FindSupportedCompilerForPlatform()
         {
-            QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment());
-            QString pathValue = currentEnvironment.value("PATH");
-            pathValue += ":/usr/local/bin";
-            currentEnvironment.insert("PATH", pathValue);
+            AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment();
+            if (!processEnvResult.IsSuccess())
+            {
+                return AZ::Failure(processEnvResult.GetError());
+            }
 
             // Validate that we have cmake installed first
-            auto queryCmakeInstalled = ExecuteCommandResult("which", QStringList{ProjectCMakeCommand}, currentEnvironment);
+            auto queryCmakeInstalled = ExecuteCommandResult("which", QStringList{ProjectCMakeCommand});
             if (!queryCmakeInstalled.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("Unable to detect CMake on this host."));
@@ -47,7 +56,7 @@ namespace O3DE::ProjectManager
             QString cmakeInstalledPath = queryCmakeInstalled.GetValue().split("\n")[0];
 
             // Query the version of the installed cmake
-            auto queryCmakeVersionQuery = ExecuteCommandResult(cmakeInstalledPath, QStringList{"-version"}, currentEnvironment);
+            auto queryCmakeVersionQuery = ExecuteCommandResult(cmakeInstalledPath, QStringList{"-version"});
             if (!queryCmakeVersionQuery.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("Unable to determine the version of CMake on this host."));
@@ -55,7 +64,7 @@ namespace O3DE::ProjectManager
             AZ_TracePrintf("Project Manager", "Cmake version %s detected.", queryCmakeVersionQuery.GetValue().split("\n")[0].toUtf8().constData());
 
             // Query for the version of xcodebuild (if installed)
-            auto queryXcodeBuildVersion = ExecuteCommandResult("xcodebuild", QStringList{"-version"}, currentEnvironment);
+            auto queryXcodeBuildVersion = ExecuteCommandResult("xcodebuild", QStringList{"-version"});
             if (!queryCmakeInstalled.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("Unable to detect XCodeBuilder on this host."));
@@ -65,11 +74,11 @@ namespace O3DE::ProjectManager
 
 
             return AZ::Success(xcodeBuilderVersionNumber);
-        }       
+        }
 
         AZ::Outcome<void, QString> OpenCMakeGUI(const QString& projectPath)
         {
-            const QString cmakeHelp = QObject::tr("Please verify you've installed CMake.app from " 
+            const QString cmakeHelp = QObject::tr("Please verify you've installed CMake.app from "
                             "<a href=\"https://cmake.org\">cmake.org</a> or, if using HomeBrew, "
                             "have installed it with <pre>brew install --cask cmake</pre>");
             QString cmakeAppPath = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, "CMake.app", QStandardPaths::LocateDirectory);
@@ -87,7 +96,7 @@ namespace O3DE::ProjectManager
 
             QProcess process;
 
-            // if the project build path is relative, it should be relative to the project path 
+            // if the project build path is relative, it should be relative to the project path
             process.setWorkingDirectory(projectPath);
             process.setProgram("open");
             process.setArguments({"-a", "CMake", "--args", "-S", projectPath, "-B", projectBuildPath});
@@ -98,44 +107,92 @@ namespace O3DE::ProjectManager
 
             return AZ::Success();
         }
-        
+
         AZ::Outcome<QString, QString> RunGetPythonScript(const QString& engineRoot)
         {
             return ExecuteCommandResultModalDialog(
                 QString("%1/python/get_python.sh").arg(engineRoot),
                 {},
-                QProcessEnvironment::systemEnvironment(),
                 QObject::tr("Running get_python script..."));
         }
 
-        AZ::IO::FixedMaxPath GetEditorDirectory()
+        AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath)
         {
-            AZ::IO::FixedMaxPath executableDirectory = AZ::Utils::GetExecutableDirectory();
-            AZ::IO::FixedMaxPath editorPath{ executableDirectory };
-            editorPath /= "../../../Editor.app/Contents/MacOS";
-            editorPath = editorPath.LexicallyNormal();
-            if (!AZ::IO::SystemFile::IsDirectory(editorPath.c_str()))
+            AZ::IO::FixedMaxPath editorPath;
+            AZ::IO::FixedMaxPath fixedProjectPath{ projectPath };
+
+            // First attempt to launch the Editor.exe within the project build directory if it exists
+            AZ::IO::FixedMaxPath buildPathSetregPath = fixedProjectPath
+            / AZ::SettingsRegistryInterface::DevUserRegistryFolder
+                / "Platform" / AZ_TRAIT_OS_PLATFORM_CODENAME / "build_path.setreg";
+            if (AZ::IO::SystemFile::Exists(buildPathSetregPath.c_str()))
             {
+                AZ::SettingsRegistryImpl localRegistry;
+                // Merge the build_path.setreg into the local SettingsRegistry instance
+                if (AZ::IO::FixedMaxPath projectBuildPath;
+                    localRegistry.MergeSettingsFile(buildPathSetregPath.Native(),
+                        AZ::SettingsRegistryInterface::Format::JsonMergePatch)
+                    && localRegistry.Get(projectBuildPath.Native(), AZ::SettingsRegistryMergeUtils::ProjectBuildPath))
+                {
+                    //  local Settings Registry will be used to merge the build_path.setreg for the supplied projectPath
+                    AZ::IO::FixedMaxPath buildConfigurationPath = (fixedProjectPath / projectBuildPath).LexicallyNormal();
+
+                    // First try "<project-build-path>/bin/$<CONFIG>/Editor.app/Contents/MacOS"
+                    // Followed by "<project-build-path>/bin/$<PLATFORM>/$<CONFIG>/Editor.app/Contents/MacOS"
+                    // Directory existence is checked in this case
+                    buildConfigurationPath /= "bin";
+                    if (editorPath = (buildConfigurationPath
+                        / AZ_BUILD_CONFIGURATION_TYPE / "Editor.app/Contents/MacOS/Editor");
+                        AZ::IO::SystemFile::Exists(editorPath.c_str()))
+                    {
+                        return editorPath;
+                    }
+                    else if (editorPath = (buildConfigurationPath / AZ_TRAIT_OS_PLATFORM_CODENAME
+                        / AZ_BUILD_CONFIGURATION_TYPE / "Editor.app/Contents/MacOS/Editor");
+                        AZ::IO::SystemFile::Exists(editorPath.c_str()))
+                    {
+                        return editorPath;
+                    }
+                }
+            }
+
+            // Fall back to locating the Editor.app bundle which should exists
+            // outside of the current O3DE.app bundle
+            editorPath = (AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) /
+                "../../../Editor.app/Contents/MacOS/Editor").LexicallyNormal();
+
+            if (!AZ::IO::SystemFile::Exists(editorPath.c_str()))
+            {
+                // Attempt to search the O3DE.app global settings registry for an InstalledBinaryFolder
+                // key which indicates the relative path to an SDK binary directory on MacOS
                 if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
                 {
                     if (AZ::IO::FixedMaxPath installedBinariesPath;
-                        settingsRegistry->Get(installedBinariesPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_InstalledBinaryFolder))
+                        settingsRegistry->Get(installedBinariesPath.Native(),
+                        AZ::SettingsRegistryMergeUtils::FilePathKey_InstalledBinaryFolder))
                     {
                         if (AZ::IO::FixedMaxPath engineRootFolder;
-                            settingsRegistry->Get(engineRootFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder))
+                            settingsRegistry->Get(engineRootFolder.Native(),
+                            AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder))
                         {
-                            editorPath = engineRootFolder / installedBinariesPath / "Editor.app/Contents/MacOS";
+                            editorPath = engineRootFolder / installedBinariesPath / "Editor.app/Contents/MacOS/Editor";
                         }
                     }
                 }
 
-                if (!AZ::IO::SystemFile::IsDirectory(editorPath.c_str()))
+                if (!AZ::IO::SystemFile::Exists(editorPath.c_str()))
                 {
                     AZ_Error("ProjectManager", false, "Unable to find the Editor app bundle!");
+                    return {};
                 }
             }
 
             return editorPath;
         }
+
+        AZ::Outcome<QString, QString> CreateDesktopShortcut([[maybe_unused]] const QString& filename, [[maybe_unused]] const QString& targetPath, [[maybe_unused]] const QStringList& arguments)
+        {
+            return AZ::Failure(QObject::tr("Creating desktop shortcuts functionality not implemented for this platform yet."));
+        }
     } // namespace ProjectUtils
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp
index 6b58458ccd..9fa9321cce 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp
+++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp
@@ -9,7 +9,7 @@
 
 namespace O3DE::ProjectManager
 {
-    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows_vs2019";
+    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows";
     const QString GetPythonScriptPath = "python/get_python.bat";
 
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Traits_Windows.h b/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Traits_Windows.h
index e6422b5a77..9e4d29b58f 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Traits_Windows.h
+++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectManager_Traits_Windows.h
@@ -9,3 +9,4 @@
 #pragma once
 
 #define AZ_TRAIT_PROJECT_MANAGER_CUSTOM_TITLEBAR true
+#define AZ_TRAIT_PROJECT_MANAGER_CREATE_DESKTOP_SHORTCUT true
diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp
index 871f8e9567..38bb867244 100644
--- a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp
+++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
@@ -13,43 +13,54 @@
 #include <QFileInfo>
 #include <QProcess>
 #include <QProcessEnvironment>
+#include <QStandardPaths>
 
+#include <AzCore/Settings/SettingsRegistryImpl.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
 
 namespace O3DE::ProjectManager
 {
     namespace ProjectUtils
     {
-        AZ::Outcome<QProcessEnvironment, QString> GetCommandLineProcessEnvironment()
+        AZ::Outcome<void, QString> SetupCommandLineProcessEnvironment()
         {
             // Use the engine path to insert a path for cmake
             auto engineInfoResult = PythonBindingsInterface::Get()->GetEngineInfo();
             if (!engineInfoResult.IsSuccess())
             {
-                return AZ::Failure(QObject::tr("Failed to get engine info"));    
+                return AZ::Failure(QObject::tr("Failed to get engine info"));
             }
             auto engineInfo = engineInfoResult.GetValue();
 
-            QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment());
-
-            // Append cmake path to PATH incase it is missing
+            // Append cmake path to the current environment PATH incase it is missing, since if
+            // we are starting CMake itself the current application needs to find it using Path
+            // This also takes affect for all child processes.
             QDir cmakePath(engineInfo.m_path);
             cmakePath.cd("cmake/runtime/bin");
-            QString pathValue = currentEnvironment.value("PATH");
-            pathValue += ";" + cmakePath.path();
-            currentEnvironment.insert("PATH", pathValue);
-            return AZ::Success(currentEnvironment);
+            QString pathEnv = qEnvironmentVariable("Path");
+            QStringList pathEnvList = pathEnv.split(";");
+            if (!pathEnvList.contains(cmakePath.path()))
+            {
+                pathEnv += ";" + cmakePath.path();
+                if (!qputenv("Path", pathEnv.toStdString().c_str()))
+                {
+                    return AZ::Failure(QObject::tr("Failed to set Path environment variable"));
+                }
+            }
+
+            return AZ::Success();
         }
 
         AZ::Outcome<QString, QString> FindSupportedCompilerForPlatform()
         {
-            // Validate that cmake is installed 
-            auto cmakeProcessEnvResult = GetCommandLineProcessEnvironment();
+            // Validate that cmake is installed
+            auto cmakeProcessEnvResult = SetupCommandLineProcessEnvironment();
             if (!cmakeProcessEnvResult.IsSuccess())
             {
                 return AZ::Failure(cmakeProcessEnvResult.GetError());
             }
-            auto cmakeVersionQueryResult = ExecuteCommandResult("cmake", QStringList{"--version"}, cmakeProcessEnvResult.GetValue());
+            auto cmakeVersionQueryResult = ExecuteCommandResult("cmake", QStringList{"--version"});
             if (!cmakeVersionQueryResult.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("CMake not found. \n\n"
@@ -100,10 +111,10 @@ namespace O3DE::ProjectManager
                 " or update to a newer version before proceeding to the next step."
                 " While installing configure Visual Studio with these <a href='https://o3de.org/docs/welcome-guide/setup/requirements/#visual-studio-configuration'>workloads</a>."));
         }
-        
+
         AZ::Outcome<void, QString> OpenCMakeGUI(const QString& projectPath)
         {
-            AZ::Outcome processEnvResult = GetCommandLineProcessEnvironment();
+            AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment();
             if (!processEnvResult.IsSuccess())
             {
                 return AZ::Failure(processEnvResult.GetError());
@@ -117,9 +128,8 @@ namespace O3DE::ProjectManager
             }
 
             QProcess process;
-            process.setProcessEnvironment(processEnvResult.GetValue());
 
-            // if the project build path is relative, it should be relative to the project path 
+            // if the project build path is relative, it should be relative to the project path
             process.setWorkingDirectory(projectPath);
 
             process.setProgram("cmake-gui");
@@ -138,13 +148,77 @@ namespace O3DE::ProjectManager
             return ExecuteCommandResultModalDialog(
                 "cmd.exe",
                 QStringList{"/c", batPath},
-                QProcessEnvironment::systemEnvironment(),
                 QObject::tr("Running get_python script..."));
         }
 
-        AZ::IO::FixedMaxPath GetEditorDirectory()
+        AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath)
         {
-            return AZ::Utils::GetExecutableDirectory();
+            AZ::IO::FixedMaxPath editorPath;
+            AZ::IO::FixedMaxPath fixedProjectPath{ projectPath };
+            // First attempt to launch the Editor.exe within the project build directory if it exists
+            AZ::IO::FixedMaxPath buildPathSetregPath = fixedProjectPath
+                / AZ::SettingsRegistryInterface::DevUserRegistryFolder
+                / "Platform" / AZ_TRAIT_OS_PLATFORM_CODENAME / "build_path.setreg";
+            if (AZ::IO::SystemFile::Exists(buildPathSetregPath.c_str()))
+            {
+                AZ::SettingsRegistryImpl settingsRegistry;
+                // Merge the build_path.setreg into the local SettingsRegistry instance
+                if (AZ::IO::FixedMaxPath projectBuildPath;
+                    settingsRegistry.MergeSettingsFile(buildPathSetregPath.Native(),
+                        AZ::SettingsRegistryInterface::Format::JsonMergePatch)
+                    && settingsRegistry.Get(projectBuildPath.Native(), AZ::SettingsRegistryMergeUtils::ProjectBuildPath))
+                {
+                    // local Settings Registry will be used to merge the build_path.setreg for the supplied projectPath
+                    AZ::IO::FixedMaxPath buildConfigurationPath = (fixedProjectPath / projectBuildPath).LexicallyNormal();
+
+                    // First try <project-build-path>/bin/$<CONFIG> and if that path doesn't exist
+                    // try <project-build-path>/bin/$<PLATFORM>/$<CONFIG>
+                    buildConfigurationPath /= "bin";
+                    if (editorPath = (buildConfigurationPath / AZ_BUILD_CONFIGURATION_TYPE / "Editor").
+                        ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+                        AZ::IO::SystemFile::Exists(editorPath.c_str()))
+                    {
+                        return editorPath;
+                    }
+                    else if (editorPath = (buildConfigurationPath / AZ_TRAIT_OS_PLATFORM_CODENAME
+                        / AZ_BUILD_CONFIGURATION_TYPE / "Editor").
+                        ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+                        AZ::IO::SystemFile::Exists(editorPath.c_str()))
+                    {
+                        return editorPath;
+                    }
+                }
+            }
+
+            // Fall back to checking if an Editor exists in O3DE executable directory
+            editorPath = AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) / "Editor";
+            editorPath.ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+            if (AZ::IO::SystemFile::Exists(editorPath.c_str()))
+            {
+                return editorPath;
+            }
+            return {};
+        }
+
+        AZ::Outcome<QString, QString> CreateDesktopShortcut(const QString& filename, const QString& targetPath, const QStringList& arguments)
+        {
+            const QString cmd{"powershell.exe"};
+            const QString desktopPath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
+            const QString shortcutPath = QString("%1/%2.lnk").arg(desktopPath).arg(filename);
+            const QString arg = QString("$s=(New-Object -COM WScript.Shell).CreateShortcut('%1');$s.TargetPath='%2';$s.Arguments='%3';$s.Save();")
+                    .arg(shortcutPath)
+                    .arg(targetPath)
+                    .arg(arguments.join(' '));
+            auto createShortcutResult = ExecuteCommandResult(cmd, QStringList{"-Command", arg});
+            if (!createShortcutResult.IsSuccess())
+            {
+                return AZ::Failure(QObject::tr("Failed to create desktop shortcut %1 <br><br>"
+                                               "Please verify you have permission to create files at the specified location.<br><br> %2")
+                                    .arg(shortcutPath)
+                                    .arg(createShortcutResult.GetError()));
+            }
+
+            return AZ::Success(QObject::tr("Desktop shortcut created at<br><a href=\"%1\">%2</a>").arg(desktopPath).arg(shortcutPath));
         }
     } // namespace ProjectUtils
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg b/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg
index 3af15393c4..0d2ec8a301 100644
--- a/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg
+++ b/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:342c3eaccf68a178dfd8c2b1792a93a8c9197c8184dca11bf90706d7481df087
-size 1611268
+oid sha256:e9ad0383f3b917fa7f4efa307a8e109a70bb5f66deb197189d013f60eb8dc32c
+size 1010250
diff --git a/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg b/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg
index 44291a8b1d..258dc62429 100644
--- a/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg
+++ b/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:797794816e4b1702f1ae1f32b408c95c79eb1f8a95aba43cfad9cccc181b0bda
-size 1135182
+oid sha256:84aab95ec8a5e3ba6ecb3aff1a814afc3171a937aa658decd18c2740623bd172
+size 984146
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
index 8dd7e4c9b5..2260ae62b9 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
@@ -41,5 +41,6 @@
         <file>Download.svg</file>
         <file>in_progress.gif</file>
         <file>gem.svg</file>
+        <file>checkmark.svg</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index d3ec066be7..1fc808b72c 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -232,6 +232,11 @@ QTabBar::tab:focus {
                             stop: 0 #555555, stop: 1.0 #777777);
 }
 
+#dialogSubTitle {
+    font-size:14px;
+    font-weight:600;
+}
+
 #horizontalSeparatingLine {
     color: #666666;
 }
@@ -563,6 +568,47 @@ QProgressBar::chunk {
     margin-top:5px;
 }
 
+#gemCatalogUpdateGemButton,
+#gemCatalogUninstallGemButton 
+{
+    qproperty-flat: true;
+    min-height:24px;
+    max-height:24px;
+    border-radius: 3px;
+    text-align:center;
+    font-size:12px;
+    font-weight:600;
+}
+
+#gemCatalogUpdateGemButton {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #888888, stop: 1.0 #555555);
+}
+#gemCatalogUpdateGemButton:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #999999, stop: 1.0 #666666);
+}
+#gemCatalogUpdateGemButton:pressed {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #555555, stop: 1.0 #777777);
+}
+
+#footer > #gemCatalogUninstallGemButton,
+#gemCatalogUninstallGemButton {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #E32C27, stop: 1.0 #951D21);
+}
+#footer > #gemCatalogUninstallGemButton:hover,
+#gemCatalogUninstallGemButton:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #FD3129, stop: 1.0 #AF2221);
+}
+#footer > #gemCatalogUninstallGemButton:pressed,
+#gemCatalogUninstallGemButton:pressed {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #951D1F, stop: 1.0 #C92724);
+}
+
 /************** Filter Tag widget **************/
 
 #FilterTagWidgetTextLabel {
diff --git a/Code/Tools/ProjectManager/Resources/checkmark.svg b/Code/Tools/ProjectManager/Resources/checkmark.svg
new file mode 100644
index 0000000000..d612b35370
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/checkmark.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icons / Hub / Download Copy 5</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Screen-1-Copy-80" transform="translate(-425.000000, -251.000000)">
+            <g id="Icons-/-Hub-/-Download-Copy-5" transform="translate(424.573941, 250.098705)">
+                <rect id="Icon-Background" x="0" y="0" width="16" height="16"></rect>
+                <path d="M8,1.33333333 C11.6818983,1.33333333 14.6666667,4.31810167 14.6666667,8 C14.6666667,11.6818983 11.6818983,14.6666667 8,14.6666667 C4.31810167,14.6666667 1.33333333,11.6818983 1.33333333,8 C1.33333333,4.31810167 4.31810167,1.33333333 8,1.33333333 Z M12.0947571,4 L5.96649831,10.1282588 L3.60947571,7.77123617 L2.66666667,8.71404521 L5.96649831,12.0138769 L13.0375661,4.94280904 L12.0947571,4 Z" id="Combined-Shape" fill="#58BC61"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
index 6b19e839d7..205395c935 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
@@ -15,6 +15,7 @@
 #include <GemCatalog/GemCatalogScreen.h>
 #include <GemRepo/GemRepoScreen.h>
 #include <ProjectUtils.h>
+#include <DownloadController.h>
 
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
diff --git a/Code/Tools/ProjectManager/Source/DownloadController.cpp b/Code/Tools/ProjectManager/Source/DownloadController.cpp
index d30e1bbc7c..9b64c5e276 100644
--- a/Code/Tools/ProjectManager/Source/DownloadController.cpp
+++ b/Code/Tools/ProjectManager/Source/DownloadController.cpp
@@ -18,7 +18,6 @@ namespace O3DE::ProjectManager
 {
     DownloadController::DownloadController(QWidget* parent)
         : QObject()
-        , m_lastProgress(0)
         , m_parent(parent)
     {
         m_worker = new DownloadWorker();
@@ -41,9 +40,11 @@ namespace O3DE::ProjectManager
     void DownloadController::AddGemDownload(const QString& gemName)
     {
         m_gemNames.push_back(gemName);
+        emit GemDownloadAdded(gemName);
+
         if (m_gemNames.size() == 1)
         {
-            m_worker->SetGemToDownload(m_gemNames[0], false);
+            m_worker->SetGemToDownload(m_gemNames.front(), false);
             m_workerThread.start();
         }
     }
@@ -62,29 +63,42 @@ namespace O3DE::ProjectManager
             else
             {
                 m_gemNames.erase(findResult);
+                emit GemDownloadRemoved(gemName);
             }
         }
     }
 
-    void DownloadController::UpdateUIProgress(int progress)
+    void DownloadController::UpdateUIProgress(int bytesDownloaded, int totalBytes)
     {
-        m_lastProgress = progress;
-        emit GemDownloadProgress(progress);
+        emit GemDownloadProgress(m_gemNames.front(), bytesDownloaded, totalBytes);
     }
 
-    void DownloadController::HandleResults(const QString& result)
+    void DownloadController::HandleResults(const QString& result, const QString& detailedError)
     {
         bool succeeded = true;
         
         if (!result.isEmpty())
         {
-            QMessageBox::critical(nullptr, tr("Gem download"), result);
+            if (!detailedError.isEmpty())
+            {
+                QMessageBox gemDownloadError;
+                gemDownloadError.setIcon(QMessageBox::Critical);
+                gemDownloadError.setWindowTitle(tr("Gem download"));
+                gemDownloadError.setText(result);
+                gemDownloadError.setDetailedText(detailedError);
+                gemDownloadError.exec();
+            }
+            else
+            {
+                QMessageBox::critical(nullptr, tr("Gem download"), result);
+            }
             succeeded = false;
         }
 
         QString gemName = m_gemNames.front();
         m_gemNames.erase(m_gemNames.begin());
         emit Done(gemName, succeeded);
+        emit GemDownloadRemoved(gemName);
 
         if (!m_gemNames.empty())
         {
diff --git a/Code/Tools/ProjectManager/Source/DownloadController.h b/Code/Tools/ProjectManager/Source/DownloadController.h
index 5b2d230379..5e637971e9 100644
--- a/Code/Tools/ProjectManager/Source/DownloadController.h
+++ b/Code/Tools/ProjectManager/Source/DownloadController.h
@@ -53,20 +53,20 @@ namespace O3DE::ProjectManager
             }
         }
     public slots:
-        void UpdateUIProgress(int progress);
-        void HandleResults(const QString& result);
+        void UpdateUIProgress(int bytesDownloaded, int totalBytes);
+        void HandleResults(const QString& result, const QString& detailedError);
 
     signals:
         void StartGemDownload(const QString& gemName);
         void Done(const QString& gemName, bool success = true);
-        void GemDownloadProgress(int percentage);
+        void GemDownloadAdded(const QString& gemName);
+        void GemDownloadRemoved(const QString& gemName);
+        void GemDownloadProgress(const QString& gemName, int bytesDownloaded, int totalBytes);
 
     private:
         DownloadWorker* m_worker;
         QThread m_workerThread;
         QWidget* m_parent;
         AZStd::vector<QString> m_gemNames;
-
-        int m_lastProgress;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp
index 9bda1b34cc..e58c41c89e 100644
--- a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp
+++ b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp
@@ -20,19 +20,20 @@ namespace O3DE::ProjectManager
 
     void DownloadWorker::StartDownload()
     {
-        auto gemDownloadProgress = [=](int downloadProgress)
+        auto gemDownloadProgress = [=](int bytesDownloaded, int totalBytes)
         {
-            m_downloadProgress = downloadProgress;
-            emit UpdateProgress(downloadProgress);
+            emit UpdateProgress(bytesDownloaded, totalBytes);
         };
-        AZ::Outcome<void, AZStd::string> gemInfoResult = PythonBindingsInterface::Get()->DownloadGem(m_gemName, gemDownloadProgress);
+        AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> gemInfoResult =
+            PythonBindingsInterface::Get()->DownloadGem(m_gemName, gemDownloadProgress, /*force*/true);
+
         if (gemInfoResult.IsSuccess())
         {
-            emit Done("");
+            emit Done("", "");
         }
         else
         {
-            emit Done(tr("Gem download failed"));
+            emit Done(gemInfoResult.GetError().first.c_str(), gemInfoResult.GetError().second.c_str());
         }
     }
 
diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.h b/Code/Tools/ProjectManager/Source/DownloadWorker.h
index 316a730a78..d33de7bacc 100644
--- a/Code/Tools/ProjectManager/Source/DownloadWorker.h
+++ b/Code/Tools/ProjectManager/Source/DownloadWorker.h
@@ -31,12 +31,11 @@ namespace O3DE::ProjectManager
         void SetGemToDownload(const QString& gemName, bool downloadNow = true);
 
     signals:
-        void UpdateProgress(int progress);
-        void Done(QString result = "");
+        void UpdateProgress(int bytesDownloaded, int totalBytes);
+        void Done(QString result = "", QString detailedResult = "");
 
     private:
 
         QString m_gemName;
-        int m_downloadProgress;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp
index 9d9110922f..1f41acd3d1 100644
--- a/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp
@@ -72,12 +72,7 @@ namespace O3DE::ProjectManager
 
     bool EngineScreenCtrl::ContainsScreen(ProjectManagerScreen screen)
     {
-        if (screen == m_engineSettingsScreen->GetScreenEnum() || screen == m_gemRepoScreen->GetScreenEnum())
-        {
-            return true;
-        }
-
-        return false;
+        return screen == m_engineSettingsScreen->GetScreenEnum() || screen == m_gemRepoScreen->GetScreenEnum();
     }
 
     void EngineScreenCtrl::NotifyCurrentScreen()
diff --git a/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp
new file mode 100644
index 0000000000..122a5cbf5a
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ExternalLinkDialog.h>
+#include <LinkWidget.h>
+#include <ProjectManagerSettings.h>
+
+#include <AzCore/Settings/SettingsRegistry.h>
+
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QIcon>
+#include <QCheckBox>
+
+namespace O3DE::ProjectManager
+{
+    ExternalLinkDialog::ExternalLinkDialog(const QUrl& url, QWidget* parent)
+        : QDialog(parent)
+    {
+        setWindowTitle(tr("Leaving O3DE"));
+        setObjectName("ExternalLinkDialog");
+        setAttribute(Qt::WA_DeleteOnClose);
+        setModal(true);
+
+        QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setMargin(30);
+        hLayout->setAlignment(Qt::AlignTop);
+        setLayout(hLayout);
+
+        QVBoxLayout* warningLayout = new QVBoxLayout();
+        warningLayout->setMargin(0);
+        warningLayout->setAlignment(Qt::AlignTop);
+        hLayout->addLayout(warningLayout);
+
+        QLabel* warningIcon = new QLabel(this);
+        warningIcon->setPixmap(QIcon(":/Warning.svg").pixmap(32, 32));
+        warningLayout->addWidget(warningIcon);
+
+        warningLayout->addStretch();
+
+        QVBoxLayout* layout = new QVBoxLayout();
+        layout->setMargin(0);
+        layout->setAlignment(Qt::AlignTop);
+        hLayout->addLayout(layout);
+
+        // Body
+        QLabel* subTitleLabel = new QLabel(tr("You are about to leave O3DE Project Manager to visit an external link."));
+        subTitleLabel->setObjectName("dialogSubTitle");
+        layout->addWidget(subTitleLabel);
+
+        layout->addSpacing(10);
+
+        QLabel* bodyLabel = new QLabel(tr("If you trust this source, you can proceed to this link, or click \"Cancel\" to return."));
+        layout->addWidget(bodyLabel);
+
+        // Don't actually set linkUrl we are just using LinkLabel superficially here
+        LinkLabel* linkLabel = new LinkLabel(url.toString(), {}, 12);
+        layout->addWidget(linkLabel);
+
+        layout->addSpacing(40);
+
+        QCheckBox* skipDialogCheckbox = new QCheckBox(tr("Do not show this again"));
+        layout->addWidget(skipDialogCheckbox);
+        connect(skipDialogCheckbox, &QCheckBox::stateChanged, this, &ExternalLinkDialog::SetSkipDialogSetting);
+
+        // Buttons
+        QDialogButtonBox* dialogButtons = new QDialogButtonBox();
+        dialogButtons->setObjectName("footer");
+        layout->addWidget(dialogButtons);
+
+        QPushButton* cancelButton = dialogButtons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
+        cancelButton->setProperty("secondary", true);
+        QPushButton* acceptButton = dialogButtons->addButton(tr("Proceed"), QDialogButtonBox::ApplyRole);
+
+        connect(cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+        connect(acceptButton, &QPushButton::clicked, this, &QDialog::accept);
+    }
+
+    void ExternalLinkDialog::SetSkipDialogSetting(bool state)
+    {
+        auto settingsRegistry = AZ::SettingsRegistry::Get();
+        if (settingsRegistry)
+        {
+            QString settingsKey = GetExternalLinkWarningKey();
+            settingsRegistry->Set(settingsKey.toStdString().c_str(), state);
+            SaveProjectManagerSettings();
+        }
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ExternalLinkDialog.h b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.h
new file mode 100644
index 0000000000..45d391e64e
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class ExternalLinkDialog
+        : public QDialog
+    {
+        Q_OBJECT // AUTOMOC
+    public:
+        explicit ExternalLinkDialog(const QUrl& url, QWidget* parent = nullptr);
+        ~ExternalLinkDialog() = default;
+
+    private slots:
+        void SetSkipDialogSetting(bool state);
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
index 8c875e4846..d6f4da0051 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
@@ -7,29 +7,39 @@
  */
 
 #include <GemCatalog/GemCatalogHeaderWidget.h>
+#include <TagWidget.h>
+
 #include <AzCore/std/functional.h>
+
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QLabel>
 #include <QPushButton>
 #include <QProgressBar>
-#include <TagWidget.h>
 #include <QMenu>
+#include <QLocale>
+#include <QMovie>
+#include <QPainter>
+#include <QPainterPath>
 
 namespace O3DE::ProjectManager
 {
-    CartOverlayWidget::CartOverlayWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent)
-        : QWidget(parent)
+    GemCartWidget::GemCartWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent)
+        : QScrollArea(parent)
         , m_gemModel(gemModel)
         , m_downloadController(downloadController)
     {
         setObjectName("GemCatalogCart");
+        setWidgetResizable(true);
+        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
         m_layout = new QVBoxLayout();
         m_layout->setSpacing(0);
         m_layout->setMargin(5);
         m_layout->setAlignment(Qt::AlignTop);
         setLayout(m_layout);
+        setMinimumHeight(400);
 
         QHBoxLayout* hLayout = new QHBoxLayout();
 
@@ -115,11 +125,15 @@ namespace O3DE::ProjectManager
                 }
                 return dependencies;
             });
-
-        setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
     }
 
-    void CartOverlayWidget::CreateGemSection(const QString& singularTitle, const QString& pluralTitle, GetTagIndicesCallback getTagIndices)
+    GemCartWidget::~GemCartWidget()
+    {
+        // disconnect from all download controller signals
+        disconnect(m_downloadController, nullptr, this, nullptr);
+    }
+
+    void GemCartWidget::CreateGemSection(const QString& singularTitle, const QString& pluralTitle, GetTagIndicesCallback getTagIndices)
     {
         QWidget* widget = new QWidget();
         widget->setFixedWidth(s_width);
@@ -155,20 +169,20 @@ namespace O3DE::ProjectManager
         update();
     }
 
-    void CartOverlayWidget::OnCancelDownloadActivated(const QString& gemName)
+    void GemCartWidget::OnCancelDownloadActivated(const QString& gemName)
     {
         m_downloadController->CancelGemDownload(gemName);
     }
 
-    void CartOverlayWidget::CreateDownloadSection()
+    void GemCartWidget::CreateDownloadSection()
     {
-        QWidget* widget = new QWidget();
-        widget->setFixedWidth(s_width);
-        m_layout->addWidget(widget);
+        m_downloadSectionWidget = new QWidget();
+        m_downloadSectionWidget->setFixedWidth(s_width);
+        m_layout->addWidget(m_downloadSectionWidget);
 
         QVBoxLayout* layout = new QVBoxLayout();
         layout->setAlignment(Qt::AlignTop);
-        widget->setLayout(layout);
+        m_downloadSectionWidget->setLayout(layout);
 
         QLabel* titleLabel = new QLabel();
         titleLabel->setObjectName("GemCatalogCartOverlaySectionLabel");
@@ -187,91 +201,135 @@ namespace O3DE::ProjectManager
         QLabel* processingQueueLabel = new QLabel("Processing Queue");
         gemDownloadLayout->addWidget(processingQueueLabel);
 
-        QWidget* downloadingItemWidget = new QWidget();
-        downloadingItemWidget->setObjectName("GemCatalogCartOverlayGemDownloadBG");
-        gemDownloadLayout->addWidget(downloadingItemWidget);
+        m_downloadingListWidget = new QWidget();
+        m_downloadingListWidget->setObjectName("GemCatalogCartOverlayGemDownloadBG");
+        gemDownloadLayout->addWidget(m_downloadingListWidget);
         QVBoxLayout* downloadingItemLayout = new QVBoxLayout();
         downloadingItemLayout->setAlignment(Qt::AlignTop);
-        downloadingItemWidget->setLayout(downloadingItemLayout);
+        m_downloadingListWidget->setLayout(downloadingItemLayout);
 
-        auto update = [=](int downloadProgress)
+        QLabel* downloadsInProgessLabel = new QLabel("");
+        downloadsInProgessLabel->setObjectName("NumDownloadsInProgressLabel");
+        downloadingItemLayout->addWidget(downloadsInProgessLabel);
+
+        if (m_downloadController->IsDownloadQueueEmpty())
         {
-            if (m_downloadController->IsDownloadQueueEmpty())
+            m_downloadSectionWidget->hide();
+        }
+        else
+        {
+            // Setup gem download rows for gems that are already in the queue
+            const AZStd::vector<QString>& downloadQueue = m_downloadController->GetDownloadQueue();
+
+            for (const QString& gemName : downloadQueue)
             {
-                widget->hide();
+                GemDownloadAdded(gemName);
+            }
+        }
+
+        // connect to download controller data changed
+        connect(m_downloadController, &DownloadController::GemDownloadAdded, this, &GemCartWidget::GemDownloadAdded);
+        connect(m_downloadController, &DownloadController::GemDownloadRemoved, this, &GemCartWidget::GemDownloadRemoved);
+        connect(m_downloadController, &DownloadController::GemDownloadProgress, this, &GemCartWidget::GemDownloadProgress);
+    }
+
+    void GemCartWidget::GemDownloadAdded(const QString& gemName)
+    {
+        // Containing widget for the current download item
+        QWidget* newGemDownloadWidget = new QWidget();
+        newGemDownloadWidget->setObjectName(gemName);
+        QVBoxLayout* downloadingGemLayout = new QVBoxLayout(newGemDownloadWidget);
+        newGemDownloadWidget->setLayout(downloadingGemLayout);
+
+        // Gem name, progress string, cancel
+        QHBoxLayout* nameProgressLayout = new QHBoxLayout(newGemDownloadWidget);
+        TagWidget* newTag = new TagWidget({gemName, gemName}, newGemDownloadWidget);
+        nameProgressLayout->addWidget(newTag);
+        QLabel* progress = new QLabel(tr("Queued"), newGemDownloadWidget);
+        progress->setObjectName("DownloadProgressLabel");
+        nameProgressLayout->addWidget(progress);
+        nameProgressLayout->addStretch();
+        QLabel* cancelText = new QLabel(tr("<a href=\"%1\">Cancel</a>").arg(gemName), newGemDownloadWidget);
+        cancelText->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
+        connect(cancelText, &QLabel::linkActivated, this, &GemCartWidget::OnCancelDownloadActivated);
+        nameProgressLayout->addWidget(cancelText);
+        downloadingGemLayout->addLayout(nameProgressLayout);
+
+        // Progress bar
+        QProgressBar* downloadProgessBar = new QProgressBar(newGemDownloadWidget);
+        downloadProgessBar->setObjectName("DownloadProgressBar");
+        downloadingGemLayout->addWidget(downloadProgessBar);
+        downloadProgessBar->setValue(0);
+
+        m_downloadingListWidget->layout()->addWidget(newGemDownloadWidget);
+
+        const AZStd::vector<QString>& downloadQueue = m_downloadController->GetDownloadQueue();
+        QLabel* numDownloads = m_downloadingListWidget->findChild<QLabel*>("NumDownloadsInProgressLabel");
+        numDownloads->setText(QString("%1 %2")
+                                  .arg(downloadQueue.size())
+                                  .arg(downloadQueue.size() == 1 ? tr("download in progress...") : tr("downloads in progress...")));
+
+        m_downloadingListWidget->show();
+    }
+
+    void GemCartWidget::GemDownloadRemoved(const QString& gemName)
+    {
+        QWidget* gemToRemove = m_downloadingListWidget->findChild<QWidget*>(gemName);
+        if (gemToRemove)
+        {
+            gemToRemove->deleteLater();
+        }
+
+        if (m_downloadController->IsDownloadQueueEmpty())
+        {
+            m_downloadSectionWidget->hide();
+        }
+        else
+        {
+            size_t downloadQueueSize = m_downloadController->GetDownloadQueue().size();
+            QLabel* numDownloads = m_downloadingListWidget->findChild<QLabel*>("NumDownloadsInProgressLabel");
+            numDownloads->setText(QString("%1 %2")
+                                      .arg(downloadQueueSize)
+                                      .arg(downloadQueueSize == 1 ? tr("download in progress...") : tr("downloads in progress...")));
+        }
+    }
+
+    void GemCartWidget::GemDownloadProgress(const QString& gemName, int bytesDownloaded, int totalBytes)
+    {
+        QWidget* gemToUpdate = m_downloadingListWidget->findChild<QWidget*>(gemName);
+        if (gemToUpdate)
+        {
+            QLabel* progressLabel = gemToUpdate->findChild<QLabel*>("DownloadProgressLabel");
+            QProgressBar* progressBar = gemToUpdate->findChild<QProgressBar*>("DownloadProgressBar");
+
+            // totalBytes can be 0 if the server does not return a content-length for the object
+            if (totalBytes != 0)
+            {
+                int downloadPercentage = static_cast<int>((bytesDownloaded / static_cast<float>(totalBytes)) * 100);
+                if (progressLabel)
+                {
+                    progressLabel->setText(QString("%1%").arg(downloadPercentage));
+                }
+                if (progressBar)
+                {
+                    progressBar->setValue(downloadPercentage);
+                }
             }
             else
             {
-                widget->setUpdatesEnabled(false);
-                // remove items
-                QLayoutItem* layoutItem = nullptr;
-                while ((layoutItem = downloadingItemLayout->takeAt(0)) != nullptr)
+                if (progressLabel)
                 {
-                    if (layoutItem->layout())
-                    {
-                        // Gem info row
-                        QLayoutItem* rowLayoutItem = nullptr;
-                        while ((rowLayoutItem = layoutItem->layout()->takeAt(0)) != nullptr)
-                        {
-                            rowLayoutItem->widget()->deleteLater();
-                        }
-                        layoutItem->layout()->deleteLater();
-                    }
-                    if (layoutItem->widget())
-                    {
-                        layoutItem->widget()->deleteLater();
-                    }
+                    progressLabel->setText(QLocale::system().formattedDataSize(bytesDownloaded));
                 }
-
-                // Setup gem download rows
-                const AZStd::vector<QString>& downloadQueue = m_downloadController->GetDownloadQueue();
-
-                QLabel* downloadsInProgessLabel = new QLabel("");
-                downloadsInProgessLabel->setText(
-                    QString("%1 %2").arg(downloadQueue.size()).arg(downloadQueue.size() == 1 ? tr("download in progress...") : tr("downloads in progress...")));
-                downloadingItemLayout->addWidget(downloadsInProgessLabel);
-
-                for (int downloadingGemNumber = 0; downloadingGemNumber < downloadQueue.size(); ++downloadingGemNumber)
+                if (progressBar)
                 {
-                    QHBoxLayout* nameProgressLayout = new QHBoxLayout();
-
-                    const QString& gemName = downloadQueue[downloadingGemNumber];
-                    TagWidget* newTag = new TagWidget({gemName, gemName});
-                    nameProgressLayout->addWidget(newTag);
-
-                    QLabel* progress = new QLabel(downloadingGemNumber == 0? QString("%1%").arg(downloadProgress) : tr("Queued"));
-                    nameProgressLayout->addWidget(progress);
-
-                    QSpacerItem* spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-                    nameProgressLayout->addSpacerItem(spacer);
-
-                    QLabel* cancelText = new QLabel(QString("<a href=\"%1\">Cancel</a>").arg(gemName));
-                    cancelText->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
-                    connect(cancelText, &QLabel::linkActivated, this, &CartOverlayWidget::OnCancelDownloadActivated);
-                    nameProgressLayout->addWidget(cancelText);
-                    downloadingItemLayout->addLayout(nameProgressLayout);
-
-                    QProgressBar* downloadProgessBar = new QProgressBar();
-                    downloadingItemLayout->addWidget(downloadProgessBar);
-                    downloadProgessBar->setValue(downloadingGemNumber == 0 ? downloadProgress : 0);
+                    progressBar->setRange(0, 0);
                 }
-
-                widget->setUpdatesEnabled(true);
-                widget->show();
             }
-        };
-
-        auto downloadEnded = [=](const QString& /*gemName*/, bool /*success*/)
-        {
-            update(0); // update the list to remove the gem that has finished
-        };
-        // connect to download controller data changed
-        connect(m_downloadController, &DownloadController::GemDownloadProgress, this, update);
-        connect(m_downloadController, &DownloadController::Done, this, downloadEnded);
-        update(0);
+        }
     }
 
-    QVector<Tag> CartOverlayWidget::GetTagsFromModelIndices(const QVector<QModelIndex>& gems) const
+    QVector<Tag> GemCartWidget::GetTagsFromModelIndices(const QVector<QModelIndex>& gems) const
     {
         QVector<Tag> tags;
         tags.reserve(gems.size());
@@ -296,7 +354,7 @@ namespace O3DE::ProjectManager
         iconButton->setFocusPolicy(Qt::NoFocus);
         iconButton->setIcon(QIcon(":/Summary.svg"));
         iconButton->setFixedSize(s_iconSize, s_iconSize);
-        connect(iconButton, &QPushButton::clicked, this, &CartButton::ShowOverlay);
+        connect(iconButton, &QPushButton::clicked, this, &CartButton::ShowGemCart);
         m_layout->addWidget(iconButton);
 
         m_countLabel = new QLabel();
@@ -309,7 +367,7 @@ namespace O3DE::ProjectManager
         m_dropDownButton->setFocusPolicy(Qt::NoFocus);
         m_dropDownButton->setIcon(QIcon(":/CarrotArrowDown.svg"));
         m_dropDownButton->setFixedSize(s_arrowDownIconSize, s_arrowDownIconSize);
-        connect(m_dropDownButton, &QPushButton::clicked, this, &CartButton::ShowOverlay);
+        connect(m_dropDownButton, &QPushButton::clicked, this, &CartButton::ShowGemCart);
         m_layout->addWidget(m_dropDownButton);
 
         // Adjust the label text whenever the model gets updated.
@@ -324,72 +382,69 @@ namespace O3DE::ProjectManager
                 m_dropDownButton->setVisible(!toBeAdded.isEmpty() || !toBeRemoved.isEmpty());
 
                 // Automatically close the overlay window in case there are no gems to be activated or deactivated anymore.
-                if (m_cartOverlay && toBeAdded.isEmpty() && toBeRemoved.isEmpty())
+                if (m_gemCart && toBeAdded.isEmpty() && toBeRemoved.isEmpty())
                 {
-                    m_cartOverlay->deleteLater();
-                    m_cartOverlay = nullptr;
+                    m_gemCart->deleteLater();
+                    m_gemCart = nullptr;
                 }
             });
     }
 
     void CartButton::mousePressEvent([[maybe_unused]] QMouseEvent* event)
     {
-        ShowOverlay();
+        ShowGemCart();
     }
 
     void CartButton::hideEvent(QHideEvent*)
     {
-        if (m_cartOverlay)
+        if (m_gemCart)
         {
-            m_cartOverlay->hide();
+            m_gemCart->hide();
         }
     }
 
-    void CartButton::ShowOverlay()
+    void CartButton::ShowGemCart()
     {
         const QVector<QModelIndex> toBeAdded = m_gemModel->GatherGemsToBeAdded(/*includeDependencies=*/true);
         const QVector<QModelIndex> toBeRemoved = m_gemModel->GatherGemsToBeRemoved(/*includeDependencies=*/true);
-        if (toBeAdded.isEmpty() && toBeRemoved.isEmpty())
+        if (toBeAdded.isEmpty() && toBeRemoved.isEmpty() && m_downloadController->IsDownloadQueueEmpty())
         {
             return;
         }
 
-        if (m_cartOverlay)
+        if (m_gemCart)
         {
             // Directly delete the former overlay before creating the new one.
             // Don't use deleteLater() here. This might overwrite the new overlay pointer
             // depending on the event queue.
-            delete m_cartOverlay;
+            delete m_gemCart;
         }
 
-        m_cartOverlay = new CartOverlayWidget(m_gemModel, m_downloadController, this);
-        connect(m_cartOverlay, &QWidget::destroyed, this, [=]
+        m_gemCart = new GemCartWidget(m_gemModel, m_downloadController, this);
+        connect(m_gemCart, &QWidget::destroyed, this, [=]
             {
                 // Reset the overlay pointer on destruction to prevent dangling pointers.
-                m_cartOverlay = nullptr;
+                m_gemCart = nullptr;
+                // Tell header gem cart is no longer open
+                UpdateGemCart(nullptr);
             });
-        m_cartOverlay->show();
+        m_gemCart->show();
 
-        const QPoint parentPos = m_dropDownButton->mapToParent(m_dropDownButton->pos());
-        const QPoint globalPos = m_dropDownButton->mapToGlobal(m_dropDownButton->pos());
-        const QPoint offset(-4, 10);
-        m_cartOverlay->setGeometry(globalPos.x() - parentPos.x() - m_cartOverlay->width() + width() + offset.x(),
-            globalPos.y() + offset.y(),
-            m_cartOverlay->width(),
-            m_cartOverlay->height());
+        emit UpdateGemCart(m_gemCart);
     }
 
     CartButton::~CartButton()
     {
         // Make sure the overlay window is automatically closed in case the gem catalog is destroyed.
-        if (m_cartOverlay)
+        if (m_gemCart)
         {
-            m_cartOverlay->deleteLater();
+            m_gemCart->deleteLater();
         }
     }
 
     GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, DownloadController* downloadController, QWidget* parent)
         : QFrame(parent)
+        , m_downloadController(downloadController)
     {
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setAlignment(Qt::AlignLeft);
@@ -416,8 +471,25 @@ namespace O3DE::ProjectManager
         hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
         hLayout->addSpacerItem(new QSpacerItem(75, 0, QSizePolicy::Fixed));
 
-        CartButton* cartButton = new CartButton(gemModel, downloadController);
-        hLayout->addWidget(cartButton);
+        // spinner
+        m_downloadSpinnerMovie = new QMovie(":/in_progress.gif");
+        m_downloadSpinner = new QLabel(this);
+        m_downloadSpinner->setScaledContents(true);
+        m_downloadSpinner->setMaximumSize(16, 16);
+        m_downloadSpinner->setMovie(m_downloadSpinnerMovie);
+        hLayout->addWidget(m_downloadSpinner);
+        hLayout->addSpacing(8);
+
+        // downloading label
+        m_downloadLabel = new QLabel(tr("Downloading"));
+        hLayout->addWidget(m_downloadLabel);
+        m_downloadSpinner->hide();
+        m_downloadLabel->hide();
+
+        hLayout->addSpacing(16);
+
+        m_cartButton = new CartButton(gemModel, downloadController);
+        hLayout->addWidget(m_cartButton);
         hLayout->addSpacing(16);
 
         // Separating line
@@ -429,6 +501,7 @@ namespace O3DE::ProjectManager
         hLayout->addSpacing(16);
 
         QMenu* gemMenu = new QMenu(this);
+        gemMenu->addAction( tr("Refresh"), [this]() { emit RefreshGems(); });
         gemMenu->addAction( tr("Show Gem Repos"), [this]() { emit OpenGemsRepo(); });
         gemMenu->addSeparator();
         gemMenu->addAction( tr("Add Existing Gem"), [this]() { emit AddGem(); });
@@ -439,10 +512,78 @@ namespace O3DE::ProjectManager
         gemMenuButton->setIcon(QIcon(":/menu.svg"));
         gemMenuButton->setIconSize(QSize(36, 24));
         hLayout->addWidget(gemMenuButton);
+
+        connect(m_downloadController, &DownloadController::GemDownloadAdded, this, &GemCatalogHeaderWidget::GemDownloadAdded);
+        connect(m_downloadController, &DownloadController::GemDownloadRemoved, this, &GemCatalogHeaderWidget::GemDownloadRemoved);
+
+        connect(
+            m_cartButton, &CartButton::UpdateGemCart, this,
+            [this](QWidget* gemCart)
+            {
+                GemCartShown(gemCart);
+                if (gemCart)
+                {
+                    emit UpdateGemCart(gemCart);
+                }
+            });
+    }
+
+    void GemCatalogHeaderWidget::GemDownloadAdded(const QString& /*gemName*/)
+    {
+        m_downloadSpinner->show();
+        m_downloadLabel->show();
+        m_downloadSpinnerMovie->start();
+        m_cartButton->ShowGemCart();
+    }
+
+    void GemCatalogHeaderWidget::GemDownloadRemoved(const QString& /*gemName*/)
+    {
+        if (m_downloadController->IsDownloadQueueEmpty())
+        {
+            m_downloadSpinner->hide();
+            m_downloadLabel->hide();
+            m_downloadSpinnerMovie->stop();
+        }
+    }
+
+    void GemCatalogHeaderWidget::GemCartShown(bool state)
+    {
+        m_showGemCart = state;
+        repaint();
     }
 
     void GemCatalogHeaderWidget::ReinitForProject()
     {
         m_filterLineEdit->setText({});
     }
+
+    void GemCatalogHeaderWidget::paintEvent([[maybe_unused]] QPaintEvent* event)
+    {
+        // Only show triangle when cart is shown
+        if (!m_showGemCart)
+        {
+            return;
+        }
+
+        const QPoint buttonPos = m_cartButton->pos();
+        const QSize buttonSize = m_cartButton->size();
+
+        // Draw isosceles triangle with top point touching bottom of cartButton
+        // Bottom aligned with header bottom and top of right panel
+        const QPoint topPoint(buttonPos.x() + buttonSize.width() / 2, buttonPos.y() + buttonSize.height());
+        const QPoint bottomLeftPoint(topPoint.x() - 20, height());
+        const QPoint bottomRightPoint(topPoint.x() + 20, height());
+
+        QPainterPath trianglePath;
+        trianglePath.moveTo(topPoint);
+        trianglePath.lineTo(bottomLeftPoint);
+        trianglePath.lineTo(bottomRightPoint);
+        trianglePath.lineTo(topPoint);
+
+        QPainter painter(this);
+        painter.setRenderHint(QPainter::Antialiasing, true);
+        painter.setPen(Qt::NoPen);
+        painter.fillPath(trianglePath, QBrush(QColor("#555555")));
+    }
+
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
index 6da78cce7a..b749e9831d 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
@@ -14,8 +14,10 @@
 #include <GemCatalog/GemModel.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
 #include <TagWidget.h>
-#include <QFrame>
 #include <DownloadController.h>
+
+#include <QFrame>
+#include <QScrollArea>
 #endif
 
 QT_FORWARD_DECLARE_CLASS(QPushButton)
@@ -24,16 +26,23 @@ QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 QT_FORWARD_DECLARE_CLASS(QHBoxLayout)
 QT_FORWARD_DECLARE_CLASS(QHideEvent)
 QT_FORWARD_DECLARE_CLASS(QMoveEvent)
+QT_FORWARD_DECLARE_CLASS(QMovie)
 
 namespace O3DE::ProjectManager
 {
-    class CartOverlayWidget
-        : public QWidget
+    class GemCartWidget
+        : public QScrollArea
     {
         Q_OBJECT // AUTOMOC
 
     public:
-        CartOverlayWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr);
+        GemCartWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr);
+        ~GemCartWidget();
+
+    public slots:
+        void GemDownloadAdded(const QString& gemName);
+        void GemDownloadRemoved(const QString& gemName);
+        void GemDownloadProgress(const QString& gemName, int bytesDownloaded, int totalBytes);
 
     private:
         QVector<Tag> GetTagsFromModelIndices(const QVector<QModelIndex>& gems) const;
@@ -47,6 +56,9 @@ namespace O3DE::ProjectManager
         GemModel* m_gemModel = nullptr;
         DownloadController* m_downloadController = nullptr;
 
+        QWidget* m_downloadSectionWidget = nullptr;
+        QWidget* m_downloadingListWidget = nullptr;
+
         inline constexpr static int s_width = 240;
     };
 
@@ -58,7 +70,10 @@ namespace O3DE::ProjectManager
     public:
         CartButton(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr);
         ~CartButton();
-        void ShowOverlay();
+        void ShowGemCart();
+
+    signals:
+        void UpdateGemCart(QWidget* gemCart);
 
     private:
         void mousePressEvent(QMouseEvent* event) override;
@@ -68,7 +83,7 @@ namespace O3DE::ProjectManager
         QHBoxLayout* m_layout = nullptr;
         QLabel* m_countLabel = nullptr;
         QPushButton* m_dropDownButton = nullptr;
-        CartOverlayWidget* m_cartOverlay = nullptr;
+        GemCartWidget* m_gemCart = nullptr;
         DownloadController* m_downloadController = nullptr;
 
         inline constexpr static int s_iconSize = 24;
@@ -86,12 +101,28 @@ namespace O3DE::ProjectManager
 
         void ReinitForProject();
 
+    public slots:
+        void GemDownloadAdded(const QString& gemName);
+        void GemDownloadRemoved(const QString& gemName);
+        void GemCartShown(bool state = false);
+
     signals:
         void AddGem();
         void OpenGemsRepo();
+        void RefreshGems();
+        void UpdateGemCart(QWidget* gemCart);
+
+    protected slots:
+        void paintEvent(QPaintEvent* event) override;
         
     private:
         AzQtComponents::SearchLineEdit* m_filterLineEdit = nullptr;
         inline constexpr static int s_height = 60;
+        DownloadController* m_downloadController = nullptr;
+        QLabel* m_downloadSpinner = nullptr;
+        QLabel* m_downloadLabel = nullptr;
+        QMovie* m_downloadSpinnerMovie = nullptr;
+        CartButton* m_cartButton = nullptr;
+        bool m_showGemCart = false;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index 79935ed235..1d4f354fb5 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -8,11 +8,20 @@
 
 #include <GemCatalog/GemCatalogScreen.h>
 #include <PythonBindingsInterface.h>
+#include <GemCatalog/GemCatalogHeaderWidget.h>
+#include <GemCatalog/GemFilterWidget.h>
+#include <GemCatalog/GemListView.h>
+#include <GemCatalog/GemInspector.h>
+#include <GemCatalog/GemModel.h>
 #include <GemCatalog/GemListHeaderWidget.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
 #include <GemCatalog/GemRequirementDialog.h>
 #include <GemCatalog/GemDependenciesDialog.h>
+#include <GemCatalog/GemUpdateDialog.h>
+#include <GemCatalog/GemUninstallDialog.h>
 #include <DownloadController.h>
+#include <ProjectUtils.h>
+
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -24,6 +33,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QHash>
+#include <QStackedWidget>
 
 namespace O3DE::ProjectManager
 {
@@ -47,8 +57,12 @@ namespace O3DE::ProjectManager
         vLayout->addWidget(m_headerWidget);
 
         connect(m_gemModel, &GemModel::gemStatusChanged, this, &GemCatalogScreen::OnGemStatusChanged);
+        connect(m_gemModel, &GemModel::dependencyGemStatusChanged, this, &GemCatalogScreen::OnDependencyGemStatusChanged);
+        connect(m_gemModel->GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, [this]{ ShowInspector(); });
+        connect(m_headerWidget, &GemCatalogHeaderWidget::RefreshGems, this, &GemCatalogScreen::Refresh);
         connect(m_headerWidget, &GemCatalogHeaderWidget::OpenGemsRepo, this, &GemCatalogScreen::HandleOpenGemRepo);
         connect(m_headerWidget, &GemCatalogHeaderWidget::AddGem, this, &GemCatalogScreen::OnAddGemClicked);
+        connect(m_headerWidget, &GemCatalogHeaderWidget::UpdateGemCart, this, &GemCatalogScreen::UpdateAndShowGemCart);
         connect(m_downloadController, &DownloadController::Done, this, &GemCatalogScreen::OnGemDownloadResult);
 
         QHBoxLayout* hLayout = new QHBoxLayout();
@@ -56,10 +70,15 @@ namespace O3DE::ProjectManager
         vLayout->addLayout(hLayout);
 
         m_gemListView = new GemListView(m_proxyModel, m_proxyModel->GetSelectionModel(), this);
+
+        m_rightPanelStack = new QStackedWidget(this);
+        m_rightPanelStack->setFixedWidth(240);
+
         m_gemInspector = new GemInspector(m_gemModel, this);
-        m_gemInspector->setFixedWidth(240);
 
         connect(m_gemInspector, &GemInspector::TagClicked, [=](const Tag& tag) { SelectGem(tag.id); });
+        connect(m_gemInspector, &GemInspector::UpdateGem, this, &GemCatalogScreen::UpdateGem);
+        connect(m_gemInspector, &GemInspector::UninstallGem, this, &GemCatalogScreen::UninstallGem);
 
         QWidget* filterWidget = new QWidget(this);
         filterWidget->setFixedWidth(240);
@@ -78,7 +97,9 @@ namespace O3DE::ProjectManager
 
         hLayout->addWidget(filterWidget);
         hLayout->addLayout(middleVLayout);
-        hLayout->addWidget(m_gemInspector);
+
+        hLayout->addWidget(m_rightPanelStack);
+        m_rightPanelStack->addWidget(m_gemInspector);
 
         m_notificationsView = AZStd::make_unique<AzToolsFramework::ToastNotificationsView>(this, AZ_CRC("GemCatalogNotificationsView"));
         m_notificationsView->SetOffset(QPoint(10, 70));
@@ -90,9 +111,16 @@ namespace O3DE::ProjectManager
         m_projectPath = projectPath;
         m_gemModel->Clear();
         m_gemsToRegisterWithProject.clear();
+
+        if (m_filterWidget)
+        {
+            // disconnect so we don't update the status filter for every gem we add
+            disconnect(m_gemModel, &GemModel::dataChanged, m_filterWidget, &GemFilterWidget::ResetGemStatusFilter);
+        }
+
         FillModel(projectPath);
 
-        m_proxyModel->ResetFilters();
+        m_proxyModel->ResetFilters(false);
         m_proxyModel->sort(/*column=*/0);
 
         if (m_filterWidget)
@@ -111,9 +139,10 @@ namespace O3DE::ProjectManager
 
         // Select the first entry after everything got correctly sized
         QTimer::singleShot(200, [=]{
-            QModelIndex firstModelIndex = m_gemListView->model()->index(0,0);
-            m_gemListView->selectionModel()->select(firstModelIndex, QItemSelectionModel::ClearAndSelect);
-            });
+            QModelIndex firstModelIndex = m_gemModel->index(0, 0);
+            QModelIndex proxyIndex = m_proxyModel->mapFromSource(firstModelIndex);
+            m_proxyModel->GetSelectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
+        });
     }
 
     void GemCatalogScreen::OnAddGemClicked()
@@ -173,7 +202,7 @@ namespace O3DE::ProjectManager
         }
 
         // add all the gem repos into the hash
-        const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemRepoGemsInfos();
+        const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForAllRepos();
         if (allRepoGemInfosResult.IsSuccess())
         {
             const QVector<GemInfo>& allRepoGemInfos = allRepoGemInfosResult.GetValue();
@@ -195,7 +224,7 @@ namespace O3DE::ProjectManager
             const bool gemFound = gemInfoHash.contains(gemName);
             if (!gemFound && !m_gemModel->IsAdded(index) && !m_gemModel->IsAddedDependency(index))
             {
-                m_gemModel->removeRow(i);
+                m_gemModel->RemoveGem(index);
             }
             else
             {
@@ -221,8 +250,11 @@ namespace O3DE::ProjectManager
         m_proxyModel->sort(/*column=*/0);
 
         // temporary, until we can refresh filter counts 
-        m_proxyModel->ResetFilters();
+        m_proxyModel->ResetFilters(false);
         m_filterWidget->ResetAllFilters();
+
+        // Reselect the same selection to proc UI updates
+        m_proxyModel->GetSelectionModel()->setCurrentIndex(m_proxyModel->GetSelectionModel()->currentIndex(), QItemSelectionModel::Select);
     }
 
     void GemCatalogScreen::OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies) 
@@ -246,23 +278,25 @@ namespace O3DE::ProjectManager
                 notification = GemModel::GetDisplayName(modelIndex);
                 if (numChangedDependencies > 0)
                 {
-                    notification += " " + tr("and") + " ";
+                    notification += tr(" and ");
                 }
-                if (added && GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded)
+                if (added && (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded) ||
+                    (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::DownloadFailed))
                 {
                     m_downloadController->AddGemDownload(GemModel::GetName(modelIndex));
+                    GemModel::SetDownloadStatus(*m_gemModel, modelIndex, GemInfo::DownloadStatus::Downloading);
                 }
             }
 
-            if (numChangedDependencies == 1 )
+            if (numChangedDependencies == 1)
             {
-                notification += "1 Gem " + tr("dependency");
+                notification += tr("1 Gem dependency");
             }
             else if (numChangedDependencies > 1)
             {
-                notification += QString("%1 Gem ").arg(numChangedDependencies) + tr("dependencies");
+                notification += tr("%1 Gem %2").arg(QString(numChangedDependencies), tr("dependencies"));
             }
-            notification += " " + (added ? tr("activated") : tr("deactivated"));
+            notification += (added ? tr(" activated") : tr(" deactivated"));
 
             AzQtComponents::ToastConfiguration toastConfiguration(AzQtComponents::ToastType::Custom, notification, "");
             toastConfiguration.m_customIconImage = ":/gem.svg";
@@ -272,6 +306,18 @@ namespace O3DE::ProjectManager
         }
     }
 
+    void GemCatalogScreen::OnDependencyGemStatusChanged(const QString& gemName)
+    {
+        QModelIndex modelIndex = m_gemModel->FindIndexByNameString(gemName);
+        bool added = GemModel::IsAddedDependency(modelIndex);
+        if (added && (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded) ||
+            (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::DownloadFailed))
+        {
+            m_downloadController->AddGemDownload(GemModel::GetName(modelIndex));
+            GemModel::SetDownloadStatus(*m_gemModel, modelIndex, GemInfo::DownloadStatus::Downloading);
+        }
+    }
+
     void GemCatalogScreen::SelectGem(const QString& gemName)
     {
         QModelIndex modelIndex = m_gemModel->FindIndexByNameString(gemName);
@@ -282,8 +328,108 @@ namespace O3DE::ProjectManager
         }
 
         QModelIndex proxyIndex = m_proxyModel->mapFromSource(modelIndex);
-        m_proxyModel->GetSelectionModel()->select(proxyIndex, QItemSelectionModel::ClearAndSelect);
+        m_proxyModel->GetSelectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
         m_gemListView->scrollTo(proxyIndex);
+
+        ShowInspector();
+    }
+
+    void GemCatalogScreen::UpdateGem(const QModelIndex& modelIndex)
+    {
+        const QString selectedGemName = m_gemModel->GetName(modelIndex);
+        const QString selectedGemLastUpdate = m_gemModel->GetLastUpdated(modelIndex);
+        const QString selectedDisplayGemName = m_gemModel->GetDisplayName(modelIndex);
+        const QString selectedGemRepoUri = m_gemModel->GetRepoUri(modelIndex);
+
+        // Refresh gem repo
+        if (!selectedGemRepoUri.isEmpty())
+        {
+            AZ::Outcome<void, AZStd::string> refreshResult = PythonBindingsInterface::Get()->RefreshGemRepo(selectedGemRepoUri);
+            if (refreshResult.IsSuccess())
+            {
+                Refresh();
+            }
+            else
+            {
+                QMessageBox::critical(
+                    this, tr("Operation failed"),
+                    tr("Failed to refresh gem repository %1<br>Error:<br>%2").arg(selectedGemRepoUri, refreshResult.GetError().c_str()));
+            }
+        }
+        // If repo uri isn't specified warn user that repo might not be refreshed
+        else
+        {
+            int result = QMessageBox::warning(
+                this, tr("Gem Repository Unspecified"),
+                tr("The repo for %1 is unspecfied. Repository cannot be automatically refreshed. "
+                   "Please ensure this gem's repo is refreshed before attempting to update.")
+                    .arg(selectedDisplayGemName),
+                QMessageBox::Cancel, QMessageBox::Ok);
+
+            // Allow user to cancel update to manually refresh repo
+            if (result != QMessageBox::Ok)
+            {
+                return;
+            }
+        }
+
+        // Check if there is an update avaliable now that repo is refreshed
+        bool updateAvaliable = PythonBindingsInterface::Get()->IsGemUpdateAvaliable(selectedGemName, selectedGemLastUpdate);
+
+        GemUpdateDialog* confirmUpdateDialog = new GemUpdateDialog(selectedGemName, updateAvaliable, this);
+        if (confirmUpdateDialog->exec() == QDialog::Accepted)
+        {
+            m_downloadController->AddGemDownload(selectedGemName);
+        }
+    }
+
+    void GemCatalogScreen::UninstallGem(const QModelIndex& modelIndex)
+    {
+        const QString selectedDisplayGemName = m_gemModel->GetDisplayName(modelIndex);
+
+        GemUninstallDialog* confirmUninstallDialog = new GemUninstallDialog(selectedDisplayGemName, this);
+        if (confirmUninstallDialog->exec() == QDialog::Accepted)
+        {
+            const QString selectedGemPath = m_gemModel->GetPath(modelIndex);
+
+            const bool wasAdded = GemModel::WasPreviouslyAdded(modelIndex);
+            const bool wasAddedDependency = GemModel::WasPreviouslyAddedDependency(modelIndex);
+
+            // Remove gem from gems to be added to update any dependencies
+            GemModel::SetIsAdded(*m_gemModel, modelIndex, false);
+            GemModel::DeactivateDependentGems(*m_gemModel, modelIndex);
+
+            // Unregister the gem
+            auto unregisterResult = PythonBindingsInterface::Get()->UnregisterGem(selectedGemPath);
+            if (!unregisterResult)
+            {
+                QMessageBox::critical(this, tr("Failed to unregister gem"), unregisterResult.GetError().c_str());
+            }
+            else
+            {
+                const QString selectedGemName = m_gemModel->GetName(modelIndex);
+
+                // Remove gem from model
+                m_gemModel->RemoveGem(modelIndex);
+
+                // Delete uninstalled gem directory
+                if (!ProjectUtils::DeleteProjectFiles(selectedGemPath, /*force*/true))
+                {
+                    QMessageBox::critical(
+                        this, tr("Failed to remove gem directory"), tr("Could not delete gem directory at:<br>%1").arg(selectedGemPath));
+                }
+
+                // Show undownloaded remote gem again
+                Refresh();
+
+                // Select remote gem
+                QModelIndex remoteGemIndex = m_gemModel->FindIndexByNameString(selectedGemName);
+                GemModel::SetWasPreviouslyAdded(*m_gemModel, remoteGemIndex, wasAdded);
+                GemModel::SetWasPreviouslyAddedDependency(*m_gemModel, remoteGemIndex, wasAddedDependency);
+                QModelIndex proxyIndex = m_proxyModel->mapFromSource(remoteGemIndex);
+                m_proxyModel->GetSelectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
+            }
+        }
     }
 
     void GemCatalogScreen::hideEvent(QHideEvent* event)
@@ -324,7 +470,7 @@ namespace O3DE::ProjectManager
                 m_gemModel->AddGem(gemInfo);
             }
 
-            const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemRepoGemsInfos();
+            const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForAllRepos();
             if (allRepoGemInfosResult.IsSuccess())
             {
                 const QVector<GemInfo>& allRepoGemInfos = allRepoGemInfosResult.GetValue();
@@ -380,6 +526,12 @@ namespace O3DE::ProjectManager
         }
     }
 
+    void GemCatalogScreen::ShowInspector()
+    {
+        m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Inspector);
+        m_headerWidget->GemCartShown();
+    }
+
     GemCatalogScreen::EnableDisableGemsResult GemCatalogScreen::EnableDisableGemsForProject(const QString& projectPath)
     {
         IPythonBindings* pythonBindings = PythonBindingsInterface::Get();
@@ -412,7 +564,9 @@ namespace O3DE::ProjectManager
             const QString& gemPath = GemModel::GetPath(modelIndex);
 
             // make sure any remote gems we added were downloaded successfully 
-            if (GemModel::GetGemOrigin(modelIndex) == GemInfo::Remote && GemModel::GetDownloadStatus(modelIndex) != GemInfo::Downloaded)
+            const GemInfo::DownloadStatus status = GemModel::GetDownloadStatus(modelIndex);
+            if (GemModel::GetGemOrigin(modelIndex) == GemInfo::Remote &&
+                !(status == GemInfo::Downloaded || status == GemInfo::DownloadSuccessful))
             {
                 QMessageBox::critical(
                     nullptr, "Cannot add gem that isn't downloaded",
@@ -459,12 +613,25 @@ namespace O3DE::ProjectManager
         emit ChangeScreenRequest(ProjectManagerScreen::GemRepos);
     }
 
+    void GemCatalogScreen::UpdateAndShowGemCart(QWidget* cartWidget)
+    {
+        QWidget* previousCart = m_rightPanelStack->widget(RightPanelWidgetOrder::Cart);
+        if (previousCart)
+        {
+            m_rightPanelStack->removeWidget(previousCart);
+        }
+
+        m_rightPanelStack->insertWidget(RightPanelWidgetOrder::Cart, cartWidget);
+        m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Cart);
+    }
+
     void GemCatalogScreen::OnGemDownloadResult(const QString& gemName, bool succeeded)
     {
         if (succeeded)
         {
             // refresh the information for downloaded gems
-            const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allGemInfosResult = PythonBindingsInterface::Get()->GetAllGemInfos(m_projectPath);
+            const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allGemInfosResult =
+                PythonBindingsInterface::Get()->GetAllGemInfos(m_projectPath);
             if (allGemInfosResult.IsSuccess())
             {
                 // we should find the gem name now in all gem infos
@@ -472,19 +639,47 @@ namespace O3DE::ProjectManager
                 {
                     if (gemInfo.m_name == gemName)
                     {
-                        QModelIndex index = m_gemModel->FindIndexByNameString(gemName);
-                        if (index.isValid())
+                        QModelIndex oldIndex = m_gemModel->FindIndexByNameString(gemName);
+                        if (oldIndex.isValid())
                         {
-                            m_gemModel->setData(index, GemInfo::Downloaded, GemModel::RoleDownloadStatus);
-                            m_gemModel->setData(index, gemInfo.m_path, GemModel::RolePath);
-                            m_gemModel->setData(index, gemInfo.m_path, GemModel::RoleDirectoryLink);
+                            // Check if old gem is selected
+                            bool oldGemSelected = false;
+                            if (m_gemModel->GetSelectionModel()->currentIndex() == oldIndex)
+                            {
+                                oldGemSelected = true;
+                            }
+
+                            // Remove old remote gem
+                            m_gemModel->RemoveGem(oldIndex);
+
+                            // Add new downloaded version of gem
+                            QModelIndex newIndex = m_gemModel->AddGem(gemInfo);
+                            GemModel::SetDownloadStatus(*m_gemModel, newIndex, GemInfo::DownloadSuccessful);
+                            GemModel::SetIsAdded(*m_gemModel, newIndex, true);
+
+                            // Select new version of gem if it was previously selected
+                            if (oldGemSelected)
+                            {
+                                QModelIndex proxyIndex = m_proxyModel->mapFromSource(newIndex);
+                                m_proxyModel->GetSelectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
+                            }
                         }
 
-                        return;
+                        break;
                     }
                 }
             }
         }
+        else
+        {
+            QModelIndex index = m_gemModel->FindIndexByNameString(gemName);
+            if (index.isValid())
+            {
+                GemModel::SetIsAdded(*m_gemModel, index, false);
+                GemModel::DeactivateDependentGems(*m_gemModel, index);
+                GemModel::SetDownloadStatus(*m_gemModel, index, GemInfo::DownloadFailed);
+            }
+        }
     }
 
     ProjectManagerScreen GemCatalogScreen::GetScreenEnum()
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
index da6d2efa7b..20b0c27ff8 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
@@ -12,18 +12,24 @@
 #include <ScreenWidget.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzToolsFramework/UI/Notifications/ToastNotificationsView.h>
-#include <GemCatalog/GemCatalogHeaderWidget.h>
-#include <GemCatalog/GemFilterWidget.h>
-#include <GemCatalog/GemListView.h>
-#include <GemCatalog/GemInspector.h>
-#include <GemCatalog/GemModel.h>
-#include <GemCatalog/GemSortFilterProxyModel.h>
+
 #include <QSet>
 #include <QString>
 #endif
 
+QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
+QT_FORWARD_DECLARE_CLASS(QStackedWidget)
+
 namespace O3DE::ProjectManager
 {
+    QT_FORWARD_DECLARE_CLASS(GemCatalogHeaderWidget)
+    QT_FORWARD_DECLARE_CLASS(GemFilterWidget)
+    QT_FORWARD_DECLARE_CLASS(GemListView)
+    QT_FORWARD_DECLARE_CLASS(GemInspector)
+    QT_FORWARD_DECLARE_CLASS(GemModel)
+    QT_FORWARD_DECLARE_CLASS(GemSortFilterProxyModel)
+    QT_FORWARD_DECLARE_CLASS(DownloadController)
+
     class GemCatalogScreen
         : public ScreenWidget
     {
@@ -47,10 +53,13 @@ namespace O3DE::ProjectManager
 
     public slots:
         void OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
+        void OnDependencyGemStatusChanged(const QString& gemName);
         void OnAddGemClicked();
         void SelectGem(const QString& gemName);
         void OnGemDownloadResult(const QString& gemName, bool succeeded = true);
         void Refresh();
+        void UpdateGem(const QModelIndex& modelIndex);
+        void UninstallGem(const QModelIndex& modelIndex);
 
     protected:
         void hideEvent(QHideEvent* event) override;
@@ -60,14 +69,22 @@ namespace O3DE::ProjectManager
 
     private slots:
         void HandleOpenGemRepo();
-
+        void UpdateAndShowGemCart(QWidget* cartWidget);
+        void ShowInspector();
 
     private:
+        enum RightPanelWidgetOrder
+        {
+            Inspector = 0,
+            Cart
+        };
+
         void FillModel(const QString& projectPath);
 
         AZStd::unique_ptr<AzToolsFramework::ToastNotificationsView> m_notificationsView;
 
         GemListView* m_gemListView = nullptr;
+        QStackedWidget* m_rightPanelStack = nullptr;
         GemInspector* m_gemInspector = nullptr;
         GemModel* m_gemModel = nullptr;
         GemCatalogHeaderWidget* m_headerWidget = nullptr;
@@ -77,6 +94,6 @@ namespace O3DE::ProjectManager
         DownloadController* m_downloadController = nullptr;
         bool m_notificationsEnabled = true;
         QSet<QString> m_gemsToRegisterWithProject;
-        QString m_projectPath = nullptr;
+        QString m_projectPath;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
index b608445d0f..acea6ce378 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
@@ -221,7 +221,6 @@ namespace O3DE::ProjectManager
         ResetGemStatusFilter();
         ResetGemOriginFilter();
         ResetTypeFilter();
-        ResetPlatformFilter();
         ResetFeatureFilter();
     }
 
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
index 12cce5a4ea..23e95cf487 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
@@ -57,7 +57,9 @@ namespace O3DE::ProjectManager
             UnknownDownloadStatus = -1,
             NotDownloaded,
             Downloading,
-            Downloaded,
+            DownloadSuccessful,
+            DownloadFailed,
+            Downloaded
         };
         static QString GetDownloadStatusString(DownloadStatus status);
 
@@ -71,10 +73,10 @@ namespace O3DE::ProjectManager
 
         QString m_path;
         QString m_name = "Unknown Gem Name";
-        QString m_displayName = "Unknown Gem Name";
+        QString m_displayName;
         QString m_creator = "Unknown Creator";
         GemOrigin m_gemOrigin = Local;
-        bool m_isAdded = false; //! Is the gem currently added and enabled in the project?
+        bool m_isAdded = false; //! Is the gem explicitly added (not a dependency) and enabled in the project?
         QString m_summary = "No summary provided.";
         Platforms m_platforms;
         Types m_types; //! Asset and/or Code and/or Tool
@@ -85,6 +87,7 @@ namespace O3DE::ProjectManager
         QString m_licenseLink;
         QString m_directoryLink;
         QString m_documentationLink;
+        QString m_repoUri;
         QString m_version = "Unknown Version";
         QString m_lastUpdatedDate = "Unknown Date";
         int m_binarySizeInKB = 0;
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
index 1bcfc6ce9d..8bdd1f0f0f 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
@@ -14,6 +14,7 @@
 #include <QSpacerItem>
 #include <QVBoxLayout>
 #include <QIcon>
+#include <QPushButton>
 
 namespace O3DE::ProjectManager
 {
@@ -52,10 +53,13 @@ namespace O3DE::ProjectManager
         Update(selectedIndices[0]);
     }
 
-    void SetLabelElidedText(QLabel* label, QString text)
+    void SetLabelElidedText(QLabel* label, QString text, int labelWidth = 0)
     {
         QFontMetrics nameFontMetrics(label->font());
-        int labelWidth = label->width();
+        if (!labelWidth)
+        {
+            labelWidth = label->width();
+        }
 
         // Don't elide if the widgets are sized too small (sometimes occurs when loading gem catalog)
         if (labelWidth > 100)
@@ -70,6 +74,8 @@ namespace O3DE::ProjectManager
 
     void GemInspector::Update(const QModelIndex& modelIndex)
     {
+        m_curModelIndex = modelIndex;
+
         if (!modelIndex.isValid())
         {
             m_mainWidget->hide();
@@ -81,7 +87,8 @@ namespace O3DE::ProjectManager
         m_summaryLabel->setText(m_model->GetSummary(modelIndex));
         m_summaryLabel->adjustSize();
 
-        m_licenseLinkLabel->setText(m_model->GetLicenseText(modelIndex));
+        // Manually define remaining space to elide text because spacer would like to take all of the space
+        SetLabelElidedText(m_licenseLinkLabel, m_model->GetLicenseText(modelIndex), width() - m_licenseLabel->width() - 35);
         m_licenseLinkLabel->SetUrl(m_model->GetLicenseLink(modelIndex));
 
         m_directoryLinkLabel->SetUrl(m_model->GetDirectoryLink(modelIndex));
@@ -123,6 +130,20 @@ namespace O3DE::ProjectManager
         const int binarySize = m_model->GetBinarySizeInKB(modelIndex);
         m_binarySizeLabel->setText(tr("Binary Size:  %1").arg(binarySize ? tr("%1 KB").arg(binarySize) : tr("Unknown")));
 
+        // Update and Uninstall buttons
+        if (m_model->GetGemOrigin(modelIndex) == GemInfo::Remote &&
+            (m_model->GetDownloadStatus(modelIndex) == GemInfo::Downloaded ||
+             m_model->GetDownloadStatus(modelIndex) == GemInfo::DownloadSuccessful))
+        {
+            m_updateGemButton->show();
+            m_uninstallGemButton->show();
+        }
+        else
+        {
+            m_updateGemButton->hide();
+            m_uninstallGemButton->hide();
+        }
+
         m_mainWidget->adjustSize();
         m_mainWidget->show();
     }
@@ -158,8 +179,8 @@ namespace O3DE::ProjectManager
             licenseHLayout->setAlignment(Qt::AlignLeft);
             m_mainLayout->addLayout(licenseHLayout);
 
-            QLabel* licenseLabel = CreateStyledLabel(licenseHLayout, s_baseFontSize, s_headerColor);
-            licenseLabel->setText(tr("License: "));
+            m_licenseLabel = CreateStyledLabel(licenseHLayout, s_baseFontSize, s_headerColor);
+            m_licenseLabel->setText(tr("License: "));
 
             m_licenseLinkLabel = new LinkLabel("", QUrl(), s_baseFontSize);
             licenseHLayout->addWidget(m_licenseLinkLabel);
@@ -223,7 +244,7 @@ namespace O3DE::ProjectManager
 
         // Depending gems
         m_dependingGems = new GemsSubWidget();
-        connect(m_dependingGems, &GemsSubWidget::TagClicked, this, [=](const Tag& tag){ emit TagClicked(tag); });
+        connect(m_dependingGems, &GemsSubWidget::TagClicked, this, [this](const Tag& tag){ emit TagClicked(tag); });
         m_mainLayout->addWidget(m_dependingGems);
         m_mainLayout->addSpacing(20);
 
@@ -234,5 +255,20 @@ namespace O3DE::ProjectManager
         m_versionLabel = CreateStyledLabel(m_mainLayout, s_baseFontSize, s_textColor);
         m_lastUpdatedLabel = CreateStyledLabel(m_mainLayout, s_baseFontSize, s_textColor);
         m_binarySizeLabel = CreateStyledLabel(m_mainLayout, s_baseFontSize, s_textColor);
+
+        m_mainLayout->addSpacing(20);
+
+        // Update and Uninstall buttons
+        m_updateGemButton = new QPushButton(tr("Update Gem"));
+        m_updateGemButton->setObjectName("gemCatalogUpdateGemButton");
+        m_mainLayout->addWidget(m_updateGemButton);
+        connect(m_updateGemButton, &QPushButton::clicked, this , [this]{ emit UpdateGem(m_curModelIndex); });
+
+        m_mainLayout->addSpacing(10);
+
+        m_uninstallGemButton = new QPushButton(tr("Uninstall Gem"));
+        m_uninstallGemButton->setObjectName("gemCatalogUninstallGemButton");
+        m_mainLayout->addWidget(m_uninstallGemButton);
+        connect(m_uninstallGemButton, &QPushButton::clicked, this , [this]{ emit UninstallGem(m_curModelIndex); });
     }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
index 9a6ad84dea..1713191623 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
@@ -16,11 +16,12 @@
 
 #include <QItemSelection>
 #include <QScrollArea>
-#include <QSpacerItem>
 #endif
 
 QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSpacerItem)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
 
 namespace O3DE::ProjectManager
 {
@@ -45,6 +46,8 @@ namespace O3DE::ProjectManager
 
     signals:
         void TagClicked(const Tag& tag);
+        void UpdateGem(const QModelIndex& modelIndex);
+        void UninstallGem(const QModelIndex& modelIndex);
 
     private slots:
         void OnSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
@@ -55,11 +58,13 @@ namespace O3DE::ProjectManager
         GemModel* m_model = nullptr;
         QWidget* m_mainWidget = nullptr;
         QVBoxLayout* m_mainLayout = nullptr;
+        QModelIndex m_curModelIndex;
 
         // General info (top) section
         QLabel* m_nameLabel = nullptr;
         QLabel* m_creatorLabel = nullptr;
         QLabel* m_summaryLabel = nullptr;
+        QLabel* m_licenseLabel = nullptr;
         LinkLabel* m_licenseLinkLabel = nullptr;
         LinkLabel* m_directoryLinkLabel = nullptr;
         LinkLabel* m_documentationLinkLabel = nullptr;
@@ -77,5 +82,8 @@ namespace O3DE::ProjectManager
         QLabel* m_versionLabel = nullptr;
         QLabel* m_lastUpdatedLabel = nullptr;
         QLabel* m_binarySizeLabel = nullptr;
+
+        QPushButton* m_updateGemButton = nullptr;
+        QPushButton* m_uninstallGemButton = nullptr;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
index e15c4b3b39..dd94e42fc4 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
@@ -37,6 +37,8 @@ namespace O3DE::ProjectManager
 
         SetStatusIcon(m_notDownloadedPixmap, ":/Download.svg");
         SetStatusIcon(m_unknownStatusPixmap, ":/X.svg");
+        SetStatusIcon(m_downloadSuccessfulPixmap, ":/checkmark.svg");
+        SetStatusIcon(m_downloadFailedPixmap, ":/Warning.svg");
 
         m_downloadingMovie = new QMovie(":/in_progress.gif");
     }
@@ -480,6 +482,14 @@ namespace O3DE::ProjectManager
             currentFrame = currentFrame.scaled(s_statusIconSize, s_statusIconSize);
             statusPixmap = &currentFrame;
         }
+        else if (downloadStatus == GemInfo::DownloadStatus::DownloadSuccessful)
+        {
+            statusPixmap = &m_downloadSuccessfulPixmap;
+        }
+        else if (downloadStatus == GemInfo::DownloadStatus::DownloadFailed)
+        {
+            statusPixmap = &m_downloadFailedPixmap;
+        }
         else if (downloadStatus == GemInfo::DownloadStatus::NotDownloaded)
         {
             statusPixmap = &m_notDownloadedPixmap;
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
index c013be0d9e..107de6de15 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
@@ -97,6 +97,8 @@ namespace O3DE::ProjectManager
 
         QPixmap m_unknownStatusPixmap;
         QPixmap m_notDownloadedPixmap;
+        QPixmap m_downloadSuccessfulPixmap;
+        QPixmap m_downloadFailedPixmap;
         QMovie* m_downloadingMovie = nullptr;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
index 88c54de0b3..d163ab9076 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
@@ -26,14 +26,14 @@ namespace O3DE::ProjectManager
         return m_selectionModel;
     }
 
-    void GemModel::AddGem(const GemInfo& gemInfo)
+    QModelIndex GemModel::AddGem(const GemInfo& gemInfo)
     {
         if (FindIndexByNameString(gemInfo.m_name).isValid())
         {
             // do not add gems with duplicate names
             // this can happen by mistake or when a gem repo has a gem with the same name as a local gem
             AZ_TracePrintf("GemModel", "Ignoring duplicate gem: %s", gemInfo.m_name.toUtf8().constData());
-            return;
+            return QModelIndex();
         }
 
         QStandardItem* item = new QStandardItem();
@@ -61,11 +61,28 @@ namespace O3DE::ProjectManager
         item->setData(gemInfo.m_downloadStatus, RoleDownloadStatus);
         item->setData(gemInfo.m_licenseText, RoleLicenseText);
         item->setData(gemInfo.m_licenseLink, RoleLicenseLink);
+        item->setData(gemInfo.m_repoUri, RoleRepoUri);
 
         appendRow(item);
 
         const QModelIndex modelIndex = index(rowCount()-1, 0);
         m_nameToIndexMap[gemInfo.m_name] = modelIndex;
+
+        return modelIndex;
+    }
+
+    void GemModel::RemoveGem(const QModelIndex& modelIndex)
+    {
+        removeRow(modelIndex.row());
+    }
+
+    void GemModel::RemoveGem(const QString& gemName)
+    {
+        auto nameFind = m_nameToIndexMap.find(gemName);
+        if (nameFind != m_nameToIndexMap.end())
+        {
+            removeRow(nameFind->row());
+        }
     }
 
     void GemModel::Clear()
@@ -255,6 +272,11 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RoleLicenseLink).toString();
     }
 
+    QString GemModel::GetRepoUri(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleRepoUri).toString();
+    }
+
     GemModel* GemModel::GetSourceModel(QAbstractItemModel* model)
     {
         GemSortFilterProxyModel* proxyModel = qobject_cast<GemSortFilterProxyModel*>(model);
@@ -335,6 +357,8 @@ namespace O3DE::ProjectManager
                     if (!IsAdded(dependency))
                     {
                         numChangedDependencies++;
+                        const QString dependencyName = gemModel->GetName(dependency);
+                        gemModel->emit dependencyGemStatusChanged(dependencyName);
                     }
                 }
             }
@@ -359,6 +383,8 @@ namespace O3DE::ProjectManager
                     if (!IsAdded(dependency))
                     {
                         numChangedDependencies++;
+                        const QString dependencyName = gemModel->GetName(dependency);
+                        gemModel->emit dependencyGemStatusChanged(dependencyName);
                     }
                 }
             }
@@ -369,11 +395,30 @@ namespace O3DE::ProjectManager
 
     void GemModel::OnRowsAboutToBeRemoved(const QModelIndex& parent, int first, int last)
     {
+        bool selectedRowRemoved = false;
         for (int i = first; i <= last; ++i)
         {
             QModelIndex modelIndex = index(i, 0, parent);
             const QString& gemName = GetName(modelIndex);
             m_nameToIndexMap.remove(gemName);
+
+            if (GetSelectionModel()->isRowSelected(i))
+            {
+                selectedRowRemoved = true;
+            }
+        }
+
+        // Select a valid row if currently selected row was removed
+        if (selectedRowRemoved)
+        {
+            for (const QModelIndex& index : m_nameToIndexMap)
+            {
+                if (index.isValid())
+                {
+                    GetSelectionModel()->setCurrentIndex(index, QItemSelectionModel::ClearAndSelect);
+                    break;
+                }
+            }
         }
     }
 
@@ -438,6 +483,23 @@ namespace O3DE::ProjectManager
         return previouslyAdded && !added;
     }
 
+    void GemModel::DeactivateDependentGems(QAbstractItemModel& model, const QModelIndex& modelIndex)
+    {
+        GemModel* gemModel = GetSourceModel(&model);
+        AZ_Assert(gemModel, "Failed to obtain GemModel");
+
+        QVector<QModelIndex> dependentGems = gemModel->GatherDependentGems(modelIndex);
+        if (!dependentGems.isEmpty())
+        {
+            // we need to deactivate all gems that depend on this one
+            for (auto dependentModelIndex : dependentGems)
+            {
+                SetIsAdded(model, dependentModelIndex, false);
+            }
+
+        }
+    }
+
     void GemModel::SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status)
     {
         model.setData(modelIndex, status, RoleDownloadStatus);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
index e25a1c7703..cb99581468 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
@@ -51,10 +51,13 @@ namespace O3DE::ProjectManager
             RoleRequirement,
             RoleDownloadStatus,
             RoleLicenseText,
-            RoleLicenseLink
+            RoleLicenseLink,
+            RoleRepoUri
         };
 
-        void AddGem(const GemInfo& gemInfo);
+        QModelIndex AddGem(const GemInfo& gemInfo);
+        void RemoveGem(const QModelIndex& modelIndex);
+        void RemoveGem(const QString& gemName);
         void Clear();
         void UpdateGemDependencies();
 
@@ -80,6 +83,7 @@ namespace O3DE::ProjectManager
         static QString GetRequirement(const QModelIndex& modelIndex);
         static QString GetLicenseText(const QModelIndex& modelIndex);
         static QString GetLicenseLink(const QModelIndex& modelIndex);
+        static QString GetRepoUri(const QModelIndex& modelIndex);
         static GemModel* GetSourceModel(QAbstractItemModel* model);
         static const GemModel* GetSourceModel(const QAbstractItemModel* model);
 
@@ -95,6 +99,7 @@ namespace O3DE::ProjectManager
         static bool NeedsToBeRemoved(const QModelIndex& modelIndex, bool includeDependencies = false);
         static bool HasRequirement(const QModelIndex& modelIndex);
         static void UpdateDependencies(QAbstractItemModel& model, const QString& gemName, bool isAdded);
+        static void DeactivateDependentGems(QAbstractItemModel& model, const QModelIndex& modelIndex);
         static void SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status);
 
         bool DoGemsToBeAddedHaveRequirements() const;
@@ -109,6 +114,7 @@ namespace O3DE::ProjectManager
 
     signals:
         void gemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
+        void dependencyGemStatusChanged(const QString& gemName);
 
     protected slots: 
         void OnRowsAboutToBeRemoved(const QModelIndex& parent, int first, int last);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp
index 32d0e2fee9..a32492cf1e 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp
@@ -204,9 +204,12 @@ namespace O3DE::ProjectManager
         emit OnInvalidated();
     }
 
-    void GemSortFilterProxyModel::ResetFilters()
+    void GemSortFilterProxyModel::ResetFilters(bool clearSearchString)
     {
-        m_searchString.clear();
+        if (clearSearchString)
+        {
+            m_searchString.clear();
+        }
         m_gemSelectedFilter = GemSelected::NoFilter;
         m_gemActiveFilter = GemActive::NoFilter;
         m_gemOriginFilter = {};
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h
index ab739e62f9..0c58d66ccf 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h
@@ -70,7 +70,7 @@ namespace O3DE::ProjectManager
         void SetFeatures(const QSet<QString>& features) { m_featureFilter = features; InvalidateFilter(); }
 
         void InvalidateFilter();
-        void ResetFilters();
+        void ResetFilters(bool clearSearchString = true);
 
     signals:
         void OnInvalidated();
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp
new file mode 100644
index 0000000000..679d9c576f
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemCatalog/GemUninstallDialog.h>
+
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QVariant>
+
+namespace O3DE::ProjectManager
+{
+    GemUninstallDialog::GemUninstallDialog(const QString& gemName, QWidget* parent)
+        : QDialog(parent)
+    {
+        setWindowTitle(tr("Uninstall Remote Gem"));
+        setObjectName("GemUninstallDialog");
+        setAttribute(Qt::WA_DeleteOnClose);
+        setModal(true);
+
+        QVBoxLayout* layout = new QVBoxLayout();
+        layout->setMargin(30);
+        layout->setAlignment(Qt::AlignTop);
+        setLayout(layout);
+
+        // Body
+        QLabel* subTitleLabel = new QLabel(tr("Are you sure you want to uninstall %1?").arg(gemName));
+        subTitleLabel->setObjectName("dialogSubTitle");
+        layout->addWidget(subTitleLabel);
+
+        layout->addSpacing(10);
+
+        QLabel* bodyLabel = new QLabel(tr("The Gem and its related files will be uninstalled. This does not affect the Gem's repository. "
+                                          "You can reinstall this Gem from the Catalog, but its contents may be subject to change."));
+        bodyLabel->setWordWrap(true);
+        bodyLabel->setFixedSize(QSize(440, 80));
+        layout->addWidget(bodyLabel);
+
+        layout->addSpacing(40);
+
+        // Buttons
+        QDialogButtonBox* dialogButtons = new QDialogButtonBox();
+        dialogButtons->setObjectName("footer");
+        layout->addWidget(dialogButtons);
+
+        QPushButton* cancelButton = dialogButtons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
+        cancelButton->setProperty("secondary", true);
+        QPushButton* uninstallButton = dialogButtons->addButton(tr("Uninstall Gem"), QDialogButtonBox::ApplyRole);
+        uninstallButton->setObjectName("gemCatalogUninstallGemButton");
+
+        connect(cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+        connect(uninstallButton, &QPushButton::clicked, this, &QDialog::accept);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.h
new file mode 100644
index 0000000000..9e3f4c3f3b
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemUninstallDialog
+        : public QDialog
+    {
+        Q_OBJECT // AUTOMOC
+    public:
+        explicit GemUninstallDialog(const QString& gemName, QWidget *parent = nullptr);
+        ~GemUninstallDialog() = default;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp
new file mode 100644
index 0000000000..d973dd3749
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GemCatalog/GemUpdateDialog.h>
+
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QVariant>
+
+namespace O3DE::ProjectManager
+{
+    GemUpdateDialog::GemUpdateDialog(const QString& gemName, bool updateAvaliable, QWidget* parent)
+        : QDialog(parent)
+    {
+        setWindowTitle(tr("Update Remote Gem"));
+        setObjectName("GemUpdateDialog");
+        setAttribute(Qt::WA_DeleteOnClose);
+        setModal(true);
+
+        QVBoxLayout* layout = new QVBoxLayout();
+        layout->setMargin(30);
+        layout->setAlignment(Qt::AlignTop);
+        setLayout(layout);
+
+        // Body
+        QLabel* subTitleLabel = new QLabel(tr("%1 to the latest version of %2?").arg(
+                                           updateAvaliable ? tr("Update") : tr("Force update"), gemName));
+        subTitleLabel->setObjectName("dialogSubTitle");
+        layout->addWidget(subTitleLabel);
+
+        layout->addSpacing(10);
+
+        QLabel* bodyLabel = new QLabel(tr("%1The latest version of this Gem may not be compatible with your engine. "
+                                          "Updating this Gem will remove any local changes made to this Gem, "
+                                          "and may remove old features that are in use.").arg(
+                                              updateAvaliable ? "" : tr("No update detected for Gem. "
+                                              "This will force a re-download of the gem. ")));
+        bodyLabel->setWordWrap(true);
+        bodyLabel->setFixedSize(QSize(440, 80));
+        layout->addWidget(bodyLabel);
+
+        layout->addSpacing(40);
+
+        // Buttons
+        QDialogButtonBox* dialogButtons = new QDialogButtonBox();
+        dialogButtons->setObjectName("footer");
+        layout->addWidget(dialogButtons);
+
+        QPushButton* cancelButton = dialogButtons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
+        cancelButton->setProperty("secondary", true);
+        QPushButton* updateButton =
+            dialogButtons->addButton(tr("%1Update Gem").arg(updateAvaliable ? "" : tr("Force ")), QDialogButtonBox::ApplyRole);
+
+        connect(cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+        connect(updateButton, &QPushButton::clicked, this, &QDialog::accept);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.h
new file mode 100644
index 0000000000..cf34abfb3d
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemUpdateDialog
+        : public QDialog
+    {
+        Q_OBJECT // AUTOMOC
+    public :
+        explicit GemUpdateDialog(const QString& gemName, bool updateAvaliable = true, QWidget* parent = nullptr);
+        ~GemUpdateDialog() = default;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h
index f1d1c2a8a2..c22511faad 100644
--- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h
@@ -37,7 +37,7 @@ namespace O3DE::ProjectManager
         QString m_additionalInfo = "";
         QString m_directoryLink = "";
         QString m_repoUri = "";
-        QStringList m_includedGemPaths = {};
+        QStringList m_includedGemUris = {};
         QDateTime m_lastUpdated;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp
index f816e86733..24a3e58ea2 100644
--- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp
@@ -8,6 +8,7 @@
 
 #include <GemRepo/GemRepoInspector.h>
 #include <GemRepo/GemRepoItemDelegate.h>
+#include <PythonBindingsInterface.h>
 
 #include <QFrame>
 #include <QLabel>
@@ -60,8 +61,10 @@ namespace O3DE::ProjectManager
 
         // Repo name and url link
         m_nameLabel->setText(m_model->GetName(modelIndex));
-        m_repoLinkLabel->setText(m_model->GetRepoUri(modelIndex));
-        m_repoLinkLabel->SetUrl(m_model->GetRepoUri(modelIndex));
+
+        const QString repoUri = m_model->GetRepoUri(modelIndex);
+        m_repoLinkLabel->setText(repoUri);
+        m_repoLinkLabel->SetUrl(repoUri);
 
         // Repo summary
         m_summaryLabel->setText(m_model->GetSummary(modelIndex));
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp
index 6189b6d8bf..436f84019a 100644
--- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp
@@ -41,7 +41,7 @@ namespace O3DE::ProjectManager
         item->setData(gemRepoInfo.m_lastUpdated, RoleLastUpdated);
         item->setData(gemRepoInfo.m_path, RolePath);
         item->setData(gemRepoInfo.m_additionalInfo, RoleAdditionalInfo);
-        item->setData(gemRepoInfo.m_includedGemPaths, RoleIncludedGems);
+        item->setData(gemRepoInfo.m_includedGemUris, RoleIncludedGems);
 
         appendRow(item);
 
@@ -98,7 +98,7 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RolePath).toString();
     }
 
-    QStringList GemRepoModel::GetIncludedGemPaths(const QModelIndex& modelIndex)
+    QStringList GemRepoModel::GetIncludedGemUris(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleIncludedGems).toStringList();
     }
@@ -118,23 +118,19 @@ namespace O3DE::ProjectManager
 
     QVector<GemInfo> GemRepoModel::GetIncludedGemInfos(const QModelIndex& modelIndex)
     {
-        QVector<GemInfo> allGemInfos;
-        QStringList repoGemPaths = GetIncludedGemPaths(modelIndex);
+        QString repoUri = GetRepoUri(modelIndex);
 
-        for (const QString& gemPath : repoGemPaths)
+        const AZ::Outcome<QVector<GemInfo>, AZStd::string>& gemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForRepo(repoUri);
+        if (gemInfosResult.IsSuccess())
         {
-            AZ::Outcome<GemInfo> gemInfoResult = PythonBindingsInterface::Get()->GetGemInfo(gemPath);
-            if (gemInfoResult.IsSuccess())
-            {
-                allGemInfos.append(gemInfoResult.GetValue());
-            }
-            else
-            {
-                QMessageBox::critical(nullptr, tr("Gem Not Found"), tr("Cannot find info for gem %1.").arg(gemPath));
-            }
+            return gemInfosResult.GetValue();
+        }
+        else
+        {
+            QMessageBox::critical(nullptr, tr("Gems not found"), tr("Cannot find info for gems from repo %1").arg(GetName(modelIndex)));
         }
 
-        return allGemInfos;
+        return QVector<GemInfo>();
     }
 
     bool GemRepoModel::IsEnabled(const QModelIndex& modelIndex)
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h
index 66fe972a95..68991a0509 100644
--- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h
@@ -39,7 +39,7 @@ namespace O3DE::ProjectManager
         static QDateTime GetLastUpdated(const QModelIndex& modelIndex);
         static QString GetPath(const QModelIndex& modelIndex);
 
-        static QStringList GetIncludedGemPaths(const QModelIndex& modelIndex);
+        static QStringList GetIncludedGemUris(const QModelIndex& modelIndex);
         static QVector<Tag> GetIncludedGemTags(const QModelIndex& modelIndex);
         static QVector<GemInfo> GetIncludedGemInfos(const QModelIndex& modelIndex);
 
diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp
index 794635a3e3..f62c30c280 100644
--- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp
@@ -75,7 +75,7 @@ namespace O3DE::ProjectManager
         // Select the first entry after everything got correctly sized
         QTimer::singleShot(200, [=]{
             QModelIndex firstModelIndex = m_gemRepoListView->model()->index(0,0);
-            m_gemRepoListView->selectionModel()->select(firstModelIndex, QItemSelectionModel::ClearAndSelect);
+            m_gemRepoListView->selectionModel()->setCurrentIndex(firstModelIndex, QItemSelectionModel::ClearAndSelect);
         });
     }
 
@@ -92,8 +92,9 @@ namespace O3DE::ProjectManager
                 return;
             }
 
-            bool addGemRepoResult = PythonBindingsInterface::Get()->AddGemRepo(repoUri);
-            if (addGemRepoResult)
+            AZ::Outcome < void,
+                AZStd::pair<AZStd::string, AZStd::string>> addGemRepoResult = PythonBindingsInterface::Get()->AddGemRepo(repoUri);
+            if (addGemRepoResult.IsSuccess())
             {
                 Reinit();
                 emit OnRefresh();
@@ -101,8 +102,21 @@ namespace O3DE::ProjectManager
             else
             {
                 QString failureMessage = tr("Failed to add gem repo: %1.").arg(repoUri);
-                QMessageBox::critical(this, tr("Operation failed"), failureMessage);
-                AZ_Error("Project Manger", false, failureMessage.toUtf8());
+                if (!addGemRepoResult.GetError().second.empty())
+                {
+                    QMessageBox addRepoError;
+                    addRepoError.setIcon(QMessageBox::Critical);
+                    addRepoError.setWindowTitle(failureMessage);
+                    addRepoError.setText(addGemRepoResult.GetError().first.c_str());
+                    addRepoError.setDetailedText(addGemRepoResult.GetError().second.c_str());
+                    addRepoError.exec();
+                }
+                else
+                {
+                    QMessageBox::critical(this, failureMessage, addGemRepoResult.GetError().first.c_str());
+                }
+
+                AZ_Error("Project Manager", false, failureMessage.toUtf8());
             }
         }
     }
diff --git a/Code/Tools/ProjectManager/Source/LinkWidget.cpp b/Code/Tools/ProjectManager/Source/LinkWidget.cpp
index 9c8c78ed37..f25e38db67 100644
--- a/Code/Tools/ProjectManager/Source/LinkWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/LinkWidget.cpp
@@ -7,6 +7,11 @@
  */
 
 #include <LinkWidget.h>
+#include <ExternalLinkDialog.h>
+#include <ProjectManagerSettings.h>
+
+#include <AzCore/Settings/SettingsRegistry.h>
+
 #include <QDesktopServices>
 #include <QEvent>
 #include <QMouseEvent>
@@ -26,7 +31,29 @@ namespace O3DE::ProjectManager
     {
         if (m_url.isValid())
         {
-            QDesktopServices::openUrl(m_url);
+            // Check if user request not to be shown external link warning dialog
+            bool skipDialog = false;
+            auto settingsRegistry = AZ::SettingsRegistry::Get();
+
+            if (settingsRegistry)
+            {
+                QString settingsKey = GetExternalLinkWarningKey();
+                settingsRegistry->Get(skipDialog, settingsKey.toStdString().c_str());
+            }
+
+            if (!skipDialog)
+            {
+                // Style does not apply if LinkLabel is parent so use parentWidget as parent instead
+                ExternalLinkDialog* linkDialog = new ExternalLinkDialog(m_url.toString(), parentWidget());
+                if (linkDialog->exec() == QDialog::Accepted)
+                {
+                    QDesktopServices::openUrl(m_url);
+                }
+            }
+            else
+            {
+                QDesktopServices::openUrl(m_url);
+            }
         }
 
         emit clicked();
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp
index 7981e9d758..ecb125ae4e 100644
--- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp
@@ -9,12 +9,14 @@
 #include <ProjectBuilderController.h>
 #include <ProjectBuilderWorker.h>
 #include <ProjectButtonWidget.h>
+#include <ProjectManagerSettings.h>
+
+#include <AzCore/Settings/SettingsRegistry.h>
 
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QUrl>
 
-
 namespace O3DE::ProjectManager
 {
     ProjectBuilderController::ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent)
@@ -27,6 +29,15 @@ namespace O3DE::ProjectManager
         m_worker = new ProjectBuilderWorker(m_projectInfo);
         m_worker->moveToThread(&m_workerThread);
 
+        auto settingsRegistry = AZ::SettingsRegistry::Get();
+        if (settingsRegistry)
+        {
+            // Remove key here in case Project Manager crashing while building that causes HandleResults to not be called
+            QString settingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName);
+            settingsRegistry->Remove(settingsKey.toStdString().c_str());
+            SaveProjectManagerSettings();
+        }
+
         connect(&m_workerThread, &QThread::finished, m_worker, &ProjectBuilderWorker::deleteLater);
         connect(&m_workerThread, &QThread::started, m_worker, &ProjectBuilderWorker::BuildProject);
         connect(m_worker, &ProjectBuilderWorker::Done, this, &ProjectBuilderController::HandleResults);
@@ -80,6 +91,8 @@ namespace O3DE::ProjectManager
 
     void ProjectBuilderController::HandleResults(const QString& result)
     {
+        QString settingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName);
+
         if (!result.isEmpty())
         {
             if (result.contains(tr("log")))
@@ -109,12 +122,26 @@ namespace O3DE::ProjectManager
                 emit NotifyBuildProject(m_projectInfo);
             }
 
+            auto settingsRegistry = AZ::SettingsRegistry::Get();
+            if (settingsRegistry)
+            {
+                settingsRegistry->Remove(settingsKey.toStdString().c_str());
+                SaveProjectManagerSettings();
+            }
+
             emit Done(false);
             return;
         }
         else
         {
             m_projectInfo.m_buildFailed = false;
+
+            auto settingsRegistry = AZ::SettingsRegistry::Get();
+            if (settingsRegistry)
+            {
+                settingsRegistry->Set(settingsKey.toStdString().c_str(), true);
+                SaveProjectManagerSettings();
+            }
         }
 
         emit Done(true);
diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp
index c6a6b20a1d..7ec691fd81 100644
--- a/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp
@@ -117,18 +117,16 @@ namespace O3DE::ProjectManager
         // Show some kind of progress with very approximate estimates
         UpdateProgress(++m_progressEstimate);
 
-        auto currentEnvironmentRequest = ProjectUtils::GetCommandLineProcessEnvironment();
+        auto currentEnvironmentRequest = ProjectUtils::SetupCommandLineProcessEnvironment();
         if (!currentEnvironmentRequest.IsSuccess())
         {
             QStringToAZTracePrint(currentEnvironmentRequest.GetError());
             return AZ::Failure(currentEnvironmentRequest.GetError());
         }
-        QProcessEnvironment currentEnvironment = currentEnvironmentRequest.GetValue();
 
         m_configProjectProcess = new QProcess(this);
         m_configProjectProcess->setProcessChannelMode(QProcess::MergedChannels);
         m_configProjectProcess->setWorkingDirectory(m_projectInfo.m_path);
-        m_configProjectProcess->setProcessEnvironment(currentEnvironment);
 
         auto cmakeGenerateArgumentsResult = ConstructCmakeGenerateProjectArguments(engineInfo.m_thirdPartyPath);
         if (!cmakeGenerateArgumentsResult.IsSuccess())
@@ -181,7 +179,6 @@ namespace O3DE::ProjectManager
         m_buildProjectProcess = new QProcess(this);
         m_buildProjectProcess->setProcessChannelMode(QProcess::MergedChannels);
         m_buildProjectProcess->setWorkingDirectory(m_projectInfo.m_path);
-        m_buildProjectProcess->setProcessEnvironment(currentEnvironment);
 
         auto cmakeBuildArgumentsResult = ConstructCmakeBuildCommandArguments();
         if (!cmakeBuildArgumentsResult.IsSuccess())
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
index c425c344e1..3225c14266 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
@@ -8,7 +8,11 @@
 
 #include <ProjectButtonWidget.h>
 #include <ProjectManagerDefs.h>
+#include <ProjectUtils.h>
+#include <ProjectManager_Traits_Platform.h>
 #include <AzQtComponents/Utilities/DesktopUtilities.h>
+#include <AzCore/IO/SystemFile.h>
+#include <AzCore/IO/Path/Path.h>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -23,6 +27,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QDesktopServices>
+#include <QMessageBox>
 
 namespace O3DE::ProjectManager
 {
@@ -198,6 +203,7 @@ namespace O3DE::ProjectManager
 
             QMenu* menu = new QMenu(this);
             menu->addAction(tr("Edit Project Settings..."), this, [this]() { emit EditProject(m_projectInfo.m_path); });
+            menu->addAction(tr("Configure Gems..."), this, [this]() { emit EditProjectGems(m_projectInfo.m_path); });
             menu->addAction(tr("Build"), this, [this]() { emit BuildProject(m_projectInfo); });
             menu->addAction(tr("Open CMake GUI..."), this, [this]() { emit OpenCMakeGUI(m_projectInfo); });
             menu->addSeparator();
@@ -205,6 +211,27 @@ namespace O3DE::ProjectManager
             { 
                 AzQtComponents::ShowFileOnDesktop(m_projectInfo.m_path);
             });
+
+#if AZ_TRAIT_PROJECT_MANAGER_CREATE_DESKTOP_SHORTCUT
+            menu->addAction(tr("Create Editor desktop shortcut..."), this, [this]()
+            {
+                AZ::IO::FixedMaxPath editorExecutablePath = ProjectUtils::GetEditorExecutablePath(m_projectInfo.m_path.toUtf8().constData());
+
+                const QString shortcutName = QString("%1 Editor").arg(m_projectInfo.m_displayName); 
+                const QString arg = QString("--regset=\"/Amazon/AzCore/Bootstrap/project_path=%1\"").arg(m_projectInfo.m_path);
+
+                auto result = ProjectUtils::CreateDesktopShortcut(shortcutName, editorExecutablePath.c_str(), { arg });
+                if(result.IsSuccess())
+                {
+                    QMessageBox::information(this, tr("Desktop Shortcut Created"), result.GetValue());
+                }
+                else
+                {
+                    QMessageBox::critical(this, tr("Failed to create shortcut"), result.GetError());
+                }
+            });
+#endif // AZ_TRAIT_PROJECT_MANAGER_CREATE_DESKTOP_SHORTCUT
+
             menu->addSeparator();
             menu->addAction(tr("Duplicate"), this, [this]() { emit CopyProject(m_projectInfo); });
             menu->addSeparator();
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
index 5e81dfc2d9..ccb644c458 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
@@ -95,6 +95,7 @@ namespace O3DE::ProjectManager
     signals:
         void OpenProject(const QString& projectName);
         void EditProject(const QString& projectName);
+        void EditProjectGems(const QString& projectName);
         void CopyProject(const ProjectInfo& projectInfo);
         void RemoveProject(const QString& projectName);
         void DeleteProject(const QString& projectName);
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp
new file mode 100644
index 0000000000..66480aab3e
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectManagerSettings.h>
+
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
+#include <AzCore/IO/ByteContainerStream.h>
+#include <AzCore/Utils/Utils.h>
+
+namespace O3DE::ProjectManager
+{
+    void SaveProjectManagerSettings()
+    {
+        auto settingsRegistry = AZ::SettingsRegistry::Get();
+        AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings;
+        dumperSettings.m_prettifyOutput = true;
+        dumperSettings.m_jsonPointerPrefix = ProjectManagerKeyPrefix;
+
+        AZStd::string stringBuffer;
+        AZ::IO::ByteContainerStream stringStream(&stringBuffer);
+        if (!AZ::SettingsRegistryMergeUtils::DumpSettingsRegistryToStream(
+                *settingsRegistry, ProjectManagerKeyPrefix, stringStream, dumperSettings))
+        {
+            AZ_Warning("ProjectManager", false, "Could not save Project Manager settings to stream");
+            return;
+        }
+
+        AZ::IO::FixedMaxPath o3deUserPath = AZ::Utils::GetO3deManifestDirectory();
+        o3deUserPath /= AZ::SettingsRegistryInterface::RegistryFolder;
+        o3deUserPath /= "ProjectManager.setreg";
+
+        bool saved = false;
+        constexpr auto configurationMode =
+            AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
+
+        AZ::IO::SystemFile outputFile;
+        if (outputFile.Open(o3deUserPath.c_str(), configurationMode))
+        {
+            saved = outputFile.Write(stringBuffer.data(), stringBuffer.size()) == stringBuffer.size();
+        }
+
+        AZ_Warning("ProjectManager", saved, "Unable to save Project Manager registry file to path: %s", o3deUserPath.c_str());
+    }
+
+    QString GetProjectBuiltSuccessfullyKey(const QString& projectName)
+    {
+        return QString("%1/Projects/%2/BuiltSuccessfully").arg(ProjectManagerKeyPrefix).arg(projectName);
+    }
+
+    QString GetExternalLinkWarningKey()
+    {
+        return QString("%1/SkipExternalLinkWarning").arg(ProjectManagerKeyPrefix);
+    }
+}
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h
new file mode 100644
index 0000000000..93cfbc5ceb
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QString>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    static constexpr char ProjectManagerKeyPrefix[] = "/O3DE/ProjectManager";
+
+    void SaveProjectManagerSettings();
+    QString GetProjectBuiltSuccessfullyKey(const QString& projectName);
+    QString GetExternalLinkWarningKey();
+}
diff --git a/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp
index 88ae3d6319..d4ac43d655 100644
--- a/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp
@@ -19,6 +19,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QStandardPaths>
+#include <QScrollArea>
 
 namespace O3DE::ProjectManager
 {
@@ -33,11 +34,23 @@ namespace O3DE::ProjectManager
         // 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");
-        m_verticalLayout = new QVBoxLayout();
 
-        // you cannot remove content margins in qss
-        m_verticalLayout->setContentsMargins(0, 0, 0, 0);
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setMargin(0);
+        vLayout->setAlignment(Qt::AlignTop);
+        projectSettingsFrame->setLayout(vLayout);
+
+        QScrollArea* scrollArea = new QScrollArea(this);
+        scrollArea->setWidgetResizable(true);
+        vLayout->addWidget(scrollArea);
+
+        QWidget* scrollWidget = new QWidget(this);
+        scrollArea->setWidget(scrollWidget);
+
+        m_verticalLayout = new QVBoxLayout();
+        m_verticalLayout->setMargin(0);
         m_verticalLayout->setAlignment(Qt::AlignTop);
+        scrollWidget->setLayout(m_verticalLayout);
 
         m_projectName = new FormLineEditWidget(tr("Project name"), "", this);
         connect(m_projectName->lineEdit(), &QLineEdit::textChanged, this, &ProjectSettingsScreen::OnProjectNameUpdated);
diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
index bb2bcd070e..b7748d8aa2 100644
--- a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp
@@ -520,12 +520,10 @@ namespace O3DE::ProjectManager
         AZ::Outcome<QString, QString> ExecuteCommandResultModalDialog(
             const QString& cmd,
             const QStringList& arguments,
-            const QProcessEnvironment& processEnv,
             const QString& title)
         {
             QString resultOutput;
             QProcess execProcess;
-            execProcess.setProcessEnvironment(processEnv);
             execProcess.setProcessChannelMode(QProcess::MergedChannels);
 
             QProgressDialog dialog(title, QObject::tr("Cancel"), /*minimum=*/0, /*maximum=*/0);
@@ -611,11 +609,9 @@ namespace O3DE::ProjectManager
         AZ::Outcome<QString, QString> ExecuteCommandResult(
             const QString& cmd,
             const QStringList& arguments,
-            const QProcessEnvironment& processEnv,
             int commandTimeoutSeconds /*= ProjectCommandLineTimeoutSeconds*/)
         {
             QProcess execProcess;
-            execProcess.setProcessEnvironment(processEnv);
             execProcess.setProcessChannelMode(QProcess::MergedChannels);
             execProcess.start(cmd, arguments);
             if (!execProcess.waitForStarted())
@@ -628,11 +624,11 @@ namespace O3DE::ProjectManager
                 return AZ::Failure(QObject::tr("Process for command '%1' timed out at %2 seconds").arg(cmd).arg(commandTimeoutSeconds));
             }
             int resultCode = execProcess.exitCode();
+            QString resultOutput = execProcess.readAllStandardOutput();
             if (resultCode != 0)
             {
-                return AZ::Failure(QObject::tr("Process for command '%1' failed (result code %2").arg(cmd).arg(resultCode));
+                return AZ::Failure(QObject::tr("Process for command '%1' failed (result code %2) %3").arg(cmd).arg(resultCode).arg(resultOutput));
             }
-            QString resultOutput = execProcess.readAllStandardOutput();
             return AZ::Success(resultOutput);
         }
 
diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.h b/Code/Tools/ProjectManager/Source/ProjectUtils.h
index 890d50d2de..713803c20b 100644
--- a/Code/Tools/ProjectManager/Source/ProjectUtils.h
+++ b/Code/Tools/ProjectManager/Source/ProjectUtils.h
@@ -47,7 +47,6 @@ namespace O3DE::ProjectManager
         AZ::Outcome<QString, QString> ExecuteCommandResult(
             const QString& cmd,
             const QStringList& arguments,
-            const QProcessEnvironment& processEnv,
             int commandTimeoutSeconds = ProjectCommandLineTimeoutSeconds);
 
         /**
@@ -61,15 +60,43 @@ namespace O3DE::ProjectManager
         AZ::Outcome<QString, QString> ExecuteCommandResultModalDialog(
             const QString& cmd,
             const QStringList& arguments,
-            const QProcessEnvironment& processEnv,
             const QString& title);
 
-        AZ::Outcome<QProcessEnvironment, QString> GetCommandLineProcessEnvironment();
+        AZ::Outcome<void, QString> SetupCommandLineProcessEnvironment();
         AZ::Outcome<QString, QString> GetProjectBuildPath(const QString& projectPath);
         AZ::Outcome<void, QString> OpenCMakeGUI(const QString& projectPath);
         AZ::Outcome<QString, QString> RunGetPythonScript(const QString& enginePath);
+
+        /**
+         * Create a desktop shortcut.
+         * @param filename the name of the desktop shorcut file 
+         * @param target the path to the target to run 
+         * @param arguments the argument list to provide to the target
+         * @return AZ::Outcome with the command result on success
+         */
+        AZ::Outcome<QString, QString> CreateDesktopShortcut(const QString& filename, const QString& targetPath, const QStringList& arguments);
         
-        AZ::IO::FixedMaxPath GetEditorDirectory();
+        /**
+         * Lookup the location of an Editor executable executable that can be used with the
+         * supplied project path
+         * First the method attempts to locate a build directory with the project path
+         * via querying the <project-path>/user/Registry/Platform/<platform>/build_path.setreg
+         * Once that is done a path is formed to locate the Editor executable within the that build
+         * directory.
+         * Two paths will checked for the existence of an Editor
+         * - "<project-build-directory>/bin/$<CONFIG>/Editor"
+         * - "<project-build-directory>/bin/<platform>/$<CONFIG>/Editor"
+         * Where <platform> is the current platform the O3DE executable is running on and $<CONFIG> is the
+         * current build configuration the O3DE executable
+         *
+         * If neiether of the above paths contain an Editor application, then a path to the Editor
+         * is formed by combinding the O3DE executable directory with the filename of Editor
+         * - "<executable-directory>/Editor"
+         *
+         * @param projectPath Path to the root of the project
+         * @return path of the Editor Executable if found or an empty path if not
+         */
+        AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath);
 
     } // namespace ProjectUtils
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
index f86a689e59..acd753a1cb 100644
--- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
@@ -14,6 +14,7 @@
 #include <ProjectUtils.h>
 #include <ProjectBuilderController.h>
 #include <ScreensCtrl.h>
+#include <ProjectManagerSettings.h>
 
 #include <AzQtComponents/Components/FlowLayout.h>
 #include <AzCore/Platform.h>
@@ -181,6 +182,7 @@ namespace O3DE::ProjectManager
 
         connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsScreen::HandleOpenProject);
         connect(projectButton, &ProjectButton::EditProject, this, &ProjectsScreen::HandleEditProject);
+        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);
@@ -269,17 +271,36 @@ namespace O3DE::ProjectManager
             // Add any missing project buttons and restore buttons to default state
             for (const ProjectInfo& project : projectsVector)
             {
+                ProjectButton* currentButton = nullptr;
                 if (!m_projectButtons.contains(QDir::toNativeSeparators(project.m_path)))
                 {
-                    m_projectButtons.insert(QDir::toNativeSeparators(project.m_path), CreateProjectButton(project));
+                    currentButton = CreateProjectButton(project);
+                    m_projectButtons.insert(QDir::toNativeSeparators(project.m_path), currentButton);
                 }
                 else
                 {
                     auto projectButtonIter = m_projectButtons.find(QDir::toNativeSeparators(project.m_path));
                     if (projectButtonIter != m_projectButtons.end())
                     {
-                        projectButtonIter.value()->RestoreDefaultState();
-                        m_projectsFlowLayout->addWidget(projectButtonIter.value());
+                        currentButton = projectButtonIter.value();
+                        currentButton->RestoreDefaultState();
+                        m_projectsFlowLayout->addWidget(currentButton);
+                    }
+                }
+
+                // Check whether project manager has successfully built the project
+                if (currentButton)
+                {
+                    auto settingsRegistry = AZ::SettingsRegistry::Get();
+                    bool projectBuiltSuccessfully = false;
+                    if (settingsRegistry)
+                    {
+                        QString settingsKey = GetProjectBuiltSuccessfullyKey(project.m_projectName);
+                        settingsRegistry->Get(projectBuiltSuccessfully, settingsKey.toStdString().c_str());
+                    }
+                    if (!projectBuiltSuccessfully)
+                    {
+                        currentButton->ShowBuildRequired();
                     }
                 }
             }
@@ -386,18 +407,26 @@ namespace O3DE::ProjectManager
             emit ChangeScreenRequest(ProjectManagerScreen::Projects);
         }
     }
+
     void ProjectsScreen::HandleOpenProject(const QString& projectPath)
     {
         if (!projectPath.isEmpty())
         {
             if (!WarnIfInBuildQueue(projectPath))
             {
-                AZ::IO::FixedMaxPath executableDirectory = ProjectUtils::GetEditorDirectory();
-                AZStd::string executableFilename = "Editor";
-                AZ::IO::FixedMaxPath editorExecutablePath = executableDirectory / (executableFilename + AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+                AZ::IO::FixedMaxPath fixedProjectPath = projectPath.toUtf8().constData();
+                AZ::IO::FixedMaxPath editorExecutablePath = ProjectUtils::GetEditorExecutablePath(fixedProjectPath);
+                if (editorExecutablePath.empty())
+                {
+                    AZ_Error("ProjectManager", false, "Failed to locate editor");
+                    QMessageBox::critical(
+                        this, tr("Error"), tr("Failed to locate the Editor, please verify that it is built."));
+                    return;
+                }
+
                 auto cmdPath = AZ::IO::FixedMaxPathString::format(
                     "%s --regset=\"/Amazon/AzCore/Bootstrap/project_path=%s\"", editorExecutablePath.c_str(),
-                    projectPath.toStdString().c_str());
+                    fixedProjectPath.c_str());
 
                 AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
                 processLaunchInfo.m_commandlineParameters = cmdPath;
@@ -448,6 +477,14 @@ namespace O3DE::ProjectManager
             emit ChangeScreenRequest(ProjectManagerScreen::UpdateProject);
         }
     }
+    void ProjectsScreen::HandleEditProjectGems(const QString& projectPath)
+    {
+        if (!WarnIfInBuildQueue(projectPath))
+        {
+            emit NotifyCurrentProject(projectPath);
+            emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);
+        }
+    }
     void ProjectsScreen::HandleCopyProject(const ProjectInfo& projectInfo)
     {
         if (!WarnIfInBuildQueue(projectInfo.m_path))
diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.h b/Code/Tools/ProjectManager/Source/ProjectsScreen.h
index 859f8d0eae..c690621fb6 100644
--- a/Code/Tools/ProjectManager/Source/ProjectsScreen.h
+++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.h
@@ -46,6 +46,7 @@ namespace O3DE::ProjectManager
         void HandleAddProjectButton();
         void HandleOpenProject(const QString& projectPath);
         void HandleEditProject(const QString& projectPath);
+        void HandleEditProjectGems(const QString& projectPath);
         void HandleCopyProject(const ProjectInfo& projectInfo);
         void HandleRemoveProject(const QString& projectPath);
         void HandleDeleteProject(const QString& projectPath);
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 4a73b39ea0..12f97e6d2e 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -23,6 +23,7 @@
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/std/string/conversions.h>
+#include <AzCore/std/numeric.h>
 #include <AzCore/StringFunc/StringFunc.h>
 
 #include <QDir>
@@ -210,6 +211,16 @@ namespace RedirectOutput
         });
 
         SetRedirection("stderr", g_redirect_stderr_saved, g_redirect_stderr, []([[maybe_unused]] const char* msg) {
+            AZStd::string lastPythonError = msg;
+            constexpr const char* pythonErrorPrefix = "ERROR:root:";
+            constexpr size_t lengthOfErrorPrefix = AZStd::char_traits<char>::length(pythonErrorPrefix);
+            auto errorPrefix = lastPythonError.find(pythonErrorPrefix);
+            if (errorPrefix != AZStd::string::npos)
+            {
+                lastPythonError.erase(errorPrefix, lengthOfErrorPrefix);
+            }
+            O3DE::ProjectManager::PythonBindingsInterface::Get()->AddErrorString(lastPythonError);
+
             AZ_TracePrintf("Python", msg);
         });
 
@@ -376,6 +387,8 @@ namespace O3DE::ProjectManager
         pybind11::gil_scoped_release release;
         pybind11::gil_scoped_acquire acquire;
 
+        ClearErrorStrings();
+
         try
         {
             executionCallback();
@@ -515,7 +528,11 @@ namespace O3DE::ProjectManager
             auto pyProjectPath = QString_To_Py_Path(projectPath);
             for (auto path : m_manifest.attr("get_all_gems")(pyProjectPath))
             {
-                gems.push_back(GemInfoFromPath(path, pyProjectPath));
+                GemInfo gemInfo = GemInfoFromPath(path, pyProjectPath);
+                // Mark as downloaded because this gem was registered with an existing directory
+                gemInfo.m_downloadStatus = GemInfo::DownloadStatus::Downloaded;
+
+                gems.push_back(AZStd::move(gemInfo));
             }
         });
         if (!result.IsSuccess())
@@ -560,7 +577,7 @@ namespace O3DE::ProjectManager
         return AZ::Success(AZStd::move(gemNames));
     }
 
-    AZ::Outcome<void, AZStd::string> PythonBindings::RegisterGem(const QString& gemPath, const QString& projectPath)
+    AZ::Outcome<void, AZStd::string> PythonBindings::GemRegistration(const QString& gemPath, const QString& projectPath, bool remove)
     {
         bool registrationResult = false;
         auto result = ExecuteWithLockErrorHandling(
@@ -582,7 +599,8 @@ namespace O3DE::ProjectManager
                 pybind11::none(), // default_restricted_folder
                 pybind11::none(), // default_third_party_folder
                 pybind11::none(), // external_subdir_engine_path
-                externalProjectPath // external_subdir_project_path
+                externalProjectPath, // external_subdir_project_path
+                remove            // remove
                 );
 
             // Returns an exit code so boolify it then invert result
@@ -595,12 +613,23 @@ namespace O3DE::ProjectManager
         }
         else if (!registrationResult)
         {
-            return AZ::Failure<AZStd::string>(AZStd::string::format("Failed to register gem path %s", gemPath.toUtf8().constData()));
+            return AZ::Failure<AZStd::string>(AZStd::string::format(
+                "Failed to %s gem path %s", remove ? "unregister" : "register", gemPath.toUtf8().constData()));
         }
 
         return AZ::Success();
     }
 
+    AZ::Outcome<void, AZStd::string> PythonBindings::RegisterGem(const QString& gemPath, const QString& projectPath)
+    {
+        return GemRegistration(gemPath, projectPath);
+    }
+
+    AZ::Outcome<void, AZStd::string> PythonBindings::UnregisterGem(const QString& gemPath, const QString& projectPath)
+    {
+        return GemRegistration(gemPath, projectPath, /*remove*/true);
+    }
+
     bool PythonBindings::AddProject(const QString& path)
     {
         bool registrationResult = false;
@@ -715,6 +744,7 @@ namespace O3DE::ProjectManager
                 gemInfo.m_documentationLink = Py_To_String_Optional(data, "documentation_url", "");
                 gemInfo.m_licenseText = Py_To_String_Optional(data, "license", "Unspecified License");
                 gemInfo.m_licenseLink = Py_To_String_Optional(data, "license_url", "");
+                gemInfo.m_repoUri = Py_To_String_Optional(data, "repo_uri", "");
 
                 if (gemInfo.m_creator.contains("Open 3D Engine"))
                 {
@@ -728,6 +758,11 @@ namespace O3DE::ProjectManager
                 {
                     gemInfo.m_gemOrigin = GemInfo::GemOrigin::Remote;
                 }
+                // If no origin was provided this cannot be remote and would be specified if O3DE so it should be local
+                else
+                {
+                    gemInfo.m_gemOrigin = GemInfo::GemOrigin::Local;
+                }
 
                 // As long Base Open3DEngine gems are installed before first startup non-remote gems will be downloaded
                 if (gemInfo.m_gemOrigin != GemInfo::GemOrigin::Remote)
@@ -1029,7 +1064,7 @@ namespace O3DE::ProjectManager
         return result && refreshResult;
     }
 
-    bool PythonBindings::AddGemRepo(const QString& repoUri)
+    AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> PythonBindings::AddGemRepo(const QString& repoUri)
     {
         bool registrationResult = false;
         bool result = ExecuteWithLock(
@@ -1043,7 +1078,12 @@ namespace O3DE::ProjectManager
                 registrationResult = !pythonRegistrationResult.cast<bool>();
             });
 
-        return result && registrationResult;
+        if (!result || !registrationResult)
+        {
+            return AZ::Failure<AZStd::pair<AZStd::string, AZStd::string>>(GetSimpleDetailedErrorPair());
+        }
+
+        return AZ::Success();
     }
 
     bool PythonBindings::RemoveGemRepo(const QString& repoUri)
@@ -1113,11 +1153,11 @@ namespace O3DE::ProjectManager
                     gemRepoInfo.m_isEnabled = false;
                 }
 
-                if (data.contains("gem_paths"))
+                if (data.contains("gems"))
                 {
-                    for (auto gemPath : data["gem_paths"])
+                    for (auto gemPath : data["gems"])
                     {
-                        gemRepoInfo.m_includedGemPaths.push_back(Py_To_String(gemPath));
+                        gemRepoInfo.m_includedGemUris.push_back(Py_To_String(gemPath));
                     }
                 }
             }
@@ -1166,49 +1206,35 @@ namespace O3DE::ProjectManager
         return AZ::Success(AZStd::move(gemRepos));
     }
 
-    AZ::Outcome<void, AZStd::string> PythonBindings::DownloadGem(const QString& gemName, std::function<void(int)> gemProgressCallback)
+    AZ::Outcome<QVector<GemInfo>, AZStd::string> PythonBindings::GetGemInfosForRepo(const QString& repoUri)
     {
-        // This process is currently limited to download a single gem at a time.
-        bool downloadSucceeded = false;
-
-        m_requestCancelDownload = false;
-        auto result = ExecuteWithLockErrorHandling(
+        QVector<GemInfo> gemInfos;
+        AZ::Outcome<void, AZStd::string> result = ExecuteWithLockErrorHandling(
             [&]
             {
-                auto downloadResult = m_download.attr("download_gem")(
-                    QString_To_Py_String(gemName), // gem name
-                    pybind11::none(), // destination path
-                    false, // skip auto register
-                    pybind11::cpp_function(
-                        [this, gemProgressCallback](int progress)
-                        {
-                            gemProgressCallback(progress);
+                auto pyUri = QString_To_Py_String(repoUri);
+                auto gemPaths = m_repo.attr("get_gem_json_paths_from_cached_repo")(pyUri);
 
-                            return m_requestCancelDownload;
-                        }) // Callback for download progress and cancelling
-                    );
-                downloadSucceeded = (downloadResult.cast<int>() == 0);
+                if (pybind11::isinstance<pybind11::set>(gemPaths))
+                {
+                    for (auto path : gemPaths)
+                    {
+                        GemInfo gemInfo = GemInfoFromPath(path, pybind11::none());
+                        gemInfo.m_downloadStatus = GemInfo::DownloadStatus::NotDownloaded;
+                        gemInfos.push_back(gemInfo);
+                    }
+                }
             });
 
-
         if (!result.IsSuccess())
         {
-            return result;
-        }
-        else if (!downloadSucceeded)
-        {
-            return AZ::Failure<AZStd::string>("Failed to download gem.");
+            return AZ::Failure(result.GetError());
         }
 
-        return AZ::Success();
+        return AZ::Success(AZStd::move(gemInfos));
     }
 
-    void PythonBindings::CancelDownload()
-    {
-        m_requestCancelDownload = true;
-    }
-
-    AZ::Outcome<QVector<GemInfo>, AZStd::string> PythonBindings::GetAllGemRepoGemsInfos()
+    AZ::Outcome<QVector<GemInfo>, AZStd::string> PythonBindings::GetGemInfosForAllRepos()
     {
         QVector<GemInfo> gemInfos;
         AZ::Outcome<void, AZStd::string> result = ExecuteWithLockErrorHandling(
@@ -1234,4 +1260,84 @@ namespace O3DE::ProjectManager
 
         return AZ::Success(AZStd::move(gemInfos));
     }
+
+    AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> PythonBindings::DownloadGem(
+        const QString& gemName, std::function<void(int, int)> gemProgressCallback, bool force)
+    {
+        // This process is currently limited to download a single gem at a time.
+        bool downloadSucceeded = false;
+
+        m_requestCancelDownload = false;
+        auto result = ExecuteWithLockErrorHandling(
+            [&]
+            {
+                auto downloadResult = m_download.attr("download_gem")(
+                    QString_To_Py_String(gemName), // gem name
+                    pybind11::none(), // destination path
+                    false, // skip auto register
+                    force, // force overwrite
+                    pybind11::cpp_function(
+                        [this, gemProgressCallback](int bytesDownloaded, int totalBytes)
+                        {
+                            gemProgressCallback(bytesDownloaded, totalBytes);
+
+                            return m_requestCancelDownload;
+                        }) // Callback for download progress and cancelling
+                    );
+                downloadSucceeded = (downloadResult.cast<int>() == 0);
+            });
+
+
+        if (!result.IsSuccess())
+        {
+            AZStd::pair<AZStd::string, AZStd::string> pythonRunError(result.GetError(), result.GetError());
+            return AZ::Failure<AZStd::pair<AZStd::string, AZStd::string>>(AZStd::move(pythonRunError));
+        }
+        else if (!downloadSucceeded)
+        {
+            return AZ::Failure<AZStd::pair<AZStd::string, AZStd::string>>(GetSimpleDetailedErrorPair());
+        }
+
+        return AZ::Success();
+    }
+
+    void PythonBindings::CancelDownload()
+    {
+        m_requestCancelDownload = true;
+    }
+
+    bool PythonBindings::IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated)
+    {
+        bool updateAvaliableResult = false;
+        bool result = ExecuteWithLock(
+            [&]
+            {
+                auto pyGemName = QString_To_Py_String(gemName);
+                auto pyLastUpdated = QString_To_Py_String(lastUpdated);
+                auto pythonUpdateAvaliableResult = m_download.attr("is_o3de_gem_update_available")(pyGemName, pyLastUpdated);
+
+                updateAvaliableResult = pythonUpdateAvaliableResult.cast<bool>();
+            });
+
+        return result && updateAvaliableResult;
+    }
+
+    AZStd::pair<AZStd::string, AZStd::string> PythonBindings::GetSimpleDetailedErrorPair()
+    {
+        AZStd::string detailedString = m_pythonErrorStrings.size() == 1
+            ? ""
+            : AZStd::accumulate(m_pythonErrorStrings.begin(), m_pythonErrorStrings.end(), AZStd::string(""));
+
+        return AZStd::pair<AZStd::string, AZStd::string>(m_pythonErrorStrings.front(), detailedString);
+    }
+
+    void PythonBindings::AddErrorString(AZStd::string errorString)
+    {
+        m_pythonErrorStrings.push_back(errorString);
+    }
+
+    void PythonBindings::ClearErrorStrings()
+    {
+        m_pythonErrorStrings.clear();
+    }
 }
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h
index 4375d56d02..48841b6565 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.h
@@ -43,6 +43,7 @@ namespace O3DE::ProjectManager
         AZ::Outcome<QVector<GemInfo>, AZStd::string> GetAllGemInfos(const QString& projectPath) override;
         AZ::Outcome<QVector<AZStd::string>, AZStd::string> GetEnabledGemNames(const QString& projectPath) override;
         AZ::Outcome<void, AZStd::string> RegisterGem(const QString& gemPath, const QString& projectPath = {}) override;
+        AZ::Outcome<void, AZStd::string> UnregisterGem(const QString& gemPath, const QString& projectPath = {}) override;
 
         // Project
         AZ::Outcome<ProjectInfo> CreateProject(const QString& projectTemplatePath, const ProjectInfo& projectInfo) override;
@@ -61,12 +62,18 @@ namespace O3DE::ProjectManager
         // Gem Repos
         AZ::Outcome<void, AZStd::string> RefreshGemRepo(const QString& repoUri) override;
         bool RefreshAllGemRepos() override;
-        bool AddGemRepo(const QString& repoUri) override;
+        AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> AddGemRepo(const QString& repoUri) override;
         bool RemoveGemRepo(const QString& repoUri) override;
         AZ::Outcome<QVector<GemRepoInfo>, AZStd::string> GetAllGemRepoInfos() override;
-        AZ::Outcome<void, AZStd::string> DownloadGem(const QString& gemName, std::function<void(int)> gemProgressCallback) override;
+        AZ::Outcome<QVector<GemInfo>, AZStd::string> GetGemInfosForRepo(const QString& repoUri) override;
+        AZ::Outcome<QVector<GemInfo>, AZStd::string> GetGemInfosForAllRepos() override;
+        AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> DownloadGem(
+            const QString& gemName, std::function<void(int, int)> gemProgressCallback, bool force = false) override;
         void CancelDownload() override;
-        AZ::Outcome<QVector<GemInfo>, AZStd::string> GetAllGemRepoGemsInfos() override;
+        bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) override;
+
+        void AddErrorString(AZStd::string errorString) override;
+        void ClearErrorStrings() override;
 
     private:
         AZ_DISABLE_COPY_MOVE(PythonBindings);
@@ -77,8 +84,10 @@ namespace O3DE::ProjectManager
         GemRepoInfo GetGemRepoInfo(pybind11::handle repoUri);
         ProjectInfo ProjectInfoFromPath(pybind11::handle path);
         ProjectTemplateInfo ProjectTemplateInfoFromPath(pybind11::handle path, pybind11::handle pyProjectPath);
+        AZ::Outcome<void, AZStd::string> GemRegistration(const QString& gemPath, const QString& projectPath, bool remove = false);
         bool RegisterThisEngine();
         bool StopPython();
+        AZStd::pair<AZStd::string, AZStd::string> GetSimpleDetailedErrorPair();
 
 
         bool m_pythonStarted = false;
@@ -98,5 +107,6 @@ namespace O3DE::ProjectManager
         pybind11::handle m_pathlib;
 
         bool m_requestCancelDownload = false;
+        AZStd::vector<AZStd::string> m_pythonErrorStrings;
     };
 }
diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
index 1134804f1f..c7c8af2ce1 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
+++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h
@@ -94,11 +94,19 @@ namespace O3DE::ProjectManager
         /**
          * Registers the gem to the specified project, or to the o3de_manifest.json if no project path is given
          * @param gemPath the path to the gem
-         * @param projectPath the path to the project. If empty, will register the external path in o3de_manifest.json 
+         * @param projectPath the path to the project. If empty, will register the external path in o3de_manifest.json
          * @return An outcome with the success flag as well as an error message in case of a failure.
          */
         virtual AZ::Outcome<void, AZStd::string> RegisterGem(const QString& gemPath, const QString& projectPath = {}) = 0;
 
+        /**
+         * Unregisters the gem from the specified project, or from the o3de_manifest.json if no project path is given
+         * @param gemPath the path to the gem
+         * @param projectPath the path to the project. If empty, will unregister the external path in o3de_manifest.json
+         * @return An outcome with the success flag as well as an error message in case of a failure.
+         */
+        virtual AZ::Outcome<void, AZStd::string> UnregisterGem(const QString& gemPath, const QString& projectPath = {}) = 0;
+
 
         // Projects 
 
@@ -192,9 +200,9 @@ namespace O3DE::ProjectManager
         /**
          * Registers this gem repo with the current engine.
          * @param repoUri the absolute filesystem path or url to the gem repo.
-         * @return true on success, false on failure.
+         * @return an outcome with a pair of string error and detailed messages on failure.
          */
-        virtual bool AddGemRepo(const QString& repoUri) = 0;
+        virtual AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> AddGemRepo(const QString& repoUri) = 0;
 
         /**
          * Unregisters this gem repo with the current engine.
@@ -210,23 +218,51 @@ namespace O3DE::ProjectManager
         virtual AZ::Outcome<QVector<GemRepoInfo>, AZStd::string> GetAllGemRepoInfos() = 0;
 
         /**
-         * Downloads and registers a Gem.
-         * @param gemName the name of the Gem to download
-         * @param gemProgressCallback a callback function that is called with an int percentage download value
-         * @return an outcome with a string error message on failure.
+         * Gathers all gem infos from the provided repo
+         * @param repoUri the absolute filesystem path or url to the gem repo.
+         * @return A list of gem infos.
          */
-        virtual AZ::Outcome<void, AZStd::string> DownloadGem(const QString& gemName, std::function<void(int)> gemProgressCallback) = 0;
-
-        /**
-        * Cancels the current download.
-        */
-        virtual void CancelDownload() = 0;
+        virtual AZ::Outcome<QVector<GemInfo>, AZStd::string> GetGemInfosForRepo(const QString& repoUri) = 0;
 
         /**
          * Gathers all gem infos for all gems registered from repos.
          * @return A list of gem infos.
          */
-        virtual AZ::Outcome<QVector<GemInfo>, AZStd::string> GetAllGemRepoGemsInfos() = 0;
+        virtual AZ::Outcome<QVector<GemInfo>, AZStd::string> GetGemInfosForAllRepos() = 0;
+
+        /**
+         * Downloads and registers a Gem.
+         * @param gemName the name of the Gem to download.
+         * @param gemProgressCallback a callback function that is called with an int percentage download value.
+         * @param force should we forcibly overwrite the old version of the gem.
+         * @return an outcome with a pair of string error and detailed messages on failure.
+         */
+        virtual AZ::Outcome<void, AZStd::pair<AZStd::string, AZStd::string>> DownloadGem(
+            const QString& gemName, std::function<void(int, int)> gemProgressCallback, bool force = false) = 0;
+
+        /**
+         * Cancels the current download.
+         */
+        virtual void CancelDownload() = 0;
+
+        /**
+         * Checks if there is an update avaliable for a gem on a repo.
+         * @param gemName the name of the gem to check.
+         * @param lastUpdated last time the gem was update.
+         * @return true if update is avaliable, false if not.
+         */
+        virtual bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) = 0;
+
+        /**
+         * Add an error string to be returned when the current python call is complete.
+         * @param The error string to be displayed.
+         */
+        virtual void AddErrorString(AZStd::string errorString) = 0;
+
+        /**
+         * Clears the current list of error strings.
+         */
+        virtual void ClearErrorStrings() = 0;
     };
 
     using PythonBindingsInterface = AZ::Interface<IPythonBindings>;
diff --git a/Code/Tools/ProjectManager/Source/ScreenWidget.h b/Code/Tools/ProjectManager/Source/ScreenWidget.h
index 148dcdb8c8..a84fb0be80 100644
--- a/Code/Tools/ProjectManager/Source/ScreenWidget.h
+++ b/Code/Tools/ProjectManager/Source/ScreenWidget.h
@@ -47,9 +47,9 @@ namespace O3DE::ProjectManager
             return tr("Missing");
         }
 
-        virtual bool ContainsScreen([[maybe_unused]] ProjectManagerScreen screen)
+        virtual bool ContainsScreen(ProjectManagerScreen screen)
         {
-            return false;
+            return GetScreenEnum() == screen;
         }
         virtual void GoToScreen([[maybe_unused]] ProjectManagerScreen screen)
         {
@@ -58,7 +58,6 @@ namespace O3DE::ProjectManager
         //! Notify this screen it is the current screen 
         virtual void NotifyCurrentScreen()
         {
-
         }
 
     signals:
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
index fb16484961..36d78ed2ac 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
@@ -15,6 +15,9 @@
 #include <UpdateProjectCtrl.h>
 #include <UpdateProjectSettingsScreen.h>
 #include <ProjectUtils.h>
+#include <DownloadController.h>
+#include <ProjectManagerSettings.h>
+#include <AzCore/Settings/SettingsRegistry.h>
 
 #include <QDialogButtonBox>
 #include <QMessageBox>
@@ -94,6 +97,17 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::UpdateProject;
     }
 
+    bool UpdateProjectCtrl::ContainsScreen(ProjectManagerScreen screen)
+    {
+        // Do not include GemRepos because we don't want to advertise jumping to it from all other screens here
+        return screen == GetScreenEnum() || screen == ProjectManagerScreen::GemCatalog;
+    }
+
+    void UpdateProjectCtrl::GoToScreen(ProjectManagerScreen screen)
+    {
+        OnChangeScreenRequest(screen);
+    }
+
     // Called when pressing "Edit Project Settings..."
     void UpdateProjectCtrl::NotifyCurrentScreen()
     {
@@ -114,6 +128,16 @@ namespace O3DE::ProjectManager
             m_stack->setCurrentWidget(m_gemRepoScreen);
             Update();
         }
+        else if (screen == ProjectManagerScreen::GemCatalog)
+        {
+            m_stack->setCurrentWidget(m_gemCatalogScreen);
+            Update();
+        }
+        else if (screen == ProjectManagerScreen::UpdateProjectSettings)
+        {
+            m_stack->setCurrentWidget(m_updateSettingsScreen);
+            Update();
+        }
         else
         {
             emit ChangeScreenRequest(screen);
@@ -280,6 +304,21 @@ namespace O3DE::ProjectManager
                 }
             }
 
+            if (newProjectSettings.m_projectName != m_projectInfo.m_projectName)
+            {
+                // update reg key
+                QString oldSettingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName);
+                QString newSettingsKey = GetProjectBuiltSuccessfullyKey(newProjectSettings.m_projectName);
+
+                auto settingsRegistry = AZ::SettingsRegistry::Get();
+                bool projectBuiltSuccessfully = false;
+                if (settingsRegistry && settingsRegistry->Get(projectBuiltSuccessfully, oldSettingsKey.toStdString().c_str()))
+                {
+                    settingsRegistry->Set(newSettingsKey.toStdString().c_str(), projectBuiltSuccessfully);
+                    SaveProjectManagerSettings();
+                }
+            }
+
             if (!newProjectSettings.m_newPreviewImagePath.isEmpty())
             {
                 if (!ProjectUtils::ReplaceProjectFile(
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h
index ee6fc792f2..070e2c58bf 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h
@@ -24,7 +24,8 @@ namespace O3DE::ProjectManager
     QT_FORWARD_DECLARE_CLASS(GemCatalogScreen)
     QT_FORWARD_DECLARE_CLASS(GemRepoScreen)
 
-    class UpdateProjectCtrl : public ScreenWidget
+    class UpdateProjectCtrl
+        : public ScreenWidget
     {
         Q_OBJECT
     public:
@@ -32,7 +33,8 @@ namespace O3DE::ProjectManager
         ~UpdateProjectCtrl() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
-    protected:
+        bool ContainsScreen(ProjectManagerScreen screen) override;
+        void GoToScreen(ProjectManagerScreen screen) override;
         void NotifyCurrentScreen() override;
 
     protected slots:
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
index 3bfc07c5b0..a430102c27 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp
@@ -35,7 +35,7 @@ namespace O3DE::ProjectManager
         previewExtrasLayout->setContentsMargins(50, 0, 0, 0);
 
         QLabel* projectPreviewLabel = new QLabel(tr("Select an image (PNG). Minimum %1 x %2 pixels.")
-                           .arg(QString::number(ProjectPreviewImageWidth), QString::number(ProjectPreviewImageHeight)));
+            .arg(QString::number(ProjectPreviewImageWidth), QString::number(ProjectPreviewImageHeight)));
         projectPreviewLabel->setObjectName("projectPreviewLabel");
         previewExtrasLayout->addWidget(projectPreviewLabel);
 
diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake
index e2e35717f6..468e8dcbc5 100644
--- a/Code/Tools/ProjectManager/project_manager_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_files.cmake
@@ -58,6 +58,8 @@ set(FILES
     Source/CreateProjectCtrl.cpp
     Source/UpdateProjectCtrl.h
     Source/UpdateProjectCtrl.cpp
+    Source/ProjectManagerSettings.h
+    Source/ProjectManagerSettings.cpp
     Source/ProjectsScreen.h
     Source/ProjectsScreen.cpp
     Source/ProjectSettingsScreen.h
@@ -76,6 +78,8 @@ set(FILES
     Source/TagWidget.cpp
     Source/TemplateButtonWidget.h
     Source/TemplateButtonWidget.cpp
+    Source/ExternalLinkDialog.h
+    Source/ExternalLinkDialog.cpp
     Source/GemCatalog/GemCatalogHeaderWidget.h
     Source/GemCatalog/GemCatalogHeaderWidget.cpp
     Source/GemCatalog/GemCatalogScreen.h
@@ -96,6 +100,10 @@ set(FILES
     Source/GemCatalog/GemListHeaderWidget.cpp
     Source/GemCatalog/GemModel.h
     Source/GemCatalog/GemModel.cpp
+    Source/GemCatalog/GemUninstallDialog.h
+    Source/GemCatalog/GemUninstallDialog.cpp
+    Source/GemCatalog/GemUpdateDialog.h
+    Source/GemCatalog/GemUpdateDialog.cpp
     Source/GemCatalog/GemDependenciesDialog.h
     Source/GemCatalog/GemDependenciesDialog.cpp
     Source/GemCatalog/GemRequirementDialog.h
diff --git a/Code/Tools/ProjectManager/tests/GemCatalogTests.cpp b/Code/Tools/ProjectManager/tests/GemCatalogTests.cpp
index f5c6d5196a..701a1ddcef 100644
--- a/Code/Tools/ProjectManager/tests/GemCatalogTests.cpp
+++ b/Code/Tools/ProjectManager/tests/GemCatalogTests.cpp
@@ -8,8 +8,8 @@
 
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzTest/Utils.h>
-#include <GemCatalog/GemModel.h>
 
+#include <GemCatalog/GemSortFilterProxyModel.h>
 
 namespace O3DE::ProjectManager
 {
@@ -17,14 +17,22 @@ namespace O3DE::ProjectManager
         : public ::UnitTest::ScopedAllocatorSetupFixture
     {
     public:
+        void SetUp() override
+        {
+            m_gemModel.reset(new GemModel());
+        }
 
-        GemCatalogTests() = default;
+        void TearDown() override
+        {
+            m_gemModel.release();
+        }
+
+    protected:
+        AZStd::unique_ptr<GemModel> m_gemModel;
     };
 
-    TEST_F(GemCatalogTests, GemCatalog_Displays_But_Does_Not_Add_Dependencies)
+    TEST_F(GemCatalogTests, GemCatalog_GemWithDependencies_DisplaysButDoesNotAddDependencies)
     {
-        GemModel* gemModel = new GemModel();
-
         // given 3 gems a,b,c where a depends on b which depends on c
         GemInfo gemA, gemB, gemC;
         QModelIndex indexA, indexB, indexC;
@@ -35,30 +43,531 @@ namespace O3DE::ProjectManager
         gemA.m_dependencies = QStringList({ "b" });
         gemB.m_dependencies = QStringList({ "c" });
 
-        gemModel->AddGem(gemA);
-        indexA = gemModel->FindIndexByNameString(gemA.m_name);
+        indexA = m_gemModel->AddGem(gemA);
+        indexB = m_gemModel->AddGem(gemB);
+        indexC = m_gemModel->AddGem(gemC);
 
-        gemModel->AddGem(gemB);
-        indexB = gemModel->FindIndexByNameString(gemB.m_name);
-
-        gemModel->AddGem(gemC);
-        indexC = gemModel->FindIndexByNameString(gemC.m_name);
-
-        gemModel->UpdateGemDependencies();
+        m_gemModel->UpdateGemDependencies();
 
         EXPECT_FALSE(GemModel::IsAdded(indexA));
         EXPECT_FALSE(GemModel::IsAddedDependency(indexB) || GemModel::IsAddedDependency(indexC));
 
         // when a is added
-        GemModel::SetIsAdded(*gemModel, indexA, true);
+        GemModel::SetIsAdded(*m_gemModel, indexA, true);
 
         // expect b and c are now dependencies of an added gem but not themselves added
         // cmake will handle dependencies
         EXPECT_TRUE(GemModel::IsAddedDependency(indexB) && GemModel::IsAddedDependency(indexC));
-        EXPECT_TRUE(!GemModel::IsAdded(indexB) && !GemModel::IsAdded(indexC));
+        EXPECT_FALSE(GemModel::IsAdded(indexB) || GemModel::IsAdded(indexC));
 
-        QVector<QModelIndex> gemsToAdd = gemModel->GatherGemsToBeAdded();
+        const QVector<QModelIndex>& gemsToAdd = m_gemModel->GatherGemsToBeAdded();
         EXPECT_TRUE(gemsToAdd.size() == 1);
         EXPECT_EQ(GemModel::GetName(gemsToAdd.at(0)), gemA.m_name);
     }
+
+    class GemCatalogFilterTests
+        : public GemCatalogTests 
+    {
+    public:
+        void SetUp() override
+        {
+            GemCatalogTests::SetUp(); 
+            m_proxyModel.reset(new GemSortFilterProxyModel(m_gemModel.get()));
+        }
+
+        void TearDown() override
+        {
+            m_proxyModel.release();
+            GemCatalogTests::TearDown(); 
+        }
+
+    protected:
+        AZStd::unique_ptr<GemSortFilterProxyModel> m_proxyModel;
+    };
+
+    class GemCatalogSearchFilterTests
+        : public GemCatalogFilterTests
+    {
+    public:
+        void SetUp() override
+        {
+            GemCatalogFilterTests::SetUp();
+
+            GemInfo gemfilterName, gemfilterDisplayName, gemfilterCreator, gemfilterSummary, gemfilterFeature;
+
+            gemfilterName.m_name = "Name";
+            gemfilterDisplayName.m_name = "D";
+            gemfilterCreator.m_name = "C";
+            gemfilterSummary.m_name = "S";
+            gemfilterFeature.m_name = "F";
+
+            gemfilterDisplayName.m_displayName = "Display Name";
+            gemfilterCreator.m_creator = "Johnathon Doe";
+            gemfilterSummary.m_summary = "Unique Summary";
+            gemfilterFeature.m_features.append("Creative Feature");
+
+            m_gemRows.append(m_gemModel->AddGem(gemfilterName).row());
+            m_gemRows.append(m_gemModel->AddGem(gemfilterDisplayName).row());
+            m_gemRows.append(m_gemModel->AddGem(gemfilterCreator).row());
+            m_gemRows.append(m_gemModel->AddGem(gemfilterSummary).row());
+            m_gemRows.append(m_gemModel->AddGem(gemfilterFeature).row());
+        }
+
+    protected:
+        enum RowOrder
+        {
+            Name,
+            DisplayName,
+            Creator,
+            Summary,
+            Features
+        };
+
+        QVector<int> m_gemRows;
+    };
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringName_ShowsNameGems)
+    {
+        m_proxyModel->SetSearchString("Name");
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringDisplayName_ShowsDisplayNameGem)
+    {
+        m_proxyModel->SetSearchString("Display Name");
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringCreator_ShowsCreatorGem)
+    {
+        m_proxyModel->SetSearchString("Johnathon Doe");
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringSummary_ShowsSummaryGem)
+    {
+        m_proxyModel->SetSearchString("Unique Summary");
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringFeatures_ShowsFeatureGem)
+    {
+        m_proxyModel->SetSearchString("Creative");
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringEmpty_ShowsAll)
+    {
+        m_proxyModel->SetSearchString("");
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringCommonCharacter_ShowsAll)
+    {
+        // All gems contain "a" in a searchable field so all should be shown
+        m_proxyModel->SetSearchString("a");
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringDifferentCaseCommonCharacter_ShowsAll)
+    {
+        // No gems contain the character "A" but search should be case insensitive
+        m_proxyModel->SetSearchString("A");
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringNoneContainCharacter_ShowsNone)
+    {
+        // No gems contain the character "z" or "Z" so none should be shown
+        m_proxyModel->SetSearchString("z");
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSearchFilterTests, GemCatalogFilters_SearchStringPartialMatchString_ShowsNone)
+    {
+        // Token matching is currently not supported
+        // The whole string must match a substring
+        m_proxyModel->SetSearchString("Name Token");
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Name], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DisplayName], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Creator], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Summary], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[Features], QModelIndex()));
+    }
+
+    class GemCatalogSelectedActiveFilterTests
+        : public GemCatalogFilterTests
+    {
+    public:
+        void SetUp() override
+        {
+            GemCatalogFilterTests::SetUp();
+
+            GemInfo gemSelected, gemSelectedDep, gemUnselected, gemUnselectedDep, gemActive, gemInactive;
+
+            gemSelected.m_name = "selected";
+            gemSelectedDep.m_name = "selectedDep";
+            gemUnselected.m_name = "unselected";
+            gemUnselectedDep.m_name = "unselectedDep";
+            gemActive.m_name = "active";
+            gemInactive.m_name = "inactive";
+
+            gemSelected.m_dependencies = QStringList({ "selectedDep" });
+            gemUnselected.m_dependencies = QStringList({ "unselectedDep" });
+
+            m_gemIndices.append(m_gemModel->AddGem(gemSelected));
+            m_gemIndices.append(m_gemModel->AddGem(gemSelectedDep));
+            m_gemIndices.append(m_gemModel->AddGem(gemUnselected));
+            m_gemIndices.append(m_gemModel->AddGem(gemUnselectedDep));
+            m_gemIndices.append(m_gemModel->AddGem(gemActive));
+            m_gemIndices.append(m_gemModel->AddGem(gemInactive));
+
+            m_gemModel->UpdateGemDependencies();
+
+            // Set intial state of catalog with the to be unselected gem currently added along with active gem
+            GemModel::SetIsAdded(*m_gemModel, m_gemIndices[Unselected], true);
+            GemModel::SetWasPreviouslyAdded(*m_gemModel, m_gemIndices[Unselected], true);
+            GemModel::SetIsAdded(*m_gemModel, m_gemIndices[Active], true);
+            GemModel::SetWasPreviouslyAdded(*m_gemModel, m_gemIndices[Active], true);
+
+            // Add selected gem and remove unselected gem
+            GemModel::SetIsAdded(*m_gemModel, m_gemIndices[Selected], true);
+            GemModel::SetIsAdded(*m_gemModel, m_gemIndices[Unselected], false);
+        }
+
+    protected:
+        enum IndexOrder
+        {
+            Selected,
+            SelectedDep,
+            Unselected,
+            UnselectedDep,
+            Active,
+            Inactive
+        };
+
+        QVector<QModelIndex> m_gemIndices;
+    };
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_SelectedActiveIntialState_AddedGemsAndDependenciesAreAdded)
+    {
+        // Check if gems are all in expected state
+        // if this test fails all other Selected/Active tests are invalid
+        EXPECT_TRUE(GemModel::IsAdded(m_gemIndices[Selected]));
+        EXPECT_TRUE(GemModel::IsAddedDependency(m_gemIndices[SelectedDep]));
+        EXPECT_FALSE(GemModel::IsAdded(m_gemIndices[Unselected]));
+        EXPECT_FALSE(GemModel::IsAddedDependency(m_gemIndices[UnselectedDep]));
+        EXPECT_TRUE(GemModel::IsAdded(m_gemIndices[Active]));
+        EXPECT_FALSE(GemModel::IsAdded(m_gemIndices[Inactive]));
+    }
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_SelectedActiveNoFilter_ShowsAll)
+    {
+        // Filter is clear
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Selected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[SelectedDep].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Unselected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[UnselectedDep].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Active].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Inactive].row(), QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_FilterSelected_ShowsSelectedAndDependencies)
+    {
+        // Check selected filter
+        // Selected dependencies should also be shown
+        m_proxyModel->SetGemSelected(GemSortFilterProxyModel::GemSelected::Selected);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Selected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[SelectedDep].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Unselected].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[UnselectedDep].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Active].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Inactive].row(), QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_FilterUnselected_ShowsUnselectedAndDependencies)
+    {
+        // Check unselected filter
+        // Unselected dependencies should also be shown
+        m_proxyModel->SetGemSelected(GemSortFilterProxyModel::GemSelected::Unselected);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Selected].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[SelectedDep].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Unselected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[UnselectedDep].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Active].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Inactive].row(), QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_FilterSelectedAndUnselected_ShowsAllChangesAndDependencies)
+    {
+        // Check both un/selected filter
+        m_proxyModel->SetGemSelected(GemSortFilterProxyModel::GemSelected::Both);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Selected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[SelectedDep].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Unselected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[UnselectedDep].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Active].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Inactive].row(), QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_FilterActive_ShowsActive)
+    {
+        // Check active filter
+        // Active dependencies should also be shown
+        m_proxyModel->SetGemActive(GemSortFilterProxyModel::GemActive::Active);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Selected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[SelectedDep].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Unselected].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[UnselectedDep].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Active].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Inactive].row(), QModelIndex()));
+    }
+
+    TEST_F(GemCatalogSelectedActiveFilterTests, GemCatalogFilters_FilterActive_ShowsInactive)
+    {
+        // Check inactive filter
+        m_proxyModel->SetGemActive(GemSortFilterProxyModel::GemActive::Inactive);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Selected].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[SelectedDep].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Unselected].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[UnselectedDep].row(), QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemIndices[Active].row(), QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemIndices[Inactive].row(), QModelIndex()));
+    }
+
+    class GemCatalogMiscFilterTests
+        : public GemCatalogFilterTests
+    {
+    public:
+        void SetUp() override
+        {
+            GemCatalogFilterTests::SetUp();
+
+            GemInfo gemA, gemB, gemC;
+
+            gemA.m_name = "Default Audio";
+            gemB.m_name = "Mobile UX";
+            gemC.m_name = "City Props";
+
+            gemA.m_gemOrigin = GemInfo::GemOrigin::Open3DEngine;
+            gemB.m_gemOrigin = GemInfo::GemOrigin::Local;
+            gemC.m_gemOrigin = GemInfo::GemOrigin::Remote;
+
+            gemA.m_types = GemInfo::Type::Code;
+            gemB.m_types = GemInfo::Type::Code | GemInfo::Type::Tool;
+            gemC.m_types = GemInfo::Type::Asset;
+
+            using Plat = GemInfo::Platform;
+            gemA.m_platforms = Plat::Windows;
+            gemB.m_platforms = Plat::Android | Plat::iOS;
+            gemC.m_platforms = Plat::Android | Plat::iOS | Plat::Linux | Plat::macOS | Plat::Windows; 
+
+            gemA.m_features = QStringList({ "Audio", "Framework", "SDK" });
+            gemB.m_features = QStringList({ "Framework", "Tools", "UI" });
+            gemC.m_features = QStringList({ "Assets", "Content", "Environment" });
+
+            m_gemRows.append(m_gemModel->AddGem(gemA).row());
+            m_gemRows.append(m_gemModel->AddGem(gemB).row());
+            m_gemRows.append(m_gemModel->AddGem(gemC).row());
+        }
+
+    protected:
+        enum RowOrder
+        {
+            DefaultAudio,
+            MobileUX,
+            CityProps
+        };
+
+        QVector<int> m_gemRows;
+    };
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_MiscNoFilter_ShowsAll)
+    {
+        // No filter
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterSingleOrigin_ShowsOriginMatch)
+    {
+        m_proxyModel->SetGemOrigins(GemInfo::GemOrigin::Open3DEngine);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetGemOrigins(GemInfo::GemOrigin::Local);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetGemOrigins(GemInfo::GemOrigin::Remote);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterMultipleOrigins_ShowsMultipleOriginMatches)
+    {
+        m_proxyModel->SetGemOrigins(GemInfo::GemOrigin::Open3DEngine | GemInfo::GemOrigin::Local);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterSingleType_ShowsTypeMatch)
+    {
+        m_proxyModel->SetTypes(GemInfo::Type::Code);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetTypes(GemInfo::Type::Tool);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetTypes(GemInfo::Type::Asset);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterMultipleTypes_ShowsMultipleTypeMatches)
+    {
+        m_proxyModel->SetTypes(GemInfo::Type::Tool | GemInfo::Type::Asset);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterSinglePlatform_ShowsPlatformMatch)
+    {
+        m_proxyModel->SetPlatforms(GemInfo::Platform::Windows);
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetPlatforms(GemInfo::Platform::Android);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetPlatforms(GemInfo::Platform::macOS);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterMultiplePlatforms_ShowsMultiplePlatformMatches)
+    {
+        m_proxyModel->SetPlatforms(GemInfo::Platform::Android | GemInfo::Platform::iOS);
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterSingleFeature_ShowsFeatureMatch)
+    {
+        m_proxyModel->SetFeatures({ "Audio" });
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetFeatures({ "Tools", });
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+
+        m_proxyModel->SetFeatures({ "Environment" });
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterMultipleFeatures_ShowsMultipleFeatureMatches)
+    {
+        m_proxyModel->SetFeatures({ "Assets", "Framework" });
+
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_TRUE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
+
+    TEST_F(GemCatalogMiscFilterTests, GemCatalogFilters_FilterPartialMatchFeature_ShowsNone)
+    {
+        // Features must be an exact match to filter by them directly
+        m_proxyModel->SetFeatures({ "Frame" });
+
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[DefaultAudio], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[MobileUX], QModelIndex()));
+        EXPECT_FALSE(m_proxyModel->filterAcceptsRow(m_gemRows[CityProps], QModelIndex()));
+    }
 }
diff --git a/Code/Tools/PythonBindingsExample/source/Application.cpp b/Code/Tools/PythonBindingsExample/source/Application.cpp
index ab1d1b5acf..cfb28d8e09 100644
--- a/Code/Tools/PythonBindingsExample/source/Application.cpp
+++ b/Code/Tools/PythonBindingsExample/source/Application.cpp
@@ -39,7 +39,6 @@ namespace PythonBindingsExample
         AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();
 
         // prepare the Python binding gem(s)
-        CalculateExecutablePath();
         Start(Descriptor());
 
         AZ::SerializeContext* context;
diff --git a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
index 3bf75e2d9b..0478e6cdb2 100644
--- a/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
@@ -368,7 +368,6 @@ namespace AZ::SceneAPI::Containers
         MOCK_METHOD0(GetSerializeContext, AZ::SerializeContext* ());
         MOCK_METHOD0(GetJsonRegistrationContext, AZ::JsonRegistrationContext* ());
         MOCK_METHOD0(GetBehaviorContext, AZ::BehaviorContext* ());
-        MOCK_CONST_METHOD0(GetAppRoot, const char*());
         MOCK_CONST_METHOD0(GetEngineRoot, const char*());
         MOCK_CONST_METHOD0(GetExecutableFolder, const char* ());
         MOCK_CONST_METHOD1(QueryApplicationType, void(AZ::ApplicationTypeQuery&));
diff --git a/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp
index f51c670fc8..c47330620d 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.cpp
@@ -185,7 +185,7 @@ namespace AZ
                                 if (lodCount > 0)
                                 {
                                     rule->AddLod();
-                                    selection.CopyTo(rule->GetNodeSelectionList(index));
+                                    selection.CopyTo(rule->GetNodeSelectionList(lodLevel));
                                 }
                                 else
                                 {
diff --git a/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h
index d152386940..c9416c0aa8 100644
--- a/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h
+++ b/Code/Tools/SceneAPI/SceneData/Behaviors/LodRuleBehavior.h
@@ -13,6 +13,7 @@
 #include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
 #include <SceneAPI/SceneCore/Events/GraphMetaInfoBus.h>
 #include <SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h>
+#include <SceneAPI/SceneData/SceneDataConfiguration.h>
 
 namespace AZ
 {
@@ -27,7 +28,7 @@ namespace AZ
         {
             class LodRule;
 
-            class LodRuleBehavior
+            class SCENE_DATA_CLASS LodRuleBehavior
                 : public SceneCore::BehaviorComponent
                 , public Events::ManifestMetaInfoBus::Handler
                 , public Events::AssetImportRequestBus::Handler
@@ -36,18 +37,19 @@ namespace AZ
             public:
                 AZ_COMPONENT(LodRuleBehavior, "{D2E19864-9A4B-41FD-8ACC-DA6756728CB3}", SceneCore::BehaviorComponent);
 
-                ~LodRuleBehavior() override = default;
+                SCENE_DATA_API ~LodRuleBehavior() override = default;
 
-                void Activate() override;
-                void Deactivate() override;
+                SCENE_DATA_API void Activate() override;
+                SCENE_DATA_API void Deactivate() override;
                 static void Reflect(ReflectContext* context);
 
-                void InitializeObject(const Containers::Scene& scene, DataTypes::IManifestObject& target) override;
-                Events::ProcessingResult UpdateManifest(Containers::Scene& scene, ManifestAction action,
+                SCENE_DATA_API void InitializeObject(const Containers::Scene& scene, DataTypes::IManifestObject& target) override;
+                SCENE_DATA_API Events::ProcessingResult UpdateManifest(
+                    Containers::Scene& scene, ManifestAction action,
                     RequestingApplication requester) override;
 
-                void GetVirtualTypeName(AZStd::string& name, Crc32 type) override;
-                void GetAllVirtualTypes(AZStd::set<Crc32>& types) override;
+                SCENE_DATA_API void GetVirtualTypeName(AZStd::string& name, Crc32 type) override;
+                SCENE_DATA_API void GetAllVirtualTypes(AZStd::set<Crc32>& types) override;
 
             private:
                 size_t SelectLodMeshes(const Containers::Scene& scene, DataTypes::ISceneNodeSelectionList& selection, size_t lodLevel) const;
diff --git a/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp
index f893751caf..a6c624397a 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.cpp
@@ -21,7 +21,6 @@ namespace AZ
         {
             const size_t LodRule::m_maxLods;
 
-            AZ_CLASS_ALLOCATOR_IMPL(LodRule, SystemAllocator, 0)
 
             SceneNodeSelectionList& LodRule::GetNodeSelectionList(size_t index)
             {
diff --git a/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h
index 0d9bf0a9a6..fd7d6bacd8 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/LodRule.h
@@ -25,26 +25,26 @@ namespace AZ
         }
         namespace SceneData
         {
-            class LodRule
+            class SCENE_DATA_CLASS LodRule
                 : public DataTypes::ILodRule
             {
             public:
                 AZ_RTTI(LodRule, "{6E796AC8-1484-4909-860A-6D3F22A7346F}", DataTypes::ILodRule);
-                AZ_CLASS_ALLOCATOR_DECL
+                AZ_CLASS_ALLOCATOR(LodRule, AZ::SystemAllocator, 0)
 
-                ~LodRule() override = default;
+                SCENE_DATA_API ~LodRule() override = default;
 
-                SceneNodeSelectionList& GetNodeSelectionList(size_t index);
+                SCENE_DATA_API SceneNodeSelectionList& GetNodeSelectionList(size_t index);
 
-                DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList(size_t index) override;
-                const DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList(size_t index) const override;
-                size_t GetLodCount() const override;
+                SCENE_DATA_API DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList(size_t index) override;
+                SCENE_DATA_API const DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList(size_t index) const override;
+                SCENE_DATA_API size_t GetLodCount() const override;
 
-                void AddLod();
+                SCENE_DATA_API void AddLod();
 
                 static void Reflect(ReflectContext* context);
-                //The engine supports 6 total lods.  1 for the base model then 5 more lods.  
-                //The rule only captures lods past level 0 so this is set to 5. 
+                //The engine supports 6 total lods.  1 for the base model then 5 more lods.
+                //The rule only captures lods past level 0 so this is set to 5.
                 static const size_t m_maxLods = 5;
             protected:
 
diff --git a/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake b/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake
index 51f3dfc9e7..3a51180ca1 100644
--- a/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake
+++ b/Code/Tools/SceneAPI/SceneData/SceneData_testing_files.cmake
@@ -11,5 +11,6 @@ set(FILES
     Tests/GraphData/MeshDataTests.cpp
     Tests/GraphData/MeshDataPrimitiveUtilsTests.cpp
     Tests/GraphData/GraphDataBehaviorTests.cpp
+    Tests/GraphData/RulesTests.cpp
     Tests/SceneManifest/SceneManifestRuleTests.cpp
 )
diff --git a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/RulesTests.cpp b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/RulesTests.cpp
new file mode 100644
index 0000000000..a6ccdfa59d
--- /dev/null
+++ b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/RulesTests.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzTest/AzTest.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneData/GraphData/MeshData.h>
+#include <SceneAPI/SceneData/Behaviors/LodRuleBehavior.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
+#include <SceneAPI/SceneData/Behaviors/Registry.h>
+#include <SceneAPI/SceneData/Groups/MeshGroup.h>
+#include <SceneAPI/SceneData/Rules/LodRule.h>
+#include <SceneAPI/SceneData/Rules/TangentsRule.h>
+
+namespace AZ
+{
+    namespace SceneData
+    {
+        struct SoftNameMock
+            : SceneAPI::Events::GraphMetaInfoBus::Handler
+        {
+            SoftNameMock()
+            {
+                BusConnect();
+            }
+
+            ~SoftNameMock() override
+            {
+                BusDisconnect();
+            }
+
+            void GetVirtualTypes(AZStd::set<Crc32>& types, const SceneAPI::Containers::Scene&, SceneAPI::Containers::SceneGraph::NodeIndex) override
+            {
+                // Indicate this node is a LOD1 type
+                types.emplace(AZ_CRC_CE("LODMesh1"));
+            }
+        };
+
+        TEST(LOD, LODRuleTest)
+        {
+            // Test that UpdateManifest doesn't crash when trying to auto-add new LOD levels
+            SoftNameMock softNameMock;
+
+            SceneAPI::SceneData::LodRuleBehavior lod;
+            SceneAPI::Containers::Scene scene("test");
+
+            auto lodRule = AZStd::shared_ptr<SceneAPI::SceneData::LodRule>(aznew SceneAPI::SceneData::LodRule());
+            scene.GetManifest().AddEntry(lodRule);
+
+            auto group = AZStd::shared_ptr<SceneAPI::SceneData::MeshGroup>(aznew SceneAPI::SceneData::MeshGroup());
+
+            // Add a bunch of other rules first
+            // This is necessary to replicate the bug condition where the index of the rule is used instead of the index of the LOD
+            for (int i = 0; i < 5; ++i)
+            {
+                auto tangentsRule = AZStd::shared_ptr<SceneAPI::SceneData::TangentsRule>(aznew SceneAPI::SceneData::TangentsRule());
+                group->GetRuleContainer().AddRule(tangentsRule);
+            }
+
+            group->GetRuleContainer().AddRule(lodRule);
+            scene.GetManifest().AddEntry(group);
+
+            auto meshData = AZStd::shared_ptr<GraphData::MeshData>(new GraphData::MeshData());
+            scene.GetGraph().AddChild(scene.GetGraph().GetRoot(), "test", meshData);
+
+            EXPECT_EQ(lodRule->GetLodCount(), 0);
+
+            // This should auto-add 1 LOD because of the "test" node we added above along with the SoftNameMock which will report it as an LOD1
+            lod.UpdateManifest(scene, SceneAPI::Events::AssetImportRequest::Update, SceneAPI::Events::AssetImportRequest::Generic);
+
+            EXPECT_EQ(lodRule->GetLodCount(), 1);
+        }
+    }
+}
diff --git a/Code/Tools/SerializeContextTools/Converter.cpp b/Code/Tools/SerializeContextTools/Converter.cpp
index 6a8bebdbfc..294bf941ac 100644
--- a/Code/Tools/SerializeContextTools/Converter.cpp
+++ b/Code/Tools/SerializeContextTools/Converter.cpp
@@ -202,8 +202,6 @@ namespace AZ
             bool skipSystem = commandLine->HasSwitch("skipsystem");
             bool isDryRun = commandLine->HasSwitch("dryrun");
 
-            const char* appRoot = const_cast<const Application&>(application).GetAppRoot();
-
             PathDocumentContainer documents;
             bool result = true;
             const AZStd::string& filePath = application.GetConfigFilePath();
@@ -230,7 +228,7 @@ namespace AZ
             }
             
             auto callback = 
-                [&result, skipGems, skipSystem, &configurationName, sourceGameFolder, &appRoot, &documents, &convertSettings, &verifySettings]
+                [&result, skipGems, skipSystem, &configurationName, sourceGameFolder, &documents, &convertSettings, &verifySettings]
                 (void* classPtr, const Uuid& classId, SerializeContext* context)
             {
                 if (classId == azrtti_typeid<AZ::ComponentApplication::Descriptor>())
@@ -238,7 +236,7 @@ namespace AZ
                     if (!skipSystem)
                     {
                         result = ConvertSystemSettings(documents, *reinterpret_cast<AZ::ComponentApplication::Descriptor*>(classPtr), 
-                            configurationName, sourceGameFolder, appRoot) && result;
+                            configurationName, sourceGameFolder) && result;
                     }
 
                     // Cleanup the Serialized Element to allow any classes within the element's hierarchy to delete
@@ -443,7 +441,7 @@ namespace AZ
         }
 
         bool Converter::ConvertSystemSettings(PathDocumentContainer& documents, const ComponentApplication::Descriptor& descriptor, 
-            const AZStd::string& configurationName, const AZ::IO::PathView& projectFolder, [[maybe_unused]] const AZStd::string& applicationRoot)
+            const AZStd::string& configurationName, const AZ::IO::PathView& projectFolder)
         {
             AZ::IO::FixedMaxPath memoryFilePath{ projectFolder };
             memoryFilePath /= "Registry";
diff --git a/Code/Tools/SerializeContextTools/Converter.h b/Code/Tools/SerializeContextTools/Converter.h
index 6c8f6c70fb..7d30ca2a3a 100644
--- a/Code/Tools/SerializeContextTools/Converter.h
+++ b/Code/Tools/SerializeContextTools/Converter.h
@@ -43,7 +43,7 @@ namespace AZ
             using PathDocumentContainer = AZStd::vector<PathDocumentPair>;
 
             static bool ConvertSystemSettings(PathDocumentContainer& documents, const ComponentApplication::Descriptor& descriptor, 
-                const AZStd::string& configurationName, const AZ::IO::PathView& projectFolder, const AZStd::string& applicationRoot);
+                const AZStd::string& configurationName, const AZ::IO::PathView& projectFolder);
             static bool ConvertSystemComponents(PathDocumentContainer& documents, const Entity& entity,
                 const AZStd::string& configurationName, const AZ::IO::PathView& projectFolder,
                 const JsonSerializerSettings& convertSettings, const JsonDeserializerSettings& verifySettings);
diff --git a/Gems/AWSClientAuth/Code/CMakeLists.txt b/Gems/AWSClientAuth/Code/CMakeLists.txt
index bd8b174b65..1f0c119f5a 100644
--- a/Gems/AWSClientAuth/Code/CMakeLists.txt
+++ b/Gems/AWSClientAuth/Code/CMakeLists.txt
@@ -15,9 +15,9 @@ ly_add_target(
         awsclientauth_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -35,7 +35,7 @@ ly_add_target(
         awsclientauth_shared_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -97,8 +97,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awsclientauth_test_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                "Include/Private"
-                "Include/Public"
+                Source
+                Include
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE
diff --git a/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h b/Gems/AWSClientAuth/Code/Include/Authentication/AuthenticationProviderBus.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h
rename to Gems/AWSClientAuth/Code/Include/Authentication/AuthenticationProviderBus.h
diff --git a/Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h b/Gems/AWSClientAuth/Code/Include/Authentication/AuthenticationTokens.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h
rename to Gems/AWSClientAuth/Code/Include/Authentication/AuthenticationTokens.h
diff --git a/Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h b/Gems/AWSClientAuth/Code/Include/Authorization/AWSCognitoAuthorizationBus.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h
rename to Gems/AWSClientAuth/Code/Include/Authorization/AWSCognitoAuthorizationBus.h
diff --git a/Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h b/Gems/AWSClientAuth/Code/Include/Authorization/ClientAuthAWSCredentials.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h
rename to Gems/AWSClientAuth/Code/Include/Authorization/ClientAuthAWSCredentials.h
diff --git a/Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h b/Gems/AWSClientAuth/Code/Include/UserManagement/AWSCognitoUserManagementBus.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h
rename to Gems/AWSClientAuth/Code/Include/UserManagement/AWSCognitoUserManagementBus.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h b/Gems/AWSClientAuth/Code/Source/AWSClientAuthBus.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h
rename to Gems/AWSClientAuth/Code/Source/AWSClientAuthBus.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h b/Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h
rename to Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h b/Gems/AWSClientAuth/Code/Source/AWSClientAuthResourceMappingConstants.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h
rename to Gems/AWSClientAuth/Code/Source/AWSClientAuthResourceMappingConstants.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h b/Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h
rename to Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h b/Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationNotificationBusBehaviorHandler.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationNotificationBusBehaviorHandler.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderScriptCanvasBus.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderScriptCanvasBus.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h b/Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderTypes.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderTypes.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h b/Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h b/Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h b/Gems/AWSClientAuth/Code/Source/Authentication/OAuthConstants.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h
rename to Gems/AWSClientAuth/Code/Source/Authentication/OAuthConstants.h
diff --git a/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp
new file mode 100644
index 0000000000..2492afa441
--- /dev/null
+++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h>
+
+#include <AzCore/Debug/Trace.h>
+
+#include <aws/cognito-identity/CognitoIdentityClient.h>
+#include <aws/cognito-identity/model/GetCredentialsForIdentityRequest.h>
+#include <aws/cognito-identity/model/GetIdRequest.h>
+#include <aws/core/utils/Outcome.h>
+#include <aws/core/utils/logging/LogMacros.h>
+#include <aws/identity-management/auth/CognitoCachingCredentialsProvider.h>
+#include <aws/identity-management/auth/PersistentCognitoIdentityProvider.h>
+
+
+namespace AWSClientAuth
+{
+    static const char* AUTH_LOG_TAG = "AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider";
+    static const char* ANON_LOG_TAG = "AWSClientAuthCachingAnonymousCredsProvider";
+
+    // Modification of https://github.com/aws/aws-sdk-cpp/blob/main/aws-cpp-sdk-identity-management/source/auth/CognitoCachingCredentialsProvider.cpp#L92
+    // to work around account ID requirement. Account id is not required for call to succeed and is not set unless provided.
+    // see: https://github.com/aws/aws-sdk-cpp/issues/1448
+    Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome FetchCredsFromCognito(
+        const Aws::CognitoIdentity::CognitoIdentityClient& cognitoIdentityClient,
+        Aws::Auth::PersistentCognitoIdentityProvider& identityRepository,
+        const char* logTag,
+        bool includeLogins)
+    {
+        auto logins = identityRepository.GetLogins();
+        Aws::Map<Aws::String, Aws::String> cognitoLogins;
+        for (auto& login : logins)
+        {
+            cognitoLogins[login.first] = login.second.accessToken;
+        }
+
+        if (!identityRepository.HasIdentityId())
+        {
+            auto accountId = identityRepository.GetAccountId();
+            auto identityPoolId = identityRepository.GetIdentityPoolId();
+
+            Aws::CognitoIdentity::Model::GetIdRequest getIdRequest;
+            getIdRequest.SetIdentityPoolId(identityPoolId);
+
+            if (!accountId.empty()) // new check
+            {
+                getIdRequest.SetAccountId(accountId);
+                AWS_LOGSTREAM_INFO(logTag, "Identity not found, requesting an id for accountId "
+                    << accountId << " identity pool id "
+                    << identityPoolId << " with logins.");
+            }
+            else
+            {
+                AWS_LOGSTREAM_INFO(
+                    logTag, "Identity not found, requesting an id for identity pool id %s" << identityPoolId << " with logins.");
+            }
+            if (includeLogins)
+            {
+                getIdRequest.SetLogins(cognitoLogins);
+            }
+
+            auto getIdOutcome = cognitoIdentityClient.GetId(getIdRequest);
+            if (getIdOutcome.IsSuccess())
+            {
+                auto identityId = getIdOutcome.GetResult().GetIdentityId();
+                AWS_LOGSTREAM_INFO(logTag, "Successfully retrieved identity: " << identityId);
+                identityRepository.PersistIdentityId(identityId);
+            }
+            else
+            {
+                AWS_LOGSTREAM_ERROR(
+                    logTag,
+                    "Failed to retrieve identity. Error: " << getIdOutcome.GetError().GetExceptionName() << " "
+                                                           << getIdOutcome.GetError().GetMessage());
+                return Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome(getIdOutcome.GetError());
+            }
+        }
+
+        Aws::CognitoIdentity::Model::GetCredentialsForIdentityRequest getCredentialsForIdentityRequest;
+        getCredentialsForIdentityRequest.SetIdentityId(identityRepository.GetIdentityId());
+        if (includeLogins)
+        {
+            getCredentialsForIdentityRequest.SetLogins(cognitoLogins);
+        }
+
+        return cognitoIdentityClient.GetCredentialsForIdentity(getCredentialsForIdentityRequest);
+    }
+
+    AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider::AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider(
+        const std::shared_ptr<Aws::Auth::PersistentCognitoIdentityProvider>& identityRepository,
+        const std::shared_ptr<Aws::CognitoIdentity::CognitoIdentityClient>& cognitoIdentityClient)
+        : CognitoCachingCredentialsProvider(identityRepository, cognitoIdentityClient)
+    {
+    }
+
+    Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome
+    AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider::GetCredentialsFromCognito() const
+    {
+        return FetchCredsFromCognito(*m_cognitoIdentityClient, *m_identityRepository, AUTH_LOG_TAG, true);
+    }
+
+    AWSClientAuthCachingAnonymousCredsProvider::AWSClientAuthCachingAnonymousCredsProvider(
+        const std::shared_ptr<Aws::Auth::PersistentCognitoIdentityProvider>& identityRepository,
+        const std::shared_ptr<Aws::CognitoIdentity::CognitoIdentityClient>& cognitoIdentityClient)
+        : AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider(identityRepository, cognitoIdentityClient)
+    {
+    }
+
+    Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome AWSClientAuthCachingAnonymousCredsProvider::
+        GetCredentialsFromCognito() const
+    {
+        return FetchCredsFromCognito(*m_cognitoIdentityClient, *m_identityRepository, ANON_LOG_TAG, false);
+    }
+
+
+} // namespace AWSClientAuth
diff --git a/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
new file mode 100644
index 0000000000..ad7faf4671
--- /dev/null
+++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <aws/cognito-identity/CognitoIdentityClient.h>
+#include <aws/identity-management/auth/CognitoCachingCredentialsProvider.h>
+#include <aws/identity-management/auth/PersistentCognitoIdentityProvider.h>
+
+namespace AWSClientAuth
+{
+    //! Cognito Caching Credentials Provider implementation that is derived from AWS Native SDK.
+    //! For use with authenticated credentials.
+    class AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider
+        : public Aws::Auth::CognitoCachingCredentialsProvider
+    {
+    public:
+        AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider(
+            const std::shared_ptr<Aws::Auth::PersistentCognitoIdentityProvider>& identityRepository,
+            const std::shared_ptr<Aws::CognitoIdentity::CognitoIdentityClient>& cognitoIdentityClient = nullptr);
+
+    protected:
+        Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome GetCredentialsFromCognito() const override;
+    };
+
+    //! Cognito Caching Credentials Provider implementation that is eventually derived from AWS Native SDK.
+    //! For use with anonymous credentials.
+    class AWSClientAuthCachingAnonymousCredsProvider : public AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider
+    {
+    public:
+        AWSClientAuthCachingAnonymousCredsProvider(
+            const std::shared_ptr<Aws::Auth::PersistentCognitoIdentityProvider>& identityRepository,
+            const std::shared_ptr<Aws::CognitoIdentity::CognitoIdentityClient>& cognitoIdentityClient = nullptr);
+
+    protected:
+        Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome GetCredentialsFromCognito() const override;
+    };
+
+} // namespace AWSClientAuth
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
rename to Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
diff --git a/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp
index 3af28582d6..f53149c90f 100644
--- a/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp
+++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp
@@ -8,6 +8,7 @@
 
 #include <AWSClientAuthBus.h>
 #include <AWSCoreBus.h>
+#include <Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h>
 #include <Authorization/AWSCognitoAuthorizationController.h>
 #include <ResourceMapping/AWSResourceMappingBus.h>
 #include <AWSClientAuthResourceMappingConstants.h>
@@ -38,10 +39,12 @@ namespace AWSClientAuth
         auto identityClient = AZ::Interface<IAWSClientAuthRequests>::Get()->GetCognitoIdentityClient();
 
         m_cognitoCachingCredentialsProvider =
-            std::make_shared<Aws::Auth::CognitoCachingAuthenticatedCredentialsProvider>(m_persistentCognitoIdentityProvider, identityClient);
+            std::make_shared<AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider>(
+            m_persistentCognitoIdentityProvider, identityClient);
 
         m_cognitoCachingAnonymousCredentialsProvider =
-            std::make_shared<Aws::Auth::CognitoCachingAnonymousCredentialsProvider>(m_persistentAnonymousCognitoIdentityProvider, identityClient);
+            std::make_shared<AWSClientAuthCachingAnonymousCredsProvider>(
+            m_persistentAnonymousCognitoIdentityProvider, identityClient);
     }
 
     AWSCognitoAuthorizationController::~AWSCognitoAuthorizationController()
@@ -65,9 +68,13 @@ namespace AWSClientAuth
         AWSCore::AWSResourceMappingRequestBus::BroadcastResult(
             m_cognitoIdentityPoolId, &AWSCore::AWSResourceMappingRequests::GetResourceNameId, CognitoIdentityPoolIdResourceMappingKey);
 
-        if (m_awsAccountId.empty() || m_cognitoIdentityPoolId.empty())
+        if (m_awsAccountId.empty())
+        {
+            AZ_TracePrintf("AWSCognitoAuthorizationController", "AWS account id not not configured. Proceeding without it.");
+        }
+
+        if (m_cognitoIdentityPoolId.empty())
         {
-            AZ_Warning("AWSCognitoAuthorizationController", !m_awsAccountId.empty(), "Missing AWS account id not configured.");
             AZ_Warning("AWSCognitoAuthorizationController", !m_cognitoIdentityPoolId.empty(), "Missing Cognito Identity pool id in resource mappings.");
             return false;
         }
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.h
similarity index 91%
rename from Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h
rename to Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.h
index 042be8fe89..1378feff19 100644
--- a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h
+++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <Authorization/AWSCognitoAuthorizationBus.h>
+#include <Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h>
 #include <Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h>
 #include <Authentication/AuthenticationProviderBus.h>
 #include <Credential/AWSCredentialBus.h>
@@ -51,8 +52,8 @@ namespace AWSClientAuth
 
         std::shared_ptr<AWSClientAuthPersistentCognitoIdentityProvider> m_persistentCognitoIdentityProvider;
         std::shared_ptr<AWSClientAuthPersistentCognitoIdentityProvider> m_persistentAnonymousCognitoIdentityProvider;
-        std::shared_ptr<Aws::Auth::CognitoCachingAuthenticatedCredentialsProvider> m_cognitoCachingCredentialsProvider;
-        std::shared_ptr<Aws::Auth::CognitoCachingAnonymousCredentialsProvider> m_cognitoCachingAnonymousCredentialsProvider;
+        std::shared_ptr<AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider> m_cognitoCachingCredentialsProvider;
+        std::shared_ptr<AWSClientAuthCachingAnonymousCredsProvider> m_cognitoCachingAnonymousCredentialsProvider;
 
         AZStd::string m_cognitoIdentityPoolId;
         AZStd::string m_formattedCognitoUserPoolId;
diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
rename to Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h b/Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h
rename to Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.h
diff --git a/Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h b/Gems/AWSClientAuth/Code/Source/UserManagement/UserManagementNotificationBusBehaviorHandler.h
similarity index 100%
rename from Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
rename to Gems/AWSClientAuth/Code/Source/UserManagement/UserManagementNotificationBusBehaviorHandler.h
diff --git a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
index 1d2e8bad42..19314035c4 100644
--- a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
+++ b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
@@ -608,7 +608,6 @@ namespace AWSClientAuthUnitTest
         AZ::Entity* FindEntity(const AZ::EntityId&) override { return nullptr; }
         AZ::BehaviorContext* GetBehaviorContext() override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
         void QueryApplicationType(AZ::ApplicationTypeQuery& /*appType*/) const override {}
diff --git a/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp
index 9f31891512..19064eb1ed 100644
--- a/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp
+++ b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp
@@ -62,6 +62,14 @@ TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Success)
     ASSERT_TRUE(m_mockController->m_cognitoIdentityPoolId == AWSClientAuthUnitTest::TEST_RESOURCE_NAME_ID);
 }
 
+TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Success_GetAWSAccountEmpty)
+{
+    EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetResourceNameId(testing::_)).Times(2);
+    EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultAccountId()).Times(1).WillOnce(testing::Return(""));
+    EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultRegion()).Times(1);
+    ASSERT_TRUE(m_mockController->Initialize());
+}
+
 TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_WithLogins_Success)
 {
     AWSClientAuth::AuthenticationTokens tokens(
@@ -121,7 +129,7 @@ TEST_F(AWSCognitoAuthorizationControllerTest, MultipleCalls_UsesCacheCredentials
     m_mockController->RequestAWSCredentialsAsync();
 }
 
-TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetIdError)
+TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetIdError) // fail
 {
     AWSClientAuth::AuthenticationTokens cognitoTokens(
         AWSClientAuthUnitTest::TEST_TOKEN, AWSClientAuthUnitTest::TEST_TOKEN, AWSClientAuthUnitTest::TEST_TOKEN,
@@ -140,7 +148,9 @@ TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetIdEr
     EXPECT_CALL(*m_cognitoIdentityClientMock, GetCredentialsForIdentity(testing::_)).Times(0);
     EXPECT_CALL(m_awsCognitoAuthorizationNotificationsBusMock, OnRequestAWSCredentialsSuccess(testing::_)).Times(0);
     EXPECT_CALL(m_awsCognitoAuthorizationNotificationsBusMock, OnRequestAWSCredentialsFail(testing::_)).Times(1);
+    AZ_TEST_START_TRACE_SUPPRESSION;
     m_mockController->RequestAWSCredentialsAsync();
+    AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
 }
 
 TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetCredentialsForIdentityError)
@@ -174,7 +184,9 @@ TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetCred
     EXPECT_CALL(*m_cognitoIdentityClientMock, GetCredentialsForIdentity(testing::_)).Times(1).WillOnce(testing::Return(outcome));
     EXPECT_CALL(m_awsCognitoAuthorizationNotificationsBusMock, OnRequestAWSCredentialsSuccess(testing::_)).Times(0);
     EXPECT_CALL(m_awsCognitoAuthorizationNotificationsBusMock, OnRequestAWSCredentialsFail(testing::_)).Times(1);
+    AZ_TEST_START_TRACE_SUPPRESSION;
     m_mockController->RequestAWSCredentialsAsync();
+    AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
 }
 
 TEST_F(AWSCognitoAuthorizationControllerTest, AddRemoveLogins_Succuess)
@@ -321,7 +333,7 @@ TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersisted
     EXPECT_TRUE(actualCredentialsProvider == m_mockController->m_cognitoCachingAnonymousCredentialsProvider);
 }
 
-TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersistedLogins_NoAnonymousCredentials_ResultNullPtr)
+TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersistedLogins_NoAnonymousCredentials_ResultNullPtr) // fails
 {
     Aws::Client::AWSError<Aws::CognitoIdentity::CognitoIdentityErrors> error;
     error.SetExceptionName(AWSClientAuthUnitTest::TEST_EXCEPTION);
@@ -331,8 +343,10 @@ TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersisted
     EXPECT_CALL(*m_cognitoIdentityClientMock, GetCredentialsForIdentity(testing::_)).Times(0);
 
     std::shared_ptr<Aws::Auth::AWSCredentialsProvider> actualCredentialsProvider;
+    AZ_TEST_START_TRACE_SUPPRESSION;
     AWSCore::AWSCredentialRequestBus::BroadcastResult(
         actualCredentialsProvider, &AWSCore::AWSCredentialRequests::GetCredentialsProvider);
+    AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
     EXPECT_TRUE(actualCredentialsProvider == nullptr);
 }
 
@@ -431,11 +445,3 @@ TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Fail_GetResourceNameEmp
     EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultAccountId()).Times(1);
     ASSERT_FALSE(m_mockController->Initialize());
 }
-
-TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Fail_GetAWSAccountEmpty)
-{
-    EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetResourceNameId(testing::_)).Times(1);
-    EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultAccountId()).Times(1).WillOnce(testing::Return(""));
-    EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultRegion()).Times(0);
-    ASSERT_FALSE(m_mockController->Initialize());
-}
diff --git a/Gems/AWSClientAuth/Code/awsclientauth_files.cmake b/Gems/AWSClientAuth/Code/awsclientauth_files.cmake
index bd4c971377..5de71210af 100644
--- a/Gems/AWSClientAuth/Code/awsclientauth_files.cmake
+++ b/Gems/AWSClientAuth/Code/awsclientauth_files.cmake
@@ -7,44 +7,43 @@
 #
 
 set(FILES
-    Include/Public/Authentication/AuthenticationProviderBus.h
-    Include/Public/Authentication/AuthenticationTokens.h
-    Include/Public/Authorization/AWSCognitoAuthorizationBus.h
-    Include/Public/Authorization/ClientAuthAWSCredentials.h
-    Include/Public/UserManagement/AWSCognitoUserManagementBus.h
+    Include/Authentication/AuthenticationProviderBus.h
+    Include/Authentication/AuthenticationTokens.h
+    Include/Authorization/AWSCognitoAuthorizationBus.h
+    Include/Authorization/ClientAuthAWSCredentials.h
+    Include/UserManagement/AWSCognitoUserManagementBus.h
 
-    Include/Private/AWSClientAuthSystemComponent.h
-    Include/Private/AWSClientAuthBus.h
-    Include/Private/AWSClientAuthResourceMappingConstants.h
-    Include/Private/Authentication/AuthenticationProviderTypes.h
-    Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
-    Include/Private/Authentication/AuthenticationProviderManager.h
-    Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
-
-    Include/Private/Authorization/AWSCognitoAuthorizationController.h
-    Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
-    Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
-
-    Include/Private/UserManagement/AWSCognitoUserManagementController.h
-    Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
-    
-    Include/Private/Authentication/AuthenticationProviderInterface.h
-    Include/Private/Authentication/OAuthConstants.h
-    Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
-    Include/Private/Authentication/LWAAuthenticationProvider.h
-    Include/Private/Authentication/GoogleAuthenticationProvider.h
- 
     Source/AWSClientAuthSystemComponent.cpp
-    Source/Authentication/AuthenticationTokens.cpp
-    Source/Authentication/AuthenticationProviderInterface.cpp
-    Source/Authentication/AuthenticationProviderManager.cpp
-    Source/Authentication/AWSCognitoAuthenticationProvider.cpp
-    Source/Authentication/LWAAuthenticationProvider.cpp
-    Source/Authentication/GoogleAuthenticationProvider.cpp
+    Source/AWSClientAuthSystemComponent.h
+    Source/AWSClientAuthBus.h
+    Source/AWSClientAuthResourceMappingConstants.h
 
-    Source/Authorization/ClientAuthAWSCredentials.cpp
-    Source/Authorization/AWSCognitoAuthorizationController.cpp
+    Source/Authentication/AuthenticationNotificationBusBehaviorHandler.h
+    Source/Authentication/AuthenticationProviderInterface.cpp
+    Source/Authentication/AuthenticationProviderInterface.h
+    Source/Authentication/AuthenticationProviderManager.cpp
+    Source/Authentication/AuthenticationProviderManager.h
+    Source/Authentication/AuthenticationProviderScriptCanvasBus.h
+    Source/Authentication/AuthenticationProviderTypes.h
+    Source/Authentication/AuthenticationTokens.cpp
+    Source/Authentication/AWSCognitoAuthenticationProvider.cpp
+    Source/Authentication/AWSCognitoAuthenticationProvider.h
+    Source/Authentication/LWAAuthenticationProvider.cpp
+    Source/Authentication/LWAAuthenticationProvider.h
+    Source/Authentication/GoogleAuthenticationProvider.cpp
+    Source/Authentication/GoogleAuthenticationProvider.h  
+    Source/Authentication/OAuthConstants.h
+
+    Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp
+    Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
     Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
+    Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
+    Source/Authorization/AWSCognitoAuthorizationController.cpp
+    Source/Authorization/AWSCognitoAuthorizationController.h
+    Source/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
+    Source/Authorization/ClientAuthAWSCredentials.cpp
 
     Source/UserManagement/AWSCognitoUserManagementController.cpp
+    Source/UserManagement/AWSCognitoUserManagementController.h
+    Source/UserManagement/UserManagementNotificationBusBehaviorHandler.h
 )
diff --git a/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake b/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
index 6297f400fd..cca6184641 100644
--- a/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
+++ b/Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSClientAuthModule.h
     Source/AWSClientAuthModule.cpp
+    Source/AWSClientAuthModule.h
 )
diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt
index 7559f4720b..974f3f03bf 100644
--- a/Gems/AWSCore/Code/CMakeLists.txt
+++ b/Gems/AWSCore/Code/CMakeLists.txt
@@ -16,10 +16,10 @@ ly_add_target(
          ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
             ${pal_dir}
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -36,7 +36,7 @@ ly_add_target(
         awscore_shared_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -60,6 +60,9 @@ ly_create_alias(
 )
 
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
+
+    include(${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME}/PAL_traits_editor_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
+
     ly_add_target(
         NAME AWSCore.Editor.Static STATIC
         NAMESPACE Gem
@@ -68,10 +71,10 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
             ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
+                Source
                 ${pal_dir}
             PUBLIC
-                Include/Public
+                Include
         BUILD_DEPENDENCIES
             PRIVATE
                 AZ::AzQtComponents
@@ -90,29 +93,38 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
             awscore_editor_shared_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
+                Source
         BUILD_DEPENDENCIES
             PRIVATE
                 AZ::AzCore
                 Gem::AWSCore.Editor.Static
     )
 
-    # This target is not a real gem module
-    # It is not meant to be loaded by the ModuleManager in C++
-    ly_add_target(
-        NAME AWSCore.ResourceMappingTool MODULE
-        NAMESPACE Gem
-        OUTPUT_SUBDIRECTORY AWSCoreEditorQtBin
-        FILES_CMAKE
-            awscore_resourcemappingtool_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Include/Private
-        BUILD_DEPENDENCIES
-            PRIVATE
-                Gem::AWSCore.Editor.Static
-    )
-    ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool)
+    if (PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL)
+
+        # This target is not a real gem module
+        # It is not meant to be loaded by the ModuleManager in C++
+        ly_add_target(
+            NAME AWSCore.ResourceMappingTool MODULE
+            NAMESPACE Gem
+            OUTPUT_SUBDIRECTORY AWSCoreEditorQtBin
+            FILES_CMAKE
+                awscore_resourcemappingtool_files.cmake
+            INCLUDE_DIRECTORIES
+                PRIVATE
+                    Source
+            BUILD_DEPENDENCIES
+                PRIVATE
+                    Gem::AWSCore.Editor.Static
+            RUNTIME_DEPENDENCIES
+                3rdParty::pyside2
+
+        )
+        ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool)
+
+        ly_install_directory(DIRECTORIES Tools/ResourceMappingTool)
+        
+    endif()
 
     # Builders and Tools (such as the Editor use AWSCore.Editor) use the .Editor module above.
     ly_create_alias(
@@ -144,8 +156,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awscore_tests_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
-                Include/Public
+                Source
+                Include
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE
@@ -154,10 +166,20 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AWSNativeSDKInit
                 Gem::AWSCore.Static
     )
+
     ly_add_googletest(
         NAME Gem::AWSCore.Tests
     )
 
+    ly_add_target_files(
+        TARGETS
+            AWSCore.Tests
+        FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/Tools/ResourceMappingTool/resource_mapping_schema.json
+        OUTPUT_SUBDIRECTORY
+            Gems/AWSCore
+    )
+
     if (PAL_TRAIT_BUILD_HOST_TOOLS)
         ly_add_target(
             NAME AWSCore.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
@@ -168,9 +190,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_tests_files.cmake
             INCLUDE_DIRECTORIES
                 PRIVATE
-                    Include/Private
+                    Source
                     ${pal_dir}
-                    Include/Public
+                    Include
                     Tests
             COMPILE_DEFINITIONS
                 PRIVATE
@@ -189,4 +211,13 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     endif()
 endif()
 
+ly_add_target_files(
+    TARGETS
+        AWSCore
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/Tools/ResourceMappingTool/resource_mapping_schema.json
+    OUTPUT_SUBDIRECTORY
+        Gems/AWSCore
+)
+
 ly_install_directory(DIRECTORIES Tools/ResourceMappingTool)
diff --git a/Gems/AWSCore/Code/Include/Public/AWSCoreBus.h b/Gems/AWSCore/Code/Include/AWSCoreBus.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/AWSCoreBus.h
rename to Gems/AWSCore/Code/Include/AWSCoreBus.h
diff --git a/Gems/AWSCore/Code/Include/Public/Credential/AWSCredentialBus.h b/Gems/AWSCore/Code/Include/Credential/AWSCredentialBus.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Credential/AWSCredentialBus.h
rename to Gems/AWSCore/Code/Include/Credential/AWSCredentialBus.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJob.h b/Gems/AWSCore/Code/Include/Framework/AWSApiClientJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJob.h
rename to Gems/AWSCore/Code/Include/Framework/AWSApiClientJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJobConfig.h b/Gems/AWSCore/Code/Include/Framework/AWSApiClientJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/AWSApiClientJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/AWSApiClientJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJob.h b/Gems/AWSCore/Code/Include/Framework/AWSApiJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/AWSApiJob.h
rename to Gems/AWSCore/Code/Include/Framework/AWSApiJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h b/Gems/AWSCore/Code/Include/Framework/AWSApiJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/AWSApiJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJob.h b/Gems/AWSCore/Code/Include/Framework/AWSApiRequestJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJob.h
rename to Gems/AWSCore/Code/Include/Framework/AWSApiRequestJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJobConfig.h b/Gems/AWSCore/Code/Include/Framework/AWSApiRequestJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/AWSApiRequestJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/AWSApiRequestJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/Error.h b/Gems/AWSCore/Code/Include/Framework/Error.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/Error.h
rename to Gems/AWSCore/Code/Include/Framework/Error.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/HttpClientComponent.h b/Gems/AWSCore/Code/Include/Framework/HttpClientComponent.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/HttpClientComponent.h
rename to Gems/AWSCore/Code/Include/Framework/HttpClientComponent.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJob.h b/Gems/AWSCore/Code/Include/Framework/HttpRequestJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJob.h
rename to Gems/AWSCore/Code/Include/Framework/HttpRequestJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJobConfig.h b/Gems/AWSCore/Code/Include/Framework/HttpRequestJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/HttpRequestJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/HttpRequestJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/JobExecuter.h b/Gems/AWSCore/Code/Include/Framework/JobExecuter.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/JobExecuter.h
rename to Gems/AWSCore/Code/Include/Framework/JobExecuter.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/JsonObjectHandler.h b/Gems/AWSCore/Code/Include/Framework/JsonObjectHandler.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/JsonObjectHandler.h
rename to Gems/AWSCore/Code/Include/Framework/JsonObjectHandler.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/JsonWriter.h b/Gems/AWSCore/Code/Include/Framework/JsonWriter.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/JsonWriter.h
rename to Gems/AWSCore/Code/Include/Framework/JsonWriter.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/MultipartFormData.h b/Gems/AWSCore/Code/Include/Framework/MultipartFormData.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/MultipartFormData.h
rename to Gems/AWSCore/Code/Include/Framework/MultipartFormData.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/RequestBuilder.h b/Gems/AWSCore/Code/Include/Framework/RequestBuilder.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/RequestBuilder.h
rename to Gems/AWSCore/Code/Include/Framework/RequestBuilder.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJob.h b/Gems/AWSCore/Code/Include/Framework/ServiceClientJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJob.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceClientJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJobConfig.h b/Gems/AWSCore/Code/Include/Framework/ServiceClientJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceClientJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceClientJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJob.h b/Gems/AWSCore/Code/Include/Framework/ServiceJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceJob.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobConfig.h b/Gems/AWSCore/Code/Include/Framework/ServiceJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h b/Gems/AWSCore/Code/Include/Framework/ServiceJobUtil.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceJobUtil.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h b/Gems/AWSCore/Code/Include/Framework/ServiceRequestJob.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceRequestJob.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJobConfig.h b/Gems/AWSCore/Code/Include/Framework/ServiceRequestJobConfig.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJobConfig.h
rename to Gems/AWSCore/Code/Include/Framework/ServiceRequestJobConfig.h
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/Util.h b/Gems/AWSCore/Code/Include/Framework/Util.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/Framework/Util.h
rename to Gems/AWSCore/Code/Include/Framework/Util.h
diff --git a/Gems/AWSCore/Code/Include/Public/ResourceMapping/AWSResourceMappingBus.h b/Gems/AWSCore/Code/Include/ResourceMapping/AWSResourceMappingBus.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/ResourceMapping/AWSResourceMappingBus.h
rename to Gems/AWSCore/Code/Include/ResourceMapping/AWSResourceMappingBus.h
diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h b/Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
rename to Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h b/Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorLambda.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h
rename to Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorLambda.h
diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h b/Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorS3.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
rename to Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorS3.h
diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h b/Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorsComponent.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h
rename to Gems/AWSCore/Code/Include/ScriptCanvas/AWSScriptBehaviorsComponent.h
diff --git a/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h b/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h
index fb82911dd4..726d4cc86f 100644
--- a/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h
+++ b/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h
@@ -7,4 +7,6 @@
  */
 #pragma once
 
-#define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 0
+#define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 1
+#define AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT         ""
+#define AWSCORE_EDITOR_PYTHON_COMMAND                "python/python.sh"
diff --git a/Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake b/Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake
new file mode 100644
index 0000000000..deaaa60506
--- /dev/null
+++ b/Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL TRUE)
diff --git a/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h b/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h
index fb82911dd4..d815c8273e 100644
--- a/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h
+++ b/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h
@@ -8,3 +8,5 @@
 #pragma once
 
 #define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 0
+#define AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT         ""
+#define AWSCORE_EDITOR_PYTHON_COMMAND                "python/python.sh"
diff --git a/Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake b/Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake
new file mode 100644
index 0000000000..e953c95955
--- /dev/null
+++ b/Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL FALSE)
diff --git a/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h b/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h
index e1522db32c..6eca30a8ac 100644
--- a/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h
+++ b/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h
@@ -8,3 +8,5 @@
 #pragma once
 
 #define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 1
+#define AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT         "debug "
+#define AWSCORE_EDITOR_PYTHON_COMMAND                "python/python.cmd"
diff --git a/Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake b/Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake
new file mode 100644
index 0000000000..deaaa60506
--- /dev/null
+++ b/Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL TRUE)
diff --git a/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h b/Gems/AWSCore/Code/Source/AWSCoreEditorModule.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
rename to Gems/AWSCore/Code/Source/AWSCoreEditorModule.h
diff --git a/Gems/AWSCore/Code/Include/Private/AWSCoreEditorSystemComponent.h b/Gems/AWSCore/Code/Source/AWSCoreEditorSystemComponent.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/AWSCoreEditorSystemComponent.h
rename to Gems/AWSCore/Code/Source/AWSCoreEditorSystemComponent.h
diff --git a/Gems/AWSCore/Code/Include/Private/AWSCoreInternalBus.h b/Gems/AWSCore/Code/Source/AWSCoreInternalBus.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/AWSCoreInternalBus.h
rename to Gems/AWSCore/Code/Source/AWSCoreInternalBus.h
diff --git a/Gems/AWSCore/Code/Include/Private/AWSCoreModule.h b/Gems/AWSCore/Code/Source/AWSCoreModule.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/AWSCoreModule.h
rename to Gems/AWSCore/Code/Source/AWSCoreModule.h
diff --git a/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp b/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp
index 294462e654..490fdc9ef2 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.cpp
@@ -160,6 +160,7 @@ namespace AWSCore
                 // If m_firstThreadCPU isn't -1, then each thread will be
                 // assigned to a specific CPU starting with the specified CPU.
                 AZ::JobManagerDesc jobManagerDesc{};
+                jobManagerDesc.m_jobManagerName = "AWSCore JobManager";
                 AZ::JobManagerThreadDesc threadDesc(m_firstThreadCPU, m_threadPriority, m_threadStackSize);
                 for (int i = 0; i < m_threadCount; ++i)
                 {
diff --git a/Gems/AWSCore/Code/Include/Private/AWSCoreSystemComponent.h b/Gems/AWSCore/Code/Source/AWSCoreSystemComponent.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/AWSCoreSystemComponent.h
rename to Gems/AWSCore/Code/Source/AWSCoreSystemComponent.h
diff --git a/Gems/AWSCore/Code/Include/Private/Configuration/AWSCoreConfiguration.h b/Gems/AWSCore/Code/Source/Configuration/AWSCoreConfiguration.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Configuration/AWSCoreConfiguration.h
rename to Gems/AWSCore/Code/Source/Configuration/AWSCoreConfiguration.h
diff --git a/Gems/AWSCore/Code/Include/Private/Credential/AWSCVarCredentialHandler.h b/Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Credential/AWSCVarCredentialHandler.h
rename to Gems/AWSCore/Code/Source/Credential/AWSCVarCredentialHandler.h
diff --git a/Gems/AWSCore/Code/Include/Private/Credential/AWSCredentialManager.h b/Gems/AWSCore/Code/Source/Credential/AWSCredentialManager.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Credential/AWSCredentialManager.h
rename to Gems/AWSCore/Code/Source/Credential/AWSCredentialManager.h
diff --git a/Gems/AWSCore/Code/Include/Private/Credential/AWSDefaultCredentialHandler.h b/Gems/AWSCore/Code/Source/Credential/AWSDefaultCredentialHandler.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Credential/AWSDefaultCredentialHandler.h
rename to Gems/AWSCore/Code/Source/Credential/AWSDefaultCredentialHandler.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h b/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
rename to Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSAttributionServiceApi.h b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSAttributionServiceApi.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSAttributionServiceApi.h
rename to Gems/AWSCore/Code/Source/Editor/Attribution/AWSAttributionServiceApi.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConsentDialog.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h
rename to Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConsentDialog.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConstant.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h
rename to Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionConstant.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionManager.h b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionManager.h
rename to Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionMetric.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h
rename to Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionMetric.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionSystemComponent.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h
rename to Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionSystemComponent.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h b/Gems/AWSCore/Code/Source/Editor/Constants/AWSCoreEditorMenuLinks.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
rename to Gems/AWSCore/Code/Source/Editor/Constants/AWSCoreEditorMenuLinks.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h b/Gems/AWSCore/Code/Source/Editor/Constants/AWSCoreEditorMenuNames.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
rename to Gems/AWSCore/Code/Source/Editor/Constants/AWSCoreEditorMenuNames.h
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
rename to Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.h
diff --git a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
index 858d30fa40..49f800dbea 100644
--- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
@@ -58,7 +58,7 @@ namespace AWSCore
         if (m_isDebug)
         {
             return AZStd::string::format(
-                "\"%s\" debug -B \"%s\" --binaries-path \"%s\" --debug --profile \"%s\" --config-path \"%s\" --log-path \"%s\"",
+                "\"%s\" " AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT "-B \"%s\" --binaries-path \"%s\" --debug --profile \"%s\" --config-path \"%s\" --log-path \"%s\"",
                 m_enginePythonEntryPath.c_str(), m_toolScriptPath.c_str(), m_toolQtBinDirectoryPath.c_str(),
                 profileName.c_str(), m_toolConfigDirectoryPath.c_str(), m_toolLogDirectoryPath.c_str());
         }
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.h
similarity index 94%
rename from Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
rename to Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.h
index 1a4c428e68..a065773743 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.h
@@ -13,6 +13,8 @@
 #include <QAction>
 #include <QObject>
 
+#include "AWSCoreEditor_Traits_Platform.h"
+
 namespace AWSCore
 {
     class AWSCoreResourceMappingToolAction
@@ -22,7 +24,7 @@ namespace AWSCore
         static constexpr const char AWSCoreResourceMappingToolActionName[] = "AWSCoreResourceMappingToolAction";
         static constexpr const char ResourceMappingToolDirectoryPath[] = "Gems/AWSCore/Code/Tools/ResourceMappingTool";
         static constexpr const char ResourceMappingToolLogDirectoryPath[] = "user/log/";
-        static constexpr const char EngineWindowsPythonEntryScriptPath[] = "python/python.cmd";
+        static constexpr const char EngineWindowsPythonEntryScriptPath[] = AWSCORE_EDITOR_PYTHON_COMMAND;
 
         AWSCoreResourceMappingToolAction(const QString& text, QObject* parent = nullptr);
 
diff --git a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingConstants.h b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingConstants.h
new file mode 100644
index 0000000000..e9d063eb5f
--- /dev/null
+++ b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingConstants.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+namespace AWSCore
+{
+    static constexpr const char AWSChinaRegionPrefix[] = "cn-";
+
+    static constexpr const char AWSFeatureGemRESTApiIdKeyNameSuffix[] = ".RESTApiId";
+    static constexpr const char AWSFeatureGemRESTApiStageKeyNameSuffix[] = ".RESTApiStage";
+
+    static constexpr const char ResourceMappingAccountIdKeyName[] = "AccountId";
+    static constexpr const char ResourceMappingResourcesKeyName[] = "AWSResourceMappings";
+    static constexpr const char ResourceMappingNameIdKeyName[] = "Name/ID";
+    static constexpr const char ResourceMappingRegionKeyName[] = "Region";
+    static constexpr const char ResourceMappingTypeKeyName[] = "Type";
+    static constexpr const char ResourceMappingVersionKeyName[] = "Version";
+
+    static constexpr const char ResourceMapppingJsonSchemaFilePath[] =
+        "Gems/AWSCore/resource_mapping_schema.json";
+} // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
index faec07b19e..d6a3912523 100644
--- a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
+++ b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp
@@ -12,6 +12,7 @@
 #include <AzCore/Serialization/Json/JsonUtils.h>
 #include <AzCore/Settings/SettingsRegistry.h>
 #include <AzCore/Settings/SettingsRegistryImpl.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 
 #include <AWSCoreInternalBus.h>
@@ -244,14 +245,16 @@ namespace AWSCore
 
     bool AWSResourceMappingManager::ValidateJsonDocumentAgainstSchema(const rapidjson::Document& jsonDocument)
     {
-        rapidjson::Document jsonSchemaDocument;
-        if (jsonSchemaDocument.Parse(ResourceMappingJsonSchema).HasParseError())
+        AZ::IO::Path executablePath = AZ::IO::PathView(AZ::Utils::GetExecutableDirectory());
+        AZ::IO::Path jsonSchemaPath = (executablePath / ResourceMapppingJsonSchemaFilePath).LexicallyNormal();
+        AZ::Outcome<rapidjson::Document, AZStd::string> readJsonOutcome = AZ::JsonSerializationUtils::ReadJsonFile(jsonSchemaPath.c_str());
+        if (!readJsonOutcome.IsSuccess() || readJsonOutcome.TakeValue().ObjectEmpty())
         {
             AZ_Error(AWSResourceMappingManagerName, false, ResourceMappingFileInvalidSchemaErrorMessage);
             return false;
         }
 
-        auto jsonSchema = rapidjson::SchemaDocument(jsonSchemaDocument);
+        auto jsonSchema = rapidjson::SchemaDocument(readJsonOutcome.TakeValue());
         rapidjson::SchemaValidator validator(jsonSchema);
 
         if (!jsonDocument.Accept(validator))
diff --git a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingManager.h b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingManager.h
rename to Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.h
diff --git a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingUtils.h b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingUtils.h
similarity index 100%
rename from Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingUtils.h
rename to Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingUtils.h
diff --git a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
index fb03dea4c0..fd37e6e228 100644
--- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
@@ -59,6 +59,34 @@ R"({
     "Version": "1.0.0"
 })";
 
+static constexpr const char TEST_VALID_EMPTY_ACCOUNTID_RESOURCE_MAPPING_CONFIG_FILE[] =
+    R"({
+    "AWSResourceMappings": {
+        "TestLambda": {
+            "Type": "AWS::Lambda::Function",
+            "Name/ID": "MyTestLambda",
+            "Region": "us-east-1",
+            "AccountId": "012345678912"
+        },
+        "TestS3Bucket": {
+            "Type": "AWS::S3::Bucket",
+            "Name/ID": "MyTestS3Bucket"
+        },
+        "TestService.RESTApiId": {
+            "Type": "AWS::ApiGateway::RestApi",
+            "Name/ID": "1234567890"
+        },
+        "TestService.RESTApiStage": {
+            "Type": "AWS::ApiGateway::Stage",
+            "Name/ID": "prod",
+            "Region": "us-east-1"
+        }
+    },
+    "AccountId": "",
+    "Region": "us-west-2",
+    "Version": "1.1.0"
+})";
+
 static constexpr const char TEST_INVALID_RESOURCE_MAPPING_CONFIG_FILE[] =
 R"({
     "AWSResourceMappings": {},
@@ -93,7 +121,7 @@ public:
 
     void SetUp() override
     {
-        AWSCoreFixture::SetUp();
+        AWSCoreFixture::SetUpFixture(false);
 
         m_normalizedSourceProjectFolder = AZStd::string::format("%s/%s%s/", AZ::Test::GetCurrentExecutablePath().c_str(),
             "AWSResourceMappingManager", AZ::Uuid::CreateRandom().ToString<AZStd::string>(false, false).c_str());
@@ -114,7 +142,7 @@ public:
         m_resourceMappingManager->DeactivateManager();
         m_resourceMappingManager.reset();
 
-        AWSCoreFixture::TearDown();
+        AWSCoreFixture::TearDownFixture(false);
     }
 
     // AWSCoreInternalRequestBus interface implementation
@@ -237,6 +265,21 @@ TEST_F(AWSResourceMappingManagerTest, ActivateManager_ParseValidConfigFile_Confi
     EXPECT_TRUE(actualEbusCalls == testThreadNumber);
 }
 
+TEST_F(AWSResourceMappingManagerTest, ActivateManager_ParseValidConfigFile_GlobalAccountIdEmpty)
+{
+    CreateTestConfigFile(TEST_VALID_EMPTY_ACCOUNTID_RESOURCE_MAPPING_CONFIG_FILE);
+    m_resourceMappingManager->ActivateManager();
+
+    AZStd::string actualAccountId;
+    AZStd::string actualRegion;
+    AWSResourceMappingRequestBus::BroadcastResult(actualAccountId, &AWSResourceMappingRequests::GetDefaultAccountId);
+    AWSResourceMappingRequestBus::BroadcastResult(actualRegion, &AWSResourceMappingRequests::GetDefaultRegion);
+    EXPECT_EQ(m_reloadConfigurationCounter, 0);
+    EXPECT_TRUE(actualAccountId.empty());
+    EXPECT_FALSE(actualRegion.empty());
+    EXPECT_TRUE(m_resourceMappingManager->GetStatus() == AWSResourceMappingManager::Status::Ready);
+}
+
 TEST_F(AWSResourceMappingManagerTest, DeactivateManager_AfterActivatingWithValidConfigFile_ConfigDataGetCleanedUp)
 {
     CreateTestConfigFile(TEST_VALID_RESOURCE_MAPPING_CONFIG_FILE);
diff --git a/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h b/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h
index 1d14484387..65e609b490 100644
--- a/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h
+++ b/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/Memory/PoolAllocator.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/Settings/SettingsRegistryImpl.h>
@@ -111,6 +112,11 @@ public:
     ~AWSCoreFixture() override = default;
 
     void SetUp() override
+    {
+        SetUpFixture();
+    }
+
+    void SetUpFixture(bool mockSettingsRegistry = true)
     {
         AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Create();
         AZ::AllocatorInstance<AZ::PoolAllocator>::Create();
@@ -120,14 +126,33 @@ public:
         AZ::IO::FileIOBase::SetInstance(nullptr);
         AZ::IO::FileIOBase::SetInstance(m_localFileIO);
 
-        m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
-        AZ::SettingsRegistry::Register(m_settingsRegistry.get());
+        if (mockSettingsRegistry)
+        {
+            m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
+            AZ::SettingsRegistry::Register(m_settingsRegistry.get());
+        }
+        else
+        {
+            m_app = AZStd::make_unique<AZ::ComponentApplication>();
+        }
     }
 
     void TearDown() override
     {
-        AZ::SettingsRegistry::Unregister(m_settingsRegistry.get());
-        m_settingsRegistry.reset();
+        TearDownFixture();
+    }
+
+    void TearDownFixture(bool mockSettingsRegistry = true) 
+    {
+        if (mockSettingsRegistry)
+        {
+            AZ::SettingsRegistry::Unregister(m_settingsRegistry.get());
+            m_settingsRegistry.reset();
+        }
+        else
+        {
+            m_app.reset();
+        }
 
         AZ::IO::FileIOBase::SetInstance(nullptr);
 
@@ -173,4 +198,5 @@ private:
 
 protected:
     AZStd::unique_ptr<AZ::SettingsRegistryImpl> m_settingsRegistry;
+    AZStd::unique_ptr<AZ::ComponentApplication> m_app;
 };
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md
index e09ecc281f..ba764dc993 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md
@@ -17,7 +17,7 @@ Or follow **AWS CLI** configuration which can be reused by boto3 lib:
 1. In order to use engine python environment, it requires to link Qt binaries for this tool.
 Follow cmake instructions to configure your project, for example:
    ```
-   $ cmake -B <BUILD_FOLDER> -S . -G "Visual Studio 16 2019" -DLY_3RDPARTY_PATH=<PATH_TO_3RDPARTY> -DLY_PROJECTS=<PROJECT_NAME>
+   $ cmake -B <BUILD_FOLDER> -S . -G "Visual Studio 16 2019" -DLY_PROJECTS=<PROJECT_NAME>
    ```
 
 2. At this point, double check engine python environment gets setup under *<ENGINE_ROOT_PATH>/python/runtime* directory
@@ -39,6 +39,16 @@ Follow cmake instructions to configure your project, for example:
       ```
       $ python\python.cmd debug Gems\AWSCore\Code\Tools\ResourceMappingTool\resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>\bin\debug\AWSCoreEditorQtBin
       ```
+   * Linux
+      * release mode
+      ```
+      $ python/python.sh Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>/bin/profile/AWSCoreEditorQtBin
+      ```
+      * debug mode
+      ```
+      $ python/python.sh Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py --binaries_path <PATH_TO_BUILD_FOLDER>/bin/debug/AWSCoreEditorQtBin
+      ```
+      
 * Note - Editor is integrated with the same engine python environment to launch Resource Mapping Tool. If it is failed to launch the tool
 in Editor, please follow above steps to make sure expected scripts/binaries are present.
 
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py
index bdfe7fa11e..39f7b5ccf1 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/controller/view_edit_controller.py
@@ -69,17 +69,13 @@ class ViewEditController(QObject):
         json_dict: Dict[str, any] = \
             json_utils.convert_resources_to_json_dict(self._proxy_model.get_resources(), self._config_file_json_source)
 
-        configuration: Configuration = self._configuration_manager.configuration
-        if json_dict.get(json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME) == \
-                json_utils.RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE:
-            json_dict[json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME] = configuration.account_id
-
         if json_dict == self._config_file_json_source:
             # skip because no difference found against existing json file
             return True
 
         # try to write in memory json content into json file
         try:
+            configuration: Configuration = self._configuration_manager.configuration
             config_file_full_path: str = file_utils.join_path(configuration.config_directory, config_file_name)
             json_utils.write_into_json_file(config_file_full_path, json_dict)
             self._config_file_json_source = json_dict
diff --git a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json
similarity index 52%
rename from Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h
rename to Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json
index 97eb5b6492..21bc3334ce 100644
--- a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json
@@ -1,42 +1,16 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-namespace AWSCore
 {
-    static constexpr const char AWSChinaRegionPrefix[] = "cn-";
-
-    static constexpr const char AWSFeatureGemRESTApiIdKeyNameSuffix[] = ".RESTApiId";
-    static constexpr const char AWSFeatureGemRESTApiStageKeyNameSuffix[] = ".RESTApiStage";
-
-    static constexpr const char ResourceMappingAccountIdKeyName[] = "AccountId";
-    static constexpr const char ResourceMappingResourcesKeyName[] = "AWSResourceMappings";
-    static constexpr const char ResourceMappingNameIdKeyName[] = "Name/ID";
-    static constexpr const char ResourceMappingRegionKeyName[] = "Region";
-    static constexpr const char ResourceMappingTypeKeyName[] = "Type";
-    static constexpr const char ResourceMappingVersionKeyName[] = "Version";
-
-    // TODO: move this into an independent file under AWSCore gem, if resource mapping tool can reuse it
-    static constexpr const char ResourceMappingJsonSchema[] =
-        R"({
     "$schema": "http://json-schema.org/draft-04/schema",
     "type": "object",
-    "title": "The AWS Resource Mapping Root schema",
+    "title": "O3DE AWS Resource mapping file schema",
     "required": ["AWSResourceMappings", "AccountId", "Region", "Version"],
     "properties": {
         "AWSResourceMappings": {
             "type": "object",
-            "title": "The AWSResourceMappings schema",
+            "title": "AWS resource mappings schema",
             "patternProperties": {
                 "^.+$": {
                     "type": "object",
-                    "title": "The AWS Resource Entry schema",
+                    "title": "AWS resource entry schema",
                     "required": ["Type", "Name/ID"],
                     "properties": {
                         "Type": {
@@ -68,7 +42,7 @@ namespace AWSCore
     },
     "AccountIdString": {
         "type": "string",
-        "pattern": "^[0-9]{12}$|EMPTY"
+        "pattern": "^[0-9]{12}$|EMPTY|^$"
     },
     "NonEmptyString": {
         "type": "string",
@@ -79,6 +53,4 @@ namespace AWSCore
         "pattern": "^[a-z]{2}-[a-z]{4,9}-[0-9]{1}$"
     },
     "additionalProperties": false
-})";
-
-} // namespace AWSCore
+}
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
index 2351fd001b..a3283cbb28 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py
@@ -10,6 +10,7 @@ import logging
 import sys
 
 from utils import environment_utils
+from utils import json_utils
 from utils import file_utils
 
 # arguments setup
@@ -20,6 +21,7 @@ argument_parser.add_argument('--debug', action='store_true', help='Execute on de
 argument_parser.add_argument('--log-path', help='Path to resource mapping tool logging directory '
                                                 '(if not provided, logging file will be located at tool directory)')
 argument_parser.add_argument('--profile', default='default', help='Named AWS profile to use for querying AWS resources')
+
 arguments: Namespace = argument_parser.parse_args()
 
 # logging setup
@@ -74,6 +76,15 @@ if __name__ == "__main__":
     except FileNotFoundError:
         logger.warning("Failed to load style sheet for resource mapping tool")
 
+    try:
+        schema_path: str = file_utils.join_path(file_utils.get_parent_directory_path(__file__),
+                                                'resource_mapping_schema.json')
+        json_utils.load_resource_mapping_json_schema(schema_path)
+    except (FileNotFoundError, ValueError, KeyError) as e:
+        logger.error(f"Failed to load schema file {e}")
+        environment_utils.cleanup_qt_environment()
+        exit(-1)
+
     logger.info("Initializing configuration manager ...")
     configuration_manager: ConfigurationManager = ConfigurationManager()
     configuration_error: bool = not configuration_manager.setup(arguments.profile, arguments.config_path)
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_view_edit_controller.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_view_edit_controller.py
index c73bddcd9c..41d4490c44 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_view_edit_controller.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/controller/test_view_edit_controller.py
@@ -420,8 +420,30 @@ class TestViewEditController(TestCase):
         self._mocked_view_edit_page.config_file_combobox.currentText.return_value = \
             TestViewEditController._expected_config_file_name
         expected_json_dict: Dict[str, any] = {
-            "dummyKey": "dummyValue",
-            self._expected_account_id_attribute_name: self._expected_account_id_template_vale}
+            "dummyKey": "dummyValue"
+        }
+        mock_json_utils.validate_resources_according_to_json_schema.return_value = []
+        mock_json_utils.convert_resources_to_json_dict.return_value = expected_json_dict
+        mock_file_utils.join_path.return_value = TestViewEditController._expected_config_file_full_path
+        mocked_call_args: call = self._mocked_view_edit_page.save_changes_button.clicked.connect.call_args[0]
+
+        mocked_call_args[0]()  # triggering save_changes_button connected function
+        mock_json_utils.convert_resources_to_json_dict.assert_called_once()
+        mock_json_utils.write_into_json_file.assert_called_once_with(
+            TestViewEditController._expected_config_file_full_path, expected_json_dict)
+        self._mocked_proxy_model.override_all_resources_status.assert_called_once_with(
+            ResourceMappingAttributesStatus(ResourceMappingAttributesStatus.SUCCESS_STATUS_VALUE,
+                                            [ResourceMappingAttributesStatus.SUCCESS_STATUS_VALUE]))
+
+    @patch("controller.view_edit_controller.file_utils")
+    @patch("controller.view_edit_controller.json_utils")
+    def test_page_save_changes_button_json_file_saved_and_template_account_id_unchanged(
+            self, mock_json_utils: MagicMock, mock_file_utils: MagicMock) -> None:
+        self._mocked_view_edit_page.config_file_combobox.currentText.return_value = \
+            TestViewEditController._expected_config_file_name
+        expected_json_dict: Dict[str, any] = {
+            self._expected_account_id_attribute_name: self._expected_account_id_template_vale
+        }
         mock_json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME = self._expected_account_id_attribute_name
         mock_json_utils.RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE = self._expected_account_id_template_vale
         mock_json_utils.validate_resources_according_to_json_schema.return_value = []
@@ -430,7 +452,31 @@ class TestViewEditController(TestCase):
         mocked_call_args: call = self._mocked_view_edit_page.save_changes_button.clicked.connect.call_args[0]
 
         mocked_call_args[0]()  # triggering save_changes_button connected function
-        assert expected_json_dict["AccountId"] == self._mocked_configuration_manager.configuration.account_id
+        assert expected_json_dict[mock_json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME] == self._expected_account_id_template_vale
+        mock_json_utils.convert_resources_to_json_dict.assert_called_once()
+        mock_json_utils.write_into_json_file.assert_called_once_with(
+            TestViewEditController._expected_config_file_full_path, expected_json_dict)
+        self._mocked_proxy_model.override_all_resources_status.assert_called_once_with(
+            ResourceMappingAttributesStatus(ResourceMappingAttributesStatus.SUCCESS_STATUS_VALUE,
+                                            [ResourceMappingAttributesStatus.SUCCESS_STATUS_VALUE]))
+
+    @patch("controller.view_edit_controller.file_utils")
+    @patch("controller.view_edit_controller.json_utils")
+    def test_page_save_changes_button_json_file_saved_and_empty_account_id_unchanged(
+            self, mock_json_utils: MagicMock, mock_file_utils: MagicMock) -> None:
+        self._mocked_view_edit_page.config_file_combobox.currentText.return_value = \
+            TestViewEditController._expected_config_file_name
+        expected_json_dict: Dict[str, any] = {
+            self._expected_account_id_attribute_name: ''
+        }
+        mock_json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME = self._expected_account_id_attribute_name
+        mock_json_utils.validate_resources_according_to_json_schema.return_value = []
+        mock_json_utils.convert_resources_to_json_dict.return_value = expected_json_dict
+        mock_file_utils.join_path.return_value = TestViewEditController._expected_config_file_full_path
+        mocked_call_args: call = self._mocked_view_edit_page.save_changes_button.clicked.connect.call_args[0]
+
+        mocked_call_args[0]()  # triggering save_changes_button connected function
+        assert expected_json_dict[mock_json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME] == ''
         mock_json_utils.convert_resources_to_json_dict.assert_called_once()
         mock_json_utils.write_into_json_file.assert_called_once_with(
             TestViewEditController._expected_config_file_full_path, expected_json_dict)
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py
index 756d6fdb10..3d36a56468 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py
@@ -5,6 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
+import platform
 from typing import List
 from unittest import TestCase
 from unittest.mock import (ANY, call, MagicMock, patch)
@@ -27,14 +28,24 @@ class TestEnvironmentUtils(TestCase):
         self.addCleanup(os_pathsep_patcher.stop)
         self._mock_os_pathsep: MagicMock = os_pathsep_patcher.start()
 
-    def test_setup_qt_environment_global_flag_is_set(self) -> None:
+    @patch('os.path.exists')
+    @patch('ctypes.CDLL')
+    def test_setup_qt_environment_global_flag_is_set(self, mock_os_path_exists, mock_ctype_cdll) -> None:
+        mock_os_path_exists.return_value = True
         environment_utils.setup_qt_environment("dummy")
         self._mock_os_environ.copy.assert_called_once()
         self._mock_os_pathsep.join.assert_called_once()
         assert environment_utils.is_qt_linked() is True
+        if platform.system() == 'Linux':
+            mock_os_path_exists.assert_called()
 
-    def test_cleanup_qt_environment_global_flag_is_set(self) -> None:
+    @patch('os.path.exists')
+    @patch('ctypes.CDLL')
+    def test_cleanup_qt_environment_global_flag_is_set(self, mock_os_path_exists, mock_ctype_cdll) -> None:
+        mock_os_path_exists.return_value = True
         environment_utils.setup_qt_environment("dummy")
         assert environment_utils.is_qt_linked() is True
         environment_utils.cleanup_qt_environment()
         assert environment_utils.is_qt_linked() is False
+        if platform.system() == 'Linux':
+            mock_os_path_exists.assert_called()
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py
index fe0f1754f3..e74771f1ef 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py
@@ -68,12 +68,65 @@ class TestFileUtils(TestCase):
         self._mock_path.cwd.assert_called_once()
         assert actual_path_name == TestFileUtils._expected_path_name
 
-    def test_get_parent_directory_path_return_expected_path_name(self) -> None:
-        self._mock_path.return_value.parent = TestFileUtils._expected_path_name
+    def test_get_parent_directory_path_return_empty_when_invalid_input(self) -> None:
+        mocked_path: MagicMock = self._mock_path.return_value
+        mocked_path.exists.return_value = False
 
         actual_path_name: str = file_utils.get_parent_directory_path("dummy")
         self._mock_path.assert_called_once()
-        assert actual_path_name == TestFileUtils._expected_path_name
+        assert actual_path_name == ""
+
+    def test_get_parent_directory_path_return_empty_when_parent_invalid(self) -> None:
+        mocked_path: MagicMock = self._mock_path.return_value
+        mocked_path.exists.return_value = True
+        mocked_parent_path: MagicMock = MagicMock()
+        mocked_path.parent = mocked_parent_path
+        mocked_parent_path.exists.return_value = False
+
+        actual_path_name: str = file_utils.get_parent_directory_path("dummy")
+        self._mock_path.assert_called()
+        assert actual_path_name == ""
+
+    def test_get_parent_directory_path_return_expected_path_when_parent_valid(self) -> None:
+        mocked_path: MagicMock = self._mock_path.return_value
+        mocked_path.exists.return_value = True
+        mocked_parent_path: MagicMock = MagicMock()
+        mocked_path.parent = mocked_parent_path
+        mocked_parent_path.exists.return_value = True
+        mocked_parent_path.resolve.return_value = TestFileUtils._expected_file_name
+
+        actual_path_name: str = file_utils.get_parent_directory_path("dummy")
+        self._mock_path.assert_called()
+        assert actual_path_name == TestFileUtils._expected_file_name
+
+    def test_get_parent_directory_path_return_empty_when_level_two_parent_invalid(self) -> None:
+        mocked_path: MagicMock = self._mock_path.return_value
+        mocked_path.exists.return_value = True
+        mocked_parent_path1: MagicMock = MagicMock()
+        mocked_path.parent = mocked_parent_path1
+        mocked_parent_path1.exists.return_value = True
+        mocked_parent_path2: MagicMock = MagicMock()
+        mocked_parent_path1.parent = mocked_parent_path2
+        mocked_parent_path2.exists.return_value = False
+
+        actual_path_name: str = file_utils.get_parent_directory_path("dummy", 2)
+        self._mock_path.assert_called()
+        assert actual_path_name == ""
+
+    def test_get_parent_directory_path_return_expected_path_when_level_two_parent_valid(self) -> None:
+        mocked_path: MagicMock = self._mock_path.return_value
+        mocked_path.exists.return_value = True
+        mocked_parent_path1: MagicMock = MagicMock()
+        mocked_path.parent = mocked_parent_path1
+        mocked_parent_path1.exists.return_value = True
+        mocked_parent_path2: MagicMock = MagicMock()
+        mocked_parent_path1.parent = mocked_parent_path2
+        mocked_parent_path2.exists.return_value = True
+        mocked_parent_path2.resolve.return_value = TestFileUtils._expected_file_name
+
+        actual_path_name: str = file_utils.get_parent_directory_path("dummy", 2)
+        self._mock_path.assert_called()
+        assert actual_path_name == TestFileUtils._expected_file_name
 
     def test_find_files_with_suffix_under_directory_return_expected_file_name(self) -> None:
         mocked_path: MagicMock = self._mock_path.return_value
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py
index 7eb92ff222..819bfb72fc 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py
@@ -10,6 +10,7 @@ from typing import (Dict, List)
 from unittest import TestCase
 from unittest.mock import (MagicMock, mock_open, patch)
 
+from utils import file_utils
 from utils import json_utils
 from model import constants
 from model.resource_mapping_attributes import (ResourceMappingAttributes, ResourceMappingAttributesBuilder,
@@ -49,6 +50,10 @@ class TestJsonUtils(TestCase):
     }
 
     def setUp(self) -> None:
+        schema_path: str = file_utils.join_path(file_utils.get_parent_directory_path(__file__, 4),
+                                                'resource_mapping_schema.json')
+        json_utils.load_resource_mapping_json_schema(schema_path)
+
         self._mock_open = mock_open()
         open_patcher: patch = patch("utils.json_utils.open", self._mock_open)
         self.addCleanup(open_patcher.stop)
@@ -103,6 +108,11 @@ class TestJsonUtils(TestCase):
         invalid_json_dict.pop(json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME)
         self.assertRaises(KeyError, json_utils.validate_json_dict_according_to_json_schema, invalid_json_dict)
 
+    def test_validate_json_dict_according_to_json_schema_raise_error_when_json_dict_has_empty_accountid(self) -> None:
+        valid_json_dict: Dict[str, any] = copy.deepcopy(TestJsonUtils._expected_json_dict)
+        valid_json_dict[json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME] = ''
+        json_utils.validate_json_dict_according_to_json_schema(valid_json_dict)
+
     def test_validate_json_dict_according_to_json_schema_pass_when_json_dict_has_template_accountid(self) -> None:
         valid_json_dict: Dict[str, any] = copy.deepcopy(TestJsonUtils._expected_json_dict)
         valid_json_dict[json_utils.RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME] = \
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py
index 8600fe31b5..b67f64e715 100644
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py
@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 
 import logging
 import os
+import platform
 from typing import Dict
 
 from utils import file_utils
@@ -38,6 +39,20 @@ def setup_qt_environment(bin_path: str) -> None:
     new_path = os.pathsep.join([binaries_path, path])
     os.environ['PATH'] = new_path
 
+    # On Linux, we need to load pyside2 and related modules as well
+    if platform.system() == 'Linux':
+        import ctypes
+
+        preload_shared_libs = [f'{bin_path}/libpyside2.abi3.so.5.14',
+                               f'{bin_path}/libQt5Widgets.so.5']
+
+        for preload_shared_lib in preload_shared_libs:
+            if not os.path.exists(preload_shared_lib):
+                logger.error(f"Cannot find required shared library at {preload_shared_lib}")
+                return
+            else:
+                ctypes.CDLL(preload_shared_lib)
+
     global qt_binaries_linked
     qt_binaries_linked = True
 
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py
index 9e5dd9617b..9899c5dbb2 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py
@@ -33,8 +33,29 @@ def get_current_directory_path() -> str:
     return str(pathlib.Path.cwd())
 
 
-def get_parent_directory_path(file_path: str) -> str:
-    return pathlib.Path(file_path).parent
+def get_parent_directory_path(file_path: str, level: int = 1) -> str:
+    """
+    Get parent directory path based on requested file path
+    :param file_path: The requested file path
+    :param level: The level of parent directory, default value is 1
+    :return The string value of parent directory path if exist; otherwise empty string
+    """
+    if not pathlib.Path(file_path).exists():
+        return ""
+
+    result: pathlib.Path = pathlib.Path(file_path).parent
+    current_level: int = 1
+    while current_level < level:
+        current_level += 1
+        if result.exists():
+            result = result.parent
+        else:
+            return ""
+
+    if not result.exists():
+        return ""
+    else:
+        return result.resolve()
 
 
 def find_files_with_suffix_under_directory(dir_path: str, suffix: str) -> List[str]:
diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
index 5b9377ada3..3af9b9ff4a 100755
--- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
+++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py
@@ -19,18 +19,29 @@ Json Utils provide related functions to read/write/serialize/deserialize json fo
 """
 logger = logging.getLogger(__name__)
 
+# resource mapping json content constants
 _RESOURCE_MAPPING_JSON_KEY_NAME: str = "AWSResourceMappings"
 _RESOURCE_MAPPING_TYPE_JSON_KEY_NAME: str = "Type"
 _RESOURCE_MAPPING_NAMEID_JSON_KEY_NAME: str = "Name/ID"
 _RESOURCE_MAPPING_REGION_JSON_KEY_NAME: str = "Region"
 _RESOURCE_MAPPING_VERSION_JSON_KEY_NAME: str = "Version"
-_RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.0.0"
-
+_RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.1.0"
 RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME: str = "AccountId"
 RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE: str = "EMPTY"
-_RESOURCE_MAPPING_ACCOUNTID_PATTERN: str = f"^[0-9]{{12}}|{RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE}$"
-_RESOURCE_MAPPING_REGION_PATTERN: str = "^[a-z]{2}-[a-z]{4,9}-[0-9]{1}$"
-_RESOURCE_MAPPING_VERSION_PATTERN: str = "^[0-9]{1}.[0-9]{1}.[0-9]{1}$"
+
+# resource mapping json schema constants
+_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_KEY_NAME: str = "AccountIdString"
+_RESOURCE_MAPPING_SCHEMA_REGION_KEY_NAME: str = "RegionString"
+_RESOURCE_MAPPING_SCHEMA_REQUIRED_PROPERTIES_KEY_NAME: str = "required"
+_RESOURCE_MAPPING_SCHEMA_PROPERTIES_KEY_NAME: str = "properties"
+_RESOURCE_MAPPING_SCHEMA_PATTERN_PROPERTIES_KEY_NAME: str = "patternProperties"
+_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME: str = "pattern"
+_RESOURCE_MAPPING_SCHEMA: Dict[str, any] = {}
+_RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES: List[str] = []
+_RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES: List[str] = []
+_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN: str = ""
+_RESOURCE_MAPPING_SCHEMA_REGION_PATTERN: str = ""
+_RESOURCE_MAPPING_SCHEMA_VERSION_PATTERN: str = ""
 
 def _add_validation_error_message(errors: Dict[int, List[str]], row: int, error_message: str) -> None:
     if row in errors.keys():
@@ -119,6 +130,26 @@ def convert_json_dict_to_resources(json_dict: Dict[str, any]) -> List[ResourceMa
     return resources
 
 
+def load_resource_mapping_json_schema(schema_path: str) -> None:
+    global _RESOURCE_MAPPING_SCHEMA, _RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES, _RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES,\
+        _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN, _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN, _RESOURCE_MAPPING_SCHEMA_VERSION_PATTERN
+
+    if not _RESOURCE_MAPPING_SCHEMA:
+        # assume schema should be in correct format, and manually load expected pattern; tool will log error if schema is invalid
+        _RESOURCE_MAPPING_SCHEMA = read_from_json_file(schema_path)
+        _RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES = _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_REQUIRED_PROPERTIES_KEY_NAME]
+        schema_properties: Dict[str, any] = _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_PROPERTIES_KEY_NAME]
+        schema_pattern_properties: Dict[str, any] = \
+            schema_properties[_RESOURCE_MAPPING_JSON_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PATTERN_PROPERTIES_KEY_NAME]
+        _RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES = list(schema_pattern_properties.values())[0][_RESOURCE_MAPPING_SCHEMA_REQUIRED_PROPERTIES_KEY_NAME]
+        _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN = \
+            _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME]
+        _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN = \
+            _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_REGION_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME]
+        _RESOURCE_MAPPING_SCHEMA_VERSION_PATTERN = \
+            schema_properties[_RESOURCE_MAPPING_VERSION_JSON_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME]
+
+
 def read_from_json_file(file_name: str) -> Dict[str, any]:
     try:
         json_dict: Dict[str, any] = {}
@@ -166,20 +197,20 @@ def validate_resources_according_to_json_schema(resources: List[ResourceMappingA
                 invalid_resources, row_count,
                 error_messages.INVALID_FORMAT_DUPLICATED_KEY_ERROR_MESSAGE.format(resource.key_name))
 
-        if not re.match(_RESOURCE_MAPPING_ACCOUNTID_PATTERN, resource.account_id):
+        if not re.match(_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN, resource.account_id):
             _add_validation_error_message(
                 invalid_resources, row_count,
                 error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_TABLE_ERROR_MESSAGE.format(
                     resource.account_id,
                     RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME,
-                    _RESOURCE_MAPPING_ACCOUNTID_PATTERN))
+                    _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN))
 
-        if not re.match(_RESOURCE_MAPPING_REGION_PATTERN, resource.region):
+        if not re.match(_RESOURCE_MAPPING_SCHEMA_REGION_PATTERN, resource.region):
             _add_validation_error_message(
                 invalid_resources, row_count,
                 error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_TABLE_ERROR_MESSAGE.format(
                     resource.region, _RESOURCE_MAPPING_REGION_JSON_KEY_NAME,
-                    _RESOURCE_MAPPING_REGION_PATTERN))
+                    _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN))
 
         row_count += 1
 
@@ -187,30 +218,32 @@ def validate_resources_according_to_json_schema(resources: List[ResourceMappingA
 
 
 def validate_json_dict_according_to_json_schema(json_dict: Dict[str, any]) -> None:
-    _validate_required_key_in_json_dict(json_dict, "root", _RESOURCE_MAPPING_VERSION_JSON_KEY_NAME)
-    _validate_required_key_in_json_dict(json_dict, "root", _RESOURCE_MAPPING_JSON_KEY_NAME)
+    # The reason we keep this manual json schema validation is python missing supportive feature in default libs
+    # When it is ready, we should be able to replace this with straightforward lib function call
+    root_property: str
+    for root_property in _RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES:
+        _validate_required_key_in_json_dict(json_dict, "root", root_property)
 
-    _validate_required_key_in_json_dict(json_dict, "root", RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME)
-    if not re.match(_RESOURCE_MAPPING_ACCOUNTID_PATTERN, json_dict[RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME]):
+    if not re.match(_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN, json_dict[RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME]):
         raise ValueError(error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_FILE_ERROR_MESSAGE.format(
             json_dict[RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME],
             f"root/{RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME}",
-            _RESOURCE_MAPPING_ACCOUNTID_PATTERN))
+            _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN))
 
-    _validate_required_key_in_json_dict(json_dict, "root", _RESOURCE_MAPPING_REGION_JSON_KEY_NAME)
-    if not re.match(_RESOURCE_MAPPING_REGION_PATTERN, json_dict[_RESOURCE_MAPPING_REGION_JSON_KEY_NAME]):
+    if not re.match(_RESOURCE_MAPPING_SCHEMA_REGION_PATTERN, json_dict[_RESOURCE_MAPPING_REGION_JSON_KEY_NAME]):
         raise ValueError(error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_FILE_ERROR_MESSAGE.format(
             json_dict[_RESOURCE_MAPPING_REGION_JSON_KEY_NAME],
             f"root/{_RESOURCE_MAPPING_REGION_JSON_KEY_NAME}",
-            _RESOURCE_MAPPING_REGION_PATTERN))
+            _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN))
 
     json_resources: Dict[str, any] = json_dict[_RESOURCE_MAPPING_JSON_KEY_NAME]
     if json_resources:
         resource_key: str
         resource_value: Dict[str, str]
         for resource_key, resource_value in json_resources.items():
-            _validate_required_key_in_json_dict(resource_value, resource_key, _RESOURCE_MAPPING_TYPE_JSON_KEY_NAME)
-            _validate_required_key_in_json_dict(resource_value, resource_key, _RESOURCE_MAPPING_NAMEID_JSON_KEY_NAME)
+            resource_property: str
+            for resource_property in _RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES:
+                _validate_required_key_in_json_dict(resource_value, resource_key, resource_property)
 
 
 def write_into_json_file(file_name: str, json_dict: Dict[str, any]) -> None:
diff --git a/Gems/AWSCore/Code/awscore_editor_files.cmake b/Gems/AWSCore/Code/awscore_editor_files.cmake
index 44ba91a5d3..ebca45454e 100644
--- a/Gems/AWSCore/Code/awscore_editor_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_files.cmake
@@ -7,25 +7,25 @@
 #
 
 set(FILES
-    Include/Private/AWSCoreEditorSystemComponent.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionManager.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h
-    Include/Private/Editor/Attribution/AWSAttributionServiceApi.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h
-    Include/Private/Editor/AWSCoreEditorManager.h
-    Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
-    Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
-    Include/Private/Editor/UI/AWSCoreEditorMenu.h
-    Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
     Source/AWSCoreEditorSystemComponent.cpp
-    Source/Editor/AWSCoreEditorManager.cpp
+    Source/AWSCoreEditorSystemComponent.h
+    Source/Editor/Attribution/AWSCoreAttributionConstant.h
     Source/Editor/Attribution/AWSCoreAttributionMetric.cpp
+    Source/Editor/Attribution/AWSCoreAttributionMetric.h
     Source/Editor/Attribution/AWSCoreAttributionManager.cpp
+    Source/Editor/Attribution/AWSCoreAttributionManager.h
     Source/Editor/Attribution/AWSCoreAttributionSystemComponent.cpp
+    Source/Editor/Attribution/AWSCoreAttributionSystemComponent.h
     Source/Editor/Attribution/AWSAttributionServiceApi.cpp
+    Source/Editor/Attribution/AWSAttributionServiceApi.h
     Source/Editor/Attribution/AWSCoreAttributionConsentDialog.cpp
+    Source/Editor/Attribution/AWSCoreAttributionConsentDialog.h
+    Source/Editor/AWSCoreEditorManager.cpp
+    Source/Editor/AWSCoreEditorManager.h
+    Source/Editor/Constants/AWSCoreEditorMenuLinks.h
+    Source/Editor/Constants/AWSCoreEditorMenuNames.h
     Source/Editor/UI/AWSCoreEditorMenu.cpp
+    Source/Editor/UI/AWSCoreEditorMenu.h
     Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
+    Source/Editor/UI/AWSCoreResourceMappingToolAction.h
 )
diff --git a/Gems/AWSCore/Code/awscore_editor_shared_files.cmake b/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
index b44a9ffcb1..8bf2abc7e0 100644
--- a/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSCoreEditorModule.h
     Source/AWSCoreEditorModule.cpp
+    Source/AWSCoreEditorModule.h
 )
diff --git a/Gems/AWSCore/Code/awscore_files.cmake b/Gems/AWSCore/Code/awscore_files.cmake
index 34c05891a7..9abc162f8a 100644
--- a/Gems/AWSCore/Code/awscore_files.cmake
+++ b/Gems/AWSCore/Code/awscore_files.cmake
@@ -7,50 +7,54 @@
 #
 
 set(FILES
-    Include/Public/AWSCoreBus.h
-    Include/Public/Credential/AWSCredentialBus.h
-    Include/Public/Framework/AWSApiClientJob.h
-    Include/Public/Framework/AWSApiClientJobConfig.h
-    Include/Public/Framework/AWSApiJob.h
-    Include/Public/Framework/AWSApiJobConfig.h
-    Include/Public/Framework/AWSApiRequestJob.h
-    Include/Public/Framework/AWSApiRequestJobConfig.h
-    Include/Public/Framework/Error.h
-    Include/Public/Framework/HttpClientComponent.h
-    Include/Public/Framework/HttpRequestJob.h
-    Include/Public/Framework/HttpRequestJobConfig.h
-    Include/Public/Framework/JobExecuter.h
-    Include/Public/Framework/JsonObjectHandler.h
-    Include/Public/Framework/JsonWriter.h
-    Include/Public/Framework/MultipartFormData.h
-    Include/Public/Framework/RequestBuilder.h
-    Include/Public/Framework/ServiceClientJob.h
-    Include/Public/Framework/ServiceClientJobConfig.h
-    Include/Public/Framework/ServiceJob.h
-    Include/Public/Framework/ServiceJobConfig.h
-    Include/Public/Framework/ServiceJobUtil.h
-    Include/Public/Framework/ServiceRequestJob.h
-    Include/Public/Framework/ServiceRequestJobConfig.h
-    Include/Public/Framework/Util.h
-    Include/Public/ResourceMapping/AWSResourceMappingBus.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h
-    Include/Private/AWSCoreInternalBus.h
-    Include/Private/AWSCoreSystemComponent.h
-    Include/Private/Configuration/AWSCoreConfiguration.h
-    Include/Private/Credential/AWSCredentialManager.h
-    Include/Private/Credential/AWSCVarCredentialHandler.h
-    Include/Private/Credential/AWSDefaultCredentialHandler.h
-    Include/Private/ResourceMapping/AWSResourceMappingConstants.h
-    Include/Private/ResourceMapping/AWSResourceMappingManager.h
-    Include/Private/ResourceMapping/AWSResourceMappingUtils.h
+    Include/AWSCoreBus.h
+    Include/Credential/AWSCredentialBus.h
+    Include/Framework/AWSApiClientJob.h
+    Include/Framework/AWSApiClientJobConfig.h
+    Include/Framework/AWSApiJob.h
+    Include/Framework/AWSApiJobConfig.h
+    Include/Framework/AWSApiRequestJob.h
+    Include/Framework/AWSApiRequestJobConfig.h
+    Include/Framework/Error.h
+    Include/Framework/HttpClientComponent.h
+    Include/Framework/HttpRequestJob.h
+    Include/Framework/HttpRequestJobConfig.h
+    Include/Framework/JobExecuter.h
+    Include/Framework/JsonObjectHandler.h
+    Include/Framework/JsonWriter.h
+    Include/Framework/MultipartFormData.h
+    Include/Framework/RequestBuilder.h
+    Include/Framework/ServiceClientJob.h
+    Include/Framework/ServiceClientJobConfig.h
+    Include/Framework/ServiceJob.h
+    Include/Framework/ServiceJobConfig.h
+    Include/Framework/ServiceJobUtil.h
+    Include/Framework/ServiceRequestJob.h
+    Include/Framework/ServiceRequestJobConfig.h
+    Include/Framework/Util.h
+    Include/ResourceMapping/AWSResourceMappingBus.h
+    Include/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
+    Include/ScriptCanvas/AWSScriptBehaviorLambda.h
+    Include/ScriptCanvas/AWSScriptBehaviorS3.h
+    Include/ScriptCanvas/AWSScriptBehaviorsComponent.h
+
+    Source/AWSCoreInternalBus.h
     Source/AWSCoreSystemComponent.cpp
+    Source/AWSCoreSystemComponent.h
     Source/Configuration/AWSCoreConfiguration.cpp
+    Source/Configuration/AWSCoreConfiguration.h
     Source/Credential/AWSCredentialManager.cpp
+    Source/Credential/AWSCredentialManager.h
     Source/Credential/AWSCVarCredentialHandler.cpp
+    Source/Credential/AWSCVarCredentialHandler.h
     Source/Credential/AWSDefaultCredentialHandler.cpp
+    Source/Credential/AWSDefaultCredentialHandler.h
+    Source/ResourceMapping/AWSResourceMappingConstants.h
+    Source/ResourceMapping/AWSResourceMappingManager.cpp
+    Source/ResourceMapping/AWSResourceMappingManager.h
+    Source/ResourceMapping/AWSResourceMappingUtils.cpp
+    Source/ResourceMapping/AWSResourceMappingUtils.h
+    
     Source/Framework/AWSApiJob.cpp
     Source/Framework/AWSApiJobConfig.cpp
     Source/Framework/Error.cpp
@@ -61,8 +65,6 @@ set(FILES
     Source/Framework/RequestBuilder.cpp
     Source/Framework/ServiceJob.cpp
     Source/Framework/ServiceJobConfig.cpp
-    Source/ResourceMapping/AWSResourceMappingManager.cpp
-    Source/ResourceMapping/AWSResourceMappingUtils.cpp
     Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp
     Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp
     Source/ScriptCanvas/AWSScriptBehaviorS3.cpp
diff --git a/Gems/AWSCore/Code/awscore_shared_files.cmake b/Gems/AWSCore/Code/awscore_shared_files.cmake
index efe6966b26..4ce375b95a 100644
--- a/Gems/AWSCore/Code/awscore_shared_files.cmake
+++ b/Gems/AWSCore/Code/awscore_shared_files.cmake
@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSCoreModule.h
     Source/AWSCoreModule.cpp
+    Source/AWSCoreModule.h   
 )
diff --git a/Gems/AWSCore/cdk/README.md b/Gems/AWSCore/cdk/README.md
index d50ca40279..644c22d36b 100644
--- a/Gems/AWSCore/cdk/README.md
+++ b/Gems/AWSCore/cdk/README.md
@@ -65,6 +65,22 @@ them to your `setup.py` file and rerun the `pip install -r requirements.txt`
 command.
 
 ## Optional Features
+
+Optional features are activated by passing [runtime context variables](https://docs.aws.amazon.com/cdk/latest/guide/context.html). To use multiple optional features together provide one key-value pair at a time:
+```
+cdk synth --context key1=value1 --context key2=value2 MyStack
+```
+
+### Automatic S3 and DynamoDB Cleanup
+The S3 bucket and Dynamodb created by the sample will be left behind as the CDK defaults to retaining such storage (both have default policies to retain resources on destroy). To delete
+the storage resources created when using CDK destroy, use the following commands to synthesize and destroy the CDK application.
+```
+cdk synth -c remove_all_storage_on_destroy=true --all
+cdk deploy -c remove_all_storage_on_destroy=true --all
+cdk destroy --all
+```
+
+### Server Access Logging
 Server access logging is enabled by default. To disable the feature, use the following commands to synthesize and deploy this CDK application.
 
 ```
diff --git a/Gems/AWSCore/cdk/core/core_stack.py b/Gems/AWSCore/cdk/core/core_stack.py
index c124cb72ab..4124b7b566 100755
--- a/Gems/AWSCore/cdk/core/core_stack.py
+++ b/Gems/AWSCore/cdk/core/core_stack.py
@@ -86,13 +86,21 @@ class CoreStack(core.Stack):
         # Create an S3 bucket for Amazon S3 server access logging
         # See https://docs.aws.amazon.com/AmazonS3/latest/dev/security-best-practices.html
         if self.node.try_get_context('disable_access_log') != 'true':
+
+            # Auto cleanup bucket and data if requested
+            _remove_storage = self.node.try_get_context('remove_all_storage_on_destroy') == 'true'
+            _removal_policy = core.RemovalPolicy.DESTROY if _remove_storage else core.RemovalPolicy.RETAIN
+
             self._server_access_logs_bucket = s3.Bucket(
                 self,
                 f'{self._project_name}-{self._feature_name}-Access-Log-Bucket',
+                access_control=s3.BucketAccessControl.LOG_DELIVERY_WRITE,
+                auto_delete_objects = _remove_storage,
                 block_public_access=s3.BlockPublicAccess.BLOCK_ALL,
                 encryption=s3.BucketEncryption.S3_MANAGED,
-                access_control=s3.BucketAccessControl.LOG_DELIVERY_WRITE
+                removal_policy=_removal_policy
             )
+
             self._server_access_logs_bucket.grant_read(self._admin_group)
 
             # Export access log bucket name
diff --git a/Gems/AWSCore/cdk/example/example_resources_stack.py b/Gems/AWSCore/cdk/example/example_resources_stack.py
index ac229cb313..6a67ed9406 100755
--- a/Gems/AWSCore/cdk/example/example_resources_stack.py
+++ b/Gems/AWSCore/cdk/example/example_resources_stack.py
@@ -126,11 +126,17 @@ class ExampleResources(core.Stack):
                 core.Fn.import_value(f"{self._project_name}:ServerAccessLogsBucket")
             )
 
+        # Auto cleanup bucket and data if requested
+        _remove_storage = self.node.try_get_context('remove_all_storage_on_destroy') == 'true'
+        _removal_policy = core.RemovalPolicy.DESTROY if _remove_storage else core.RemovalPolicy.RETAIN
+
         example_bucket = s3.Bucket(
             self,
             f'{self._project_name}-{self._feature_name}-Example-S3bucket',
+            auto_delete_objects=_remove_storage,
             block_public_access=s3.BlockPublicAccess.BLOCK_ALL,
             encryption=s3.BucketEncryption.S3_MANAGED,
+            removal_policy=_removal_policy,
             server_access_logs_bucket=
             server_access_logs_bucket if server_access_logs_bucket else None,
             server_access_logs_prefix=
@@ -170,6 +176,11 @@ class ExampleResources(core.Stack):
                 type=dynamo.AttributeType.STRING
             )
         )
+
+        # Auto-delete the table when requested
+        if self.node.try_get_context('remove_all_storage_on_destroy') == 'true':
+            demo_table.apply_removal_policy(core.RemovalPolicy.DESTROY)
+
         return demo_table
 
     def __create_outputs(self) -> None:
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt b/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt
index 1fab09e9f4..ab85e89f75 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt
@@ -6,8 +6,6 @@
 #
 #
 
-set(awsgameliftclient_compile_definition $<IF:$<CONFIG:release>,AWSGAMELIFT_RELEASE,AWSGAMELIFT_DEV>)
-
 ly_add_target(
     NAME AWSGameLift.Client.Static STATIC
     NAMESPACE Gem
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp
index 4ee2d31ebf..f900310078 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp
@@ -33,7 +33,7 @@
 
 namespace AWSGameLift
 {
-#if defined(AWSGAMELIFT_DEV)
+#if defined(AZ_DEBUG_BUILD) || defined(AZ_PROFILE_BUILD)
     AZ_CVAR(AZ::CVarFixedString, cl_gameliftLocalEndpoint, "", nullptr, AZ::ConsoleFunctorFlags::Null, "The local endpoint to test with GameLiftLocal SDK.");
 #endif
 
@@ -87,7 +87,7 @@ namespace AWSGameLift
 
         // Set up client endpoint or region
         AZStd::string localEndpoint = "";
-#if defined(AWSGAMELIFT_DEV)
+#if defined(AZ_DEBUG_BUILD) || defined(AZ_PROFILE_BUILD)
         localEndpoint = static_cast<AZ::CVarFixedString>(cl_gameliftLocalEndpoint);
 #endif
         if (!localEndpoint.empty())
@@ -139,7 +139,7 @@ namespace AWSGameLift
         {
             const AWSGameLiftAcceptMatchRequest& gameliftStartMatchmakingRequest =
                 static_cast<const AWSGameLiftAcceptMatchRequest&>(acceptMatchRequest);
-            AcceptMatchHelper(gameliftStartMatchmakingRequest);
+            AcceptMatchActivity::AcceptMatch(gameliftStartMatchmakingRequest);
         }
     }
 
@@ -157,9 +157,9 @@ namespace AWSGameLift
         AZ::JobContext* jobContext = nullptr;
         AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
         AZ::Job* acceptMatchJob = AZ::CreateJobFunction(
-            [this, gameliftStartMatchmakingRequest]()
+            [gameliftStartMatchmakingRequest]()
             {
-                AcceptMatchHelper(gameliftStartMatchmakingRequest);
+                AcceptMatchActivity::AcceptMatch(gameliftStartMatchmakingRequest);
 
                 AzFramework::MatchmakingAsyncRequestNotificationBus::Broadcast(
                     &AzFramework::MatchmakingAsyncRequestNotifications::OnAcceptMatchAsyncComplete);
@@ -169,21 +169,6 @@ namespace AWSGameLift
         acceptMatchJob->Start(); 
     }
 
-    void AWSGameLiftClientManager::AcceptMatchHelper(const AWSGameLiftAcceptMatchRequest& acceptMatchRequest)
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-
-        AZStd::string response;
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            AcceptMatchActivity::AcceptMatch(*gameliftClient, acceptMatchRequest);
-        }
-    }
-
     AZStd::string AWSGameLiftClientManager::CreateSession(const AzFramework::CreateSessionRequest& createSessionRequest)
     {
         AZStd::string result = "";
@@ -191,13 +176,13 @@ namespace AWSGameLift
         {
             const AWSGameLiftCreateSessionRequest& gameliftCreateSessionRequest =
                 static_cast<const AWSGameLiftCreateSessionRequest&>(createSessionRequest);
-            result = CreateSessionHelper(gameliftCreateSessionRequest);
+            result = CreateSessionActivity::CreateSession(gameliftCreateSessionRequest);
         }
         else if (CreateSessionOnQueueActivity::ValidateCreateSessionOnQueueRequest(createSessionRequest))
         {
             const AWSGameLiftCreateSessionOnQueueRequest& gameliftCreateSessionOnQueueRequest =
                 static_cast<const AWSGameLiftCreateSessionOnQueueRequest&>(createSessionRequest);
-            result = CreateSessionOnQueueHelper(gameliftCreateSessionOnQueueRequest);
+            result = CreateSessionOnQueueActivity::CreateSessionOnQueue(gameliftCreateSessionOnQueueRequest);
         }
         else
         {
@@ -217,9 +202,9 @@ namespace AWSGameLift
             AZ::JobContext* jobContext = nullptr;
             AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
             AZ::Job* createSessionJob = AZ::CreateJobFunction(
-                [this, gameliftCreateSessionRequest]()
+                [gameliftCreateSessionRequest]()
                 {
-                    AZStd::string result = CreateSessionHelper(gameliftCreateSessionRequest);
+                    AZStd::string result = CreateSessionActivity::CreateSession(gameliftCreateSessionRequest);
 
                     AzFramework::SessionAsyncRequestNotificationBus::Broadcast(
                         &AzFramework::SessionAsyncRequestNotifications::OnCreateSessionAsyncComplete, result);
@@ -235,9 +220,9 @@ namespace AWSGameLift
             AZ::JobContext* jobContext = nullptr;
             AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
             AZ::Job* createSessionOnQueueJob = AZ::CreateJobFunction(
-                [this, gameliftCreateSessionOnQueueRequest]()
+                [gameliftCreateSessionOnQueueRequest]()
                 {
-                    AZStd::string result = CreateSessionOnQueueHelper(gameliftCreateSessionOnQueueRequest);
+                    AZStd::string result = CreateSessionOnQueueActivity::CreateSessionOnQueue(gameliftCreateSessionOnQueueRequest);
 
                     AzFramework::SessionAsyncRequestNotificationBus::Broadcast(
                         &AzFramework::SessionAsyncRequestNotifications::OnCreateSessionAsyncComplete, result);
@@ -253,38 +238,6 @@ namespace AWSGameLift
         }
     }
 
-    AZStd::string AWSGameLiftClientManager::CreateSessionHelper(
-        const AWSGameLiftCreateSessionRequest& createSessionRequest)
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-        AZStd::string result = "";
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            result = CreateSessionActivity::CreateSession(*gameliftClient, createSessionRequest);
-        }
-        return result;
-    }
-
-    AZStd::string AWSGameLiftClientManager::CreateSessionOnQueueHelper(
-        const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest)
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-        AZStd::string result;
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            result = CreateSessionOnQueueActivity::CreateSessionOnQueue(*gameliftClient, createSessionOnQueueRequest);
-        }
-        return result;
-    }
-
     bool AWSGameLiftClientManager::JoinSession(const AzFramework::JoinSessionRequest& joinSessionRequest)
     {
         bool result = false;
@@ -292,7 +245,8 @@ namespace AWSGameLift
         {
             const AWSGameLiftJoinSessionRequest& gameliftJoinSessionRequest =
                 static_cast<const AWSGameLiftJoinSessionRequest&>(joinSessionRequest);
-            result = JoinSessionHelper(gameliftJoinSessionRequest);
+            auto createPlayerSessionOutcome = JoinSessionActivity::CreatePlayerSession(gameliftJoinSessionRequest);
+            result = JoinSessionActivity::RequestPlayerJoinSession(createPlayerSessionOutcome);
         }
 
         return result;
@@ -313,9 +267,10 @@ namespace AWSGameLift
         AZ::JobContext* jobContext = nullptr;
         AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
         AZ::Job* joinSessionJob = AZ::CreateJobFunction(
-            [this, gameliftJoinSessionRequest]()
+            [gameliftJoinSessionRequest]()
             {
-                bool result = JoinSessionHelper(gameliftJoinSessionRequest);
+                auto createPlayerSessionOutcome = JoinSessionActivity::CreatePlayerSession(gameliftJoinSessionRequest);
+                bool result = JoinSessionActivity::RequestPlayerJoinSession(createPlayerSessionOutcome);
 
                 AzFramework::SessionAsyncRequestNotificationBus::Broadcast(
                     &AzFramework::SessionAsyncRequestNotifications::OnJoinSessionAsyncComplete, result);
@@ -325,23 +280,6 @@ namespace AWSGameLift
         joinSessionJob->Start();
     }
 
-    bool AWSGameLiftClientManager::JoinSessionHelper(const AWSGameLiftJoinSessionRequest& joinSessionRequest)
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-        bool result = false;
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            auto createPlayerSessionOutcome = JoinSessionActivity::CreatePlayerSession(*gameliftClient, joinSessionRequest);
-
-            result = JoinSessionActivity::RequestPlayerJoinSession(createPlayerSessionOutcome);
-        }
-        return result;
-    }
-
     void AWSGameLiftClientManager::LeaveSession()
     {
         AWSGameLift::LeaveSessionActivity::LeaveSession();
@@ -371,7 +309,7 @@ namespace AWSGameLift
         {
             const AWSGameLiftSearchSessionsRequest& gameliftSearchSessionsRequest =
                 static_cast<const AWSGameLiftSearchSessionsRequest&>(searchSessionsRequest);
-            response = SearchSessionsHelper(gameliftSearchSessionsRequest);
+            response = SearchSessionsActivity::SearchSessions(gameliftSearchSessionsRequest);
         }
 
         return response;
@@ -392,9 +330,9 @@ namespace AWSGameLift
         AZ::JobContext* jobContext = nullptr;
         AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
         AZ::Job* searchSessionsJob = AZ::CreateJobFunction(
-            [this, gameliftSearchSessionsRequest]()
+            [gameliftSearchSessionsRequest]()
             {
-                AzFramework::SearchSessionsResponse response = SearchSessionsHelper(gameliftSearchSessionsRequest);
+                AzFramework::SearchSessionsResponse response = SearchSessionsActivity::SearchSessions(gameliftSearchSessionsRequest);
 
                 AzFramework::SessionAsyncRequestNotificationBus::Broadcast(
                     &AzFramework::SessionAsyncRequestNotifications::OnSearchSessionsAsyncComplete, response);
@@ -404,22 +342,6 @@ namespace AWSGameLift
         searchSessionsJob->Start(); 
     }
 
-    AzFramework::SearchSessionsResponse AWSGameLiftClientManager::SearchSessionsHelper(
-        const AWSGameLiftSearchSessionsRequest& searchSessionsRequest) const
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-        AzFramework::SearchSessionsResponse response;
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            response = SearchSessionsActivity::SearchSessions(*gameliftClient, searchSessionsRequest);
-        }
-        return response;
-    }
-
     AZStd::string AWSGameLiftClientManager::StartMatchmaking(const AzFramework::StartMatchmakingRequest& startMatchmakingRequest)
     {
         AZStd::string response;
@@ -427,7 +349,7 @@ namespace AWSGameLift
         {
             const AWSGameLiftStartMatchmakingRequest& gameliftStartMatchmakingRequest =
                 static_cast<const AWSGameLiftStartMatchmakingRequest&>(startMatchmakingRequest);
-            response = StartMatchmakingHelper(gameliftStartMatchmakingRequest);
+            response = StartMatchmakingActivity::StartMatchmaking(gameliftStartMatchmakingRequest);
         }
 
         return response;
@@ -448,9 +370,9 @@ namespace AWSGameLift
         AZ::JobContext* jobContext = nullptr;
         AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
         AZ::Job* startMatchmakingJob = AZ::CreateJobFunction(
-            [this, gameliftStartMatchmakingRequest]()
+            [gameliftStartMatchmakingRequest]()
             {
-                AZStd::string response = StartMatchmakingHelper(gameliftStartMatchmakingRequest);
+                AZStd::string response = StartMatchmakingActivity::StartMatchmaking(gameliftStartMatchmakingRequest);
 
                 AzFramework::MatchmakingAsyncRequestNotificationBus::Broadcast(
                     &AzFramework::MatchmakingAsyncRequestNotifications::OnStartMatchmakingAsyncComplete, response);
@@ -460,29 +382,14 @@ namespace AWSGameLift
         startMatchmakingJob->Start(); 
     }
 
-    AZStd::string AWSGameLiftClientManager::StartMatchmakingHelper(const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest)
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-
-        AZStd::string response;
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            response = StartMatchmakingActivity::StartMatchmaking(*gameliftClient, startMatchmakingRequest);
-        }
-        return response;
-    }
-
     void AWSGameLiftClientManager::StopMatchmaking(const AzFramework::StopMatchmakingRequest& stopMatchmakingRequest)
     {
         if (StopMatchmakingActivity::ValidateStopMatchmakingRequest(stopMatchmakingRequest))
         {
             const AWSGameLiftStopMatchmakingRequest& gameliftStopMatchmakingRequest =
                 static_cast<const AWSGameLiftStopMatchmakingRequest&>(stopMatchmakingRequest);
-            StopMatchmakingHelper(gameliftStopMatchmakingRequest);
+
+            StopMatchmakingActivity::StopMatchmaking(gameliftStopMatchmakingRequest);
         }
     }
 
@@ -501,9 +408,9 @@ namespace AWSGameLift
         AZ::JobContext* jobContext = nullptr;
         AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
         AZ::Job* stopMatchmakingJob = AZ::CreateJobFunction(
-            [this, gameliftStopMatchmakingRequest]()
+            [gameliftStopMatchmakingRequest]()
             {
-                StopMatchmakingHelper(gameliftStopMatchmakingRequest);
+                StopMatchmakingActivity::StopMatchmaking(gameliftStopMatchmakingRequest);
 
                 AzFramework::MatchmakingAsyncRequestNotificationBus::Broadcast(
                     &AzFramework::MatchmakingAsyncRequestNotifications::OnStopMatchmakingAsyncComplete);
@@ -512,18 +419,4 @@ namespace AWSGameLift
 
         stopMatchmakingJob->Start(); 
     }
-
-    void AWSGameLiftClientManager::StopMatchmakingHelper(const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest)
-    {
-        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
-
-        if (!gameliftClient)
-        {
-            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
-        }
-        else
-        {
-            StopMatchmakingActivity::StopMatchmaking(*gameliftClient, stopMatchmakingRequest);
-        }
-    }
 } // namespace AWSGameLift
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h
index 8a0c91c36d..f37152bc60 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h
@@ -175,14 +175,5 @@ namespace AWSGameLift
         bool JoinSession(const AzFramework::JoinSessionRequest& joinSessionRequest) override;
         AzFramework::SearchSessionsResponse SearchSessions(const AzFramework::SearchSessionsRequest& searchSessionsRequest) const override;
         void LeaveSession() override;
-
-    private:
-        void AcceptMatchHelper(const AWSGameLiftAcceptMatchRequest& createSessionRequest);
-        AZStd::string CreateSessionHelper(const AWSGameLiftCreateSessionRequest& createSessionRequest);
-        AZStd::string CreateSessionOnQueueHelper(const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest);
-        bool JoinSessionHelper(const AWSGameLiftJoinSessionRequest& joinSessionRequest);
-        AzFramework::SearchSessionsResponse SearchSessionsHelper(const AWSGameLiftSearchSessionsRequest& searchSessionsRequest) const;
-        AZStd::string StartMatchmakingHelper(const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest);
-        void StopMatchmakingHelper(const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest);
     };
 } // namespace AWSGameLift
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
index 25ba328fd0..dbeced1728 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
@@ -7,9 +7,11 @@
  */
 
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 
 #include <Activity/AWSGameLiftAcceptMatchActivity.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
 
 #include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/model/AcceptMatchRequest.h>
@@ -42,13 +44,19 @@ namespace AWSGameLift
             return request;
         }
 
-        void AcceptMatch(const Aws::GameLift::GameLiftClient& gameliftClient,
-            const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest)
+        void AcceptMatch(const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest)
         {
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftAcceptMatchActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return;
+            }
+
             AZ_TracePrintf(AWSGameLiftAcceptMatchActivityName, "Requesting AcceptMatch against Amazon GameLift service ...");
 
             Aws::GameLift::Model::AcceptMatchRequest request = BuildAWSGameLiftAcceptMatchRequest(AcceptMatchRequest);
-            auto AcceptMatchOutcome = gameliftClient.AcceptMatch(request);
+            auto AcceptMatchOutcome = gameliftClient->AcceptMatch(request);
 
             if (AcceptMatchOutcome.IsSuccess())
             {
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h
index d5f28f92e2..ac4012c347 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h
@@ -23,7 +23,7 @@ namespace AWSGameLift
         Aws::GameLift::Model::AcceptMatchRequest BuildAWSGameLiftAcceptMatchRequest(const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest);
 
         // Create AcceptMatchRequest and make a AcceptMatch call through GameLift client
-        void AcceptMatch(const Aws::GameLift::GameLiftClient& gameliftClient, const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest);
+        void AcceptMatch(const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest);
 
         // Validate AcceptMatchRequest and check required request parameters
         bool ValidateAcceptMatchRequest(const AzFramework::AcceptMatchRequest& AcceptMatchRequest);
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.cpp
index 0332ea7a76..ee93f022a1 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.cpp
@@ -6,9 +6,16 @@
  *
  */
 
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+
 #include <Activity/AWSGameLiftActivityUtils.h>
 #include <Activity/AWSGameLiftCreateSessionActivity.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
+
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/CreateGameSessionRequest.h>
 
 namespace AWSGameLift
 {
@@ -63,15 +70,21 @@ namespace AWSGameLift
             return request;
         }
 
-        AZStd::string CreateSession(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
-            const AWSGameLiftCreateSessionRequest& createSessionRequest)
+        AZStd::string CreateSession(const AWSGameLiftCreateSessionRequest& createSessionRequest)
         {
+            AZStd::string result = "";
+
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftCreateSessionActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return result;
+            }
+
             AZ_TracePrintf(AWSGameLiftCreateSessionActivityName, "Requesting CreateGameSession against Amazon GameLift service ...");
 
-            AZStd::string result = "";
             Aws::GameLift::Model::CreateGameSessionRequest request = BuildAWSGameLiftCreateGameSessionRequest(createSessionRequest);
-            auto createSessionOutcome = gameliftClient.CreateGameSession(request);
+            auto createSessionOutcome = gameliftClient->CreateGameSession(request);
             AZ_TracePrintf(AWSGameLiftCreateSessionActivityName, "CreateGameSession request against Amazon GameLift service is complete");
 
             if (createSessionOutcome.IsSuccess())
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.h
index 714675c652..af236dbfa4 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionActivity.h
@@ -10,9 +10,7 @@
 
 #include <Request/AWSGameLiftCreateSessionRequest.h>
 
-#include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/GameLiftClient.h>
-#include <aws/gamelift/model/CreateGameSessionRequest.h>
 
 namespace AWSGameLift
 {
@@ -24,9 +22,7 @@ namespace AWSGameLift
         Aws::GameLift::Model::CreateGameSessionRequest BuildAWSGameLiftCreateGameSessionRequest(const AWSGameLiftCreateSessionRequest& createSessionRequest);
 
         // Create CreateGameSessionRequest and make a CreateGameSession call through GameLift client
-        AZStd::string CreateSession(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
-            const AWSGameLiftCreateSessionRequest& createSessionRequest);
+        AZStd::string CreateSession(const AWSGameLiftCreateSessionRequest& createSessionRequest);
 
         // Validate CreateSessionRequest and check required request parameters
         bool ValidateCreateSessionRequest(const AzFramework::CreateSessionRequest& createSessionRequest);
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.cpp
index 52be365ea5..8e8d7e23c5 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.cpp
@@ -6,9 +6,16 @@
  *
  */
 
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+
 #include <AWSGameLiftSessionConstants.h>
 #include <Activity/AWSGameLiftActivityUtils.h>
 #include <Activity/AWSGameLiftCreateSessionOnQueueActivity.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
+
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/StartGameSessionPlacementRequest.h>
 
 namespace AWSGameLift
 {
@@ -47,17 +54,23 @@ namespace AWSGameLift
             return request;
         }
 
-        AZStd::string CreateSessionOnQueue(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
-            const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest)
+        AZStd::string CreateSessionOnQueue(const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest)
         {
+            AZStd::string result = "";
+
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftCreateSessionOnQueueActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return result;
+            }
+
             AZ_TracePrintf(AWSGameLiftCreateSessionOnQueueActivityName,
                 "Requesting StartGameSessionPlacement against Amazon GameLift service ...");
 
-            AZStd::string result = "";
             Aws::GameLift::Model::StartGameSessionPlacementRequest request =
                 BuildAWSGameLiftStartGameSessionPlacementRequest(createSessionOnQueueRequest);
-            auto createSessionOnQueueOutcome = gameliftClient.StartGameSessionPlacement(request);
+            auto createSessionOnQueueOutcome = gameliftClient->StartGameSessionPlacement(request);
             AZ_TracePrintf(AWSGameLiftCreateSessionOnQueueActivityName,
                 "StartGameSessionPlacement request against Amazon GameLift service is complete.");
 
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.h
index 714bcd1060..5f16bf0b31 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.h
@@ -10,9 +10,7 @@
 
 #include <Request/AWSGameLiftCreateSessionOnQueueRequest.h>
 
-#include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/GameLiftClient.h>
-#include <aws/gamelift/model/StartGameSessionPlacementRequest.h>
 
 namespace AWSGameLift
 {
@@ -25,9 +23,7 @@ namespace AWSGameLift
             const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest);
 
         // Create StartGameSessionPlacementRequest and make a CreateGameSession call through GameLift client
-        AZStd::string CreateSessionOnQueue(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
-            const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest);
+        AZStd::string CreateSessionOnQueue(const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest);
 
         // Validate CreateSessionOnQueueRequest and check required request parameters
         bool ValidateCreateSessionOnQueueRequest(const AzFramework::CreateSessionRequest& createSessionRequest);
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.cpp
index a47e59255f..71ef9e9737 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.cpp
@@ -7,10 +7,11 @@
  */
 
 #include <AzCore/Interface/Interface.h>
-#include <AzFramework/Session/ISessionHandlingRequests.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 
 #include <Activity/AWSGameLiftJoinSessionActivity.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
 
 namespace AWSGameLift
 {
@@ -59,16 +60,24 @@ namespace AWSGameLift
         }
 
         Aws::GameLift::Model::CreatePlayerSessionOutcome CreatePlayerSession(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
             const AWSGameLiftJoinSessionRequest& joinSessionRequest)
         {
+            Aws::GameLift::Model::CreatePlayerSessionOutcome createPlayerSessionOutcome;
+
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftJoinSessionActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return createPlayerSessionOutcome;
+            }
+
             AZ_TracePrintf(AWSGameLiftJoinSessionActivityName,
                 "Requesting CreatePlayerSession for player %s against Amazon GameLift service ...",
                 joinSessionRequest.m_playerId.c_str());
 
             Aws::GameLift::Model::CreatePlayerSessionRequest request =
                 BuildAWSGameLiftCreatePlayerSessionRequest(joinSessionRequest);
-            auto createPlayerSessionOutcome = gameliftClient.CreatePlayerSession(request);
+            createPlayerSessionOutcome = gameliftClient->CreatePlayerSession(request);
             AZ_TracePrintf(AWSGameLiftJoinSessionActivityName,
                 "CreatePlayerSession request for player %s against Amazon GameLift service is complete", joinSessionRequest.m_playerId.c_str());
 
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.h
index fe34e5fe57..b011f4877b 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftJoinSessionActivity.h
@@ -36,7 +36,6 @@ namespace AWSGameLift
 
         // Create CreatePlayerSessionRequest and make a CreatePlayerSession call through GameLift client
         Aws::GameLift::Model::CreatePlayerSessionOutcome CreatePlayerSession(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
             const AWSGameLiftJoinSessionRequest& joinSessionRequest);
 
         // Request to setup networking connection for player
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftLeaveSessionActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftLeaveSessionActivity.cpp
index a99fed4edc..fd3b3d6ebc 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftLeaveSessionActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftLeaveSessionActivity.cpp
@@ -6,11 +6,12 @@
  *
  */
 
-#include <Activity/AWSGameLiftLeaveSessionActivity.h>
-
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Session/ISessionHandlingRequests.h>
 
+#include <Activity/AWSGameLiftLeaveSessionActivity.h>
+
 namespace AWSGameLift
 {
     namespace LeaveSessionActivity
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.cpp
index 5f0b6fd012..b7917e6d59 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.cpp
@@ -6,10 +6,16 @@
  *
  */
 
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Session/SessionConfig.h>
 
 #include <Activity/AWSGameLiftSearchSessionsActivity.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
+
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/SearchGameSessionsRequest.h>
 
 namespace AWSGameLift
 {
@@ -62,14 +68,21 @@ namespace AWSGameLift
         }
 
         AzFramework::SearchSessionsResponse SearchSessions(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
             const AWSGameLiftSearchSessionsRequest& searchSessionsRequest)
         {
+            AzFramework::SearchSessionsResponse response;
+
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftSearchSessionsActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return response;
+            }
+
             AZ_TracePrintf(AWSGameLiftSearchSessionsActivityName, "Requesting SearchGameSessions against Amazon GameLift service ...");
 
-            AzFramework::SearchSessionsResponse response;
             Aws::GameLift::Model::SearchGameSessionsRequest request = BuildAWSGameLiftSearchGameSessionsRequest(searchSessionsRequest);
-            Aws::GameLift::Model::SearchGameSessionsOutcome outcome = gameliftClient.SearchGameSessions(request);
+            Aws::GameLift::Model::SearchGameSessionsOutcome outcome = gameliftClient->SearchGameSessions(request);
             AZ_TracePrintf(AWSGameLiftSearchSessionsActivityName, "SearchGameSessions request against Amazon GameLift service is complete");
 
             if (outcome.IsSuccess())
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.h
index 205e83dd96..d5bcda992c 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftSearchSessionsActivity.h
@@ -10,9 +10,7 @@
 
 #include <Request/AWSGameLiftSearchSessionsRequest.h>
 
-#include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/GameLiftClient.h>
-#include <aws/gamelift/model/SearchGameSessionsRequest.h>
 
 namespace AWSGameLift
 {
@@ -28,7 +26,6 @@ namespace AWSGameLift
 
         // Create SearchGameSessionsRequest and make a SeachGameSessions call through GameLift client
         AzFramework::SearchSessionsResponse SearchSessions(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
             const AWSGameLiftSearchSessionsRequest& searchSessionsRequest);
 
         // Convert from Aws::GameLift::Model::SearchGameSessionsResult to AzFramework::SearchSessionsResponse.
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp
index 00a7773491..6f6c7fccc0 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp
@@ -7,11 +7,13 @@
  */
 
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 
 #include <Activity/AWSGameLiftActivityUtils.h>
 #include <Activity/AWSGameLiftStartMatchmakingActivity.h>
 #include <AWSGameLiftPlayer.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
 
 #include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/model/StartMatchmakingRequest.h>
@@ -78,14 +80,21 @@ namespace AWSGameLift
         }
 
         AZStd::string StartMatchmaking(
-            const Aws::GameLift::GameLiftClient& gameliftClient,
             const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest)
         {
+            AZStd::string result = "";
+
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftStartMatchmakingActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return result;
+            }
+
             AZ_TracePrintf(AWSGameLiftStartMatchmakingActivityName, "Requesting StartMatchmaking against Amazon GameLift service ...");
 
-            AZStd::string result = "";
             Aws::GameLift::Model::StartMatchmakingRequest request = BuildAWSGameLiftStartMatchmakingRequest(startMatchmakingRequest);
-            auto startMatchmakingOutcome = gameliftClient.StartMatchmaking(request);
+            auto startMatchmakingOutcome = gameliftClient->StartMatchmaking(request);
             if (startMatchmakingOutcome.IsSuccess())
             {
                 result = AZStd::string(startMatchmakingOutcome.GetResult().GetMatchmakingTicket().GetTicketId().c_str());
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h
index db814c14b2..f736e318fb 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h
@@ -23,7 +23,7 @@ namespace AWSGameLift
         Aws::GameLift::Model::StartMatchmakingRequest BuildAWSGameLiftStartMatchmakingRequest(const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest);
 
         // Create StartMatchmakingRequest and make a StartMatchmaking call through GameLift client
-        AZStd::string StartMatchmaking(const Aws::GameLift::GameLiftClient& gameliftClient, const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest);
+        AZStd::string StartMatchmaking(const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest);
 
         // Validate StartMatchmakingRequest and check required request parameters
         bool ValidateStartMatchmakingRequest(const AzFramework::StartMatchmakingRequest& startMatchmakingRequest);
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp
index b427d0323a..022861570a 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp
@@ -7,9 +7,11 @@
  */
 
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 
 #include <Activity/AWSGameLiftStopMatchmakingActivity.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Request/IAWSGameLiftInternalRequests.h>
 
 #include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/model/StopMatchmakingRequest.h>
@@ -32,13 +34,19 @@ namespace AWSGameLift
             return request;
         }
 
-        void StopMatchmaking(const Aws::GameLift::GameLiftClient& gameliftClient,
-            const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest)
+        void StopMatchmaking(const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest)
         {
+            auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+            if (!gameliftClient)
+            {
+                AZ_Error(AWSGameLiftStopMatchmakingActivityName, false, AWSGameLiftClientMissingErrorMessage);
+                return;
+            }
+
             AZ_TracePrintf(AWSGameLiftStopMatchmakingActivityName, "Requesting StopMatchmaking against Amazon GameLift service ...");
 
             Aws::GameLift::Model::StopMatchmakingRequest request = BuildAWSGameLiftStopMatchmakingRequest(stopMatchmakingRequest);
-            auto stopMatchmakingOutcome = gameliftClient.StopMatchmaking(request);
+            auto stopMatchmakingOutcome = gameliftClient->StopMatchmaking(request);
 
             if (stopMatchmakingOutcome.IsSuccess())
             {
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h
index 0820f2c05e..b5f19d35df 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h
@@ -23,7 +23,7 @@ namespace AWSGameLift
         Aws::GameLift::Model::StopMatchmakingRequest BuildAWSGameLiftStopMatchmakingRequest(const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest);
 
         // Create StopMatchmakingRequest and make a StopMatchmaking call through GameLift client
-        void StopMatchmaking(const Aws::GameLift::GameLiftClient& gameliftClient, const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest);
+        void StopMatchmaking(const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest);
 
         // Validate StopMatchmakingRequest and check required request parameters
         bool ValidateStopMatchmakingRequest(const AzFramework::StopMatchmakingRequest& stopMatchmakingRequest);
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionActivityTest.cpp
index 70dcdba1af..fcf867138b 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionActivityTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionActivityTest.cpp
@@ -9,6 +9,8 @@
 #include <Activity/AWSGameLiftCreateSessionActivity.h>
 #include <AWSGameLiftClientFixture.h>
 
+#include <aws/gamelift/model/CreateGameSessionRequest.h>
+
 using namespace AWSGameLift;
 
 using AWSGameLiftCreateSessionActivityTest = AWSGameLiftClientFixture;
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionOnQueueActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionOnQueueActivityTest.cpp
index 8a785d8007..4845586e47 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionOnQueueActivityTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftCreateSessionOnQueueActivityTest.cpp
@@ -9,6 +9,8 @@
 #include <AWSGameLiftClientFixture.h>
 #include <Activity/AWSGameLiftCreateSessionOnQueueActivity.h>
 
+#include <aws/gamelift/model/StartGameSessionPlacementRequest.h>
+
 using namespace AWSGameLift;
 
 using AWSGameLiftCreateSessionOnQueueActivityTest = AWSGameLiftClientFixture;
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftJoinSessionActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftJoinSessionActivityTest.cpp
index 6a1156646a..33b03649c7 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftJoinSessionActivityTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftJoinSessionActivityTest.cpp
@@ -6,6 +6,8 @@
  *
  */
 
+#include <AzFramework/Session/ISessionHandlingRequests.h>
+
 #include <AWSGameLiftClientFixture.h>
 #include <Activity/AWSGameLiftJoinSessionActivity.h>
 
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftSearchSessionsActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftSearchSessionsActivityTest.cpp
index 3337c2f6d2..0d3c8c137b 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftSearchSessionsActivityTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftSearchSessionsActivityTest.cpp
@@ -12,6 +12,9 @@
 #include <AWSGameLiftClientFixture.h>
 #include <AWSGameLiftSessionConstants.h>
 
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/SearchGameSessionsRequest.h>
+
 using namespace AWSGameLift;
 
 using AWSGameLiftSearchSessionsActivityTest = AWSGameLiftClientFixture;
diff --git a/Gems/AWSMetrics/Code/CMakeLists.txt b/Gems/AWSMetrics/Code/CMakeLists.txt
index 2e78ee8c42..1da4e7f96f 100644
--- a/Gems/AWSMetrics/Code/CMakeLists.txt
+++ b/Gems/AWSMetrics/Code/CMakeLists.txt
@@ -13,9 +13,9 @@ ly_add_target(
         awsmetrics_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -32,9 +32,9 @@ ly_add_target(
         awsmetrics_shared_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -88,8 +88,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awsmetrics_tests_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
-                Include/Public
+                Include
+                Source
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE
diff --git a/Gems/AWSMetrics/Code/Include/Public/AWSMetricsBus.h b/Gems/AWSMetrics/Code/Include/AWSMetricsBus.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Public/AWSMetricsBus.h
rename to Gems/AWSMetrics/Code/Include/AWSMetricsBus.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/MetricsAttribute.h b/Gems/AWSMetrics/Code/Include/MetricsAttribute.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/MetricsAttribute.h
rename to Gems/AWSMetrics/Code/Include/MetricsAttribute.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsConstant.h b/Gems/AWSMetrics/Code/Source/AWSMetricsConstant.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/AWSMetricsConstant.h
rename to Gems/AWSMetrics/Code/Source/AWSMetricsConstant.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsModule.h b/Gems/AWSMetrics/Code/Source/AWSMetricsModule.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/AWSMetricsModule.h
rename to Gems/AWSMetrics/Code/Source/AWSMetricsModule.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsServiceApi.h b/Gems/AWSMetrics/Code/Source/AWSMetricsServiceApi.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/AWSMetricsServiceApi.h
rename to Gems/AWSMetrics/Code/Source/AWSMetricsServiceApi.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/AWSMetricsSystemComponent.h b/Gems/AWSMetrics/Code/Source/AWSMetricsSystemComponent.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/AWSMetricsSystemComponent.h
rename to Gems/AWSMetrics/Code/Source/AWSMetricsSystemComponent.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/ClientConfiguration.h b/Gems/AWSMetrics/Code/Source/ClientConfiguration.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/ClientConfiguration.h
rename to Gems/AWSMetrics/Code/Source/ClientConfiguration.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/DefaultClientIdProvider.h b/Gems/AWSMetrics/Code/Source/DefaultClientIdProvider.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/DefaultClientIdProvider.h
rename to Gems/AWSMetrics/Code/Source/DefaultClientIdProvider.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/GlobalStatistics.h b/Gems/AWSMetrics/Code/Source/GlobalStatistics.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/GlobalStatistics.h
rename to Gems/AWSMetrics/Code/Source/GlobalStatistics.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/IdentityProvider.h b/Gems/AWSMetrics/Code/Source/IdentityProvider.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/IdentityProvider.h
rename to Gems/AWSMetrics/Code/Source/IdentityProvider.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/MetricsEvent.h b/Gems/AWSMetrics/Code/Source/MetricsEvent.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/MetricsEvent.h
rename to Gems/AWSMetrics/Code/Source/MetricsEvent.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/MetricsEventBuilder.h b/Gems/AWSMetrics/Code/Source/MetricsEventBuilder.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/MetricsEventBuilder.h
rename to Gems/AWSMetrics/Code/Source/MetricsEventBuilder.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/MetricsManager.h b/Gems/AWSMetrics/Code/Source/MetricsManager.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/MetricsManager.h
rename to Gems/AWSMetrics/Code/Source/MetricsManager.h
diff --git a/Gems/AWSMetrics/Code/Include/Private/MetricsQueue.h b/Gems/AWSMetrics/Code/Source/MetricsQueue.h
similarity index 100%
rename from Gems/AWSMetrics/Code/Include/Private/MetricsQueue.h
rename to Gems/AWSMetrics/Code/Source/MetricsQueue.h
diff --git a/Gems/AWSMetrics/Code/awsmetrics_files.cmake b/Gems/AWSMetrics/Code/awsmetrics_files.cmake
index b51235c957..936c5634e1 100644
--- a/Gems/AWSMetrics/Code/awsmetrics_files.cmake
+++ b/Gems/AWSMetrics/Code/awsmetrics_files.cmake
@@ -7,27 +7,28 @@
 #
 
 set(FILES
-    Include/Public/AWSMetricsBus.h
-    Include/Private/AWSMetricsConstant.h
-    Include/Private/AWSMetricsServiceApi.h
-    Include/Private/AWSMetricsSystemComponent.h
-    Include/Private/ClientConfiguration.h
-    Include/Private/DefaultClientIdProvider.h
-    Include/Private/GlobalStatistics.h
-    Include/Private/IdentityProvider.h
-    Include/Private/MetricsAttribute.h
-    Include/Private/MetricsEvent.h
-    Include/Private/MetricsEventBuilder.h    
-    Include/Private/MetricsManager.h
-    Include/Private/MetricsQueue.h
-    Source/ClientConfiguration.cpp
-    Source/DefaultClientIdProvider.cpp
+    Include/AWSMetricsBus.h
+    Include/MetricsAttribute.h
+
+    Source/AWSMetricsConstant.h
     Source/AWSMetricsServiceApi.cpp
+    Source/AWSMetricsServiceApi.h
     Source/AWSMetricsSystemComponent.cpp
+    Source/AWSMetricsSystemComponent.h
+    Source/ClientConfiguration.cpp
+    Source/ClientConfiguration.h
+    Source/DefaultClientIdProvider.h
+    Source/DefaultClientIdProvider.cpp
+    Source/GlobalStatistics.h
     Source/IdentityProvider.cpp
-    Source/MetricsEvent.cpp
-    Source/MetricsEventBuilder.cpp
+    Source/IdentityProvider.h
     Source/MetricsAttribute.cpp
+    Source/MetricsEvent.cpp
+    Source/MetricsEvent.h
+    Source/MetricsEventBuilder.cpp
+    Source/MetricsEventBuilder.h
     Source/MetricsManager.cpp
+    Source/MetricsManager.h
     Source/MetricsQueue.cpp
+    Source/MetricsQueue.h
 )
diff --git a/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake b/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake
index 3366363152..fee62c6f12 100644
--- a/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake
+++ b/Gems/AWSMetrics/Code/awsmetrics_shared_files.cmake
@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSMetricsModule.h
     Source/AWSMetricsModule.cpp
+    Source/AWSMetricsModule.h
 )
diff --git a/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp b/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
index 56f28856af..8f8fb48212 100644
--- a/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
+++ b/Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
@@ -439,13 +439,6 @@ namespace AssetValidation
 
     bool GetDefaultSeedListFiles(AZStd::vector<AZStd::string>& defaultSeedListFiles)
     {
-        const char* engineRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-
-        const char* appRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetAppRoot);
-
-
         auto settingsRegistry = AZ::SettingsRegistry::Get();
         AZ::SettingsRegistryInterface::FixedValueString gameFolder;
         auto projectKey = AZ::SettingsRegistryInterface::FixedValueString::format("%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey);
@@ -509,30 +502,28 @@ namespace AssetValidation
 
     AZ::Outcome<AzFramework::AssetSeedList, AZStd::string> AssetValidationSystemComponent::LoadSeedList(const char* seedPath, AZStd::string& seedListPath)
     {
-        AZStd::string absoluteSeedPath = seedPath;
+        AZ::IO::Path absoluteSeedPath = seedPath;
 
         if (AZ::StringFunc::Path::IsRelative(seedPath))
         {
-            const char* appRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(appRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
+            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
 
-            if (!appRoot)
+            if (engineRoot.empty())
             {
                 return AZ::Failure(AZStd::string("Couldn't get engine root"));
             }
 
-            absoluteSeedPath = AZStd::string::format("%s/%s", appRoot, seedPath);
+            absoluteSeedPath = (engineRoot / seedPath).String();
         }
 
-        AzFramework::StringFunc::Path::Normalize(absoluteSeedPath);
         AzFramework::AssetSeedList seedList;
 
-        if (!AZ::Utils::LoadObjectFromFileInPlace(absoluteSeedPath, seedList))
+        if (!AZ::Utils::LoadObjectFromFileInPlace(absoluteSeedPath.Native(), seedList))
         {
             return AZ::Failure(AZStd::string::format("Failed to load seed list %s", absoluteSeedPath.c_str()));
         }
 
-        seedListPath = absoluteSeedPath;
+        seedListPath = AZStd::move(absoluteSeedPath.Native());
 
         return AZ::Success(seedList);
     }
diff --git a/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h b/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
index c4872ab425..8da3ae1b34 100644
--- a/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
+++ b/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
@@ -150,13 +150,13 @@ struct AssetValidationTest
 
             auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
                 + "/project_path";
-            m_registry.Set(projectPathKey, (AZ::IO::FixedMaxPath(GetEngineRoot()) / "AutomatedTesting").Native());
+            m_registry.Set(projectPathKey, (AZ::IO::FixedMaxPath(m_tempDir.GetDirectory()) / "AutomatedTesting").Native());
             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";
-            m_registry.Set(enginePathKey, GetEngineRoot());
+            m_registry.Set(enginePathKey, m_tempDir.GetDirectory());
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(m_registry);
         }
     }
@@ -176,11 +176,6 @@ struct AssetValidationTest
         AZ_Assert(false, "Not implemented");
     }
 
-    const char* GetEngineRoot() const override
-    {
-        return m_tempDir.GetDirectory();
-    }
-
     void SetUp() override
     {
         using namespace ::testing;
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset
similarity index 60%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset
index fe2e7e0cb4..dc1f38d2da 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset
@@ -7,16 +7,6 @@
             "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
             "Name": "Albedo",
             "RGB_Weight": "CIEXYZ",
-            "FileMasks": [
-                "_basecolor",
-                "_diff",
-                "_color",
-                "_col",
-                "_albedo",
-                "_alb",
-                "_bc",
-                "_diffuse"
-            ],
             "PixelFormat": "BC1",
             "DiscardAlpha": true,
             "IsPowerOf2": true,
@@ -29,16 +19,6 @@
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_col",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
@@ -51,16 +31,6 @@
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_col",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
@@ -73,16 +43,6 @@
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_col",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "BC1",
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
@@ -94,16 +54,6 @@
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_col",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "BC1",
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset
similarity index 60%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset
index fda5a9cc52..439a057410 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset
@@ -7,15 +7,6 @@
             "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
             "Name": "AlbedoWithCoverage",
             "RGB_Weight": "CIEXYZ",
-            "FileMasks": [
-                "_diff",
-                "_color",
-                "_albedo",
-                "_alb",
-                "_basecolor",
-                "_bc",
-                "_diffuse"
-            ],
             "PixelFormat": "BC1a",
             "IsPowerOf2": true,
             "MipMapSetting": {
@@ -27,15 +18,6 @@
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -46,15 +28,6 @@
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -65,15 +38,6 @@
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "BC1a",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -84,15 +48,6 @@
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "BC1a",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset
similarity index 55%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset
index 19d2b2bbe6..c315ede21c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset
@@ -7,17 +7,7 @@
             "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
             "Name": "AlbedoWithGenericAlpha",
             "RGB_Weight": "CIEXYZ",
-            "FileMasks": [
-                "_diff",
-                "_color",
-                "_albedo",
-                "_alb",
-                "_basecolor",
-                "_bc",
-                "_diffuse"
-            ],
-            "PixelFormat": "BC3",
-            "IsPowerOf2": true,
+            "PixelFormat": "ASTC_4x4",
             "MipMapSetting": {
                 "MipGenType": "Box"
             }
@@ -27,18 +17,8 @@
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
@@ -47,18 +27,8 @@
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
@@ -67,17 +37,7 @@
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "BC3",
-                "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
@@ -86,17 +46,7 @@
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_diff",
-                    "_color",
-                    "_albedo",
-                    "_alb",
-                    "_basecolor",
-                    "_bc",
-                    "_diffuse"
-                ],
                 "PixelFormat": "BC3",
-                "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AmbientOcclusion.preset
similarity index 64%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AmbientOcclusion.preset
index d5acef34d6..573de18b88 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AmbientOcclusion.preset
@@ -8,12 +8,6 @@
             "Name": "AmbientOcclusion",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_ao",
-                "_ambocc",
-                "_amb",
-                "_ambientocclusion"
-            ],
             "PixelFormat": "BC4"
         },
         "PlatformsPresets": {
@@ -22,12 +16,6 @@
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ao",
-                    "_ambocc",
-                    "_amb",
-                    "_ambientocclusion"
-                ],
                 "MaxTextureSize": 2048,
                 "PixelFormat": "ASTC_4x4"
             },
@@ -36,12 +24,6 @@
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ao",
-                    "_ambocc",
-                    "_amb",
-                    "_ambientocclusion"
-                ],
                 "MaxTextureSize": 2048,
                 "PixelFormat": "ASTC_4x4"
             },
@@ -50,12 +32,6 @@
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ao",
-                    "_ambocc",
-                    "_amb",
-                    "_ambientocclusion"
-                ],
                 "PixelFormat": "BC4"
             },
             "provo": {
@@ -63,12 +39,6 @@
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ao",
-                    "_ambocc",
-                    "_amb",
-                    "_ambientocclusion"
-                ],
                 "PixelFormat": "BC4"
             }
         }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ConvolvedCubemap.preset
similarity index 88%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ConvolvedCubemap.preset
index abdf6501be..1ef15ada45 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ConvolvedCubemap.preset
@@ -8,10 +8,6 @@
             "Name": "ConvolvedCubemap",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_ccm",
-                "_convolvedcubemap"
-            ],
             "SuppressEngineReduce": true,
             "PixelFormat": "R9G9B9E5",
             "DiscardAlpha": true,
@@ -35,10 +31,6 @@
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ccm",
-                    "_convolvedcubemap"
-                ],
                 "SuppressEngineReduce": true,
                 "PixelFormat": "R9G9B9E5",
                 "DiscardAlpha": true,
@@ -61,10 +53,6 @@
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ccm",
-                    "_convolvedcubemap"
-                ],
                 "SuppressEngineReduce": true,
                 "PixelFormat": "R9G9B9E5",
                 "DiscardAlpha": true,
@@ -87,10 +75,6 @@
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ccm",
-                    "_convolvedcubemap"
-                ],
                 "SuppressEngineReduce": true,
                 "PixelFormat": "R9G9B9E5",
                 "DiscardAlpha": true,
@@ -113,10 +97,6 @@
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ccm",
-                    "_convolvedcubemap"
-                ],
                 "SuppressEngineReduce": true,
                 "PixelFormat": "R9G9B9E5",
                 "DiscardAlpha": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Decal_AlbedoWithOpacity.preset
similarity index 86%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Decal_AlbedoWithOpacity.preset
index e2e009afc5..873d434380 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Decal_AlbedoWithOpacity.preset
@@ -6,9 +6,6 @@
         "DefaultPreset": {
             "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
             "Name": "Decal_AlbedoWithOpacity",
-            "FileMasks": [
-                "_decal"
-            ],
             "PixelFormat": "BC7t",
             "IsPowerOf2": true,
             "MipMapSetting": {
@@ -21,9 +18,6 @@
             "android": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
-                "FileMasks": [
-                    "_decal"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
@@ -36,9 +30,6 @@
             "ios": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
-                "FileMasks": [
-                    "_decal"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
@@ -51,9 +42,6 @@
             "mac": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
-                "FileMasks": [
-                    "_decal"
-                ],
                 "PixelFormat": "BC3",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -65,9 +53,6 @@
             "provo": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
-                "FileMasks": [
-                    "_decal"
-                ],
                 "PixelFormat": "BC7t",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Displacement.preset
similarity index 59%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Displacement.preset
index 28ac84d646..04f35dbd6f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Displacement.preset
@@ -8,18 +8,6 @@
             "Name": "Displacement",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_displ",
-                "_disp",
-                "_dsp",
-                "_d",
-                "_dm",
-                "_displacement",
-                "_height",
-                "_hm",
-                "_ht",
-                "_h"
-            ],
             "PixelFormat": "BC4",
             "DiscardAlpha": true,
             "IsPowerOf2": true,
@@ -33,18 +21,6 @@
                 "Name": "Displacement",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_displ",
-                    "_disp",
-                    "_dsp",
-                    "_d",
-                    "_dm",
-                    "_displacement",
-                    "_height",
-                    "_hm",
-                    "_ht",
-                    "_h"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
@@ -59,18 +35,6 @@
                 "Name": "Displacement",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_displ",
-                    "_disp",
-                    "_dsp",
-                    "_d",
-                    "_dm",
-                    "_displacement",
-                    "_height",
-                    "_hm",
-                    "_ht",
-                    "_h"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
@@ -84,18 +48,6 @@
                 "Name": "Displacement",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_displ",
-                    "_disp",
-                    "_dsp",
-                    "_d",
-                    "_dm",
-                    "_displacement",
-                    "_height",
-                    "_hm",
-                    "_ht",
-                    "_h"
-                ],
                 "PixelFormat": "BC4",
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
@@ -108,18 +60,6 @@
                 "Name": "Displacement",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_displ",
-                    "_disp",
-                    "_dsp",
-                    "_d",
-                    "_dm",
-                    "_displacement",
-                    "_height",
-                    "_hm",
-                    "_ht",
-                    "_h"
-                ],
                 "PixelFormat": "BC4",
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset
similarity index 61%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset
index f5e3a79357..798b8d1657 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset
@@ -7,13 +7,6 @@
             "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
             "Name": "Emissive",
             "RGB_Weight": "CIEXYZ",
-            "FileMasks": [
-                    "_emissive",
-                    "_e",
-                    "_glow",
-                    "_em",
-                    "_emit"
-            ],
             "PixelFormat": "BC7",
             "DiscardAlpha": true
         },
@@ -22,13 +15,6 @@
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_emissive",
-                    "_e",
-                    "_glow",
-                    "_em",
-                    "_emit"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true
@@ -37,13 +23,6 @@
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_emissive",
-                    "_e",
-                    "_glow",
-                    "_em",
-                    "_emit"
-                ],
                 "PixelFormat": "ASTC_6x6",
                 "MaxTextureSize": 2048,
                 "DiscardAlpha": true
@@ -52,13 +31,6 @@
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_emissive",
-                    "_e",
-                    "_glow",
-                    "_em",
-                    "_emit"
-                ],
                 "PixelFormat": "BC7",
                 "DiscardAlpha": true
             },
@@ -66,13 +38,6 @@
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
-                "FileMasks": [
-                    "_emissive",
-                    "_e",
-                    "_glow",
-                    "_em",
-                    "_emit"
-                ],
                 "PixelFormat": "BC7",
                 "DiscardAlpha": true
             }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Gradient.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Gradient.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Greyscale.preset
similarity index 77%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Greyscale.preset
index c71ada1269..19439bad2d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Greyscale.preset
@@ -8,11 +8,8 @@
             "Name": "Greyscale",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_mask"
-            ],
             "PixelFormat": "BC4",
-            "IsPowerOf2": true,
+            "Swizzle": "rrr1",
             "MipMapSetting": {
                 "MipGenType": "Box"
             }
@@ -23,11 +20,8 @@
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_mask"
-                ],
                 "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true,
+                "Swizzle": "rrr1",
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
@@ -37,11 +31,8 @@
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_mask"
-                ],
                 "PixelFormat": "ASTC_4x4",
-                "IsPowerOf2": true,
+                "Swizzle": "rrr1",
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
@@ -51,11 +42,8 @@
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_mask"
-                ],
                 "PixelFormat": "BC4",
-                "IsPowerOf2": true,
+                "Swizzle": "rrr1",
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
@@ -65,11 +53,8 @@
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_mask"
-                ],
                 "PixelFormat": "BC4",
-                "IsPowerOf2": true,
+                "Swizzle": "rrr1",
                 "MipMapSetting": {
                     "MipGenType": "Box"
                 }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLDiffuse.preset
similarity index 90%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLDiffuse.preset
index 8bd6b348d1..845f8e13e4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLDiffuse.preset
@@ -7,9 +7,6 @@
             "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
             "Name": "IBLDiffuse",
             "Description": "The input cubemap generates an IBL diffuse output cubemap.",
-            "FileMasks": [
-                "_ibldiffusecm"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -31,9 +28,6 @@
             "android": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
-                "FileMasks": [
-                    "_ibldiffusecm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -54,9 +48,6 @@
             "ios": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
-                "FileMasks": [
-                    "_ibldiffusecm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -77,9 +68,6 @@
             "mac": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
-                "FileMasks": [
-                    "_ibldiffusecm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -100,9 +88,6 @@
             "provo": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
-                "FileMasks": [
-                    "_ibldiffusecm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLGlobal.preset
similarity index 83%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLGlobal.preset
index 717157f2aa..51daf44d6e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLGlobal.preset
@@ -8,11 +8,6 @@
             "Name": "IBLGlobal",
             "Description": "The input cubemap generates IBL specular and diffuse cubemaps.",
             "GenerateIBLOnly": true,
-            "FileMasks": [
-                "_iblglobalcm",
-                "_cubemap",
-                "_cm"
-            ],
             "CubemapSettings": {
                 "GenerateIBLSpecular": true,
                 "IBLSpecularPreset": "IBLSpecular",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSkybox.preset
similarity index 90%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSkybox.preset
index eee9af4cea..1a596468bd 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSkybox.preset
@@ -7,9 +7,6 @@
             "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
             "Name": "IBLSkybox",
             "Description": "The input cubemap generates a skybox, IBL specular, and IBL diffuse output cubemaps.",
-            "FileMasks": [
-                "_iblskyboxcm"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -29,9 +26,6 @@
             "android": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
-                "FileMasks": [
-                    "_iblskyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -50,9 +44,6 @@
             "ios": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
-                "FileMasks": [
-                    "_iblskyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -71,9 +62,6 @@
             "mac": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
-                "FileMasks": [
-                    "_iblskyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -92,9 +80,6 @@
             "provo": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
-                "FileMasks": [
-                    "_iblskyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecular.preset
similarity index 87%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecular.preset
index 4f935c73ff..691f554540 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecular.preset
@@ -7,10 +7,6 @@
             "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
             "Name": "IBLSpecular",
             "Description": "The input cubemap generates an IBL specular output cubemap.",
-            "FileMasks": [
-                "_iblspecularcm",
-                "_iblspecularcm256"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -34,10 +30,6 @@
             "android": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
-                "FileMasks": [
-                    "_iblspecularcm",
-                    "_iblspecularcm256"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -60,10 +52,6 @@
             "ios": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
-                "FileMasks": [
-                    "_iblspecularcm",
-                    "_iblspecularcm256"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -86,10 +74,6 @@
             "mac": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
-                "FileMasks": [
-                    "_iblspecularcm",
-                    "_iblspecularcm256"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -112,10 +96,6 @@
             "provo": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
-                "FileMasks": [
-                    "_iblspecularcm",
-                    "_iblspecularcm256"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularHigh.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularHigh.preset
similarity index 90%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularHigh.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularHigh.preset
index ff4e143326..b436386864 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularHigh.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularHigh.preset
@@ -7,9 +7,6 @@
             "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}",
             "Name": "IBLSpecularHigh",
             "Description": "The input cubemap generates an IBL specular output cubemap.",
-            "FileMasks": [
-                "_iblspecularcm512"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -33,9 +30,6 @@
             "android": {
                 "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}",
                 "Name": "IBLSpecularHigh",
-                "FileMasks": [
-                    "_iblspecularcm512"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -58,9 +52,6 @@
             "ios": {
                 "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}",
                 "Name": "IBLSpecularHigh",
-                "FileMasks": [
-                    "_iblspecularcm512"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -83,9 +74,6 @@
             "mac": {
                 "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}",
                 "Name": "IBLSpecularHigh",
-                "FileMasks": [
-                    "_iblspecularcm512"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -108,9 +96,6 @@
             "provo": {
                 "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}",
                 "Name": "IBLSpecularHigh",
-                "FileMasks": [
-                    "_iblspecularcm512"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularLow.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularLow.preset
similarity index 90%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularLow.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularLow.preset
index ee9ddd6ac7..7810028efa 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularLow.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularLow.preset
@@ -7,9 +7,6 @@
             "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}",
             "Name": "IBLSpecularLow",
             "Description": "The input cubemap generates an IBL specular output cubemap.",
-            "FileMasks": [
-                "_iblspecularcm128"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -33,9 +30,6 @@
             "android": {
                 "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}",
                 "Name": "IBLSpecularLow",
-                "FileMasks": [
-                    "_iblspecularcm128"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -58,9 +52,6 @@
             "ios": {
                 "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}",
                 "Name": "IBLSpecularLow",
-                "FileMasks": [
-                    "_iblspecularcm128"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -83,9 +74,6 @@
             "mac": {
                 "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}",
                 "Name": "IBLSpecularLow",
-                "FileMasks": [
-                    "_iblspecularcm128"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -108,9 +96,6 @@
             "provo": {
                 "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}",
                 "Name": "IBLSpecularLow",
-                "FileMasks": [
-                    "_iblspecularcm128"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryHigh.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryHigh.preset
similarity index 90%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryHigh.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryHigh.preset
index 08d9416935..a18885dad9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryHigh.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryHigh.preset
@@ -7,9 +7,6 @@
             "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}",
             "Name": "IBLSpecularVeryHigh",
             "Description": "The input cubemap generates an IBL specular output cubemap.",
-            "FileMasks": [
-                "_iblspecularcm1024"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -33,9 +30,6 @@
             "android": {
                 "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}",
                 "Name": "IBLSpecularVeryHigh",
-                "FileMasks": [
-                    "_iblspecularcm1024"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -58,9 +52,6 @@
             "ios": {
                 "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}",
                 "Name": "IBLSpecularVeryHigh",
-                "FileMasks": [
-                    "_iblspecularcm1024"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -83,9 +74,6 @@
             "mac": {
                 "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}",
                 "Name": "IBLSpecularVeryHigh",
-                "FileMasks": [
-                    "_iblspecularcm1024"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -108,9 +96,6 @@
             "provo": {
                 "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}",
                 "Name": "IBLSpecularVeryHigh",
-                "FileMasks": [
-                    "_iblspecularcm1024"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryLow.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryLow.preset
similarity index 90%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryLow.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryLow.preset
index c5c0788848..fb910b563a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryLow.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryLow.preset
@@ -7,9 +7,6 @@
             "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}",
             "Name": "IBLSpecularVeryLow",
             "Description": "The input cubemap generates an IBL specular output cubemap.",
-            "FileMasks": [
-                "_iblspecularcm64"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -33,9 +30,6 @@
             "android": {
                 "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}",
                 "Name": "IBLSpecularVeryLow",
-                "FileMasks": [
-                    "_iblspecularcm64"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -58,9 +52,6 @@
             "ios": {
                 "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}",
                 "Name": "IBLSpecularVeryLow",
-                "FileMasks": [
-                    "_iblspecularcm64"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -83,9 +74,6 @@
             "mac": {
                 "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}",
                 "Name": "IBLSpecularVeryLow",
-                "FileMasks": [
-                    "_iblspecularcm64"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -108,9 +96,6 @@
             "provo": {
                 "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}",
                 "Name": "IBLSpecularVeryLow",
-                "FileMasks": [
-                    "_iblspecularcm64"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings
new file mode 100644
index 0000000000..bba2855650
--- /dev/null
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings
@@ -0,0 +1,154 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "BuilderSettingManager",
+    "ClassData": {
+        "BuildSettings": {
+            "android": {
+                "GlossScale": 16.0,
+                "GlossBias": 0.0,
+                "Streaming": false,
+                "Enable": true
+            },
+            "ios": {
+                "GlossScale": 16.0,
+                "GlossBias": 0.0,
+                "Streaming": false,
+                "Enable": true
+            },
+            "mac": {
+                "GlossScale": 16.0,
+                "GlossBias": 0.0,
+                "Streaming": false,
+                "Enable": true
+            },
+            "pc": {
+                "GlossScale": 16.0,
+                "GlossBias": 0.0,
+                "Streaming": false,
+                "Enable": true
+            },
+            "linux": {
+                "GlossScale": 16.0,
+                "GlossBias": 0.0,
+                "Streaming": false,
+                "Enable": true
+            },
+            "provo": {
+                "GlossScale": 16.0,
+                "GlossBias": 0.0,
+                "Streaming": false,
+                "Enable": false
+            }
+        },
+        "PresetsByFileMask": {
+            // albedo
+            "_basecolor": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_diff": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_diffuse": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_color": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_col": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_albedo": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_alb": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            "_bc": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ],
+            // normals
+            "_ddn": [ "Normals" ],
+            "_normal": [ "Normals" ],
+            "_normalmap": [ "Normals" ],
+            "_normals": [ "Normals" ],
+            "_norm": [ "Normals" ],
+            "_nor": [ "Normals" ],
+            "_nrm": [ "Normals" ],
+            "_nm": [ "Normals" ],
+            "_n": [ "Normals" ],
+            "_ddna": [ "NormalsWithSmoothness" ],
+            "_normala": [ "NormalsWithSmoothness" ],
+            "_nrma": [ "NormalsWithSmoothness" ],
+            "_nma": [ "NormalsWithSmoothness" ],
+            "_na": [ "NormalsWithSmoothness" ],
+            // refelctance
+            "_spec": [ "Reflectance" ],
+            "_specular": [ "Reflectance" ],
+            "_metallic": [ "Reflectance" ],
+            "_refl": [ "Reflectance" ],
+            "_ref": [ "Reflectance" ],
+            "_rf": [ "Reflectance" ],
+            "_gloss": [ "Reflectance" ],
+            "_g": [ "Reflectance" ],
+            "_f0": [ "Reflectance" ],
+            "_specf0": [ "Reflectance" ],
+            "_metal": [ "Reflectance" ],
+            "_mtl": [ "Reflectance" ],
+            "_m": [ "Reflectance" ],
+            "_mt": [ "Reflectance" ],
+            "_metalness": [ "Reflectance" ],
+            "_rough": [ "Reflectance" ],
+            "_roughness": [ "Reflectance" ],
+            // opacity
+            "_sss": [ "Opacity" ],
+            "_trans": [ "Opacity" ],
+            "_opac": [ "Opacity" ],
+            "_opacity": [ "Opacity" ],
+            "_o": [ "Opacity" ],
+            "_op": [ "Opacity" ],
+            "_mask": [ "Opacity", "Greyscale" ],
+            "_msk": [ "Opacity" ],
+            "_blend": [ "Opacity" ],
+            // AO
+            "_ao": [ "AmbientOcclusion" ],
+            "_ambocc": [ "AmbientOcclusion" ],
+            "_amb": [ "AmbientOcclusion" ],
+            "_ambientocclusion": [ "AmbientOcclusion" ],
+            // emissive
+            "_emissive": [ "Emissive" ],
+            "_e": [ "Emissive" ],
+            "_glow": [ "Emissive" ],
+            "_em": [ "Emissive" ],
+            "_emit": [ "Emissive" ],
+            // displacement
+            "_displ": [ "Displacement" ],
+            "_disp": [ "Displacement" ],
+            "_dsp": [ "Displacement" ],
+            "_d": [ "Displacement" ],
+            "_dm": [ "Displacement" ],
+            "_displacement": [ "Displacement" ],
+            "_height": [ "Displacement" ],
+            "_hm": [ "Displacement" ],
+            "_ht": [ "Displacement" ],
+            "_h": [ "Displacement" ],
+            // cubemap
+            "_ibldiffusecm": [ "IBLDiffuse" ],
+            "_iblskyboxcm": [ "IBLSkybox" ],
+            "_iblspecularcm": [ "IBLSpecular" ],
+            "_iblspecularcm64": [ "IBLSpecularVeryLow" ],
+            "_iblspecularcm128": [ "IBLSpecularLow" ],
+            "_iblspecularcm256": [ "IBLSpecular" ],
+            "_iblspecularcm512": [ "IBLSpecularHigh" ],
+            "_iblspecularcm1024": [ "IBLSpecularVeryHigh" ],
+            "_skyboxcm": [ "Skybox" ],
+            "_ccm": [ "ConvolvedCubemap" ],
+            "_convolvedcubemap": [ "ConvolvedCubemap" ],
+            "_iblglobalcm": [ "IBLGlobal" ],
+            "_cubemap": [ "IBLGlobal" ],
+            "_cm": [ "IBLGlobal" ],
+            // lut
+            "_lut": [ "LUT_RG8" ],
+            "_lutr32f": [ "LUT_R32F" ],
+            "_lutrgba8": [ "LUT_RGBA8" ],
+            "_lutrgba16": [ "LUT_RGBA16" ],
+            "_lutrgba16f": [ "LUT_RGBA16F" ],
+            "_lutrg16": [ "LUT_RG16" ],
+            "_lutrg32f": [ "LUT_RG32F" ],
+            "_lutrgba32f": [ "LUT_RGBA32F" ],
+            // layer mask
+            "_layers": [ "LayerMask" ],
+            "_rgbmask": [ "LayerMask" ],
+            // decal
+            "_decal": [ "Decal_AlbedoWithOpacity" ],
+            // ui
+            "_ui": [ "UserInterface_Compressed","UserInterface_Lossless" ]
+        },
+        "DefaultPreset": "Albedo",
+        "DefaultPresetAlpha": "AlbedoWithGenericAlpha"
+    }
+}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_R32F.preset
similarity index 97%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_R32F.preset
index 1bb23c6e96..693f268304 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_R32F.preset
@@ -6,7 +6,6 @@
         "DefaultPreset": {
             "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}",
             "Name": "LUT_R32F",
-            "FileMasks": ["_lutr32f"],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "PixelFormat": "R32F"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG16.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG16.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG32F.preset
similarity index 97%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG32F.preset
index 2cf0c6ca0a..7277a4b111 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG32F.preset
@@ -6,7 +6,6 @@
         "DefaultPreset": {
             "UUID": "{52470B8B-0798-4E03-B0D3-039D5141CFEC}",
             "Name": "LUT_RG32F",
-            "FileMasks": ["_lutrg32f"],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "PixelFormat": "R32G32F"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG8.preset
similarity index 79%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG8.preset
index 9838d532b2..051cc2bedc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG8.preset
@@ -8,9 +8,6 @@
             "Name": "LUT_RG8",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_lut"
-            ],
             "PixelFormat": "R8G8"
         },
         "PlatformsPresets": {
@@ -19,9 +16,6 @@
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lut"
-                ],
                 "PixelFormat": "R8G8"
             },
             "ios": {
@@ -29,9 +23,6 @@
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lut"
-                ],
                 "PixelFormat": "R8G8"
             },
             "mac": {
@@ -39,9 +30,6 @@
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lut"
-                ],
                 "PixelFormat": "R8G8"
             },
             "provo": {
@@ -49,9 +37,6 @@
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lut"
-                ],
                 "PixelFormat": "R8G8"
             }
         }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16.preset
similarity index 78%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16.preset
index f36d566d7e..ed940e5f25 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16.preset
@@ -8,9 +8,6 @@
             "Name": "LUT_RGBA16",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_lutrgba16"
-            ],
             "PixelFormat": "R16G16B16A16"
         },
         "PlatformsPresets": {
@@ -19,9 +16,6 @@
                 "Name": "LUT_RGBA16",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lutrgba16"
-                ],
                 "PixelFormat": "R16G16B16A16"
             },
             "ios": {
@@ -29,9 +23,6 @@
                 "Name": "LUT_RGBA16",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lutrgba16"
-                ],
                 "PixelFormat": "R16G16B16A16"
             },
             "osx_gl": {
@@ -39,9 +30,6 @@
                 "Name": "LUT_RGBA16",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lutrgba16"
-                ],
                 "PixelFormat": "R16G16B16A16"
             },
             "provo": {
@@ -49,9 +37,6 @@
                 "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/Assets/Config/LUT_RGBA16F.preset
similarity index 78%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16F.preset
index 367c5101b3..f5d109b4a1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16F.preset
@@ -8,9 +8,6 @@
             "Name": "LUT_RGBA16F",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_lutrgba16f"
-            ],
             "PixelFormat": "R16G16B16A16F"
         },
         "PlatformsPresets": {
@@ -19,9 +16,6 @@
                 "Name": "LUT_RGBA16F",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lutrgba16f"
-                ],
                 "PixelFormat": "R16G16B16A16F"
             },
             "ios": {
@@ -29,9 +23,6 @@
                 "Name": "LUT_RGBA16F",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lutrgba16f"
-                ],
                 "PixelFormat": "R16G16B16A16F"
             },
             "osx_gl": {
@@ -39,9 +30,6 @@
                 "Name": "LUT_RGBA16F",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_lutrgba16f"
-                ],
                 "PixelFormat": "R16G16B16A16F"
             },
             "provo": {
@@ -49,9 +37,6 @@
                 "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/Assets/Config/LUT_RGBA32F.preset
similarity index 97%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA32F.preset
index 3a456825bf..b85cb66c9d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA32F.preset
@@ -6,7 +6,6 @@
         "DefaultPreset": {
             "UUID": "{AC4C49D4-2C70-425A-8DBF-E7FB2C61CF8D}",
             "Name": "LUT_RGBA32F",
-            "FileMasks": ["_lutrgba32f"],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "PixelFormat": "R32G32B32A32F"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA8.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA8.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LayerMask.preset
similarity index 72%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LayerMask.preset
index 5ce06aaea2..d33db40547 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LayerMask.preset
@@ -8,10 +8,6 @@
             "Name": "LayerMask",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_layers",
-                "_rgbmask"
-            ],
             "PixelFormat": "R8G8B8X8"
         },
         "PlatformsPresets": {
@@ -20,10 +16,6 @@
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_layers",
-                    "_rgbmask"
-                ],
                 "PixelFormat": "R8G8B8X8"
             },
             "ios": {
@@ -31,10 +23,6 @@
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_layers",
-                    "_rgbmask"
-                ],
                 "PixelFormat": "R8G8B8X8"
             },
             "mac": {
@@ -42,10 +30,6 @@
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_layers",
-                    "_rgbmask"
-                ],
                 "PixelFormat": "R8G8B8X8"
             },
             "provo": {
@@ -53,10 +37,6 @@
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_layers",
-                    "_rgbmask"
-                ],
                 "PixelFormat": "R8G8B8X8"
             }
         }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Normals.preset
similarity index 62%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Normals.preset
index eee0b88686..3f7a9ff111 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Normals.preset
@@ -8,17 +8,6 @@
             "Name": "Normals",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_ddn",
-                "_normal",
-                "_normalmap",
-                "_normals",
-                "_norm",
-                "_nor",
-                "_nrm",
-                "_nm",
-                "_n"
-            ],
             "PixelFormat": "BC5s",
             "DiscardAlpha": true,
             "IsPowerOf2": true,
@@ -33,17 +22,6 @@
                 "Name": "Normals",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddn",
-                    "_normal",
-                    "_normalmap",
-                    "_normals",
-                    "_norm",
-                    "_nor",
-                    "_nrm",
-                    "_nm",
-                    "_n"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "DiscardAlpha": true,
                 "MaxTextureSize": 1024,
@@ -58,17 +36,6 @@
                 "Name": "Normals",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddn",
-                    "_normal",
-                    "_normalmap",
-                    "_normals",
-                    "_norm",
-                    "_nor",
-                    "_nrm",
-                    "_nm",
-                    "_n"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "DiscardAlpha": true,
                 "MaxTextureSize": 1024,
@@ -83,17 +50,6 @@
                 "Name": "Normals",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddn",
-                    "_normal",
-                    "_normalmap",
-                    "_normals",
-                    "_norm",
-                    "_nor",
-                    "_nrm",
-                    "_nm",
-                    "_n"
-                ],
                 "PixelFormat": "BC5s",
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
@@ -107,17 +63,6 @@
                 "Name": "Normals",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddn",
-                    "_normal",
-                    "_normalmap",
-                    "_normals",
-                    "_norm",
-                    "_nor",
-                    "_nrm",
-                    "_nm",
-                    "_n"
-                ],
                 "PixelFormat": "BC5s",
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/NormalsWithSmoothness.preset
similarity index 74%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/NormalsWithSmoothness.preset
index 2c66cf9190..fd0abf3467 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/NormalsWithSmoothness.preset
@@ -8,13 +8,6 @@
             "Name": "NormalsWithSmoothness",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_ddna",
-                "_normala",
-                "_nrma",
-                "_nma",
-                "_na"
-            ],
             "PixelFormat": "BC5s",
             "PixelFormatAlpha": "BC4",
             "IsPowerOf2": true,
@@ -30,13 +23,6 @@
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna",
-                    "_normala",
-                    "_nrma",
-                    "_nma",
-                    "_na"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "PixelFormatAlpha": "ASTC_4x4",
                 "MaxTextureSize": 2048,
@@ -52,13 +38,6 @@
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna",
-                    "_normala",
-                    "_nrma",
-                    "_nma",
-                    "_na"
-                ],
                 "PixelFormat": "ASTC_4x4",
                 "PixelFormatAlpha": "ASTC_4x4",
                 "MaxTextureSize": 2048,
@@ -74,13 +53,6 @@
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna",
-                    "_normala",
-                    "_nrma",
-                    "_nma",
-                    "_na"
-                ],
                 "PixelFormat": "BC5s",
                 "PixelFormatAlpha": "BC4",
                 "IsPowerOf2": true,
@@ -95,13 +67,6 @@
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_ddna",
-                    "_normala",
-                    "_nrma",
-                    "_nma",
-                    "_na"
-                ],
                 "PixelFormat": "BC5s",
                 "PixelFormatAlpha": "BC4",
                 "IsPowerOf2": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Opacity.preset
similarity index 56%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Opacity.preset
index 53998583cc..e896b74522 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Opacity.preset
@@ -8,19 +8,8 @@
             "Name": "Opacity",
             "SourceColor": "Linear",
             "DestColor": "Linear",
-            "FileMasks": [
-                "_sss",
-                "_trans",
-                "_opac",
-                "_opacity",
-                "_o",
-                "_opac",
-                "_op",
-                "_mask",
-                "_msk",
-                "_blend"
-            ],
             "PixelFormat": "BC4",
+            "Swizzle": "rrr1",
             "IsPowerOf2": true,
             "MipMapSetting": {
                 "MipGenType": "Box"
@@ -32,19 +21,8 @@
                 "Name": "Opacity",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_sss",
-                    "_trans",
-                    "_opac",
-                    "_opacity",
-                    "_o",
-                    "_opac",
-                    "_op",
-                    "_mask",
-                    "_msk",
-                    "_blend"
-                ],
                 "PixelFormat": "ASTC_4x4",
+                "Swizzle": "rrr1",
                 "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -56,19 +34,8 @@
                 "Name": "Opacity",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_sss",
-                    "_trans",
-                    "_opac",
-                    "_opacity",
-                    "_o",
-                    "_opac",
-                    "_op",
-                    "_mask",
-                    "_msk",
-                    "_blend"
-                ],
                 "PixelFormat": "ASTC_4x4",
+                "Swizzle": "rrr1",
                 "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -80,19 +47,8 @@
                 "Name": "Opacity",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_sss",
-                    "_trans",
-                    "_opac",
-                    "_opacity",
-                    "_o",
-                    "_opac",
-                    "_op",
-                    "_mask",
-                    "_msk",
-                    "_blend"
-                ],
                 "PixelFormat": "BC4",
+                "Swizzle": "rrr1",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -103,19 +59,8 @@
                 "Name": "Opacity",
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
-                "FileMasks": [
-                    "_sss",
-                    "_trans",
-                    "_opac",
-                    "_opacity",
-                    "_o",
-                    "_opac",
-                    "_op",
-                    "_mask",
-                    "_msk",
-                    "_blend"
-                ],
                 "PixelFormat": "BC4",
+                "Swizzle": "rrr1",
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinear.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinear.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinearUncompressed.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinearUncompressed.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_Linear.preset
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_Linear.preset
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset
new file mode 100644
index 0000000000..9e3c718978
--- /dev/null
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset
@@ -0,0 +1,68 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "MultiplatformPresetSettings",
+    "ClassData": {
+        "DefaultPreset": {
+            "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
+            "Name": "Reflectance",
+            "SourceColor": "Linear",
+            "DestColor": "Linear",
+            "PixelFormat": "BC4",
+            "IsPowerOf2": true,
+            "MipMapSetting": {
+                "MipGenType": "Box"
+            }
+        },
+        "PlatformsPresets": {
+            "android": {
+                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
+                "Name": "Reflectance",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "ASTC_6x6",
+                "Swizzle": "rrr1",
+                "MaxTextureSize": 2048,
+                "IsPowerOf2": true,
+                "MipMapSetting": {
+                    "MipGenType": "Box"
+                }
+            },
+            "ios": {
+                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
+                "Name": "Reflectance",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "ASTC_6x6",
+                "Swizzle": "rrr1",
+                "MaxTextureSize": 2048,
+                "IsPowerOf2": true,
+                "MipMapSetting": {
+                    "MipGenType": "Box"
+                }
+            },
+            "mac": {
+                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
+                "Name": "Reflectance",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "BC4",
+                "IsPowerOf2": true,
+                "MipMapSetting": {
+                    "MipGenType": "Box"
+                }
+            },
+            "provo": {
+                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
+                "Name": "Reflectance",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "BC4",
+                "IsPowerOf2": true,
+                "MipMapSetting": {
+                    "MipGenType": "Box"
+                }
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Skybox.preset
similarity index 86%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Skybox.preset
index 4f71855ecf..b502872f92 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Skybox.preset
@@ -6,9 +6,6 @@
         "DefaultPreset": {
             "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
             "Name": "Skybox",
-            "FileMasks": [
-                "_skyboxcm"
-            ],
             "SourceColor": "Linear",
             "DestColor": "Linear",
             "SuppressEngineReduce": true,
@@ -24,9 +21,6 @@
             "android": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
-                "FileMasks": [
-                    "_skyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -41,9 +35,6 @@
             "ios": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
-                "FileMasks": [
-                        "_skyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -58,9 +49,6 @@
             "mac": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
-                "FileMasks": [
-                        "_skyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
@@ -75,9 +63,6 @@
             "provo": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
-                "FileMasks": [
-                        "_skyboxcm"
-                ],
                 "SourceColor": "Linear",
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset
similarity index 95%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset
index 13334de700..7e2c42fa6b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset
@@ -9,8 +9,7 @@
             "SuppressEngineReduce": true,
             "PixelFormat": "R8G8B8A8",
             "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [ "_ui" ]
+            "DestColor": "Linear"
         },
         "PlatformsPresets": {
             "android": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Lossless.preset
similarity index 95%
rename from Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Lossless.preset
index 39066b242b..bec6a604ef 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Lossless.preset
@@ -9,8 +9,7 @@
             "SuppressEngineReduce": true,
             "PixelFormat": "R8G8B8A8",
             "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [ "_ui" ]
+            "DestColor": "Linear"
         },
         "PlatformsPresets": {
             "android": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
index a4ba846f1b..1ae406c6fd 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
@@ -8,6 +8,7 @@
 
 
 #include "BuilderSettingManager.h"
+#include <QCoreApplication>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
@@ -17,8 +18,9 @@
 #include <BuilderSettings/CubemapSettings.h>
 #include <BuilderSettings/TextureSettings.h>
 #include <Converters/Cubemap.h>
-#include <Processing/PixelFormatInfo.h>
 #include <Processing/ImageToProcess.h>
+#include <Processing/PixelFormatInfo.h>
+#include <Processing/Utils.h>
 #include <ImageLoader/ImageLoaders.h>
 #include <ImageProcessing_Traits_Platform.h>
 
@@ -41,13 +43,18 @@
 
 namespace ImageProcessingAtom
 {
-    const char* BuilderSettingManager::s_defaultConfigRelativeFolder = "Gems/Atom/Asset/ImageProcessingAtom/Config/";
+    const char* BuilderSettingManager::s_defaultConfigRelativeFolder = "Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/";
     const char* BuilderSettingManager::s_projectConfigRelativeFolder = "Config/AtomImageBuilder/";
     const char* BuilderSettingManager::s_builderSettingFileName = "ImageBuilder.settings";
-    const char* BuilderSettingManager::s_presetFileExtension = ".preset";
+    const char* BuilderSettingManager::s_presetFileExtension = "preset";
 
     const char FileMaskDelimiter = '_';
 
+    namespace
+    {
+        [[maybe_unused]] static constexpr const char* const LogWindow = "Image Processing";
+    }
+
 #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3) \
     namespace ImageProcess##PrivateName                                                                                                                                                           \
@@ -69,13 +76,15 @@ namespace ImageProcessingAtom
         if (serialize)
         {
             serialize->Class<BuilderSettingManager>()
-                ->Version(1)
-                ->Field("AnalysisFingerprint", &BuilderSettingManager::m_analysisFingerprint)
+                ->Version(2)
                 ->Field("BuildSettings", &BuilderSettingManager::m_builderSettings)
-                ->Field("DefaultPresetsByFileMask", &BuilderSettingManager::m_defaultPresetByFileMask)
+                ->Field("PresetsByFileMask", &BuilderSettingManager::m_presetFilterMap)
                 ->Field("DefaultPreset", &BuilderSettingManager::m_defaultPreset)
                 ->Field("DefaultPresetAlpha", &BuilderSettingManager::m_defaultPresetAlpha)
-                ->Field("DefaultPresetNonePOT", &BuilderSettingManager::m_defaultPresetNonePOT);
+                ->Field("DefaultPresetNonePOT", &BuilderSettingManager::m_defaultPresetNonePOT)
+                // deprecated properties
+                ->Field("DefaultPresetsByFileMask", &BuilderSettingManager::m_defaultPresetByFileMask)
+                ->Field("AnalysisFingerprint", &BuilderSettingManager::m_analysisFingerprint);
         }
     }
 
@@ -122,7 +131,7 @@ namespace ImageProcessingAtom
         s_globalInstance.Reset();
     }
     
-    const PresetSettings* BuilderSettingManager::GetPreset(const PresetName& presetName, const PlatformName& platform, AZStd::string_view* settingsFilePathOut)
+    const PresetSettings* BuilderSettingManager::GetPreset(const PresetName& presetName, const PlatformName& platform, AZStd::string_view* settingsFilePathOut) const
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
         auto itr = m_presets.find(presetName);
@@ -137,16 +146,36 @@ namespace ImageProcessingAtom
         return nullptr;
     }
 
-    const BuilderSettings* BuilderSettingManager::GetBuilderSetting(const PlatformName& platform)
+    AZStd::vector<AZStd::string> BuilderSettingManager::GetFileMasksForPreset(const PresetName& presetName) const
     {
-        if (m_builderSettings.find(platform) != m_builderSettings.end())
+        AZStd::vector<AZStd::string> fileMasks;
+        
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
+        for (const auto& mapping:m_presetFilterMap)
         {
-            return &m_builderSettings[platform];
+            for (const auto& preset : mapping.second)
+            {
+                if (preset == presetName)
+                {
+                    fileMasks.push_back(mapping.first);
+                    break;
+                }
+            }
+        }
+        return fileMasks;
+    }
+
+    const BuilderSettings* BuilderSettingManager::GetBuilderSetting(const PlatformName& platform) const
+    {
+        auto itr = m_builderSettings.find(platform);
+        if (itr != m_builderSettings.end())
+        {
+            return &itr->second;
         }
         return nullptr;
     }
 
-    const PlatformNameList BuilderSettingManager::GetPlatformList()
+    const PlatformNameList BuilderSettingManager::GetPlatformList() const
     {
         PlatformNameList platforms;
 
@@ -161,12 +190,19 @@ namespace ImageProcessingAtom
         return platforms;
     }
 
-    const AZStd::map <FileMask, AZStd::unordered_set<PresetName>>& BuilderSettingManager::GetPresetFilterMap()
+    const AZStd::map <FileMask, AZStd::unordered_set<PresetName>>& BuilderSettingManager::GetPresetFilterMap() const
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
         return m_presetFilterMap;
     }
 
+    const AZStd::unordered_set<PresetName>& BuilderSettingManager::GetFullPresetList() const
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
+        AZStd::string noFilter = AZStd::string();
+        return m_presetFilterMap.find(noFilter)->second;
+    }
+
     const PresetName BuilderSettingManager::GetPresetNameFromId(const AZ::Uuid& presetId)
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
@@ -188,7 +224,6 @@ namespace ImageProcessingAtom
         m_presetFilterMap.clear();
         m_builderSettings.clear();
         m_presets.clear();
-        m_defaultPresetByFileMask.clear();
     }
 
     StringOutcome BuilderSettingManager::LoadConfig()
@@ -198,44 +233,53 @@ namespace ImageProcessingAtom
         auto fileIoBase = AZ::IO::FileIOBase::GetInstance();
         if (fileIoBase == nullptr)
         {
-            return AZ::Failure(AZStd::string("File IO instance needs to be initialized to resolve ImageProcessing builder file aliases"));
+            return AZ::Failure(
+                AZStd::string("File IO instance needs to be initialized to resolve ImageProcessing builder file aliases"));
         }
 
-        // Construct the default setting path
-
-        AZ::IO::FixedMaxPath defaultConfigFolder;
         if (auto engineRoot = fileIoBase->ResolvePath("@engroot@"); engineRoot.has_value())
         {
-            defaultConfigFolder = *engineRoot;
-            defaultConfigFolder /= s_defaultConfigRelativeFolder;
+            m_defaultConfigFolder = *engineRoot;
+            m_defaultConfigFolder /= s_defaultConfigRelativeFolder;
         }
 
-        AZ::IO::FixedMaxPath projectConfigFolder;
         if (auto sourceGameRoot = fileIoBase->ResolvePath("@projectroot@"); sourceGameRoot.has_value())
         {
-            projectConfigFolder = *sourceGameRoot;
-            projectConfigFolder /= s_projectConfigRelativeFolder;
+            m_projectConfigFolder = *sourceGameRoot;
+            m_projectConfigFolder /= s_projectConfigRelativeFolder;
         }
 
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
         ClearSettings();
         
-        outcome = LoadSettings((projectConfigFolder / s_builderSettingFileName).Native());
-
-        if (!outcome.IsSuccess())
-        {
-            outcome = LoadSettings((defaultConfigFolder / s_builderSettingFileName).Native());
-        }
+        outcome = LoadSettings();
         
         if (outcome.IsSuccess())
         {
             // Load presets in default folder first, then load from project folder. 
             // The same presets which loaded last will overwrite previous loaded one.
-            LoadPresets(defaultConfigFolder.Native());
-            LoadPresets(projectConfigFolder.Native());
+            LoadPresets(m_defaultConfigFolder.Native());
+            LoadPresets(m_projectConfigFolder.Native());
+        }
 
-            // Regenerate file mask mapping after all presets loaded
-            RegenerateMappings();
+        // Collect extra file masks from preset files
+        CollectFileMasksFromPresets();
+
+        
+        if (QCoreApplication::instance())
+        {
+            m_fileWatcher.reset(new QFileSystemWatcher);
+            // track preset files
+            // Note, the QT signal would only works for AP but not AssetBuilder
+            // We use file time stamp to track preset file change in builder's CreateJob
+            for (auto& preset : m_presets)
+            {
+                m_fileWatcher.data()->addPath(QString(preset.second.m_presetFilePath.c_str()));
+            }
+            m_fileWatcher.data()->addPath(QString(m_defaultConfigFolder.c_str()));
+            m_fileWatcher.data()->addPath(QString(m_projectConfigFolder.c_str()));
+            QObject::connect(m_fileWatcher.data(), &QFileSystemWatcher::fileChanged, this, &BuilderSettingManager::OnFileChanged);
+            QObject::connect(m_fileWatcher.data(), &QFileSystemWatcher::directoryChanged, this, &BuilderSettingManager::OnFolderChanged);
         }
 
         return outcome;
@@ -243,36 +287,84 @@ namespace ImageProcessingAtom
 
     void BuilderSettingManager::LoadPresets(AZStd::string_view presetFolder)
     {
-        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
-
         QDirIterator it(presetFolder.data(), QStringList() << "*.preset", QDir::Files, QDirIterator::NoIteratorFlags);
         while (it.hasNext())
         {
             QString filePath = it.next();
-            QFileInfo fileInfo = it.fileInfo();
+            LoadPreset(filePath.toUtf8().data());
+        }
+    }
 
-            MultiplatformPresetSettings preset;
-            auto result = AZ::JsonSerializationUtils::LoadObjectFromFile(preset, filePath.toUtf8().data());
-            if (!result.IsSuccess())
+    bool BuilderSettingManager::LoadPreset(const AZStd::string& filePath)
+    {
+        QFileInfo fileInfo (filePath.c_str());
+
+        if (!fileInfo.exists())
+        {
+            return false;
+        }
+
+        MultiplatformPresetSettings preset;
+        auto result = AZ::JsonSerializationUtils::LoadObjectFromFile(preset, filePath);
+        if (!result.IsSuccess())
+        {
+            AZ_Warning(LogWindow, false, "Failed to load preset file %s. Error: %s",
+                filePath.c_str(), result.GetError().c_str());
+            return false;
+        }
+
+        PresetName presetName(fileInfo.baseName().toUtf8().data());
+
+        AZ_Warning(LogWindow, presetName == preset.GetPresetName(), "Preset file name '%s' is not"
+            " same as preset name '%s'. Using preset file name as preset name",
+            filePath.c_str(), preset.GetPresetName().GetCStr());
+
+        preset.SetPresetName(presetName);
+
+        m_presets[presetName] = PresetEntry{preset, filePath.c_str(), fileInfo.lastModified()};
+        return true;
+    }
+
+    void BuilderSettingManager::ReloadPreset(const PresetName& presetName)
+    {
+        // Find the preset file from project or default config folder
+        AZStd::string presetFileName = AZStd::string::format("%s.%s", presetName.GetCStr(), s_presetFileExtension);
+        AZ::IO::FixedMaxPath filePath = m_projectConfigFolder/presetFileName;
+        QFileInfo fileInfo (filePath.c_str());
+        if (!fileInfo.exists())
+        {
+            filePath = (m_defaultConfigFolder/presetFileName).c_str();
+            fileInfo = QFileInfo(filePath.c_str());
+        }
+        
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
+
+        //Skip the loading if the file wasn't chagned
+        if (fileInfo.exists())
+        {
+            if (m_presets.find(presetName) != m_presets.end())
             {
-                AZ_Warning("Image Processing", false, "Failed to load preset file %s. Error: %s",
-                    filePath.toUtf8().data(), result.GetError().c_str());
+                if (m_presets[presetName].m_lastModifiedTime == fileInfo.lastModified()
+                    && m_presets[presetName].m_presetFilePath == filePath.c_str())
+                {
+                    return;
+                }
             }
+        }
 
-            PresetName presetName(fileInfo.baseName().toUtf8().data());
+        // remove preset
+        m_presets.erase(presetName);
 
-            AZ_Warning("Image Processing", presetName == preset.GetPresetName(), "Preset file name '%s' is not"
-                " same as preset name '%s'. Using preset file name as preset name",
-                filePath.toUtf8().data(), preset.GetPresetName().GetCStr());
-
-            preset.SetPresetName(presetName);
-
-            m_presets[presetName] = PresetEntry{preset, filePath.toUtf8().data()};
+        if (fileInfo.exists())
+        {
+            LoadPreset(filePath.c_str());
         }
     }
 
     StringOutcome BuilderSettingManager::LoadConfigFromFolder(AZStd::string_view configFolder)
     {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
+
         // Load builder settings
         AZStd::string settingFilePath = AZStd::string::format("%.*s%s",  aznumeric_cast<int>(configFolder.size()), 
             configFolder.data(), s_builderSettingFileName);
@@ -282,12 +374,108 @@ namespace ImageProcessingAtom
         if (result.IsSuccess())
         {
             LoadPresets(configFolder);
-            RegenerateMappings();
         }
 
         return result;
     }
 
+    void BuilderSettingManager::ReportDeprecatedSettings()
+    {
+        // reported deprecated attributes in image builder settings
+        if (!m_analysisFingerprint.empty())
+        {
+            AZ_Warning(LogWindow, false, "'AnalysisFingerprint' is deprecated and it should be removed from file [%s]", s_builderSettingFileName);
+        }
+        if (!m_defaultPresetByFileMask.empty())
+        {
+            AZ_Warning(LogWindow, false, "'DefaultPresetsByFileMask' is deprecated and it should be removed from file [%s]. Use PresetsByFileMask instead", s_builderSettingFileName);
+        }
+    }
+
+    StringOutcome BuilderSettingManager::LoadSettings()
+    {
+        // If the project image build setting file exist, it will merge image builder settings from project folder to the settings from default config folder.
+        bool needMerge = false;
+        AZStd::string projectSettingFile{ (m_projectConfigFolder / s_builderSettingFileName).Native() };
+
+        if (AZ::IO::SystemFile::Exists(projectSettingFile.c_str()))
+        {
+            needMerge = true;
+        }
+
+        AZ::Outcome<void, AZStd::string> outcome;
+        AZStd::string defaultSettingFile{ (m_defaultConfigFolder / s_builderSettingFileName).Native() };
+        if (needMerge)
+        {
+            auto outcome1 = AZ::JsonSerializationUtils::ReadJsonFile(defaultSettingFile);
+            auto outcome2 = AZ::JsonSerializationUtils::ReadJsonFile(projectSettingFile);
+
+            // return error if it failed to load default settings
+            if (!outcome1.IsSuccess())
+            {
+                return STRING_OUTCOME_ERROR(outcome1.GetError());
+            }
+
+            // if project config was loaded successfully, apply merge patch
+            rapidjson::Document& originDoc = outcome1.GetValue();
+            if (outcome2.IsSuccess())
+            {
+                const rapidjson::Document& patchDoc = outcome2.GetValue();
+                AZ::JsonSerializationResult::ResultCode result =
+                    AZ::JsonSerialization::ApplyPatch(originDoc, originDoc.GetAllocator(), patchDoc, AZ::JsonMergeApproach::JsonMergePatch);
+
+                if (result.GetProcessing() == AZ::JsonSerializationResult::Processing::Completed)
+                {
+                    AZStd::vector<char> outBuffer;
+                    AZ::IO::ByteContainerStream<AZStd::vector<char>> outStream{ &outBuffer };
+                    AZ::JsonSerializationUtils::WriteJsonStream(originDoc, outStream);
+
+                    outStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN);
+
+                    outcome = AZ::JsonSerializationUtils::LoadObjectFromStream(*this, outStream);
+                    if (!outcome.IsSuccess())
+                    {
+                        return STRING_OUTCOME_ERROR(outcome.GetError());
+                    }
+                    
+                    ReportDeprecatedSettings();
+
+
+                    // Generate config file fingerprint
+                    outStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN);
+                    AZ::u64 hash = AssetBuilderSDK::GetHashFromIOStream(outStream);
+                    m_analysisFingerprint = AZStd::string::format("%llX", hash);
+                }
+                else
+                {
+                    needMerge = false;
+                    AZ_Warning(LogWindow, false, "Failed to fully merge data into image builder settings. Skipping project build setting file [%s]", projectSettingFile.c_str());
+                }
+            }
+            else
+            {
+                AZ_Warning(LogWindow, false, "Failed to load project setting file [%s]. Skipping", projectSettingFile.c_str());
+            }
+        }
+
+        if (!needMerge)
+        {
+            outcome = AZ::JsonSerializationUtils::LoadObjectFromFile(*this, defaultSettingFile);
+            if (!outcome.IsSuccess())
+            {
+                return STRING_OUTCOME_ERROR(outcome.GetError());
+            }
+
+            ReportDeprecatedSettings();
+
+            // Generate config file fingerprint
+            AZ::u64 hash = AssetBuilderSDK::GetFileHash(defaultSettingFile.c_str());
+            m_analysisFingerprint = AZStd::string::format("%llX", hash);
+        }
+
+        return STRING_OUTCOME_SUCCESS;
+    }
+
     StringOutcome BuilderSettingManager::LoadSettings(AZStd::string_view filepath)
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
@@ -336,13 +524,13 @@ namespace ImageProcessingAtom
         return m_analysisFingerprint;
     }
 
-    void BuilderSettingManager::RegenerateMappings()
+    void BuilderSettingManager::CollectFileMasksFromPresets()
     {
         AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
 
         AZStd::string noFilter = AZStd::string();
-
-        m_presetFilterMap.clear();
+        
+        AZStd::string extraString;
 
         for (const auto& presetIter : m_presets)
         {
@@ -357,22 +545,31 @@ namespace ImageProcessingAtom
             {
                 if (filemask.empty() || filemask[0] != FileMaskDelimiter)
                 {
-                    AZ_Warning("Image Processing", false, "File mask '%s' is invalid. It must start with '%c'.", filemask.c_str(), FileMaskDelimiter);
+                    AZ_Warning(LogWindow, false, "File mask '%s' is invalid. It must start with '%c'.", filemask.c_str(), FileMaskDelimiter);
                     continue;
                 }
                 else if (filemask.size() < 2)
                 {
-                    AZ_Warning("Image Processing", false, "File mask '%s' is invalid. The '%c' must be followed by at least one other character.", filemask.c_str());
+                    AZ_Warning(LogWindow, false, "File mask '%s' is invalid. The '%c' must be followed by at least one other character.", filemask.c_str());
                     continue;
                 }
                 else if (filemask.find(FileMaskDelimiter, 1) != AZStd::string::npos)
                 {
-                    AZ_Warning("Image Processing", false, "File mask '%s' is invalid. It must contain only a single '%c' character.", filemask.c_str(), FileMaskDelimiter);
+                    AZ_Warning(LogWindow, false, "File mask '%s' is invalid. It must contain only a single '%c' character.", filemask.c_str(), FileMaskDelimiter);
                     continue;
                 }
+
+                extraString += (filemask + preset.m_name.GetCStr());
+
                 m_presetFilterMap[filemask].insert(preset.m_name);
             }
         }
+
+        if (!extraString.empty())
+        {
+            AZ::u64 hash = AZStd::hash<AZStd::string>{}(extraString);
+            m_analysisFingerprint += AZStd::string::format("%llX", hash);
+        }
     }
 
     void BuilderSettingManager::MetafilePathFromImagePath(AZStd::string_view imagePath, AZStd::string& metafilePath)
@@ -419,38 +616,15 @@ namespace ImageProcessingAtom
         return m_presets.find(presetName) != m_presets.end();
     }
 
-    PresetName BuilderSettingManager::GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr imageFromFile)
+    PresetName BuilderSettingManager::GetSuggestedPreset(AZStd::string_view imageFilePath) const
     {
         PresetName emptyPreset;
 
-        //load the image to get its size for later use
-        IImageObjectPtr image = imageFromFile;
-        //if the input image is empty we will try to load it from the path
-        if (imageFromFile == nullptr)
-        {
-            image = IImageObjectPtr(LoadImageFromFile(imageFilePath));
-        }
-
-        if (image == nullptr)
-        {
-            return emptyPreset;
-        }
-
         //get file mask of this image file
         AZStd::string fileMask = GetFileMask(imageFilePath);
 
         PresetName outPreset = emptyPreset;
 
-        //check default presets for some file masks
-        if (m_defaultPresetByFileMask.find(fileMask) != m_defaultPresetByFileMask.end())
-        {
-            outPreset = m_defaultPresetByFileMask[fileMask];
-            if (!IsValidPreset(outPreset))
-            {
-                outPreset = emptyPreset;
-            }
-        }
-
         //use the preset filter map to find
         if (outPreset.IsEmpty() && !fileMask.empty())
         {
@@ -461,54 +635,21 @@ namespace ImageProcessingAtom
             }
         }
 
-        const PresetSettings* presetInfo = nullptr;
-
-        if (!outPreset.IsEmpty())
-        {
-            presetInfo = GetPreset(outPreset);
-
-            //special case for cubemap
-            if (presetInfo && presetInfo->m_cubemapSetting)
-            {
-                // If it's not a latitude-longitude map or it doesn't match any cubemap layouts then reset its preset
-                if (!IsValidLatLongMap(image) && CubemapLayout::GetCubemapLayoutInfo(image) == nullptr)
-                {
-                    outPreset = emptyPreset;
-                }
-            }
-        }
-
         if (outPreset == emptyPreset)
         {
-            if (image->GetAlphaContent() == EAlphaContent::eAlphaContent_Absent)
-            {
-                outPreset = m_defaultPreset;
-            }
-            else
-            {
-                outPreset = m_defaultPresetAlpha;
-            }
+            outPreset = m_defaultPreset;
         }
 
-        //get the pixel format for selected preset
-        presetInfo = GetPreset(outPreset);
+        return outPreset;
+    }
 
-        if (presetInfo)
-        {
-            //valid whether image size work with pixel format
-            if (CPixelFormats::GetInstance().IsImageSizeValid(presetInfo->m_pixelFormat,
-                image->GetWidth(0), image->GetHeight(0), false))
-            {
-                return outPreset;
-            }
-            else
-            {
-                AZ_Warning("Image Processing", false, "Image dimensions are not compatible with preset '%s'. The default preset will be used.", presetInfo->m_name.GetCStr());
-            }
-        }
-
-        //uncompressed one which could be used for almost everything
-        return m_defaultPresetNonePOT;
+    AZStd::vector<AZStd::string> BuilderSettingManager::GetPossiblePresetPaths(const PresetName& presetName) const
+    {
+        AZStd::vector<AZStd::string> paths;
+        AZStd::string presetFile = AZStd::string::format("%s.preset", presetName.GetCStr());
+        paths.push_back((m_defaultConfigFolder / presetFile).c_str());
+        paths.push_back((m_projectConfigFolder / presetFile).c_str());
+        return paths;
     }
 
     bool BuilderSettingManager::DoesSupportPlatform(AZStd::string_view platformId)
@@ -526,18 +667,50 @@ namespace ImageProcessingAtom
             AZStd::string filePath;
             if (!AzFramework::StringFunc::Path::Join(outputFolder.data(), fileName.c_str(), filePath))
             {
-                AZ_Warning("Image Processing", false, "Failed to construct path with folder '%.*s' and file: '%s' to save preset",
+                AZ_Warning(LogWindow, false, "Failed to construct path with folder '%.*s' and file: '%s' to save preset",
                     aznumeric_cast<int>(outputFolder.size()), outputFolder.data(), filePath.c_str());
                 continue;
             }
             auto result = AZ::JsonSerializationUtils::SaveObjectToFile(&presetEntry.m_multiPreset, filePath);
             if (!result.IsSuccess())
             {
-                AZ_Warning("Image Processing", false, "Failed to save preset '%s' to file '%s'. Error: %s", 
+                AZ_Warning(LogWindow, false, "Failed to save preset '%s' to file '%s'. Error: %s", 
                     presetEntry.m_multiPreset.GetDefaultPreset().m_name.GetCStr(), filePath.c_str(), result.GetError().c_str());
             }
         }
     }
 
+    void BuilderSettingManager::OnFileChanged(const QString &path)
+    {
+        // handles preset file change
+        // Note: this signal only works with AP but not AssetBuilder
+        AZ_TracePrintf(LogWindow, "File changed %s\n", path.toUtf8().data());
+        QFileInfo info(path);
 
+        // skip if the file is not a preset file
+        // Note: for .settings file change it's handled when restart AP. 
+        if (info.suffix() != s_presetFileExtension)
+        {
+            return;
+        }
+        
+        ReloadPreset(PresetName(info.baseName().toUtf8().data()));
+    }
+    
+    void BuilderSettingManager::OnFolderChanged([[maybe_unused]] const QString &path)
+    {
+        // handles new file added or removed
+        // Note: this signal only works with AP but not AssetBuilder
+        AZ_TracePrintf(LogWindow, "folder changed %s\n", path.toUtf8().data());
+
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_presetMapLock);
+        m_presets.clear();
+        LoadPresets(m_defaultConfigFolder.Native());
+        LoadPresets(m_projectConfigFolder.Native());
+
+        for (auto& preset : m_presets)
+        {
+            m_fileWatcher.data()->addPath(QString(preset.second.m_presetFilePath.c_str()));
+        }
+    }
 } // namespace ImageProcessingAtom
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
index 3bbb71ea43..443b91bc07 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h
@@ -10,10 +10,15 @@
 
 #include <BuilderSettings/ImageProcessingDefines.h>
 #include <BuilderSettings/BuilderSettings.h>
-#include <AzCore/std/containers/set.h>
 #include <AzCore/base.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/std/containers/set.h>
 #include <Atom/ImageProcessing/ImageObject.h>
 
+#include <QDateTime>
+#include <QFileSystemWatcher>
+#include <QScopedPointer>
+
 class QSettings;
 class QString;
 
@@ -36,6 +41,7 @@ namespace ImageProcessingAtom
      * Each preset setting may have different values on different platform, but they are using same uuid.
      */
     class BuilderSettingManager
+        : public QObject // required for using QFileSystemWatcher
     {
         friend class ImageProcessingTest;
 
@@ -49,17 +55,21 @@ namespace ImageProcessingAtom
         static void DestroyInstance();
         static void Reflect(AZ::ReflectContext* context);
         
-        const PresetSettings* GetPreset(const PresetName& presetName, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr);
+        const PresetSettings* GetPreset(const PresetName& presetName, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr) const;
 
-        const BuilderSettings* GetBuilderSetting(const PlatformName& platform);
+        AZStd::vector<AZStd::string> GetFileMasksForPreset(const PresetName& presetName) const;
+
+        const BuilderSettings* GetBuilderSetting(const PlatformName& platform) const;
                 
         //! Return A list of platform supported
-        const PlatformNameList GetPlatformList();
+        const PlatformNameList GetPlatformList() const;
 
         //! Return A map of preset settings based on their filemasks.
         //!      @key filemask string, empty string means no filemask
         //!      @value set of preset setting names supporting the specified filemask
-        const AZStd::map<FileMask, AZStd::unordered_set<PresetName>>& GetPresetFilterMap();
+        const AZStd::map<FileMask, AZStd::unordered_set<PresetName>>& GetPresetFilterMap() const;
+
+        const AZStd::unordered_set<PresetName>& GetFullPresetList() const;
 
         //! Find preset name based on the preset id.
         const PresetName GetPresetNameFromId(const AZ::Uuid& presetId);
@@ -68,7 +78,11 @@ namespace ImageProcessingAtom
         StringOutcome LoadConfig();
         
         //! Load configurations files from a folder which includes builder settings and presets
-        StringOutcome LoadConfigFromFolder(AZStd::string_view configFolder);
+        //! Note: this is only used for unit test. Use LoadConfig() for editor or game launcher
+         StringOutcome LoadConfigFromFolder(AZStd::string_view configFolder);
+
+        //! Reload preset from config folders
+        void ReloadPreset(const PresetName& presetName);
                 
         const AZStd::string& GetAnalysisFingerprint() const;
 
@@ -81,7 +95,12 @@ namespace ImageProcessingAtom
         //! @param imageFilePath: Filepath string of the image file. The function may load the image from the path for better detection
         //! @param image: an optional image object which can be used for preset selection if there is no match based file mask.
         //! @return suggested preset name.
-        PresetName GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr image = nullptr);
+        PresetName GetSuggestedPreset(AZStd::string_view imageFilePath) const;
+
+        //! Get the possible preset config's full file paths
+        //! This function is only used for setting up image's source dependency if a preset file is missing
+        //! Otherwise, the preset's file path can be retrieved in GetPreset() function
+        AZStd::vector<AZStd::string> GetPossiblePresetPaths(const PresetName& presetName) const;
 
         bool IsValidPreset(PresetName presetName) const;
 
@@ -105,25 +124,41 @@ namespace ImageProcessingAtom
     private: // functions
         AZ_DISABLE_COPY_MOVE(BuilderSettingManager);
 
+        // Write image builder setting to the file specified by filepath
         StringOutcome WriteSettings(AZStd::string_view filepath);
+        // Load image builder settings from the file specified by filepath
         StringOutcome LoadSettings(AZStd::string_view filepath);
 
+        // Load merge image builder settings (project and default)
+        StringOutcome LoadSettings();
+
+        // report warnings for the deprecated properties in image builder setting data
+        void ReportDeprecatedSettings();
+
         // Clear Builder Settings and any cached maps/lists
         void ClearSettings();
 
-        // Regenerate Builder Settings and any cached maps/lists
-        void RegenerateMappings();
+        // collect file masks 
+        void CollectFileMasksFromPresets();
 
         // Functions to save/load preset from a folder
         void SavePresets(AZStd::string_view outputFolder);
         void LoadPresets(AZStd::string_view presetFolder);
 
+        // Load a preset to m_presets and return true if success
+        bool LoadPreset(const AZStd::string& filePath);
+
+        // handle preset files changes
+        void OnFileChanged(const QString &path);
+        void OnFolderChanged(const QString &path);
+
     private: // variables
 
         struct PresetEntry
         {
             MultiplatformPresetSettings m_multiPreset;
             AZStd::string m_presetFilePath; // Can be used for debug output
+            QDateTime m_lastModifiedTime;
         };
 
         // Builder settings for each platform
@@ -131,13 +166,13 @@ namespace ImageProcessingAtom
 
         AZStd::unordered_map<PresetName, PresetEntry> m_presets;
 
-        // Cached list of presets mapped by their file masks.
+        // a list of presets mapped by their file masks.
         // @Key file mask, use empty string to indicate all presets without filtering
         // @Value set of preset names that matches the file mask
         AZStd::map <FileMask, AZStd::unordered_set<PresetName>> m_presetFilterMap;
 
-        // A mutex to protect when modifying any map in this manager        
-        AZStd::recursive_mutex m_presetMapLock;
+        // A mutex to protect when modifying any map in this manager
+        mutable AZStd::recursive_mutex m_presetMapLock;
 
         // Default presets for certain file masks
         AZStd::map <FileMask, PresetName > m_defaultPresetByFileMask;
@@ -153,5 +188,14 @@ namespace ImageProcessingAtom
 
         // Image builder's version
         AZStd::string m_analysisFingerprint;
+
+        // default config folder
+        AZ::IO::FixedMaxPath m_defaultConfigFolder;
+
+        // project config folder
+        AZ::IO::FixedMaxPath m_projectConfigFolder;
+
+        // File system watcher to detect preset file changes
+        QScopedPointer<QFileSystemWatcher> m_fileWatcher;
     };
 } // namespace ImageProcessingAtom
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
index 9135a0f4d1..77f804b646 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h
@@ -26,19 +26,19 @@ namespace ImageProcessingAtom
         static void Reflect(AZ::ReflectContext* context);
 
         // "cm_ftype", cubemap angular filter type: gaussian, cone, disc, cosine, cosine_power, ggx
-        CubemapFilterType m_filter;
+        CubemapFilterType m_filter = CubemapFilterType::ggx;
 
         // "cm_fangle", base filter angle for cubemap filtering(degrees), 0 - disabled
-        float m_angle;
+        float m_angle = 0;
 
         // "cm_fmipangle", initial mip filter angle for cubemap filtering(degrees), 0 - disabled
-        float m_mipAngle;
+        float m_mipAngle = 0;
 
         // "cm_fmipslope", mip filter angle multiplier for cubemap filtering, 1 - default"
-        float m_mipSlope;
+        float m_mipSlope = 1;
 
         // "cm_edgefixup", cubemap edge fix-up width, 0 - disabled
-        float m_edgeFixup;
+        float m_edgeFixup = 0;
 
         // generate an IBL specular cubemap
         bool m_generateIBLSpecular = false;
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
index e421715995..7c35a0634e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h
@@ -39,7 +39,8 @@ namespace ImageProcessingAtom
 #define STRING_OUTCOME_ERROR(error) AZ::Failure(AZStd::string(error))
 
     // Common typedefs (with dependent forward-declarations)
-    typedef AZStd::string PlatformName, FileMask;
+    typedef AZStd::string PlatformName;
+    typedef AZStd::string FileMask;
     typedef AZ::Name PresetName;
     typedef AZStd::vector<PlatformName> PlatformNameVector;
     typedef AZStd::list<PlatformName> PlatformNameList;
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
index b0f78d60a3..3219bef582 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
@@ -32,10 +32,9 @@ namespace ImageProcessingAtom
             return;
         }
 
-        uint32 dwWidth, dwHeight, dwMips;
+        uint32 dwWidth, dwHeight;
         dwWidth = Get()->GetWidth(0);
         dwHeight = Get()->GetHeight(0);
-        dwMips = Get()->GetMipCount();
 
         //if the output image size doesn't work the desired pixel format. set to fallback format
         const PixelFormatInfo* dstFmtInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(fmtDst);
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
index 067faf3dab..3e255dcccc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
@@ -171,7 +171,7 @@ namespace ImageProcessingAtomEditor
         if (!preset)
         {
             AZ_Warning("Texture Editor", false, "Cannot find preset %s! Will assign a suggested one for the texture.", presetName.GetCStr());
-            presetName = BuilderSettingManager::Instance()->GetSuggestedPreset(m_fullPath, m_img);
+            presetName = BuilderSettingManager::Instance()->GetSuggestedPreset(m_fullPath);
 
             for (auto& settingIter : m_settingsMap)
             {
@@ -257,15 +257,22 @@ namespace ImageProcessingAtomEditor
             // Update input width and height if it's a cubemap
             if (presetSetting->m_cubemapSetting != nullptr)
             {
-                CubemapLayout *srcCubemap = CubemapLayout::CreateCubemapLayout(m_img);
-                if (srcCubemap == nullptr)
+                if (IsValidLatLongMap(m_img))
                 {
-                    return false;
+                    inputWidth = inputWidth/4;
+                }
+                else
+                {
+                    CubemapLayout *srcCubemap = CubemapLayout::CreateCubemapLayout(m_img);
+                    if (srcCubemap == nullptr)
+                    {
+                        return false;
+                    }
+                    inputWidth = srcCubemap->GetFaceSize();
+                    delete srcCubemap;
                 }
-                inputWidth = srcCubemap->GetFaceSize();
                 inputHeight = inputWidth;
                 outResolutionInfo.arrayCount = 6;
-                delete srcCubemap;
             }
 
             GetOutputExtent(inputWidth, inputHeight, outResolutionInfo.width, outResolutionInfo.height, outResolutionInfo.reduce, &textureSetting, presetSetting);
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
index e50d95b907..cc341c5e31 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
@@ -18,6 +18,27 @@
 namespace ImageProcessingAtomEditor
 {
     using namespace ImageProcessingAtom;
+
+    AZStd::string GetImageFileMask(const AZStd::string& imageFilePath)
+    {
+        const char FileMaskDelimiter = '_';
+
+        //get file name
+        AZStd::string fileName;
+        QString lowerFileName = imageFilePath.data();
+        lowerFileName = lowerFileName.toLower();
+        AzFramework::StringFunc::Path::GetFileName(lowerFileName.toUtf8().constData(), fileName);
+
+        //get the substring from last '_'
+        size_t lastUnderScore = fileName.find_last_of(FileMaskDelimiter);
+        if (lastUnderScore != AZStd::string::npos)
+        {
+            return fileName.substr(lastUnderScore);
+        }
+
+        return AZStd::string();
+    }
+
     TexturePresetSelectionWidget::TexturePresetSelectionWidget(EditorTextureSetting& textureSetting, QWidget* parent /*= nullptr*/)
         : QWidget(parent)
         , m_ui(new Ui::TexturePresetSelectionWidget)
@@ -29,33 +50,31 @@ namespace ImageProcessingAtomEditor
         m_presetList.clear();
         auto& presetFilterMap = BuilderSettingManager::Instance()->GetPresetFilterMap();
 
-        AZStd::unordered_set<ImageProcessingAtom::PresetName> noFilterPresetList;
-
-        // Check if there is any filtered preset list first
-        for(auto& presetFilter : presetFilterMap)
+        if (m_listAllPresets)
         {
-            if (presetFilter.first.empty())
+            m_presetList = BuilderSettingManager::Instance()->GetFullPresetList();
+        }
+        else
+        {
+            auto fileMask = GetImageFileMask(m_textureSetting->m_textureName);
+            auto itr = presetFilterMap.find(fileMask);
+            if (itr != presetFilterMap.end())
             {
-                noFilterPresetList = presetFilter.second;
+                m_presetList = itr->second;
             }
-            else if (IsMatchingWithFileMask(m_textureSetting->m_textureName, presetFilter.first))
+            else
             {
-                for(const auto& presetName : presetFilter.second)
-                {
-                    m_presetList.insert(presetName);
-                }
+                m_presetList = BuilderSettingManager::Instance()->GetFullPresetList();
             }
         }
-        // If no filtered preset list available or should list all presets, use non-filter list
-        if (m_presetList.size() == 0 || m_listAllPresets)
-        {
-            m_presetList = noFilterPresetList;
-        }
 
+        QStringList stringList;
         foreach (const auto& presetName, m_presetList)
         {
-            m_ui->presetComboBox->addItem(QString(presetName.GetCStr()));
+            stringList.append(QString(presetName.GetCStr()));
         }
+        stringList.sort();
+        m_ui->presetComboBox->addItems(stringList);
 
         // Set current preset
         const auto& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset;
@@ -173,8 +192,9 @@ namespace ImageProcessingAtomEditor
         AZStd::string conventionText = "";
         if (presetSettings)
         {
+            auto fileMasks = BuilderSettingManager::Instance()->GetFileMasksForPreset(presetSettings->m_name);
             int i = 0;
-            for (const PlatformName& filemask : presetSettings->m_fileMasks)
+            for (const auto& filemask : fileMasks)
             {
                 conventionText +=  i > 0 ? " " + filemask : filemask;
                 i++;
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
index 90d45ae65a..57596f4a71 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
@@ -221,6 +221,58 @@ namespace ImageProcessingAtom
         m_isShuttingDown = true;
     }
 
+    PresetName GetImagePreset(const AZStd::string& filepath)
+    {
+        // first let preset from asset info
+        TextureSettings textureSettings;
+        StringOutcome output = TextureSettings::LoadTextureSetting(filepath, textureSettings);
+
+        if (!textureSettings.m_preset.IsEmpty())
+        {
+            return textureSettings.m_preset;
+        }
+
+        return BuilderSettingManager::Instance()->GetSuggestedPreset(filepath);
+    }
+
+    void HandlePresetDependency(PresetName presetName, AZStd::vector<AssetBuilderSDK::SourceFileDependency>& sourceDependencyList)
+    {
+        // Reload preset if it was changed
+        ImageProcessingAtom::BuilderSettingManager::Instance()->ReloadPreset(presetName);
+        
+        AZStd::string_view filePath;
+        auto presetSettings = BuilderSettingManager::Instance()->GetPreset(presetName, /*default platform*/"", &filePath);
+
+        AssetBuilderSDK::SourceFileDependency sourceFileDependency;
+        sourceFileDependency.m_sourceDependencyType = AssetBuilderSDK::SourceFileDependency::SourceFileDependencyType::Absolute;
+
+        // Need to watch any possibe preset paths 
+        AZStd::vector<AZStd::string> possiblePresetPaths = BuilderSettingManager::Instance()->GetPossiblePresetPaths(presetName);
+        for (const auto& path:possiblePresetPaths)
+        {
+            sourceFileDependency.m_sourceFileDependencyPath = path;
+            sourceDependencyList.push_back(sourceFileDependency);
+        }
+
+        if (presetSettings)
+        {
+            // handle special case here
+            // Cubemap setting may reference some other presets
+            if (presetSettings->m_cubemapSetting)
+            {
+                if (presetSettings->m_cubemapSetting->m_generateIBLDiffuse && !presetSettings->m_cubemapSetting->m_iblDiffusePreset.IsEmpty())
+                {
+                    HandlePresetDependency(presetSettings->m_cubemapSetting->m_iblDiffusePreset, sourceDependencyList);
+                }
+            
+                if (presetSettings->m_cubemapSetting->m_generateIBLSpecular && !presetSettings->m_cubemapSetting->m_iblSpecularPreset.IsEmpty())
+                {
+                    HandlePresetDependency(presetSettings->m_cubemapSetting->m_iblSpecularPreset, sourceDependencyList);
+                }
+            }
+        }
+    }
+
     // this happens early on in the file scanning pass
     // this function should consistently always create the same jobs, and should do no checking whether the job is up to date or not - just be consistent.
     void ImageBuilderWorker::CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response)
@@ -242,13 +294,26 @@ namespace ImageProcessingAtom
             if (ImageProcessingAtom::BuilderSettingManager::Instance()->DoesSupportPlatform(platformInfo.m_identifier))
             {
                 AssetBuilderSDK::JobDescriptor descriptor;
-                descriptor.m_jobKey = ext + " Atom Compile";
+                descriptor.m_jobKey = "Image Compile: " + ext;
                 descriptor.SetPlatformIdentifier(platformInfo.m_identifier.c_str());
                 descriptor.m_critical = false;
+                descriptor.m_additionalFingerprintInfo = "";
                 response.m_createJobOutputs.push_back(descriptor);
             }
         }
 
+        // add source dependency for .assetinfo file
+        AssetBuilderSDK::SourceFileDependency sourceFileDependency;
+        sourceFileDependency.m_sourceDependencyType = AssetBuilderSDK::SourceFileDependency::SourceFileDependencyType::Absolute;
+        sourceFileDependency.m_sourceFileDependencyPath = request.m_sourceFile;
+        AZ::StringFunc::Path::ReplaceExtension(sourceFileDependency.m_sourceFileDependencyPath, TextureSettings::ExtensionName);
+        response.m_sourceFileDependencyList.push_back(sourceFileDependency);
+
+        // add source dependencies for .preset files
+        // Get the preset for this file 
+        auto presetName = GetImagePreset(request.m_sourceFile);
+        HandlePresetDependency(presetName, response.m_sourceFileDependencyList);
+
         response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
         return;
     }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
index 057605a089..9bd6bcbdf3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
@@ -99,11 +99,9 @@ namespace ImageProcessingAtom
                 return pRet;
             }
 
-            const char* pFormatText;
             if (dwBitsPerChannel == 8)
             {
                 // R8, GR8, BGR8, BGRA8
-                pFormatText = "8-bit";
                 pRet = Load8BitImageFromTIFF(tif);
             }
             else if (dwBitsPerChannel == 16)
@@ -111,19 +109,16 @@ namespace ImageProcessingAtom
                 // A/L/R16, R16F, GR16, GR16f, ARGB16, ARGB16f
                 if (dwFormat == SAMPLEFORMAT_IEEEFP)
                 {
-                    pFormatText = "16-bit float";
                     pRet = Load16BitHDRImageFromTIFF(tif);
                 }
                 else
                 {
-                    pFormatText = "16-bit int";
                     pRet = Load16BitImageFromTIFF(tif);
                 }
             }
             else if (dwBitsPerChannel == 32 && dwFormat == SAMPLEFORMAT_IEEEFP)
             {
                 // A/L/R32f, GR32f, ARGB32f
-                pFormatText = "32-bit float";
                 pRet = Load32BitHDRImageFromTIFF(tif);
             }
             else
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
index 5b23009cff..defca690a3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
@@ -11,6 +11,7 @@
 #include <Processing/ImageConvert.h>
 #include <Processing/ImageAssetProducer.h>
 #include <Processing/ImageFlags.h>
+#include <Processing/Utils.h>
 #include <Converters/FIR-Weights.h>
 #include <Converters/Cubemap.h>
 #include <Converters/PixelOperation.h>
@@ -229,12 +230,24 @@ namespace ImageProcessingAtom
                 AZStd::unique_ptr<CubemapSettings>& cubemapSettings = m_input->m_presetSetting.m_cubemapSetting;
                 if (cubemapSettings->m_generateIBLSpecular && !cubemapSettings->m_iblSpecularPreset.IsEmpty())
                 {
-                    CreateIBLCubemap(cubemapSettings->m_iblSpecularPreset, SpecularCubemapSuffix, m_iblSpecularCubemapImage);
+                    bool success = CreateIBLCubemap(cubemapSettings->m_iblSpecularPreset, SpecularCubemapSuffix, m_iblSpecularCubemapImage);
+                    if (!success)
+                    {
+                        m_isSucceed = false;
+                        m_isFinished = true;
+                        break;
+                    }
                 }
 
                 if (cubemapSettings->m_generateIBLDiffuse && !cubemapSettings->m_iblDiffusePreset.IsEmpty())
                 {
-                    CreateIBLCubemap(cubemapSettings->m_iblDiffusePreset, DiffuseCubemapSuffix, m_iblDiffuseCubemapImage);
+                    bool success = CreateIBLCubemap(cubemapSettings->m_iblDiffusePreset, DiffuseCubemapSuffix, m_iblDiffuseCubemapImage);
+                    if (!success)
+                    {
+                        m_isSucceed = false;
+                        m_isFinished = true;
+                        break;
+                    }
                 }
             }
 
@@ -251,7 +264,12 @@ namespace ImageProcessingAtom
             {
                 if (m_input->m_presetSetting.m_cubemapSetting->m_requiresConvolve)
                 {
-                    FillCubemapMipmaps();
+                    bool success = FillCubemapMipmaps();
+                    if (!success)
+                    {
+                        m_isSucceed = false;
+                         m_isFinished = true;
+                    }
                 }
             }
             else
@@ -268,9 +286,7 @@ namespace ImageProcessingAtom
             // get gloss from normal for all mipmaps and save to alpha channel
             if (m_input->m_presetSetting.m_glossFromNormals)
             {
-                bool hasAlpha = (m_alphaContent == EAlphaContent::eAlphaContent_OnlyBlack
-                    || m_alphaContent == EAlphaContent::eAlphaContent_OnlyBlackAndWhite
-                    || m_alphaContent == EAlphaContent::eAlphaContent_Greyscale);
+                bool hasAlpha = Utils::NeedAlphaChannel(m_alphaContent);
 
                 m_image->Get()->GlossFromNormals(hasAlpha);
                 // set alpha content so it won't be ignored later.
@@ -347,7 +363,11 @@ namespace ImageProcessingAtom
             }
             else
             {
-                AZ_TracePrintf("Image Processing", "Image converted with preset [%s] [%s] and saved to [%s] (%d bytes) taking %f seconds\n",
+                
+                [[maybe_unused]] const PixelFormatInfo* formatInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(m_image->Get()->GetPixelFormat());
+                AZ_TracePrintf("Image Processing", "Image [%dx%d] [%s] converted with preset [%s] [%s] and saved to [%s] (%d bytes) taking %f seconds\n",
+                    m_image->Get()->GetWidth(0), m_image->Get()->GetHeight(0),
+                    formatInfo->szName,
                     m_input->m_presetSetting.m_name.GetCStr(),
                     m_input->m_filePath.c_str(),
                     m_input->m_outputFolder.c_str(), sizeTotal, m_processTime);
@@ -421,6 +441,17 @@ namespace ImageProcessingAtom
             outHeight >>= 1;
             outReduce++;
         }
+
+        // resize to min texture size if it's smaller
+        if (outWidth < presetSettings->m_minTextureSize)
+        {
+            outWidth = presetSettings->m_minTextureSize;
+        }
+
+        if (outHeight < presetSettings->m_minTextureSize)
+        {
+            outHeight = presetSettings->m_minTextureSize;
+        }
     }
 
     bool ImageConvertProcess::ConvertToLinear()
@@ -647,7 +678,7 @@ namespace ImageProcessingAtom
         }
         else if (!CPixelFormats::GetInstance().IsImageSizeValid(dstFmt, dwWidth, dwHeight, false))
         {
-            AZ_Warning("Image Processing", false, "Image size will be scaled for pixel format %s", CPixelFormats::GetInstance().GetPixelFormatInfo(dstFmt)->szName);
+            AZ_TracePrintf("Image processing", "Image size will be scaled for pixel format %s\n", CPixelFormats::GetInstance().GetPixelFormatInfo(dstFmt)->szName);
         }
 
 #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
@@ -758,7 +789,7 @@ namespace ImageProcessingAtom
         // in very rare user case, an old texture setting file may not have a preset. We fix it over here too. 
         if (textureSettings.m_preset.IsEmpty())
         {
-            textureSettings.m_preset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilePath, srcImage);
+            textureSettings.m_preset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilePath);
         }
 
         // Get preset
@@ -795,7 +826,7 @@ namespace ImageProcessingAtom
         return process;
     }
 
-    void ImageConvertProcess::CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage)
+    bool ImageConvertProcess::CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage)
     {
         const AZStd::string& platformId = m_input->m_platform;
         AZStd::string_view filePath;
@@ -803,7 +834,7 @@ namespace ImageProcessingAtom
         if (presetSettings == nullptr)
         {
             AZ_Error("Image Processing", false, "Couldn't find preset for IBL cubemap generation");
-            return;
+            return false;
         }
 
         // generate export file name
@@ -838,14 +869,14 @@ namespace ImageProcessingAtom
         if (!imageConvertProcess)
         {
             AZ_Error("Image Processing", false, "Failed to create image convert process for the IBL cubemap");
-            return;
+            return false;
         }
 
         imageConvertProcess->ProcessAll();
         if (!imageConvertProcess->IsSucceed())
         {
             AZ_Error("Image Processing", false, "Image convert process for the IBL cubemap failed");
-            return;
+            return false;
         }
 
         // append the output products to the job's product list
@@ -853,6 +884,7 @@ namespace ImageProcessingAtom
 
         // store the output cubemap so it can be accessed by unit tests
         cubemapImage = imageConvertProcess->m_image->Get();
+        return true;
     }
 
     bool ConvertImageFile(const AZStd::string& imageFilePath, const AZStd::string& exportDir,
@@ -873,68 +905,6 @@ namespace ImageProcessingAtom
         return result;
     }
 
-    IImageObjectPtr MergeOutputImageForPreview(IImageObjectPtr image, IImageObjectPtr alphaImage)
-    {
-        if (!image)
-        {
-            return IImageObjectPtr();
-        }
-
-        ImageToProcess imageToProcess(image);
-        imageToProcess.ConvertFormat(ePixelFormat_R8G8B8A8);
-        IImageObjectPtr previewImage = imageToProcess.Get();
-
-        // If there is separate Alpha image, combine it with output
-        if (alphaImage)
-        {
-            // Create pixel operation function for rgb and alpha images
-            IPixelOperationPtr imageOp = CreatePixelOperation(ePixelFormat_R8G8B8A8);
-            IPixelOperationPtr alphaOp = CreatePixelOperation(ePixelFormat_A8);
-
-            // Convert the alpha image to A8 first
-            ImageToProcess imageToProcess2(alphaImage);
-            imageToProcess2.ConvertFormat(ePixelFormat_A8);
-            IImageObjectPtr previewImageAlpha = imageToProcess2.Get();
-
-            const uint32 imageMips = previewImage->GetMipCount();
-            [[maybe_unused]] const uint32 alphaMips = previewImageAlpha->GetMipCount();
-
-            // Get count of bytes per pixel for both rgb and alpha images
-            uint32 imagePixelBytes = CPixelFormats::GetInstance().GetPixelFormatInfo(ePixelFormat_R8G8B8A8)->bitsPerBlock / 8;
-            uint32 alphaPixelBytes = CPixelFormats::GetInstance().GetPixelFormatInfo(ePixelFormat_A8)->bitsPerBlock / 8;
-
-            AZ_Assert(imageMips <= alphaMips, "Mip level of alpha image is less than origin image!");
-
-            // For each mip level, set the alpha value to the image
-            for (uint32 mipLevel = 0; mipLevel < imageMips; ++mipLevel)
-            {
-                const uint32 pixelCount = previewImage->GetPixelCount(mipLevel);
-                [[maybe_unused]] const uint32 alphaPixelCount = previewImageAlpha->GetPixelCount(mipLevel);
-
-                AZ_Assert(pixelCount == alphaPixelCount, "Pixel count for image and alpha image at mip level %d is not equal!", mipLevel);
-
-                uint8* imageBuf;
-                uint32 pitch;
-                previewImage->GetImagePointer(mipLevel, imageBuf, pitch);
-
-                uint8* alphaBuf;
-                uint32 alphaPitch;
-                previewImageAlpha->GetImagePointer(mipLevel, alphaBuf, alphaPitch);
-
-                float rAlpha, gAlpha, bAlpha, aAlpha, rImage, gImage, bImage, aImage;
-
-                for (uint32 i = 0; i < pixelCount; ++i, imageBuf += imagePixelBytes, alphaBuf += alphaPixelBytes)
-                {
-                    alphaOp->GetRGBA(alphaBuf, rAlpha, gAlpha, bAlpha, aAlpha);
-                    imageOp->GetRGBA(imageBuf, rImage, gImage, bImage, aImage);
-                    imageOp->SetRGBA(imageBuf, rImage, gImage, bImage, aAlpha);
-                }
-            }
-        }
-
-        return previewImage;
-    }
-
     IImageObjectPtr ConvertImageForPreview(IImageObjectPtr image)
     {
         if (!image)
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
index fe57b1a89f..ba3d21191f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
@@ -51,9 +51,6 @@ namespace ImageProcessingAtom
     //Converts the image to a RGBA8 format that can be displayed in a preview UI.
     IImageObjectPtr ConvertImageForPreview(IImageObjectPtr image);
 
-    //Combine image with alpha image if any and output as RGBA8
-    IImageObjectPtr MergeOutputImageForPreview(IImageObjectPtr image, IImageObjectPtr alphaImage);
-
     //get output image size and mip count based on the texture setting and preset setting
 
     //other helper functions
@@ -160,7 +157,7 @@ namespace ImageProcessingAtom
         bool FillCubemapMipmaps();
 
         //IBL cubemap generation, this creates a separate ImageConvertProcess
-        void CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage);
+        bool CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage);
 
         //convert color space to linear with pixel format rgba32f
         bool ConvertToLinear();
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
index 0e4521ab24..d81685f0c6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
@@ -16,28 +16,14 @@
 
 namespace ImageProcessingAtom
 {
-    IImageObjectPtr ImageConvertOutput::GetOutputImage(OutputImageType type) const
+    IImageObjectPtr ImageConvertOutput::GetOutputImage() const
     {
-        if (type < OutputImageType::Count)
-        {
-            return m_outputImage[static_cast<int>(type)];
-        }
-        else
-        {
-            return IImageObjectPtr();
-        }
+        return m_outputImage;
     }
 
-    void ImageConvertOutput::SetOutputImage(IImageObjectPtr image, OutputImageType type)
+    void ImageConvertOutput::SetOutputImage(IImageObjectPtr image)
     {
-        if (type < OutputImageType::Count)
-        {
-            m_outputImage[static_cast<int>(type)] = image;
-        }
-        else
-        {
-            AZ_Error("ImageProcess", false, "Cannot set output image to %d", type);
-        }
+        m_outputImage = image;
     }
 
     void ImageConvertOutput::SetReady(bool ready)
@@ -62,10 +48,7 @@ namespace ImageProcessingAtom
 
     void ImageConvertOutput::Reset()
     {
-        for (int i = 0; i < static_cast<int>(OutputImageType::Count); i++)
-        {
-            m_outputImage[i] = nullptr;
-        }
+        m_outputImage = nullptr;
         m_outputReady = false;
         m_progress = 0.0f;
     }
@@ -109,13 +92,12 @@ namespace ImageProcessingAtom
 
         IImageObjectPtr outputImage = m_process->GetOutputImage();
 
-        m_output->SetOutputImage(outputImage, ImageConvertOutput::Base);
-
         if (!IsJobCancelled())
         {
-            // For preview, combine image output with alpha if any
+            // convert the output image to RGBA format for preview
             m_output->SetProgress(1.0f / static_cast<float>(m_previewProcessStep));
-            m_output->SetOutputImage(outputImage, ImageConvertOutput::Preview);
+            IImageObjectPtr uncompressedImage = ConvertImageForPreview(outputImage);
+            m_output->SetOutputImage(uncompressedImage);
         }
 
         m_output->SetReady(true);
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
index 9baa5dd1b4..ac15d47806 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
@@ -21,16 +21,8 @@ namespace ImageProcessingAtom
     class ImageConvertOutput
     {
     public:
-        enum OutputImageType
-        {
-            Base = 0,   // Might contains alpha or not
-            Alpha,      // Separate alpha image
-            Preview,    // Combine base image with alpha if any, format RGBA8
-            Count
-        };
-
-        IImageObjectPtr GetOutputImage(OutputImageType type) const;
-        void SetOutputImage(IImageObjectPtr image, OutputImageType type);
+        IImageObjectPtr GetOutputImage() const;
+        void SetOutputImage(IImageObjectPtr image);
         void SetReady(bool ready);
         bool IsReady() const;
         float GetProgress() const;
@@ -38,7 +30,7 @@ namespace ImageProcessingAtom
         void Reset();
 
     private:
-        IImageObjectPtr m_outputImage[OutputImageType::Count];
+        IImageObjectPtr m_outputImage;
         bool m_outputReady = false;
         float m_progress = 0.0f;
     };
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
index 465d992ef6..758df462ec 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
@@ -183,10 +183,9 @@ namespace ImageProcessingAtom
             return EAlphaContent::eAlphaContent_Absent;
         }
 
-        //if it's compressed format, return indeterminate. if user really want to know the content, they may convert the format to ARGB8 first
         if (!CPixelFormats::GetInstance().IsPixelFormatUncompressed(m_pixelFormat))
         {
-            AZ_Assert(false, "the function only works right with uncompressed formats. convert to uncompressed format if you get accurate result");
+            AZ_TracePrintf("Image processing", "GetAlphaContent() was called for compressed format\n");
             return EAlphaContent::eAlphaContent_Indeterminate;
         }
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
index f51741eba9..ff7fa911d7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
@@ -86,7 +86,7 @@ namespace ImageProcessingAtom
 
     IImageObjectPtr ImagePreview::GetOutputImage()
     {
-        return m_output.GetOutputImage(ImageConvertOutput::Preview);
+        return m_output.GetOutputImage();
     }
 
     ImagePreview::~ImagePreview()
@@ -101,6 +101,8 @@ namespace ImageProcessingAtom
     void ImagePreview::InitializeJobSettings()
     {
         AZ::JobManagerDesc desc;
+        desc.m_jobManagerName = "ImagePreview";
+
         AZ::JobManagerThreadDesc threadDesc;
         desc.m_workerThreads.push_back(threadDesc);
         // Check to ensure these have not already been initialized.
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
index 29ba8c3351..20e1b18e77 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
@@ -385,6 +385,13 @@ namespace ImageProcessingAtom
             }
             return true;
         }
+
+        bool NeedAlphaChannel(EAlphaContent alphaContent)
+        {
+             return (alphaContent == EAlphaContent::eAlphaContent_OnlyBlack
+                        || alphaContent == EAlphaContent::eAlphaContent_OnlyBlackAndWhite
+                        || alphaContent == EAlphaContent::eAlphaContent_Greyscale);
+        }
     }
 
 } // namespace ImageProcessingAtom
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h
index d5905eddbc..59503a2366 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h
@@ -26,5 +26,7 @@ namespace ImageProcessingAtom
         IImageObjectPtr LoadImageFromImageAsset(const AZ::Data::Asset<AZ::RPI::StreamingImageAsset>& asset);
 
         bool SaveImageToDdsFile(IImageObjectPtr image, AZStd::string_view filePath);
+
+        bool NeedAlphaChannel(EAlphaContent alphaContent);
     }
 }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
index d5b795a1fa..91b0952a06 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
@@ -111,7 +111,6 @@ namespace UnitTest
         AZ::SerializeContext* GetSerializeContext() override { return m_context.get(); }
         AZ::BehaviorContext*  GetBehaviorContext() override { return nullptr; }
         AZ::JsonRegistrationContext* GetJsonRegistrationContext() override { return m_jsonRegistrationContext.get(); }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const AZ::ComponentApplicationRequests::EntityCallback& /*callback*/) override {}
@@ -204,7 +203,7 @@ namespace UnitTest
             m_gemFolder = AZ::Test::GetEngineRootPath() + "/Gems/Atom/Asset/ImageProcessingAtom/";
             m_outputFolder = m_gemFolder + AZStd::string("Code/Tests/TestAssets/temp/");
 
-            m_defaultSettingFolder = m_gemFolder + AZStd::string("Config/");
+            m_defaultSettingFolder = m_gemFolder + AZStd::string("Assets/Config/");
             m_testFileFolder = m_gemFolder + AZStd::string("Code/Tests/TestAssets/");
 
             InitialImageFilenames();
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings b/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
deleted file mode 100644
index 466ac4b71d..0000000000
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "BuilderSettingManager",
-    "ClassData": {
-        "AnalysisFingerprint": "2",
-        "BuildSettings": {
-            "android": {
-                "GlossScale": 16.0,
-                "GlossBias": 0.0,
-                "Streaming": false,
-                "Enable": true
-            },
-            "ios": {
-                "GlossScale": 16.0,
-                "GlossBias": 0.0,
-                "Streaming": false,
-                "Enable": true
-            },
-            "mac": {
-                "GlossScale": 16.0,
-                "GlossBias": 0.0,
-                "Streaming": false,
-                "Enable": true
-            },
-            "pc": {
-                "GlossScale": 16.0,
-                "GlossBias": 0.0,
-                "Streaming": false,
-                "Enable": true
-            },
-            "linux": {
-                "GlossScale": 16.0,
-                "GlossBias": 0.0,
-                "Streaming": false,
-                "Enable": true
-            },
-            "provo": {
-                "GlossScale": 16.0,
-                "GlossBias": 0.0,
-                "Streaming": false,
-                "Enable": false
-            }
-        },
-        "DefaultPresetsByFileMask": {
-            "_basecolor": "Albedo",
-            "_diff": "Albedo",
-            "_diffuse": "Albedo",
-            "_ddn": "Normals",
-            "_normal": "Normals",
-            "_ddna": "NormalsWithSmoothness",
-            "_glossness": "Reflectance",
-            "_spec": "Reflectance",
-            "_specular": "Reflectance",
-            "_metallic": "Reflectance",
-            "_refl": "Reflectance",
-            "_roughness": "Reflectance",
-            "_ibldiffusecm": "IBLDiffuse",
-            "_iblskyboxcm": "IBLSkybox",
-            "_iblspecularcm": "IBLSpecular",
-            "_skyboxcm": "Skybox"
-        },
-        "DefaultPreset": "Albedo",
-        "DefaultPresetAlpha": "AlbedoWithGenericAlpha",
-        "DefaultPresetNonePOT": "ReferenceImage"
-    }
-}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
deleted file mode 100644
index 2ac88dca85..0000000000
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "Type": "JsonSerialization",
-    "Version": 1,
-    "ClassName": "MultiplatformPresetSettings",
-    "ClassData": {
-        "DefaultPreset": {
-            "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-            "Name": "Reflectance",
-            "SourceColor": "Linear",
-            "DestColor": "Linear",
-            "FileMasks": [
-                "_spec",
-                "_refl",
-                "_ref",
-                "_rf",
-                "_gloss",
-                "_g",
-                "_f0",
-                "_specf0",
-                "_specular",
-                "_metal",
-                "_mtl",
-                "_m",
-                "_mt",
-                "_metalness",
-                "_metallic",
-                "_roughness",
-                "_rough"
-            ],
-            "PixelFormat": "BC1",
-            "IsPowerOf2": true,
-            "MipMapSetting": {
-                "MipGenType": "Box"
-            }
-        },
-        "PlatformsPresets": {
-            "android": {
-                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-                "Name": "Reflectance",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl",
-                    "_ref",
-                    "_rf",
-                    "_gloss",
-                    "_g",
-                    "_f0",
-                    "_specf0",
-                    "_metal",
-                    "_mtl",
-                    "_m",
-                    "_mt",
-                    "_metalness",
-                    "_metallic",
-                    "_roughness",
-                    "_rough"
-                ],
-                "PixelFormat": "ASTC_6x6",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "ios": {
-                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-                "Name": "Reflectance",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl",
-                    "_ref",
-                    "_rf",
-                    "_gloss",
-                    "_g",
-                    "_f0",
-                    "_specf0",
-                    "_metal",
-                    "_mtl",
-                    "_m",
-                    "_mt",
-                    "_metalness",
-                    "_metallic",
-                    "_roughness",
-                    "_rough"
-                ],
-                "PixelFormat": "ASTC_6x6",
-                "MaxTextureSize": 2048,
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "mac": {
-                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-                "Name": "Reflectance",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl",
-                    "_ref",
-                    "_rf",
-                    "_gloss",
-                    "_g",
-                    "_f0",
-                    "_specf0",
-                    "_metal",
-                    "_mtl",
-                    "_m",
-                    "_mt",
-                    "_metalness",
-                    "_metallic",
-                    "_roughness",
-                    "_rough"
-                ],
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            },
-            "provo": {
-                "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
-                "Name": "Reflectance",
-                "SourceColor": "Linear",
-                "DestColor": "Linear",
-                "FileMasks": [
-                    "_spec",
-                    "_refl",
-                    "_ref",
-                    "_rf",
-                    "_gloss",
-                    "_g",
-                    "_f0",
-                    "_specf0",
-                    "_metal",
-                    "_mtl",
-                    "_m",
-                    "_mt",
-                    "_metalness",
-                    "_metallic",
-                    "_roughness",
-                    "_rough"
-                ],
-                "PixelFormat": "BC1",
-                "IsPowerOf2": true,
-                "MipMapSetting": {
-                    "MipGenType": "Box"
-                }
-            }
-        }
-    }
-}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
index dc8af67877..6ba119943e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
@@ -1438,15 +1438,12 @@ namespace ImageProcessingAtom
         int32 a_Channel2Src, int32 a_Channel3Src )
     {
         int32 iFace, iMipLevel, u, v, k;
-        int32 size;
         CP_ITYPE texelData[4];
         int32 channelSrcArray[4];
 
         //since output is being modified, terminate any active filtering threads
         TerminateActiveThreads();
 
-        size = m_OutputSize;
-    
         channelSrcArray[0] = a_Channel0Src;
         channelSrcArray[1] = a_Channel1Src;
         channelSrcArray[2] = a_Channel2Src;
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
index e41c04a0be..99b7c814d1 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
@@ -82,7 +82,7 @@ namespace AZ
             // Register Shader Asset Builder
             AssetBuilderSDK::AssetBuilderDesc shaderAssetBuilderDescriptor;
             shaderAssetBuilderDescriptor.m_name = "Shader Asset Builder";
-            shaderAssetBuilderDescriptor.m_version = 107; // Required .azsl extension in .shader file references
+            shaderAssetBuilderDescriptor.m_version = 108; // The Build Time Stamp of ShaderAsset And ShaderVariantAsset Should Be Based On GetTimeUTCMilliSecond()
             // .shader file changes trigger rebuilds
             shaderAssetBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern( AZStd::string::format("*.%s", RPI::ShaderSourceData::Extension), AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
             shaderAssetBuilderDescriptor.m_busId = azrtti_typeid<ShaderAssetBuilder>();
@@ -108,7 +108,7 @@ namespace AZ
                 shaderVariantAssetBuilderDescriptor.m_name = "Shader Variant Asset Builder";
                 // Both "Shader Variant Asset Builder" and "Shader Asset Builder" produce ShaderVariantAsset products. If you update
                 // ShaderVariantAsset you will need to update BOTH version numbers, not just "Shader Variant Asset Builder".
-                shaderVariantAssetBuilderDescriptor.m_version = 26; // [AZSL] Changing inlineConstant to rootConstant keyword work.
+                shaderVariantAssetBuilderDescriptor.m_version = 27; // The Build Time Stamp of ShaderAsset And ShaderVariantAsset Should Be Based On GetTimeUTCMilliSecond().
                 shaderVariantAssetBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern(AZStd::string::format("*.%s", RPI::ShaderVariantListSourceData::Extension), AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
                 shaderVariantAssetBuilderDescriptor.m_busId = azrtti_typeid<ShaderVariantAssetBuilder>();
                 shaderVariantAssetBuilderDescriptor.m_createJobFunction = AZStd::bind(&ShaderVariantAssetBuilder::CreateJobs, &m_shaderVariantAssetBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
index 89e202a4bc..e431b74282 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
@@ -162,7 +162,7 @@ namespace AZ
             // has the same value, because later the ShaderVariantTreeAsset job will fetch this value from the local ShaderAsset
             // which could cross platforms (i.e. building an android ShaderVariantTreeAsset on PC would fetch the tiemstamp from
             // the PC's ShaderAsset).
-            AZStd::sys_time_t shaderAssetBuildTimestamp = AZStd::GetTimeNowMicroSecond();
+            AZ::u64 shaderAssetBuildTimestamp = AZStd::GetTimeUTCMilliSecond();
 
             // Need to get the name of the azsl file from the .shader source asset, to be able to declare a dependency to SRG Layout Job.
             // and the macro options to preprocess.
@@ -229,8 +229,8 @@ namespace AZ
             }  // for all request.m_enabledPlatforms
 
             AZ_TracePrintf(
-                ShaderAssetBuilderName, "CreateJobs for %s took %llu microseconds", shaderAssetSourceFileFullPath.c_str(),
-                AZStd::GetTimeNowMicroSecond() - shaderAssetBuildTimestamp);
+                ShaderAssetBuilderName, "CreateJobs for %s took %llu milliseconds", shaderAssetSourceFileFullPath.c_str(),
+                AZStd::GetTimeUTCMilliSecond() - shaderAssetBuildTimestamp);
 
             response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
         }
@@ -355,8 +355,8 @@ namespace AZ
                 return;
             }
 
-            // Get the time stamp string as sys_time_t, and also convert back to string to make sure it was converted correctly.
-            AZStd::sys_time_t shaderAssetBuildTimestamp = 0;
+            // Get the time stamp string as u64, and also convert back to string to make sure it was converted correctly.
+            AZ::u64 shaderAssetBuildTimestamp = 0;
             auto shaderAssetBuildTimestampIterator = request.m_jobDescription.m_jobParameters.find(ShaderAssetBuildTimestampParam);
             if (shaderAssetBuildTimestampIterator != request.m_jobDescription.m_jobParameters.end())
             {
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
index bb40baca7d..5eaa0d9ddb 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp
@@ -765,7 +765,7 @@ namespace AZ
                 return;
             }
             
-            const AZStd::sys_time_t shaderVariantAssetBuildTimestamp = AZStd::GetTimeNowMicroSecond();
+            const AZ::u64 shaderVariantAssetBuildTimestamp = AZStd::GetTimeUTCMilliSecond();
 
             auto supervariantList = ShaderBuilderUtility::GetSupervariantListFromShaderSourceData(shaderSourceDescriptor);
 
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h
index 2eaf1d9d8b..b0457656af 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.h
@@ -38,7 +38,7 @@ namespace AZ
             const AZStd::string& m_tempDirPath;
             //! Used to synchronize versions of the ShaderAsset and ShaderVariantAsset,
             //! especially during hot-reload. A (ShaderVariantAsset.timestamp) >= (ShaderAsset.timestamp).
-            const AZStd::sys_time_t m_assetBuildTimestamp; 
+            const AZ::u64 m_assetBuildTimestamp;
             const RPI::ShaderSourceData& m_shaderSourceDataDescriptor;
             const RPI::ShaderOptionGroupLayout& m_shaderOptionGroupLayout;
             const MapOfStringToStageType& m_shaderEntryPoints;
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant.material
index d49ca5dfe8..070c275b51 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "metallic": {
             "useTexture": false
@@ -18,4 +18,4 @@
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant_tex.material
index 49014ae2b1..22b9c9f4f6 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant_tex.material
@@ -1,11 +1,11 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
-            "textureMap": "Materials/Presets/MacBeth/00_illuminant_sRGB.tif"
+            "textureMap": "00_illuminant_sRGB.tif"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin.material
index 0fcedddf9d..534d4f0e85 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
-                0.17143511772155763,
+                0.17143511772155762,
                 0.08227664977312088,
-                0.056122682988643649,
+                0.056122682988643646,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/01_dark_skin_sRGB.tif",
+            "textureMap": "01_dark_skin_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin_tex.material
index 7b10a3b5f5..172f6ea142 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\01_dark_skin.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "01_dark_skin.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin.material
index 2ca339cadc..13831b6c55 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.21953155100345612,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/02_light_skin_sRGB.tif",
+            "textureMap": "02_light_skin_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin_tex.material
index b2f9c271b9..bd886e2dfe 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\02_light_skin.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "02_light_skin.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky.material
index 6432314ff2..47afe4d792 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.10946822166442871,
-                0.19806210696697236,
-                0.33716335892677309,
+                0.19806210696697235,
+                0.33716335892677307,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/03_blue_sky_sRGB.tif",
+            "textureMap": "03_blue_sky_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky_tex.material
index 606d958818..0760647c9d 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\03_blue_sky.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "03_blue_sky.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage.material
index 6b43cabedb..2f833f57ee 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage.material
@@ -1,16 +1,16 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.10223544389009476,
-                0.14996567368507386,
-                0.052857253700494769,
+                0.14996567368507385,
+                0.052857253700494766,
                 1.0
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage_tex.material
index 5ea1a31afc..bb83083003 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\04_foliage.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "04_foliage.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,7 +11,7 @@
                 1.0,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/04_foliage_sRGB.tif"
+            "textureMap": "04_foliage_sRGB.tif"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower.material
index fa8302b859..bf6ee703da 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower.material
@@ -1,16 +1,16 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.2232242375612259,
                 0.21953155100345612,
-                0.43414968252182009,
+                0.43414968252182007,
                 1.0
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower_tex.material
index 2d3ecdea6f..5f83eecd82 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\05_blue_flower.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "05_blue_flower.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,7 +11,7 @@
                 1.0,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/05_blue_flower_sRGB.tif"
+            "textureMap": "05_blue_flower_sRGB.tif"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green.material
index 86e4fcb19d..fd20326fe2 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.12477302551269531,
                 0.5209887623786926,
-                0.40723279118537905,
+                0.40723279118537903,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/06_bluish_green_sRGB.tif",
+            "textureMap": "06_bluish_green_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green_tex.material
index 13b3cf293d..a5d7541fe2 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\06_bluish_green.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "06_bluish_green.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange.material
index f60f82f16c..c1c76e8eaf 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange.material
@@ -1,16 +1,16 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.7156938910484314,
-                0.19806210696697236,
-                0.026245517656207086,
+                0.19806210696697235,
+                0.026245517656207085,
                 1.0
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange_tex.material
index 8db258d41f..7ebc7ab081 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\07_orange.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "07_orange.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,7 +11,7 @@
                 1.0,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/07_orange_sRGB.tif"
+            "textureMap": "07_orange_sRGB.tif"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue.material
index 5e978ea495..4884aef6ab 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.06480506807565689,
                 0.10702677816152573,
-                0.39157700538635256,
+                0.39157700538635254,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/08_purplish_blue_sRGB.tif",
+            "textureMap": "08_purplish_blue_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue_tex.material
index 0ae7ea5e92..6722af151c 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\08_purplish_blue.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "08_purplish_blue.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red.material
index 86d9714b41..1a49b6339b 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.12213321030139923,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/09_moderate_red_sRGB.tif",
+            "textureMap": "09_moderate_red_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red_tex.material
index a738a10dfd..cddceff49a 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\09_moderate_red.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "09_moderate_red.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple.material
index cf9d9c2f03..792881c65c 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.10461585223674774,
-                0.043732356280088428,
+                0.043732356280088425,
                 0.1412680298089981,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/10_purple_sRGB.tif",
+            "textureMap": "10_purple_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple_tex.material
index f0deb97c0c..09e57d0cae 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\10_purple.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "10_purple.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green.material
index 11b67ee518..ec49ed13d2 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.0481727309525013,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/11_yellow_green_sRGB.tif",
+            "textureMap": "11_yellow_green_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green_tex.material
index e7c081c496..35e77c9ced 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\11_yellow_green.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "11_yellow_green.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow.material
index eb194f7990..6c7fcd08cd 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.7835355401039124,
-                0.35640496015548708,
+                0.35640496015548706,
                 0.02217135950922966,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/12_orange_yellow_sRGB.tif",
+            "textureMap": "12_orange_yellow_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow_tex.material
index 392c99b0ba..9a198e2d84 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\12_orange_yellow.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "12_orange_yellow.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue.material
index 0403aff6fe..91d337919f 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
-                0.024155031889677049,
+                0.024155031889677048,
                 0.0481727309525013,
-                0.29176774621009829,
+                0.29176774621009827,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/13_blue_sRGB.tif",
+            "textureMap": "13_blue_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue_tex.material
index fe9929f7d4..b294d8d2d4 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\13_blue.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "13_blue.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green.material
index f199575b58..29bb867531 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.06480506807565689,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/14_green_sRGB.tif",
+            "textureMap": "14_green_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green_tex.material
index 15adcf4788..8e2df1342f 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\14_green.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "14_green.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red.material
index 6489638ba6..553d1584a5 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
-                0.43414968252182009,
-                0.029556725174188615,
+                0.43414968252182007,
+                0.029556725174188614,
                 0.03955138474702835,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/15_red_sRGB.tif",
+            "textureMap": "15_red_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_tex.material
index 79ce245674..a3b472c083 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\15_red.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "15_red.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow.material
index f5d302126f..a28aa13685 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.00802624598145485,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/16_yellow_sRGB.tif",
+            "textureMap": "16_yellow_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow_tex.material
index 6daa82a310..c7fa73d87b 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\16_yellow.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "16_yellow.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta.material
index 7d3019913d..d30ef62a63 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.30498206615448,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/17_magenta_sRGB.tif",
+            "textureMap": "17_magenta_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta_tex.material
index c346a3e29d..e4c3b35e2e 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\17_magenta.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "17_magenta.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan.material
index 6b2ab75dbd..efd9aa4005 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.0,
-                0.24620431661605836,
+                0.24620431661605835,
                 0.3813229501247406,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/18_cyan_sRGB.tif",
+            "textureMap": "18_cyan_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan_tex.material
index d0d5234498..2975d48196 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\18_cyan.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "18_cyan.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D.material
index de5c5f6281..462e969d65 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.8713664412498474,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/19_white_9-5_0-05D_sRGB.tif",
+            "textureMap": "19_white_9-5_0-05D_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D_tex.material
index 9fd79a1633..452a891639 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\19_white_9-5_0-05D.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "19_white_9-5_0-05D.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D.material
index 748471138d..cc8a1b1b14 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.5840848684310913,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/20_neutral_8-0_0-23D_sRGB.tif",
+            "textureMap": "20_neutral_8-0_0-23D_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D_tex.material
index 3a23f07bfa..d46a64105e 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\20_neutral_8-0_0-23D.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "20_neutral_8-0_0-23D.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D.material
index edfae0689f..462259b193 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
                 0.3515373468399048,
-                0.35640496015548708,
-                0.35640496015548708,
+                0.35640496015548706,
+                0.35640496015548706,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/21_neutral_6-5_0-44D_sRGB.tif",
+            "textureMap": "21_neutral_6-5_0-44D_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D_tex.material
index bf4fe1218a..4072adf8cf 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\21_neutral_6-5_0-44D.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "21_neutral_6-5_0-44D.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D.material
index a758b474f7..a5b5cf4127 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D.material
@@ -1,18 +1,18 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
-                0.18782329559326173,
+                0.18782329559326172,
                 0.191195547580719,
                 0.191195547580719,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/22_neutral_5-0_0-70D_sRGB.tif",
+            "textureMap": "22_neutral_5-0_0-70D_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D_tex.material
index 69b18cb115..7dc6016eed 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\22_neutral_5-0_0-70D.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "22_neutral_5-0_0-70D.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D.material
index 7ce60b545b..e69f1a7827 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.09083695709705353,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/23_neutral_3-5_1-05D_sRGB.tif",
+            "textureMap": "23_neutral_3-5_1-05D_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D_tex.material
index 1b77a786c9..2611311790 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\23_neutral_3-5_1-05D.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "23_neutral_3-5_1-05D.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D.material
index f448eea265..1222c09018 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,8 +11,8 @@
                 0.0318913571536541,
                 1.0
             ],
-            "textureMap": "Materials/Presets/MacBeth/24_black_2-0_1-50D_sRGB.tif",
+            "textureMap": "24_black_2-0_1-50D_sRGB.tif",
             "useTexture": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D_tex.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D_tex.material
index 8530dc7ffc..c60f696b58 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D_tex.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D_tex.material
@@ -1,8 +1,8 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\24_black_2-0_1-50D.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "24_black_2-0_1-50D.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,4 +14,4 @@
             "useTexture": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/macbeth_lab_16bit_2014_sRGB.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/macbeth_lab_16bit_2014_sRGB.material
index a67b484c31..f70b3538aa 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/macbeth_lab_16bit_2014_sRGB.material
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/macbeth_lab_16bit_2014_sRGB.material
@@ -1,11 +1,11 @@
 {
     "description": "",
-    "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
-    "propertyLayoutVersion": 3,
+    "parentMaterial": "00_illuminant.material",
+    "materialType": "../../Types/StandardPBR.materialtype",
+    "materialTypeVersion": 4,
     "properties": {
         "baseColor": {
-            "textureMap": "Materials/Presets/MacBeth/ColorChecker_sRGB_from_Lab_16bit_AfterNov2014.tif"
+            "textureMap": "ColorChecker_sRGB_from_Lab_16bit_AfterNov2014.tif"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/NewDepthOfFieldComposite.pass b/Gems/Atom/Feature/Common/Assets/Passes/NewDepthOfFieldComposite.pass
index 522ae78fa5..c96039f159 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/NewDepthOfFieldComposite.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/NewDepthOfFieldComposite.pass
@@ -11,6 +11,11 @@
                     "Name": "Depth",
                     "SlotType": "Input",
                     "ScopeAttachmentUsage": "Shader",
+                    "ImageViewDesc": {
+                        "AspectFlags": [
+                            "Depth"
+                        ]
+                    },
                     "ShaderImageDimensionsConstant": "m_fullResDimensions"
                 },
                 {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass
index 4972f0f494..d1825be820 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass
@@ -34,10 +34,6 @@
                 }
             ],
             "PassRequests": [
-                {
-                    "Name": "ReflectionScreenSpaceBlurPass",
-                    "TemplateName": "ReflectionScreenSpaceBlurPassTemplate"
-                },
                 {
                     "Name": "ReflectionScreenSpaceTracePass",
                     "TemplateName": "ReflectionScreenSpaceTracePassTemplate",
@@ -56,42 +52,65 @@
                                 "Attachment": "NormalInput"
                             }
                         },
-                        {
-                            "LocalSlot": "DepthStencilInput",
-                            "AttachmentRef": {
-                                "Pass": "Parent",
-                                "Attachment": "DepthStencilInput"
-
-                            }
-                        },
                         {
                             "LocalSlot": "SpecularF0Input",
                             "AttachmentRef": {
                                 "Pass": "Parent",
                                 "Attachment": "SpecularF0Input"
                             }
+                        },
+                        {
+                            "LocalSlot": "ReflectionInputOutput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "ReflectionInputOutput"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "Name": "ReflectionScreenSpaceBlurPass",
+                    "TemplateName": "ReflectionScreenSpaceBlurPassTemplate",
+                    "Connections": [
+                        {
+                            "LocalSlot": "DepthInput",
+                            "AttachmentRef": {
+                                "Pass": "Parent",
+                                "Attachment": "DepthStencilInput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "ScreenSpaceReflectionInputOutput",
+                            "AttachmentRef": {
+                                "Pass": "ReflectionScreenSpaceTracePass",
+                                "Attachment": "ScreenSpaceReflectionOutput"
+                            }
+                        },
+                        {
+                            "LocalSlot": "DownsampledDepthInputOutput",
+                            "AttachmentRef": {
+                                "Pass": "ReflectionScreenSpaceTracePass",
+                                "Attachment": "DownsampledDepthOutput"
+                            }
                         }
                     ]
                 },
                 {
                     "Name": "ReflectionScreenSpaceCompositePass",
                     "TemplateName": "ReflectionScreenSpaceCompositePassTemplate",
-                    "ExecuteAfter": [
-                        "ReflectionScreenSpaceBlurPass"
-                    ],
                     "Connections": [
                         {
-                            "LocalSlot": "TraceInput",
+                            "LocalSlot": "ReflectionInput",
                             "AttachmentRef": {
-                                "Pass": "ReflectionScreenSpaceTracePass",
-                                "Attachment": "Output"
+                                "Pass": "ReflectionScreenSpaceBlurPass",
+                                "Attachment": "ScreenSpaceReflectionInputOutput"
                             }
                         },
                         {
-                            "LocalSlot": "PreviousFrameBufferInput",
+                            "LocalSlot": "DownsampledDepthInput",
                             "AttachmentRef": {
                                 "Pass": "ReflectionScreenSpaceBlurPass",
-                                "Attachment": "PreviousFrameInputOutput"
+                                "Attachment": "DownsampledDepthInputOutput"
                             }
                         },
                         {
@@ -115,6 +134,13 @@
                                 "Attachment": "DepthStencilInput"
                             }
                         },
+                        {
+                            "LocalSlot": "PreviousFrameInputOutput",
+                            "AttachmentRef": {
+                                "Pass": "ReflectionScreenSpaceTracePass",
+                                "Attachment": "PreviousFrameInputOutput"
+                            }
+                        },
                         {
                             "LocalSlot": "DepthStencilInput",
                             "AttachmentRef": {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass
index e2fde2d4ef..a5fd2fdfb1 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass
@@ -8,34 +8,19 @@
             "PassClass": "ReflectionScreenSpaceBlurPass",
             "Slots": [
                 {
-                    "Name": "PreviousFrameInputOutput",
+                    "Name": "DepthInput",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "Shader"
+                },
+                {
+                    "Name": "ScreenSpaceReflectionInputOutput",
                     "SlotType": "InputOutput",
                     "ScopeAttachmentUsage": "Shader"
-                }
-            ],
-            "ImageAttachments": [
+                },
                 {
-                    "Name": "PreviousFrameImage",
-                    "SizeSource": {
-                        "Source": {
-                            "Pass": "Parent",
-                            "Attachment": "SpecularInput"
-                        }
-                    },
-                    "ImageDescriptor": {
-                        "Format": "R16G16B16A16_FLOAT",
-                        "SharedQueueMask": "Graphics"
-                    },
-                    "GenerateFullMipChain": true
-                }
-            ],
-            "Connections": [
-                {
-                    "LocalSlot": "PreviousFrameInputOutput",
-                    "AttachmentRef": {
-                        "Pass": "This",
-                        "Attachment": "PreviousFrameImage"
-                    }
+                    "Name": "DownsampledDepthInputOutput",
+                    "SlotType": "InputOutput",
+                    "ScopeAttachmentUsage": "DepthStencil"
                 }
             ]
         }
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass
index a616ed4c8e..af3878cf6b 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass
@@ -7,6 +7,11 @@
             "Name": "ReflectionScreenSpaceBlurVerticalPassTemplate",
             "PassClass": "ReflectionScreenSpaceBlurChildPass",
             "Slots": [
+                {
+                    "Name": "DepthInput",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "Shader"
+                },
                 {
                     "Name": "Input",
                     "SlotType": "InputOutput",
@@ -16,6 +21,20 @@
                     "Name": "Output",
                     "SlotType": "InputOutput",
                     "ScopeAttachmentUsage": "RenderTarget"
+                },
+                {
+                    "Name": "DownsampledDepthOutput",
+                    "SlotType": "InputOutput",
+                    "ScopeAttachmentUsage": "DepthStencil"
+                }
+            ],
+            "Connections": [
+                {
+                    "LocalSlot": "DepthInput",
+                    "AttachmentRef": {
+                        "Pass": "Parent",
+                        "Attachment": "DepthInput"
+                    }
                 }
             ],
             "PassData": {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass
index 5443c32406..17b58dbc9e 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass
@@ -8,12 +8,12 @@
             "PassClass": "ReflectionScreenSpaceCompositePass",
             "Slots": [
                 {
-                    "Name": "TraceInput",
+                    "Name": "ReflectionInput",
                     "SlotType": "Input",
                     "ScopeAttachmentUsage": "Shader"
                 },
                 {
-                    "Name": "PreviousFrameBufferInput",
+                    "Name": "DownsampledDepthInput",
                     "SlotType": "Input",
                     "ScopeAttachmentUsage": "Shader"
                 },
@@ -37,6 +37,11 @@
                         ]
                     }
                 },
+                {
+                    "Name": "PreviousFrameInputOutput",
+                    "SlotType": "InputOutput",
+                    "ScopeAttachmentUsage": "Shader"
+                },
                 {
                     "Name": "DepthStencilInput",
                     "SlotType": "Input",
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass
index 370db1f45a..824d23a046 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass
@@ -5,7 +5,7 @@
     "ClassData": {
         "PassTemplate": {
             "Name": "ReflectionScreenSpaceTracePassTemplate",
-            "PassClass": "FullScreenTriangle",
+            "PassClass": "ReflectionScreenSpaceTracePass",
             "Slots": [
                 {
                     "Name": "DepthStencilTextureInput",
@@ -28,24 +28,52 @@
                     "ScopeAttachmentUsage": "Shader"
                 },
                 {
-                    "Name": "DepthStencilInput",
+                    "Name": "ReflectionInputOutput",
                     "SlotType": "Input",
-                    "ScopeAttachmentUsage": "DepthStencil",
-                    "ImageViewDesc": {
-                        "AspectFlags": [
-                            "Stencil"
-                        ]
+                    "ScopeAttachmentUsage": "Shader"
+                },
+                {
+                    "Name": "PreviousFrameInputOutput",
+                    "SlotType": "Input",
+                    "ScopeAttachmentUsage": "Shader"
+                },
+                {
+                    "Name": "ScreenSpaceReflectionOutput",
+                    "SlotType": "Output",
+                    "ScopeAttachmentUsage": "RenderTarget",
+                    "LoadStoreAction": {
+                        "ClearValue": {
+                            "Value": [
+                                0.0,
+                                0.0,
+                                0.0,
+                                0.0
+                            ]
+                        },
+                        "LoadAction": "Clear"
                     }
                 },
                 {
-                    "Name": "Output",
+                    "Name": "DownsampledDepthOutput",
                     "SlotType": "Output",
-                    "ScopeAttachmentUsage": "RenderTarget"
+                    "ScopeAttachmentUsage": "DepthStencil",
+                    "LoadStoreAction": {
+                        "ClearValue": {
+                            "Type": "DepthStencil",
+                            "Value": [
+                                1.0,
+                                {},
+                                {},
+                                {}
+                            ]
+                        },
+                        "LoadAction": "Clear"
+                    }
                 }
             ],
             "ImageAttachments": [
                 {
-                    "Name": "TraceImage",
+                    "Name": "ScreenSpaceReflectionImage",
                     "SizeSource": {
                         "Source": {
                             "Pass": "This",
@@ -56,9 +84,40 @@
                             "HeightMultiplier": 0.5
                         }
                     },
-                    "MultisampleSource": {
-                        "Pass": "This",
-                        "Attachment": "SpecularF0Input"
+                    "ImageDescriptor": {
+                        "Format": "R16G16B16A16_FLOAT",
+                        "MipLevels": "5",
+                        "SharedQueueMask": "Graphics"
+                    }
+                },
+                {
+                    "Name": "DownsampledDepthImage",
+                    "SizeSource": {
+                        "Source": {
+                            "Pass": "Parent",
+                            "Attachment": "DepthStencilInput"
+                        },
+                        "Multipliers": {
+                            "WidthMultiplier": 0.5,
+                            "HeightMultiplier": 0.5
+                        }
+                    },
+                    "FormatSource": {
+                        "Pass": "Parent",
+                        "Attachment": "DepthStencilInput"
+                    },
+                    "ImageDescriptor": {
+                        "MipLevels": "5",
+                        "SharedQueueMask": "Graphics"
+                    }
+                },
+                {
+                    "Name": "PreviousFrameImage",
+                    "SizeSource": {
+                        "Source": {
+                            "Pass": "Parent",
+                            "Attachment": "SpecularInput"
+                        }
                     },
                     "ImageDescriptor": {
                         "Format": "R16G16B16A16_FLOAT",
@@ -68,15 +127,28 @@
             ],
             "Connections": [
                 {
-                    "LocalSlot": "Output",
+                    "LocalSlot": "ScreenSpaceReflectionOutput",
                     "AttachmentRef": {
                         "Pass": "This",
-                        "Attachment": "TraceImage"
+                        "Attachment": "ScreenSpaceReflectionImage"
+                    }
+                },
+                {
+                    "LocalSlot": "DownsampledDepthOutput",
+                    "AttachmentRef": {
+                        "Pass": "This",
+                        "Attachment": "DownsampledDepthImage"
+                    }
+                },
+                {
+                    "LocalSlot": "PreviousFrameInputOutput",
+                    "AttachmentRef": {
+                        "Pass": "This",
+                        "Attachment": "PreviousFrameImage"
                     }
                 }
             ],
-            "PassData":
-            {
+            "PassData": {
                 "$type": "FullscreenTrianglePassData",
                 "ShaderAsset": {
                     "FilePath": "Shaders/Reflections/ReflectionScreenSpaceTrace.shader"
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass b/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass
index ab03ea01ef..674acdd3a0 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass
@@ -15,7 +15,12 @@
                 {
                     "Name": "InputDepth",
                     "SlotType": "Input",
-                    "ScopeAttachmentUsage": "Shader"
+                    "ScopeAttachmentUsage": "Shader",
+                    "ImageViewDesc": {
+                        "AspectFlags": [
+                            "Depth"
+                        ]
+                    }
                 },
                 {
                     "Name": "OutputEdgeDetectionResult",
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/Filter.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/Filter.azsli
index 8271aa46fb..11dac7b81c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/Filter.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Math/Filter.azsli
@@ -41,97 +41,3 @@ bool IsInsideOfImageSize(
     return IsInsideOfImageSize(coord, inputImageSize) &&
         IsInsideOfImageSize(coord, outputImageSize);
 }
-
-//! This returns filtered value of "source" with weights in "filterTable" in 1 direction.
-//! @param coord the center coordinate (in Texture2DArray) of the filtered area.
-//!              the xy coordinate is in pixel, and z is array slice index.
-//! @param source image resource which is used as the source of the filtering.
-//!               Note that it contains entire of the shadowmap atlas, not a single shadowmap.
-//! @param direction either (1,0) or (0,1).  
-//!                   If (1,0), the filtering direction is horizontal,
-//!                   and if (0,1), it is vertical.
-//! @param sourceMin the minimum (left/top most) index of the shadowmap.
-//! @param sourceMax the maximum (right/bottom most) index of the shadowmap.
-//! @param filterTable the weight table for this table.
-//!                    Since the weight table of a Gaussian filter is left-right symmetry,
-//!                    the right half is omitted in this filterTable.
-//! @param filterOffset the offset of the filtering parameter in filterTable.
-//! @param filterCount the element count of filtering parameter in filterTable.
-//!                        For example, the weight table has size 11 in the original meaning
-//!                        of Gaussian filter, filterCount == 6 by omitting the right half.
-float FilteredFloat(
-    uint3 coord,
-    Texture2DArray<float> source,
-    int2 direction,
-    int sourceMin,
-    int sourceMax,
-    Buffer<float> filterTable,
-    uint filterOffset,
-    uint filterCount)
-{
-    if (filterCount == 0)
-    {
-        return 0.; // if no filtering info, early return.
-    }
-
-    const int centerIndex = (int)dot(coord.xy, direction);
-    float result = 0.;
-    int index = 0;
-
-    // This function summarizes the values stored in "source"
-    // from minIndex to maxIndex with weight in "filterTable".
-    // In the case that some point in [minIndex, maxIndex] go outside of
-    // the shadowmap (indicated by sourceMin and sourceMax),
-    // the edge value of the shadowmap is used.
-    
-    // 1. littler index side (left/up side)
-    const int minIndex = centerIndex - ((int)filterCount - 1);
-
-    // 1-1. outside of shadowmap (littler)
-    // Assuming outside values are equal to the edge value,
-    // it first summarize the weights for outside of shadowmap
-    // then multiply it by the edge value.
-    float weight = 0.; // summation of weights of outside of shadowmap
-    for (index = minIndex; index < sourceMin; ++index)
-    {
-        weight += filterTable[filterOffset + index - minIndex];
-    }
-    int2 edgeOffset = direction * (sourceMin - centerIndex);
-    int3 edgeCoord = coord + int3(edgeOffset, 0);
-    result += weight * source[edgeCoord];
-
-    // 1-2. inside of shadowmap (littler)
-    for (index = max(sourceMin, minIndex); index < centerIndex; ++index)
-    {
-        const int2 offset = direction * (index - centerIndex);
-        result += filterTable[filterOffset + index - minIndex] * 
-            source[coord + int3(offset, 0)];
-    }
-
-    // 2. greater index side (right/down side)
-    const int maxIndex = centerIndex + ((int)filterCount - 1);
-
-    // 2-1. outside of shadowmap (greater)
-    // This is similar to 1-1 above.
-    weight = 0.; // summation of weights of outside of shadowmap
-    for (index = maxIndex; index > sourceMax; --index)
-    {
-        weight += filterTable[filterOffset + maxIndex - index];
-    }
-    edgeOffset = direction * (sourceMax - centerIndex);
-    edgeCoord = coord + int3(edgeOffset, 0);
-    result += weight * source[edgeCoord];
-
-    // 2-2. inside of shadowmap (greater)
-    for (index = min(sourceMax, maxIndex); index > centerIndex; --index)
-    {
-        const int2 offset = direction * (index - centerIndex);
-        result += filterTable[filterOffset + maxIndex - index] *
-            source[coord + int3(offset, 0)];
-    }
-    
-    // 3. center
-    result += filterTable[filterOffset + filterCount - 1] * source[coord];
-
-    return result;
-}
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/BackLighting.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/BackLighting.azsli
index 83cf79ed61..dfd5522f5c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/BackLighting.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/BackLighting.azsli
@@ -23,6 +23,16 @@ float3 TransmissionKernel(float t, float3 s)
     return 0.25 * (1.0 / exp(exponent) + 3.0 / exp(exponent / 3.0));
 }
 
+float ThinObjectFalloff(const float3 surfaceNormal, const float3 dirToLight)
+{
+    const float ndl = saturate(dot(-surfaceNormal, dirToLight));
+    
+    // ndl works decently well but it can produce a harsh discontinuity in the area just before 
+    // the shadow starts appearing on objects like cylinder and tubes.
+    // Smoothing out ndl does a decent enough job of removing this artifact.
+    return smoothstep(0, 1, ndl * ndl);
+}
+
 float3 GetBackLighting(Surface surface, LightingData lightingData, float3 lightIntensity, float3 dirToLight, float shadowRatio)
 {
     float3 result = float3(0.0, 0.0, 0.0);
@@ -53,8 +63,10 @@ float3 GetBackLighting(Surface surface, LightingData lightingData, float3 lightI
             float litRatio = 1.0 - shadowRatio;
             if (litRatio)
             {
-                result = TransmissionKernel(surface.transmission.thickness * transmissionParams.w, rcp(transmissionParams.xyz)) * 
-                    saturate(dot(-surface.normal, dirToLight)) * lightIntensity * litRatio;
+                const float thickness = surface.transmission.thickness * transmissionParams.w;
+                const float3 invScattering = rcp(transmissionParams.xyz);
+                const float falloff = ThinObjectFalloff(surface.normal, dirToLight);
+                result = TransmissionKernel(thickness, invScattering) * falloff * lightIntensity * litRatio;
             }
 
             break;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Decals.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Decals.azsli
index f9ead72ce4..aecb89eb92 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Decals.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Decals.azsli
@@ -76,23 +76,23 @@ void ApplyDecal(uint currDecalIndex, inout Surface surface)
         {
             case 0:
                 baseMap = ViewSrg::m_decalTextureArrayDiffuse0.Sample(PassSrg::LinearSampler, decalUV);
-                normalMap = ViewSrg::m_decalTextureArrayNormalMaps0.Sample(PassSrg::LinearSampler, decalUV);
+                normalMap = ViewSrg::m_decalTextureArrayNormalMaps0.Sample(PassSrg::LinearSampler, decalUV).rg;
             break;
             case 1:
                 baseMap = ViewSrg::m_decalTextureArrayDiffuse1.Sample(PassSrg::LinearSampler, decalUV);
-                normalMap = ViewSrg::m_decalTextureArrayNormalMaps1.Sample(PassSrg::LinearSampler, decalUV);
+                normalMap = ViewSrg::m_decalTextureArrayNormalMaps1.Sample(PassSrg::LinearSampler, decalUV).rg;
             break;
             case 2:
                 baseMap = ViewSrg::m_decalTextureArrayDiffuse2.Sample(PassSrg::LinearSampler, decalUV);
-                normalMap = ViewSrg::m_decalTextureArrayNormalMaps2.Sample(PassSrg::LinearSampler, decalUV);
+                normalMap = ViewSrg::m_decalTextureArrayNormalMaps2.Sample(PassSrg::LinearSampler, decalUV).rg;
             break;
             case 3:
                 baseMap = ViewSrg::m_decalTextureArrayDiffuse3.Sample(PassSrg::LinearSampler, decalUV);
-                normalMap = ViewSrg::m_decalTextureArrayNormalMaps3.Sample(PassSrg::LinearSampler, decalUV);
+                normalMap = ViewSrg::m_decalTextureArrayNormalMaps3.Sample(PassSrg::LinearSampler, decalUV).rg;
             break;
             case 4:
                 baseMap = ViewSrg::m_decalTextureArrayDiffuse4.Sample(PassSrg::LinearSampler, decalUV);
-                normalMap = ViewSrg::m_decalTextureArrayNormalMaps4.Sample(PassSrg::LinearSampler, decalUV);
+                normalMap = ViewSrg::m_decalTextureArrayNormalMaps4.Sample(PassSrg::LinearSampler, decalUV).rg;
             break;            
         }
         
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/DefaultObjectSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/DefaultObjectSrg.azsli
index 10526597cb..9f40e7ab8f 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/DefaultObjectSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/DefaultObjectSrg.azsli
@@ -37,6 +37,7 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
         float m_padding;
         bool m_useReflectionProbe;
         bool m_useParallaxCorrection;
+        float m_exposure;
     };
 
     ReflectionProbeData m_reflectionProbeData;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/StandardLighting.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/StandardLighting.azsli
index 94d6c199a5..773c86ff0f 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/StandardLighting.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/StandardLighting.azsli
@@ -48,9 +48,9 @@ float3 GetSpecularLighting(Surface surface, LightingData lightingData, const flo
         // HdotV = HdotL due to the definition of half vector
         float3 clearCoatF = FresnelSchlick(HdotL, 0.04) * surface.clearCoat.factor;
         float clearCoatRoughness = max(surface.clearCoat.roughness * surface.clearCoat.roughness, 0.0005f);
-        float3 clearCoatSpecular = ClearCoatGGX(NdotH, HdotL, NdotL, surface.clearCoat.normal, clearCoatRoughness, clearCoatF );
+        float3 clearCoatSpecular = ClearCoatGGX(NdotH, HdotL, NdotL, surface.clearCoat.normal, clearCoatRoughness, clearCoatF);
 
-        specular = specular * (1.0 - clearCoatF) * (1.0 - clearCoatF) + clearCoatSpecular;
+        specular = specular * (1.0 - clearCoatF) + clearCoatSpecular;
     }
     
     specular *= lightIntensity;
@@ -95,7 +95,7 @@ PbrLightingOutput DebugOutput(float3 color)
 {
     PbrLightingOutput output = (PbrLightingOutput)0;
 
-    float defaultNormal = float3(0.0f, 0.0f, 1.0f);
+    float3 defaultNormal = float3(0.0f, 0.0f, 1.0f);
 
     output.m_diffuseColor = float4(color.rgb, 1.0f);
     output.m_normal.rgb = EncodeNormalSignedOctahedron(defaultNormal);
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingUtils.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingUtils.azsli
index 3248fc83eb..b26b81a7c8 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingUtils.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/LightingUtils.azsli
@@ -67,6 +67,6 @@ float3 ApplyParallaxCorrectionAABB(float3 aabbMin, float3 aabbMax, float3 aabbPo
 // compute parallax corrected reflection vector, OBB version
 float3 ApplyParallaxCorrectionOBB(float4x4 obbTransformInverse, float3 obbHalfExtents, float3 positionWS, float3 reflectDir)
 {
-    float4 p = mul(obbTransformInverse, float4(positionWS, 1.0f));
+    float3 p = mul(obbTransformInverse, float4(positionWS, 1.0f)).xyz;
     return ApplyParallaxCorrectionAABB(-obbHalfExtents, obbHalfExtents, float3(0.0f, 0.0f, 0.0f), p, reflectDir);
 }
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ibl.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ibl.azsli
index d33a307dfe..abc2d3d3bd 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ibl.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ibl.azsli
@@ -60,7 +60,7 @@ float3 GetIblSpecular(
     
         // compute blend amount based on world position in the reflection probe volume
         float blendAmount = ComputeLerpBetweenInnerOuterOBBs(
-            ObjectSrg::GetReflectionProbeWorldMatrixInverse(),
+            (float3x4)ObjectSrg::GetReflectionProbeWorldMatrixInverse(),
             ObjectSrg::m_reflectionProbeData.m_innerObbHalfLengths,
             ObjectSrg::m_reflectionProbeData.m_outerObbHalfLengths,
             position);
@@ -85,12 +85,12 @@ void ApplyIBL(Surface surface, inout LightingData lightingData)
 
     if(useIbl)
     {
-        float iblExposureFactor = pow(2.0, SceneSrg::m_iblExposure);
+        float globalIblExposure = pow(2.0, SceneSrg::m_iblExposure);
         
         if(useDiffuseIbl)
         {
             float3 iblDiffuse = GetIblDiffuse(surface.normal, surface.albedo, lightingData.diffuseResponse);
-            lightingData.diffuseLighting += (iblDiffuse * iblExposureFactor * lightingData.diffuseAmbientOcclusion);
+            lightingData.diffuseLighting += (iblDiffuse * globalIblExposure * lightingData.diffuseAmbientOcclusion);
         }
 
         if(useSpecularIbl)
@@ -116,8 +116,8 @@ void ApplyIBL(Surface surface, inout LightingData lightingData)
                 iblSpecular = iblSpecular * (1.0 - clearCoatResponse) * (1.0 - clearCoatResponse) + clearCoatIblSpecular;
             }
 
-            lightingData.specularLighting += (iblSpecular * iblExposureFactor);
+            float exposure = ObjectSrg::m_reflectionProbeData.m_useReflectionProbe ? pow(2.0, ObjectSrg::m_reflectionProbeData.m_exposure) : globalIblExposure;
+            lightingData.specularLighting += (iblSpecular * exposure);
         }
     }
 }
-
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ltc.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ltc.azsli
index 6e45cf30c8..a98221f60c 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ltc.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/Ltc.azsli
@@ -256,15 +256,16 @@ void NormalizeQuadPoints(inout float3 p[5], in int vertexCount)
 }
 
 // Transforms the 4 points of a quad into the hemisphere of the normal
-void TransformQuadToOrthonormalBasis(in float3 normal, in float3 dirToView, inout float3 p[4])
+void TransformQuadToOrthonormalBasis(in float3 normal, in float3 dirToView, in float3 p[4], out float3 tp[5])
 {
     float3x3 orthoNormalBasis = BuildViewAlignedOrthonormalBasis(normal, dirToView);
 
     // Transform points into orthonormal space
-    p[0] = mul(orthoNormalBasis, p[0]);
-    p[1] = mul(orthoNormalBasis, p[1]);
-    p[2] = mul(orthoNormalBasis, p[2]);
-    p[3] = mul(orthoNormalBasis, p[3]);
+    tp[0] = mul(orthoNormalBasis, p[0]);
+    tp[1] = mul(orthoNormalBasis, p[1]);
+    tp[2] = mul(orthoNormalBasis, p[2]);
+    tp[3] = mul(orthoNormalBasis, p[3]);
+    tp[4] = float3(0.0, 0.0, 0.0); // Extra vertex for if quad becomes a pentagon after clipping to hemisphere.
 }
 
 // Integrates the edges of a quad for lambertian diffuse contribution.
@@ -325,6 +326,47 @@ float IntegrateQuadSpecular(in float3 v[5], in float vertexCount, in bool double
     return sum;
 }
 
+// Transform points p into the normal's hemisphere, then clip them to the hemisphere. Returns total number of points after clipping.
+int LtcQuadTransformAndClip(
+    in float3 normal,
+    in float3 dirToCamera,
+    in float3 p[4],
+    inout float3 polygon[5]
+    )
+{
+    // Transform the points of the light into the space of the normal's hemisphere.
+    TransformQuadToOrthonormalBasis(normal, dirToCamera, p, polygon);
+
+    // Clip the light polygon to the normal hemisphere. This is done before the LTC matrix is applied to prevent
+    // parts of the light below the horizon from impacting the surface. The number of points remaining after
+    // the clip is returned in vertexCount. It's possible for the vertexCount of the resulting clipped quad to be
+    // 0 - all points clipped (no work to do, so return)
+    // 3 - 3 points clipped, leaving only a triangular corner of the quad
+    // 4 - 2 or 0 points clipped, leaving a quad
+    // 5 - 1 point clipped leaving a pentagon.
+    int vertexCount = 0;
+    ClipQuadToHorizon(polygon, vertexCount);
+    return vertexCount;
+}
+
+// Evaluate the LTC specular reflectance of points in polygon. Does not scale by fresnel.
+float LtcEvaluateSpecularUnscaled(
+    in float2 ltcCoords,
+    in Texture2D ltcMatrix,
+    in float3 polygon[5],
+    in int vertexCount,
+    in bool doubleSided)
+{
+    // Look up the values for the LTC matrix based on the roughness and orientation.
+    float3x3 ltcMat = LtcMatrix(ltcMatrix, ltcCoords);
+
+    // Transform the quad based on the LTC lookup matrix
+    ApplyLtcMatrixToQuad(ltcMat, polygon, vertexCount);
+
+    // IntegrateQuadSpecular uses more accurate integration than diffuse to handle smooth surfaces correctly.
+    return IntegrateQuadSpecular(polygon, vertexCount, doubleSided);
+}
+
 // Evaluate linear transform cosine lighting for a 4 point quad.
 //   normal - The surface normal
 //   dirToView - Normalized direction from the surface to the view
@@ -334,31 +376,21 @@ float IntegrateQuadSpecular(in float3 v[5], in float vertexCount, in bool double
 //   diffuse - The output diffuse response for the quad light
 //   specular - The output specular response for the quad light
 void LtcQuadEvaluate(
-    in float3 normal,
-    in float3 dirToView,
-    in float3x3 ltcMat,
+    in Surface surface,
+    in LightingData lightingData,
+    in Texture2D ltcMatrix,
+    in Texture2D<float2> ltcAmpMatrix,
     in float3 p[4],
     in bool doubleSided,
-    out float diffuse,
-    out float specular)
+    out float diffuseOut,
+    out float3 specularOut)
 {
-    // Transform the points of the light into the space of the normal's hemisphere.
-    TransformQuadToOrthonormalBasis(normal, dirToView, p);
-
+    
     // Initialize quad with dummy point at end in case one corner is clipped (resulting in 5 sided polygon)
-    float3 v[5] = {p[0], p[1], p[2], p[3], float3(0.0, 0.0, 0.0)};
-
-    // Clip the light polygon to the normal hemisphere. This is done before the LTC matrix is applied to prevent
-    // parts of the light below the horizon from impacting the surface. The number of points remaining after
-    // the clip is returned in vertexCount. It's possible for the vertexCount of the resulting clipped quad to be
-    // 0 - all points clipped (no work to do, so return)
-    // 3 - 3 points clipped, leaving only a triangular corner of the quad
-    // 4 - 2 or 0 points clipped, leaving a quad
-    // 5 - 1 point clipped leaving a pentagon.
-
-    int vertexCount = 0;
-    ClipQuadToHorizon(v, vertexCount);
+    float3 polygon[5];
 
+    // Transform the points of the light into the space of the normal's hemisphere and clip to the hemisphere
+    int vertexCount = LtcQuadTransformAndClip(surface.normal, lightingData.dirToCamera, p, polygon);
     if (vertexCount == 0)
     {
         // Entire light is below the horizon.
@@ -366,12 +398,37 @@ void LtcQuadEvaluate(
     }
 
     // IntegrateQuadDiffuse is a cheap approximation compared to specular.
-    diffuse = IntegrateQuadDiffuse(v, vertexCount, doubleSided);
+    float diffuse = IntegrateQuadDiffuse(polygon, vertexCount, doubleSided);
 
-    ApplyLtcMatrixToQuad(ltcMat, v, vertexCount);
+    float2 ltcCoords = LtcCoords(dot(surface.normal, lightingData.dirToCamera), surface.roughnessLinear);
+    float specular = LtcEvaluateSpecularUnscaled(ltcCoords, ltcMatrix, polygon, vertexCount, doubleSided);
 
-    // IntegrateQuadSpecular uses more accurate integration to handle smooth surfaces correctly.
-    specular = IntegrateQuadSpecular(v, vertexCount, doubleSided);
+    // Apply BRDF scale terms (BRDF magnitude and Schlick Fresnel)
+    float2 schlick = ltcAmpMatrix.Sample(PassSrg::LinearSampler, ltcCoords).xy;
+    float3 specularRgb = specular * (schlick.x * surface.specularF0 + (1.0 - surface.specularF0) * schlick.y);
+    
+    if(o_clearCoat_feature_enabled)
+    {
+        int vertexCountCc = LtcQuadTransformAndClip(surface.clearCoat.normal, lightingData.dirToCamera, p, polygon);
+        if (vertexCountCc > 0)
+        {
+            float2 ltcCoordsCc = LtcCoords(dot(surface.clearCoat.normal, lightingData.dirToCamera), surface.clearCoat.roughness);
+            float clearCoatSpecular = LtcEvaluateSpecularUnscaled(ltcCoordsCc, ltcMatrix, polygon, vertexCountCc, doubleSided);
+
+            // Apply BRDF scale terms (BRDF magnitude and Schlick Fresnel)
+            const float clearCoatSpecularF0 = 0.04;
+            float2 schlickCc = ltcAmpMatrix.Sample(PassSrg::LinearSampler, ltcCoordsCc).xy;
+            float F = schlickCc.x * clearCoatSpecularF0 + (1.0 - clearCoatSpecularF0) * schlickCc.y;
+            F *= surface.clearCoat.factor;
+
+            // Attenuate diffuse and specular based on how much light the clearcoat layer reflects
+            diffuse = diffuse * (1.0 - F);
+            specularRgb = (specularRgb * (1.0 - F)) + (clearCoatSpecular * F);
+        }
+    }
+
+    diffuseOut = diffuse;
+    specularOut = specularRgb;
 }
 
 // Checks an edge against the horizon and integrates it.
@@ -397,7 +454,7 @@ void LtcQuadEvaluate(
 // 4. Both points are below the horizon
 //    - Do nothing.
 
-void EvaluatePolyEdge(in float3 p0, in float3 p1, inout float3 prevClipPoint, in float3x3 ltcMat, inout float diffuse, inout float specular)
+void EvaluatePolyEdge(in float3 p0, in float3 p1, in float3x3 ltcMat, inout float3 prevClipPoint, inout float diffuse, inout float specular)
 {
     if (p0.z > 0.0)
     {
@@ -428,6 +485,74 @@ void EvaluatePolyEdge(in float3 p0, in float3 p1, inout float3 prevClipPoint, in
     }
 }
 
+// Same as above but only evaluates specular (used for clear coat)
+void EvaluatePolyEdgeSpecularOnly(in float3 p0, in float3 p1, in float3x3 ltcMat, inout float3 prevClipPoint, inout float specular)
+{
+    if (p0.z > 0.0)
+    {
+        if (p1.z > 0.0)
+        {
+            // Both above horizon
+            specular += IntegrateEdge(normalize(mul(ltcMat, p0)), normalize(mul(ltcMat, p1)));
+        }
+        else
+        {
+            // Going from above to below horizon
+            prevClipPoint = ClipEdge(p0, p1);
+            specular += IntegrateEdge(normalize(mul(ltcMat, p0)), normalize(mul(ltcMat, prevClipPoint)));
+        }
+    }
+    else if (p1.z > 0.0)
+    {
+        // Going from below to above horizon
+        float3 clipPoint = mul(ltcMat, ClipEdge(p1, p0));
+        specular += IntegrateEdge(normalize(mul(ltcMat, prevClipPoint)), normalize(clipPoint));
+        specular += IntegrateEdge(normalize(clipPoint), normalize(mul(ltcMat, p1)));
+    }
+}
+
+// Evaluates the intial points to start looping through a polygon light. The first point in polygon may be below the surface
+// so care must be taking to figure out which point to start with and what point to use to close the polygon.
+void LtcPolygonEvaluateInitialPoints(
+    in float3 surfacePosition,
+    in float3x3 orthonormalMat,
+    in StructuredBuffer<float4> positions,
+    in uint startIdx,
+    inout float3 prevClipPoint,
+    inout float3 closePoint,
+    inout uint endIdx,
+    inout float3 p0)
+{
+    // Prepare initial values
+    p0 = mul(orthonormalMat, positions[startIdx].xyz - surfacePosition); // First point in polygon
+    
+    prevClipPoint = float3(0.0, 0.0, 0.0); // Used to hold previous clip point when polygon dips below horizon.
+    closePoint = p0;
+    
+    // Handle if the first point is below the horizon.
+    if (p0.z < 0.0)
+    {
+        float3 firstPoint = p0; // save the first point so it can be restored later.
+
+        // Find the previous clip point so it can be used when the polygon goes above the horizon by
+        // searching backwards, updating the endIdx along the way to avoid reprocessing those points later
+        for ( ; endIdx > startIdx + 1; --endIdx)
+        {
+            float3 prevPoint = mul(orthonormalMat, positions[endIdx - 1].xyz - surfacePosition);
+            if (prevPoint.z > 0.0)
+            {
+                prevClipPoint = ClipEdge(prevPoint, p0);
+                closePoint = prevClipPoint;
+                break;
+            }
+            p0 = prevPoint;
+        }
+
+        p0 = firstPoint; // Restore the original p0
+    }
+    
+}
+
 // Evaluates the LTC result of an arbitrary polygon lighting a surface position.
 //   pos - The surface position
 //   normal - The surface normal
@@ -445,72 +570,102 @@ void EvaluatePolyEdge(in float3 p0, in float3 p1, inout float3 prevClipPoint, in
 // EvaluatePolyEdge() later. During this search it also adjusts the end point index as necessary to avoid processing
 // those points that are below the horizon.
 void LtcPolygonEvaluate(
-    in float3 pos, 
-    in float3 normal, 
-    in float3 dirToView,
-    in float3x3 ltcMat,
+    in Surface surface,
+    in LightingData lightingData,
+    in Texture2D ltcMatrix,
+    in Texture2D<float2> ltcAmpMatrix,
     in StructuredBuffer<float4> positions,
     in uint startIdx,
     in uint endIdx,
-    out float diffuse,
-    out float specular
+    out float diffuseOut,
+    out float3 specularRgbOut
 )
 {
     if (endIdx - startIdx < 3)
     {
         return; // Must have at least 3 points to form a polygon.
     }
+    uint originalEndIdx = endIdx; // Original endIdx may be needed for clearcoat
 
     // Rotate ltc matrix
-    float3x3 orthonormalMat = BuildViewAlignedOrthonormalBasis(normal, dirToView);
+    float3x3 orthonormalMat = BuildViewAlignedOrthonormalBasis(surface.normal, lightingData.dirToCamera);
 
-    // Prepare initial values
-    float3 p0 = mul(orthonormalMat, positions[startIdx].xyz - pos); // First point in polygon
-    diffuse = 0.0;
-    specular = 0.0;
-    
-    float3 prevClipPoint = float3(0.0, 0.0, 0.0); // Used to hold previous clip point when polygon dips below horizon.
-    float3 closePoint = p0;
-    
-    // Handle if the first point is below the horizon.
-    if (p0.z < 0.0)
+    // Evaluate the starting point (p0), previous point, and point used to close the polygon
+    float3 p0, prevClipPoint, closePoint;
+    LtcPolygonEvaluateInitialPoints(surface.position, orthonormalMat, positions, startIdx, prevClipPoint, closePoint, endIdx, p0);
+
+    // Check if all points below horizon
+    if (endIdx == startIdx + 1)
     {
-        float3 firstPoint = p0; // save the first point so it can be restored later.
-
-        // Find the previous clip point so it can be used when the polygon goes above the horizon by
-        // searching backwards, updating the endIdx along the way to avoid reprocessing those points later
-        for ( ; endIdx > startIdx + 1; --endIdx)
-        {
-            float3 prevPoint = mul(orthonormalMat, positions[endIdx - 1].xyz - pos);
-            if (prevPoint.z > 0.0)
-            {
-                prevClipPoint = ClipEdge(prevPoint, p0);
-                closePoint = prevClipPoint;
-                break;
-            }
-            p0 = prevPoint;
-        }
-        
-        // Check if all points below horizon
-        if (endIdx == startIdx + 1)
-        {
-            return; 
-        }
-
-        p0 = firstPoint; // Restore the original p0
+        return; 
     }
     
+    float diffuse = 0.0;
+    float specular = 0.0;
+
+    float2 ltcCoords = LtcCoords(dot(surface.normal, lightingData.dirToCamera), surface.roughnessLinear);
+    float3x3 ltcMat = LtcMatrix(ltcMatrix, ltcCoords);
+    
     // Evaluate all the points
     for (uint curIdx = startIdx + 1; curIdx < endIdx; ++curIdx)
     {
-        float3 p1 = mul(orthonormalMat, positions[curIdx].xyz - pos); // Current point in polygon
-        EvaluatePolyEdge(p0, p1, prevClipPoint, ltcMat, diffuse, specular);
+        float3 p1 = mul(orthonormalMat, positions[curIdx].xyz - surface.position); // Current point in polygon
+        EvaluatePolyEdge(p0, p1, ltcMat, prevClipPoint, diffuse, specular);
         p0 = p1;
     }
     
-    EvaluatePolyEdge(p0, closePoint, prevClipPoint, ltcMat, diffuse, specular);
+    EvaluatePolyEdge(p0, closePoint, ltcMat, prevClipPoint, diffuse, specular);
 
     // Note: negated due to winding order
     diffuse = -diffuse;
     specular = -specular;
+
+    // Apply BRDF scale terms (BRDF magnitude and Schlick Fresnel)
+    float2 schlick = ltcAmpMatrix.Sample(PassSrg::LinearSampler, ltcCoords).xy;
+    float3 specularRgb = specular * ((schlick.x * surface.specularF0) + (1.0 - surface.specularF0) * schlick.y);
+
+    if(o_clearCoat_feature_enabled)
+    {
+        // Rotate ltc matrix
+        float3x3 orthonormalMatCc = BuildViewAlignedOrthonormalBasis(surface.clearCoat.normal, lightingData.dirToCamera);
+
+        // restore original endIdx and re-evaluate initial points with matrix based on the clearcoat normal.
+        endIdx = originalEndIdx;
+        LtcPolygonEvaluateInitialPoints(surface.position, orthonormalMatCc, positions, startIdx, prevClipPoint, closePoint, endIdx, p0);
+
+        // Check if all points below horizon
+        if (endIdx != startIdx + 1)
+        {
+            float specularCc = 0.0;
+
+            float2 ltcCoordsCc = LtcCoords(dot(surface.clearCoat.normal, lightingData.dirToCamera), surface.clearCoat.roughness);
+            float3x3 ltcMatCc = LtcMatrix(ltcMatrix, ltcCoordsCc);
+            
+            // Evaluate all the points
+            for (uint curIdx = startIdx + 1; curIdx < endIdx; ++curIdx)
+            {
+                float3 p1 = mul(orthonormalMatCc, positions[curIdx].xyz - surface.position); // Current point in polygon
+                EvaluatePolyEdgeSpecularOnly(p0, p1, ltcMatCc, prevClipPoint, specularCc);
+                p0 = p1;
+            }
+            
+            EvaluatePolyEdgeSpecularOnly(p0, closePoint, ltcMatCc, prevClipPoint, specularCc);
+
+            // Note: negated due to winding order
+            specularCc = -specularCc;
+
+            // Apply BRDF scale terms (BRDF magnitude and Schlick Fresnel)
+            const float clearCoatSpecularF0 = 0.04;
+            float2 schlickCc = ltcAmpMatrix.Sample(PassSrg::LinearSampler, ltcCoordsCc).xy;
+            float F = clearCoatSpecularF0 * schlickCc.x + (1.0 - clearCoatSpecularF0) * schlickCc.y;
+            F *= surface.clearCoat.factor;
+
+            diffuse = diffuse * (1.0 - F);
+            specularRgb = (specularRgb * (1.0 - F)) + (specularCc * F);
+        }
+    }
+
+    diffuseOut = diffuse;
+    specularRgbOut = specularRgb;
+
 }
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli
index e6eea9728f..92f4065931 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli
@@ -50,6 +50,20 @@ int UnpackPointLightShadowIndex(const ViewSrg::PointLight light, const int face)
     return (light.m_shadowIndices[index] >> shiftAmount) & 0xFFFF;
 } 
 
+uint ComputeShadowIndex(const ViewSrg::PointLight light, const Surface surface)
+{
+    // shadow map size and bias are the same across all shadowmaps used by a specific point light, so just grab the first one
+    const uint lightIndex0 = UnpackPointLightShadowIndex(light, 0);
+    const float shadowmapSize = ViewSrg::m_projectedFilterParams[lightIndex0].m_shadowmapSize;
+    
+    // Note that the normal bias offset could potentially move the shadowed position from one map to another map inside the same point light shadow.
+    const float normalBias = ViewSrg::m_projectedShadows[lightIndex0].m_normalShadowBias;
+    const float3 biasedPosition = surface.position + ComputeNormalShadowOffset(normalBias, surface.vertexNormal, shadowmapSize);
+    
+    const int shadowCubemapFace = GetPointLightShadowCubemapFace(biasedPosition, light.m_position);
+    return UnpackPointLightShadowIndex(light, shadowCubemapFace);
+}
+
 void ApplyPointLight(ViewSrg::PointLight light, Surface surface, inout LightingData lightingData)
 {
     float3 posToLight = light.m_position - surface.position;
@@ -74,10 +88,8 @@ void ApplyPointLight(ViewSrg::PointLight light, Surface surface, inout LightingD
         float backShadowRatio = 0.0;
         if (o_enableShadows)
         {
-            const int shadowCubemapFace = GetPointLightShadowCubemapFace(surface.position, light.m_position);
-            const int shadowIndex = UnpackPointLightShadowIndex(light, shadowCubemapFace);
             const float3 lightDir = normalize(light.m_position - surface.position);
-             
+            const uint shadowIndex = ComputeShadowIndex(light, surface);
             litRatio *= ProjectedShadow::GetVisibility(
                     shadowIndex,
                     light.m_position,
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PolygonLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PolygonLight.azsli
index 66f21ec5d8..07fe6d4f00 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PolygonLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PolygonLight.azsli
@@ -51,25 +51,19 @@ void ApplyPoylgonLight(ViewSrg::PolygonLight light, Surface surface, inout Light
     float radiusAttenuation = 1.0 - (falloff * falloff);
     radiusAttenuation = radiusAttenuation * radiusAttenuation;
 
-    float2 ltcCoords = LtcCoords(dot(surface.normal, lightingData.dirToCamera), surface.roughnessLinear);
-    float3x3 ltcMat = LtcMatrix(SceneSrg::m_ltcMatrix, ltcCoords);
-
     float diffuse = 0.0;
-    float specular = 0.0;
+    float3 specularRgb = 0.0;
+
+    LtcPolygonEvaluate(surface, lightingData, SceneSrg::m_ltcMatrix, SceneSrg::m_ltcAmplification, ViewSrg::m_polygonLightPoints, startIndex, endIndex, diffuse, specularRgb);
 
-    LtcPolygonEvaluate(surface.position, surface.normal, lightingData.dirToCamera, ltcMat, ViewSrg::m_polygonLightPoints, startIndex, endIndex, diffuse, specular);
     diffuse = doubleSided ? abs(diffuse) : max(0.0, diffuse);
-    specular = doubleSided ? abs(specular) : max(0.0, specular);
-
-    // Apply BRDF scale terms (BRDF magnitude and Schlick Fresnel)
-    float2 schlick = SceneSrg::m_ltcAmplification.Sample(PassSrg::LinearSampler, ltcCoords).xy;
-    float3 specularRGB = specular * (schlick.x + (1.0 - surface.specularF0) * schlick.y);
+    specularRgb = doubleSided ? abs(specularRgb) : max(0.0, specularRgb);
 
     // Scale by inverse surface area of hemisphere (1/2pi), attenuation, and light intensity
     float3 intensity = 0.5 * INV_PI * radiusAttenuation * abs(light.m_rgbIntensityNits);
 
     lightingData.diffuseLighting += surface.albedo * diffuse * intensity;
-    lightingData.specularLighting += surface.specularF0 * specularRGB * intensity;
+    lightingData.specularLighting += specularRgb * intensity;
 }
 
 void ApplyPolygonLights(Surface surface, inout LightingData lightingData)
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/QuadLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/QuadLight.azsli
index 43f5095f84..63515339d8 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/QuadLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/QuadLight.azsli
@@ -112,22 +112,15 @@ void ApplyQuadLight(ViewSrg::QuadLight light, Surface surface, inout LightingDat
         {
             float3 p[4] = {p0, p1, p2, p3};
             
-            float2 ltcCoords = LtcCoords(dot(surface.normal, lightingData.dirToCamera), surface.roughnessLinear);
-            float3x3 ltcMat = LtcMatrix(SceneSrg::m_ltcMatrix, ltcCoords);
-            
             float diffuse = 0.0;
-            float specular = 0.0;
-            LtcQuadEvaluate(surface.normal, lightingData.dirToCamera, ltcMat, p, doubleSided, diffuse, specular);
-
-            // Apply BRDF scale terms (BRDF magnitude and Schlick Fresnel)
-            float2 schlick = SceneSrg::m_ltcAmplification.Sample(PassSrg::LinearSampler, ltcCoords).xy;
-            float3 specularRGB = specular * (schlick.x + (1.0 - surface.specularF0) * schlick.y);
+            float3 specular = float3(0.0, 0.0, 0.0); // specularF0 used in LtcQuadEvaluate which is a float3
+            LtcQuadEvaluate(surface, lightingData, SceneSrg::m_ltcMatrix, SceneSrg::m_ltcAmplification, p, doubleSided, diffuse, specular);
 
             // Scale by inverse surface area of hemisphere (1/2pi), attenuation, and light intensity
             float3 intensity = 0.5 * INV_PI * radiusAttenuation * light.m_rgbIntensityNits;
 
             lightingData.diffuseLighting += surface.albedo * diffuse * intensity;
-            lightingData.specularLighting += surface.specularF0 * specularRGB * intensity;
+            lightingData.specularLighting += specular * intensity;
         }
         else
         {
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Brdf.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Brdf.azsli
index 0f3e3c913d..e7904fefdf 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Brdf.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Brdf.azsli
@@ -22,7 +22,7 @@
 // ------- Diffuse Lighting -------
 
 //! Simple Lambertian BRDF. 
-float3 DiffuseLambertian(float3 albedo, float3 normal, float3 dirToLight, float diffuseResponse)
+float3 DiffuseLambertian(float3 albedo, float3 normal, float3 dirToLight, float3 diffuseResponse)
 {
     float NdotL = saturate(dot(normal, dirToLight));
     return albedo * NdotL * INV_PI * diffuseResponse;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/DirectionalLightShadow.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/DirectionalLightShadow.azsli
index a7122aaf3a..59817af701 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/DirectionalLightShadow.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/DirectionalLightShadow.azsli
@@ -166,7 +166,7 @@ float DirectionalLightShadow::GetThickness(uint lightIndex, float3 shadowCoords[
 bool2 DirectionalLightShadow::IsShadowed(float3 shadowCoord, uint indexOfCascade)
 {
     static const float PixelMargin = 1.5; // avoiding artifact between cascade levels.
-    static const float DepthMargin = 0.01; // avoiding artifact when near depth bounds.
+    static const float DepthMargin = 1e-8; // avoiding artifact when near depth bounds.
 
     // size is the shadowap's width and height.
     const uint size = ViewSrg::m_directionalLightShadows[m_lightIndex].m_shadowmapSize;
@@ -210,8 +210,8 @@ float DirectionalLightShadow::GetVisibilityFromLightNoFilter()
 
 float DirectionalLightShadow::GetVisibilityFromLightPcf()
 {   
-    static const float DepthMargin = 0.01; // avoiding artifact when near depth bounds.
     static const float PixelMargin = 1.5; // avoiding artifact between cascade levels.
+    static const float DepthMargin = 1e-8; // avoiding artifact when near depth bounds.
 
     const uint size = ViewSrg::m_directionalLightShadows[m_lightIndex].m_shadowmapSize;
     const uint cascadeCount = ViewSrg::m_directionalLightShadows[m_lightIndex].m_cascadeCount;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ESM.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ESM.azsli
new file mode 100644
index 0000000000..3a258c2f47
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ESM.azsli
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+ 
+#pragma once
+ 
+
+float SampleESM(const Texture2DArray<float> shadowMap, const SamplerState samp, const float3 uv, const float zReceiver, const float esmExponent)
+{
+	const float mipmaplevel = 0;
+	const float occluder = shadowMap.SampleLevel(samp,uv, mipmaplevel).r;
+	const float lit = exp((occluder - zReceiver) * esmExponent);
+	return lit;
+}
+
+float PCFFallbackForESM(const Texture2DArray<float> shadowMap, const float3 uv, const float zReceiver, const float esmExponent)
+{
+    const float result = SampleESM(shadowMap, PassSrg::LinearSampler, uv, zReceiver, esmExponent);
+    return saturate(result);
+}
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli
index daed3a2921..98ec9ea8bc 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli
@@ -14,6 +14,8 @@
 #include <Atom/RPI/Math.azsli>
 #include "BicubicPcfFilters.azsli"
 #include "Shadow.azsli"
+#include "NormalOffsetShadows.azsli"
+#include "ESM.azsli"
 
 // ProjectedShadow calculates shadowed area projected from a light.
 class ProjectedShadow
@@ -123,6 +125,7 @@ float ProjectedShadow::GetThickness(uint shadowIndex, float3 worldPosition)
 
     ProjectedShadow shadow;
     shadow.m_worldPosition = worldPosition;
+    shadow.m_normalVector = 0; // The normal vector is used to reduce acne, this is not an issue when using the shadowmap to determine thickness. 
     shadow.m_shadowIndex = shadowIndex;
     shadow.SetShadowPosition();
     return shadow.GetThickness();
@@ -188,13 +191,11 @@ float ProjectedShadow::GetVisibilityEsm()
         const float depth = PerspectiveDepthToLinear(
             m_shadowPosition.z - m_bias, 
             coefficients);
-        const float occluder = shadowmap.SampleLevel(
-            PassSrg::LinearSampler, 
-            float3(atlasPosition.xy * invAtlasSize, atlasPosition.z),
-            /*LOD=*/0).r;
+            
+        const float3 uv = float3(atlasPosition.xy * invAtlasSize, atlasPosition.z);
+        const float esmExponent = ViewSrg::m_projectedShadows[m_shadowIndex].m_esmExponent;
+        const float ratio = SampleESM(shadowmap, PassSrg::LinearSampler, uv, depth, esmExponent);
 
-        const float exponent = -ViewSrg::m_projectedShadows[m_shadowIndex].m_esmExponent * (depth - occluder);
-        const float ratio = exp(exponent);
         // pow() mitigates light bleeding to shadows from near shadow casters.
         return saturate( pow(ratio, 8) );
     }
@@ -227,21 +228,18 @@ float ProjectedShadow::GetVisibilityEsmPcf()
             return 1.;
         }
         const float3 atlasPosition = GetAtlasPosition(m_shadowPosition.xy);
+        const float3 uv = float3(atlasPosition.xy * invAtlasSize, atlasPosition.z);
         const float depth = PerspectiveDepthToLinear(
             m_shadowPosition.z - m_bias,
             coefficients);
-        const float occluder = shadowmap.SampleLevel(
-            PassSrg::LinearSampler,
-            float3(atlasPosition.xy * invAtlasSize, atlasPosition.z),
-            /*LOD=*/0).r;
-
-        const float exponent = -ViewSrg::m_projectedShadows[m_shadowIndex].m_esmExponent * (depth - occluder);
-        float ratio = exp(exponent);
+        
+        const float esmExponent = ViewSrg::m_projectedShadows[m_shadowIndex].m_esmExponent;
+        float ratio = SampleESM(shadowmap, PassSrg::LinearSampler, uv, depth, esmExponent);
 
         static const float pcfFallbackThreshold = 1.04;
         if (ratio > pcfFallbackThreshold)
         {
-            ratio = GetVisibilityPcf();
+            ratio = PCFFallbackForESM(shadowmap, uv, depth, esmExponent);
         }
         else
         {
@@ -317,8 +315,13 @@ bool ProjectedShadow::IsShadowed(float3 shadowPosition)
 
 void ProjectedShadow::SetShadowPosition()
 {
+    const float normalBias = ViewSrg::m_projectedShadows[m_shadowIndex].m_normalShadowBias;
+    const float shadowmapSize = ViewSrg::m_projectedFilterParams[m_shadowIndex].m_shadowmapSize;
+    const float3 shadowOffset = ComputeNormalShadowOffset(normalBias, m_normalVector, shadowmapSize);
     const float4x4 depthBiasMatrix = ViewSrg::m_projectedShadows[m_shadowIndex].m_depthBiasMatrix;
-    float4 shadowPositionHomogeneous = mul(depthBiasMatrix, float4(m_worldPosition, 1));
+    
+    float4 shadowPositionHomogeneous = mul(depthBiasMatrix, float4(m_worldPosition + shadowOffset, 1));
+         
     m_shadowPosition = shadowPositionHomogeneous.xyz / shadowPositionHomogeneous.w;
     
     m_bias = ViewSrg::m_projectedShadows[m_shadowIndex].m_bias / shadowPositionHomogeneous.w;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Skin/SkinObjectSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Skin/SkinObjectSrg.azsli
index d0766c295d..99a32629ef 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Skin/SkinObjectSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Skin/SkinObjectSrg.azsli
@@ -46,6 +46,7 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
         float m_padding;
         bool m_useReflectionProbe;
         bool m_useParallaxCorrection;
+        float m_exposure;
     };
 
     ReflectionProbeData m_reflectionProbeData;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli
index 10906ac09b..3eff3615f0 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli
@@ -26,8 +26,10 @@ partial ShaderResourceGroup ViewSrg
 
         // circle of confusion to screen ratio;
         float m_cocToScreenRatio;
-    };
 
+        [[pad_to(16)]]
+    };
+     
     DepthOfFieldData m_dof;
     
     struct ExposureControlParameters
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli
index 3e90e1a441..9253885cfc 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrgAll.azsli
@@ -12,4 +12,5 @@
 
 #ifdef AZ_COLLECTING_PARTIAL_SRGS
 #include <Atom/Feature/Common/Assets/ShaderResourceGroups/ViewSrg.azsli>
+#include <Terrain/Assets/Shaders/Terrain/ViewSrg.azsli> // Temporary until gem partial view srgs can be included automatically.
 #endif
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance.azshader
index 31fae5d98b..a9b5567f6b 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_dx12_0.azshadervariant
index 19e9fdfc8d..6d4b6d0fca 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_null_0.azshadervariant
index 43c4a615cf..5d8800a6fe 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_vulkan_0.azshadervariant
index 75f070a03e..930f7898c4 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance.azshader
index 0025388bc1..268020b431 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_dx12_0.azshadervariant
index 34a9b3659f..d95ec6c1b9 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_null_0.azshadervariant
index 4a2b0e9944..3253ddba37 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_vulkan_0.azshadervariant
index c053a7db19..c38b94c4f1 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn.azshader
index c507b12563..5c46d368ce 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_dx12_0.azshadervariant
index f60c713597..eb6938f8c9 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_null_0.azshadervariant
index 3e810bcfb5..8c83c1e3ff 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_vulkan_0.azshadervariant
index 5918f277b5..2fbb9ffffe 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow.azshader
index 120eb70e54..96053f4091 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_dx12_0.azshadervariant
index d38d779696..4bdbdddf33 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_null_0.azshadervariant
index 6d7a604701..77668a2450 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_vulkan_0.azshadervariant
index dee941cfae..fb3dd771ca 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification.azshader
index e2e0fa90f5..eda8d53376 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_dx12_0.azshadervariant
index 7a92fc2de5..2df610df77 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_null_0.azshadervariant
index 43408b26f3..f2458e692b 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_vulkan_0.azshadervariant
index 877085446d..0e08e84f74 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing.azshader
index 2c403c77f8..1cea4860a1 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_dx12_0.azshadervariant
index 4bcc47ee43..5605a47e9c 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_null_0.azshadervariant
index f173416210..15f3477cb5 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_vulkan_0.azshadervariant
index 0eb04a25b8..c2bcd4ab07 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit.azshader
index 2847d0035a..9958708a64 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant
index 93cfb47819..fbd1d90251 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant
index 4a16e24211..483be0eceb 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant
index df52c9c8d2..530eef2f10 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader
index d95fd5b3b2..eddac4e2bd 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_dx12_0.azshadervariant
index c853de4d14..ad06bbd104 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_null_0.azshadervariant
index 40e18c215c..527b42569a 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_vulkan_0.azshadervariant
index 34761ccf98..426d955938 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader
index c19020dc84..08ed61ab03 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant
index a7d44b5541..d1012a896f 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant
index 82e0065216..cb730be1df 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant
index 20b81aee6c..b58af4c473 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader
index aec2786540..e7f4577c9a 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant
index de851f187e..2565261d62 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant
index 5d8207dfdb..a1db8345e4 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant
index c819e57c4c..2d4897e451 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl
index 6d55648f22..db91c369ef 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl
@@ -48,6 +48,9 @@ void MainCS(uint3 group_thread_id : SV_GroupThreadID, uint3 group_id : SV_GroupI
         LDS_MAX_COC[group_thread_id.x] = 0;
     }
 
+    // Sync LDS
+    GroupMemoryBarrierWithGroupSync();
+    
     // We use gather to get 2x2 values at once, so thread samples are spaced 2 pixels apart (+1 so the sample position is in between the four pixels)
     float2 samplePos = float2(dispatch_id.xy) * 2 + float2(1, 1);
     float2 sampleUV = samplePos * PassSrg::m_inputDimensions.zw;
@@ -74,6 +77,9 @@ void MainCS(uint3 group_thread_id : SV_GroupThreadID, uint3 group_id : SV_GroupI
     InterlockedMin( LDS_MIN_COC[0], LDS_MIN_COC[group_thread_id.x] );
     InterlockedMax( LDS_MAX_COC[0], LDS_MAX_COC[group_thread_id.x] );
 
+    // Sync LDS
+    GroupMemoryBarrierWithGroupSync();
+
     // Each group write to just one pixel. If we're the last thread in the group, write out
     if(group_thread_id.x == 0)
     {
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl
index a0734caf02..e9333a4694 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderInner.azsl
@@ -81,7 +81,7 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex)
     }
 
     // apply exposure setting
-    specular *= pow(2.0, SceneSrg::m_iblExposure);
+    specular *= pow(2.0, ObjectSrg::m_exposure);
 
     PSOutput OUT;
     OUT.m_color = float4(specular, 1.0f);
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli
index 8151ed2fd5..366dc691ed 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderObjectSrg.azsli
@@ -17,6 +17,7 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
     float3 m_outerObbHalfLengths;
     float3 m_innerObbHalfLengths;
     bool m_useParallaxCorrection;
+    float m_exposure;
     TextureCube m_reflectionCubeMap;
 
     float4x4 GetWorldMatrix()
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl
index ac97172f1f..138d29398e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionProbeRenderOuter.azsl
@@ -104,7 +104,7 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex)
     blendWeight /= max(1.0f, blendWeightAllProbes);
 
     // apply exposure setting
-    specular *= pow(2.0, SceneSrg::m_iblExposure);
+    specular *= pow(2.0, ObjectSrg::m_exposure);
 
     // apply blend weight for additive blending
     specular *= blendWeight;
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli
index 1e4d4af8a2..3d38df2816 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli
@@ -6,11 +6,31 @@
  *
  */
 
-// 7-tap Gaussian Kernel (Sigma 1.1)
-static const uint GaussianKernelSize = 7;
-static const int2  TexelOffsetsV[GaussianKernelSize] = {{0, -3}, {0, -2}, {0, -1}, {0, 0}, {0, 1}, {0, 2}, {0, 3}};
-static const int2  TexelOffsetsH[GaussianKernelSize] = {{-3, 0}, {-2, 0}, {-1, 0}, {0, 0}, {1, 0}, {2, 0}, {3, 0}};
-static const float TexelWeights[GaussianKernelSize] = {0.010805f, 0.074929f, 0.238727f, 0.351078f, 0.238727f, 0.074929f, 0.010805f};
+// Gaussian Kernel Radius 9, Sigma 1.8
+static const uint GaussianKernelSize = 19;
+static const int2  TexelOffsetsV[GaussianKernelSize] = {{0, -9}, {0, -8}, {0, -7}, {0, -6}, {0, -5}, {0, -4}, {0, -3}, {0, -2}, {0, -1}, {0, 0}, {0, 1}, {0, 2}, {0, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7}, {0, 8}, {0, 9}};
+static const int2  TexelOffsetsH[GaussianKernelSize] = {{-9, 0}, {-8, 0}, {-7, 0}, {-6, 0}, {-5, 0}, {-4, 0}, {-3, 0}, {-2, 0}, {-1, 0}, {0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}, {7, 0}, {8, 0}, {9, 0}};
+static const float TexelWeights[GaussianKernelSize] = {
+    0.0000011022801820635918f,
+    0.000014295732881160677f,
+    0.0001370168487067367f,
+    0.0009708086495991633f,
+    0.005086391900047703f,
+    0.019711193240183777f,
+    0.056512463228943335f,
+    0.11989501853796679f,
+    0.18826323520204147f,
+    0.21881694875889543f,
+    0.18826323520204147f,
+    0.11989501853796679f,
+    0.056512463228943335f,
+    0.019711193240183777f,
+    0.005086391900047703f,
+    0.0009708086495991633f,
+    0.0001370168487067367f,
+    0.000014295732881160677f,
+    0.0000011022801820635918f
+};
 
 float3 GaussianFilter(uint2 screenCoords, int2 texelOffsets[GaussianKernelSize], RWTexture2D<float4> inputImage)
 {
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl
index cfc35d10e4..bdc787350e 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl
@@ -10,12 +10,13 @@
 #include <viewsrg.srgi>
 
 #include <Atom/Features/PostProcessing/FullscreenVertex.azsli>
-#include <Atom/Features/PostProcessing/FullscreenPixelInfo.azsli>
 #include <Atom/Features/SrgSemantics.azsli>
+#include <Atom/RPI/Math.azsli>
 #include "ReflectionScreenSpaceBlurCommon.azsli"
 
 ShaderResourceGroup PassSrg : SRG_PerPass
 {
+    Texture2DMS<float>  m_depth;
     RWTexture2D<float4> m_input;
     RWTexture2D<float4> m_output;
     uint m_imageWidth;
@@ -26,13 +27,39 @@ ShaderResourceGroup PassSrg : SRG_PerPass
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 
 // Pixel Shader
+struct PSOutput
+{    
+    float4 m_color  : SV_Target0;
+    float m_depth   : SV_Depth;
+};
+
 PSOutput MainPS(VSOutput IN)
 {
     // vertical blur uses coordinates from the mip0 input image
-    uint2 coords = IN.m_position.xy * PassSrg::m_outputScale;
-    float3 result = GaussianFilter(coords, TexelOffsetsV, PassSrg::m_input);
+    uint2 halfResCoords = IN.m_position.xy * PassSrg::m_outputScale;
+    float3 result = GaussianFilter(halfResCoords, TexelOffsetsV, PassSrg::m_input);
+
+    // downsample depth, using fullscreen image coordinates
+    float downsampledDepth = 0;
+    if (PassSrg::m_input[halfResCoords].w > 0.0f)
+    {
+        uint2 fullScreenCoords = halfResCoords * 2;
+
+        for (int y = -2; y < 2; ++y)
+        {
+            for (int x = -2; x < 2; ++x)
+            {
+                float depth = PassSrg::m_depth.Load(fullScreenCoords + int2(x, y), 0).r;
+                if (depth > downsampledDepth)
+                {
+                    downsampledDepth = depth;
+                }
+            }
+        }
+    }
 
     PSOutput OUT;
     OUT.m_color = float4(result, 1.0f);
+    OUT.m_depth = downsampledDepth;
     return OUT;
 }
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader
index dcebb4d2ae..92995bd69f 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader
@@ -10,7 +10,8 @@
     {
         "Depth" :
         {
-            "Enable" : false
+            "Enable" : true,	// required to bind the depth buffer SRV
+            "CompareFunc" : "Always"
         }
     },
 
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl
index a0c31442fa..6cd4ce16f5 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl
@@ -12,17 +12,19 @@
 #include <Atom/RPI/Math.azsli>
 #include <Atom/Features/PostProcessing/FullscreenVertex.azsli>
 #include <Atom/Features/PostProcessing/FullscreenPixelInfo.azsli>
+#include <Atom/Features/PostProcessing/PostProcessUtil.azsli>
 #include <Atom/Features/MatrixUtility.azsli>
 #include <Atom/Features/PBR/LightingUtils.azsli>
 #include <Atom/Features/PBR/Microfacet/Fresnel.azsli>
 
 ShaderResourceGroup PassSrg : SRG_PerPass
 {
-    Texture2DMS<float4> m_trace;
-    Texture2D<float4>   m_previousFrame;
+    Texture2D<float4>   m_reflection;
+    Texture2D<float>    m_downsampledDepth;
     Texture2DMS<float4> m_normal;       // RGB10 = Normal (Encoded), A2 = Flags
     Texture2DMS<float4> m_specularF0;   // RGB8 = SpecularF0, A8 = Roughness
     Texture2DMS<float>  m_depth;
+    Texture2D<float4>   m_previousFrame;
 
     Sampler LinearSampler
     {
@@ -40,6 +42,49 @@ ShaderResourceGroup PassSrg : SRG_PerPass
 
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 
+float3 SampleReflection(float2 reflectionUV, float mip, float depth, float3 normal, uint2 invDimensions)
+{  
+    const float DepthTolerance = 0.001f;
+
+    // attempt to trivially accept the downsampled reflection texel
+    float downsampledDepth = PassSrg::m_downsampledDepth.SampleLevel(PassSrg::LinearSampler, reflectionUV, floor(mip)).r;
+    if (abs(depth - downsampledDepth) <= DepthTolerance)
+    {
+        // use this reflection sample
+        float3 reflection = PassSrg::m_reflection.SampleLevel(PassSrg::LinearSampler, reflectionUV, mip).rgb;
+        return reflection;
+    }
+    
+    // neighborhood search surrounding the downsampled texel, searching for the closest matching depth
+    float closestDepthDelta = 1.0f;
+    int2 closestOffsetUV = float2(0.0f, 0.0f);
+    for (int y = -4; y <= 4; ++y)
+    {
+        for (int x = -4; x <= 4; ++x)
+        {
+            float2 offsetUV = float2(x * invDimensions.x, y * invDimensions.y);
+            float downsampledDepth = PassSrg::m_downsampledDepth.SampleLevel(PassSrg::LinearSampler, reflectionUV + offsetUV, floor(mip)).r;
+            float depthDelta = abs(depth - downsampledDepth);
+
+            if (depthDelta <= DepthTolerance)
+            {
+                // depth is within tolerance, use this texel
+                float3 reflection = PassSrg::m_reflection.SampleLevel(PassSrg::LinearSampler, reflectionUV + offsetUV, mip).rgb;
+                return reflection;
+            }
+
+            if (closestDepthDelta > depthDelta)
+            {
+                closestDepthDelta = depthDelta;
+                closestOffsetUV = offsetUV;
+            }
+        }
+    }
+    
+    float3 reflection = PassSrg::m_reflection.SampleLevel(PassSrg::LinearSampler, reflectionUV + closestOffsetUV, mip).rgb;
+    return reflection;
+}
+
 // Pixel Shader
 PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex)
 {
@@ -52,11 +97,21 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex)
     // compute trace image coordinates for the half-res image
     float2 traceCoords = screenCoords * 0.5f;
 
-    // load trace data and check w-component to see if there was a hit
-    float4 traceData = PassSrg::m_trace.Load(traceCoords, sampleIndex);
-    if (traceData.w <= 0.0f)
+    // check reflection data mip0 to see if there was a hit
+    float4 reflectionData = PassSrg::m_reflection.Load(uint3(traceCoords, 0));
+    if (reflectionData.w <= 0.0f)
     {
-        // no hit, fallback to the cubemap reflections currently in the reflection buffer
+        // fallback to the cubemap reflections currently in the reflection buffer
+        discard;
+    }
+
+    // load specular and roughness
+    float4 specularF0 = PassSrg::m_specularF0.Load(screenCoords, sampleIndex);
+    float roughness = specularF0.a;
+    const float MaxRoughness = 0.5f;
+    if (roughness > MaxRoughness)
+    {
+        // fallback to the cubemap reflections currently in the reflection buffer
         discard;
     }
 
@@ -65,8 +120,9 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex)
     float depth = PassSrg::m_depth.Load(screenCoords, sampleIndex).r;
     float2 ndcPos = float2(UV.x, 1.0f - UV.y) * 2.0f - 1.0f;
     float4 projectedPos = float4(ndcPos, depth, 1.0f);
-    float4 positionWS = mul(ViewSrg::m_viewProjectionInverseMatrix, projectedPos);
-    positionWS /= positionWS.w;
+    float4 positionVS = mul(ViewSrg::m_projectionMatrixInverse, projectedPos);
+    positionVS /= positionVS.w;
+    float3 positionWS = mul(ViewSrg::m_viewMatrixInverse, positionVS).xyz;  
 
     // compute ray from camera to surface position
     float3 cameraToPositionWS = normalize(positionWS.xyz - ViewSrg::m_worldPosition);
@@ -74,42 +130,16 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex)
     // retrieve surface normal
     float4 encodedNormal = PassSrg::m_normal.Load(screenCoords, sampleIndex);
     float3 normalWS = DecodeNormalSignedOctahedron(encodedNormal.rgb);
-
-    // compute surface specular
-    float4 specularF0 = PassSrg::m_specularF0.Load(screenCoords, sampleIndex);
-    float roughness = specularF0.a;
     float NdotV = dot(normalWS, -cameraToPositionWS);
-    float3 specular = FresnelSchlickWithRoughness(NdotV, specularF0.rgb, roughness);
 
-    // reconstruct the world space position of the trace coordinates
-    float2 traceUV = saturate(traceData.xy / dimensions);
-    float traceDepth = PassSrg::m_depth.Load(traceData.xy, sampleIndex).r;
-    float2 traceNDC = float2(traceUV.x, 1.0f - traceUV.y) * 2.0f - 1.0f;
-    float4 traceProjectedPos = float4(traceNDC, traceDepth, 1.0f);
-    float4 tracePositionVS = mul(ViewSrg::m_projectionMatrixInverse, traceProjectedPos);
-    tracePositionVS /= tracePositionVS.w;
-    float4 tracePositionWS = mul(ViewSrg::m_viewMatrixInverse, tracePositionVS);
-
-    // reproject to the previous frame image coordinates
-    float4 tracePrevNDC = mul(ViewSrg::m_viewProjectionPrevMatrix, tracePositionWS);
-    tracePrevNDC /= tracePrevNDC.w;
-    float2 tracePrevUV = float2(tracePrevNDC.x, -1.0f * tracePrevNDC.y) * 0.5f + 0.5f;
-
-    // compute the roughness mip to use in the previous frame image
+    // compute the roughness mip to use in the reflection image
     // remap the roughness mip into a lower range to more closely match the material roughness values
-    const float MaxRoughness = 0.5f;
     float mip = saturate(roughness / MaxRoughness) * PassSrg::m_maxMipLevel;
     
-    // sample reflection value from the roughness mip
-    float4 reflectionColor = float4(PassSrg::m_previousFrame.SampleLevel(PassSrg::LinearSampler, tracePrevUV, mip).rgb, 1.0f);  
-    
-    // fade rays close to screen edge
-    const float ScreenFadeDistance = 0.95f;
-    float2 fadeAmount = max(max(0.0f, traceUV - ScreenFadeDistance), max(0.0f, 1.0f - traceUV - ScreenFadeDistance));
-    fadeAmount /= (1.0f - ScreenFadeDistance);
-    float alpha = 1.0f - max(fadeAmount.x, fadeAmount.y);
-    
+    // sample reflection color from the mip chain
+    float3 reflectionColor = SampleReflection(IN.m_texCoord, mip, depth, normalWS, 1.0f / dimensions);
+
     PSOutput OUT;
-    OUT.m_color = float4(reflectionColor.rgb * specular, alpha);
+    OUT.m_color = float4(reflectionColor, reflectionData.w);
     return OUT;
 }
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl
index c95befce05..7c18b7f5de 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl
@@ -10,7 +10,7 @@
 #include <viewsrg.srgi>
 
 #include <Atom/Features/PostProcessing/FullscreenVertexUtil.azsli>
-#include <Atom/Features/PostProcessing/FullscreenPixelInfo.azsli>
+#include <Atom/Features/PostProcessing/PostProcessUtil.azsli>
 #include <Atom/Features/MatrixUtility.azsli>
 #include <Atom/Features/PBR/LightingUtils.azsli>
 #include <Atom/Features/PBR/Microfacet/Fresnel.azsli>
@@ -20,6 +20,18 @@ ShaderResourceGroup PassSrg : SRG_PerPass
     Texture2DMS<float>  m_depth;
     Texture2DMS<float4> m_normal;       // RGB10 = Normal (Encoded), A2 = Flags
     Texture2DMS<float4> m_specularF0;   // RGB8 = SpecularF0, A8 = Roughness
+    Texture2DMS<float4> m_reflection;
+    Texture2D<float4>   m_previousFrame;
+
+    Sampler LinearSampler
+    {
+        MinFilter = Linear;
+        MagFilter = Linear;
+        MipFilter = Linear;
+        AddressU = Clamp;
+        AddressV = Clamp;
+        AddressW = Clamp;
+    };
 }
 
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
@@ -49,6 +61,12 @@ VSOutput MainVS(VSInput input)
 }
 
 // Pixel Shader
+struct PSOutput
+{    
+    float4 m_color  : SV_Target0;
+    float m_depth   : SV_Depth;
+};
+
 PSOutput MainPS(VSOutput IN)
 {
     // compute screen coords based on a half-res render target
@@ -83,16 +101,83 @@ PSOutput MainPS(VSOutput IN)
     // reflect view ray around surface normal
     float3 reflectDirVS = normalize(reflect(cameraToPositionVS, normalVS));
  
+    // check to see if the reflected direction is approaching the camera
+    float rdotv = dot(reflectDirVS, -cameraToPositionVS);
+    bool fallbackEdge = false;
+    if (rdotv >= -0.05f)
+    {
+        if (rdotv >= 0.0f)
+        {
+            // ray points back to camera, fallback to cubemaps
+            discard;            
+        }
+
+        // ray is approaching the camera direction, but not there yet - trace the reflection and set this
+        // as a non-reflected pixel, which will prevent artifacts at the boundary
+        fallbackEdge = true;
+    }
+
     // trace screenspace rays against the depth buffer to find the screenspace intersection coordinates    
     float4 result = float4(0.0f, 0.0f, 0.0f, 0.0f);
     float2 hitCoords = float2(0.0f, 0.0f);
     if (TraceRayScreenSpace(positionVS, reflectDirVS, dimensions, hitCoords))
     {
-        float rdotv = dot(reflectDirVS, cameraToPositionVS);
-        result = float4(hitCoords, 0.0f, rdotv);   
+        // reconstruct the world space position of the trace coordinates
+        float2 traceUV = saturate(hitCoords / dimensions);
+        float traceDepth = PassSrg::m_depth.Load(hitCoords, 0).r;
+        float2 traceNDC = float2(traceUV.x, 1.0f - traceUV.y) * 2.0f - 1.0f;
+        float4 traceProjectedPos = float4(traceNDC, traceDepth, 1.0f);
+        float4 tracePositionVS = mul(ViewSrg::m_projectionMatrixInverse, traceProjectedPos);
+        tracePositionVS /= tracePositionVS.w;
+        float4 tracePositionWS = mul(ViewSrg::m_viewMatrixInverse, tracePositionVS);
+        
+        // reproject to the previous frame image coordinates
+        float4 tracePrevNDC = mul(ViewSrg::m_viewProjectionPrevMatrix, tracePositionWS);
+        tracePrevNDC /= tracePrevNDC.w;
+        float2 tracePrevUV = float2(tracePrevNDC.x, -1.0f * tracePrevNDC.y) * 0.5f + 0.5f;
+
+        // sample the previous frame image
+        result.rgb = PassSrg::m_previousFrame.SampleLevel(PassSrg::LinearSampler, tracePrevUV, 0).rgb;
+
+        // apply surface specular
+        float3 specularF0 = PassSrg::m_specularF0.Load(screenCoords, 0).rgb;
+        result.rgb *= specularF0;
+
+        // fade rays close to screen edge
+        const float ScreenFadeDistance = 0.95f;
+        float2 fadeAmount = max(max(0.0f, traceUV - ScreenFadeDistance), max(0.0f, 1.0f - traceUV - ScreenFadeDistance));
+        fadeAmount /= (1.0f - ScreenFadeDistance);
+        result.a = fallbackEdge ? 0.0f : 1.0f - max(fadeAmount.x, fadeAmount.y);
+    }
+    else
+    {
+        // ray miss, add in the IBL/probe reflections from the specular pass
+        float4 positionWS = mul(ViewSrg::m_viewMatrixInverse, positionVS);
+        float3 cameraToPositionWS = normalize(positionWS - ViewSrg::m_worldPosition);  
+        float3 reflectDirWS = normalize(reflect(cameraToPositionWS, normalWS));
+        
+        result.rgb += PassSrg::m_reflection.Load(screenCoords, 0).rgb;
+        result.a = fallbackEdge ? 0.0f : 1.0f;
+    }
+
+    // downsample depth
+    float downsampledDepth = 0.0f;
+    for (int y = -2; y < 2; ++y)
+    {
+        for (int x = -2; x < 2; ++x)
+        {
+            float depth = PassSrg::m_depth.Load(screenCoords + int2(x, y), 0).r;
+
+            // take the closest depth sample (larger depth value due to reverse depth)
+            if (depth > downsampledDepth)
+            {
+                downsampledDepth = depth;
+            }
+        }
     }
 
     PSOutput OUT;
     OUT.m_color = result;
+    OUT.m_depth = downsampledDepth;
     return OUT;
 }
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader
index 563e0e3276..3ceabd404a 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader
@@ -10,7 +10,8 @@
     {
         "Depth" :
         {
-            "Enable" : false
+            "Enable" : true,	// required to bind the depth buffer SRV
+            "CompareFunc" : "Always"
         }
     },
 
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
index 5aa2dfb800..98220fae15 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h
@@ -86,6 +86,8 @@ namespace AZ
             virtual void SetShadowsEnabled(LightHandle handle, bool enabled) = 0;
             //! Sets the shadow bias
             virtual void SetShadowBias(LightHandle handle, float bias) = 0;
+            //! Sets the normal shadow bias
+            virtual void SetNormalShadowBias(LightHandle handle, float bias) = 0;
             //! Sets the shadowmap size (width and height) of the light.
             virtual void SetShadowmapMaxResolution(LightHandle handle, ShadowmapSize shadowmapSize) = 0;
             //! Specifies filter method of shadows.
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h
index 1a5a776cdf..52b1402b24 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h
@@ -74,6 +74,8 @@ namespace AZ
             virtual void SetFilteringSampleCount(LightHandle handle, uint16_t count) = 0;
             //! Sets the Esm exponent to use. Higher values produce a steeper falloff in the border areas between light and shadow.
             virtual void SetEsmExponent(LightHandle handle, float exponent) = 0;
+            //! Sets the normal shadow bias. Reduces acne by biasing the shadowmap lookup along the geometric normal.
+            virtual void SetNormalShadowBias(LightHandle handle, float bias) = 0;
             //! Sets all of the the point data for the provided LightHandle.
             virtual void SetPointData(LightHandle handle, const PointLightData& data) = 0;
         };
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessor.h
index 2ac184e2e0..23cd76ca20 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessor.h
@@ -30,7 +30,7 @@ namespace AZ
         class TransformServiceFeatureProcessor;
         class RayTracingFeatureProcessor;
 
-        class MeshDataInstance
+        class ModelDataInstance
         {
             friend class MeshFeatureProcessor;
             friend class MeshLoader;
@@ -47,7 +47,7 @@ namespace AZ
             public:
                 using ModelChangedEvent = MeshFeatureProcessorInterface::ModelChangedEvent;
 
-                MeshLoader(const Data::Asset<RPI::ModelAsset>& modelAsset, MeshDataInstance* parent);
+                MeshLoader(const Data::Asset<RPI::ModelAsset>& modelAsset, ModelDataInstance* parent);
                 ~MeshLoader();
 
                 ModelChangedEvent& GetModelChangedEvent();
@@ -68,7 +68,7 @@ namespace AZ
                                                                   } };
                 MeshFeatureProcessorInterface::ModelChangedEvent m_modelChangedEvent;
                 Data::Asset<RPI::ModelAsset> m_modelAsset;
-                MeshDataInstance* m_parent = nullptr;
+                ModelDataInstance* m_parent = nullptr;
             };
 
             void DeInit();
@@ -99,7 +99,8 @@ namespace AZ
             //! A reference to the original model asset in case it got cloned before creating the model instance.
             Data::Asset<RPI::ModelAsset> m_originalModelAsset;
 
-            Data::Instance<RPI::ShaderResourceGroup> m_shaderResourceGroup;
+            //! List of object SRGs used by meshes in this model 
+            AZStd::vector<Data::Instance<RPI::ShaderResourceGroup>> m_objectSrgList;
             AZStd::unique_ptr<MeshLoader> m_meshLoader;
             RPI::Scene* m_scene = nullptr;
             RHI::DrawItemSortKey m_sortKey;
@@ -152,7 +153,7 @@ namespace AZ
 
             Data::Instance<RPI::Model> GetModel(const MeshHandle& meshHandle) const override;
             Data::Asset<RPI::ModelAsset> GetModelAsset(const MeshHandle& meshHandle) const override;
-            Data::Instance<RPI::ShaderResourceGroup> GetObjectSrg(const MeshHandle& meshHandle) const override;
+            const AZStd::vector<Data::Instance<RPI::ShaderResourceGroup>>& GetObjectSrgs(const MeshHandle& meshHandle) const override;
             void QueueObjectSrgForCompile(const MeshHandle& meshHandle) const override;
             void SetMaterialAssignmentMap(const MeshHandle& meshHandle, const Data::Instance<RPI::Material>& material) override;
             void SetMaterialAssignmentMap(const MeshHandle& meshHandle, const MaterialAssignmentMap& materials) override;
@@ -195,7 +196,7 @@ namespace AZ
             void OnRenderPipelineRemoved(RPI::RenderPipeline* pipeline) override;
                         
             AZStd::concurrency_checker m_meshDataChecker;
-            StableDynamicArray<MeshDataInstance> m_meshData;
+            StableDynamicArray<ModelDataInstance> m_modelData;
             TransformServiceFeatureProcessor* m_transformService;
             RayTracingFeatureProcessor* m_rayTracingFeatureProcessor = nullptr;
             AZ::RPI::ShaderSystemInterface::GlobalShaderOptionUpdatedEvent::Handler m_handleGlobalShaderOptionUpdate;
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessorInterface.h
index cffbe5c3c5..356b1936ca 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Mesh/MeshFeatureProcessorInterface.h
@@ -20,7 +20,7 @@ namespace AZ
 {
     namespace Render
     {
-        class MeshDataInstance;
+        class ModelDataInstance;
 
         //! Settings to apply to a mesh handle when acquiring it for the first time
         struct MeshHandleDescriptor
@@ -40,7 +40,7 @@ namespace AZ
         public:
             AZ_RTTI(AZ::Render::MeshFeatureProcessorInterface, "{975D7F0C-2E7E-4819-94D0-D3C4E2024721}", FeatureProcessor);
 
-            using MeshHandle = StableDynamicArrayHandle<MeshDataInstance>;
+            using MeshHandle = StableDynamicArrayHandle<ModelDataInstance>;
             using ModelChangedEvent = Event<const Data::Instance<RPI::Model>>;
 
             //! Acquires a model with an optional collection of material assignments.
@@ -61,12 +61,15 @@ namespace AZ
             virtual Data::Instance<RPI::Model> GetModel(const MeshHandle& meshHandle) const = 0;
             //! Gets the underlying RPI::ModelAsset for a meshHandle.
             virtual Data::Asset<RPI::ModelAsset> GetModelAsset(const MeshHandle& meshHandle) const = 0;
-            //! Gets the ObjectSrg for a meshHandle.
-            //! Updating the ObjectSrg should be followed by a call to QueueObjectSrgForCompile,
-            //! instead of compiling the srg directly. This way, if the srg has already been queued for compile,
-            //! it will not be queued twice in the same frame. The ObjectSrg should not be updated during
+
+            //! Gets the ObjectSrgs for a meshHandle.
+            //! Updating the ObjectSrgs should be followed by a call to QueueObjectSrgForCompile,
+            //! instead of compiling the srgs directly. This way, if the srgs have already been queued for compile,
+            //! they will not be queued twice in the same frame. The ObjectSrgs should not be updated during
             //! Simulate, or it will create a race between updating the data and the call to Compile
-            virtual Data::Instance<RPI::ShaderResourceGroup> GetObjectSrg(const MeshHandle& meshHandle) const = 0;
+            //! Cases where there may be multiple ObjectSrgs: if a model has multiple submeshes and those submeshes use different
+            //! materials with different object SRGs.
+            virtual const AZStd::vector<Data::Instance<RPI::ShaderResourceGroup>>& GetObjectSrgs(const MeshHandle& meshHandle) const = 0;
             //! Queues the object srg for compile.
             virtual void QueueObjectSrgForCompile(const MeshHandle& meshHandle) const = 0;
             //! Sets the MaterialAssignmentMap for a meshHandle, using just a single material for the DefaultMaterialAssignmentId.
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h
index 5efd235a67..ded36f5496 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h
@@ -39,6 +39,8 @@ namespace AZ
             bool IsCubeMapReferenced(const AZStd::string& relativePath) override;
             bool IsValidProbeHandle(const ReflectionProbeHandle& probe) const override { return (probe.get() != nullptr); }
             void ShowProbeVisualization(const ReflectionProbeHandle& probe, bool showVisualization) override;
+            void SetRenderExposure(const ReflectionProbeHandle& probe, float renderExposure) override;
+            void SetBakeExposure(const ReflectionProbeHandle& probe, float bakeExposure) override;
 
             // FeatureProcessor overrides
             void Activate() override;
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h
index 4eb2130b1b..80c92281ea 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessorInterface.h
@@ -50,6 +50,8 @@ namespace AZ
             virtual bool IsCubeMapReferenced(const AZStd::string& relativePath) = 0;
             virtual bool IsValidProbeHandle(const ReflectionProbeHandle& probe) const = 0;
             virtual void ShowProbeVisualization(const ReflectionProbeHandle& probe, bool showVisualization) = 0;
+            virtual void SetRenderExposure(const ReflectionProbeHandle& probe, float renderExposure) = 0;
+            virtual void SetBakeExposure(const ReflectionProbeHandle& probe, float bakeExposure) = 0;
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h
index 82cc1e7d50..b2d483e48c 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h
@@ -27,31 +27,50 @@ namespace AZ::Render
         static constexpr IndexType NoFreeSlot = std::numeric_limits<IndexType>::max();
         IndexType m_firstFreeSlot = NoFreeSlot;
 
+        //! Clears all data and resets to initial state.
         void Clear();
+
+        //! Creates a new entry, default-constructs it, and returns an index that references it.
         IndexType GetFreeSlotIndex();
+
+        //! Destroys the data referenced by index and frees that index for future use.
         void RemoveIndex(IndexType index);
+
+        //! Destroys the data and related index by using a pointer to the data itself.
         void RemoveData(DataType* data);
 
+        //! Returns a reference to the data using the provided index.
         DataType& GetData(IndexType index);
         const DataType& GetData(IndexType index) const;
+
+        //! Returns a count of how many items are stored in the IndexedDataVector
         size_t GetDataCount() const;
 
+        //! Returns a reference to the internal data vector.
+        //! This vector should not be altered by calling code or the IndexedDataVector will be corrupted
         AZStd::vector<DataType>& GetDataVector();
         const AZStd::vector<DataType>& GetDataVector() const;
+        
+        //! Returns a reference to the internal vector.
+        const AZStd::vector<IndexType>& GetDataToIndexVector() const;
 
-        AZStd::vector<IndexType>& GetIndexVector();
-        const AZStd::vector<IndexType>& GetIndexVector() const;
-
+        //! Returns the offset into the internal data vector for a given index.
         IndexType GetRawIndex(IndexType index) const;
+
+        //! Returns the logical index for data given its pointer, which could passed to
+        //! GetData() to retrieve the data again.
         IndexType GetIndexForData(const DataType* data) const;
 
     private:
         constexpr static size_t InitialReservedSize = 128;
 
-        // Stores data indices and an embedded free list
+        // Indices to data and an embedded free list in the unused entries
         AZStd::vector<IndexType> m_indices;
-        // Stores the indirection index
+
+        // Map of the physical index in m_data to the logical index for that data in m_indices.
         AZStd::vector<IndexType> m_dataToIndices;
+
+        // The actual data.
         AZStd::vector<DataType> m_data;
     };
 } // namespace AZ::Render
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl
index 581186dbcc..03c3564ce9 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl
@@ -125,13 +125,7 @@ namespace AZ::Render
     }
 
     template<typename DataType, typename IndexType>
-    inline AZStd::vector<IndexType>& IndexedDataVector<DataType, IndexType>::GetIndexVector()
-    {
-        return m_dataToIndices;
-    }
-
-    template<typename DataType, typename IndexType>
-    inline const AZStd::vector<IndexType>& IndexedDataVector<DataType, IndexType>::GetIndexVector() const
+    inline const AZStd::vector<IndexType>& IndexedDataVector<DataType, IndexType>::GetDataToIndexVector() const
     {
         return m_dataToIndices;
     }
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h
index 8bd494dfde..2dd4bed264 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h
@@ -30,7 +30,6 @@ namespace AZ
 
             AZStd::string m_displayName;
             AZ::Data::Asset<AZ::RPI::ModelAsset> m_modelAsset;
-            AZ::Data::Asset<AZ::RPI::StreamingImageAsset> m_previewImageAsset;
         };
 
         using ModelPresetPtr = AZStd::shared_ptr<ModelPreset>;
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h
index a1a6e329b2..c0f11dd159 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h
@@ -17,7 +17,7 @@ namespace AZ
     {
         //! MultiIndexedDataVector is similar to IndexedDataVector but adds support for multiple different data vectors each containing different types
         //! i.e. structure of (N) arrays
-        //! See IndexedDataVectorTests.cpp for examples of use
+        //! See MultiIndexedDataVectorTests.cpp for examples of use
         template<typename ... Ts>
         class MultiIndexedDataVector
         {
@@ -199,6 +199,28 @@ namespace AZ
             {
                 return m_indices.at(index);
             }
+            
+            template<size_t Index, typename DataType>
+            IndexType GetIndexForData(const DataType* data) const
+            {
+                if (data >= &AZStd::get<Index>(m_data).front() && data <= &AZStd::get<Index>(m_data).back())
+                {
+                    return m_dataToIndices.at(data - &AZStd::get<Index>(m_data).front());
+                }
+                return NoFreeSlot;
+            }
+
+            template<size_t Index, typename LambdaType>
+            void ForEach(LambdaType lambda) const
+            {
+                for (auto& item : AZStd::get<Index>(m_data))
+                {
+                    if (!lambda(item))
+                    {
+                        break;
+                    }
+                }
+            }
 
         private:
             using Fn = void(&)(AZStd::vector<Ts>& ...);
diff --git a/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h
index 35e399997f..2c818d3c9b 100644
--- a/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Mocks/MockMeshFeatureProcessor.h
@@ -19,7 +19,7 @@ namespace UnitTest
         MOCK_METHOD1(CloneMesh, MeshHandle(const MeshHandle&));
         MOCK_CONST_METHOD1(GetModel, AZStd::intrusive_ptr<AZ::RPI::Model>(const MeshHandle&));
         MOCK_CONST_METHOD1(GetModelAsset, AZ::Data::Asset<AZ::RPI::ModelAsset>(const MeshHandle&));
-        MOCK_CONST_METHOD1(GetObjectSrg, AZStd::intrusive_ptr<AZ::RPI::ShaderResourceGroup>(const MeshHandle&));
+        MOCK_CONST_METHOD1(GetObjectSrgs, const AZStd::vector<AZStd::intrusive_ptr<AZ::RPI::ShaderResourceGroup>>&(const MeshHandle&));
         MOCK_CONST_METHOD1(QueueObjectSrgForCompile, void(const MeshHandle&));
         MOCK_CONST_METHOD1(GetMaterialAssignmentMap, const AZ::Render::MaterialAssignmentMap&(const MeshHandle&));
         MOCK_METHOD2(ConnectModelChangeEventHandler, void(const MeshHandle&, ModelChangedEvent::Handler&));
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h
index fe731f4ad6..b329a35977 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h
@@ -155,8 +155,10 @@ namespace AZ
         enum AuxGeomShapeType
         {
             ShapeType_Sphere,
+            ShapeType_Hemisphere,
             ShapeType_Cone,
             ShapeType_Cylinder,
+            ShapeType_CylinderNoEnds,       // Cylinder without disks on either end
             ShapeType_Disk,
             ShapeType_Quad,
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
index b755a6efee..5cc43e9013 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
@@ -314,15 +314,40 @@ namespace AZ
             AddShape(style, shape);
         }
 
-        void AuxGeomDrawQueue::DrawSphere(
-            const AZ::Vector3& center, 
+        Matrix3x3 CreateMatrix3x3FromDirection(const AZ::Vector3& direction)
+        {
+            Vector3 unitDirection(direction.GetNormalized());
+            Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized());
+            Vector3 unitCross(unitOrthogonal.Cross(unitDirection));
+            return Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross);
+        }
+
+        void AuxGeomDrawQueue::DrawSphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex)
+        {
+            DrawSphereCommon(center, direction, radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false);
+        }
+
+        void AuxGeomDrawQueue::DrawSphere(const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex)
+        {
+            DrawSphereCommon(center, AZ::Vector3::CreateAxisZ(), radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false);
+        }
+
+        void AuxGeomDrawQueue::DrawHemisphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex)
+        {
+            DrawSphereCommon(center, direction, radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, true);
+        }
+
+        void AuxGeomDrawQueue::DrawSphereCommon(
+            const AZ::Vector3& center,
+            const AZ::Vector3& direction,
             float radius, 
             const AZ::Color& color, 
             DrawStyle style, 
             DepthTest depthTest, 
             DepthWrite depthWrite, 
             FaceCullMode faceCull, 
-            int32_t viewProjOverrideIndex) 
+            int32_t viewProjOverrideIndex,
+            bool isHemisphere) 
         {
             if (radius <= 0.0f)
             {
@@ -330,12 +355,12 @@ namespace AZ
             }
 
             ShapeBufferEntry shape;
-            shape.m_shapeType = ShapeType_Sphere;
+            shape.m_shapeType = isHemisphere ? ShapeType_Hemisphere : ShapeType_Sphere;
             shape.m_depthRead  = ConvertRPIDepthTestFlag(depthTest);
             shape.m_depthWrite = ConvertRPIDepthWriteFlag(depthWrite);
             shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull);
             shape.m_color = color;
-            shape.m_rotationMatrix = Matrix3x3::CreateIdentity();
+            shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction);
             shape.m_position = center;
             shape.m_scale = AZ::Vector3(radius, radius, radius);
             shape.m_pointSize = m_pointSize;
@@ -362,13 +387,9 @@ namespace AZ
             shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull);
             shape.m_color = color;
 
-            Vector3 unitDirection(direction.GetNormalized());
-            Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized());
-            Vector3 unitCross(unitOrthogonal.Cross(unitDirection));
-
             // The disk mesh is created with the top of the disk pointing along the positive Y axis. This creates a
             // rotation so that the top of the disk will point along the given direction vector.
-            shape.m_rotationMatrix = Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross);
+            shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction);
             shape.m_position = center;
             shape.m_scale = AZ::Vector3(radius, 1.0f, radius);
             shape.m_pointSize = m_pointSize;
@@ -401,13 +422,7 @@ namespace AZ
             shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull);
             shape.m_color = color;
 
-            Vector3 unitDirection(direction.GetNormalized());
-            Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized());
-            Vector3 unitCross(unitOrthogonal.Cross(unitDirection));
-
-            // The cone mesh is created with the tip of the cone pointing along the positive Y axis. This creates a
-            // rotation so that the tip of the cone will point along the given direction vector.
-            shape.m_rotationMatrix = Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross);
+            shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction);
             shape.m_position = center;
             shape.m_scale = AZ::Vector3(radius, height, radius);
             shape.m_pointSize = m_pointSize;
@@ -416,17 +431,30 @@ namespace AZ
             AddShape(style, shape);
         }
 
-        void AuxGeomDrawQueue::DrawCylinder(
-            const AZ::Vector3& center, 
-            const AZ::Vector3& direction, 
-            float radius, 
-            float height, 
-            const AZ::Color& color, 
-            DrawStyle style, 
-            DepthTest depthTest, 
-            DepthWrite depthWrite, 
-            FaceCullMode faceCull, 
-            int32_t viewProjOverrideIndex) 
+        void AuxGeomDrawQueue::DrawCylinder(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color,
+            DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex)
+        {
+            DrawCylinderCommon(center, direction, radius, height, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, true);
+        }
+
+        void AuxGeomDrawQueue::DrawCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color,
+            DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex)
+        {
+            DrawCylinderCommon(center, direction, radius, height, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false);
+        }
+
+        void AuxGeomDrawQueue::DrawCylinderCommon(
+            const AZ::Vector3& center,
+            const AZ::Vector3& direction,
+            float radius,
+            float height,
+            const AZ::Color& color,
+            DrawStyle style,
+            DepthTest depthTest,
+            DepthWrite depthWrite,
+            FaceCullMode faceCull,
+            int32_t viewProjOverrideIndex,
+            bool drawEnds)
         {
             if (radius <= 0.0f || height <= 0.0f)
             {
@@ -434,19 +462,15 @@ namespace AZ
             }
 
             ShapeBufferEntry shape;
-            shape.m_shapeType = ShapeType_Cylinder;
-            shape.m_depthRead  = ConvertRPIDepthTestFlag(depthTest);
+            shape.m_shapeType = drawEnds ? ShapeType_Cylinder : ShapeType_CylinderNoEnds;
+            shape.m_depthRead = ConvertRPIDepthTestFlag(depthTest);
             shape.m_depthWrite = ConvertRPIDepthWriteFlag(depthWrite);
             shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull);
             shape.m_color = color;
 
-            Vector3 unitDirection(direction.GetNormalized());
-            Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized());
-            Vector3 unitCross(unitOrthogonal.Cross(unitDirection));
-
             // The cylinder mesh is created with the top end cap of the cylinder facing along the positive Y axis. This creates a
             // rotation so that the top face of the cylinder will face along the given direction vector.
-            shape.m_rotationMatrix = Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross);
+            shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction);
             shape.m_position = center;
             shape.m_scale = AZ::Vector3(radius, height, radius);
             shape.m_pointSize = m_pointSize;
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h
index 535a992fe0..7fa1bbdca8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h
@@ -60,9 +60,12 @@ namespace AZ
             // Fixed shape draws
             void DrawQuad(float width, float height, const AZ::Matrix3x4& transform, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawSphere(const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
+            void DrawSphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
+            void DrawHemisphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawDisk(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawCone(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawCylinder(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
+            void DrawCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawAabb(const AZ::Aabb& aabb, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawAabb(const AZ::Aabb& aabb, const AZ::Matrix3x4& transform, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
             void DrawObb(const AZ::Obb& obb, const AZ::Vector3& position, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override;
@@ -73,6 +76,9 @@ namespace AZ
 
         private: // functions
 
+            void DrawCylinderCommon(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex, bool drawEnds);
+            void DrawSphereCommon(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex, bool isHemisphere);
+
             //! Clear the current buffers
             void ClearCurrentBufferData();
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
index c2ee397b4c..2e7c0759db 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
@@ -10,6 +10,7 @@
 #include "AuxGeomDrawProcessorShared.h"
 
 #include <AzCore/Debug/EventTrace.h>
+#include <AzCore/std/algorithm.h>
 #include <AzCore/std/containers/array.h>
 
 #include <Atom/RHI/Factory.h>
@@ -69,11 +70,13 @@ namespace AZ
             SetupInputStreamLayout(m_objectStreamLayout[DrawStyle_Solid], RHI::PrimitiveTopology::TriangleList, false);
             SetupInputStreamLayout(m_objectStreamLayout[DrawStyle_Shaded], RHI::PrimitiveTopology::TriangleList, true);
 
-            CreateSphereBuffersAndViews();
+            CreateSphereBuffersAndViews(AuxGeomShapeType::ShapeType_Sphere);
+            CreateSphereBuffersAndViews(AuxGeomShapeType::ShapeType_Hemisphere);
             CreateQuadBuffersAndViews();
             CreateDiskBuffersAndViews();
             CreateConeBuffersAndViews();
-            CreateCylinderBuffersAndViews();
+            CreateCylinderBuffersAndViews(AuxGeomShapeType::ShapeType_Cylinder);
+            CreateCylinderBuffersAndViews(AuxGeomShapeType::ShapeType_CylinderNoEnds);
             CreateBoxBuffersAndViews();
 
             // cache scene pointer for RHI::PipelineState creation.
@@ -293,8 +296,11 @@ namespace AZ
             }
         }
 
-        bool FixedShapeProcessor::CreateSphereBuffersAndViews()
+        bool FixedShapeProcessor::CreateSphereBuffersAndViews(AuxGeomShapeType sphereShapeType)
         {
+            AZ_Assert(sphereShapeType == ShapeType_Sphere || sphereShapeType == ShapeType_Hemisphere,
+                "Trying to create sphere buffers and views with a non-sphere shape type!");
+
             const uint32_t numSphereLods = 5;
             struct LodInfo
             {
@@ -311,13 +317,13 @@ namespace AZ
                 {  9,  9, 0.0000f}
             }};
 
-            auto& m_shape = m_shapes[ShapeType_Sphere];
+            auto& m_shape = m_shapes[sphereShapeType];
             m_shape.m_numLods = numSphereLods;
 
             for (uint32_t lodIndex = 0; lodIndex < numSphereLods; ++lodIndex)
             {
                 MeshData meshData;
-                CreateSphereMeshData(meshData, lodInfo[lodIndex].numRings, lodInfo[lodIndex].numSections);
+                CreateSphereMeshData(meshData, lodInfo[lodIndex].numRings, lodInfo[lodIndex].numSections, sphereShapeType);
 
                 ObjectBuffers objectBuffers;
 
@@ -334,12 +340,25 @@ namespace AZ
             return true;
         }
 
-        void FixedShapeProcessor::CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections)
+        void FixedShapeProcessor::CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections, AuxGeomShapeType sphereShapeType)
         {
             const float radius = 1.0f;
 
+            // calculate "inner" vertices
+            float sectionAngle(DegToRad(360.0f / static_cast<float>(numSections)));
+            float ringSlice(DegToRad(180.0f / static_cast<float>(numRings)));
+
+            uint32_t numberOfPoles = 2;
+
+            if (sphereShapeType == ShapeType_Hemisphere)
+            {
+                numberOfPoles = 1;
+                numRings = (numRings + 1) / 2;
+                ringSlice = DegToRad(90.0f / static_cast<float>(numRings));
+            }
+
             // calc required number of vertices/indices/triangles to build a sphere for the given parameters
-            uint32_t numVertices = (numRings - 1) * numSections + 2;
+            uint32_t numVertices = (numRings - 1) * numSections + numberOfPoles;
 
             // setup buffers
             auto& positions = meshData.m_positions;
@@ -354,30 +373,29 @@ namespace AZ
             using NormalType = AuxGeomNormal;
 
             // 1st pole vertex
-            positions.push_back(PosType(0.0f, 0.0f, radius));
-            normals.push_back(NormalType(0.0f, 0.0f, 1.0f));
+            positions.push_back(PosType(0.0f, radius, 0.0f));
+            normals.push_back(NormalType(0.0f, 1.0f, 0.0f));
 
-            // calculate "inner" vertices
-            float sectionAngle(DegToRad(360.0f / static_cast<float>(numSections)));
-            float ringSlice(DegToRad(180.0f / static_cast<float>(numRings)));
-
-            for (uint32_t ring = 1; ring < numRings; ++ring)
+            for (uint32_t ring = 1; ring < numRings - numberOfPoles + 2; ++ring)
             {
                 float w(sinf(ring * ringSlice));
                 for (uint32_t section = 0; section < numSections; ++section)
                 {
                     float x = radius * cosf(section * sectionAngle) * w;
-                    float y = radius * sinf(section * sectionAngle) * w;
-                    float z = radius * cosf(ring * ringSlice);
+                    float y = radius * cosf(ring * ringSlice);
+                    float z = radius * sinf(section * sectionAngle) * w;
                     Vector3 radialVector(x, y, z);
                     positions.push_back(radialVector);
                     normals.push_back(radialVector.GetNormalized());
                 }
             }
 
-            // 2nd vertex of pole (for end cap)
-            positions.push_back(PosType(0.0f, 0.0f, -radius));
-            normals.push_back(NormalType(0.0f, 0.0f, -1.0f));
+            if (sphereShapeType == ShapeType_Sphere)
+            {
+                // 2nd vertex of pole (for end cap)
+                positions.push_back(PosType(0.0f, -radius, 0.0f));
+                normals.push_back(NormalType(0.0f, -1.0f, 0.0f));
+            }
 
             // point indices
             {
@@ -393,7 +411,8 @@ namespace AZ
 
             // line indices
             {
-                const uint32_t numEdges = (numRings - 2) * numSections * 2 + 2 * numSections * 2;
+                // NumEdges = NumRingEdges + NumSectionEdges = (numRings * numSections) + (numRings * numSections)
+                const uint32_t numEdges = numRings * numSections * 2;
                 const uint32_t numLineIndices = numEdges * 2;
 
                 // build "inner" faces
@@ -401,10 +420,9 @@ namespace AZ
                 indices.clear();
                 indices.reserve(numLineIndices);
 
-                for (uint16_t ring = 0; ring < numRings - 2; ++ring)
+                for (uint16_t ring = 0; ring < numRings - numberOfPoles + 1; ++ring)
                 {
                     uint16_t firstVertOfThisRing = static_cast<uint16_t>(1 + ring * numSections);
-                    uint16_t firstVertOfNextRing = static_cast<uint16_t>(1 + (ring + 1) * numSections);
                     for (uint16_t section = 0; section < numSections; ++section)
                     {
                         uint32_t nextSection = (section + 1) % numSections;
@@ -414,32 +432,33 @@ namespace AZ
                         indices.push_back(static_cast<uint16_t>(firstVertOfThisRing + nextSection));
 
                         // line around section
-                        indices.push_back(firstVertOfThisRing + section);
-                        indices.push_back(firstVertOfNextRing + section);
+                        int currentVertexIndex = firstVertOfThisRing + section;
+                        // max 0 will implicitly handle the top pole
+                        int previousVertexIndex = AZStd::max(currentVertexIndex - (int)numSections, 0);
+                        indices.push_back(static_cast<uint16_t>(currentVertexIndex));
+                        indices.push_back(static_cast<uint16_t>(previousVertexIndex));
                     }
                 }
 
-                // build faces for end caps (to connect "inner" vertices with poles)
-                uint16_t firstPoleVert = 0;
-                uint16_t firstVertOfFirstRing = static_cast<uint16_t>(1 + (0) * numSections);
-                for (uint16_t section = 0; section < numSections; ++section)
+                if (sphereShapeType == ShapeType_Sphere)
                 {
-                    indices.push_back(firstPoleVert);
-                    indices.push_back(firstVertOfFirstRing + section);
-                }
-
-                uint16_t lastPoleVert = static_cast<uint16_t>((numRings - 1) * numSections + 1);
-                uint16_t firstVertOfLastRing = static_cast<uint16_t>(1 + (numRings - 2) * numSections);
-                for (uint16_t section = 0; section < numSections; ++section)
-                {
-                    indices.push_back(firstVertOfLastRing + section);
-                    indices.push_back(lastPoleVert);
+                    // build faces for bottom pole (to connect "inner" vertices with poles)
+                    uint16_t lastPoleVert = static_cast<uint16_t>((numRings - 1) * numSections + 1);
+                    uint16_t firstVertOfLastRing = static_cast<uint16_t>(1 + (numRings - 2) * numSections);
+                    for (uint16_t section = 0; section < numSections; ++section)
+                    {
+                        indices.push_back(firstVertOfLastRing + section);
+                        indices.push_back(lastPoleVert);
+                    }
                 }
             }
 
             // triangle indices
             {
-                const uint32_t numTriangles = (numRings - 2) * numSections * 2  + 2 * numSections;
+                // NumTriangles = NumTrianglesAtPoles + NumQuads * 2
+                //              = (numSections * 2) + ((numRings - 2) * numSections * 2)
+                //              = (numSections * 2) * (numRings - 2 + 1)
+                const uint32_t numTriangles = (numRings - 1) * numSections * 2;
                 const uint32_t numTriangleIndices = numTriangles * 3;
 
                 // build "inner" faces
@@ -447,10 +466,10 @@ namespace AZ
                 indices.clear();
                 indices.reserve(numTriangleIndices);
 
-                for (uint32_t ring = 0; ring < numRings - 2; ++ring)
+                for (uint32_t ring = 0; ring < numRings - numberOfPoles; ++ring)
                 {
                     uint32_t firstVertOfThisRing = 1 + ring * numSections;
-                    uint32_t firstVertOfNextRing = 1 + (ring + 1) * numSections;
+                    uint32_t firstVertOfNextRing = firstVertOfThisRing + numSections;
 
                     for (uint32_t section = 0; section < numSections; ++section)
                     {
@@ -476,14 +495,17 @@ namespace AZ
                     indices.push_back(static_cast<uint16_t>(firstPoleVert));
                 }
 
-                uint32_t lastPoleVert = (numRings - 1) * numSections + 1;
-                uint32_t firstVertOfLastRing = 1 + (numRings - 2) * numSections;
-                for (uint32_t section = 0; section < numSections; ++section)
+                if (sphereShapeType == ShapeType_Sphere)
                 {
-                    uint32_t nextSection = (section + 1) % numSections;
-                    indices.push_back(static_cast<uint16_t>(firstVertOfLastRing + nextSection));
-                    indices.push_back(static_cast<uint16_t>(firstVertOfLastRing + section));
-                    indices.push_back(static_cast<uint16_t>(lastPoleVert));
+                    uint32_t lastPoleVert = (numRings - 1) * numSections + 1;
+                    uint32_t firstVertOfLastRing = 1 + (numRings - 2) * numSections;
+                    for (uint32_t section = 0; section < numSections; ++section)
+                    {
+                        uint32_t nextSection = (section + 1) % numSections;
+                        indices.push_back(static_cast<uint16_t>(firstVertOfLastRing + nextSection));
+                        indices.push_back(static_cast<uint16_t>(firstVertOfLastRing + section));
+                        indices.push_back(static_cast<uint16_t>(lastPoleVert));
+                    }
                 }
             }
         }
@@ -827,8 +849,11 @@ namespace AZ
             }
         }
 
-        bool FixedShapeProcessor::CreateCylinderBuffersAndViews()
+        bool FixedShapeProcessor::CreateCylinderBuffersAndViews(AuxGeomShapeType cylinderShapeType)
         {
+            AZ_Assert(cylinderShapeType == ShapeType_Cylinder || cylinderShapeType == ShapeType_CylinderNoEnds,
+                "Trying to create cylinder buffers and views with a non-cylinder shape type!");
+
             const uint32_t numCylinderLods = 5;
             struct LodInfo
             {
@@ -836,21 +861,21 @@ namespace AZ
                 float    screenPercentage;
             };
             const AZStd::array<LodInfo, numCylinderLods> lodInfo =
-            {{
+            { {
                 { 38, 0.1000f},
                 { 22, 0.0100f},
                 { 14, 0.0010f},
                 { 10, 0.0001f},
                 {  8, 0.0000f}
-            }};
+            } };
 
-            auto& m_shape = m_shapes[ShapeType_Cylinder];
+            auto& m_shape = m_shapes[cylinderShapeType];
             m_shape.m_numLods = numCylinderLods;
 
             for (uint32_t lodIndex = 0; lodIndex < numCylinderLods; ++lodIndex)
             {
                 MeshData meshData;
-                CreateCylinderMeshData(meshData, lodInfo[lodIndex].numSections);
+                CreateCylinderMeshData(meshData, lodInfo[lodIndex].numSections, cylinderShapeType);
 
                 ObjectBuffers objectBuffers;
 
@@ -867,13 +892,25 @@ namespace AZ
             return true;
         }
 
-        void FixedShapeProcessor::CreateCylinderMeshData(MeshData& meshData, uint32_t numSections)
+        void FixedShapeProcessor::CreateCylinderMeshData(MeshData& meshData, uint32_t numSections, AuxGeomShapeType cylinderShapeType)
         {
             const float radius = 1.0f;
             const float height = 1.0f;
 
+            //uint16_t indexOfBottomCenter = 0;
+            //uint16_t indexOfBottomStart = 1;
+            //uint16_t indexOfTopCenter = numSections + 1;
+            //uint16_t indexOfTopStart = numSections + 2;
+            uint16_t indexOfSidesStart = static_cast<uint16_t>(2 * numSections + 2);
+
+            if (cylinderShapeType == ShapeType_CylinderNoEnds)
+            {
+                // We won't draw disks at the ends of the cylinder, so no need to offset side indices
+                indexOfSidesStart = 0;
+            }
+
             // calc required number of vertices to build a cylinder for the given parameters
-            uint32_t numVertices = 4 * numSections + 2;
+            uint32_t numVertices = indexOfSidesStart + 2 * numSections;
 
             // setup buffers
             auto& positions = meshData.m_positions;
@@ -888,8 +925,11 @@ namespace AZ
             float topHeight = height * 0.5f;
 
             // Create caps
-            CreateDiskMeshData(meshData, numSections, Facing::Down, bottomHeight);
-            CreateDiskMeshData(meshData, numSections, Facing::Up, topHeight);
+            if (cylinderShapeType == ShapeType_Cylinder)
+            {
+                CreateDiskMeshData(meshData, numSections, Facing::Down, bottomHeight);
+                CreateDiskMeshData(meshData, numSections, Facing::Up, topHeight);
+            }
 
             // create vertices for side (so normal points out correctly)
             float sectionAngle(DegToRad(360.0f / (float)numSections));
@@ -906,12 +946,6 @@ namespace AZ
                 normals.push_back(normal);
             }
 
-            //uint16_t indexOfBottomCenter = 0;
-            //uint16_t indexOfBottomStart = 1;
-            //uint16_t indexOfTopCenter = numSections + 1;
-            //uint16_t indexOfTopStart = numSections + 2;
-            uint16_t indexOfSidesStart = static_cast<uint16_t>(2 * numSections + 2);
-
             // build point indices
             {
                 auto& indices = meshData.m_pointIndices;
@@ -930,6 +964,24 @@ namespace AZ
                     indices.push_back(indexOfSidesStart + 2 * section);
                     indices.push_back(indexOfSidesStart + 2 * section + 1);
                 }
+
+                // If we're not drawing the disks at the ends of the cylinder, we still want to
+                // draw a ring around the end to join the tips of lines we created just above
+                if (cylinderShapeType == ShapeType_CylinderNoEnds)
+                {
+                    for (uint16_t section = 0; section < numSections; ++section)
+                    {
+                        uint16_t nextSection = (section + 1) % numSections;
+
+                        // line around the bottom cap
+                        indices.push_back(section * 2);
+                        indices.push_back(nextSection * 2);
+
+                        // line around the top cap
+                        indices.push_back(section * 2 + 1);
+                        indices.push_back(nextSection * 2 + 1);
+                    }
+                }
             }
 
             // indices for triangles
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h
index 4007d62f66..958cee3143 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h
@@ -138,8 +138,8 @@ namespace AZ
                 Both,
             };
 
-            bool CreateSphereBuffersAndViews();
-            void CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections);
+            bool CreateSphereBuffersAndViews(AuxGeomShapeType sphereShapeType);
+            void CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections, AuxGeomShapeType sphereShapeType);
 
             bool CreateQuadBuffersAndViews();
             void CreateQuadMeshDataSide(MeshData& meshData, bool isUp, bool drawLines);
@@ -152,8 +152,8 @@ namespace AZ
             bool CreateConeBuffersAndViews();
             void CreateConeMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections);
 
-            bool CreateCylinderBuffersAndViews();
-            void CreateCylinderMeshData(MeshData& meshData, uint32_t numSections);
+            bool CreateCylinderBuffersAndViews(AuxGeomShapeType cylinderShapeType);
+            void CreateCylinderMeshData(MeshData& meshData, uint32_t numSections, AuxGeomShapeType cylinderShapeType);
 
             bool CreateBoxBuffersAndViews();
             void CreateBoxMeshData(MeshData& meshData);
diff --git a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
index 2e5db39880..c3c189eb62 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
@@ -100,6 +100,7 @@
 #include <DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h>
 #include <DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h>
 #include <DiffuseGlobalIllumination/DiffuseGlobalIlluminationFeatureProcessor.h>
+#include <ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h>
 #include <ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h>
 #include <ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.h>
 #include <ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h>
@@ -292,6 +293,7 @@ namespace AZ
             passSystem->AddPassCreator(Name("DeferredFogPass"), &DeferredFogPass::Create);
 
             // Add Reflection passes
+            passSystem->AddPassCreator(Name("ReflectionScreenSpaceTracePass"), &Render::ReflectionScreenSpaceTracePass::Create);
             passSystem->AddPassCreator(Name("ReflectionScreenSpaceBlurPass"), &Render::ReflectionScreenSpaceBlurPass::Create);
             passSystem->AddPassCreator(Name("ReflectionScreenSpaceBlurChildPass"), &Render::ReflectionScreenSpaceBlurChildPass::Create);
             passSystem->AddPassCreator(Name("ReflectionScreenSpaceCompositePass"), &Render::ReflectionScreenSpaceCompositePass::Create);
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
index b6c6910fd3..8a1ff95f29 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
@@ -343,7 +343,6 @@ namespace AZ
                 m_shadowBufferNeedsUpdate = true;
 
                 m_shadowProperties.GetData(index).m_cameraConfigurations[nullptr] = {};
-                m_shadowProperties.GetData(index).m_cameraTransforms[nullptr] = Transform::CreateIdentity();
 
                 const LightHandle handle(index);
                 m_shadowingLightHandle = handle; // only the recent light has shadows.
@@ -495,20 +494,10 @@ namespace AZ
 
         void DirectionalLightFeatureProcessor::SetCameraTransform(
             LightHandle handle,
-            const Transform& cameraTransform,
-            const RPI::RenderPipelineId& renderPipelineId)
+            const Transform&,
+            const RPI::RenderPipelineId&)
         {
             ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex());
-
-            if (RPI::RenderPipeline* renderPipeline = GetParentScene()->GetRenderPipeline(renderPipelineId).get())
-            {
-                const RPI::View* cameraView = renderPipeline->GetDefaultView().get();
-                property.m_cameraTransforms[cameraView] = cameraTransform;
-            }
-            else
-            {
-                property.m_cameraTransforms[nullptr] = cameraTransform;
-            }
             property.m_shadowmapViewNeedsUpdate = true;
         }
 
@@ -934,17 +923,6 @@ namespace AZ
             return property.m_cameraConfigurations.at(nullptr);
         }
 
-        const Transform& DirectionalLightFeatureProcessor::GetCameraTransform(LightHandle handle, const RPI::View* cameraView) const
-        {
-            const ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex());
-            const auto findIt = property.m_cameraTransforms.find(cameraView);
-            if (findIt != property.m_cameraTransforms.end())
-            {
-                return findIt->second;
-            }
-            return property.m_cameraTransforms.at(nullptr);
-        }
-
         void DirectionalLightFeatureProcessor::UpdateFrustums(
             LightHandle handle)
         {
@@ -1056,7 +1034,7 @@ namespace AZ
                         // if the shadow is rendering in an EnvironmentCubeMapPass it also needs to be a ReflectiveCubeMap view,
                         // to filter out shadows from objects that are excluded from the cubemap
                         RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassClass<RPI::EnvironmentCubeMapPass>();
-                        passFilter.SetOwenrScene(GetParentScene()); // only handles passes for this scene
+                        passFilter.SetOwnerScene(GetParentScene()); // only handles passes for this scene
                         RPI::PassSystemInterface::Get()->ForEachPass(passFilter, [&usageFlags]([[maybe_unused]] RPI::Pass* pass) -> RPI::PassFilterExecutionFlow
                             {
                                 usageFlags |= RPI::View::UsageReflectiveCubeMap;
@@ -1248,6 +1226,32 @@ namespace AZ
             property.m_shadowmapViewNeedsUpdate = true;
         }
 
+        float DirectionalLightFeatureProcessor::GetShadowmapSizeFromCameraView(const LightHandle handle, const RPI::View* cameraView) const
+        {
+            const DirectionalLightShadowData& shadowData = m_shadowData.at(cameraView).GetData(handle.GetIndex());
+            return static_cast<float>(shadowData.m_shadowmapSize);
+        }
+
+        void DirectionalLightFeatureProcessor::SnapAabbToPixelIncrements(const float invShadowmapSize, Vector3& orthoMin, Vector3& orthoMax)
+        {
+            // This function stops the cascaded shadowmap from shimmering as the camera moves.
+            // See CascadedShadowsManager.cpp in the Microsoft CascadedShadowMaps11 sample for details.
+
+            const Vector3 normalizeByBufferSize = Vector3(invShadowmapSize, invShadowmapSize, invShadowmapSize);
+
+            const Vector3 worldUnitsPerTexel = (orthoMax - orthoMin) * normalizeByBufferSize;
+
+            // We snap the camera to 1 pixel increments so that moving the camera does not cause the shadows to jitter.
+            // This is a matter of dividing by the world space size of a texel
+            orthoMin /= worldUnitsPerTexel;
+            orthoMin = orthoMin.GetFloor();
+            orthoMin *= worldUnitsPerTexel;
+
+            orthoMax /= worldUnitsPerTexel;
+            orthoMax = orthoMax.GetFloor();
+            orthoMax *= worldUnitsPerTexel;
+        }
+
         void DirectionalLightFeatureProcessor::UpdateShadowmapViews(LightHandle handle)
         {
             ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex());
@@ -1259,18 +1263,26 @@ namespace AZ
 
             for (auto& segmentIt : property.m_segments)
             {
+                const float invShadowmapSize = 1.0f / GetShadowmapSizeFromCameraView(handle, segmentIt.first);
+
                 for (uint16_t cascadeIndex = 0; cascadeIndex < segmentIt.second.size(); ++cascadeIndex)
                 {
-                    const Aabb viewAabb = CalculateShadowViewAabb(
-                        handle, segmentIt.first, cascadeIndex, lightTransform);
+                    const Aabb viewAabb = CalculateShadowViewAabb(handle, segmentIt.first, cascadeIndex, lightTransform);
 
                     if (viewAabb.IsValid() && viewAabb.IsFinite())
                     {
+                        const float cascadeNear = viewAabb.GetMin().GetY();
+                        const float cascadeFar = viewAabb.GetMax().GetY();
+
+                        Vector3 snappedAabbMin = viewAabb.GetMin();
+                        Vector3 snappedAabbMax = viewAabb.GetMax();
+
+                        SnapAabbToPixelIncrements(invShadowmapSize, snappedAabbMin, snappedAabbMax);
+
                         Matrix4x4 viewToClipMatrix = Matrix4x4::CreateIdentity();
-                        MakeOrthographicMatrixRH(viewToClipMatrix,
-                            viewAabb.GetMin().GetElement(0), viewAabb.GetMax().GetElement(0),
-                            viewAabb.GetMin().GetElement(2), viewAabb.GetMax().GetElement(2),
-                            viewAabb.GetMin().GetElement(1), viewAabb.GetMax().GetElement(1));
+                        MakeOrthographicMatrixRH(
+                            viewToClipMatrix, snappedAabbMin.GetElement(0), snappedAabbMax.GetElement(0), snappedAabbMin.GetElement(2),
+                            snappedAabbMax.GetElement(2), cascadeNear, cascadeFar);
 
                         CascadeSegment& segment = segmentIt.second[cascadeIndex];
                         segment.m_aabb = viewAabb;
@@ -1331,10 +1343,11 @@ namespace AZ
             // If we used an AABB whose Y-direction range is from a segment,
             // the depth value on the shadowmap saturated to 0 or 1,
             // and we could not draw shadow correctly.
+            const Transform cameraTransform = cameraView->GetCameraTransform();
             const Vector3 entireFrustumCenterLight =
-                lightTransform.GetInverseFast() * (GetCameraTransform(handle, cameraView).TransformPoint(property.m_entireFrustumCenterLocal));
+                lightTransform.GetInverseFast() * (cameraTransform.TransformPoint(property.m_entireFrustumCenterLocal));
             const float entireCenterY = entireFrustumCenterLight.GetElement(1);
-            const Vector3 cameraLocationWorld = GetCameraTransform(handle, cameraView).GetTranslation();
+            const Vector3 cameraLocationWorld = cameraTransform.GetTranslation();
             const Vector3 cameraLocationLight = lightTransformInverse * cameraLocationWorld;
             // Extend light view frustum by camera depth far in order to avoid shadow lacking behind camera.
             const float cameraBehindMinY = cameraLocationLight.GetElement(1) - GetCameraConfiguration(handle, cameraView).GetDepthFar();
@@ -1394,8 +1407,8 @@ namespace AZ
                 GetCameraConfiguration(handle, cameraView).GetDepthCenter(depthNear, depthFar),
                 depthFar);
 
-            const Vector3 localCenter{ 0.f, depthCenter, 0.f };
-            return GetCameraTransform(handle, cameraView).TransformPoint(localCenter);
+            const Vector3 localCenter{ 0.f, depthCenter, 0.f };            
+            return cameraView->GetCameraTransform().TransformPoint(localCenter);
         }
 
         float DirectionalLightFeatureProcessor::GetRadius(
@@ -1449,7 +1462,7 @@ namespace AZ
             const ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex());
             const Vector3& boundaryCenter = GetWorldCenterPosition(handle, cameraView, depthNear, depthFar);
             const CascadeShadowCameraConfiguration& cameraConfiguration = GetCameraConfiguration(handle, cameraView);
-            const Transform& cameraTransform = GetCameraTransform(handle, cameraView);
+            const Transform cameraTransform = cameraView->GetCameraTransform();
             const Vector3& cameraFwd = cameraTransform.GetBasis(1);
             const Vector3& cameraUp = cameraTransform.GetBasis(2);
             const Vector3 cameraToBoundaryCenter = boundaryCenter - cameraTransform.GetTranslation();
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h
index 8d7a9d76e4..c206a5097f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h
@@ -134,9 +134,6 @@ namespace AZ
                 // Default far depth of each cascade.
                 AZStd::array<float, Shadow::MaxNumberOfCascades> m_defaultFarDepths;
 
-                // Transforms of camera who offers view frustum for each camera view.
-                AZStd::unordered_map<const RPI::View*, Transform> m_cameraTransforms;
-
                 // Configuration offers shape of the camera view frustum for each camera view.
                 AZStd::unordered_map<const RPI::View*, CascadeShadowCameraConfiguration> m_cameraConfigurations;
 
@@ -259,11 +256,6 @@ namespace AZ
             //! it returns one of the fallback render pipeline ID.
             const CascadeShadowCameraConfiguration& GetCameraConfiguration(LightHandle handle, const RPI::View* cameraView) const;
 
-            //! This returns the camera transform.
-            //! If it has not been registered for the given camera view.
-            //! it returns one of the fallback render pipeline ID.
-            const Transform& GetCameraTransform(LightHandle handle, const RPI::View* cameraView) const;
-
             //! This update view frustum of camera.
             void UpdateFrustums(LightHandle handle);
 
@@ -341,6 +333,9 @@ namespace AZ
             //! This draws bounding boxes of cascades.
             void DrawCascadeBoundingBoxes(LightHandle handle);
 
+            float GetShadowmapSizeFromCameraView(const LightHandle handle, const RPI::View* cameraView) const;
+            void SnapAabbToPixelIncrements(const float invShadowmapSize, Vector3& orthoMin, Vector3& orthoMax);
+
             IndexedDataVector<ShadowProperty> m_shadowProperties;
             // [GFX TODO][ATOM-2012] shadow for multiple directional lights
             LightHandle m_shadowingLightHandle;
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
index acf81ede32..e362ee3afc 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
@@ -313,6 +313,11 @@ namespace AZ
             SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetShadowBias, bias);
         }
 
+        void DiskLightFeatureProcessor::SetNormalShadowBias(LightHandle handle, float bias)
+        {
+            SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetNormalShadowBias, bias);
+        }
+
         void DiskLightFeatureProcessor::SetShadowmapMaxResolution(LightHandle handle, ShadowmapSize shadowmapSize)
         {
             SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetShadowmapMaxResolution, shadowmapSize);
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
index 275712f84f..bafddacc65 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h
@@ -51,6 +51,7 @@ namespace AZ
             void SetConeAngles(LightHandle handle, float innerDegrees, float outerDegrees) override;
             void SetShadowsEnabled(LightHandle handle, bool enabled) override;
             void SetShadowBias(LightHandle handle, float bias) override;
+            void SetNormalShadowBias(LightHandle handle, float bias) override;
             void SetShadowmapMaxResolution(LightHandle handle, ShadowmapSize shadowmapSize) override;
             void SetShadowFilterMethod(LightHandle handle, ShadowFilterMethod method) override;
             void SetFilteringSampleCount(LightHandle handle, uint16_t count) override;
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
index dcf412c35d..c5d6c3bf78 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
@@ -302,5 +302,10 @@ namespace AZ
             SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetEsmExponent, esmExponent);
         }
 
+        void PointLightFeatureProcessor::SetNormalShadowBias(LightHandle handle, float bias)
+        {
+            SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetNormalShadowBias, bias);
+        }
+
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h
index 54cb0303cc..df97fa0a52 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h
@@ -52,6 +52,7 @@ namespace AZ
             void SetShadowFilterMethod(LightHandle handle, ShadowFilterMethod method) override;
             void SetFilteringSampleCount(LightHandle handle, uint16_t count) override;
             void SetEsmExponent(LightHandle handle, float esmExponent) override;
+            void SetNormalShadowBias(LightHandle handle, float bias) override;
             void SetPointData(LightHandle handle, const PointLightData& data) override;
 
             const Data::Instance<RPI::Buffer>  GetLightBuffer() const;
diff --git a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
index 8b016410aa..5fc4fed420 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
@@ -142,7 +142,12 @@ namespace AZ
             Utils::PngFile image = Utils::PngFile::Create(readbackResult.m_imageDescriptor.m_size, format, *buffer);
 
             Utils::PngFile::SaveSettings saveSettings;
-            saveSettings.m_compressionLevel = r_pngCompressionLevel;
+
+            if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
+            {
+                console->GetCvarValue("r_pngCompressionLevel", saveSettings.m_compressionLevel);
+            }
+
             // We should probably strip alpha to save space, especially for automated test screenshots. Alpha is left in to maintain
             // prior behavior, changing this is out of scope for the current task. Note, it would have bit of a cascade effect where
             // AtomSampleViewer's ScriptReporter assumes an RGBA image.
diff --git a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
index 0ff8d2c165..d3615bfaa9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
@@ -68,6 +68,8 @@ namespace AZ
             : Base(descriptor)
             , AzFramework::InputChannelEventListener(AzFramework::InputChannelEventListener::GetPriorityDebugUI() - 1) // Give ImGui manager priority over the pass
             , AzFramework::InputTextEventListener(AzFramework::InputTextEventListener::GetPriorityDebugUI() - 1) // Give ImGui manager priority over the pass
+            , m_tickHandlerFrameStart(*this)
+            , m_tickHandlerFrameEnd(*this)
         {
 
             const ImGuiPassData* imguiPassData = RPI::PassUtils::GetPassData<ImGuiPassData>(descriptor);
@@ -102,7 +104,6 @@ namespace AZ
             Init();
             ImGui::NewFrame();
 
-            TickBus::Handler::BusConnect();
             AzFramework::InputChannelEventListener::Connect();
             AzFramework::InputTextEventListener::Connect();
         }
@@ -127,7 +128,6 @@ namespace AZ
 
             AzFramework::InputTextEventListener::BusDisconnect();
             AzFramework::InputChannelEventListener::BusDisconnect();
-            TickBus::Handler::BusDisconnect();
         }
 
         ImGuiContext* ImGuiPass::GetContext()
@@ -140,14 +140,61 @@ namespace AZ
             m_drawData.push_back(drawData);
         }
 
-        void ImGuiPass::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint timePoint)
+        ImGuiPass::TickHandlerFrameStart::TickHandlerFrameStart(ImGuiPass& imGuiPass)
+            : m_imGuiPass(imGuiPass)
         {
-            auto imguiContextScope = ImguiContextScope(m_imguiContext);
+            TickBus::Handler::BusConnect();
+        }
+
+        int ImGuiPass::TickHandlerFrameStart::GetTickOrder()
+        {
+            return AZ::ComponentTickBus::TICK_PRE_RENDER;
+        }
+
+        void ImGuiPass::TickHandlerFrameStart::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint timePoint)
+        {
+            auto imguiContextScope = ImguiContextScope(m_imGuiPass.m_imguiContext);
+            ImGui::NewFrame();
 
             auto& io = ImGui::GetIO();
             io.DeltaTime = deltaTime;
         }
 
+        ImGuiPass::TickHandlerFrameEnd::TickHandlerFrameEnd(ImGuiPass& imGuiPass)
+            : m_imGuiPass(imGuiPass)
+        {
+            TickBus::Handler::BusConnect();
+        }
+
+        int ImGuiPass::TickHandlerFrameEnd::GetTickOrder()
+        {
+            // ImGui::NewFrame() must be called (see ImGuiPass::TickHandlerFrameStart::OnTick) after populating
+            // ImGui::GetIO().NavInputs (see ImGuiPass::OnInputChannelEventFiltered), and paired with a call to
+            // ImGui::EndFrame() (see ImGuiPass::TickHandlerFrameEnd::OnTick); if this is not called explicitly
+            // then it will be called from inside ImGui::Render() (see ImGuiPass::SetupFrameGraphDependencies).
+            //
+            // ImGui::Render() gets called (indirectly) from OnSystemTick, so we cannot rely on it being paired
+            // with a matching call to ImGui::NewFrame() that gets called from OnTick, because OnSystemTick and
+            // OnTick can be called at different frequencies under some circumstances (namely from the editor).
+            //
+            // To account for this we must explicitly call ImGui::EndFrame() once a frame from OnTick to ensure
+            // that every call to ImGui::NewFrame() has been matched with a call to ImGui::EndFrame(), but only
+            // after ImGui::Render() has had the chance first (if so calling ImGui::EndFrame() again is benign).
+            //
+            // Because ImGui::Render() gets called (indirectly) from OnSystemTick, which usually happens at the
+            // start of every frame, we give TickHandlerFrameEnd::OnTick() the order of TICK_FIRST such that it
+            // will be called first on the regular tick bus, which is invoked immediately after the system tick.
+            //
+            // So while returning TICK_FIRST is incredibly counter-intuitive, hopefully that all explains why.
+            return AZ::ComponentTickBus::TICK_FIRST;
+        }
+
+        void ImGuiPass::TickHandlerFrameEnd::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint timePoint)
+        {
+            auto imguiContextScope = ImguiContextScope(m_imGuiPass.m_imguiContext);
+            ImGui::EndFrame();
+        }
+
         bool ImGuiPass::OnInputTextEventFiltered(const AZStd::string& textUTF8)
         {
             auto imguiContextScope = ImguiContextScope(m_imguiContext);
@@ -413,6 +460,7 @@ namespace AZ
 
         void ImGuiPass::Init()
         {
+            auto imguiContextScope = ImguiContextScope(m_imguiContext);
             auto& io = ImGui::GetIO();
 
             // ImGui IO Setup
@@ -421,7 +469,6 @@ namespace AZ
                 {
                     io.KeyMap[static_cast<ImGuiKey_>(i)] = static_cast<int>(i);
                 }
-                io.NavActive = true;
 
                 // Touch input
                 const AzFramework::InputDevice* inputDevice = nullptr;
@@ -434,6 +481,17 @@ namespace AZ
                     io.ConfigFlags |= ImGuiConfigFlags_IsTouchScreen;
                 }
 
+                // Gamepad input
+                inputDevice = nullptr;
+                AzFramework::InputDeviceRequestBus::EventResult(inputDevice,
+                    AzFramework::InputDeviceGamepad::IdForIndex0,
+                    &AzFramework::InputDeviceRequests::GetInputDevice);
+                if (inputDevice && inputDevice->IsSupported())
+                {
+                    io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
+                    io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
+                }
+
                 // Set initial display size to something reasonable (this will be updated in FramePrepare)
                 io.DisplaySize.x = 1920;
                 io.DisplaySize.y = 1080;
@@ -571,7 +629,6 @@ namespace AZ
             auto imguiContextScope = ImguiContextScope(m_imguiContext);
             ImGui::GetIO().MouseWheel = m_lastFrameMouseWheel;
             m_lastFrameMouseWheel = 0.0;
-            ImGui::NewFrame();
         }
 
         void ImGuiPass::BuildCommandListInternal(const RHI::FrameGraphExecuteContext& context)
diff --git a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
index 018d2d46b7..b774144ba3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
@@ -54,7 +54,6 @@ namespace AZ
         //! This pass owns and manages activation of an Imgui context.
         class ImGuiPass
             : public RPI::RenderPass
-            , private TickBus::Handler
             , private AzFramework::InputChannelEventListener
             , private AzFramework::InputTextEventListener
         {
@@ -76,9 +75,6 @@ namespace AZ
             //! Allows draw data from other imgui contexts to be rendered on this context.
             void RenderImguiDrawData(const ImDrawData& drawData);
 
-            // TickBus::Handler overrides...
-            void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint) override;
-
             // AzFramework::InputTextEventListener overrides...
             bool OnInputTextEventFiltered(const AZStd::string& textUTF8) override;
 
@@ -98,6 +94,35 @@ namespace AZ
             void BuildCommandListInternal(const RHI::FrameGraphExecuteContext& context) override;
 
         private:
+            //! Class which connects to the tick handler using the tick order required at the start of an ImGui frame.
+            class TickHandlerFrameStart : protected TickBus::Handler
+            {
+            public:
+                TickHandlerFrameStart(ImGuiPass& imGuiPass);
+
+            protected:
+                // TickBus::Handler overrides...
+                int GetTickOrder() override;
+                void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint) override;
+
+            private:
+                ImGuiPass& m_imGuiPass;
+            };
+
+            //! Class which connects to the tick handler using the tick order required at the end of an ImGui frame.
+            class TickHandlerFrameEnd : protected TickBus::Handler
+            {
+            public:
+                TickHandlerFrameEnd(ImGuiPass& imGuiPass);
+
+            protected:
+                // TickBus::Handler overrides...
+                int GetTickOrder() override;
+                void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint) override;
+
+            private:
+                ImGuiPass& m_imGuiPass;
+            };
 
             struct DrawInfo
             {
@@ -111,6 +136,8 @@ namespace AZ
             void Init();
 
             ImGuiContext* m_imguiContext = nullptr;
+            TickHandlerFrameStart m_tickHandlerFrameStart;
+            TickHandlerFrameEnd m_tickHandlerFrameEnd;
 
             RHI::Ptr<RPI::PipelineStateForDraw> m_pipelineState;
             Data::Instance<RPI::Shader> m_shader;
diff --git a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp
index c753079d5b..ef3f33d1c3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/LuxCore/LuxCoreRenderer.cpp
@@ -13,6 +13,7 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzFramework/Components/CameraBus.h>
 #include <AzCore/std/containers/compressed_pair.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/API/ApplicationAPI.h>
 
 #include <luxcore/luxcore.h>
@@ -295,14 +296,12 @@ namespace AZ
             }
 
             // Run luxcoreui.exe
-            AZStd::string luxCoreExeFullPath;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(luxCoreExeFullPath, &AzFramework::ApplicationRequests::GetAppRoot);
-            luxCoreExeFullPath = luxCoreExeFullPath + AZ_TRAIT_LUXCORE_EXEPATH;
-            AzFramework::StringFunc::Path::Normalize(luxCoreExeFullPath);
+            AZ::IO::FixedMaxPath luxCoreExeFullPath = AZ::Utils::GetEnginePath();
+            luxCoreExeFullPath /= AZ_TRAIT_LUXCORE_EXEPATH;
 
             AZStd::string commandLine = "-o " + AZStd::string(resolvedPath) + "/render.cfg";
 
-            LuxCoreUI::LaunchLuxCoreUI(luxCoreExeFullPath, commandLine);
+            LuxCoreUI::LaunchLuxCoreUI(luxCoreExeFullPath.String(), commandLine);
         }
     }
 }
diff --git a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
index c7fb19bc5d..112eff64a8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
@@ -67,7 +67,7 @@ namespace AZ
             m_handleGlobalShaderOptionUpdate.Disconnect();
 
             DisableSceneNotification();
-            AZ_Warning("MeshFeatureProcessor", m_meshData.size() == 0,
+            AZ_Warning("MeshFeatureProcessor", m_modelData.size() == 0,
                 "Deactivaing the MeshFeatureProcessor, but there are still outstanding mesh handles.\n"
             );
             m_transformService = nullptr;
@@ -81,7 +81,7 @@ namespace AZ
 
             AZStd::concurrency_check_scope scopeCheck(m_meshDataChecker);
 
-            const auto iteratorRanges = m_meshData.GetParallelRanges();
+            const auto iteratorRanges = m_modelData.GetParallelRanges();
             AZ::JobCompletion jobCompletion;
             for (const auto& iteratorRange : iteratorRanges)
             {
@@ -125,11 +125,11 @@ namespace AZ
             m_forceRebuildDrawPackets = false;
 
             // CullingSystem::RegisterOrUpdateCullable() is not threadsafe, so need to do those updates in a single thread
-            for (MeshDataInstance& meshDataInstance : m_meshData)
+            for (ModelDataInstance& modelDataInstance : m_modelData)
             {
-                if (meshDataInstance.m_model && meshDataInstance.m_cullBoundsNeedsUpdate)
+                if (modelDataInstance.m_model && modelDataInstance.m_cullBoundsNeedsUpdate)
                 {
-                    meshDataInstance.UpdateCullBounds(m_transformService);
+                    modelDataInstance.UpdateCullBounds(m_transformService);
                 }
             }
         }
@@ -151,14 +151,14 @@ namespace AZ
             AZ_PROFILE_SCOPE(AzRender, "MeshFeatureProcessor: AcquireMesh");
 
             // don't need to check the concurrency during emplace() because the StableDynamicArray won't move the other elements during insertion
-            MeshHandle meshDataHandle = m_meshData.emplace();
+            MeshHandle meshDataHandle = m_modelData.emplace();
 
             meshDataHandle->m_descriptor = descriptor;
             meshDataHandle->m_scene = GetParentScene();
             meshDataHandle->m_materialAssignments = materials;
             meshDataHandle->m_objectId = m_transformService->ReserveObjectId();
             meshDataHandle->m_originalModelAsset = descriptor.m_modelAsset;
-            meshDataHandle->m_meshLoader = AZStd::make_unique<MeshDataInstance::MeshLoader>(descriptor.m_modelAsset, &*meshDataHandle);
+            meshDataHandle->m_meshLoader = AZStd::make_unique<ModelDataInstance::MeshLoader>(descriptor.m_modelAsset, &*meshDataHandle);
 
             return meshDataHandle;
         }
@@ -183,7 +183,7 @@ namespace AZ
                 m_transformService->ReleaseObjectId(meshHandle->m_objectId);
 
                 AZStd::concurrency_check_scope scopeCheck(m_meshDataChecker);
-                m_meshData.erase(meshHandle);
+                m_modelData.erase(meshHandle);
 
                 return true;
             }
@@ -215,9 +215,10 @@ namespace AZ
             return {};
         }
 
-        Data::Instance<RPI::ShaderResourceGroup> MeshFeatureProcessor::GetObjectSrg(const MeshHandle& meshHandle) const
+        const AZStd::vector<Data::Instance<RPI::ShaderResourceGroup>>& MeshFeatureProcessor::GetObjectSrgs(const MeshHandle& meshHandle) const
         {
-            return meshHandle.IsValid() ? meshHandle->m_shaderResourceGroup : nullptr;
+            static AZStd::vector<Data::Instance<RPI::ShaderResourceGroup>> staticEmptyList;
+            return meshHandle.IsValid() ? meshHandle->m_objectSrgList : staticEmptyList;
         }
 
         void MeshFeatureProcessor::QueueObjectSrgForCompile(const MeshHandle& meshHandle) const
@@ -274,9 +275,9 @@ namespace AZ
         {
             if (meshHandle.IsValid())
             {
-                MeshDataInstance& meshData = *meshHandle;
-                meshData.m_cullBoundsNeedsUpdate = true;
-                meshData.m_objectSrgNeedsUpdate = true;
+                ModelDataInstance& modelData = *meshHandle;
+                modelData.m_cullBoundsNeedsUpdate = true;
+                modelData.m_objectSrgNeedsUpdate = true;
 
                 m_transformService->SetTransformForId(meshHandle->m_objectId, transform, nonUniformScale);
 
@@ -292,10 +293,10 @@ namespace AZ
         {
             if (meshHandle.IsValid())
             {
-                MeshDataInstance& meshData = *meshHandle;
-                meshData.m_aabb = localAabb;
-                meshData.m_cullBoundsNeedsUpdate = true;
-                meshData.m_objectSrgNeedsUpdate = true;
+                ModelDataInstance& modelData = *meshHandle;
+                modelData.m_aabb = localAabb;
+                modelData.m_cullBoundsNeedsUpdate = true;
+                modelData.m_objectSrgNeedsUpdate = true;
             }
         };
 
@@ -465,7 +466,7 @@ namespace AZ
         void MeshFeatureProcessor::UpdateMeshReflectionProbes()
         {
             // we need to rebuild the Srg for any meshes that are using the forward pass IBL specular option
-            for (auto& meshInstance : m_meshData)
+            for (auto& meshInstance : m_modelData)
             {
                 if (meshInstance.m_descriptor.m_useForwardPassIblSpecular)
                 {
@@ -474,14 +475,14 @@ namespace AZ
             }
         }
 
-        // MeshDataInstance::MeshLoader...
-        MeshDataInstance::MeshLoader::MeshLoader(const Data::Asset<RPI::ModelAsset>& modelAsset, MeshDataInstance* parent)
+        // ModelDataInstance::MeshLoader...
+        ModelDataInstance::MeshLoader::MeshLoader(const Data::Asset<RPI::ModelAsset>& modelAsset, ModelDataInstance* parent)
             : m_modelAsset(modelAsset)
             , m_parent(parent)
         {
             if (!m_modelAsset.GetId().IsValid())
             {
-                AZ_Error("MeshDataInstance::MeshLoader", false, "Invalid model asset Id.");
+                AZ_Error("ModelDataInstance::MeshLoader", false, "Invalid model asset Id.");
                 return;
             }
             
@@ -494,19 +495,19 @@ namespace AZ
             AzFramework::AssetCatalogEventBus::Handler::BusConnect();
         }
 
-        MeshDataInstance::MeshLoader::~MeshLoader()
+        ModelDataInstance::MeshLoader::~MeshLoader()
         {
             AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
             Data::AssetBus::Handler::BusDisconnect();
         }
 
-        MeshFeatureProcessorInterface::ModelChangedEvent& MeshDataInstance::MeshLoader::GetModelChangedEvent()
+        MeshFeatureProcessorInterface::ModelChangedEvent& ModelDataInstance::MeshLoader::GetModelChangedEvent()
         {
             return m_modelChangedEvent;
         }
 
         //! AssetBus::Handler overrides...
-        void MeshDataInstance::MeshLoader::OnAssetReady(Data::Asset<Data::AssetData> asset)
+        void ModelDataInstance::MeshLoader::OnAssetReady(Data::Asset<Data::AssetData> asset)
         {
             Data::Asset<RPI::ModelAsset> modelAsset = asset;
 
@@ -527,7 +528,7 @@ namespace AZ
                 }
                 else
                 {
-                    AZ_Error("MeshDataInstance", false, "Cannot clone model for '%s'. Cloth simulation results won't be individual per entity.", modelAsset->GetName().GetCStr());
+                    AZ_Error("ModelDataInstance", false, "Cannot clone model for '%s'. Cloth simulation results won't be individual per entity.", modelAsset->GetName().GetCStr());
                     model = RPI::Model::FindOrCreate(modelAsset);
                 }
             }
@@ -547,29 +548,29 @@ namespace AZ
             {
                 //when running with null renderer, the RPI::Model::FindOrCreate(...) is expected to return nullptr, so suppress this error.
                 AZ_Error(
-                    "MeshDataInstance::OnAssetReady", RHI::IsNullRenderer(), "Failed to create model instance for '%s'",
+                    "ModelDataInstance::OnAssetReady", RHI::IsNullRenderer(), "Failed to create model instance for '%s'",
                     asset.GetHint().c_str());
             }
         }
 
         
-        void MeshDataInstance::MeshLoader::OnModelReloaded(Data::Asset<Data::AssetData> asset)
+        void ModelDataInstance::MeshLoader::OnModelReloaded(Data::Asset<Data::AssetData> asset)
         {
             OnAssetReady(asset);
         }
 
-        void MeshDataInstance::MeshLoader::OnAssetError(Data::Asset<Data::AssetData> asset)
+        void ModelDataInstance::MeshLoader::OnAssetError(Data::Asset<Data::AssetData> asset)
         {
             // Note: m_modelAsset and asset represents same asset, but only m_modelAsset contains the file path in its hint from serialization
             AZ_Error(
-                "MeshDataInstance::MeshLoader", false, "Failed to load asset %s. It may be missing, or not be finished processing",
+                "ModelDataInstance::MeshLoader", false, "Failed to load asset %s. It may be missing, or not be finished processing",
                 m_modelAsset.GetHint().c_str());
 
             AzFramework::AssetSystemRequestBus::Broadcast(
                 &AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetByUuid, m_modelAsset.GetId().m_guid);
         }
         
-        void MeshDataInstance::MeshLoader::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
+        void ModelDataInstance::MeshLoader::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
         {
             if (assetId == m_modelAsset.GetId())
             {
@@ -584,7 +585,7 @@ namespace AZ
             }
         }
 
-        void MeshDataInstance::MeshLoader::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
+        void ModelDataInstance::MeshLoader::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
         {
             if (assetId == m_modelAsset.GetId())
             {
@@ -599,9 +600,9 @@ namespace AZ
             }
         }
 
-        // MeshDataInstance...
+        // ModelDataInstance...
 
-        void MeshDataInstance::DeInit()
+        void ModelDataInstance::DeInit()
         {
             m_scene->GetCullingScene()->UnregisterCullable(m_cullable);
 
@@ -609,11 +610,11 @@ namespace AZ
 
             m_drawPacketListsByLod.clear();
             m_materialAssignments.clear();
-            m_shaderResourceGroup = {};
+            m_objectSrgList = {};
             m_model = {};
         }
 
-        void MeshDataInstance::Init(Data::Instance<RPI::Model> model)
+        void ModelDataInstance::Init(Data::Instance<RPI::Model> model)
         {
             m_model = model;
             const size_t modelLodCount = m_model->GetLodCount();
@@ -623,11 +624,11 @@ namespace AZ
                 BuildDrawPacketList(modelLodIndex);
             }
 
-            if (m_shaderResourceGroup)
+            for(auto& objectSrg : m_objectSrgList)
             {
                 // Set object Id once since it never changes
                 RHI::ShaderInputNameIndex objectIdIndex = "m_objectId";
-                m_shaderResourceGroup->SetConstant(objectIdIndex, m_objectId.GetIndex());
+                objectSrg->SetConstant(objectIdIndex, m_objectId.GetIndex());
                 objectIdIndex.AssertValid();
             }
 
@@ -643,12 +644,12 @@ namespace AZ
             m_objectSrgNeedsUpdate = true;
         }
 
-        void MeshDataInstance::BuildDrawPacketList(size_t modelLodIndex)
+        void ModelDataInstance::BuildDrawPacketList(size_t modelLodIndex)
         {
             RPI::ModelLod& modelLod = *m_model->GetLods()[modelLodIndex];
             const size_t meshCount = modelLod.GetMeshes().size();
 
-            MeshDataInstance::DrawPacketList& drawPacketListOut = m_drawPacketListsByLod[modelLodIndex];
+            ModelDataInstance::DrawPacketList& drawPacketListOut = m_drawPacketListsByLod[modelLodIndex];
             drawPacketListOut.clear();
             drawPacketListOut.reserve(meshCount);
 
@@ -682,27 +683,32 @@ namespace AZ
                     continue;
                 }
 
-                if (m_shaderResourceGroup && m_shaderResourceGroup->GetLayout()->GetHash() != objectSrgLayout->GetHash())
+                Data::Instance<RPI::ShaderResourceGroup> meshObjectSrg;
+
+                // See if the object SRG for this mesh is already in our list of object SRGs
+                for (auto& objectSrgIter : m_objectSrgList)
                 {
-                    AZ_Warning("MeshFeatureProcessor", false, "All materials on a model must use the same per-object ShaderResourceGroup. Skipping.");
-                    continue;
+                    if (objectSrgIter->GetLayout()->GetHash() == objectSrgLayout->GetHash())
+                    {
+                        meshObjectSrg = objectSrgIter;
+                    }
                 }
 
-                // The first time we find the per-surface SRG asset we create an instance and store it
-                // in shaderResourceGroupInOut. All of the Model's draw packets will use this same instance.
-                if (!m_shaderResourceGroup)
+                // If the object SRG for this mesh was not already in the list, create it and add it to the list
+                if (!meshObjectSrg)
                 {
                     auto& shaderAsset = material->GetAsset()->GetMaterialTypeAsset()->GetShaderAssetForObjectSrg();
-                    m_shaderResourceGroup = RPI::ShaderResourceGroup::Create(shaderAsset, objectSrgLayout->GetName());
-                    if (!m_shaderResourceGroup)
+                    meshObjectSrg = RPI::ShaderResourceGroup::Create(shaderAsset, objectSrgLayout->GetName());
+                    if (!meshObjectSrg)
                     {
                         AZ_Warning("MeshFeatureProcessor", false, "Failed to create a new shader resource group, skipping.");
                         continue;
                     }
+                    m_objectSrgList.push_back(meshObjectSrg);
                 }
 
                 // setup the mesh draw packet
-                RPI::MeshDrawPacket drawPacket(modelLod, meshIndex, material, m_shaderResourceGroup, materialAssignment.m_matModUvOverrides);
+                RPI::MeshDrawPacket drawPacket(modelLod, meshIndex, material, meshObjectSrg, materialAssignment.m_matModUvOverrides);
 
                 // set the shader option to select forward pass IBL specular if necessary
                 if (!drawPacket.SetShaderOption(AZ::Name("o_meshUseForwardPassIBLSpecular"), AZ::RPI::ShaderOptionValue{ m_descriptor.m_useForwardPassIblSpecular }))
@@ -726,7 +732,7 @@ namespace AZ
             }
         }
 
-        void MeshDataInstance::SetRayTracingData()
+        void ModelDataInstance::SetRayTracingData()
         {
             if (!m_model)
             {
@@ -993,7 +999,7 @@ namespace AZ
             rayTracingFeatureProcessor->SetMesh(m_objectId, m_model->GetModelAsset()->GetId(), subMeshes);
         }
 
-        void MeshDataInstance::RemoveRayTracingData()
+        void ModelDataInstance::RemoveRayTracingData()
         {
             // remove from ray tracing
             RayTracingFeatureProcessor* rayTracingFeatureProcessor = m_scene->GetFeatureProcessor<RayTracingFeatureProcessor>();
@@ -1003,7 +1009,7 @@ namespace AZ
             }
         }
 
-        void MeshDataInstance::SetSortKey(RHI::DrawItemSortKey sortKey)
+        void ModelDataInstance::SetSortKey(RHI::DrawItemSortKey sortKey)
         {
             m_sortKey = sortKey;
             for (auto& drawPacketList : m_drawPacketListsByLod)
@@ -1015,24 +1021,24 @@ namespace AZ
             }
         }
 
-        RHI::DrawItemSortKey MeshDataInstance::GetSortKey() const
+        RHI::DrawItemSortKey ModelDataInstance::GetSortKey() const
         {
             return m_sortKey;
         }
 
-        void MeshDataInstance::SetMeshLodConfiguration(RPI::Cullable::LodConfiguration meshLodConfig)
+        void ModelDataInstance::SetMeshLodConfiguration(RPI::Cullable::LodConfiguration meshLodConfig)
         {
             m_cullable.m_lodData.m_lodConfiguration = meshLodConfig;
         }
 
-        RPI::Cullable::LodConfiguration MeshDataInstance::GetMeshLodConfiguration() const
+        RPI::Cullable::LodConfiguration ModelDataInstance::GetMeshLodConfiguration() const
         {
             return m_cullable.m_lodData.m_lodConfiguration;
         }
 
-        void MeshDataInstance::UpdateDrawPackets(bool forceUpdate /*= false*/)
+        void ModelDataInstance::UpdateDrawPackets(bool forceUpdate /*= false*/)
         {
-            AZ_PROFILE_SCOPE(AzRender, "MeshDataInstance:: UpdateDrawPackets");
+            AZ_PROFILE_SCOPE(AzRender, "ModelDataInstance:: UpdateDrawPackets");
             for (auto& drawPacketList : m_drawPacketListsByLod)
             {
                 for (auto& drawPacket : drawPacketList)
@@ -1045,9 +1051,9 @@ namespace AZ
             }
         }
 
-        void MeshDataInstance::BuildCullable()
+        void ModelDataInstance::BuildCullable()
         {
-            AZ_PROFILE_SCOPE(AzRender, "MeshDataInstance: BuildCullable");
+            AZ_PROFILE_SCOPE(AzRender, "ModelDataInstance: BuildCullable");
             AZ_Assert(m_cullableNeedsRebuild, "This function only needs to be called if the cullable to be rebuilt");
             AZ_Assert(m_model, "The model has not finished loading yet");
 
@@ -1122,9 +1128,9 @@ namespace AZ
             m_cullBoundsNeedsUpdate = true;
         }
 
-        void MeshDataInstance::UpdateCullBounds(const TransformServiceFeatureProcessor* transformService)
+        void ModelDataInstance::UpdateCullBounds(const TransformServiceFeatureProcessor* transformService)
         {
-            AZ_PROFILE_SCOPE(AzRender, "MeshDataInstance: UpdateCullBounds");
+            AZ_PROFILE_SCOPE(AzRender, "ModelDataInstance: UpdateCullBounds");
             AZ_Assert(m_cullBoundsNeedsUpdate, "This function only needs to be called if the culling bounds need to be rebuilt");
             AZ_Assert(m_model, "The model has not finished loading yet");
 
@@ -1148,70 +1154,74 @@ namespace AZ
             m_cullBoundsNeedsUpdate = false;
         }
 
-        void MeshDataInstance::UpdateObjectSrg()
+        void ModelDataInstance::UpdateObjectSrg()
         {
-            if (!m_shaderResourceGroup)
+            for (auto& objectSrg : m_objectSrgList)
             {
-                return;
+                ReflectionProbeFeatureProcessor* reflectionProbeFeatureProcessor = m_scene->GetFeatureProcessor<ReflectionProbeFeatureProcessor>();
+
+                if (reflectionProbeFeatureProcessor && (m_descriptor.m_useForwardPassIblSpecular || m_hasForwardPassIblSpecularMaterial))
+                {
+                    // retrieve probe constant indices
+                    AZ::RHI::ShaderInputConstantIndex modelToWorldConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_modelToWorld"));
+                    AZ_Error("ModelDataInstance", modelToWorldConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    AZ::RHI::ShaderInputConstantIndex modelToWorldInverseConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_modelToWorldInverse"));
+                    AZ_Error("ModelDataInstance", modelToWorldInverseConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    AZ::RHI::ShaderInputConstantIndex outerObbHalfLengthsConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_outerObbHalfLengths"));
+                    AZ_Error("ModelDataInstance", outerObbHalfLengthsConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    AZ::RHI::ShaderInputConstantIndex innerObbHalfLengthsConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_innerObbHalfLengths"));
+                    AZ_Error("ModelDataInstance", innerObbHalfLengthsConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    AZ::RHI::ShaderInputConstantIndex useReflectionProbeConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_useReflectionProbe"));
+                    AZ_Error("ModelDataInstance", useReflectionProbeConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    AZ::RHI::ShaderInputConstantIndex useParallaxCorrectionConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_useParallaxCorrection"));
+                    AZ_Error("ModelDataInstance", useParallaxCorrectionConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    AZ::RHI::ShaderInputConstantIndex exposureConstantIndex = objectSrg->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_exposure"));
+                    AZ_Error("ModelDataInstance", exposureConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
+
+                    // retrieve probe cubemap index
+                    Name reflectionCubeMapImageName = Name("m_reflectionProbeCubeMap");
+                    RHI::ShaderInputImageIndex reflectionCubeMapImageIndex = objectSrg->FindShaderInputImageIndex(reflectionCubeMapImageName);
+                    AZ_Error("ModelDataInstance", reflectionCubeMapImageIndex.IsValid(), "Failed to find shader image index [%s]", reflectionCubeMapImageName.GetCStr());
+
+                    // retrieve the list of probes that contain the centerpoint of the mesh
+                    TransformServiceFeatureProcessor* transformServiceFeatureProcessor = m_scene->GetFeatureProcessor<TransformServiceFeatureProcessor>();
+                    Transform transform = transformServiceFeatureProcessor->GetTransformForId(m_objectId);
+
+                    ReflectionProbeFeatureProcessor::ReflectionProbeVector reflectionProbes;
+                    reflectionProbeFeatureProcessor->FindReflectionProbes(transform.GetTranslation(), reflectionProbes);
+
+                    if (!reflectionProbes.empty() && reflectionProbes[0])
+                    {
+                        objectSrg->SetConstant(modelToWorldConstantIndex, reflectionProbes[0]->GetTransform());
+                        objectSrg->SetConstant(modelToWorldInverseConstantIndex, Matrix3x4::CreateFromTransform(reflectionProbes[0]->GetTransform()).GetInverseFull());
+                        objectSrg->SetConstant(outerObbHalfLengthsConstantIndex, reflectionProbes[0]->GetOuterObbWs().GetHalfLengths());
+                        objectSrg->SetConstant(innerObbHalfLengthsConstantIndex, reflectionProbes[0]->GetInnerObbWs().GetHalfLengths());
+                        objectSrg->SetConstant(useReflectionProbeConstantIndex, true);
+                        objectSrg->SetConstant(useParallaxCorrectionConstantIndex, reflectionProbes[0]->GetUseParallaxCorrection());
+                        objectSrg->SetConstant(exposureConstantIndex, reflectionProbes[0]->GetRenderExposure());
+
+                        objectSrg->SetImage(reflectionCubeMapImageIndex, reflectionProbes[0]->GetCubeMapImage());
+                    }
+                    else
+                    {
+                        objectSrg->SetConstant(useReflectionProbeConstantIndex, false);
+                    }
+                }
+
+                objectSrg->Compile();
             }
 
-            ReflectionProbeFeatureProcessor* reflectionProbeFeatureProcessor = m_scene->GetFeatureProcessor<ReflectionProbeFeatureProcessor>();
-
-            if (reflectionProbeFeatureProcessor && (m_descriptor.m_useForwardPassIblSpecular || m_hasForwardPassIblSpecularMaterial))
-            {
-                // retrieve probe constant indices
-                AZ::RHI::ShaderInputConstantIndex modelToWorldConstantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_modelToWorld"));
-                AZ_Error("MeshDataInstance", modelToWorldConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
-
-                AZ::RHI::ShaderInputConstantIndex modelToWorldInverseConstantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_modelToWorldInverse"));
-                AZ_Error("MeshDataInstance", modelToWorldInverseConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
-
-                AZ::RHI::ShaderInputConstantIndex outerObbHalfLengthsConstantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_outerObbHalfLengths"));
-                AZ_Error("MeshDataInstance", outerObbHalfLengthsConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
-
-                AZ::RHI::ShaderInputConstantIndex innerObbHalfLengthsConstantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_innerObbHalfLengths"));
-                AZ_Error("MeshDataInstance", innerObbHalfLengthsConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
-
-                AZ::RHI::ShaderInputConstantIndex useReflectionProbeConstantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_useReflectionProbe"));
-                AZ_Error("MeshDataInstance", useReflectionProbeConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
-
-                AZ::RHI::ShaderInputConstantIndex useParallaxCorrectionConstantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_reflectionProbeData.m_useParallaxCorrection"));
-                AZ_Error("MeshDataInstance", useParallaxCorrectionConstantIndex.IsValid(), "Failed to find ReflectionProbe constant index");
-
-                // retrieve probe cubemap index
-                Name reflectionCubeMapImageName = Name("m_reflectionProbeCubeMap");
-                RHI::ShaderInputImageIndex reflectionCubeMapImageIndex = m_shaderResourceGroup->FindShaderInputImageIndex(reflectionCubeMapImageName);
-                AZ_Error("MeshDataInstance", reflectionCubeMapImageIndex.IsValid(), "Failed to find shader image index [%s]", reflectionCubeMapImageName.GetCStr());
-
-                // retrieve the list of probes that contain the centerpoint of the mesh
-                TransformServiceFeatureProcessor* transformServiceFeatureProcessor = m_scene->GetFeatureProcessor<TransformServiceFeatureProcessor>();
-                Transform transform = transformServiceFeatureProcessor->GetTransformForId(m_objectId);
-
-                ReflectionProbeFeatureProcessor::ReflectionProbeVector reflectionProbes;
-                reflectionProbeFeatureProcessor->FindReflectionProbes(transform.GetTranslation(), reflectionProbes);
-
-                if (!reflectionProbes.empty() && reflectionProbes[0])
-                {
-                    m_shaderResourceGroup->SetConstant(modelToWorldConstantIndex, reflectionProbes[0]->GetTransform());
-                    m_shaderResourceGroup->SetConstant(modelToWorldInverseConstantIndex, Matrix3x4::CreateFromTransform(reflectionProbes[0]->GetTransform()).GetInverseFull());
-                    m_shaderResourceGroup->SetConstant(outerObbHalfLengthsConstantIndex, reflectionProbes[0]->GetOuterObbWs().GetHalfLengths());
-                    m_shaderResourceGroup->SetConstant(innerObbHalfLengthsConstantIndex, reflectionProbes[0]->GetInnerObbWs().GetHalfLengths());
-                    m_shaderResourceGroup->SetConstant(useReflectionProbeConstantIndex, true);
-                    m_shaderResourceGroup->SetConstant(useParallaxCorrectionConstantIndex, reflectionProbes[0]->GetUseParallaxCorrection());
-
-                    m_shaderResourceGroup->SetImage(reflectionCubeMapImageIndex, reflectionProbes[0]->GetCubeMapImage());
-                }
-                else
-                {
-                    m_shaderResourceGroup->SetConstant(useReflectionProbeConstantIndex, false);
-                }
-            }
-
-            m_shaderResourceGroup->Compile();
-            m_objectSrgNeedsUpdate = false;
+            // Set m_objectSrgNeedsUpdate to false if there are object SRGs in the list
+            m_objectSrgNeedsUpdate = m_objectSrgNeedsUpdate && (m_objectSrgList.size() == 0);
         }
 
-        bool MeshDataInstance::MaterialRequiresForwardPassIblSpecular(Data::Instance<RPI::Material> material) const
+        bool ModelDataInstance::MaterialRequiresForwardPassIblSpecular(Data::Instance<RPI::Material> material) const
         {
             // look for a shader that has the o_materialUseForwardPassIBLSpecular option set
             // Note: this should be changed to have the material automatically set the forwardPassIBLSpecular
@@ -1237,7 +1247,7 @@ namespace AZ
             return false;
         }
 
-        void MeshDataInstance::SetVisible(bool isVisible)
+        void ModelDataInstance::SetVisible(bool isVisible)
         {
             m_visible = isVisible;
             m_cullable.m_isHidden = !isVisible;
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
index a9d8d5105f..c8e683e1d1 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
@@ -37,6 +37,11 @@ namespace AZ
             m_currentTime = AZStd::chrono::system_clock::now();
         }
 
+        void PostProcessFeatureProcessor::Deactivate()
+        {
+            m_viewAliasMap.clear();
+        }
+
         void PostProcessFeatureProcessor::UpdateTime()
         {
             AZStd::chrono::system_clock::time_point now = AZStd::chrono::system_clock::now();
@@ -45,6 +50,16 @@ namespace AZ
             m_deltaTime = deltaTime.count();
         }
 
+        void PostProcessFeatureProcessor::SetViewAlias(const AZ::RPI::ViewPtr sourceView, const AZ::RPI::ViewPtr targetView)
+        {
+            m_viewAliasMap[sourceView.get()] = targetView.get();
+        }
+
+        void PostProcessFeatureProcessor::RemoveViewAlias(const AZ::RPI::ViewPtr sourceView)
+        {
+            m_viewAliasMap.erase(sourceView.get());
+        }
+
         void PostProcessFeatureProcessor::Simulate(const FeatureProcessor::SimulatePacket& packet)
         {
             AZ_PROFILE_SCOPE(RPI, "PostProcessFeatureProcessor: Simulate");
@@ -200,8 +215,12 @@ namespace AZ
 
         AZ::Render::PostProcessSettings* PostProcessFeatureProcessor::GetLevelSettingsFromView(AZ::RPI::ViewPtr view)
         {
+            // check for view aliases first
+            auto viewAliasiterator = m_viewAliasMap.find(view.get());
+            
+            // Use the view alias if it exists
+            auto settingsIterator = m_blendedPerViewSettings.find(viewAliasiterator != m_viewAliasMap.end() ? viewAliasiterator->second : view.get());
             // If no settings for the view is found, the global settings is returned.
-            auto settingsIterator = m_blendedPerViewSettings.find(view.get());
             return settingsIterator != m_blendedPerViewSettings.end()
                 ? &settingsIterator->second
                 : m_globalAggregateLevelSettings.get();
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h
index 2c1cc98449..10af993d9d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.h
@@ -34,6 +34,7 @@ namespace AZ
 
             //! FeatureProcessor overrides...
             void Activate() override;
+            void Deactivate() override;
             void Simulate(const FeatureProcessor::SimulatePacket& packet) override;
 
             //! PostProcessFeatureProcessorInterface...
@@ -43,6 +44,9 @@ namespace AZ
             void OnPostProcessSettingsChanged() override;
             PostProcessSettings* GetLevelSettingsFromView(AZ::RPI::ViewPtr view);
 
+            void SetViewAlias(const AZ::RPI::ViewPtr sourceView, const AZ::RPI::ViewPtr targetView);
+            void RemoveViewAlias(const AZ::RPI::ViewPtr sourceView);
+
         private:
             PostProcessFeatureProcessor(const PostProcessFeatureProcessor&) = delete;
 
@@ -83,6 +87,8 @@ namespace AZ
 
             // Each camera/view will have its own PostProcessSettings
             AZStd::unordered_map<AZ::RPI::View*, PostProcessSettings> m_blendedPerViewSettings;
+            // This is used for mimicking a postfx setting of a different view
+            AZStd::unordered_map<AZ::RPI::View*, AZ::RPI::View*> m_viewAliasMap;
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp
index 862892ad1b..5683241693 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/EyeAdaptationPass.cpp
@@ -81,7 +81,7 @@ namespace AZ
             if (scene)
             {
                 PostProcessFeatureProcessor* fp = scene->GetFeatureProcessor<PostProcessFeatureProcessor>();
-                AZ::RPI::ViewPtr view = GetView();
+                AZ::RPI::ViewPtr view = GetRenderPipeline()->GetDefaultView();
                 if (fp)
                 {
                     PostProcessSettings* postProcessSettings = fp->GetLevelSettingsFromView(view);
@@ -110,7 +110,7 @@ namespace AZ
                 PostProcessFeatureProcessor* fp = scene->GetFeatureProcessor<PostProcessFeatureProcessor>();
                 if (fp)
                 {
-                    AZ::RPI::ViewPtr view = GetView();
+                    AZ::RPI::ViewPtr view = GetRenderPipeline()->GetDefaultView();
                     PostProcessSettings* postProcessSettings = fp->GetLevelSettingsFromView(view);
                     if (postProcessSettings)
                     {
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
index e86d91d387..4ac5782b04 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
@@ -120,15 +120,17 @@ namespace AZ
                     m_scene->RemoveRenderPipeline(m_environmentCubeMapPipelineId);
                     m_environmentCubeMapPass = nullptr;
 
-                    // restore exposure
-                    sceneSrg->SetConstant(m_iblExposureConstantIndex, m_previousExposure);
+                    // restore exposures
+                    sceneSrg->SetConstant(m_globalIblExposureConstantIndex, m_previousGlobalIblExposure);
+                    sceneSrg->SetConstant(m_skyBoxExposureConstantIndex, m_previousSkyBoxExposure);
 
                     m_buildingCubeMap = false;
                 }
                 else
                 {
-                    // set exposure to 0.0 while baking the cubemap
-                    sceneSrg->SetConstant(m_iblExposureConstantIndex, 0.0f);
+                    // set exposures to the user specified value while baking the cubemap
+                    sceneSrg->SetConstant(m_globalIblExposureConstantIndex, m_bakeExposure);
+                    sceneSrg->SetConstant(m_skyBoxExposureConstantIndex, m_bakeExposure);
                 }
             }
 
@@ -162,6 +164,7 @@ namespace AZ
                 m_renderOuterSrg->SetConstant(m_reflectionRenderData->m_outerObbHalfLengthsRenderConstantIndex, m_outerObbWs.GetHalfLengths());
                 m_renderOuterSrg->SetConstant(m_reflectionRenderData->m_innerObbHalfLengthsRenderConstantIndex, m_innerObbWs.GetHalfLengths());
                 m_renderOuterSrg->SetConstant(m_reflectionRenderData->m_useParallaxCorrectionRenderConstantIndex, m_useParallaxCorrection);
+                m_renderOuterSrg->SetConstant(m_reflectionRenderData->m_exposureConstantIndex, m_renderExposure);
                 m_renderOuterSrg->SetImage(m_reflectionRenderData->m_reflectionCubeMapRenderImageIndex, m_cubeMapImage);
                 m_renderOuterSrg->Compile();
 
@@ -172,6 +175,7 @@ namespace AZ
                 m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_outerObbHalfLengthsRenderConstantIndex, m_outerObbWs.GetHalfLengths());
                 m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_innerObbHalfLengthsRenderConstantIndex, m_innerObbWs.GetHalfLengths());
                 m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_useParallaxCorrectionRenderConstantIndex, m_useParallaxCorrection);
+                m_renderInnerSrg->SetConstant(m_reflectionRenderData->m_exposureConstantIndex, m_renderExposure);
                 m_renderInnerSrg->SetImage(m_reflectionRenderData->m_reflectionCubeMapRenderImageIndex, m_cubeMapImage);
                 m_renderInnerSrg->Compile();
 
@@ -303,9 +307,10 @@ namespace AZ
             const RPI::Ptr<RPI::ParentPass>& rootPass = environmentCubeMapPipeline->GetRootPass();
             rootPass->AddChild(m_environmentCubeMapPass);
 
-            // store the current IBL exposure value
+            // store the current IBL exposure values
             Data::Instance<RPI::ShaderResourceGroup> sceneSrg = m_scene->GetShaderResourceGroup();
-            m_previousExposure = sceneSrg->GetConstant<float>(m_iblExposureConstantIndex);
+            m_previousGlobalIblExposure = sceneSrg->GetConstant<float>(m_globalIblExposureConstantIndex);
+            m_previousSkyBoxExposure = sceneSrg->GetConstant<float>(m_skyBoxExposureConstantIndex);
 
             m_scene->AddRenderPipeline(environmentCubeMapPipeline);
         }
@@ -326,6 +331,17 @@ namespace AZ
             m_meshFeatureProcessor->SetVisible(m_visualizationMeshHandle, showVisualization);
         }
 
+        void ReflectionProbe::SetRenderExposure(float renderExposure)
+        {
+            m_renderExposure = renderExposure;
+            m_updateSrg = true;
+        }
+
+        void ReflectionProbe::SetBakeExposure(float bakeExposure)
+        {
+            m_bakeExposure = bakeExposure;
+        }
+
         const RHI::DrawPacket* ReflectionProbe::BuildDrawPacket(
             const Data::Instance<RPI::ShaderResourceGroup>& srg,
             const RPI::Ptr<RPI::PipelineStateForDraw>& pipelineState,
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
index bee304c5b9..17ef54367b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
@@ -61,6 +61,7 @@ namespace AZ
             RHI::ShaderInputNameIndex m_outerObbHalfLengthsRenderConstantIndex = "m_outerObbHalfLengths";
             RHI::ShaderInputNameIndex m_innerObbHalfLengthsRenderConstantIndex = "m_innerObbHalfLengths";
             RHI::ShaderInputNameIndex m_useParallaxCorrectionRenderConstantIndex = "m_useParallaxCorrection";
+            RHI::ShaderInputNameIndex m_exposureConstantIndex = "m_exposure";
             RHI::ShaderInputNameIndex m_reflectionCubeMapRenderImageIndex = "m_reflectionCubeMap";
         };
 
@@ -106,6 +107,14 @@ namespace AZ
             // enables or disables rendering of the visualization sphere
             void ShowVisualization(bool showVisualization);
 
+            // the exposure to use when rendering meshes with this probe's cubemap
+            void SetRenderExposure(float renderExposure);
+            float GetRenderExposure() const { return m_renderExposure; }
+
+            // the exposure to use when baking the probe cubemap
+            void SetBakeExposure(float bakeExposure);
+            float GetBakeExposure() const { return m_bakeExposure; }
+
         private:
 
             AZ_DISABLE_COPY_MOVE(ReflectionProbe);
@@ -157,6 +166,8 @@ namespace AZ
             RHI::ConstPtr<RHI::DrawPacket> m_blendWeightDrawPacket;
             RHI::ConstPtr<RHI::DrawPacket> m_renderOuterDrawPacket;
             RHI::ConstPtr<RHI::DrawPacket> m_renderInnerDrawPacket;
+            float m_renderExposure = 0.0f;
+            float m_bakeExposure = 0.0f;
             bool m_updateSrg = false;
 
             const RHI::DrawItemSortKey InvalidSortKey = static_cast<RHI::DrawItemSortKey>(-1);
@@ -169,8 +180,10 @@ namespace AZ
             RPI::Ptr<RPI::EnvironmentCubeMapPass> m_environmentCubeMapPass = nullptr;
             RPI::RenderPipelineId m_environmentCubeMapPipelineId;
             BuildCubeMapCallback m_callback;
-            RHI::ShaderInputNameIndex m_iblExposureConstantIndex = "m_iblExposure";
-            float m_previousExposure = 0.0f;
+            RHI::ShaderInputNameIndex m_globalIblExposureConstantIndex = "m_iblExposure";
+            RHI::ShaderInputNameIndex m_skyBoxExposureConstantIndex = "m_cubemapExposure";
+            float m_previousGlobalIblExposure = 0.0f;
+            float m_previousSkyBoxExposure = 0.0f;
             bool m_buildingCubeMap = false;
         };
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
index ae63ff1dde..e9038858ad 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
@@ -283,6 +283,18 @@ namespace AZ
             probe->ShowVisualization(showVisualization);
         }
 
+        void ReflectionProbeFeatureProcessor::SetRenderExposure(const ReflectionProbeHandle& probe, float renderExposure)
+        {
+            AZ_Assert(probe.get(), "SetRenderExposure called with an invalid handle");
+            probe->SetRenderExposure(renderExposure);
+        }
+
+        void ReflectionProbeFeatureProcessor::SetBakeExposure(const ReflectionProbeHandle& probe, float bakeExposure)
+        {
+            AZ_Assert(probe.get(), "SetBakeExposure called with an invalid handle");
+            probe->SetBakeExposure(bakeExposure);
+        }
+
         void ReflectionProbeFeatureProcessor::FindReflectionProbes(const Vector3& position, ReflectionProbeVector& reflectionProbes)
         {
             reflectionProbes.clear();
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp
index a1858a7e9d..8c5e36e706 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "ReflectionCopyFrameBufferPass.h"
-#include "ReflectionScreenSpaceBlurPass.h"
+#include "ReflectionScreenSpaceTracePass.h"
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
 #include <Atom/RPI.Public/Pass/PassFilter.h>
 
@@ -28,16 +28,16 @@ namespace AZ
 
         void ReflectionCopyFrameBufferPass::BuildInternal()
         {
-            RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassName(AZ::Name("ReflectionScreenSpaceBlurPass"), GetRenderPipeline());
+            RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassName(AZ::Name("ReflectionScreenSpaceTracePass"), GetRenderPipeline());
             RPI::PassSystemInterface::Get()->ForEachPass(passFilter, [this](RPI::Pass* pass) -> RPI::PassFilterExecutionFlow
                 {
-                    Render::ReflectionScreenSpaceBlurPass* blurPass = azrtti_cast<ReflectionScreenSpaceBlurPass*>(pass);
-                    Data::Instance<RPI::AttachmentImage>& frameBufferAttachment = blurPass->GetFrameBufferImageAttachment();
+                    Render::ReflectionScreenSpaceTracePass* tracePass = azrtti_cast<ReflectionScreenSpaceTracePass*>(pass);
+                    Data::Instance<RPI::AttachmentImage>& frameBufferAttachment = tracePass->GetPreviousFrameImageAttachment();
 
                     RPI::PassAttachmentBinding& outputBinding = GetOutputBinding(0);
                     AttachImageToSlot(outputBinding.m_name, frameBufferAttachment);
 
-                     return RPI::PassFilterExecutionFlow::StopVisitingPasses;
+                    return RPI::PassFilterExecutionFlow::StopVisitingPasses;
                 });
 
             FullscreenTrianglePass::BuildInternal();
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
index edd7ad1013..298aefe8df 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
@@ -12,6 +12,7 @@
 #include <Atom/RHI/FrameGraphAttachmentInterface.h>
 #include <Atom/RHI.Reflect/ImageViewDescriptor.h>
 #include <Atom/RPI.Reflect/Pass/FullscreenTrianglePassData.h>
+#include <Atom/RPI.Reflect/Pass/PassName.h>
 #include <Atom/RPI.Public/Pass/PassDefines.h>
 #include <Atom/RPI.Public/Pass/PassFactory.h>
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
@@ -79,7 +80,7 @@ namespace AZ
             horizontalBlurChildDesc.m_passTemplate = blurHorizontalPassTemplate;
 
             // add child passes to perform the vertical and horizontal Gaussian blur for each roughness mip level
-            for (uint32_t mip = 0; mip < m_numBlurMips; ++mip)
+            for (uint32_t mip = 0; mip < NumMipLevels - 1; ++mip)
             {
                 // create Vertical blur child passes
                 {
@@ -114,39 +115,19 @@ namespace AZ
             RemoveChildren();
             m_flags.m_createChildren = true;
 
-            Data::Instance<RPI::AttachmentImagePool> pool = RPI::ImageSystemInterface::Get()->GetSystemAttachmentPool();
-            
-            // retrieve the image attachment from the pass
-            AZ_Assert(m_ownedAttachments.size() == 1, "ReflectionScreenSpaceBlurPass must have exactly one ImageAttachment defined");
-            RPI::Ptr<RPI::PassAttachment> reflectionImageAttachment = m_ownedAttachments[0];
-            
-            // update the image attachment descriptor to sync up size and format
-            reflectionImageAttachment->Update();
-            
-            // change the lifetime since we want it to live between frames
-            reflectionImageAttachment->m_lifetime = RHI::AttachmentLifetimeType::Imported;
-
-            // set the bind flags
-            RHI::ImageDescriptor& imageDesc = reflectionImageAttachment->m_descriptor.m_image;            
-            imageDesc.m_bindFlags |= RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite;
-
-            // create the image attachment
-            RHI::ClearValue clearValue = RHI::ClearValue::CreateVector4Float(0, 0, 0, 0);
-            m_frameBufferImageAttachment = RPI::AttachmentImage::Create(*pool.get(), imageDesc, Name(reflectionImageAttachment->m_path.GetCStr()), &clearValue, nullptr);
-            
-            reflectionImageAttachment->m_path = m_frameBufferImageAttachment->GetAttachmentId();
-            reflectionImageAttachment->m_importedResource = m_frameBufferImageAttachment;
-
-            uint32_t mipLevels = reflectionImageAttachment->m_descriptor.m_image.m_mipLevels;
+            // retrieve the reflection, downsampled normal, and downsampled depth attachments
+            RPI::PassAttachment* reflectionImageAttachment = GetInputOutputBinding(0).m_attachment.get();
             RHI::Size imageSize = reflectionImageAttachment->m_descriptor.m_image.m_size;
 
+            RPI::PassAttachment* downsampledDepthImageAttachment = GetInputOutputBinding(1).m_attachment.get();
+
             // create transient attachments, one for each blur mip level
             AZStd::vector<RPI::PassAttachment*> transientPassAttachments;
-            for (uint32_t mip = 1; mip <= mipLevels - 1; ++mip)
+            for (uint32_t mip = 1; mip <= NumMipLevels - 1; ++mip)
             {
                 RHI::Size mipSize = imageSize.GetReducedMip(mip);
 
-                RHI::ImageBindFlags imageBindFlags = RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite;
+                RHI::ImageBindFlags imageBindFlags = RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead;
                 auto transientImageDesc = RHI::ImageDescriptor::Create2D(imageBindFlags, mipSize.m_width, mipSize.m_height, RHI::Format::R16G16B16A16_FLOAT);
 
                 RPI::PassAttachment* transientPassAttachment = aznew RPI::PassAttachment();
@@ -160,8 +141,6 @@ namespace AZ
                 m_ownedAttachments.push_back(transientPassAttachment);
             }
 
-            m_numBlurMips = mipLevels - 1;
-
             // call ParentPass::BuildInternal() first to configure the slots and auto-add the empty bindings,
             // then we will assign attachments to the bindings
             ParentPass::BuildInternal();
@@ -170,13 +149,27 @@ namespace AZ
             uint32_t attachmentIndex = 0;
             for (auto& verticalBlurChildPass : m_verticalBlurChildPasses)
             {
+                // mip0 source input
                 RPI::PassAttachmentBinding& inputAttachmentBinding = verticalBlurChildPass->GetInputOutputBinding(0);
                 inputAttachmentBinding.SetAttachment(reflectionImageAttachment);
                 inputAttachmentBinding.m_connectedBinding = &GetInputOutputBinding(0);
 
+                // mipN transient output
                 RPI::PassAttachmentBinding& outputAttachmentBinding = verticalBlurChildPass->GetInputOutputBinding(1);
                 outputAttachmentBinding.SetAttachment(transientPassAttachments[attachmentIndex]);
 
+                // setup downsampled depth output
+                // Note: this is a vertical pass output only, and each vertical child pass writes a specific mip level
+                uint32_t mipLevel = attachmentIndex + 1;
+
+                // downsampled depth output
+                RPI::PassAttachmentBinding& downsampledDepthAttachmentBinding = verticalBlurChildPass->GetInputOutputBinding(2);
+                RHI::ImageViewDescriptor downsampledDepthOutputViewDesc;
+                downsampledDepthOutputViewDesc.m_mipSliceMin = static_cast<int16_t>(mipLevel);
+                downsampledDepthOutputViewDesc.m_mipSliceMax = static_cast<int16_t>(mipLevel);
+                downsampledDepthAttachmentBinding.m_unifiedScopeDesc.SetAsImage(downsampledDepthOutputViewDesc);
+                downsampledDepthAttachmentBinding.SetAttachment(downsampledDepthImageAttachment);
+
                 attachmentIndex++;
             }
  
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
index b7ea98ae25..9548665c8a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
@@ -29,12 +29,8 @@ namespace AZ
             //! Creates a new pass without a PassTemplate
             static RPI::Ptr<ReflectionScreenSpaceBlurPass> Create(const RPI::PassDescriptor& descriptor);
 
-            //! Returns the frame buffer image attachment used by the ReflectionFrameBufferCopy pass
-            //! to store the previous frame image
-            Data::Instance<RPI::AttachmentImage>& GetFrameBufferImageAttachment() { return m_frameBufferImageAttachment; }
-
-            //! Returns the number of mip levels in the blur
-            uint32_t GetNumBlurMips() const { return m_numBlurMips; }
+            //! The total number of mip levels in the blur (including mip0)
+            static const uint32_t NumMipLevels = 5;
 
         private:
             explicit ReflectionScreenSpaceBlurPass(const RPI::PassDescriptor& descriptor);
@@ -47,9 +43,6 @@ namespace AZ
 
             AZStd::vector<RPI::Ptr<RPI::FullscreenTrianglePass>> m_verticalBlurChildPasses;
             AZStd::vector<RPI::Ptr<RPI::FullscreenTrianglePass>> m_horizontalBlurChildPasses;
-
-            Data::Instance<RPI::AttachmentImage> m_frameBufferImageAttachment;
-            uint32_t m_numBlurMips = 0;
         };
     }   // namespace RPI
 }   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp
index 1362191691..d27d4d90c9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp
@@ -26,6 +26,19 @@ namespace AZ
         {
         }
 
+        bool ReflectionScreenSpaceCompositePass::IsEnabled() const
+        {
+            // delay for a few frames to ensure that the previous frame texture is populated
+            static const uint32_t FrameDelay = 10;
+            if (m_frameDelayCount < FrameDelay)
+            {
+                m_frameDelayCount++;
+                return false;
+            }
+
+            return true;
+        }
+
         void ReflectionScreenSpaceCompositePass::CompileResources([[maybe_unused]] const RHI::FrameGraphCompileContext& context)
         {
             if (!m_shaderResourceGroup)
@@ -33,22 +46,8 @@ namespace AZ
                 return;
             }
 
-            RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassName(AZ::Name("ReflectionScreenSpaceBlurPass"), GetRenderPipeline());
-
-            RPI::PassSystemInterface::Get()->ForEachPass(passFilter, [this](RPI::Pass* pass) -> RPI::PassFilterExecutionFlow
-                {
-                    Render::ReflectionScreenSpaceBlurPass* blurPass = azrtti_cast<ReflectionScreenSpaceBlurPass*>(pass);
-
-                    // compute the max mip level based on the available mips in the previous frame image, and capping it
-                    // to stay within a range that has reasonable data
-                    const uint32_t MaxNumRoughnessMips = 8;
-                    uint32_t maxMipLevel = AZStd::min(MaxNumRoughnessMips, blurPass->GetNumBlurMips()) - 1;
-
-                    auto constantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_maxMipLevel"));
-                    m_shaderResourceGroup->SetConstant(constantIndex, maxMipLevel);
-
-                     return RPI::PassFilterExecutionFlow::StopVisitingPasses;
-                });
+            auto constantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_maxMipLevel"));
+            m_shaderResourceGroup->SetConstant(constantIndex, ReflectionScreenSpaceBlurPass::NumMipLevels - 1);
 
             FullscreenTrianglePass::CompileResources(context);
         }
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h
index c70a21cd1e..03b2834633 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h
@@ -34,6 +34,9 @@ namespace AZ
 
             // Pass Overrides...
             void CompileResources(const RHI::FrameGraphCompileContext& context) override;
+            bool IsEnabled() const override;
+
+            mutable uint32_t m_frameDelayCount = 0;
         };
     }   // namespace RPI
 }   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp
new file mode 100644
index 0000000000..7f6bce8a00
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "ReflectionScreenSpaceTracePass.h"
+#include <Atom/RPI.Public/Pass/PassSystemInterface.h>
+#include <Atom/RPI.Public/Pass/PassFilter.h>
+#include <Atom/RPI.Public/RenderPipeline.h>
+#include <Atom/RPI.Public/Image/ImageSystemInterface.h>
+#include <Atom/RPI.Public/Image/AttachmentImagePool.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        RPI::Ptr<ReflectionScreenSpaceTracePass> ReflectionScreenSpaceTracePass::Create(const RPI::PassDescriptor& descriptor)
+        {
+            RPI::Ptr<ReflectionScreenSpaceTracePass> pass = aznew ReflectionScreenSpaceTracePass(descriptor);
+            return AZStd::move(pass);
+        }
+
+        ReflectionScreenSpaceTracePass::ReflectionScreenSpaceTracePass(const RPI::PassDescriptor& descriptor)
+            : RPI::FullscreenTrianglePass(descriptor)
+        {
+        }
+
+        void ReflectionScreenSpaceTracePass::BuildInternal()
+        {
+            Data::Instance<RPI::AttachmentImagePool> pool = RPI::ImageSystemInterface::Get()->GetSystemAttachmentPool();
+
+            // retrieve the previous frame image attachment from the pass
+            AZ_Assert(m_ownedAttachments.size() == 3, "ReflectionScreenSpaceTracePass must have the following attachment images defined: ReflectionImage, DownSampledDepthImage, and PreviousFrameImage");
+            RPI::Ptr<RPI::PassAttachment> previousFrameImageAttachment = m_ownedAttachments[2];
+            
+            // update the image attachment descriptor to sync up size and format
+            previousFrameImageAttachment->Update();
+            
+            // change the lifetime since we want it to live between frames
+            previousFrameImageAttachment->m_lifetime = RHI::AttachmentLifetimeType::Imported;
+            
+            // set the bind flags
+            RHI::ImageDescriptor& imageDesc = previousFrameImageAttachment->m_descriptor.m_image;
+            imageDesc.m_bindFlags |= RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite;
+            
+            // create the image attachment
+            RHI::ClearValue clearValue = RHI::ClearValue::CreateVector4Float(0, 0, 0, 0);
+            m_previousFrameImageAttachment = RPI::AttachmentImage::Create(*pool.get(), imageDesc, Name(previousFrameImageAttachment->m_path.GetCStr()), &clearValue, nullptr);
+
+            previousFrameImageAttachment->m_path = m_previousFrameImageAttachment->GetAttachmentId();
+            previousFrameImageAttachment->m_importedResource = m_previousFrameImageAttachment;
+        }
+
+    }   // namespace RPI
+}   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h
new file mode 100644
index 0000000000..b03418bbac
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <Atom/RPI.Public/Pass/Pass.h>
+#include <Atom/RPI.Public/Pass/FullscreenTrianglePass.h>
+#include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
+#include <Atom/RPI.Public/Shader/Shader.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        //! This pass traces screenspace reflections from the previous frame image.
+        class ReflectionScreenSpaceTracePass
+            : public RPI::FullscreenTrianglePass
+        {
+            AZ_RPI_PASS(DiffuseProbeGridDownsamplePass);
+
+        public:
+            AZ_RTTI(Render::ReflectionScreenSpaceTracePass, "{70FD45E9-8363-4AA1-A514-3C24AC975E53}", FullscreenTrianglePass);
+            AZ_CLASS_ALLOCATOR(Render::ReflectionScreenSpaceTracePass, SystemAllocator, 0);
+
+            //! Creates a new pass without a PassTemplate
+            static RPI::Ptr<ReflectionScreenSpaceTracePass> Create(const RPI::PassDescriptor& descriptor);
+
+            Data::Instance<RPI::AttachmentImage>& GetPreviousFrameImageAttachment() { return m_previousFrameImageAttachment; }
+
+        private:
+            explicit ReflectionScreenSpaceTracePass(const RPI::PassDescriptor& descriptor);
+
+            // Pass behavior overrides...
+            virtual void BuildInternal() override;
+
+            Data::Instance<RPI::AttachmentImage> m_previousFrameImageAttachment;
+        };
+    }   // namespace RPI
+}   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
index 70ccaa5702..c0cc93d7e0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
@@ -155,8 +155,9 @@ namespace AZ::Render
     {
         AZ_Assert(id.IsValid(), "Invalid ShadowId passed to ProjectedShadowFeatureProcessor::SetNormalShadowBias().");
 
-        ShadowProperty& shadowProperty = GetShadowPropertyFromShadowId(id);
-        shadowProperty.m_normalShadowBias = normalShadowBias;
+        ShadowData& shadowData = m_shadowData.GetElement<ShadowDataIndex>(id.GetIndex());
+        shadowData.m_normalShadowBias = normalShadowBias;
+        m_deviceBufferNeedsUpdate = true;
     }
 
     void ProjectedShadowFeatureProcessor::SetShadowmapMaxResolution(ShadowId id, ShadowmapSize size)
diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
index 8939f1845d..a892e77b7f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
@@ -68,7 +68,7 @@ namespace AZ::Render
             uint32_t m_filteringSampleCount = 0;
             AZStd::array<float, 2> m_unprojectConstants = { {0, 0} };
             float m_bias;
-            float m_normalShadowBias;
+            float m_normalShadowBias = 0;
             float m_esmExponent = 87.0f;
             float m_padding[3];
         };
@@ -79,7 +79,6 @@ namespace AZ::Render
             ProjectedShadowDescriptor m_desc;
             RPI::ViewPtr m_shadowmapView;
             float m_bias = 0.1f;
-            float m_normalShadowBias = 0.0f;
             ShadowId m_shadowId;
         };
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
index 4c379c4239..c135b017fa 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
@@ -95,13 +95,13 @@ namespace AZ
                         renderProxy.m_instance->m_model->WaitForUpload();
                     }
 
-                    //Note: we are creating pointers to the meshDataInstance cullpacket and lod packet here,
+                    //Note: we are creating pointers to the modelDataInstance cullpacket and lod packet here,
                     //and holding them until the skinnedMeshDispatchItems are dispatched. There is an assumption that the underlying
                     //data will not move during this phase.
-                    MeshDataInstance& meshDataInstance = **renderProxy.m_meshHandle;
-                    m_workgroup.m_cullPackets.push_back(&meshDataInstance.GetCullPacket());
-                    m_workgroup.m_drawListMask |= meshDataInstance.GetCullPacket().m_drawListMask;
-                    m_lodPackets.push_back(&meshDataInstance.GetLodPacket());
+                    ModelDataInstance& modelDataInstance = **renderProxy.m_meshHandle;
+                    m_workgroup.m_cullPackets.push_back(&modelDataInstance.GetCullPacket());
+                    m_workgroup.m_drawListMask |= modelDataInstance.GetCullPacket().m_drawListMask;
+                    m_lodPackets.push_back(&modelDataInstance.GetLodPacket());
                     m_potentiallyVisibleProxies.push_back(&renderProxy);
                 }
             }
@@ -187,8 +187,8 @@ namespace AZ
                     renderProxy.m_instance->m_model->WaitForUpload();
                 }
 
-                MeshDataInstance& meshDataInstance = **renderProxy.m_meshHandle;
-                const RPI::Cullable& cullable = meshDataInstance.GetCullable();
+                ModelDataInstance& modelDataInstance = **renderProxy.m_meshHandle;
+                const RPI::Cullable& cullable = modelDataInstance.GetCullable();
 
                 for (const RPI::ViewPtr& viewPtr : packet.m_views)
                 {
diff --git a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp
index 8bf518e277..87fb46a7c6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshOutputStreamManager.cpp
@@ -98,7 +98,12 @@ namespace AZ
             }
             m_needsInit = false;
 
-            const AZ::u64 sizeInMb = r_skinnedMeshInstanceMemoryPoolSize;
+            AZ::u64 sizeInMb{};
+            if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
+            {
+                console->GetCvarValue("r_skinnedMeshInstanceMemoryPoolSize", sizeInMb);
+            }
+
             m_sizeInBytes = sizeInMb * (1024u * 1024u);
 
             CalculateAlignment();
diff --git a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
index 3704c8ec0f..e2a99668eb 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
@@ -110,6 +110,11 @@ namespace AZ
                         ->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_displayName, "Display Name", "Identifier used for display and selection")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_iblDiffuseImageAsset, "IBL Diffuse Image Asset", "IBL diffuse image asset reference")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_iblSpecularImageAsset, "IBL Specular Image Asset", "IBL specular image asset reference")
+                        ->DataElement(AZ::Edit::UIHandlers::Slider, &LightingPreset::m_iblExposure, "IBL exposure", "IBL exposure")
+                            ->Attribute(AZ::Edit::Attributes::SoftMin, -5.0f)
+                            ->Attribute(AZ::Edit::Attributes::SoftMax, 5.0f)
+                            ->Attribute(AZ::Edit::Attributes::Min, -20.0f)
+                            ->Attribute(AZ::Edit::Attributes::Max, 20.0f)
                         ->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_skyboxImageAsset, "Skybox Image Asset", "Skybox image asset reference")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_alternateSkyboxImageAsset, "Skybox Image Asset (Alt)", "Alternate skybox image asset reference")
                         ->DataElement(AZ::Edit::UIHandlers::Slider, &LightingPreset::m_skyboxExposure, "Skybox Exposure", "Skybox exposure")
diff --git a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
index 63c2fc7150..d636fde2fe 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
@@ -29,7 +29,6 @@ namespace AZ
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_displayName, "Display Name", "Identifier used for display and selection")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_modelAsset, "Model Asset", "Model asset reference")
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_previewImageAsset, "Preview Image Asset", "Preview image asset reference")
                         ;
                 }
             }
diff --git a/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
index c684b3cc89..ce8a1680a9 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
@@ -24,10 +24,9 @@ namespace AZ
             if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
                 serializeContext->Class<ModelPreset>()
-                    ->Version(3)
+                    ->Version(4)
                     ->Field("displayName", &ModelPreset::m_displayName)
                     ->Field("modelAsset", &ModelPreset::m_modelAsset)
-                    ->Field("previewImageAsset", &ModelPreset::m_previewImageAsset)
                     ;
             }
 
@@ -41,7 +40,6 @@ namespace AZ
                     ->Constructor<const ModelPreset&>()
                     ->Property("displayName", BehaviorValueProperty(&ModelPreset::m_displayName))
                     ->Property("modelAsset", BehaviorValueProperty(&ModelPreset::m_modelAsset))
-                    ->Property("previewImageAsset", BehaviorValueProperty(&ModelPreset::m_previewImageAsset))
                     ;
             }
         }
diff --git a/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp
index 6a13b9b774..88e67538c5 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp
@@ -8,156 +8,218 @@
 
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/Component/ComponentApplication.h>
-#include <Atom/Feature/Utils/MultiIndexedDataVector.h>
+#include <Atom/Feature/Utils/IndexedDataVector.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <gtest/gtest.h>
 
-
 namespace UnitTest
 {
     using namespace AZ;
     using namespace AZ::Render;
-
+    
     class IndexedDataVectorTests
-        : public ::testing::Test
+        : public UnitTest::AllocatorsTestFixture
     {
     public:
         void SetUp() override
         {
-            CreateAllocator();
+            UnitTest::AllocatorsTestFixture::SetUp();
         }
 
         void TearDown() override
         {
-            DestroyAllocator();
+            UnitTest::AllocatorsTestFixture::TearDown();
         }
 
-    private:
-
-        void CreateAllocator()
+        template<typename T>
+        IndexedDataVector<T> SetupIndexedDataVector(size_t size, T initialValue = T(0), T incrementAmount = T(1), AZStd::vector<uint16_t>* indices = nullptr)
         {
-            static constexpr size_t NumMBToAllocate = 1;
-            SystemAllocator::Descriptor desc;
-            desc.m_heap.m_numFixedMemoryBlocks = 1;
-            desc.m_heap.m_fixedMemoryBlocksByteSize[0] = NumMBToAllocate * 1024 * 1024;
-            m_memBlock = AZ_OS_MALLOC(
-                desc.m_heap.m_fixedMemoryBlocksByteSize[0],
-                desc.m_heap.m_memoryBlockAlignment);
-            desc.m_heap.m_fixedMemoryBlocks[0] = m_memBlock;
-
-            AllocatorInstance<AZ::SystemAllocator>::Create(desc);
+            IndexedDataVector<T> data;
+            T value = initialValue;
+            for (size_t i = 0; i < size; ++i)
+            {
+                uint16_t index = data.GetFreeSlotIndex();
+                EXPECT_NE(index, IndexedDataVector<int>::NoFreeSlot);
+                if (indices)
+                {
+                    indices->push_back(index);
+                }
+                if (index != IndexedDataVector<int>::NoFreeSlot)
+                {
+                    data.GetData(index) = value;
+                    value += incrementAmount;
+                }
+            }
+            return data;
         }
 
-        void DestroyAllocator()
+        template<typename T>
+        void ShuffleIndexedDataVector(IndexedDataVector<T>& dataVector, AZStd::vector<uint16_t>& indices)
         {
-            AllocatorInstance<AZ::SystemAllocator>::Destroy();
-            AZ_OS_FREE(m_memBlock);
-            m_memBlock = nullptr;
+            AZStd::vector<T> values;
+
+            // remove every other element and store it
+            for (size_t i = 0; i < indices.size(); ++i)
+            {
+                values.push_back(dataVector.GetData(indices.at(i)));
+                dataVector.RemoveIndex(indices.at(i));
+                indices.erase(&indices.at(i));
+            }
+
+            for (T value : values)
+            {
+                uint16_t index = dataVector.GetFreeSlotIndex();
+                indices.push_back(index);
+                dataVector.GetData(index) = value;
+            }
         }
 
-        void* m_memBlock = nullptr;
     };
-
-    TEST_F(IndexedDataVectorTests, TestInsert)
+    
+    TEST_F(IndexedDataVectorTests, Construction)
     {
-        MultiIndexedDataVector<int, double> myVec;
-        constexpr int NumToInsert = 5;
+        IndexedDataVector<int> testVector;
+        uint16_t index = testVector.GetFreeSlotIndex();
+        EXPECT_NE(index, IndexedDataVector<int>::NoFreeSlot);
+    }
+    
+    TEST_F(IndexedDataVectorTests, TestInsertGetBasic)
+    {
+        constexpr size_t count = 16;
+        constexpr int initialValue = 0;
+        constexpr int increment = 1;
 
         AZStd::vector<uint16_t> indices;
-
-        for (int i = 0; i < NumToInsert; ++i)
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count, initialValue, increment, &indices);
+        
+        int value = initialValue;
+        for (size_t i = 0; i < count; ++i)
         {
-            auto index = myVec.GetFreeSlotIndex();
-            indices.push_back(index);
-            myVec.GetData<0>(index) = i;
-            myVec.GetData<1>(index) = (double)i;
+            EXPECT_EQ(testVector.GetData(indices.at(i)), value);
+            value += increment;
+        }
+    }
+    
+    TEST_F(IndexedDataVectorTests, TestInsertGetComplex)
+    {
+        constexpr size_t count = 16;
+        constexpr int initialValue = 0;
+        constexpr int increment = 1;
+
+        AZStd::vector<uint16_t> indices;
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count, initialValue, increment, &indices);
+
+        // Create a set of the data that should be in the IndexedDataVector
+        AZStd::set<int> values;
+        for (int i = 0; i < count; ++i)
+        {
+            values.emplace(initialValue + i * increment);
         }
 
-        for (size_t i = 0; i < NumToInsert; ++i)
+        // Add and remove items to shuffle the underlying data
+        ShuffleIndexedDataVector(testVector, indices);
+
+        // Check to make sure all the data is still there
+        AZStd::vector<int>& underlyingVector = testVector.GetDataVector();
+        for (size_t i = 0; i < underlyingVector.size(); ++i)
         {
-            auto index = indices[i];
-            EXPECT_EQ(i, myVec.GetData<0>(index));
-            EXPECT_EQ((double)i, myVec.GetData<1>(index));
+            EXPECT_TRUE(values.contains(underlyingVector.at(i)));
         }
     }
 
     TEST_F(IndexedDataVectorTests, TestSize)
     {
-        MultiIndexedDataVector<int> myVec;
-        constexpr int NumToInsert = 5;
-        for (int i = 0; i < NumToInsert; ++i)
-        {
-            auto index = myVec.GetFreeSlotIndex();
-            myVec.GetData<0>(index) = i;
-        }
-        EXPECT_EQ(NumToInsert, myVec.GetDataCount());
-        EXPECT_EQ(NumToInsert, myVec.GetDataVector<0>().size());
+        constexpr size_t count = 32;
 
-        myVec.Clear();
-
-        EXPECT_EQ(0, myVec.GetDataCount());
-        EXPECT_EQ(0, myVec.GetDataVector<0>().size());
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count);
+        EXPECT_EQ(testVector.GetDataCount(), count);
     }
 
-    TEST_F(IndexedDataVectorTests, TestErase)
+    TEST_F(IndexedDataVectorTests, TestClear)
     {
-        MultiIndexedDataVector<int> myVec;
-        constexpr int NumToInsert = 200;
-        AZStd::unordered_map<int, uint16_t> valueToIndex;
-
-        for (int i = 0; i < NumToInsert; ++i)
-        {
-            auto index = myVec.GetFreeSlotIndex();
-            valueToIndex[i] = index;
-            myVec.GetData<0>(index) = i;
-        }
-
-        // erase every even number
-        for (int i = 0; i < NumToInsert; i += 2)
-        {
-            uint16_t index = valueToIndex[i];
-            auto previousRawIndex = myVec.GetRawIndex(index);
-            auto movedIndex = myVec.RemoveIndex(index);
-            if (movedIndex != MultiIndexedDataVector<int>::NoFreeSlot)
-            {
-                auto newRawIndex = myVec.GetRawIndex(movedIndex);
-
-                // RemoveIndex() returns the index of the item that moves into its spot if any, so check
-                // to make sure the Raw index of the old matches the raw index of the new
-                EXPECT_EQ(previousRawIndex, newRawIndex);
-            }
-            valueToIndex.erase(i);
-        }
-
-        for (const auto& iter : valueToIndex)
-        {
-            int val = iter.first;
-            uint16_t index = iter.second;
-            EXPECT_EQ(val, myVec.GetData<0>(index));
-        }
+        constexpr size_t count = 32;
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count);
+        testVector.Clear();
+        EXPECT_EQ(testVector.GetDataCount(), 0);
     }
 
-    TEST_F(IndexedDataVectorTests, TestManyTypes)
+    TEST_F(IndexedDataVectorTests, TestRemove)
     {
-        MultiIndexedDataVector<int, AZStd::string, double, float, const char*> myVec;
-        auto index = myVec.GetFreeSlotIndex();
+        constexpr size_t count = 8;
+        constexpr int initialValue = 0;
+        constexpr int increment = 8;
 
-        constexpr int TestIntVal = INT_MIN;
-        constexpr double TestDoubleVal = -DBL_MIN;
-        const AZStd::string TestStringVal = "This is an AZStd::string.";
-        constexpr float TestFloatVal = FLT_MAX;
-        const char* TestConstPointerVal = "This is a C array.";
+        AZStd::vector<uint16_t> indices;
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count, initialValue, increment, &indices);
 
-        myVec.GetData<0>(index) = TestIntVal;
-        myVec.GetData<1>(index) = TestStringVal;
-        myVec.GetData<2>(index) = TestDoubleVal;
-        myVec.GetData<3>(index) = TestFloatVal;
-        myVec.GetData<4>(index) = TestConstPointerVal;
+        // Remove every other element by index
+        for (uint16_t i = 0; i < count; i += 2)
+        {
+            testVector.RemoveIndex(i);
+        }
+        
+        EXPECT_EQ(testVector.GetDataCount(), count / 2);
+
+        // Make sure the rest of the data is still there
+        AZStd::vector<uint16_t> remainingIndices;
+        for (size_t i = 1; i < count; i += 2)
+        {
+            int value = testVector.GetData(indices.at(i));
+            EXPECT_EQ(value, initialValue + increment * i);
+            remainingIndices.push_back(indices.at(i));
+        }
+
+        // remove the rest of the valus by value
+        for (uint16_t index : remainingIndices)
+        {
+            int* valuePtr = &testVector.GetData(index);
+            testVector.RemoveData(valuePtr);
+        }
+
+        EXPECT_EQ(testVector.GetDataCount(), 0);
+    }
+
+    TEST_F(IndexedDataVectorTests, TestIndexForData)
+    {
+        constexpr size_t count = 8;
+        constexpr int initialValue = 0;
+        constexpr int increment = 8;
+
+        AZStd::vector<uint16_t> indices;
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count, initialValue, increment, &indices);
+        
+        // Add and remove items to shuffle the underlying data
+        ShuffleIndexedDataVector(testVector, indices);
+        
+        AZStd::vector<int>& underlyingVector = testVector.GetDataVector();
+        for (size_t i = 0; i < underlyingVector.size(); ++i)
+        {
+            int value = underlyingVector.at(i);
+            uint16_t index = testVector.GetIndexForData(&underlyingVector.at(i));
+
+            // The data from GetData(index) should match for the index retrieved using GetIndexForData() for the same data.
+            EXPECT_EQ(testVector.GetData(index), value);
+        }
+    }
+    
+    TEST_F(IndexedDataVectorTests, TestRawIndex)
+    {
+        constexpr size_t count = 8;
+        constexpr int initialValue = 0;
+        constexpr int increment = 8;
+
+        AZStd::vector<uint16_t> indices;
+        IndexedDataVector<int> testVector = SetupIndexedDataVector<int>(count, initialValue, increment, &indices);
+
+        // Add and remove items to shuffle the underlying data
+        ShuffleIndexedDataVector(testVector, indices);
+        
+        AZStd::vector<int>& underlyingVector = testVector.GetDataVector();
+        for (size_t i = 0; i < indices.size(); ++i)
+        {
+            // Check that the data retrieved from GetData for a given index matches the data in the underlying vector for the raw index.
+            EXPECT_EQ(testVector.GetData(indices.at(i)), underlyingVector.at(testVector.GetRawIndex(indices.at(i))));
+        }
 
-        EXPECT_EQ(TestIntVal, static_cast<int>(myVec.GetData<0>(index)));
-        EXPECT_EQ(TestStringVal, static_cast<AZStd::string>(myVec.GetData<1>(index)));
-        EXPECT_EQ(TestDoubleVal, static_cast<double>(myVec.GetData<2>(index)));
-        EXPECT_EQ(TestFloatVal, static_cast<float>(myVec.GetData<3>(index)));
-        EXPECT_STREQ(TestConstPointerVal, static_cast<const char*>(myVec.GetData<4>(index)));
     }
 }
diff --git a/Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp
new file mode 100644
index 0000000000..5a317c41aa
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include <Atom/Feature/Utils/MultiIndexedDataVector.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <gtest/gtest.h>
+
+
+namespace UnitTest
+{
+    using namespace AZ;
+    using namespace AZ::Render;
+
+    class MultiIndexedDataVectorTests
+        : public UnitTest::AllocatorsTestFixture
+    {
+    public:
+        void SetUp() override
+        {
+            UnitTest::AllocatorsTestFixture::SetUp();
+        }
+
+        void TearDown() override
+        {
+            UnitTest::AllocatorsTestFixture::TearDown();
+        }
+    };
+
+    TEST_F(MultiIndexedDataVectorTests, TestInsert)
+    {
+        enum Types
+        {
+            IntType = 0,
+            DoubleType = 1,
+        };
+
+        MultiIndexedDataVector<int, double> myVec;
+        constexpr int NumToInsert = 5;
+
+        AZStd::vector<uint16_t> indices;
+
+        for (int i = 0; i < NumToInsert; ++i)
+        {
+            auto index = myVec.GetFreeSlotIndex();
+            indices.push_back(index);
+            myVec.GetData<IntType>(index) = i;
+            myVec.GetData<DoubleType>(index) = (double)i;
+        }
+
+        for (size_t i = 0; i < NumToInsert; ++i)
+        {
+            auto index = indices[i];
+            EXPECT_EQ(i, myVec.GetData<IntType>(index));
+            EXPECT_EQ((double)i, myVec.GetData<DoubleType>(index));
+        }
+    }
+
+    TEST_F(MultiIndexedDataVectorTests, TestSize)
+    {
+        enum Types
+        {
+            IntType = 0,
+        };
+
+        MultiIndexedDataVector<int> myVec;
+        constexpr int NumToInsert = 5;
+        for (int i = 0; i < NumToInsert; ++i)
+        {
+            auto index = myVec.GetFreeSlotIndex();
+            myVec.GetData<IntType>(index) = i;
+        }
+        EXPECT_EQ(NumToInsert, myVec.GetDataCount());
+        EXPECT_EQ(NumToInsert, myVec.GetDataVector<IntType>().size());
+
+        myVec.Clear();
+
+        EXPECT_EQ(0, myVec.GetDataCount());
+        EXPECT_EQ(0, myVec.GetDataVector<IntType>().size());
+    }
+
+    TEST_F(MultiIndexedDataVectorTests, TestErase)
+    {
+        enum Types
+        {
+            IntType = 0,
+        };
+
+        MultiIndexedDataVector<int> myVec;
+        constexpr int NumToInsert = 200;
+        AZStd::unordered_map<int, uint16_t> valueToIndex;
+
+        for (int i = 0; i < NumToInsert; ++i)
+        {
+            auto index = myVec.GetFreeSlotIndex();
+            valueToIndex[i] = index;
+            myVec.GetData<IntType>(index) = i;
+        }
+
+        // erase every even number
+        for (int i = 0; i < NumToInsert; i += 2)
+        {
+            uint16_t index = valueToIndex[i];
+            auto previousRawIndex = myVec.GetRawIndex(index);
+            auto movedIndex = myVec.RemoveIndex(index);
+            if (movedIndex != MultiIndexedDataVector<int>::NoFreeSlot)
+            {
+                auto newRawIndex = myVec.GetRawIndex(movedIndex);
+
+                // RemoveIndex() returns the index of the item that moves into its spot if any, so check
+                // to make sure the Raw index of the old matches the raw index of the new
+                EXPECT_EQ(previousRawIndex, newRawIndex);
+            }
+            valueToIndex.erase(i);
+        }
+
+        for (const auto& iter : valueToIndex)
+        {
+            int val = iter.first;
+            uint16_t index = iter.second;
+            EXPECT_EQ(val, myVec.GetData<IntType>(index));
+        }
+    }
+
+    TEST_F(MultiIndexedDataVectorTests, TestManyTypes)
+    {
+        enum Types
+        {
+            IntType = 0,
+            StringType = 1,
+            DoubleType = 2,
+            FloatType = 3,
+            CharType = 4,
+        };
+
+        MultiIndexedDataVector<int, AZStd::string, double, float, const char*> myVec;
+        auto index = myVec.GetFreeSlotIndex();
+
+        constexpr int TestIntVal = INT_MIN;
+        constexpr double TestDoubleVal = -DBL_MIN;
+        const AZStd::string TestStringVal = "This is an AZStd::string.";
+        constexpr float TestFloatVal = FLT_MAX;
+        const char* TestConstPointerVal = "This is a C array.";
+
+        myVec.GetData<IntType>(index) = TestIntVal;
+        myVec.GetData<StringType>(index) = TestStringVal;
+        myVec.GetData<DoubleType>(index) = TestDoubleVal;
+        myVec.GetData<FloatType>(index) = TestFloatVal;
+        myVec.GetData<CharType>(index) = TestConstPointerVal;
+
+        EXPECT_EQ(TestIntVal, static_cast<int>(myVec.GetData<IntType>(index)));
+        EXPECT_EQ(TestStringVal, static_cast<AZStd::string>(myVec.GetData<StringType>(index)));
+        EXPECT_EQ(TestDoubleVal, static_cast<double>(myVec.GetData<DoubleType>(index)));
+        EXPECT_EQ(TestFloatVal, static_cast<float>(myVec.GetData<FloatType>(index)));
+        EXPECT_STREQ(TestConstPointerVal, static_cast<const char*>(myVec.GetData<CharType>(index)));
+    }
+
+    MultiIndexedDataVector<int32_t, float> CreateTestVector(AZStd::vector<uint16_t>& indices)
+    {
+        enum Types
+        {
+            IntType = 0,
+            FloatType = 1,
+        };
+
+        MultiIndexedDataVector<int32_t, float> myVec;
+        constexpr int32_t Count = 10;
+        int32_t startInt = 10;
+        float startFloat = 2.0f;
+        
+        // Create some initial values
+        for (uint32_t i = 0; i < Count; ++i)
+        {
+            uint16_t index = myVec.GetFreeSlotIndex();
+            indices.push_back(index);
+            myVec.GetData<IntType>(index) = startInt;
+            myVec.GetData<FloatType>(index) = startFloat;
+            startInt += 1;
+            startFloat += 1.0f;
+        }
+
+        return myVec;
+    }
+    
+    void CheckIndexedData(MultiIndexedDataVector<int32_t, float>& data, AZStd::vector<uint16_t>& indices)
+    {
+        enum Types
+        {
+            IntType = 0,
+            FloatType = 1,
+        };
+
+        // For each index, get its data and make sure GetIndexForData returns the same
+        // index used to retrieve the data
+        for (uint32_t i = 0; i < data.GetDataCount(); ++i)
+        {
+            int32_t& intData = data.GetData<IntType>(indices.at(i));
+            uint16_t indexForData = data.GetIndexForData<IntType>(&intData);
+            EXPECT_EQ(indices.at(i), indexForData);
+                
+            float& floatData = data.GetData<FloatType>(indices.at(i));
+            indexForData = data.GetIndexForData<FloatType>(&floatData);
+            EXPECT_EQ(indices.at(i), indexForData);
+        }
+    }
+
+    TEST_F(MultiIndexedDataVectorTests, GetIndexForDataSimple)
+    {
+        AZStd::vector<uint16_t> indices;
+        MultiIndexedDataVector<int32_t, float> myVec = CreateTestVector(indices);
+        CheckIndexedData(myVec, indices);
+    }
+
+    TEST_F(MultiIndexedDataVectorTests, GetIndexForDataComplex)
+    {
+        enum Types
+        {
+            IntType = 0,
+            FloatType = 1,
+        };
+
+        AZStd::vector<uint16_t> indices;
+        MultiIndexedDataVector<int32_t, float> myVec = CreateTestVector(indices);
+
+        // remove every other value to shuffle the data around
+        for (uint32_t i = 0; i < myVec.GetDataCount(); i += 2)
+        {
+            myVec.RemoveIndex(indices.at(i));
+        }
+        
+        int32_t startInt = 100;
+        float startFloat = 20.0f;
+
+        // Add some data back in
+        const size_t count = myVec.GetDataCount();
+        for (uint32_t i = 0; i < count; i += 2)
+        {
+            uint16_t index = myVec.GetFreeSlotIndex();
+            indices.at(i) = index;
+            myVec.GetData<IntType>(index) = startInt;
+            myVec.GetData<FloatType>(index) = startFloat;
+            startInt += 1;
+            startFloat += 1.0f;
+        }
+
+        CheckIndexedData(myVec, indices);
+    }
+
+    TEST_F(MultiIndexedDataVectorTests, ForEach)
+    {
+        enum Types
+        {
+            IntType = 0,
+            FloatType = 1,
+        };
+
+        MultiIndexedDataVector<int32_t, float> myVec;
+        constexpr int32_t Count = 10;
+        int32_t startInt = 10;
+        float startFloat = 2.0f;
+
+        AZStd::vector<uint16_t> indices;
+        AZStd::set<int32_t> intValues;
+        AZStd::set<float> floatValues;
+
+        // Create some initial values
+        for (uint32_t i = 0; i < Count; ++i)
+        {
+            uint16_t index = myVec.GetFreeSlotIndex();
+            indices.push_back(index);
+            myVec.GetData<IntType>(index) = startInt;
+            myVec.GetData<FloatType>(index) = startFloat;
+            intValues.insert(startInt);
+            floatValues.insert(startFloat);
+            startInt += 1;
+            startFloat += 1.0f;
+        }
+
+        uint32_t visitCount = 0;
+        myVec.ForEach<IntType>([&](int32_t value) -> bool
+        {
+            intValues.erase(value);
+            ++visitCount;
+            return true; // keep iterating
+        });
+
+        // All ints should have been visited and found in the set
+        EXPECT_EQ(visitCount, Count);
+        EXPECT_EQ(intValues.size(), 0);
+
+        visitCount = 0;
+        myVec.ForEach<FloatType>([&](float value) -> bool
+        {
+            floatValues.erase(value);
+            ++visitCount;
+            return true; // keep iterating
+        });
+        
+        // All floats should have been visited and found in the set
+        EXPECT_EQ(visitCount, Count);
+        EXPECT_EQ(floatValues.size(), 0);
+        
+        visitCount = 0;
+        myVec.ForEach<IntType>([&]([[maybe_unused]] int32_t value) -> bool
+        {
+            ++visitCount;
+            return false; // stop iterating
+        });
+
+        // Since false is immediately returned, only one element should have been visited.
+        EXPECT_EQ(visitCount, 1);
+
+    }
+}
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 184460b210..3ed2ec8755 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
@@ -275,6 +275,8 @@ set(FILES
     Source/RayTracing/RayTracingPassData.h
     Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
     Source/ReflectionProbe/ReflectionProbe.cpp
+    Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp
+    Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h
     Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
     Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h
     Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.cpp
diff --git a/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake
index 1d94a2ae9e..99f3cf8e1a 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake
@@ -11,6 +11,7 @@ set(FILES
     Tests/CommonTest.cpp
     Tests/CoreLights/ShadowmapAtlasTest.cpp
     Tests/IndexedDataVectorTests.cpp
+    Tests/MultiIndexedDataVectorTests.cpp
     Tests/IndexableListTests.cpp
     Tests/SparseVectorTests.cpp
     Tests/SkinnedMesh/SkinnedMeshDispatchItemTests.cpp
diff --git a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py
index d500d6e09c..7e244dcfb2 100644
--- a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py
+++ b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py
@@ -163,6 +163,7 @@ _LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
 # -------------------------------------------------------------------------
 
 
+# -------------------------------------------------------------------------
 def get_datadir() -> pathlib.Path:
     """
     persistent application data.
diff --git a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapperpassthrough.py b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapper.py
similarity index 65%
rename from Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapperpassthrough.py
rename to Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapper.py
index 76cdd8450a..bfcdf4c79e 100644
--- a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapperpassthrough.py
+++ b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapper.py
@@ -10,9 +10,7 @@
 """Frame capture of the Displaymapper Passthrough (outputs .dds image)"""
 # ------------------------------------------------------------------------
 import logging as _logging
-from env_bool import env_bool
 
-# ------------------------------------------------------------------------
 _MODULENAME = 'ColorGrading.capture_displaymapperpassthrough'
 
 import ColorGrading.initialize
@@ -27,25 +25,35 @@ _LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
 import azlmbr.bus
 import azlmbr.atom
 
-default_passtree = ["Root",
+# This requires the level to have the DisplayMapper component added
+# and configured to 'Passthrough'
+# but now we can capture the parent input 
+# so this is here for reference for how it previously worked
+passtree_displaymapperpassthrough = ["Root",
+                                     "MainPipeline_0",
+                                     "MainPipeline",
+                                     "PostProcessPass",
+                                     "LightAdaptation",
+                                     "DisplayMapperPass",
+                                     "DisplayMapperPassthrough"]
+
+# we can grad the parent pass input to the displaymapper directly
+passtree_default = ["Root",
                     "MainPipeline_0",
                     "MainPipeline",
                     "PostProcessPass",
                     "LightAdaptation",
-                    "DisplayMapperPass",
-                    "DisplayMapperPassthrough"]
+                    "DisplayMapperPass"]
 
-default_path = "FrameCapture\DisplayMapperPassthrough.dds"
-
-# To Do: we should try to set display mapper to passthrough,
-# then back after capture?
+default_path = "FrameCapture\DisplayMappeInput.dds"
 
 # To Do: we can wrap this, to call from a PySide2 GUI
 
 def capture(command="CapturePassAttachment",
-            passtree=default_passtree,
-            pass_type="Output",
+            passtree=passtree_default,
+            pass_type="Input",
             output_path=default_path):
+    """Writes frame capture into project cache"""
     azlmbr.atom.FrameCaptureRequestBus(azlmbr.bus.Broadcast,
                                        command,
                                        passtree,
diff --git a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py
index ac64ade322..24fcd08f02 100644
--- a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py
+++ b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py
@@ -32,10 +32,7 @@ if DCCSI_GDEBUG:
     DCCSI_LOGLEVEL = int(10)
 
 # set up logger with both console and file _logging
-if DCCSI_GDEBUG:
-    _LOGGER = initialize_logger(_PACKAGENAME, log_to_file=True, default_log_level=DCCSI_LOGLEVEL)
-else:
-    _LOGGER = initialize_logger(_PACKAGENAME, log_to_file=False, default_log_level=DCCSI_LOGLEVEL)
+_LOGGER = initialize_logger(_PACKAGENAME, log_to_file=DCCSI_GDEBUG, default_log_level=DCCSI_LOGLEVEL)
         
 _LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
 
@@ -46,7 +43,7 @@ if DCCSI_DEV_MODE:
     APPDATA = get_datadir()  # os APPDATA
     APPDATA_WING = Path(APPDATA, f"Wing Pro {DCCSI_WING_VERSION_MAJOR}").resolve()
     if APPDATA_WING.exists():
-        site.addsitedir(pathlib.PureWindowsPath(APPDATA_WING).as_posix())
+        site.addsitedir(APPDATA_WING.resolve())
         import wingdbstub as debugger
         try:
             debugger.Ensure()
@@ -75,8 +72,7 @@ def start():
 
         try:
             _O3DE_DEV = Path(os.getenv('O3DE_DEV'))
-            _O3DE_DEV = _O3DE_DEV.resolve()
-            os.environ['O3DE_DEV'] = pathlib.PureWindowsPath(_O3DE_DEV).as_posix()
+            os.environ['O3DE_DEV'] = _O3DE_DEV.as_posix()
             _LOGGER.debug(f'O3DE_DEV is: {_O3DE_DEV}')
         except EnvironmentError as e:
             _LOGGER.error('O3DE engineroot not set or found')
@@ -86,23 +82,22 @@ def start():
             _TAG_LY_BUILD_PATH = os.getenv('TAG_LY_BUILD_PATH', 'build')
             _DEFAULT_BIN_PATH = Path(str(_O3DE_DEV), _TAG_LY_BUILD_PATH, 'bin', 'profile')
             _O3DE_BIN_PATH = Path(os.getenv('O3DE_BIN_PATH', _DEFAULT_BIN_PATH))
-            _O3DE_BIN_PATH = _O3DE_BIN_PATH.resolve()
-            os.environ['O3DE_BIN_PATH'] = pathlib.PureWindowsPath(_O3DE_BIN_PATH).as_posix()
+            os.environ['O3DE_BIN_PATH'] = _O3DE_BIN_PATH.as_posix()
             _LOGGER.debug(f'O3DE_BIN_PATH is: {_O3DE_BIN_PATH}')
-            site.addsitedir(pathlib.PureWindowsPath(_O3DE_BIN_PATH).as_posix())
+            site.addsitedir(_O3DE_BIN_PATH.resolve())
         except EnvironmentError as e:
             _LOGGER.error('O3DE bin folder not set or found')
             raise e
         
         if running_editor:
             _O3DE_DEV = Path(os.getenv('O3DE_DEV', Path(azlmbr.paths.engroot)))
-            os.environ['O3DE_DEV'] = pathlib.PureWindowsPath(_O3DE_DEV).as_posix()
+            os.environ['O3DE_DEV'] = _O3DE_DEV.as_posix()
             _LOGGER.debug(_O3DE_DEV)
         
             _O3DE_BIN_PATH = Path(str(_O3DE_DEV),Path(azlmbr.paths.executableFolder))
         
             _O3DE_BIN = Path(os.getenv('O3DE_BIN', _O3DE_BIN_PATH.resolve()))
-            os.environ['O3DE_BIN'] = pathlib.PureWindowsPath(_O3DE_BIN).as_posix()
+            os.environ['O3DE_BIN'] = _O3DE_BIN_PATH.as_posix()
         
             _LOGGER.debug(_O3DE_BIN)
         
diff --git a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat
index 56021c0801..89dd86be80 100644
--- a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat
+++ b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat
@@ -34,15 +34,15 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 IF EXIST "%~dp0User_Env.bat" CALL %~dp0User_Env.bat
 
 :: Initialize env
-echo 
+echo.
 echo     ... calling Env_Core.bat
 CALL %~dp0\Env_Core.bat
 
-echo 
+echo.
 echo     ... calling Env_Python.bat
 CALL %~dp0\Env_Python.bat
 
-echo 
+echo.
 echo     ... calling Env_Tools.bat
 CALL %~dp0\Env_Tools.bat
 
diff --git a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat
index fc4afc964e..ffb34b06e5 100644
--- a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat
+++ b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat
@@ -27,37 +27,19 @@ echo ~    O3DE Color Grading Python Env ...
 echo _____________________________________________________________________
 echo.
 
-:: Python Version
-:: Ideally these are set to match the O3DE python distribution
-:: <O3DE>\python\runtime
-IF "%DCCSI_PY_VERSION_MAJOR%"=="" (set DCCSI_PY_VERSION_MAJOR=3)
-echo     DCCSI_PY_VERSION_MAJOR = %DCCSI_PY_VERSION_MAJOR%
-
-:: PY version Major
-IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=7)
-echo     DCCSI_PY_VERSION_MINOR = %DCCSI_PY_VERSION_MINOR%
-
-IF "%DCCSI_PY_VERSION_RELEASE%"=="" (set DCCSI_PY_VERSION_RELEASE=10)
-echo     DCCSI_PY_VERSION_RELEASE = %DCCSI_PY_VERSION_RELEASE%
-
-:: shared location for 64bit python 3.7 DEV location
-:: this defines a DCCsi sandbox for lib site-packages by version
-:: <O3DE>\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib
-set DCCSI_PYTHON_PATH=%DCCSIG_PATH%\3rdParty\Python
-echo     DCCSI_PYTHON_PATH = %DCCSI_PYTHON_PATH%
-
-:: add access to a Lib location that matches the py version (example: 3.7.x)
-:: switch this for other python versions like maya (2.7.x)
-IF "%DCCSI_PYTHON_LIB_PATH%"=="" (set DCCSI_PYTHON_LIB_PATH=%DCCSI_PYTHON_PATH%\Lib\%DCCSI_PY_VERSION_MAJOR%.x\%DCCSI_PY_VERSION_MAJOR%.%DCCSI_PY_VERSION_MINOR%.x\site-packages)
-echo     DCCSI_PYTHON_LIB_PATH = %DCCSI_PYTHON_LIB_PATH%
-
-:: add to the PATH
-SET PATH=%DCCSI_PYTHON_LIB_PATH%;%PATH%
-
 :: shared location for default O3DE python location
 set DCCSI_PYTHON_INSTALL=%O3DE_DEV%\Python
 echo     DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL%
 
+:: Warning, many DCC tools (like Maya) include thier own versioned python interpretter.
+:: Some apps may not operate correctly if PYTHONHOME is set/propogated.
+:: This is definitely the case with Maya, doing so causes Maya to not boot.
+FOR /F "tokens=* USEBACKQ" %%F IN (`%DCCSI_PYTHON_INSTALL%\python.cmd %DCCSI_PYTHON_INSTALL%\get_python_path.py`) DO (SET PYTHONHOME=%%F)
+echo     PYTHONHOME - is now the folder containing O3DE python executable
+echo     PYTHONHOME = %PYTHONHOME% 
+
+SET PYTHON=%PYTHONHOME%\python.exe
+
 :: location for O3DE python 3.7 location 
 set DCCSI_PY_BASE=%DCCSI_PYTHON_INSTALL%\python.cmd
 echo     DCCSI_PY_BASE = %DCCSI_PY_BASE%
@@ -65,10 +47,7 @@ echo     DCCSI_PY_BASE = %DCCSI_PY_BASE%
 :: ide and debugger plug
 set DCCSI_PY_DEFAULT=%DCCSI_PY_BASE%
 
-IF "%DCCSI_PY_REV%"=="" (set DCCSI_PY_REV=rev2)
-IF "%DCCSI_PY_PLATFORM%"=="" (set DCCSI_PY_PLATFORM=windows)
-
-set DCCSI_PY_IDE=%DCCSI_PYTHON_INSTALL%\runtime\python-%DCCSI_PY_VERSION_MAJOR%.%DCCSI_PY_VERSION_MINOR%.%DCCSI_PY_VERSION_RELEASE%-%DCCSI_PY_REV%-%DCCSI_PY_PLATFORM%\python
+set DCCSI_PY_IDE=%PYTHONHOME%
 echo     DCCSI_PY_IDE = %DCCSI_PY_IDE%
 
 :: Wing and other IDEs probably prefer access directly to the python.exe
@@ -91,11 +70,6 @@ SET PATH=%DCCSI_PYTHON_INSTALL%;%DCCSI_PY_IDE%;%DCCSI_PY_IDE_PACKAGES%;%DCCSI_PY
 set PYTHONPATH=%DCCSIG_PATH%;%DCCSI_PYTHON_LIB_PATH%;%O3DE_BIN_PATH%;%DCCSI_COLORGRADING_SCRIPTS%;%DCCSI_FEATURECOMMON_SCRIPTS%;%PYTHONPATH%
 echo     PYTHONPATH = %PYTHONPATH%
 
-:: used for debugging in WingIDE (but needs to be here)
-IF "%TAG_USERNAME%"=="" (set TAG_USERNAME=NOT_SET)
-echo     TAG_USERNAME = %TAG_USERNAME%
-IF "%TAG_USERNAME%"=="NOT_SET" (echo        Add TAG_USERNAME to User_Env.bat)
-
 :: Set flag so we don't initialize dccsi environment twice
 SET O3DE_ENV_PY_INIT=1
 GOTO END_OF_FILE
diff --git a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template
index 973d6d5afd..7ab970c98e 100644
--- a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template
+++ b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template
@@ -25,11 +25,6 @@ SET TAG_LY_BUILD_PATH=build
 SET DCCSI_GDEBUG=True
 SET DCCSI_DEV_MODE=True
 
-:: set the your user name here for windows path
-SET TAG_USERNAME=NOT_SET
-SET DCCSI_PY_REV=rev1
-SET DCCSI_PY_PLATFORM=windows
-
 :: Set flag so we don't initialize dccsi environment twice
 SET O3DE_USER_ENV_INIT=1
 GOTO END_OF_FILE
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h
index 2985581040..4ae560c816 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/CommandQueue.h
@@ -72,6 +72,8 @@ namespace AZ
             AZStd::mutex m_workQueueMutex;
             AZStd::queue<Command> m_workQueue;
             AZStd::condition_variable m_workQueueCondition;
+            AZStd::mutex m_flushCommandsMutex;
+            AZStd::condition_variable m_flushCommandsCondition;
             AZStd::atomic_bool m_isWorkQueueEmpty;
             AZStd::atomic_bool m_isQuitting;
         };
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
index 71f9f1605b..1755d45a74 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
@@ -112,6 +112,9 @@ namespace AZ
             //! Returns true if Pix dll is loaded
             static bool IsPixModuleLoaded();
 
+            //! Returns true if Pix GPU events should be emitted
+            static bool PixGpuEventsEnabled();
+
             //! Returns true if Warp is enabled
             static bool UsingWarpDevice();
 
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h
index 97ac3baa90..abad1fb263 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/SwapChain.h
@@ -75,6 +75,9 @@ namespace AZ
             //! Return True if the swap chain prefers exclusive full screen mode and a transition happened, false otherwise.
             virtual bool SetExclusiveFullScreenState([[maybe_unused]]bool fullScreenState) { return false; }
 
+            //! Recreate the swapchain if it becomes invalid during presenting. This should happen at the end of the frame
+            //! due to images being used as attachments in the frame graph.
+            virtual void ProcessRecreation() {};
         protected:
             SwapChain();
 
@@ -98,6 +101,14 @@ namespace AZ
 
             //////////////////////////////////////////////////////////////////////////
 
+            //! Shutdown and clear all the images.
+            void ShutdownImages();
+
+            //! Initialized all the images.
+            ResultCode InitImages();
+
+            //! Flag indicating if swapchain recreation is needed at the end of the frame.
+            bool m_pendingRecreation = false;
         private:
 
             bool ValidateDescriptor(const SwapChainDescriptor& descriptor) const;
diff --git a/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
index a365b23e94..1cee382189 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
@@ -71,6 +71,7 @@ namespace AZ
             {
                 m_isQuitting = true;
                 m_workQueueCondition.notify_all();
+                m_flushCommandsCondition.notify_all();
                 if (m_thread.joinable())
                 {
                    m_thread.join();
@@ -102,9 +103,10 @@ namespace AZ
         void CommandQueue::FlushCommands()
         {
             AZ_PROFILE_SCOPE(RHI, "CommandQueue: FlushCommands");
-            while (!m_isWorkQueueEmpty && !m_isQuitting)
+            AZStd::unique_lock<AZStd::mutex> lock(m_flushCommandsMutex);
+            if (!m_isWorkQueueEmpty && !m_isQuitting)
             {
-                AZStd::this_thread::yield();
+                m_flushCommandsCondition.wait(lock, [this]() { return m_isWorkQueueEmpty.load() || m_isQuitting.load(); });
             }
         }
         
@@ -119,7 +121,11 @@ namespace AZ
                     
                     if (m_workQueue.empty())
                     {
-                        m_isWorkQueueEmpty = true;
+                        {
+                            AZStd::unique_lock<AZStd::mutex> flushCommandsLock(m_flushCommandsMutex);
+                            m_isWorkQueueEmpty = true;
+                            m_flushCommandsCondition.notify_all();
+                        }
                         m_workQueueCondition.wait(lock, [this]() { return !m_workQueue.empty() || m_isQuitting; });
                     }
                     
diff --git a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
index 82b0a13c86..9146175252 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
@@ -26,6 +26,7 @@ static bool s_isRenderDocDllLoaded = false;
 #if defined(USE_PIX)
 static AZStd::unique_ptr<AZ::DynamicModuleHandle> s_pixModule;
 static bool s_isPixGpuCaptureDllLoaded = false;
+static bool s_pixGpuMarkersEnabled = false;
 #endif
 
 static bool s_usingWarpDevice = false;
@@ -62,6 +63,7 @@ namespace AZ
 #if defined(USE_RENDERDOC)
             // If RenderDoc is requested, we need to load the library as early as possible (before device queries/factories are made)
             bool enableRenderDoc = RHI::QueryCommandLineOption("enableRenderDoc");
+            s_pixGpuMarkersEnabled = s_pixGpuMarkersEnabled || enableRenderDoc;
 
             if (enableRenderDoc && AZ_TRAIT_RENDERDOC_MODULE && !s_renderDocModule)
             {
@@ -119,6 +121,8 @@ namespace AZ
 
             //Pix dll can still be injected even if we do not pass in enablePixGPU. This can be done if we launch the app from Pix.
             s_isPixGpuCaptureDllLoaded = Platform::IsPixDllInjected(AZ_TRAIT_PIX_MODULE);
+
+            s_pixGpuMarkersEnabled = s_pixGpuMarkersEnabled || RHI::QueryCommandLineOption("enablePixGpuMarkers");
 #endif
         }
 
@@ -202,6 +206,15 @@ namespace AZ
 #endif
         }
 
+        bool Factory::PixGpuEventsEnabled()
+        {
+#if defined(USE_PIX)
+            return s_pixGpuMarkersEnabled;
+#else
+            return false;
+#endif
+        }
+
         bool Factory::UsingWarpDevice()
         {
             return s_usingWarpDevice;
diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp
index 6bac2b8c7d..388277ff59 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp
@@ -134,7 +134,6 @@ namespace AZ
             m_scopeAttachmentLookup.clear();
             m_imageAttachments.clear();
             m_bufferAttachments.clear();
-            m_swapChainAttachments.clear();
             m_importedImageAttachments.clear();
             m_importedBufferAttachments.clear();
             m_transientImageAttachments.clear();
@@ -153,6 +152,13 @@ namespace AZ
                 delete attachment;
             }
             m_attachments.clear();
+
+            for (auto swapchainAttachment : m_swapChainAttachments)
+            {
+                swapchainAttachment->GetSwapChain()->ProcessRecreation();
+            }
+
+            m_swapChainAttachments.clear();
         }
 
         ImageDescriptor FrameGraphAttachmentDatabase::GetImageDescriptor(const AttachmentId& attachmentId) const
diff --git a/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp
index ff1f0e69a6..074eedf1b6 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp
@@ -58,43 +58,68 @@ namespace AZ
                 // Overwrite descriptor dimensions with the native ones (the ones assigned by the platform) returned by InitInternal.
                 m_descriptor.m_dimensions = nativeDimensions;
 
-                m_images.reserve(m_descriptor.m_dimensions.m_imageCount);
+                resultCode = InitImages();
+            }
 
-                for (uint32_t imageIdx = 0; imageIdx < m_descriptor.m_dimensions.m_imageCount; ++imageIdx)
-                {
-                    m_images.emplace_back(RHI::Factory::Get().CreateImage());
-                }
+            return resultCode;
+        }
 
-                InitImageRequest request;
+        void SwapChain::ShutdownImages()
+        {
+            // Shutdown existing set of images.
+            uint32_t imageSize = aznumeric_cast<uint32_t>(m_images.size());
+            for (uint32_t imageIdx = 0; imageIdx < imageSize; ++imageIdx)
+            {
+                m_images[imageIdx]->Shutdown();
+            }
 
-                RHI::ImageDescriptor& imageDescriptor = request.m_descriptor;
-                imageDescriptor.m_dimension = RHI::ImageDimension::Image2D;
-                imageDescriptor.m_bindFlags = RHI::ImageBindFlags::Color;
-                imageDescriptor.m_size.m_width = m_descriptor.m_dimensions.m_imageWidth;
-                imageDescriptor.m_size.m_height = m_descriptor.m_dimensions.m_imageHeight;
-                imageDescriptor.m_format = m_descriptor.m_dimensions.m_imageFormat;
+            m_images.clear();
+        }
 
-                for (uint32_t imageIdx = 0; imageIdx < m_descriptor.m_dimensions.m_imageCount; ++imageIdx)
-                {
-                    request.m_image = m_images[imageIdx].get();
-                    request.m_imageIndex = imageIdx;
+        ResultCode SwapChain::InitImages()
+        {
+            ResultCode resultCode = ResultCode::Success;
 
-                    resultCode = ImagePoolBase::InitImage(
-                        request.m_image,
-                        imageDescriptor,
-                        [this, &request]()
+            m_images.reserve(m_descriptor.m_dimensions.m_imageCount);
+
+            // If the new display mode has more buffers, add them.
+            for (uint32_t i = 0; i < m_descriptor.m_dimensions.m_imageCount; ++i)
+            {
+                m_images.emplace_back(RHI::Factory::Get().CreateImage());
+            }
+
+            InitImageRequest request;
+
+            RHI::ImageDescriptor& imageDescriptor = request.m_descriptor;
+            imageDescriptor.m_dimension = RHI::ImageDimension::Image2D;
+            imageDescriptor.m_bindFlags = RHI::ImageBindFlags::Color;
+            imageDescriptor.m_size.m_width = m_descriptor.m_dimensions.m_imageWidth;
+            imageDescriptor.m_size.m_height = m_descriptor.m_dimensions.m_imageHeight;
+            imageDescriptor.m_format = m_descriptor.m_dimensions.m_imageFormat;
+
+            for (uint32_t imageIdx = 0; imageIdx < m_descriptor.m_dimensions.m_imageCount; ++imageIdx)
+            {
+                request.m_image = m_images[imageIdx].get();
+                request.m_imageIndex = imageIdx;
+
+                resultCode = ImagePoolBase::InitImage(
+                    request.m_image, imageDescriptor,
+                    [this, &request]()
                     {
                         return InitImageInternal(request);
                     });
 
-                    if (resultCode != ResultCode::Success)
-                    {
-                        Shutdown();
-                        break;
-                    }
+                if (resultCode != ResultCode::Success)
+                {
+                    AZ_Error("Swapchain", false, "Failed to initialize images.");
+                    Shutdown();
+                    break;
                 }
             }
 
+            // Reset the current index back to 0 so we match the platform swap chain.
+            m_currentImageIndex = 0;
+
             return resultCode;
         }
 
@@ -105,63 +130,15 @@ namespace AZ
         }
 
         ResultCode SwapChain::Resize(const RHI::SwapChainDimensions& dimensions)
-        {     
-            // Shutdown existing set of images.
-            for (uint32_t imageIdx = 0; imageIdx < GetImageCount(); ++imageIdx)
-            {
-                m_images[imageIdx]->Shutdown();
-            }
+        {
+            ShutdownImages();
 
             SwapChainDimensions nativeDimensions = dimensions;
             ResultCode resultCode = ResizeInternal(dimensions, &nativeDimensions);
             if (resultCode == ResultCode::Success)
             {
                 m_descriptor.m_dimensions = nativeDimensions;
-                m_images.reserve(m_descriptor.m_dimensions.m_imageCount);
-
-                // If the new display mode has more buffers, add them.
-                while (m_images.size() < static_cast<size_t>(m_descriptor.m_dimensions.m_imageCount))
-                {
-                    m_images.emplace_back(RHI::Factory::Get().CreateImage());
-                }
-
-                // If it has fewer, trim down.
-                while (m_images.size() > static_cast<size_t>(m_descriptor.m_dimensions.m_imageCount))
-                {
-                    m_images.pop_back();
-                }
-
-                InitImageRequest request;
-
-                RHI::ImageDescriptor& imageDescriptor = request.m_descriptor;
-                imageDescriptor.m_dimension = RHI::ImageDimension::Image2D;
-                imageDescriptor.m_bindFlags = RHI::ImageBindFlags::Color;
-                imageDescriptor.m_size.m_width = m_descriptor.m_dimensions.m_imageWidth;
-                imageDescriptor.m_size.m_height = m_descriptor.m_dimensions.m_imageHeight;
-                imageDescriptor.m_format = m_descriptor.m_dimensions.m_imageFormat;
-
-                for (uint32_t imageIdx = 0; imageIdx < GetImageCount(); ++imageIdx)
-                {
-                    request.m_image = m_images[imageIdx].get();
-                    request.m_imageIndex = imageIdx;
-
-                    resultCode = ImagePoolBase::InitImage(
-                        request.m_image,
-                        imageDescriptor,
-                        [this, &request]()
-                    {
-                        return InitImageInternal(request);
-                    });
-
-                    if (resultCode != ResultCode::Success)
-                    {
-                        Shutdown();
-                        break;
-                    }
-                }
-
-                // Reset the current index back to 0 so we match the platform swap chain.
-                m_currentImageIndex = 0;
+                resultCode = InitImages();
             }
 
             return resultCode;
@@ -188,7 +165,7 @@ namespace AZ
 
         uint32_t SwapChain::GetImageCount() const
         {
-            return static_cast<uint32_t>(m_images.size());
+            return aznumeric_cast<uint32_t>(m_images.size());
         }
 
         uint32_t SwapChain::GetCurrentImageIndex() const
@@ -209,8 +186,18 @@ namespace AZ
         void SwapChain::Present()
         {
             AZ_TRACE_METHOD();
-            m_currentImageIndex = PresentInternal();
-            AZ_Assert(m_currentImageIndex < m_images.size(), "Invalid image index");
+            // Due to swapchain recreation, the images are refreshed.
+            // There is no need to present swapchain for this frame.
+            const uint32_t imageCount = aznumeric_cast<uint32_t>(m_images.size());
+            if (imageCount == 0)
+            {
+                return;
+            }
+            else
+            {
+                m_currentImageIndex = PresentInternal();
+                AZ_Assert(m_currentImageIndex < imageCount, "Invalid image index");
+            }
         }
     }
 }
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.h
index 2eef783932..225b039c66 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.h
@@ -56,6 +56,9 @@ AZ_POP_DISABLE_WARNING
 // This define controls whether DXR ray tracing support is available on the platform.
 #define AZ_DX12_DXR_SUPPORT
 
+// This define is used to initialize the D3D12_ROOT_SIGNATURE_DESC::Flags property.
+#define AZ_DX12_ROOT_SIGNATURE_FLAGS D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT
+
 using ID3D12CommandAllocatorX = ID3D12CommandAllocator;
 using ID3D12CommandQueueX = ID3D12CommandQueue;
 using ID3D12DeviceX = ID3D12Device5;
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
index 5f85d3ad03..fc80cc50d6 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -33,12 +33,20 @@ namespace AZ
             ID3D12DeviceX* dx12Device = device.GetDevice();
 
             m_copyQueue = CommandQueue::Create();
-            
+
+            // The async upload queue should always use the primary copy queue,
+            // but because this change is being made in the stabilization branch
+            // we will put it behind a define out of an abundance of caution, and
+            // change it to always do this once the change gets back to development.
+        #if defined(AZ_DX12_USE_PRIMARY_COPY_QUEUE_FOR_ASYNC_UPLOAD_QUEUE)
+            m_copyQueue = &device.GetCommandQueueContext().GetCommandQueue(RHI::HardwareQueueClass::Copy);
+        #else
             // Make a secondary Copy queue, the primary queue is owned by the CommandQueueContext
             CommandQueueDescriptor commandQueueDesc;
             commandQueueDesc.m_hardwareQueueClass = RHI::HardwareQueueClass::Copy;
             commandQueueDesc.m_hardwareQueueSubclass = HardwareQueueSubclass::Secondary;
             m_copyQueue->Init(device, commandQueueDesc);
+        #endif // defined(AZ_DX12_ASYNC_UPLOAD_QUEUE_USE_PRIMARY_COPY_QUEUE)
             m_uploadFence.Init(dx12Device, RHI::FenceState::Signaled);
 
             for (size_t i = 0; i < descriptor.m_frameCount; ++i)
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
index 1ee35c513a..07cf3bf8ad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
@@ -97,7 +97,7 @@ namespace AZ
             SetName(name);
 
             PIXBeginEvent(PIX_MARKER_CMDLIST_COL, name.GetCStr());
-            if (RHI::Factory::Get().IsPixModuleLoaded() || RHI::Factory::Get().IsRenderDocModuleLoaded())
+            if (RHI::Factory::Get().PixGpuEventsEnabled())
             {
                 PIXBeginEvent(GetCommandList(), PIX_MARKER_CMDLIST_COL, name.GetCStr());
             }
@@ -107,7 +107,7 @@ namespace AZ
         {
             FlushBarriers();
             PIXEndEvent();
-            if (RHI::Factory::Get().IsPixModuleLoaded() || RHI::Factory::Get().IsRenderDocModuleLoaded())
+            if (RHI::Factory::Get().PixGpuEventsEnabled())
             {
                 PIXEndEvent(GetCommandList());
             }
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
index 3fdeec1c51..5a54282e70 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
@@ -417,7 +417,7 @@ namespace AZ
             }
 
             D3D12_ROOT_SIGNATURE_DESC rootSignatureDesc;
-            rootSignatureDesc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+            rootSignatureDesc.Flags = AZ_DX12_ROOT_SIGNATURE_FLAGS;
             rootSignatureDesc.NumParameters = static_cast<uint32_t>(parameters.size());
             rootSignatureDesc.pParameters = parameters.data();
             rootSignatureDesc.NumStaticSamplers = static_cast<uint32_t>(staticSamplers.size());
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
index 0a9ea63d2f..c84c440c92 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -86,7 +86,7 @@ namespace AZ
 
                 AZStd::wstring shaderExportNameWstring;
                 AZStd::to_wstring(shaderExportNameWstring, record.m_shaderExportName.GetStringView());
-                void* shaderIdentifier = stateObjectProperties->GetShaderIdentifier(shaderExportNameWstring.c_str());
+                const void* shaderIdentifier = stateObjectProperties->GetShaderIdentifier(shaderExportNameWstring.c_str());
                 memcpy(mappedData, shaderIdentifier, D3D12_SHADER_IDENTIFIER_SIZE_IN_BYTES);
                 mappedData += D3D12_SHADER_IDENTIFIER_SIZE_IN_BYTES;
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
index cea072954a..b29018a2ac 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
@@ -311,7 +311,7 @@ namespace AZ
 
             PIXBeginEvent(0xFFFF00FF, GetId().GetCStr());
 
-            if (RHI::Factory::Get().IsPixModuleLoaded() || RHI::Factory::Get().IsRenderDocModuleLoaded())
+            if (RHI::Factory::Get().PixGpuEventsEnabled())
             {
                 PIXBeginEvent(commandList.GetCommandList(), 0xFFFF00FF, GetId().GetCStr());
             }
@@ -428,7 +428,7 @@ namespace AZ
                 }
             }
 
-            if (RHI::Factory::Get().IsPixModuleLoaded() || RHI::Factory::Get().IsRenderDocModuleLoaded())
+            if (RHI::Factory::Get().PixGpuEventsEnabled())
             {
                 PIXEndEvent(commandList.GetCommandList());
             }
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h
index 50132d62ec..2d40d21ed5 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h
@@ -76,7 +76,7 @@ namespace AZ
             const AZStd::vector<VkDescriptorBindingFlags>& GetNativeBindingFlags() const;
             const RHI::ShaderResourceGroupLayout* GetShaderResourceGroupLayout() const;
 
-            static const uint32_t MaxUnboundedArrayDescriptors = (1024 * 1024 * 2); // 2M
+            static const uint32_t MaxUnboundedArrayDescriptors = 900000; //Using this number as it needs to be less than maxDescriptorSetSampledImages limit of 1048576
             bool GetHasUnboundedArray() const { return m_hasUnboundedArray; }
 
         private:
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
index bef2b154e1..67f4834524 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
@@ -59,14 +59,26 @@ namespace AZ
             m_swapChainBarrier.m_isValid = true;
         }
 
+        void SwapChain::ProcessRecreation()
+        {
+            if (m_pendingRecreation)
+            {
+                ShutdownImages();
+                InvalidateNativeSwapChain();
+                CreateSwapchain();
+                InitImages();
+
+                m_pendingRecreation = false;
+            }
+        }
+
         void SwapChain::SetVerticalSyncIntervalInternal(uint32_t previousVsyncInterval)
         {
             if (GetDescriptor().m_verticalSyncInterval == 0 || previousVsyncInterval == 0)
             {
                 // The presentation mode may change when transitioning to or from a vsynced presentation mode
                 // In this case, the swapchain must be recreated.
-                InvalidateNativeSwapChain();
-                CreateSwapchain();
+                m_pendingRecreation = true;
             }
         }
 
@@ -231,8 +243,7 @@ namespace AZ
                 // VK_SUBOPTIMAL_KHR is treated as success, but we better update the surface info as well.
                 if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR)
                 {
-                    InvalidateNativeSwapChain();
-                    CreateSwapchain();
+                    m_pendingRecreation = true;
                 }
                 else
                 {
@@ -246,18 +257,16 @@ namespace AZ
                 }
             };
 
-            m_presentationQueue->QueueCommand(AZStd::move(presentCommand));
-
             uint32_t acquiredImageIndex = GetCurrentImageIndex();
             RHI::ResultCode result = AcquireNewImage(&acquiredImageIndex);
             if (result == RHI::ResultCode::Fail)
             {
-                InvalidateNativeSwapChain();
-                CreateSwapchain();
+                m_pendingRecreation = true;
                 return 0;
             }
             else
             {
+                m_presentationQueue->QueueCommand(AZStd::move(presentCommand));
                 return acquiredImageIndex;
             }
         }
@@ -474,12 +483,18 @@ namespace AZ
         void SwapChain::InvalidateNativeSwapChain()
         {
             auto& device = static_cast<Device&>(GetDevice());
-            vkDeviceWaitIdle(device.GetNativeDevice());
-            if (m_nativeSwapChain != VK_NULL_HANDLE)
+            auto presentCommand = [this,  &device]([[maybe_unused]] void* queue)
             {
-                vkDestroySwapchainKHR(device.GetNativeDevice(), m_nativeSwapChain, nullptr);
-                m_nativeSwapChain = VK_NULL_HANDLE;
-            }
+                vkDeviceWaitIdle(device.GetNativeDevice());
+                if (m_nativeSwapChain != VK_NULL_HANDLE)
+                {
+                    vkDestroySwapchainKHR(device.GetNativeDevice(), m_nativeSwapChain, nullptr);
+                    m_nativeSwapChain = VK_NULL_HANDLE;
+                }
+            };
+
+            m_presentationQueue->QueueCommand(AZStd::move(presentCommand));
+            m_presentationQueue->FlushCommands();
         }
 
         RHI::ResultCode SwapChain::CreateSwapchain()
@@ -487,7 +502,7 @@ namespace AZ
             auto& device = static_cast<Device&>(GetDevice());
 
             m_surfaceCapabilities = GetSurfaceCapabilities();
-            m_surfaceFormat = GetSupportedSurfaceFormat(GetDescriptor().m_dimensions.m_imageFormat);
+            m_surfaceFormat = GetSupportedSurfaceFormat(m_dimensions.m_imageFormat);
             m_presentMode = GetSupportedPresentMode(GetDescriptor().m_verticalSyncInterval);
             m_compositeAlphaFlagBits = GetSupportedCompositeAlpha(); 
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h
index ee2ff3c207..68abc97b2d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.h
@@ -51,6 +51,7 @@ namespace AZ
 
             void QueueBarrier(const VkPipelineStageFlags src, const VkPipelineStageFlags dst, const VkImageMemoryBarrier& imageBarrier);
 
+            void ProcessRecreation() override;
         private:
             SwapChain() = default;
 
diff --git a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
index 6ffdb6e815..344ccac1fb 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
@@ -177,7 +177,7 @@ float ComputeLerpBetweenInnerOuterAABBs(float3 innerAabbMin, float3 innerAabbMax
 bool ObbContainsPoint(float4x4 obbTransformInverse, float3 obbHalfExtents, float3 testPoint)
 {
     // get the position in Obb local space, force to positive quadrant with abs()
-    float4 p = abs(mul(obbTransformInverse, float4(testPoint, 1.0f)));
+    float3 p = abs(mul(obbTransformInverse, float4(testPoint, 1.0f)).xyz);
     return AabbContainsPoint(-obbHalfExtents, obbHalfExtents, p);
 }
 
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png b/Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png
new file mode 100644
index 0000000000..1352d14edf
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb91c050a829ff03b972202cf8c90034e4f252d972332224791d135c07d9d528
+size 796
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png
new file mode 100644
index 0000000000..198d034892
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7028c8db4f935f23aa4396668278a67691d92fe345cc9d417a9f47bd9a4af32b
+size 8130
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo
new file mode 100644
index 0000000000..264a7f2a25
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo
@@ -0,0 +1,91 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="2" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="Name" field="Preset" value="ReferenceImage" type="{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<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="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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="linux" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png
new file mode 100644
index 0000000000..14c3ec76b0
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7d94b9c0a77741736b93d8ed4d2b22bc9ae4cf649f3d8b3f10cbaf595a3ed31
+size 8336
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo
new file mode 100644
index 0000000000..4a234ef9f3
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo
@@ -0,0 +1,148 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="2" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="Name" field="Preset" value="ReferenceImage" type="{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<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="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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="linux" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png
new file mode 100644
index 0000000000..aafdcc2681
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bbd45e3ef81850da81d1cc01775930a53c424e64e287b00990af3e7e6a682ba
+size 9701
diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo
new file mode 100644
index 0000000000..747ce3e0e2
--- /dev/null
+++ b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo
@@ -0,0 +1,148 @@
+<ObjectStream version="3">
+	<Class name="TextureSettings" version="2" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
+		<Class name="AZ::Uuid" field="PresetID" value="{00000000-0000-0000-0000-000000000000}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+		<Class name="Name" field="Preset" value="ReferenceImage" type="{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}"/>
+		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<Class name="bool" field="EngineReduce" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		</Class>
+		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+		<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="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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="ios" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="linux" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#4·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#2·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#3·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
+							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
+							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
+						</Class>
+					</Class>
+				</Class>
+			</Class>
+			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
+				<Class name="AZStd::string" field="value1" value="pc" 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="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
+				</Class>
+			</Class>
+		</Class>
+		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+	</Class>
+</ObjectStream>
+
diff --git a/Gems/Atom/RPI/Assets/seedList.seed b/Gems/Atom/RPI/Assets/seedList.seed
index 300092e6c3..622638d698 100644
--- a/Gems/Atom/RPI/Assets/seedList.seed
+++ b/Gems/Atom/RPI/Assets/seedList.seed
@@ -24,6 +24,22 @@
 			<Class name="unsigned int" field="platformFlags" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			<Class name="AZStd::string" field="pathHint" value="shader/sceneandviewsrgs.azshader" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
+		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
+			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
+				<Class name="AZ::Uuid" field="guid" value="{FFF65E99-3A75-5734-BC40-E7D6796B1789}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			</Class>
+			<Class name="unsigned int" field="platformFlags" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="AZStd::string" field="pathHint" value="textures/defaults/defaultfallback.png.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+		</Class>
+		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
+			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
+				<Class name="AZ::Uuid" field="guid" value="{BBA1FB65-974C-55D2-B549-806FA42A2115}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			</Class>
+			<Class name="unsigned int" field="platformFlags" value="3" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+			<Class name="AZStd::string" field="pathHint" value="textures/defaults/missing.png.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+		</Class>
 	</Class>
 </ObjectStream>
 
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h
index bd11965ffa..f758019cfb 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h
@@ -12,6 +12,7 @@
 #include <AzCore/JSON/document.h>
 
 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
+#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
 
 namespace AZ
 {
@@ -21,21 +22,24 @@ namespace AZ
         {
             // Declarations...
 
-            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId);
+            // Note that these functions default to TraceLevel::Error to preserve legacy behavior of these APIs. It would be nice to make the default match
+            // RPI.Reflect/Asset/AssetUtils.h which is TraceLevel::Warning, but we are close to a release so it isn't worth the risk at this time.
 
-            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId);
+            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId, TraceLevel reporting = TraceLevel::Error);
+
+            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId, TraceLevel reporting = TraceLevel::Error);
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId = 0);
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId = 0, TraceLevel reporting = TraceLevel::Error);
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId = 0);
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId = 0, TraceLevel reporting = TraceLevel::Error);
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId, const char* sourcePathForDebug);
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId, const char* sourcePathForDebug, TraceLevel reporting = TraceLevel::Error);
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId);
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId, TraceLevel reporting = TraceLevel::Error);
 
             //! Attempts to resolve the full path to a product asset given its ID
             AZStd::string GetProductPathByAssetId(const AZ::Data::AssetId& assetId);
@@ -65,12 +69,12 @@ namespace AZ
             // Definitions...
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId)
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId, TraceLevel reporting)
             {
-                auto assetId = MakeAssetId(sourcePath, productSubId);
+                auto assetId = MakeAssetId(sourcePath, productSubId, reporting);
                 if (assetId.IsSuccess())
                 {
-                    return LoadAsset<AssetDataT>(assetId.GetValue(), sourcePath.c_str());
+                    return LoadAsset<AssetDataT>(assetId.GetValue(), sourcePath.c_str(), reporting);
                 }
                 else
                 {
@@ -79,20 +83,20 @@ namespace AZ
             }
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId)
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId, TraceLevel reporting)
             {
                 AZStd::string resolvedPath = ResolvePathReference(originatingSourcePath, referencedSourceFilePath);
-                return LoadAsset<AssetDataT>(resolvedPath, productSubId);
+                return LoadAsset<AssetDataT>(resolvedPath, productSubId, reporting);
             }
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId)
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId, TraceLevel reporting)
             {
-                return LoadAsset<AssetDataT>(assetId, nullptr);
+                return LoadAsset<AssetDataT>(assetId, nullptr, reporting);
             }
 
             template<typename AssetDataT>
-            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId, [[maybe_unused]] const char* sourcePathForDebug)
+            Outcome<AZ::Data::Asset<AssetDataT>> LoadAsset(const AZ::Data::AssetId& assetId, [[maybe_unused]] const char* sourcePathForDebug, TraceLevel reporting)
             {
                 if (nullptr == AZ::IO::FileIOBase::GetInstance()->GetAlias("@products@"))
                 {
@@ -111,11 +115,11 @@ namespace AZ
                 }
                 else
                 {
-                    AZ_Error("AssetUtils", false, "Could not load %s [Source='%s' Cache='%s' AssetID=%s] ",
+                    AssetUtilsInternal::ReportIssue(reporting, AZStd::string::format("Could not load %s [Source='%s' Cache='%s' AssetID=%s] ",
                         AzTypeInfo<AssetDataT>::Name(),
                         sourcePathForDebug ? sourcePathForDebug : "<unknown>",
                         asset.GetHint().empty() ? "<unknown>" : asset.GetHint().c_str(),
-                        assetId.ToString<AZStd::string>().c_str());
+                        assetId.ToString<AZStd::string>().c_str()).c_str());
 
                     return AZ::Failure();
                 }
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
index d12e848a02..c1183c7aa1 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
@@ -28,7 +28,18 @@ namespace AZ
 
         namespace MaterialUtils
         {
-            Outcome<Data::Asset<ImageAsset>> GetImageAssetReference(AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath);
+            enum class GetImageAssetResult
+            {
+                Empty,             //! No image was actually requested, the path was empty
+                Found,             //! The requested asset was found
+                Missing            //! The requested asset was not found, and a placeholder asset was used instead
+            };
+
+            //! Finds an ImageAsset referenced by a material file (or a placeholder)
+            //! @param imageAsset the resulting ImageAsset
+            //! @param materialSourceFilePath the full path to a material source file that is referenfing an image file
+            //! @param imageFilePath the path to an image source file, which could be relative to the asset root or relative to the material file
+            GetImageAssetResult GetImageAssetReference(Data::Asset<ImageAsset>& imageAsset, AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath);
 
             //! Resolve an enum to a uint32_t given its name and definition array (in MaterialPropertyDescriptor).
             //! @param propertyDescriptor it contains the definition of all enum names in an array.
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantAssetCreator.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantAssetCreator.h
index fd069f21e0..488bfb09f8 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantAssetCreator.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantAssetCreator.h
@@ -40,7 +40,7 @@ namespace AZ
             //! Set the timestamp value when the ProcessJob() started.
             //! This is needed to synchronize between the ShaderAsset and ShaderVariantAsset when hot-reloading shaders.
             //! The idea is that this timestamp must be greater or equal than the ShaderAsset. 
-            void SetBuildTimestamp(AZStd::sys_time_t buildTimestamp);
+            void SetBuildTimestamp(AZ::u64 buildTimestamp);
 
             //! Assigns a shaderStageFunction, which contains the byte code, to the slot dictated by the shader stage.
             void SetShaderFunction(RHI::ShaderStage shaderStage, RHI::Ptr<RHI::ShaderStageFunction> shaderStageFunction);
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h
index 474d0d5b9e..29b127407e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h
@@ -147,6 +147,30 @@ namespace AZ
             //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused
             virtual void DrawSphere( const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
 
+            //! Draw a sphere.
+            //! @param center        The center of the sphere.
+            //! @param direction     The direction vector. The Pole of the hemisphere will point along this vector.
+            //! @param radius        The radius.
+            //! @param color         The color to draw the sphere.
+            //! @param style         The draw style (point, wireframe, solid, shaded etc).
+            //! @param depthTest     If depth testing should be enabled
+            //! @param depthWrite    If depth writing should be enabled
+            //! @param faceCull      Which (if any) facing triangles should be culled
+            //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused
+            virtual void DrawSphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
+
+            //! Draw a hemisphere.
+            //! @param center        The center of the sphere.
+            //! @param direction     The direction vector. The Pole of the hemisphere will point along this vector.
+            //! @param radius        The radius.
+            //! @param color         The color to draw the sphere.
+            //! @param style         The draw style (point, wireframe, solid, shaded etc).
+            //! @param depthTest     If depth testing should be enabled
+            //! @param depthWrite    If depth writing should be enabled
+            //! @param faceCull      Which (if any) facing triangles should be culled
+            //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused
+            virtual void DrawHemisphere( const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
+
             //! Draw a disk.
             //! @param center        The center of the disk.
             //! @param direction     The direction vector. The disk will be orthogonal this vector.
@@ -172,7 +196,7 @@ namespace AZ
             //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused
             virtual void DrawCone(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
 
-            //! Draw a cylinder.
+            //! Draw a cylinder (with flat disks on the end).
             //! @param center        The center of the base circle.
             //! @param direction     The direction vector. The top end cap of the cylinder will face along this vector.
             //! @param radius        The radius.
@@ -185,6 +209,19 @@ namespace AZ
             //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused
             virtual void DrawCylinder(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
 
+            //! Draw a cylinder without flat disk on the end.
+            //! @param center        The center of the base circle.
+            //! @param direction     The direction vector. The top end cap of the cylinder will face along this vector.
+            //! @param radius        The radius.
+            //! @param height        The height of the cylinder.
+            //! @param color         The color to draw the cylinder.
+            //! @param style         The draw style (point, wireframe, solid, shaded etc).
+            //! @param depthTest     If depth testing should be enabled
+            //! @param depthWrite    If depth writing should be enabled
+            //! @param faceCull      Which (if any) facing triangles should be culled
+            //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused
+            virtual void DrawCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0;
+
             //! Draw an axis-aligned bounding box with no transform.
             //! @param aabb          The AABB (typically the bounding box of a set of world space points).
             //! @param color         The color to draw the box.
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h
index a88c640c19..6f93b0d247 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h
@@ -15,6 +15,7 @@
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Debug/Budget.h>
+#include <AzCore/EBus/Event.h>
 #include <AzCore/Name/Name.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/containers/fixed_vector.h>
@@ -24,6 +25,8 @@ AZ_DECLARE_BUDGET(RPI);
 
 namespace AZ
 {
+    class Matrix4x4;
+
     namespace RHI
     {
         class ShaderResourceGroup;
@@ -52,6 +55,8 @@ namespace AZ
         using ViewportContextPtr = AZStd::shared_ptr<ViewportContext>;
         using ConstViewportContextPtr = AZStd::shared_ptr<const ViewportContext>;
 
+        using MatrixChangedEvent = Event<const AZ::Matrix4x4&>;
+
         //! The name used to identify a View within in a Scene.
         //! Note that the same View could have different tags in different RenderPipelines.
         using PipelineViewTag = AZ::Name;
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h
index f567881c50..920b763bc3 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h
@@ -29,6 +29,14 @@ namespace AZ
             Count
         };
 
+        namespace DefaultImageAssetPaths
+        {
+            static constexpr char DefaultFallback[] = "textures/defaults/defaultfallback.png.streamingimage";
+            static constexpr char Processing[] = "textures/defaults/processing.png.streamingimage";
+            static constexpr char ProcessingFailed[] = "textures/defaults/processingfailed.png.streamingimage";
+            static constexpr char Missing[] = "textures/defaults/missing.png.streamingimage";
+        }
+
         class ImageSystemInterface
         {
         public:
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFilter.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFilter.h
index c42991725e..b93458113b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFilter.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/PassFilter.h
@@ -56,8 +56,8 @@ namespace AZ
                 OwnerRenderPipeline = AZ_BIT(5)
             };
 
-            void SetOwenrScene(const Scene* scene);
-            void SetOwenrRenderPipeline(const RenderPipeline* renderPipeline);
+            void SetOwnerScene(const Scene* scene);
+            void SetOwnerRenderPipeline(const RenderPipeline* renderPipeline);
             void SetPassName(Name passName);
             void SetTemplateName(Name passTemplateName);
             void SetPassClass(TypeId passClassTypeId);
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
index ec51e34897..bdd305b4eb 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h
@@ -62,6 +62,10 @@ namespace AZ
             //! It may return nullptr if this pass is independent with any views.
             ViewPtr GetView() const;
 
+            // Add a srg to srg list to be bound for this pass
+            void BindSrg(const RHI::ShaderResourceGroup* srg);
+            
+
         protected:
             explicit RenderPass(const PassDescriptor& descriptor);
 
@@ -95,9 +99,6 @@ namespace AZ
             // Clear the srg list
             void ResetSrgs();
 
-            // Add a srg to srg list to be bound for this pass
-            void BindSrg(const RHI::ShaderResourceGroup* srg);
-            
             // Set srgs for pass's execution
             void SetSrgsForDraw(RHI::CommandList* commandList);
             void SetSrgsForDispatch(RHI::CommandList* commandList);
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
index 9138c0b418..57f595ccba 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
@@ -97,7 +97,7 @@ namespace AZ
             // SystemTickBus::OnTick
             void OnSystemTick() override;
 
-            float GetCurrentTime();
+            float GetCurrentTime() const;
 
             // The set of core asset handlers registered by the system.
             AZStd::vector<AZStd::unique_ptr<Data::AssetHandler>> m_assetHandlers;
@@ -123,7 +123,6 @@ namespace AZ
             // The job policy used for feature processor's rendering prepare
             RHI::JobPolicy m_prepareRenderJobPolicy = RHI::JobPolicy::Parallel;
 
-            ScriptTimePoint m_startTime;
             float m_currentSimulationTime = 0.0f;
 
             RPISystemDescriptor m_descriptor;
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
index cdaf59ff75..92b9ad695a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h
@@ -92,6 +92,11 @@ namespace AZ
             const AZ::Matrix4x4& GetViewToWorldMatrix() const;
             const AZ::Matrix4x4& GetViewToClipMatrix() const;
             const AZ::Matrix4x4& GetWorldToClipMatrix() const;
+            const AZ::Matrix4x4& GetClipToWorldMatrix() const;
+
+            AZ::Matrix3x4 GetWorldToViewMatrixAsMatrix3x4() const;
+            AZ::Matrix3x4 GetViewToWorldMatrixAsMatrix3x4() const;
+
             //! Get the camera's world transform, converted from the viewToWorld matrix's native y-up to z-up
             AZ::Transform GetCameraTransform() const;
 
@@ -118,7 +123,6 @@ namespace AZ
             //! Update View's SRG values and compile. This should only be called once per frame before execute command lists.
             void UpdateSrg();
 
-            using MatrixChangedEvent = AZ::Event<const AZ::Matrix4x4&>;
             //! Notifies consumers when the world to view matrix has changed.
             void ConnectWorldToViewMatrixChangedHandler(MatrixChangedEvent::Handler& handler);
             //! Notifies consumers when the world to clip matrix has changed.
@@ -130,17 +134,22 @@ namespace AZ
             //! Returns the masked occlusion culling interface
             MaskedOcclusionCulling* GetMaskedOcclusionCulling();
 
+            //! This is called by RenderPipeline when this view is added to the pipeline.
+            void OnAddToRenderPipeline();
+
         private:
             View() = delete;
             View(const AZ::Name& name, UsageFlags usage);
 
-
             //! Sorts the finalized draw lists in this view
             void SortFinalizedDrawLists();
 
             //! Sorts a drawList using the sort function from a pass with the corresponding drawListTag
             void SortDrawList(RHI::DrawList& drawList, RHI::DrawListTag tag);
 
+            //! Attempt to create a shader resource group.
+            void TryCreateShaderResourceGroup();
+
             AZ::Name m_name;
             UsageFlags m_usageFlags;
 
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 966e6b3016..92cfc720da 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
@@ -13,7 +13,6 @@
 #include <Atom/RPI.Public/WindowContext.h>
 #include <Atom/RPI.Public/Scene.h>
 #include <Atom/RPI.Public/SceneBus.h>
-#include <AzCore/EBus/Event.h>
 
 namespace AZ
 {
@@ -98,7 +97,6 @@ namespace AZ
             //! Alternatively, connect to ViewportContextNotificationsBus and listen to ViewportContextNotifications::OnViewportDpiScalingChanged.
             void ConnectDpiScalingFactorChangedHandler(ScalarChangedEvent::Handler& handler);
 
-            using MatrixChangedEvent = AZ::Event<const AZ::Matrix4x4&>;
             //! Notifies consumers when the view matrix has changed.
             void ConnectViewMatrixChangedHandler(MatrixChangedEvent::Handler& handler);
             //! Notifies consumers when the projection matrix has changed.
@@ -121,17 +119,12 @@ namespace AZ
             void ConnectAboutToBeDestroyedHandler(ViewportIdEvent::Handler& handler);
 
             // ViewportRequestBus interface overrides...
-            //! Gets the current camera's view matrix.
             const AZ::Matrix4x4& GetCameraViewMatrix() const override;
-            //! Sets the current camera's view matrix.
+            AZ::Matrix3x4 GetCameraViewMatrixAsMatrix3x4() const override;
             void SetCameraViewMatrix(const AZ::Matrix4x4& matrix) override;
-            //! Gets the current camera's projection matrix.
             const AZ::Matrix4x4& GetCameraProjectionMatrix() const override;
-            //! Sets the current camera's projection matrix.
             void SetCameraProjectionMatrix(const AZ::Matrix4x4& matrix) override;
-            //! Convenience method, gets the AZ::Transform corresponding to this camera's view matrix.
             AZ::Transform GetCameraTransform() const override;
-            //! Convenience method, sets the camera's view matrix from this AZ::Transform.
             void SetCameraTransform(const AZ::Transform& transform) override;
 
         private:
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h
index 0b53172ba2..2b83903dd1 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextBus.h
@@ -67,6 +67,9 @@ namespace AZ
             virtual ViewportContextPtr GetViewportContextByName(const Name& contextName) const = 0;
             //! Gets the registered ViewportContext with the corresponding ID, if any.
             virtual ViewportContextPtr GetViewportContextById(AzFramework::ViewportId id) const = 0;
+            //! Gets the registered ViewportContext with matching RPI::Scene, if any.
+            //! This function will return the first result.
+            virtual ViewportContextPtr GetViewportContextByScene(const Scene* scene) const = 0;
             //! Maps a ViewportContext to a new name, inheriting the View stack (if any) registered to that context name.
             //! This can be used to switch "default" viewports by registering a viewport with the default ViewportContext name
             //! but note that only one ViewportContext can be mapped to a context name at a time.
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h
index 65576f97d3..2672ede9f5 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContextManager.h
@@ -41,6 +41,7 @@ namespace AZ
             bool PopView(const Name& contextName, ViewPtr view) override;
             ViewPtr GetCurrentView(const Name& contextName) const override;
             ViewportContextPtr GetDefaultViewportContext() const override;
+            ViewportContextPtr GetViewportContextByScene(const Scene* scene) const override;
 
         private:
             void RegisterViewportContext(const Name& contextName, ViewportContextPtr viewportContext);
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h
index 3f4e15744a..b3b62cbc31 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h
@@ -25,6 +25,9 @@ namespace AZ
                 const Data::Asset<Data::AssetData>& asset,
                 AZStd::shared_ptr<Data::AssetDataStream> stream,
                 const Data::AssetFilterCB& assetLoadFilterCB) override;
+
+            // Return a default fallback image if an asset is missing
+            Data::AssetId AssetMissingInCatalog(const Data::Asset<Data::AssetData>& /*asset*/) override;
         };
     }
 }
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAsset.h
index 711ebb61a7..70451bd055 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderAsset.h
@@ -294,7 +294,7 @@ namespace AZ
             Name m_drawListName;
 
             //! Use to synchronize versions of the ShaderAsset and ShaderVariantTreeAsset, especially during hot-reload.
-            AZStd::sys_time_t m_buildTimestamp = 0; 
+            AZ::u64 m_buildTimestamp = 0; 
 
 
             ///////////////////////////////////////////////////////////////////
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantAsset.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantAsset.h
index 66bbd7b188..5146ae370a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantAsset.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantAsset.h
@@ -61,7 +61,7 @@ namespace AZ
 
             //! Return the timestamp when this asset was built, and it must be >= than the timestamp of the main ShaderAsset.
             //! This is used to synchronize versions of the ShaderAsset and ShaderVariantAsset, especially during hot-reload.
-            AZStd::sys_time_t GetBuildTimestamp() const;
+            AZ::u64 GetBuildTimestamp() const;
 
             bool IsRootVariant() const { return m_stableId == RPI::RootShaderVariantStableId; } 
 
@@ -80,7 +80,7 @@ namespace AZ
             AZStd::array<RHI::Ptr<RHI::ShaderStageFunction>, RHI::ShaderStageCount> m_functionsByStage;
 
             //! Used to synchronize versions of the ShaderAsset and ShaderVariantAsset, especially during hot-reload.
-            AZStd::sys_time_t m_buildTimestamp = 0;
+            AZ::u64 m_buildTimestamp = 0;
         };
 
         class ShaderVariantAssetHandler final
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
index e9cebf29c7..f11b2f94ac 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
@@ -63,11 +63,21 @@ namespace AZ
         {
             BusDisconnect();
         }
+        
+        bool MaterialBuilder::ReportMaterialAssetWarningsAsErrors() const
+        {
+            bool warningsAsErrors = false;
+            if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+            {
+                settingsRegistry->Get(warningsAsErrors, "/O3DE/Atom/RPI/MaterialBuilder/WarningsAsErrors");
+            }
+            return warningsAsErrors;
+        }
 
         //! Adds all relevant dependencies for a referenced source file, considering that the path might be relative to the original file location or a full asset path.
         //! This will usually include multiple source dependencies and a single job dependency, but will include only source dependencies if the file is not found.
         //! Note the AssetBuilderSDK::JobDependency::m_platformIdentifier will not be set by this function. The calling code must set this value before passing back
-        //! to the AssetBuilderSDK::CreateJobsResponse. If isOrderedOnceForMaterialTypes is true and the dependency is a materialtype file, the job dependency type
+        //! to the AssetBuilderSDK::CreateJobsResponse. If isOrderedOnceForMaterialTypes is true and the dependency is a .materialtype file, the job dependency type
         //! will be set to JobDependencyType::OrderOnce.
         void AddPossibleDependencies(AZStd::string_view currentFilePath,
             AZStd::string_view referencedParentPath,
@@ -277,8 +287,8 @@ namespace AZ
 
             return materialTypeAssetOutcome.GetValue();
         }
-
-        AZ::Data::Asset<MaterialAsset> CreateMaterialAsset(AZStd::string_view materialSourceFilePath, const rapidjson::Value& json)
+        
+        AZ::Data::Asset<MaterialAsset> MaterialBuilder::CreateMaterialAsset(AZStd::string_view materialSourceFilePath, const rapidjson::Value& json) const
         {
             auto material = LoadSourceData<MaterialSourceData>(json, materialSourceFilePath);
 
@@ -292,7 +302,7 @@ namespace AZ
                 return {};
             }
 
-            auto materialAssetOutcome = material.GetValue().CreateMaterialAsset(Uuid::CreateRandom(), materialSourceFilePath, true);
+            auto materialAssetOutcome = material.GetValue().CreateMaterialAsset(Uuid::CreateRandom(), materialSourceFilePath, ReportMaterialAssetWarningsAsErrors());
             if (!materialAssetOutcome.IsSuccess())
             {
                 return {};
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h
index afb0789dcf..4fa5f3cf10 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h
@@ -9,6 +9,8 @@
 #pragma once
 
 #include <AssetBuilderSDK/AssetBuilderBusses.h>
+#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
+#include <AzCore/JSON/document.h>
 
 namespace AZ
 {
@@ -37,6 +39,9 @@ namespace AZ
 
         private:
             
+            AZ::Data::Asset<MaterialAsset> CreateMaterialAsset(AZStd::string_view materialSourceFilePath, const rapidjson::Value& json) const;
+            bool ReportMaterialAssetWarningsAsErrors() const;
+            
             bool m_isShuttingDown = false;
         };
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
index 9fc99e3ea4..dbf0fea791 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
@@ -2088,7 +2088,7 @@ namespace AZ
                 AZ::Vector3 vpos;    //note: it seems to be fastest to reuse a local Vector3 rather than constructing new ones each loop iteration
                 for (uint32_t i = 0; i < elementCount; ++i)
                 {
-                    vpos.Set(const_cast<float*>(reinterpret_cast<const float*>(&buffer[i])));
+                    vpos.Set(reinterpret_cast<const float*>(&buffer[i]));
                     aabb.AddPoint(vpos);
                 }
             }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h
index ee4bce634d..de4e1a0fe5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelExporterComponent.h
@@ -25,7 +25,7 @@ namespace AZ
     namespace RPI
     {
         /**
-         * This is the central component that drive the process of exporting a scene to Model 
+         * This is the central component that drive the process of exporting a scene to Model
          * and Material assets. It delegates asset-build duties to other components like
          * ModelAssetBuilderComponent and MaterialAssetBuilderComponent via export events.
          */
@@ -55,7 +55,7 @@ namespace AZ
 
                 AZStd::string_view m_relativeFileName;
                 AZStd::string_view m_extension;
-                const Uuid m_sourceUuid;
+                const Uuid m_sourceUuid = Uuid::CreateNull();
                 const DataStream::StreamType m_dataStreamType = DataStream::ST_BINARY;
             };
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp
index c940ef808b..e2877aa163 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp
@@ -10,6 +10,7 @@
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzCore/IO/IOUtils.h>
+#include <AzCore/IO/Path/Path.h>
 
 namespace AZ
 {
@@ -46,6 +47,12 @@ namespace AZ
 
             AZStd::string ResolvePathReference(const AZStd::string& originatingSourceFilePath, const AZStd::string& referencedSourceFilePath)
             {
+                // The IsAbsolute part prevents "second join parameter is an absolute path" warnings in StringFunc::Path::Join below
+                if (referencedSourceFilePath.empty() || AZ::IO::PathView{referencedSourceFilePath}.IsAbsolute())
+                {
+                    return referencedSourceFilePath;
+                }
+
                 AZStd::string normalizedReferencedPath = referencedSourceFilePath;
                 AzFramework::StringFunc::Path::Normalize(normalizedReferencedPath);
 
@@ -113,7 +120,7 @@ namespace AZ
                 return results;
             }
 
-            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId)
+            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId, TraceLevel reporting)
             {
                 bool assetFound = false;
                 AZ::Data::AssetInfo sourceInfo;
@@ -122,7 +129,7 @@ namespace AZ
 
                 if (!assetFound)
                 {
-                    AZ_Error("AssetUtils", false, "Could not find asset [%s]", sourcePath.c_str());
+                    AssetUtilsInternal::ReportIssue(reporting, AZStd::string::format("Could not find asset [%s]", sourcePath.c_str()).c_str());
                     return AZ::Failure();
                 }
                 else
@@ -131,10 +138,10 @@ namespace AZ
                 }
             }
 
-            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId)
+            Outcome<Data::AssetId> MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId, TraceLevel reporting)
             {
                 AZStd::string resolvedPath = ResolvePathReference(originatingSourcePath, referencedSourceFilePath);
-                return MakeAssetId(resolvedPath, productSubId);
+                return MakeAssetId(resolvedPath, productSubId, reporting);
             }
         } // namespace AssetUtils
     } // namespace RPI
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
index d6308ec655..4351213c22 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
@@ -116,10 +116,11 @@ namespace AZ
             {
                 m_properties = AZStd::move(newPropertyGroups);
 
-                AZ_Warning("MaterialSourceData", false,
+                AZ_Warning(
+                    "MaterialSourceData", false,
                     "This material is based on version '%u' of '%s', but the material type is now at version '%u'. "
-                    "Automatic updates are available. Consider updating the .material source file.",
-                    m_materialTypeVersion, m_materialType.c_str(), materialTypeSourceData.m_version);
+                    "Automatic updates are available. Consider updating the .material source file: '%s'.",
+                    m_materialTypeVersion, materialTypeFullPath.c_str(), materialTypeSourceData.m_version, materialSourceFilePath.data());
             }
 
             m_materialTypeVersion = materialTypeSourceData.m_version;
@@ -303,7 +304,7 @@ namespace AZ
                     MaterialPropertyId propertyId{ group.first, property.first };
                     if (!property.second.m_value.IsValid())
                     {
-                        AZ_Warning("Material source data", false, "Source data for material property value is invalid.");
+                        materialAssetCreator.ReportWarning("Source data for material property value is invalid.");
                     }
                     else
                     {
@@ -317,22 +318,20 @@ namespace AZ
                             {
                             case MaterialPropertyDataType::Image:
                                 {
-                                    Outcome<Data::Asset<ImageAsset>> imageAssetResult = MaterialUtils::GetImageAssetReference(
-                                        materialSourceFilePath, property.second.m_value.GetValue<AZStd::string>());
+                                    Data::Asset<ImageAsset> imageAsset;
 
-                                    if (imageAssetResult.IsSuccess())
+                                    MaterialUtils::GetImageAssetResult result = MaterialUtils::GetImageAssetReference(
+                                        imageAsset, materialSourceFilePath, property.second.m_value.GetValue<AZStd::string>());
+                                    
+                                    if (result == MaterialUtils::GetImageAssetResult::Missing)
                                     {
-                                        auto& imageAsset = imageAssetResult.GetValue();
-                                        // Load referenced images when load material
-                                        imageAsset.SetAutoLoadBehavior(Data::AssetLoadBehavior::PreLoad);
-                                        materialAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset);
-                                    }
-                                    else
-                                    {
-                                        materialAssetCreator.ReportError(
+                                        materialAssetCreator.ReportWarning(
                                             "Material property '%s': Could not find the image '%s'", propertyId.GetFullName().GetCStr(),
                                             property.second.m_value.GetValue<AZStd::string>().data());
                                     }
+                                    
+                                    imageAsset.SetAutoLoadBehavior(Data::AssetLoadBehavior::PreLoad);
+                                    materialAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset);
                                 }
                                 break;
                             case MaterialPropertyDataType::Enum:
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
index d5551e89ae..d8e6c156be 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
@@ -451,20 +451,21 @@ namespace AZ
                         {
                         case MaterialPropertyDataType::Image:
                         {
-                            auto imageAssetResult = MaterialUtils::GetImageAssetReference(
-                                materialTypeSourceFilePath, property.m_value.GetValue<AZStd::string>());
+                            Data::Asset<ImageAsset> imageAsset;
 
-                            if (imageAssetResult)
-                            {
-                                auto imageAsset = imageAssetResult.GetValue();
-                                materialTypeAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset);
-                            }
-                            else
+                            MaterialUtils::GetImageAssetResult result = MaterialUtils::GetImageAssetReference(
+                                imageAsset, materialTypeSourceFilePath, property.m_value.GetValue<AZStd::string>());
+
+                            if (result == MaterialUtils::GetImageAssetResult::Missing)
                             {
                                 materialTypeAssetCreator.ReportError(
                                     "Material property '%s': Could not find the image '%s'", propertyId.GetFullName().GetCStr(),
                                     property.m_value.GetValue<AZStd::string>().data());
                             }
+                            else
+                            {
+                                materialTypeAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset);
+                            }
                         }
                         break;
                         case MaterialPropertyDataType::Enum:
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
index 90ce9e66ce..7fff8d81bc 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
@@ -28,25 +28,36 @@ namespace AZ
     {
         namespace MaterialUtils
         {
-            Outcome<Data::Asset<ImageAsset>> GetImageAssetReference(AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath)
+            GetImageAssetResult GetImageAssetReference(Data::Asset<ImageAsset>& imageAsset, AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath)
             {
+                imageAsset = {};
+
                 if (imageFilePath.empty())
                 {
                     // The image value was present but specified an empty string, meaning the texture asset should be explicitly cleared.
-                    return AZ::Success(Data::Asset<ImageAsset>());
+                    return GetImageAssetResult::Empty;
                 }
                 else
                 {
-                    Outcome<Data::AssetId> imageAssetId = AssetUtils::MakeAssetId(materialSourceFilePath, imageFilePath, StreamingImageAsset::GetImageAssetSubId());
+                    // We use TraceLevel::None because fallback textures are available and we'll return GetImageAssetResult::Missing below in that case.
+                    // Callers of GetImageAssetReference will be responsible for logging warnings or errors as needed.
+
+                    Outcome<Data::AssetId> imageAssetId = AssetUtils::MakeAssetId(materialSourceFilePath, imageFilePath, StreamingImageAsset::GetImageAssetSubId(), AssetUtils::TraceLevel::None);
+                    
                     if (!imageAssetId.IsSuccess())
                     {
-                        return AZ::Failure();
-                    }
-                    else
-                    {
-                        Data::Asset<ImageAsset> unloadedImageAssetReference(imageAssetId.GetValue(), azrtti_typeid<StreamingImageAsset>(), imageFilePath);
-                        return AZ::Success(unloadedImageAssetReference);
+                        // When the AssetId cannot be found, we don't want to outright fail, because the runtime has mechanisms for displaying fallback textures which gives the
+                        // user a better recovery workflow. On the other hand we can't just provide an empty/invalid Asset<ImageAsset> because that would be interpreted as simply
+                        // no value was present and result in using no texture, and this would amount to a silent failure.
+                        // So we use a randomly generated (well except for the "BADA55E7" bit ;) UUID which the runtime and tools will interpret as a missing asset and represent
+                        // it as such.
+                        static const Uuid InvalidAssetPlaceholderId = "{BADA55E7-1A1D-4940-B655-9D08679BD62F}";
+                        imageAsset = Data::Asset<ImageAsset>{InvalidAssetPlaceholderId, azrtti_typeid<StreamingImageAsset>(), imageFilePath};
+                        return GetImageAssetResult::Missing;
                     }
+                    
+                    imageAsset = Data::Asset<ImageAsset>{imageAssetId.GetValue(), azrtti_typeid<StreamingImageAsset>(), imageFilePath};
+                    return GetImageAssetResult::Found;
                 }
             }
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp
index e0e83cfce2..5b32edc0bf 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderVariantAssetCreator.cpp
@@ -92,7 +92,7 @@ namespace AZ
         /////////////////////////////////////////////////////////////////////
         // Methods for all shader variant types
 
-        void ShaderVariantAssetCreator::SetBuildTimestamp(AZStd::sys_time_t buildTimestamp)
+        void ShaderVariantAssetCreator::SetBuildTimestamp(AZ::u64 buildTimestamp)
         {
             if (ValidateIsReady())
             {
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
index 65508b6371..9dd4cf99b1 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
@@ -20,7 +20,6 @@
 #include <AzCore/std/parallel/lock.h>
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/Debug/EventTrace.h>
-#include <AzCore/Debug/Timer.h>
 #include <AzCore/Jobs/JobFunction.h>
 #include <AzCore/Jobs/Job.h>
 #include <AzCore/Task/TaskGraph.h>
@@ -284,7 +283,7 @@ namespace AZ
             const Scene& scene,
             View& view,
             Frustum& frustum,
-            void* maskedOcclusionCulling)
+            [[maybe_unused]]void* maskedOcclusionCulling)
         {
             AZStd::shared_ptr<WorklistData> worklistData = AZStd::make_shared<WorklistData>();
             worklistData->m_debugCtx = &debugCtx;
@@ -517,7 +516,7 @@ namespace AZ
         }
 #endif
 
-        void CullingScene::ProcessCullablesCommon(const Scene& scene, View& view, AZ::Frustum& frustum, void*& maskedOcclusionCulling)
+        void CullingScene::ProcessCullablesCommon(const Scene& scene, View& view, AZ::Frustum& frustum, [[maybe_unused]]void*& maskedOcclusionCulling)
         {
             AZ_PROFILE_SCOPE(RPI, "CullingScene::ProcessCullablesCommon() - %s", view.GetName().GetCStr());
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp
index d9e458c615..d172abd81f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassFilter.cpp
@@ -90,13 +90,13 @@ namespace AZ
             return filter;
         }
 
-        void PassFilter::SetOwenrScene(const Scene* scene)
+        void PassFilter::SetOwnerScene(const Scene* scene)
         {
             m_ownerScene = scene;
             UpdateFilterOptions();
         }
 
-        void PassFilter::SetOwenrRenderPipeline(const RenderPipeline* renderPipeline)
+        void PassFilter::SetOwnerRenderPipeline(const RenderPipeline* renderPipeline)
         {
             m_ownerRenderPipeline = renderPipeline;
             UpdateFilterOptions();
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
index 2b32503838..4465b8594f 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
@@ -33,6 +33,7 @@
 
 #include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Interface/Interface.h>
+#include <AzCore/Time/ITime.h>
 
 #include <AzFramework/Asset/AssetSystemBus.h>
 
@@ -276,15 +277,10 @@ namespace AZ
             }
         }
 
-        float RPISystem::GetCurrentTime()
+        float RPISystem::GetCurrentTime() const
         {
-            ScriptTimePoint timeAtCurrentTick;
-            AZ::TickRequestBus::BroadcastResult(timeAtCurrentTick, &AZ::TickRequestBus::Events::GetTimeAtCurrentTick);
-
-            // We subtract the start time to maximize precision of the time value, since we will be converting it to a float.
-            double currentTime = timeAtCurrentTick.GetSeconds() - m_startTime.GetSeconds();
-
-            return aznumeric_cast<float>(currentTime);
+            const AZ::TimeUs currentSimulationTimeUs = AZ::GetRealElapsedTimeUs();
+            return AZ::TimeUsToSeconds(currentSimulationTimeUs);
         }
 
         void RPISystem::RenderTick()
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
index 8d4303f187..062eaf02bd 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp
@@ -178,6 +178,10 @@ namespace AZ
                     pipelineViews.m_views.resize(1);
                 }
                 ViewPtr previousView = pipelineViews.m_views[0];
+                if (view)
+                {
+                    view->OnAddToRenderPipeline();
+                }
                 pipelineViews.m_views[0] = view;
 
                 if (previousView)
@@ -238,6 +242,7 @@ namespace AZ
                     pipelineViews.m_type = PipelineViewType::Transient;
                 }
                 view->SetPassesByDrawList(&pipelineViews.m_passesByDrawList);
+                view->OnAddToRenderPipeline();
                 pipelineViews.m_views.push_back(view);
             }
         }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
index 337eaa5455..b1ae460af6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
@@ -202,17 +202,17 @@ namespace AZ
                     return;
                 }
                 AZ_Assert(m_asset->m_buildTimestamp == m_reloadedRootShaderVariantAsset->GetBuildTimestamp(),
-                    "shaderAsset timeStamp=%lld, but Root ShaderVariantAsset timeStamp=%lld",
+                    "shaderAsset '%s' timeStamp=%lld, but Root ShaderVariantAsset timeStamp=%lld", m_asset.GetHint().c_str(),
                     m_asset->m_buildTimestamp, m_reloadedRootShaderVariantAsset->GetBuildTimestamp());
                 m_asset->UpdateRootShaderVariantAsset(m_supervariantIndex, m_reloadedRootShaderVariantAsset);
                 m_reloadedRootShaderVariantAsset = {}; // Clear the temporary reference.
 
                 if (ShaderReloadDebugTracker::IsEnabled())
                 {
-                    auto makeTimeString = [](AZStd::sys_time_t timestamp, AZStd::sys_time_t now)
+                    auto makeTimeString = [](AZ::u64 timestamp, AZ::u64 now)
                     {
-                        AZStd::sys_time_t elapsedMicroseconds = now - timestamp;
-                        double elapsedSeconds = aznumeric_cast<double>(elapsedMicroseconds / 1'000'000);
+                        AZ::u64 elapsedMillis = now - timestamp;
+                        double elapsedSeconds = aznumeric_cast<double>(elapsedMillis / 1'000);
                         AZStd::string timeString = AZStd::string::format("%lld (%f seconds ago)", timestamp, elapsedSeconds);
                         return timeString;
                     };
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
index 8c1e38ba58..a5c67b6210 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp
@@ -47,18 +47,14 @@ namespace AZ
         {
             AZ_Assert(!name.IsEmpty(), "invalid name");
 
-            // Set default matrixes. 
+            // Set default matrices 
             SetWorldToViewMatrix(AZ::Matrix4x4::CreateIdentity());
             AZ::Matrix4x4 viewToClipMatrix;
             AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::Constants::HalfPi, 1, 0.1f, 1000.f, true);
             SetViewToClipMatrix(viewToClipMatrix);
 
-            Data::Asset<ShaderAsset> viewSrgShaderAsset = RPISystemInterface::Get()->GetCommonShaderAssetForSrgs();
+            TryCreateShaderResourceGroup();
 
-            if (viewSrgShaderAsset.IsReady())
-            {
-                m_shaderResourceGroup = ShaderResourceGroup::Create(viewSrgShaderAsset, RPISystemInterface::Get()->GetViewSrgLayout()->GetName());
-            }
 #if AZ_TRAIT_MASKED_OCCLUSION_CULLING_SUPPORTED
             m_maskedOcclusionCulling = MaskedOcclusionCulling::Create();
             m_maskedOcclusionCulling->SetResolution(MaskedSoftwareOcclusionCullingWidth, MaskedSoftwareOcclusionCullingHeight);
@@ -125,6 +121,7 @@ namespace AZ
 
             m_worldToViewMatrix = worldToView;
             m_worldToClipMatrix = m_viewToClipMatrix * m_worldToViewMatrix;
+            m_clipToWorldMatrix = m_worldToClipMatrix.GetInverseFull();
 
             m_onWorldToViewMatrixChange.Signal(m_worldToViewMatrix);
             m_onWorldToClipMatrixChange.Signal(m_worldToClipMatrix);
@@ -162,6 +159,7 @@ namespace AZ
             m_worldToViewMatrix = m_viewToWorldMatrix.GetInverseFast();
 
             m_worldToClipMatrix = m_viewToClipMatrix * m_worldToViewMatrix;
+            m_clipToWorldMatrix = m_worldToClipMatrix.GetInverseFull();
 
             // Only signal an update when there is a change, otherwise this might block
             // user input from changing the value.
@@ -177,6 +175,7 @@ namespace AZ
             m_viewToClipMatrix = viewToClip;
 
             m_worldToClipMatrix = m_viewToClipMatrix * m_worldToViewMatrix;
+            m_clipToWorldMatrix = m_worldToClipMatrix.GetInverseFull();
 
             // Update z depth constant simultaneously
             // zNear -> n, zFar -> f
@@ -217,6 +216,16 @@ namespace AZ
             return m_viewToWorldMatrix;
         }
 
+        AZ::Matrix3x4 View::GetWorldToViewMatrixAsMatrix3x4() const
+        {
+            return AZ::Matrix3x4::UnsafeCreateFromMatrix4x4(m_worldToViewMatrix);
+        }
+
+        AZ::Matrix3x4 View::GetViewToWorldMatrixAsMatrix3x4() const
+        {
+            return AZ::Matrix3x4::UnsafeCreateFromMatrix4x4(m_viewToWorldMatrix);
+        }
+
         const AZ::Matrix4x4& View::GetViewToClipMatrix() const
         {
             return m_viewToClipMatrix;
@@ -227,6 +236,11 @@ namespace AZ
             return m_worldToClipMatrix;
         }
 
+        const AZ::Matrix4x4& View::GetClipToWorldMatrix() const
+        {
+            return m_clipToWorldMatrix;
+        }
+
         bool View::HasDrawListTag(RHI::DrawListTag drawListTag)
         {
             return drawListTag.IsValid() && m_drawListMask[drawListTag.GetIndex()];
@@ -263,12 +277,12 @@ namespace AZ
             passWithDrawListTag->SortDrawList(drawList);
         }
 
-        void View::ConnectWorldToViewMatrixChangedHandler(View::MatrixChangedEvent::Handler& handler)
+        void View::ConnectWorldToViewMatrixChangedHandler(MatrixChangedEvent::Handler& handler)
         {
             handler.Connect(m_onWorldToViewMatrixChange);
         }
 
-        void View::ConnectWorldToClipMatrixChangedHandler(View::MatrixChangedEvent::Handler& handler)
+        void View::ConnectWorldToClipMatrixChangedHandler(MatrixChangedEvent::Handler& handler)
         {
             handler.Connect(m_onWorldToClipMatrixChange);
         }
@@ -361,16 +375,19 @@ namespace AZ
         {
             if (m_clipSpaceOffset.IsZero())
             {
-                Matrix4x4 worldToClipPrevMatrix = m_viewToClipPrevMatrix * m_worldToViewPrevMatrix;
-                m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, worldToClipPrevMatrix);
-                m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, m_worldToClipMatrix);
-                m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, m_viewToClipMatrix);
-                m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, m_clipToWorldMatrix);
-                m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, m_viewToClipMatrix.GetInverseFull());
+                if (m_shaderResourceGroup)
+                {
+                    Matrix4x4 worldToClipPrevMatrix = m_viewToClipPrevMatrix * m_worldToViewPrevMatrix;
+                    m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, worldToClipPrevMatrix);
+                    m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, m_worldToClipMatrix);
+                    m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, m_viewToClipMatrix);
+                    m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, m_clipToWorldMatrix);
+                    m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, m_viewToClipMatrix.GetInverseFull());
+                }
             }
             else
             {
-                // Offset the current and previous frame clip matricies
+                // Offset the current and previous frame clip matrices
                 Matrix4x4 offsetViewToClipMatrix = m_viewToClipMatrix;
                 offsetViewToClipMatrix.SetElement(0, 2, m_clipSpaceOffset.GetX());
                 offsetViewToClipMatrix.SetElement(1, 2, m_clipSpaceOffset.GetY());
@@ -379,27 +396,33 @@ namespace AZ
                 offsetViewToClipPrevMatrix.SetElement(0, 2, m_clipSpaceOffset.GetX());
                 offsetViewToClipPrevMatrix.SetElement(1, 2, m_clipSpaceOffset.GetY());
 
-                // Build other matricies dependent on the view to clip matricies
+                // Build other matrices dependent on the view to clip matrices
                 Matrix4x4 offsetWorldToClipMatrix = offsetViewToClipMatrix * m_worldToViewMatrix;
                 Matrix4x4 offsetWorldToClipPrevMatrix = offsetViewToClipPrevMatrix * m_worldToViewPrevMatrix;
             
                 Matrix4x4 offsetClipToViewMatrix = offsetViewToClipMatrix.GetInverseFull();
                 Matrix4x4 offsetClipToWorldMatrix = m_viewToWorldMatrix * offsetClipToViewMatrix;
-                    
-                m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, offsetWorldToClipPrevMatrix);
-                m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, offsetWorldToClipMatrix);
-                m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, offsetViewToClipMatrix);
-                m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, offsetClipToWorldMatrix);
-                m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, offsetViewToClipMatrix.GetInverseFull());
+
+                if (m_shaderResourceGroup)
+                {
+                    m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, offsetWorldToClipPrevMatrix);
+                    m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, offsetWorldToClipMatrix);
+                    m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, offsetViewToClipMatrix);
+                    m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, offsetClipToWorldMatrix);
+                    m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, offsetViewToClipMatrix.GetInverseFull());
+                }
             }
 
-            m_shaderResourceGroup->SetConstant(m_worldPositionConstantIndex, m_position);
-            m_shaderResourceGroup->SetConstant(m_viewMatrixConstantIndex, m_worldToViewMatrix);
-            m_shaderResourceGroup->SetConstant(m_viewMatrixInverseConstantIndex, m_worldToViewMatrix.GetInverseFull());
-            m_shaderResourceGroup->SetConstant(m_zConstantsConstantIndex, m_nearZ_farZ_farZTimesNearZ_farZMinusNearZ);
-            m_shaderResourceGroup->SetConstant(m_unprojectionConstantsIndex, m_unprojectionConstants);
+            if (m_shaderResourceGroup)
+            {
+                m_shaderResourceGroup->SetConstant(m_worldPositionConstantIndex, m_position);
+                m_shaderResourceGroup->SetConstant(m_viewMatrixConstantIndex, m_worldToViewMatrix);
+                m_shaderResourceGroup->SetConstant(m_viewMatrixInverseConstantIndex, m_worldToViewMatrix.GetInverseFull());
+                m_shaderResourceGroup->SetConstant(m_zConstantsConstantIndex, m_nearZ_farZ_farZTimesNearZ_farZMinusNearZ);
+                m_shaderResourceGroup->SetConstant(m_unprojectionConstantsIndex, m_unprojectionConstants);
 
-            m_shaderResourceGroup->Compile();
+                m_shaderResourceGroup->Compile();
+            }
 
             m_viewToClipPrevMatrix = m_viewToClipMatrix;
             m_worldToViewPrevMatrix = m_worldToViewMatrix;
@@ -418,5 +441,30 @@ namespace AZ
         {
             return m_maskedOcclusionCulling;
         }
+
+        void View::TryCreateShaderResourceGroup()
+        {
+            if (!m_shaderResourceGroup)
+            {
+                if (auto rpiSystemInterface = RPISystemInterface::Get())
+                {
+                    if (Data::Asset<ShaderAsset> viewSrgShaderAsset = rpiSystemInterface->GetCommonShaderAssetForSrgs();
+                        viewSrgShaderAsset.IsReady())
+                    {
+                        m_shaderResourceGroup =
+                            ShaderResourceGroup::Create(viewSrgShaderAsset, rpiSystemInterface->GetViewSrgLayout()->GetName());
+                    }
+                }
+            }
+        }
+
+        void View::OnAddToRenderPipeline()
+        {
+            TryCreateShaderResourceGroup();
+            if (!m_shaderResourceGroup)
+            {
+                AZ_Warning("RPI::View", false, "Shader Resource Group failed to initialize");
+            }
+        }
     } // namespace RPI
 } // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
index 77114e5cf5..1013d35285 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
@@ -36,12 +36,12 @@ namespace AZ
             AzFramework::WindowNotificationBus::Handler::BusConnect(nativeWindow);
             AzFramework::ViewportRequestBus::Handler::BusConnect(id);
 
-            m_onProjectionMatrixChangedHandler = ViewportContext::MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix)
+            m_onProjectionMatrixChangedHandler = MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix)
             {
                 m_projectionMatrixChangedEvent.Signal(matrix);
             });
 
-            m_onViewMatrixChangedHandler = ViewportContext::MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix)
+            m_onViewMatrixChangedHandler = MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix)
             {
                 m_viewMatrixChangedEvent.Signal(matrix);
             });
@@ -203,6 +203,11 @@ namespace AZ
             return GetDefaultView()->GetWorldToViewMatrix();
         }
 
+        AZ::Matrix3x4 ViewportContext::GetCameraViewMatrixAsMatrix3x4() const
+        {
+            return GetDefaultView()->GetWorldToViewMatrixAsMatrix3x4();
+        }
+
         void ViewportContext::SetCameraViewMatrix(const AZ::Matrix4x4& matrix)
         {
             GetDefaultView()->SetWorldToViewMatrix(matrix);
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp
index 6ea2491a0f..bba9ae7cf6 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContextManager.cpp
@@ -176,6 +176,20 @@ namespace AZ
             return {};
         }
 
+        ViewportContextPtr ViewportContextManager::GetViewportContextByScene(const Scene* scene) const
+        {
+            AZStd::lock_guard lock(m_containerMutex);
+            for (const auto& viewportData : m_viewportContexts)
+            {
+                ViewportContextPtr viewportContext = viewportData.second.context.lock();
+                if (viewportContext && viewportContext->GetRenderScene().get() == scene)
+                {
+                    return viewportContext;
+                }
+            }
+            return {};
+        }
+
         void ViewportContextManager::RenameViewportContext(ViewportContextPtr viewportContext, const Name& newContextName)
         {
             auto currentAssignedViewportContext = GetViewportContextByName(newContextName);
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp
index fa39820329..dd16c565e7 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp
@@ -7,6 +7,9 @@
  */
 
 #include <Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h>
+#include <Atom/RPI.Public/Image/ImageSystemInterface.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
 
 namespace AZ
 {
@@ -40,5 +43,56 @@ namespace AZ
 
             return loadResult;
         }
-    }
-}
+
+        Data::AssetId StreamingImageAssetHandler::AssetMissingInCatalog(const Data::Asset<Data::AssetData>& asset)
+        {
+            // Find out if the asset is missing completely, or just still processing
+            // and escalate the asset to the top of the list
+            AzFramework::AssetSystem::AssetStatus missingAssetStatus;
+            AzFramework::AssetSystemRequestBus::BroadcastResult(
+                missingAssetStatus, &AzFramework::AssetSystem::AssetSystemRequests::GetAssetStatusById, asset.GetId().m_guid);
+
+            // Determine which fallback image to use
+            const char* relativePath = DefaultImageAssetPaths::DefaultFallback;
+
+            bool useDebugFallbackImages = true;
+            if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+            {
+                settingsRegistry->GetObject(useDebugFallbackImages, "/O3DE/Atom/RPI/UseDebugFallbackImages");
+            }
+
+            if (useDebugFallbackImages)
+            {
+                switch (missingAssetStatus)
+                {
+                case AzFramework::AssetSystem::AssetStatus::AssetStatus_Queued:
+                case AzFramework::AssetSystem::AssetStatus::AssetStatus_Compiling:
+                    relativePath = DefaultImageAssetPaths::Processing;
+                    break;
+                case AzFramework::AssetSystem::AssetStatus::AssetStatus_Failed:
+                    relativePath = DefaultImageAssetPaths::ProcessingFailed;
+                    break;
+                case AzFramework::AssetSystem::AssetStatus::AssetStatus_Missing:
+                case AzFramework::AssetSystem::AssetStatus::AssetStatus_Unknown:
+                case AzFramework::AssetSystem::AssetStatus::AssetStatus_Compiled:
+                    relativePath = DefaultImageAssetPaths::Missing;
+                    break;
+                }
+            }
+
+            // Make sure the fallback image has been processed
+            AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus_Unknown;
+            AzFramework::AssetSystemRequestBus::BroadcastResult(
+                status, &AzFramework::AssetSystemRequestBus::Events::CompileAssetSync, relativePath);
+
+            // Return the asset id of the fallback image
+            Data::AssetId assetId{};
+            bool autoRegisterIfNotFound = false;
+            Data::AssetCatalogRequestBus::BroadcastResult(
+                assetId, &Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, relativePath,
+                azrtti_typeid<AZ::RPI::StreamingImageAsset>(), autoRegisterIfNotFound);
+
+            return assetId;
+        }
+    } // namespace RPI
+} // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
index ac90333842..3c6947b83d 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
@@ -226,10 +226,12 @@ namespace AZ
             
             if (changesWereApplied)
             {
-                AZ_Warning("MaterialAsset", false,
+                AZ_Warning(
+                    "MaterialAsset", false,
                     "This material is based on version '%u' of %s, but the material type is now at version '%u'. "
-                    "Automatic updates are available. Consider updating the .material source file.",
-                    originalVersion, m_materialTypeAsset.ToString<AZStd::string>().c_str(), m_materialTypeAsset->GetVersion());
+                    "Automatic updates are available. Consider updating the .material source file for '%s'.",
+                    originalVersion, m_materialTypeAsset.ToString<AZStd::string>().c_str(), m_materialTypeAsset->GetVersion(),
+                    GetId().ToString<AZStd::string>().c_str());
             }
 
             m_materialTypeVersion = m_materialTypeAsset->GetVersion();
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
index d1017139fc..b74305613e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
@@ -118,12 +118,16 @@ namespace AZ
             else if (value.is<Data::Asset<Data::AssetData>>())
             {
                 result.m_value = Data::Asset<RPI::ImageAsset>(
-                    AZStd::any_cast<Data::Asset<Data::AssetData>>(value).GetId(), azrtti_typeid<RPI::StreamingImageAsset>());
+                    AZStd::any_cast<Data::Asset<Data::AssetData>>(value).GetId(),
+                    azrtti_typeid<RPI::StreamingImageAsset>(),
+                    AZStd::any_cast<Data::Asset<Data::AssetData>>(value).GetHint());
             }
             else if (value.is<Data::Asset<StreamingImageAsset>>())
             {
                 result.m_value = Data::Asset<RPI::ImageAsset>(
-                    AZStd::any_cast<Data::Asset<StreamingImageAsset>>(value).GetId(), azrtti_typeid<RPI::StreamingImageAsset>());
+                    AZStd::any_cast<Data::Asset<StreamingImageAsset>>(value).GetId(),
+                    azrtti_typeid<RPI::StreamingImageAsset>(),
+                    AZStd::any_cast<Data::Asset<StreamingImageAsset>>(value).GetHint());
             }
             else if (value.is<Data::Asset<ImageAsset>>())
             {
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
index 9a432643d7..e362229d2d 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
@@ -201,23 +201,11 @@ namespace AZ
             AZ::Vector3& normal) const
         {
             const BufferAssetView& indexBufferView = mesh.GetIndexBufferAssetView();
-            const AZStd::array_view<ModelLodAsset::Mesh::StreamBufferInfo>& streamBufferList = mesh.GetStreamBufferInfoList();
+            const BufferAssetView* positionBufferView = mesh.GetSemanticBufferAssetView(m_positionName);
 
-            // find position semantic
-            const ModelLodAsset::Mesh::StreamBufferInfo* positionBuffer = nullptr;
-
-            for (const ModelLodAsset::Mesh::StreamBufferInfo& bufferInfo : streamBufferList)
+            if (positionBufferView && positionBufferView->GetBufferAsset().Get())
             {
-                if (bufferInfo.m_semantic.m_name == m_positionName)
-                {
-                    positionBuffer = &bufferInfo;
-                    break;
-                }
-            }
-
-            if (positionBuffer && positionBuffer->m_bufferAssetView.GetBufferAsset().Get())
-            {
-                BufferAsset* bufferAssetViewPtr = positionBuffer->m_bufferAssetView.GetBufferAsset().Get();
+                BufferAsset* bufferAssetViewPtr = positionBufferView->GetBufferAsset().Get();
                 BufferAsset* indexAssetViewPtr = indexBufferView.GetBufferAsset().Get();
 
                 if (!bufferAssetViewPtr || !indexAssetViewPtr)
@@ -225,7 +213,7 @@ namespace AZ
                     return false;
                 }
 
-                RHI::BufferViewDescriptor positionBufferViewDesc = bufferAssetViewPtr->GetBufferViewDescriptor();
+                RHI::BufferViewDescriptor positionBufferViewDesc = positionBufferView->GetBufferViewDescriptor();
                 AZStd::array_view<uint8_t> positionRawBuffer = bufferAssetViewPtr->GetBuffer();
 
                 const uint32_t positionElementSize = positionBufferViewDesc.m_elementSize;
@@ -234,22 +222,28 @@ namespace AZ
                 // Position is 3 floats
                 if (positionElementSize != sizeof(float) * 3)
                 {
-                    AZ_Warning("ModelAsset", false, "unsupported mesh posiiton format, only full 3 floats per vertex are supported at the moment");
+                    AZ_Warning(
+                        "ModelAsset", false, "unsupported mesh posiiton format, only full 3 floats per vertex are supported at the moment");
                     return false;
                 }
 
+                RHI::BufferViewDescriptor indexBufferViewDesc = indexBufferView.GetBufferViewDescriptor();
                 AZStd::array_view<uint8_t> indexRawBuffer = indexAssetViewPtr->GetBuffer();
-                RHI::BufferViewDescriptor indexRawDesc = indexAssetViewPtr->GetBufferViewDescriptor();
-
-                bool anyHit = false;
 
                 const AZ::Vector3 rayEnd = rayStart + rayDir;
                 AZ::Vector3 a, b, c;
                 AZ::Vector3 intersectionNormal;
 
+                bool anyHit = false;
                 float shortestDistanceNormalized = AZStd::numeric_limits<float>::max();
-                const AZ::u32* indexPtr = reinterpret_cast<const AZ::u32*>(indexRawBuffer.data());
-                for (uint32_t indexIter = 0; indexIter <= indexRawDesc.m_elementCount - 3; indexIter += 3, indexPtr += 3)
+
+                const AZ::u32* indexPtr = reinterpret_cast<const AZ::u32*>(
+                    indexRawBuffer.data() + (indexBufferViewDesc.m_elementOffset * indexBufferViewDesc.m_elementSize));
+                const float* positionPtr = reinterpret_cast<const float*>(
+                    positionRawBuffer.data() + (positionBufferViewDesc.m_elementOffset * positionBufferViewDesc.m_elementSize));
+
+                constexpr int StepSize = 3; // number of values per vertex (x, y, z)
+                for (uint32_t indexIter = 0; indexIter < indexBufferViewDesc.m_elementCount; indexIter += StepSize, indexPtr += StepSize)
                 {
                     AZ::u32 index0 = indexPtr[0];
                     AZ::u32 index1 = indexPtr[1];
@@ -261,17 +255,17 @@ namespace AZ
                         return false;
                     }
 
-                    const float* p = reinterpret_cast<const float*>(&positionRawBuffer[index0 * positionElementSize]);
-                    a.Set(const_cast<float*>(p)); // faster than AZ::Vector3 c-tor
-
-                    p = reinterpret_cast<const float*>(&positionRawBuffer[index1 * positionElementSize]);
-                    b.Set(const_cast<float*>(p));
-
-                    p = reinterpret_cast<const float*>(&positionRawBuffer[index2 * positionElementSize]);
-                    c.Set(const_cast<float*>(p));
+                    // faster than AZ::Vector3 c-tor
+                    const float* aRef = &positionPtr[index0 * StepSize];
+                    a.Set(aRef);
+                    const float* bRef = &positionPtr[index1 * StepSize];
+                    b.Set(bRef);
+                    const float* cRef = &positionPtr[index2 * StepSize];
+                    c.Set(cRef);
 
                     float currentDistanceNormalized;
-                    if (AZ::Intersect::IntersectSegmentTriangleCCW(rayStart, rayEnd, a, b, c, intersectionNormal, currentDistanceNormalized))
+                    if (AZ::Intersect::IntersectSegmentTriangleCCW(
+                            rayStart, rayEnd, a, b, c, intersectionNormal, currentDistanceNormalized))
                     {
                         anyHit = true;
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp
index 442fc6a79f..ec1a65a6d5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderVariantAsset.cpp
@@ -60,7 +60,7 @@ namespace AZ
             }
         }
 
-        AZStd::sys_time_t ShaderVariantAsset::GetBuildTimestamp() const
+        AZ::u64 ShaderVariantAsset::GetBuildTimestamp() const
         {
             return m_buildTimestamp;
         }
diff --git a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
index 31c1bc6715..02e69e732c 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
@@ -46,7 +46,6 @@ namespace UnitTest
         bool DeleteEntity(const AZ::EntityId&) override { return false; }
         AZ::Entity* FindEntity(const AZ::EntityId&) override { return nullptr; }
         AZ::BehaviorContext*  GetBehaviorContext() override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
diff --git a/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
index ee3ad94d4f..fb88e62617 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
@@ -44,7 +44,6 @@ namespace UnitTest
         AZ::Entity* FindEntity(const AZ::EntityId&) override { return nullptr; }
         AZ::BehaviorContext*  GetBehaviorContext() override { return nullptr; }
         AZ::JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
diff --git a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp
index 5343c295d8..8c685656ba 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp
@@ -69,6 +69,19 @@ namespace UnitTest
         assetPath /= "Cache";
         AZ::IO::FileIOBase::GetInstance()->SetAlias("@products@", assetPath.c_str());
 
+        // Remark, AZ::Utils::GetProjectPath() is not used when defining "user" folder,
+        // instead We use AZ::Test::GetEngineRootPath();.
+        // Reason:
+        // When running unit tests, using AZ::Utils::GetProjectPath() will resolve to something like:
+        // "/data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache"
+        // The ShaderMetricSystem.cpp writes to the @user@ folder and the following runtime error occurs:
+        // "You may not alter data inside the asset cache.  Please check the call stack and consider writing into the source asset folder instead."
+        // "Attempted write location: /data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache/user/shadermetrics.json"
+        // To avoid the error We use AZ::Test::GetEngineRootPath();
+        AZ::IO::Path userPath = AZ::Test::GetEngineRootPath();
+        userPath /= "user";
+        AZ::IO::FileIOBase::GetInstance()->SetAlias("@user@", userPath.c_str());
+
         m_jsonRegistrationContext = AZStd::make_unique<AZ::JsonRegistrationContext>();
         m_jsonSystemComponent = AZStd::make_unique<AZ::JsonSystemComponent>();
         m_jsonSystemComponent->Reflect(m_jsonRegistrationContext.get());
diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
index fa8eed35de..d4bf3e5eaa 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
@@ -625,23 +625,6 @@ namespace UnitTest
         // We use local functions to easily start a new MaterialAssetCreator for each test case because
         // the AssetCreator would just skip subsequent operations after the first failure is detected.
 
-        auto expectError = [](AZStd::function<void(MaterialSourceData& materialSourceData)> setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 2)
-        {
-            MaterialSourceData sourceData;
-
-            sourceData.m_materialType = "@exefolder@/Temp/test.materialtype";
-
-            AddPropertyGroup(sourceData, "general");
-
-            setOneBadInput(sourceData);
-
-            AZ_TEST_START_ASSERTTEST;
-            auto materialAssetOutcome = sourceData.CreateMaterialAsset(Uuid::CreateRandom(), "", false);
-            AZ_TEST_STOP_ASSERTTEST(expectedAsserts); // Usually one for the initial error, and one for when End() is called
-
-            EXPECT_FALSE(materialAssetOutcome.IsSuccess());
-        };
-
         auto expectWarning = [](AZStd::function<void(MaterialSourceData& materialSourceData)> setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 1)
         {
             MaterialSourceData sourceData;
@@ -692,10 +675,10 @@ namespace UnitTest
         });
 
         // Missing image reference
-        expectError([](MaterialSourceData& materialSourceData)
+        expectWarning([](MaterialSourceData& materialSourceData)
         {
             AddProperty(materialSourceData, "general", "MyImage", AZStd::string("doesNotExist.streamingimage"));
-        }, 3); // Expect a 3rd error because AssetUtils reports its own assertion failure
+        });
     }
 
 
diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
index 9c3e08ee08..61999d808e 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
@@ -888,4 +888,43 @@ namespace UnitTest
         EXPECT_EQ(indexFromOldName, indexFromNewName);
     }
 
+    template<typename T>
+    void CheckPropertyValueRoundTrip(const T& value)
+    {
+        AZ::RPI::MaterialPropertyValue materialPropertyValue{value};
+        AZStd::any anyValue{value};
+        AZ::RPI::MaterialPropertyValue materialPropertyValueFromAny = MaterialPropertyValue::FromAny(anyValue);
+        AZ::RPI::MaterialPropertyValue materialPropertyValueFromRoundTrip = MaterialPropertyValue::FromAny(MaterialPropertyValue::ToAny(materialPropertyValue));
+        
+        EXPECT_EQ(materialPropertyValue, materialPropertyValueFromAny);
+        EXPECT_EQ(materialPropertyValue, materialPropertyValueFromRoundTrip);
+
+        if (materialPropertyValue.Is<Data::Asset<ImageAsset>>())
+        {
+            EXPECT_EQ(materialPropertyValue.GetValue<Data::Asset<ImageAsset>>().GetHint(), materialPropertyValueFromAny.GetValue<Data::Asset<ImageAsset>>().GetHint());
+            EXPECT_EQ(materialPropertyValue.GetValue<Data::Asset<ImageAsset>>().GetHint(), materialPropertyValueFromRoundTrip.GetValue<Data::Asset<ImageAsset>>().GetHint());
+        }
+    }
+
+    TEST_F(MaterialTests, TestMaterialPropertyValueAsAny)
+    {
+        CheckPropertyValueRoundTrip(true);
+        CheckPropertyValueRoundTrip(false);
+        CheckPropertyValueRoundTrip(7);
+        CheckPropertyValueRoundTrip(8u);
+        CheckPropertyValueRoundTrip(9.0f);
+        CheckPropertyValueRoundTrip(AZ::Vector2(1.0f, 2.0f));
+        CheckPropertyValueRoundTrip(AZ::Vector3(1.0f, 2.0f, 3.0f));
+        CheckPropertyValueRoundTrip(AZ::Vector4(1.0f, 2.0f, 3.0f, 4.0f));
+        CheckPropertyValueRoundTrip(AZ::Color(1.0f, 2.0f, 3.0f, 4.0f));
+        CheckPropertyValueRoundTrip(Data::Asset<Data::AssetData>{});
+        CheckPropertyValueRoundTrip(Data::Asset<ImageAsset>{});
+        CheckPropertyValueRoundTrip(Data::Asset<StreamingImageAsset>{});
+        CheckPropertyValueRoundTrip(Data::Asset<Data::AssetData>{Uuid::CreateRandom(), azrtti_typeid<AZ::RPI::StreamingImageAsset>(), "TestAssetPath.png"});
+        CheckPropertyValueRoundTrip(Data::Asset<ImageAsset>{Uuid::CreateRandom(), azrtti_typeid<AZ::RPI::StreamingImageAsset>(), "TestAssetPath.png"});
+        CheckPropertyValueRoundTrip(Data::Asset<StreamingImageAsset>{Uuid::CreateRandom(), azrtti_typeid<AZ::RPI::StreamingImageAsset>(), "TestAssetPath.png"});
+        CheckPropertyValueRoundTrip(m_testImageAsset);
+        CheckPropertyValueRoundTrip(Data::Instance<Image>{m_testImage});
+        CheckPropertyValueRoundTrip(AZStd::string{"hello"});
+    }
 }
diff --git a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
index 7b07e14de0..81d773d8c0 100644
--- a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
@@ -38,7 +38,7 @@ namespace UnitTest
         bufferData.resize(bufferSize);
 
         //The actual data doesn't matter
-        const uint8_t bufferDataSize = static_cast<uint8_t>(bufferData.size());
+        const uint8_t bufferDataSize = aznumeric_cast<uint8_t>(bufferData.size());
         for (uint8_t i = 0; i < bufferDataSize; ++i)
         {
             bufferData[i] = i;
@@ -248,7 +248,8 @@ namespace UnitTest
             return asset;
         }
 
-        AZ::Data::Asset<AZ::RPI::ModelAsset> BuildTestModel(const uint32_t lodCount, const uint32_t sharedMeshCount, const uint32_t separateMeshCount, ExpectedModel& expectedModel)
+        AZ::Data::Asset<AZ::RPI::ModelAsset> BuildTestModel(
+            const uint32_t lodCount, const uint32_t sharedMeshCount, const uint32_t separateMeshCount, ExpectedModel& expectedModel)
         {
             using namespace AZ;
 
@@ -989,6 +990,9 @@ namespace UnitTest
         uint32_t{ 0 }, 2, 1, 1, 2, 3, 4, 5, 6, 5, 7, 6, 0, 4, 2, 4, 6, 2, 1, 3, 5, 5, 3, 7, 0, 1, 4, 4, 1, 5, 2, 6, 3, 6, 7, 3,
     };
 
+    static constexpr AZStd::array QuadPositions = { -1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, -1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 0.0f };
+    static constexpr AZStd::array QuadIndices = { uint32_t{ 0 }, 2, 1, 1, 2, 3 };
+
     // 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.
@@ -1031,42 +1035,80 @@ namespace UnitTest
     static constexpr inline auto minmaxElement = AZStd::minmax_element(begin(TwoSeparatedPlanesIndices), end(TwoSeparatedPlanesIndices));
     static_assert(*minmaxElement.second == (TwoSeparatedPlanesPositions.size() / 3) - 1);
 
-    template<class x> class TD;
     class TestMesh
     {
     public:
+        TestMesh() = default;
+
         TestMesh(const float* positions, size_t positionCount, const uint32_t* indices, size_t indicesCount)
         {
             AZ::RPI::ModelLodAssetCreator lodCreator;
-            lodCreator.Begin(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
+            Begin(lodCreator);
+            Add(lodCreator, positions, positionCount, /*positionOffset=*/0, indices, indicesCount, /*indexOffset=*/0);
+            End(lodCreator);
+        }
 
+        // initiate the asset lod creation process (note: End must be called after meshes have been added).
+        void Begin(AZ::RPI::ModelLodAssetCreator& lodCreator)
+        {
+            lodCreator.Begin(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
+        }
+
+        // add a sub mesh and reuse existing position/index buffer (be very careful with the offsets used)
+        void Add(
+            AZ::RPI::ModelLodAssetCreator& lodCreator,
+            const float* positions,
+            size_t positionCount,
+            size_t positionOffset,
+            AZ::Data::Asset<AZ::RPI::BufferAsset> positionBuffer,
+            const uint32_t* indices,
+            size_t indexCount,
+            size_t indexOffset,
+            AZ::Data::Asset<AZ::RPI::BufferAsset> indexBuffer)
+        {
             lodCreator.BeginMesh();
-            lodCreator.SetMeshAabb(AZ::Aabb::CreateFromMinMax({-1.0f, -1.0f, -0.5f}, {1.0f, 1.0f, 0.5f}));
+            lodCreator.SetMeshAabb(AZ::Aabb::CreateFromMinMax({ -1.0f, -1.0f, -0.5f }, { 1.0f, 1.0f, 0.5f }));
             lodCreator.SetMeshMaterialSlot(AZ::Sfmt::GetInstance().Rand32());
 
-            {
-                AZ::Data::Asset<AZ::RPI::BufferAsset> indexBuffer = BuildTestBuffer(static_cast<uint32_t>(indicesCount), sizeof(uint32_t));
-                AZStd::copy(indices, indices + indicesCount, reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(indexBuffer->GetBuffer().data())));
-                lodCreator.SetMeshIndexBuffer({
-                    indexBuffer,
-                    AZ::RHI::BufferViewDescriptor::CreateStructured(0, static_cast<uint32_t>(indicesCount), sizeof(uint32_t))
-                });
-            }
+            AZStd::copy(
+                indices, indices + indexCount,
+                reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(indexBuffer->GetBuffer().data())) + indexOffset);
+            lodCreator.SetMeshIndexBuffer(
+                { indexBuffer,
+                  AZ::RHI::BufferViewDescriptor::CreateStructured(
+                      aznumeric_cast<uint32_t>(indexOffset), aznumeric_cast<uint32_t>(indexCount), sizeof(uint32_t)) });
+            AZStd::copy(
+                positions, positions + positionCount,
+                reinterpret_cast<float*>(const_cast<uint8_t*>(positionBuffer->GetBuffer().data())) + positionOffset);
+            lodCreator.AddMeshStreamBuffer(
+                AZ::RHI::ShaderSemantic(AZ::Name("POSITION")), AZ::Name(),
+                { positionBuffer,
+                  AZ::RHI::BufferViewDescriptor::CreateStructured(
+                      aznumeric_cast<uint32_t>(positionOffset / 3), aznumeric_cast<uint32_t>(positionCount / 3), sizeof(float) * 3) });
 
-            {
-                AZ::Data::Asset<AZ::RPI::BufferAsset> positionBuffer = BuildTestBuffer(static_cast<uint32_t>(positionCount / 3), sizeof(float) * 3);
-                AZStd::copy(positions, positions + positionCount, reinterpret_cast<float*>(const_cast<uint8_t*>(positionBuffer->GetBuffer().data())));
-                lodCreator.AddMeshStreamBuffer(
-                    AZ::RHI::ShaderSemantic(AZ::Name("POSITION")),
-                    AZ::Name(),
-                    {
-                        positionBuffer,
-                        AZ::RHI::BufferViewDescriptor::CreateStructured(0, static_cast<uint32_t>(positionCount / 3), sizeof(float) * 3)
-                    }
-                );
-            }
             lodCreator.EndMesh();
+        }
 
+        // overload of Add - here a new index/position buffer is created for the new data instead of potentially reusing an existing buffer
+        void Add(
+            AZ::RPI::ModelLodAssetCreator& lodCreator,
+            const float* positions,
+            size_t positionCount,
+            size_t positionOffset,
+            const uint32_t* indices,
+            size_t indexCount,
+            size_t indexOffset)
+        {
+            AZ::Data::Asset<AZ::RPI::BufferAsset> indexBuffer = BuildTestBuffer(aznumeric_cast<uint32_t>(indexCount), sizeof(uint32_t));
+            AZ::Data::Asset<AZ::RPI::BufferAsset> positionBuffer =
+                BuildTestBuffer(aznumeric_cast<uint32_t>(positionCount / 3), sizeof(float) * 3);
+
+            Add(lodCreator, positions, positionCount, positionOffset, positionBuffer, indices, indexCount, indexOffset, indexBuffer);
+        }
+
+        // complete the asset lod creation process
+        void End(AZ::RPI::ModelLodAssetCreator& lodCreator)
+        {
             AZ::Data::Asset<AZ::RPI::ModelLodAsset> lodAsset;
             lodCreator.End(lodAsset);
 
@@ -1199,7 +1241,7 @@ namespace UnitTest
         constexpr float rayLength = 100.0f;
         EXPECT_THAT(
             m_kdTree->RayIntersection(
-                AZ::Vector3::CreateZero(), AZ::Vector3::CreateAxisZ(-rayLength), t, normal), testing::Eq(true));
+                AZ::Vector3::CreateZero(), AZ::Vector3::CreateAxisZ(-rayLength), t, normal), testing::IsTrue());
         EXPECT_THAT(t, testing::FloatEq(0.005f));
     }
 
@@ -1210,7 +1252,7 @@ namespace UnitTest
 
         constexpr float rayLength = 10.0f;
         EXPECT_THAT(
-            m_kdTree->RayIntersection(AZ::Vector3::CreateAxisZ(0.75f), AZ::Vector3::CreateAxisZ(-rayLength), t, normal), testing::Eq(true));
+            m_kdTree->RayIntersection(AZ::Vector3::CreateAxisZ(0.75f), AZ::Vector3::CreateAxisZ(-rayLength), t, normal), testing::IsTrue());
         EXPECT_THAT(t, testing::FloatEq(0.025f));
     }
 
@@ -1288,7 +1330,7 @@ namespace UnitTest
         EXPECT_THAT(
             m_mesh->GetModel()->LocalRayIntersectionAgainstModel(
                 AZ::Vector3::CreateAxisZ(5.0f), -AZ::Vector3::CreateAxisZ(10.0f), AllowBruteForce, t, normal),
-            testing::Eq(true));
+            testing::IsTrue());
         EXPECT_THAT(t, testing::FloatEq(0.4f));
     }
 
@@ -1302,8 +1344,87 @@ namespace UnitTest
         EXPECT_THAT(
             m_mesh->GetModel()->LocalRayIntersectionAgainstModel(
                 AZ::Vector3::CreateAxisY(10.0f), -AZ::Vector3::CreateAxisY(9.0f), AllowBruteForce, t, normal),
-            testing::Eq(true));
+            testing::IsTrue());
         EXPECT_THAT(t, testing::FloatEq(1.0f));
         EXPECT_THAT(normal, IsClose(AZ::Vector3::CreateAxisY()));
     }
+
+    // test to verify that each secondary sub meshes are still intersected with correctly when using brute-force
+    // ray intersection
+    class BruteForceMultiModelIntersectsFixture : public ModelTests
+    {
+    public:
+        inline static const float QuadOffsetX = 15.0f;
+
+        void SetUp() override
+        {
+            ModelTests::SetUp();
+            m_mesh = AZStd::make_unique<TestMesh>();
+
+            AZ::RPI::ModelLodAssetCreator lodCreator;
+            m_mesh->Begin(lodCreator);
+
+            // take default quad positions and offset in X by set amount
+            AZStd::vector<float> offsetQuadPositions;
+            offsetQuadPositions.resize(QuadPositions.size());
+            AZStd::copy(QuadPositions.begin(), QuadPositions.end(), offsetQuadPositions.begin());
+            for (size_t xVertIndex = 0; xVertIndex < offsetQuadPositions.size(); xVertIndex += 3)
+            {
+                offsetQuadPositions[xVertIndex] += QuadOffsetX;
+            }
+
+            // create shared buffer to store cube and quad mesh in the same buffer
+            const size_t indicesCount = QuadIndices.size() + CubeIndices.size();
+            const size_t positionCount = QuadPositions.size() + CubePositions.size();
+            AZ::Data::Asset<AZ::RPI::BufferAsset> indexBuffer = BuildTestBuffer(aznumeric_cast<uint32_t>(indicesCount), sizeof(uint32_t));
+            AZ::Data::Asset<AZ::RPI::BufferAsset> positionBuffer =
+                BuildTestBuffer(aznumeric_cast<uint32_t>(positionCount / 3), sizeof(float) * 3);
+
+            // add the cube mesh
+            m_mesh->Add(
+                lodCreator, CubePositions.data(), CubePositions.size(), 0, positionBuffer, CubeIndices.data(), CubeIndices.size(), 0,
+                indexBuffer);
+            // add the quad mesh (offset by the cube position and index data into the same buffer)
+            m_mesh->Add(
+                lodCreator, offsetQuadPositions.data(), offsetQuadPositions.size(), /*offset=*/CubePositions.size(), positionBuffer,
+                QuadIndices.data(), QuadIndices.size(), /*offset=*/CubeIndices.size(), indexBuffer);
+
+            m_mesh->End(lodCreator);
+        }
+
+        void TearDown() override
+        {
+            m_mesh.reset();
+            ModelTests::TearDown();
+        }
+
+        AZStd::unique_ptr<TestMesh> m_mesh;
+        inline static constexpr bool AllowBruteForce = false;
+    };
+
+    TEST_F(BruteForceMultiModelIntersectsFixture, RayIntersectsWithFirstSubMesh)
+    {
+        float t = 0.0f;
+        AZ::Vector3 normal = AZ::Vector3::CreateOne(); // invalid starting normal
+        // fire a ray at the first sub mesh and ensure a successful hit is returned
+        EXPECT_THAT(
+            m_mesh->GetModel()->LocalRayIntersectionAgainstModel(
+                AZ::Vector3(0.0f, 0.0f, 5.0f), -AZ::Vector3::CreateAxisZ(10.0f), AllowBruteForce, t, normal),
+            testing::IsTrue());
+        EXPECT_THAT(t, testing::FloatEq(0.4f));
+        EXPECT_THAT(normal, IsClose(AZ::Vector3::CreateAxisZ()));
+    }
+
+    TEST_F(BruteForceMultiModelIntersectsFixture, RayIntersectsWithSecondSubMesh)
+    {
+        float t = 0.0f;
+        AZ::Vector3 normal = AZ::Vector3::CreateOne(); // invalid starting normal
+        // fire a ray at the second sub mesh and ensure a successful hit is returned
+        EXPECT_THAT(
+            m_mesh->GetModel()->LocalRayIntersectionAgainstModel(
+                AZ::Vector3(QuadOffsetX, 0.0f, 5.0f), -AZ::Vector3::CreateAxisZ(10.0f), AllowBruteForce, t, normal),
+            testing::IsTrue());
+        EXPECT_THAT(t, testing::FloatEq(0.5f));
+        EXPECT_THAT(normal, IsClose(AZ::Vector3::CreateAxisZ()));
+    }
 } // namespace UnitTest
diff --git a/Gems/Atom/RPI/Registry/atom_rpi.release.setreg b/Gems/Atom/RPI/Registry/atom_rpi.release.setreg
new file mode 100644
index 0000000000..72fb4f01e8
--- /dev/null
+++ b/Gems/Atom/RPI/Registry/atom_rpi.release.setreg
@@ -0,0 +1,9 @@
+{
+    "O3DE": {
+        "Atom": {
+            "RPI": {
+                "UseDebugFallbackImages": false
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/RPI/Registry/atom_rpi.setreg b/Gems/Atom/RPI/Registry/atom_rpi.setreg
index 16ce8b3bd7..fa3c13a81e 100644
--- a/Gems/Atom/RPI/Registry/atom_rpi.setreg
+++ b/Gems/Atom/RPI/Registry/atom_rpi.setreg
@@ -17,7 +17,8 @@
                     "DynamicDrawSystemDescriptor": {
                         "DynamicBufferPoolSize": 50331648 // 3 * 16 * 1024 * 1024 (for 3 frames)
                     }
-                }
+                },
+                "UseDebugFallbackImages": true
             }
         }
     }
diff --git a/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material b/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material
index 400044d29f..78f597b14f 100644
--- a/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material
+++ b/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material
@@ -33,7 +33,7 @@
         },
         "subsurfaceScattering": {
             "enableSubsurfaceScattering": true,
-            "influenceMap": "Objects/Lucy/Lucy_thickness.tif",
+            "influenceMap": "TestData/Textures/checker8x8_gray_512.png",
             "scatterDistance": 15.0,
             "subsurfaceScatterFactor": 0.4300000071525574,
             "thicknessMap": "Objects/Lucy/Lucy_thickness.tif",
@@ -47,8 +47,7 @@
                 0.3182879388332367,
                 0.16388189792633058,
                 1.0
-            ],
-            "useInfluenceMap": false
+            ]
         },
         "wrinkleLayers": {
             "baseColorMap1": "TestData/Textures/cc0/Lava004_1K_Color.jpg",
@@ -61,4 +60,4 @@
             "normalMap2": "TestData/Textures/TextureHaven/4k_castle_brick_02_red/4k_castle_brick_02_red_normal.png"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
index 40c8d7956e..e7e8208722 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt
@@ -42,6 +42,7 @@ ly_add_target(
             Gem::Atom_RHI.Reflect
             Gem::Atom_Feature_Common.Static
             Gem::Atom_Bootstrap.Headers
+            Gem::ImageProcessingAtom.Headers
 )
 
 ly_add_target(
@@ -60,6 +61,8 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             Gem::AtomToolsFramework.Static
+    RUNTIME_DEPENDENCIES
+        Gem::ImageProcessingAtom.Editor
 )
 
 ################################################################################
@@ -80,6 +83,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             PRIVATE
                 AZ::AzTest
                 AZ::AzTestShared
+                AZ::AzFrameworkTestShared
                 Gem::AtomToolsFramework.Static
                 Gem::Atom_Utils.TestUtils.Static
     )
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h
index d55755a242..9eaacbfa4f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h
@@ -58,7 +58,7 @@ namespace AtomToolsFramework
         void CreateStaticModules(AZStd::vector<AZ::Module*>& outModules) override;
         const char* GetCurrentConfigurationName() const override;
         void StartCommon(AZ::Entity* systemEntity) override;
-        void Tick(float deltaOverride = -1.f) override;
+        void Tick() override;
         void Stop() override;
 
     protected:
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h
index 96a8728a43..fc19aea2d3 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h
@@ -26,6 +26,21 @@ namespace AtomToolsFramework
         //! Get the combined output of all messages
         AZStd::string GetDump() const;
 
+        //! Return the number of OnAssert calls
+        size_t GetAssertCount() const;
+        
+        //! Return the number of OnException calls
+        size_t GetExceptionCount() const;
+        
+        //! Return the number of OnError calls, and includes OnAssert and OnException if @includeHigher is true
+        size_t GetErrorCount(bool includeHigher = false) const;
+        
+        //! Return the number of OnWarning calls, and includes higher categories if @includeHigher is true
+        size_t GetWarningCount(bool includeHigher = false) const;
+        
+        //! Return the number of OnPrintf calls, and includes higher categories if @includeHigher is true
+        size_t GetPrintfCount(bool includeHigher = false) const;
+
     private:
         //////////////////////////////////////////////////////////////////////////
         // AZ::Debug::TraceMessageBus::Handler overrides...
@@ -38,5 +53,11 @@ namespace AtomToolsFramework
 
         size_t m_maxMessageCount = std::numeric_limits<size_t>::max();
         AZStd::list<AZStd::string> m_messages;
+        
+        size_t m_assertCount = 0;
+        size_t m_exceptionCount = 0;
+        size_t m_errorCount = 0;
+        size_t m_warningCount = 0;
+        size_t m_printfCount = 0;
     };
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
index 08f59f9e0b..d27f2403a1 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
@@ -49,6 +49,7 @@ namespace AtomToolsFramework
     //! @param propertyValue the value being converted before saving
     bool ConvertToExportFormat(
         const AZStd::string& exportPath,
+        [[maybe_unused]] const AZ::Name& propertyId,
         const AZ::RPI::MaterialTypeSourceData::PropertyDefinition& propertyDefinition,
         AZ::RPI::MaterialPropertyValue& propertyValue);
 
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h
index 1ad6f69961..ab2b8b46c0 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h
@@ -8,8 +8,9 @@
 
 #pragma once
 
-#include <AzCore/PlatformDef.h>
 #include <AzCore/Asset/AssetManager.h>
+#include <AzCore/PlatformDef.h>
+#include <AzCore/Settings/SettingsRegistry.h>
 #include <AzCore/std/containers/vector.h>
 
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
@@ -18,11 +19,24 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnin
 #include <QStringList>
 AZ_POP_DISABLE_WARNING
 
+class QImage;
+
 namespace AtomToolsFramework
 {
+    template<typename T>
+    T GetSettingOrDefault(AZStd::string_view path, const T& defaultValue)
+    {
+        T result;
+        auto settingsRegistry = AZ::SettingsRegistry::Get();
+        return (settingsRegistry && settingsRegistry->Get(result, path)) ? result : defaultValue;
+    }
+
+    using LoadImageAsyncCallback = AZStd::function<void(const QImage&)>;
+    void LoadImageAsync(const AZStd::string& path, LoadImageAsyncCallback callback);
+
     QFileInfo GetSaveFileInfo(const QString& initialPath);
     QFileInfo GetOpenFileInfo(const AZStd::vector<AZ::Data::AssetType>& assetTypes);
     QFileInfo GetUniqueFileInfo(const QString& initialPath);
     QFileInfo GetDuplicationFileInfo(const QString& initialPath);
     bool LaunchTool(const QString& baseName, const QString& extension, const QStringList& arguments);
-}
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
index 1200cb3d79..c54ffc812b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
@@ -26,7 +26,7 @@ namespace AtomToolsFramework
 
         virtual AZ::Transform GetCameraTransform() const = 0;
         virtual void SetCameraTransform(const AZ::Transform& transform) = 0;
-        virtual void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) = 0;
+        virtual void ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) = 0;
     };
 
     //! A function object to represent returning a camera controller priority.
@@ -91,7 +91,7 @@ namespace AtomToolsFramework
         // ModularCameraViewportContext overrides ...
         AZ::Transform GetCameraTransform() const override;
         void SetCameraTransform(const AZ::Transform& transform) override;
-        void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) override;
+        void ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) override;
 
     private:
         AzFramework::ViewportId m_viewportId;
@@ -112,15 +112,16 @@ namespace AtomToolsFramework
         void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
 
         // ModularViewportCameraControllerRequestBus overrides ...
-        void InterpolateToTransform(const AZ::Transform& worldFromLocal) override;
-        AZ::Transform GetReferenceFrame() const override;
-        void SetReferenceFrame(const AZ::Transform& worldFromLocal) override;
-        void ClearReferenceFrame() override;
+        bool InterpolateToTransform(const AZ::Transform& worldFromLocal) override;
+        bool IsInterpolating() const override;
+        void StartTrackingTransform(const AZ::Transform& worldFromLocal) override;
+        void StopTrackingTransform() override;
+        bool IsTrackingTransform() const override;
 
     private:
-        //! Update the reference frame after a change has been made to the camera
-        //! view without updating the internal camera via user input.
-        void RefreshReferenceFrame();
+        //! Combine the current camera transform with any potential roll from the tracked
+        //! transform (this is usually zero).
+        AZ::Transform CombinedCameraTransform() const;
 
         //! The current mode the camera controller is in.
         enum class CameraMode
@@ -141,21 +142,21 @@ namespace AtomToolsFramework
         AzFramework::Camera m_camera; //!< The current camera state (pitch/yaw/position/look-distance).
         AzFramework::Camera m_targetCamera; //!< The target (next) camera state that m_camera is catching up to.
         AzFramework::Camera m_previousCamera; //!< The state of the camera from the previous frame.
-        AZStd::optional<AzFramework::Camera> m_storedCamera; //!< A potentially stored camera for when a custom reference frame is set.
+        AZStd::optional<AzFramework::Camera> m_storedCamera; //!< A potentially stored camera for when a transform is being tracked.
         AzFramework::CameraSystem m_cameraSystem; //!< The camera system responsible for managing all CameraInputs.
         AzFramework::CameraProps m_cameraProps; //!< Camera properties to control rotate and translate smoothness.
         CameraControllerPriorityFn m_priorityFn; //!< Controls at what priority the camera controller should respond to events.
 
         CameraAnimation m_cameraAnimation; //!< Camera animation state (used during CameraMode::Animation).
         CameraMode m_cameraMode = CameraMode::Control; //!< The current mode the camera is operating in.
-        //! An additional reference frame the camera can operate in (identity has no effect).
-        AZ::Transform m_referenceFrameOverride = AZ::Transform::CreateIdentity();
-        //! Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally).
-        bool m_updatingTransformInternally = false;
+        float m_roll = 0.0f; //!< The current amount of roll to be applied to the camera.
+        float m_targetRoll = 0.0f; //!< The target amount of roll to be applied to the camera (current will move towards this).
         //! Listen for camera view changes outside of the camera controller.
-        AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
+        AZ::RPI::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
         //! The current instance of the modular camera viewport context.
         AZStd::unique_ptr<ModularCameraViewportContext> m_modularCameraViewportContext;
+        //! Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally).
+        bool m_updatingTransformInternally = false;
     };
 
     //! Placeholder implementation for ModularCameraViewportContext (useful for verifying the interface).
@@ -164,10 +165,10 @@ namespace AtomToolsFramework
     public:
         AZ::Transform GetCameraTransform() const override;
         void SetCameraTransform(const AZ::Transform& transform) override;
-        void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) override;
+        void ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) override;
 
     private:
         AZ::Transform m_cameraTransform = AZ::Transform::CreateIdentity();
-        AZ::RPI::ViewportContext::MatrixChangedEvent m_viewMatrixChangedEvent;
+        AZ::RPI::MatrixChangedEvent m_viewMatrixChangedEvent;
     };
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
index ab397692e4..4422751d6b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
@@ -23,23 +23,31 @@ namespace AtomToolsFramework
     class ModularViewportCameraControllerRequests : public AZ::EBusTraits
     {
     public:
+        static inline constexpr float InterpolateToTransformDuration = 1.0f;
+
         using BusIdType = AzFramework::ViewportId;
         static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 
         //! Begin a smooth transition of the camera to the requested transform.
         //! @param worldFromLocal The transform of where the camera should end up.
-        virtual void InterpolateToTransform(const AZ::Transform& worldFromLocal) = 0;
+        //! @return Returns true if the call began an interpolation and false otherwise. Calls to InterpolateToTransform
+        //! will have no effect if an interpolation is currently in progress.
+        virtual bool InterpolateToTransform(const AZ::Transform& worldFromLocal) = 0;
 
-        //! Return the current reference frame.
-        //! @note If a reference frame has not been set or a frame has been cleared, this is just the identity.
-        virtual AZ::Transform GetReferenceFrame() const = 0;
+        //! Returns if the camera is currently interpolating to a new transform.
+        virtual bool IsInterpolating() const = 0;
 
-        //! Set a new reference frame other than the identity for the camera controller.
-        virtual void SetReferenceFrame(const AZ::Transform& worldFromLocal) = 0;
+        //! Start tracking a transform.
+        //! Store the current camera transform and move to the next camera transform.
+        virtual void StartTrackingTransform(const AZ::Transform& worldFromLocal) = 0;
 
-        //! Clear the current reference frame to restore the identity.
-        virtual void ClearReferenceFrame() = 0;
+        //! Stop tracking the set transform.
+        //! The previously stored camera transform is restored.
+        virtual void StopTrackingTransform() = 0;
+
+        //! Return if the tracking transform is set.
+        virtual bool IsTrackingTransform() const = 0;
 
     protected:
         ~ModularViewportCameraControllerRequests() = default;
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 8233658ded..3393897936 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
@@ -12,7 +12,7 @@
 #include <QElapsedTimer>
 #include <Atom/RPI.Public/Base.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
-#include <AzToolsFramework/Input/QtEventToAzInputManager.h>
+#include <AzToolsFramework/Input/QtEventToAzInputMapper.h>
 #include <AzFramework/Input/Events/InputChannelEventListener.h>
 #include <AzFramework/Scene/Scene.h>
 #include <AzFramework/Viewport/ViewportControllerInterface.h>
@@ -21,6 +21,7 @@
 #include <AzFramework/Windowing/WindowBus.h>
 #include <AzCore/Component/TickBus.h>
 #include <Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h>
+#include <AtomToolsFramework/Viewport/ViewportInteractionImpl.h>
 
 namespace AtomToolsFramework
 {
@@ -30,8 +31,8 @@ namespace AtomToolsFramework
     //! @see AZ::RPI::ViewportContext for Atom's API for setting up 
     class RenderViewportWidget
         : public QWidget
-        , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
         , public AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler
+        , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequests
         , public AzFramework::WindowRequestBus::Handler
         , protected AzFramework::InputChannelEventListener
         , protected AZ::TickBus::Handler
@@ -90,11 +91,11 @@ namespace AtomToolsFramework
         //! Input processing is enabled by default.
         void SetInputProcessingEnabled(bool enabled);
 
-        // AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler overrides ...
+        // ViewportInteractionRequests overrides ...
         AzFramework::CameraState GetCameraState() override;
         AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override;
-        AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override;
-        AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
+        AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) override;
+        AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportScreenToWorldRay(
             const AzFramework::ScreenPoint& screenPosition) override;
         float DeviceScalingFactor() override;
 
@@ -115,6 +116,7 @@ namespace AtomToolsFramework
         void ToggleFullScreenState() override;
         float GetDpiScaleFactor() const override;
         uint32_t GetSyncInterval() const override;
+        bool SetSyncInterval(uint32_t newSyncInterval) override;
         uint32_t GetDisplayRefreshRate() const override;
 
     protected:
@@ -149,5 +151,7 @@ namespace AtomToolsFramework
         AZ::ScriptTimePoint m_time;
         // Maps our internal Qt events into AzFramework InputChannels for our ViewportControllerList.
         AzToolsFramework::QtEventToAzInputMapper* m_inputChannelMapper = nullptr;
+        // Implementation of ViewportInteractionRequests (handles viewport picking operations).
+        AZStd::unique_ptr<ViewportInteractionImpl> m_viewportInteractionImpl;
     };
 } //namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h
new file mode 100644
index 0000000000..b6ad6e17d1
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <Atom/RPI.Public/Base.h>
+#include <Atom/RPI.Public/View.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <AzFramework/Viewport/CameraState.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+
+namespace AtomToolsFramework
+{
+    //! A concrete implementation of the ViewportInteractionRequestBus.
+    //! Primarily concerned with picking (screen to world and world to screen transformations).
+    class ViewportInteractionImpl
+        : public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
+        , private AZ::RPI::ViewportContextIdNotificationBus::Handler
+    {
+    public:
+        explicit ViewportInteractionImpl(AZ::RPI::ViewPtr viewPtr);
+
+        void Connect(AzFramework::ViewportId viewportId);
+        void Disconnect();
+
+        // ViewportInteractionRequestBus overrides ...
+        AzFramework::CameraState GetCameraState() override;
+        AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override;
+        AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) override;
+        AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportScreenToWorldRay(
+            const AzFramework::ScreenPoint& screenPosition) override;
+        float DeviceScalingFactor() override;
+
+        AZStd::function<AzFramework::ScreenSize()> m_screenSizeFn; //! Callback to determine the screen size.
+        AZStd::function<float()> m_deviceScalingFactorFn; //! Callback to determine the device scaling factor.
+
+    private:
+        // ViewportContextIdNotificationBus overrides ...
+        void OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view) override;
+
+        AZ::RPI::ViewPtr m_viewPtr;
+    };
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
index ba3bfe4718..0f21dcb70e 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
@@ -79,12 +79,18 @@ namespace AtomToolsFramework
         m_styleManager.reset(new AzQtComponents::StyleManager(this));
         m_styleManager->initialize(this, engineRootPath);
 
-        connect(&m_timer, &QTimer::timeout, this, [&]()
+        m_timer.setInterval(1);
+        connect(&m_timer, &QTimer::timeout, this, [this]()
         {
             this->PumpSystemEventLoopUntilEmpty();
             this->Tick();
         });
 
+        connect(this, &QGuiApplication::applicationStateChanged, this, [this]()
+        {
+            // Limit the update interval when not in focus to reduce power consumption and interference with other applications
+            this->m_timer.setInterval((applicationState() & Qt::ApplicationActive) ? 1 : 32);
+        });
     }
 
     AtomToolsApplication ::~AtomToolsApplication()
@@ -454,10 +460,10 @@ namespace AtomToolsFramework
         return false;
     }
 
-    void AtomToolsApplication::Tick(float deltaOverride)
+    void AtomToolsApplication::Tick()
     {
         TickSystem();
-        Base::Tick(deltaOverride);
+        Base::Tick();
 
         if (WasExitMainLoopRequested())
         {
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h
index 759b2558bf..ae60220314 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h
@@ -9,11 +9,13 @@
 #pragma once
 
 #include <AzCore/Module/Module.h>
+#include <AzToolsFramework/API/PythonLoader.h>
 
 namespace AtomToolsFramework
 {
     class AtomToolsFrameworkModule
         : public AZ::Module
+        , public AzToolsFramework::EmbeddedPython::PythonLoader
     {
     public:
         AZ_RTTI(AtomToolsFrameworkModule, "{B58B7CA8-98C9-4DC8-8607-E094989BBBE2}", AZ::Module);
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp
index 3fd069ff0b..5f8c8b9004 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp
@@ -31,6 +31,7 @@ namespace AtomToolsFramework
 
     bool TraceRecorder::OnAssert(const char* message)
     {
+        ++m_assertCount;
         if (m_messages.size() < m_maxMessageCount)
         {
             m_messages.push_back(AZStd::string::format("Assert: %s", message));
@@ -40,6 +41,7 @@ namespace AtomToolsFramework
 
     bool TraceRecorder::OnException(const char* message)
     {
+        ++m_exceptionCount;
         if (m_messages.size() < m_maxMessageCount)
         {
             m_messages.push_back(AZStd::string::format("Exception: %s", message));
@@ -49,6 +51,7 @@ namespace AtomToolsFramework
 
     bool TraceRecorder::OnError(const char* /*window*/, const char* message)
     {
+        ++m_errorCount;
         if (m_messages.size() < m_maxMessageCount)
         {
             m_messages.push_back(AZStd::string::format("Error: %s", message));
@@ -58,6 +61,7 @@ namespace AtomToolsFramework
 
     bool TraceRecorder::OnWarning(const char* /*window*/, const char* message)
     {
+        ++m_warningCount;
         if (m_messages.size() < m_maxMessageCount)
         {
             m_messages.push_back(AZStd::string::format("Warning: %s", message));
@@ -67,11 +71,58 @@ namespace AtomToolsFramework
 
     bool TraceRecorder::OnPrintf(const char* /*window*/, const char* message)
     {
+        ++m_printfCount;
         if (m_messages.size() < m_maxMessageCount)
         {
             m_messages.push_back(AZStd::string::format("%s", message));
         }
         return false;
+}
+    
+    size_t TraceRecorder::GetAssertCount() const
+    {
+        return m_assertCount;
+    }
+
+    size_t TraceRecorder::GetExceptionCount() const
+    {
+        return m_exceptionCount;
+    }
+
+    size_t TraceRecorder::GetErrorCount(bool includeHigher) const
+    {
+        if (includeHigher)
+        {
+            return m_errorCount + GetAssertCount() + GetExceptionCount();
+        }
+        else
+        {
+            return m_errorCount;
+        }
+    }
+
+    size_t TraceRecorder::GetWarningCount(bool includeHigher) const
+    {
+        if (includeHigher)
+        {
+            return m_warningCount + GetErrorCount(true);
+        }
+        else
+        {
+            return m_warningCount;
+        }
+    }
+
+    size_t TraceRecorder::GetPrintfCount(bool includeHigher) const
+    {
+        if (includeHigher)
+        {
+            return m_printfCount + GetWarningCount(true);
+        }
+        else
+        {
+            return m_printfCount;
+        }
     }
 
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp
index 00de2a7c4c..3a392c1413 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp
@@ -495,8 +495,6 @@ namespace AtomToolsFramework
             return AZ::Uuid::CreateNull();
         }
 
-        traceRecorder.GetDump().clear();
-
         bool openResult = false;
         AtomToolsDocumentRequestBus::EventResult(openResult, documentId, &AtomToolsDocumentRequestBus::Events::Open, requestedPath);
         if (!openResult)
@@ -507,6 +505,12 @@ namespace AtomToolsFramework
             AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::DestroyDocument, documentId);
             return AZ::Uuid::CreateNull();
         }
+        else if (traceRecorder.GetWarningCount(true) > 0)
+        {
+            QMessageBox::warning(
+                QApplication::activeWindow(), QString("Document opened with warnings"),
+                QString("Warnings encountered: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+        }
 
         return documentId;
     }
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRendererSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRendererSystemComponent.cpp
index d46e7b27be..28bd196a1d 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRendererSystemComponent.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRendererSystemComponent.cpp
@@ -10,6 +10,7 @@
 #include <AzCore/Serialization/EditContextConstants.inl>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <PreviewRenderer/PreviewRendererSystemComponent.h>
+#include <Atom/RPI.Public/RPISystemInterface.h>
 
 namespace AtomToolsFramework
 {
@@ -53,10 +54,15 @@ namespace AtomToolsFramework
         AZ::TickBus::QueueFunction(
             [this]()
             {
-                if (!m_previewRenderer)
+                // Only create a preview renderer if the RPI interface is fully initialized.  Otherwise the constructor will leave things
+                // in a bad state that can lead to crashing.
+                if (AZ::RPI::RPISystemInterface::Get()->IsInitialized())
                 {
-                    m_previewRenderer.reset(aznew AtomToolsFramework::PreviewRenderer(
-                        "PreviewRendererSystemComponent Preview Scene", "PreviewRendererSystemComponent Preview Pipeline"));
+                    if (!m_previewRenderer)
+                    {
+                        m_previewRenderer.reset(aznew AtomToolsFramework::PreviewRenderer(
+                            "PreviewRendererSystemComponent Preview Scene", "PreviewRendererSystemComponent Preview Pipeline"));
+                    }
                 }
             });
     }
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
index c49cd3fafb..3ffd8efa6e 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp
@@ -167,6 +167,7 @@ namespace AtomToolsFramework
 
     bool ConvertToExportFormat(
         const AZStd::string& exportPath,
+        [[maybe_unused]] const AZ::Name& propertyId,
         const AZ::RPI::MaterialTypeSourceData::PropertyDefinition& propertyDefinition,
         AZ::RPI::MaterialPropertyValue& propertyValue)
     {
@@ -175,7 +176,7 @@ namespace AtomToolsFramework
             const uint32_t index = propertyValue.GetValue<uint32_t>();
             if (index >= propertyDefinition.m_enumValues.size())
             {
-                AZ_Error("AtomToolsFramework", false, "Invalid value for material enum property: '%s'.", propertyDefinition.m_name.c_str());
+                AZ_Error("AtomToolsFramework", false, "Invalid value for material enum property: '%s'.", propertyId.GetCStr());
                 return false;
             }
 
@@ -186,18 +187,33 @@ namespace AtomToolsFramework
         // Image asset references must be converted from asset IDs to a relative source file path
         if (propertyDefinition.m_dataType == AZ::RPI::MaterialPropertyDataType::Image)
         {
+            AZStd::string imagePath;
+            AZ::Data::AssetId imageAssetId;
+
             if (propertyValue.Is<AZ::Data::Asset<AZ::RPI::ImageAsset>>())
             {
                 const auto& imageAsset = propertyValue.GetValue<AZ::Data::Asset<AZ::RPI::ImageAsset>>();
-                const auto& imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAsset.GetId());
-                propertyValue = GetExteralReferencePath(exportPath, imagePath);
-                return true;
+                imageAssetId = imageAsset.GetId();
             }
 
             if (propertyValue.Is<AZ::Data::Instance<AZ::RPI::Image>>())
             {
                 const auto& image = propertyValue.GetValue<AZ::Data::Instance<AZ::RPI::Image>>();
-                const auto& imagePath = image ? AZ::RPI::AssetUtils::GetSourcePathByAssetId(image->GetAssetId()) : "";
+                if (image)
+                {
+                    imageAssetId = image->GetAssetId();
+                }
+            }
+            
+            imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAssetId);
+
+            if (imageAssetId.IsValid() && imagePath.empty())
+            {
+                AZ_Error("AtomToolsFramework", false, "Image asset could not be found for property: '%s'.", propertyId.GetCStr());
+                return false;
+            }
+            else
+            {
                 propertyValue = GetExteralReferencePath(exportPath, imagePath);
                 return true;
             }
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp
index be112345a9..cd50c10e23 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp
@@ -6,15 +6,18 @@
  *
  */
 
+#include <Atom/ImageProcessing/ImageObject.h>
+#include <Atom/ImageProcessing/ImageProcessingBus.h>
 #include <AtomToolsFramework/Util/Util.h>
 #include <AzCore/IO/SystemFile.h>
+#include <AzCore/Jobs/JobFunction.h>
 #include <AzCore/StringFunc/StringFunc.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzQtComponents/Components/Widgets/FileDialog.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
 #include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
 #include <QApplication>
@@ -24,6 +27,36 @@ AZ_POP_DISABLE_WARNING
 
 namespace AtomToolsFramework
 {
+    void LoadImageAsync(const AZStd::string& path, LoadImageAsyncCallback callback)
+    {
+        AZ::Job* job = AZ::CreateJobFunction(
+            [path, callback]()
+            {
+                ImageProcessingAtom::IImageObjectPtr imageObject;
+                ImageProcessingAtom::ImageProcessingRequestBus::BroadcastResult(
+                    imageObject, &ImageProcessingAtom::ImageProcessingRequests::LoadImagePreview, path);
+
+                if (imageObject)
+                {
+                    AZ::u8* imageBuf = nullptr;
+                    AZ::u32 pitch = 0;
+                    AZ::u32 mip = 0;
+                    imageObject->GetImagePointer(mip, imageBuf, pitch);
+                    const AZ::u32 width = imageObject->GetWidth(mip);
+                    const AZ::u32 height = imageObject->GetHeight(mip);
+
+                    QImage image(imageBuf, width, height, pitch, QImage::Format_RGBA8888);
+
+                    if (callback)
+                    {
+                        callback(image);
+                    }
+                }
+            },
+            true);
+        job->Start();
+    }
+
     QFileInfo GetSaveFileInfo(const QString& initialPath)
     {
         const QFileInfo initialFileInfo(initialPath);
@@ -133,29 +166,12 @@ namespace AtomToolsFramework
 
     bool LaunchTool(const QString& baseName, const QString& extension, const QStringList& arguments)
     {
-        const char* engineRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-        AZ_Assert(engineRoot != nullptr, "AzFramework::ApplicationRequests::GetEngineRoot failed");
+        AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
+        AZ_Assert(!engineRoot.empty(), "Cannot query Engine Path");
 
-        char binFolderName[AZ_MAX_PATH_LEN] = {};
-        AZ::Utils::GetExecutablePathReturnType ret = AZ::Utils::GetExecutablePath(binFolderName, AZ_MAX_PATH_LEN);
+        AZ::IO::FixedMaxPath launchPath = AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory())
+            / (baseName + extension).toUtf8().constData();
 
-        // If it contains the filename, zero out the last path separator character...
-        if (ret.m_pathIncludesFilename)
-        {
-            char* lastSlash = strrchr(binFolderName, AZ_CORRECT_FILESYSTEM_SEPARATOR);
-            if (lastSlash)
-            {
-                *lastSlash = '\0';
-            }
-        }
-
-        const QString path = QString("%1%2%3%4")
-            .arg(binFolderName)
-            .arg(AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING)
-            .arg(baseName)
-            .arg(extension);
-
-        return QProcess::startDetached(path, arguments, engineRoot);
+        return QProcess::startDetached(launchPath.c_str(), arguments, engineRoot.c_str());
     }
 }
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
index a92bfdbcdb..12e16c3dfa 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
@@ -12,6 +12,7 @@
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Math/Color.h>
+#include <AzCore/std/math.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/Viewport/ScreenGeometry.h>
@@ -85,7 +86,7 @@ namespace AtomToolsFramework
         }
     }
 
-    void ModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler)
+    void ModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler)
     {
         if (auto viewportContext = RetrieveViewportContext(m_viewportId))
         {
@@ -175,20 +176,16 @@ namespace AtomToolsFramework
             // ignore these updates if the camera is being updated internally
             if (!m_updatingTransformInternally)
             {
-                if (m_storedCamera.has_value())
-                {
-                    // if an external change occurs ensure we update the stored reference frame if one is set
-                    RefreshReferenceFrame();
-                    return;
-                }
-
                 m_previousCamera = m_targetCamera;
-                UpdateCameraFromTransform(m_targetCamera, m_modularCameraViewportContext->GetCameraTransform());
-                m_camera = m_targetCamera;
+
+                const AZ::Transform transform = m_modularCameraViewportContext->GetCameraTransform();
+                const AZ::Vector3 eulerAngles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(transform));
+                UpdateCameraFromTranslationAndRotation(m_targetCamera, transform.GetTranslation(), eulerAngles);
+                m_targetRoll = eulerAngles.GetY();
             }
         };
 
-        m_cameraViewMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
+        m_cameraViewMatrixChangeHandler = AZ::RPI::MatrixChangedEvent::Handler(handleCameraChange);
         m_modularCameraViewportContext->ConnectViewMatrixChangedHandler(m_cameraViewMatrixChangeHandler);
 
         ModularViewportCameraControllerRequestBus::Handler::BusConnect(viewportId);
@@ -227,7 +224,9 @@ namespace AtomToolsFramework
         {
             m_targetCamera = m_cameraSystem.StepCamera(m_targetCamera, event.m_deltaTime.count());
             m_camera = AzFramework::SmoothCamera(m_camera, m_targetCamera, m_cameraProps, event.m_deltaTime.count());
-            m_modularCameraViewportContext->SetCameraTransform(m_referenceFrameOverride * m_camera.Transform());
+            m_roll = AzFramework::SmoothValue(m_targetRoll, m_roll, m_cameraProps.m_rotateSmoothnessFn(), event.m_deltaTime.count());
+
+            m_modularCameraViewportContext->SetCameraTransform(CombinedCameraTransform());
         }
         else if (m_cameraMode == CameraMode::Animation)
         {
@@ -236,7 +235,10 @@ namespace AtomToolsFramework
                 return t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f);
             };
 
-            m_cameraAnimation.m_time = AZ::GetClamp(m_cameraAnimation.m_time + event.m_deltaTime.count(), 0.0f, 1.0f);
+            m_cameraAnimation.m_time = AZ::GetClamp(
+                m_cameraAnimation.m_time +
+                    (event.m_deltaTime.count() / ModularViewportCameraControllerRequests::InterpolateToTransformDuration),
+                0.0f, 1.0f);
 
             const auto& [transformStart, transformEnd, animationTime] = m_cameraAnimation;
 
@@ -250,6 +252,7 @@ namespace AtomToolsFramework
             m_camera.m_yaw = eulerAngles.GetZ();
             m_camera.m_pivot = current.GetTranslation();
             m_camera.m_offset = AZ::Vector3::CreateZero();
+            m_targetRoll = eulerAngles.GetY();
             m_targetCamera = m_camera;
 
             m_modularCameraViewportContext->SetCameraTransform(current);
@@ -257,55 +260,59 @@ namespace AtomToolsFramework
             if (animationTime >= 1.0f)
             {
                 m_cameraMode = CameraMode::Control;
-                RefreshReferenceFrame();
             }
         }
 
         m_updatingTransformInternally = false;
     }
 
-    void ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal)
+    bool ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal)
     {
-        m_cameraMode = CameraMode::Animation;
-        m_cameraAnimation = CameraAnimation{ m_referenceFrameOverride * m_camera.Transform(), worldFromLocal, 0.0f };
+        if (!IsInterpolating())
+        {
+            m_cameraMode = CameraMode::Animation;
+            m_cameraAnimation = CameraAnimation{ CombinedCameraTransform(), worldFromLocal, 0.0f };
+
+            return true;
+        }
+
+        return false;
     }
 
-    AZ::Transform ModularViewportCameraControllerInstance::GetReferenceFrame() const
+    bool ModularViewportCameraControllerInstance::IsInterpolating() const
     {
-        return m_referenceFrameOverride;
+        return m_cameraMode == CameraMode::Animation;
     }
 
-    void ModularViewportCameraControllerInstance::SetReferenceFrame(const AZ::Transform& worldFromLocal)
+    void ModularViewportCameraControllerInstance::StartTrackingTransform(const AZ::Transform& worldFromLocal)
     {
         if (!m_storedCamera.has_value())
         {
             m_storedCamera = m_previousCamera;
         }
 
-        m_referenceFrameOverride = worldFromLocal;
-        m_targetCamera.m_pitch = 0.0f;
-        m_targetCamera.m_yaw = 0.0f;
+        const auto angles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromQuaternion(worldFromLocal.GetRotation()));
+        m_targetCamera.m_pitch = angles.GetX();
+        m_targetCamera.m_yaw = angles.GetZ();
         m_targetCamera.m_offset = AZ::Vector3::CreateZero();
-        m_targetCamera.m_pivot = AZ::Vector3::CreateZero();
-        m_camera = m_targetCamera;
+        m_targetCamera.m_pivot = worldFromLocal.GetTranslation();
+        m_targetRoll = angles.GetY();
     }
 
-    void ModularViewportCameraControllerInstance::ClearReferenceFrame()
+    void ModularViewportCameraControllerInstance::StopTrackingTransform()
     {
-        m_referenceFrameOverride = AZ::Transform::CreateIdentity();
-
         if (m_storedCamera.has_value())
         {
             m_targetCamera = m_storedCamera.value();
-            m_camera = m_targetCamera;
+            m_targetRoll = 0.0f;
         }
 
         m_storedCamera.reset();
     }
 
-    void ModularViewportCameraControllerInstance::RefreshReferenceFrame()
+    bool ModularViewportCameraControllerInstance::IsTrackingTransform() const
     {
-        m_referenceFrameOverride = m_modularCameraViewportContext->GetCameraTransform() * m_camera.Transform().GetInverse();
+        return m_storedCamera.has_value();
     }
 
     AZ::Transform PlaceholderModularCameraViewportContextImpl::GetCameraTransform() const
@@ -316,12 +323,17 @@ namespace AtomToolsFramework
     void PlaceholderModularCameraViewportContextImpl::SetCameraTransform(const AZ::Transform& transform)
     {
         m_cameraTransform = transform;
-        m_viewMatrixChangedEvent.Signal(AzFramework::CameraViewFromCameraTransform(Matrix4x4FromTransform(transform)));
+        m_viewMatrixChangedEvent.Signal(
+            AZ::Matrix4x4::CreateFromMatrix3x4(AzFramework::CameraViewFromCameraTransform(AZ::Matrix3x4::CreateFromTransform(transform))));
     }
 
-    void PlaceholderModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(
-        AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler)
+    void PlaceholderModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler)
     {
         handler.Connect(m_viewMatrixChangedEvent);
     }
+
+    AZ::Transform ModularViewportCameraControllerInstance::CombinedCameraTransform() const
+    {
+        return m_camera.Transform() * AZ::Transform::CreateFromMatrix3x3(AZ::Matrix3x3::CreateRotationY(m_targetRoll));
+    }
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
index bed4778e8e..f6efdc57b8 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
@@ -75,7 +75,11 @@ namespace AtomToolsFramework
         m_defaultCamera = AZ::RPI::View::CreateView(cameraName, AZ::RPI::View::UsageFlags::UsageCamera);
         AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get()->PushView(m_viewportContext->GetName(), m_defaultCamera);
 
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(GetId());
+        m_viewportInteractionImpl = AZStd::make_unique<ViewportInteractionImpl>(m_defaultCamera);
+        m_viewportInteractionImpl->m_deviceScalingFactorFn = [this] { return aznumeric_cast<float>(devicePixelRatioF()); };
+        m_viewportInteractionImpl->m_screenSizeFn = [this] { return AzFramework::ScreenSize(width(), height()); };
+        m_viewportInteractionImpl->Connect(id);
+
         AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusConnect(GetId());
         AzFramework::InputChannelEventListener::Connect();
         AZ::TickBus::Handler::BusConnect();
@@ -107,7 +111,7 @@ namespace AtomToolsFramework
         AZ::TickBus::Handler::BusDisconnect();
         AzFramework::InputChannelEventListener::Disconnect();
         AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusDisconnect();
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect();
+        m_viewportInteractionImpl->Disconnect();
     }
 
     void RenderViewportWidget::LockRenderTargetSize(uint32_t width, uint32_t height)
@@ -290,77 +294,23 @@ namespace AtomToolsFramework
 
     AzFramework::CameraState RenderViewportWidget::GetCameraState()
     {
-        AZ::RPI::ViewPtr currentView = m_viewportContext->GetDefaultView();
-        if (currentView == nullptr)
-        {
-            return {};
-        }
-
-        // Build camera state from Atom camera transforms
-        AzFramework::CameraState cameraState = AzFramework::CreateCameraFromWorldFromViewMatrix(
-            currentView->GetViewToWorldMatrix(),
-            AZ::Vector2{aznumeric_cast<float>(width()), aznumeric_cast<float>(height())}
-        );
-        AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(cameraState, currentView->GetViewToClipMatrix());
-
-        // Convert from Z-up
-        AZStd::swap(cameraState.m_forward, cameraState.m_up);
-        cameraState.m_forward = -cameraState.m_forward;
-
-        return cameraState;
+        return m_viewportInteractionImpl->GetCameraState();
     }
 
     AzFramework::ScreenPoint RenderViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
     {
-        if (AZ::RPI::ViewPtr currentView = m_viewportContext->GetDefaultView();
-            currentView == nullptr)
-        {
-            return AzFramework::ScreenPoint(0, 0);
-        }
-
-        return AzFramework::WorldToScreen(worldPosition, GetCameraState());
+        return m_viewportInteractionImpl->ViewportWorldToScreen(worldPosition);
     }
 
-    AZStd::optional<AZ::Vector3> RenderViewportWidget::ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth)
+    AZ::Vector3 RenderViewportWidget::ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition)
     {
-        const auto& cameraProjection = m_viewportContext->GetCameraProjectionMatrix();
-        const auto& cameraView = m_viewportContext->GetCameraViewMatrix();
-
-        const AZ::Vector4 normalizedScreenPosition {
-            screenPosition.m_x * 2.f / width() - 1.0f,
-            (height() - screenPosition.m_y) * 2.f / height() - 1.0f,
-            1.f - depth, // [GFX TODO] [ATOM-1501] Currently we always assume reverse depth
-            1.f
-        };
-
-        AZ::Matrix4x4 worldFromScreen = cameraProjection * cameraView;
-        worldFromScreen.InvertFull();
-
-        const AZ::Vector4 projectedPosition = worldFromScreen * normalizedScreenPosition;
-        if (projectedPosition.GetW() == 0.0f)
-        {
-            return {};
-        }
-
-        return projectedPosition.GetAsVector3() / projectedPosition.GetW();
+        return m_viewportInteractionImpl->ViewportScreenToWorld(screenPosition);
     }
 
-    AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> RenderViewportWidget::ViewportScreenToWorldRay(
+    AzToolsFramework::ViewportInteraction::ProjectedViewportRay RenderViewportWidget::ViewportScreenToWorldRay(
         const AzFramework::ScreenPoint& screenPosition)
     {
-        auto pos0 = ViewportScreenToWorld(screenPosition, 0.f);
-        auto pos1 = ViewportScreenToWorld(screenPosition, 1.f);
-        if (!pos0.has_value() || !pos1.has_value())
-        {
-            return {};
-        }
-
-        pos0 = m_viewportContext->GetDefaultView()->GetViewToWorldMatrix().GetTranslation();
-        AZ::Vector3 rayOrigin = pos0.value();
-        AZ::Vector3 rayDirection = pos1.value() - pos0.value();
-        rayDirection.Normalize();
-
-        return AzToolsFramework::ViewportInteraction::ProjectedViewportRay{rayOrigin, rayDirection};
+        return m_viewportInteractionImpl->ViewportScreenToWorldRay(screenPosition);
     }
 
     float RenderViewportWidget::DeviceScalingFactor()
@@ -445,4 +395,11 @@ namespace AtomToolsFramework
     {
         return 1;
     }
+
+    // Editor ignores requests to change the sync interval
+    bool RenderViewportWidget::SetSyncInterval(uint32_t /*ignored*/)
+    {
+        return false;
+    }
+
 } //namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp
new file mode 100644
index 0000000000..7ae3175e03
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AtomToolsFramework/Viewport/ViewportInteractionImpl.h>
+#include <AzFramework/Viewport/ViewportScreen.h>
+
+namespace AtomToolsFramework
+{
+    ViewportInteractionImpl::ViewportInteractionImpl(AZ::RPI::ViewPtr viewPtr)
+        : m_viewPtr(AZStd::move(viewPtr))
+    {
+    }
+
+    void ViewportInteractionImpl::Connect(const AzFramework::ViewportId viewportId)
+    {
+        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(viewportId);
+        AZ::RPI::ViewportContextIdNotificationBus::Handler::BusConnect(viewportId);
+    }
+
+    void ViewportInteractionImpl::Disconnect()
+    {
+        AZ::RPI::ViewportContextIdNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect();
+    }
+
+    AzFramework::CameraState ViewportInteractionImpl::GetCameraState()
+    {
+        // build camera state from atom camera transforms
+        AzFramework::CameraState cameraState =
+            AzFramework::CreateDefaultCamera(m_viewPtr->GetCameraTransform(), AzFramework::Vector2FromScreenSize(m_screenSizeFn()));
+        AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(cameraState, m_viewPtr->GetViewToClipMatrix());
+        return cameraState;
+    }
+
+    AzFramework::ScreenPoint ViewportInteractionImpl::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
+    {
+        return AzFramework::WorldToScreen(worldPosition, GetCameraState());
+    }
+
+    AZ::Vector3 ViewportInteractionImpl::ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition)
+    {
+        return AzFramework::ScreenToWorld(screenPosition, GetCameraState());
+    }
+
+    AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportInteractionImpl::ViewportScreenToWorldRay(
+        const AzFramework::ScreenPoint& screenPosition)
+    {
+        return AzToolsFramework::ViewportInteraction::ViewportScreenToWorldRay(GetCameraState(), screenPosition);
+    }
+
+    float ViewportInteractionImpl::DeviceScalingFactor()
+    {
+        return m_deviceScalingFactorFn();
+    }
+
+    void ViewportInteractionImpl::OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view)
+    {
+        m_viewPtr = AZStd::move(view);
+    }
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp
index aeca51230a..f07fd9c536 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp
@@ -50,8 +50,9 @@ namespace AtomToolsFramework
 
     void AtomToolsMainWindow::ActivateWindow()
     {
-        activateWindow();
+        show();
         raise();
+        activateWindow();
     }
 
     bool AtomToolsMainWindow::AddDockWidget(const AZStd::string& name, QWidget* widget, uint32_t area, uint32_t orientation)
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
index df16cfbc43..3124372bd2 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp
@@ -12,16 +12,25 @@
 
 namespace UnitTest
 {
+    class AtomToolsFrameworkTestEnvironment : public AZ::Test::ITestEnvironment
+    {
+    protected:
+        void SetupEnvironment() override
+        {
+            AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
+        }
+
+        void TeardownEnvironment() override
+        {
+            AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
+        }
+    };
+
     class AtomToolsFrameworkTest : public ::testing::Test
     {
     protected:
         void SetUp() override
         {
-            if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
-            {
-                AZ::AllocatorInstance<AZ::SystemAllocator>::Create(AZ::SystemAllocator::Descriptor());
-            }
-
             m_assetSystemStub.Activate();
 
             RegisterSourceAsset("objects/upgrades/materials/supercondor.material");
@@ -38,11 +47,6 @@ namespace UnitTest
         void TearDown() override
         {
             m_assetSystemStub.Deactivate();
-
-            if (AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
-            {
-                AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-            }
         }
 
         void RegisterSourceAsset(const AZStd::string& path)
@@ -73,5 +77,5 @@ namespace UnitTest
         ASSERT_EQ(AtomToolsFramework::GetExteralReferencePath("d:/project/assets/objects/upgrades/materials/supercondor.material", "d:/project/assets/materials/condor.material", 0), "materials/condor.material");
     }
 
-    AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
+    AZ_UNIT_TEST_HOOK(new AtomToolsFrameworkTestEnvironment);
 } // namespace UnitTest
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp
new file mode 100644
index 0000000000..19c55d7473
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Atom/RPI.Public/View.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
+#include <AzCore/Math/IntersectSegment.h>
+#include <AzCore/Math/MatrixUtils.h>
+#include <AzCore/Name/NameDictionary.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzFramework/Viewport/ScreenGeometry.h>
+#include <AzFramework/Viewport/ViewportScreen.h>
+#include <AzTest/AzTest.h>
+#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
+#include <Tests/Utils/Printers.h>
+
+namespace UnitTest
+{
+    class ViewportInteractionImplFixture : public ::testing::Test
+    {
+    public:
+        static inline constexpr AzFramework::ViewportId TestViewportId = 1234;
+        static inline constexpr AzFramework::ScreenSize ScreenDimensions = AzFramework::ScreenSize(1280, 720);
+
+        static AzFramework::ScreenPoint ScreenCenter()
+        {
+            const auto halfScreenDimensions = ScreenDimensions * 0.5f;
+            return AzFramework::ScreenPoint(halfScreenDimensions.m_width, halfScreenDimensions.m_height);
+        }
+
+        void SetUp() override
+        {
+            AZ::NameDictionary::Create();
+
+            m_view = AZ::RPI::View::CreateView(AZ::Name("TestView"), AZ::RPI::View::UsageCamera);
+
+            const auto aspectRatio = aznumeric_cast<float>(ScreenDimensions.m_width) / aznumeric_cast<float>(ScreenDimensions.m_height);
+
+            AZ::Matrix4x4 viewToClipMatrix;
+            AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::DegToRad(60.0f), aspectRatio, 0.1f, 1000.f, true);
+            m_view->SetViewToClipMatrix(viewToClipMatrix);
+
+            m_viewportInteractionImpl = AZStd::make_unique<AtomToolsFramework::ViewportInteractionImpl>(m_view);
+
+            m_viewportInteractionImpl->m_deviceScalingFactorFn = []
+            {
+                return 1.0f;
+            };
+            m_viewportInteractionImpl->m_screenSizeFn = []
+            {
+                return ScreenDimensions;
+            };
+
+            m_viewportInteractionImpl->Connect(TestViewportId);
+        }
+
+        void TearDown() override
+        {
+            m_viewportInteractionImpl->Disconnect();
+            m_viewportInteractionImpl.reset();
+
+            m_view.reset();
+
+            AZ::NameDictionary::Destroy();
+        }
+
+        AZ::RPI::ViewPtr m_view;
+        AZStd::unique_ptr<AtomToolsFramework::ViewportInteractionImpl> m_viewportInteractionImpl;
+    };
+
+    // transform a point from screen space to world space, and then from world space back to screen space
+    AzFramework::ScreenPoint ScreenToWorldToScreen(
+        const AzFramework::ScreenPoint& screenPoint,
+        AzToolsFramework::ViewportInteraction::ViewportInteractionRequests& viewportInteractionRequests)
+    {
+        const auto worldResult = viewportInteractionRequests.ViewportScreenToWorld(screenPoint);
+        return viewportInteractionRequests.ViewportWorldToScreen(worldResult);
+    }
+
+    TEST_F(ViewportInteractionImplFixture, ViewportInteractionRequestsMapsFromScreenToWorldAndBack)
+    {
+        using AzFramework::ScreenPoint;
+
+        m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(90.0f)), AZ::Vector3(10.0f, 0.0f, 5.0f)));
+
+        {
+            const auto expectedScreenPoint = ScreenPoint{ 600, 450 };
+            const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl);
+            EXPECT_EQ(resultScreenPoint, expectedScreenPoint);
+        }
+
+        {
+            auto expectedScreenPoint = ScreenCenter();
+            const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl);
+            EXPECT_EQ(resultScreenPoint, expectedScreenPoint);
+        }
+
+        {
+            const auto expectedScreenPoint = ScreenPoint{ 0, 0 };
+            const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl);
+            EXPECT_EQ(resultScreenPoint, expectedScreenPoint);
+        }
+
+        {
+            const auto expectedScreenPoint = ScreenPoint{ ScreenDimensions.m_width, ScreenDimensions.m_height };
+            const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl);
+            EXPECT_EQ(resultScreenPoint, expectedScreenPoint);
+        }
+    }
+
+    TEST_F(ViewportInteractionImplFixture, ScreenToWorldReturnsPositionOnNearClipPlaneInWorldSpace)
+    {
+        m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-90.0f)), AZ::Vector3(20.0f, 0.0f, 0.0f)));
+
+        const auto worldResult = m_viewportInteractionImpl->ViewportScreenToWorld(ScreenCenter());
+        EXPECT_THAT(worldResult, IsClose(AZ::Vector3(20.1f, 0.0f, 0.0f)));
+    }
+
+    // note: values produced by reproducing in the editor viewport
+    TEST_F(ViewportInteractionImplFixture, WorldToScreenGivesExpectedScreenCoordinates)
+    {
+        using AzFramework::ScreenPoint;
+
+        {
+            m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(160.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-18.0f)),
+                AZ::Vector3(-21.0f, 2.5f, 6.0f)));
+
+            const auto screenResult = m_viewportInteractionImpl->ViewportWorldToScreen(AZ::Vector3(-21.0f, -1.5f, 5.0f));
+            EXPECT_EQ(screenResult, ScreenPoint(420, 326));
+        }
+
+        {
+            m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(175.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-90.0f)),
+                AZ::Vector3(-10.0f, -11.0f, 2.5f)));
+
+            const auto screenResult = m_viewportInteractionImpl->ViewportWorldToScreen(AZ::Vector3(-10.0f, -10.5f, 0.5f));
+            EXPECT_EQ(screenResult, ScreenPoint(654, 515));
+        }
+
+        {
+            m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(70.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(65.0f)),
+                AZ::Vector3(-22.5f, -10.0f, 1.5f)));
+
+            const auto screenResult = m_viewportInteractionImpl->ViewportWorldToScreen(AZ::Vector3(-23.0f, -9.5f, 3.0f));
+            EXPECT_EQ(screenResult, ScreenPoint(754, 340));
+        }
+    }
+
+    TEST_F(ViewportInteractionImplFixture, ScreenToWorldRayGivesGivesExpectedOriginAndDirection)
+    {
+        using AzFramework::ScreenPoint;
+
+        m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(34.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-24.0f)),
+            AZ::Vector3(-9.3f, -9.8f, 4.0f)));
+
+        const auto ray = m_viewportInteractionImpl->ViewportScreenToWorldRay(ScreenPoint(832, 226));
+
+        float unused;
+        auto intersection = AZ::Intersect::IntersectRaySphere(ray.origin, ray.direction, AZ::Vector3(-14.0f, 5.7f, 0.75f), 0.5f, unused);
+
+        EXPECT_EQ(intersection, AZ::Intersect::SphereIsectTypes::ISECT_RAY_SPHERE_ISECT);
+    }
+
+    TEST_F(ViewportInteractionImplFixture, ViewportInteractionRequestsReturnsNewViewWhenItIsChanged)
+    {
+        // Given
+        const auto primaryViewTransform = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(90.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-45.0f)),
+            AZ::Vector3(-10.0f, -15.0f, 20.0f));
+
+        m_view->SetCameraTransform(primaryViewTransform);
+
+        AZ::RPI::ViewPtr secondaryView = AZ::RPI::View::CreateView(AZ::Name("SecondaryView"), AZ::RPI::View::UsageCamera);
+
+        const auto secondaryViewTransform = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation(
+            AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-90.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(30.0f)),
+            AZ::Vector3(-50.0f, -25.0f, 10.0f));
+
+        secondaryView->SetCameraTransform(secondaryViewTransform);
+
+        // When
+        AZ::RPI::ViewportContextIdNotificationBus::Event(
+            TestViewportId, &AZ::RPI::ViewportContextIdNotificationBus::Events::OnViewportDefaultViewChanged, secondaryView);
+
+        // retrieve updated camera transform
+        AzFramework::CameraState cameraState;
+        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+            cameraState, TestViewportId, &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState);
+
+        const auto cameraTransform = AzFramework::CameraTransform(cameraState);
+
+        // Then
+        // camera transform matches that of the secondary view
+        EXPECT_THAT(cameraTransform, IsClose(secondaryViewTransform));
+    }
+} // namespace UnitTest
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
index a2446cebcc..3ddcc05245 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
@@ -28,6 +28,7 @@ set(FILES
     Include/AtomToolsFramework/Util/MaterialPropertyUtil.h
     Include/AtomToolsFramework/Util/Util.h
     Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+    Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h
     Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
     Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
     Include/AtomToolsFramework/Window/AtomToolsMainWindow.h
@@ -55,6 +56,7 @@ set(FILES
     Source/Util/Util.cpp
     Source/Viewport/RenderViewportWidget.cpp
     Source/Viewport/ModularViewportCameraController.cpp
+    Source/Viewport/ViewportInteractionImpl.cpp
     Source/Window/AtomToolsMainWindow.cpp
     Source/Window/AtomToolsMainWindowSystemComponent.cpp
     Source/Window/AtomToolsMainWindowSystemComponent.h
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake
index bd9ad9b3d8..a071d29f47 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake
@@ -8,4 +8,5 @@
 
 set(FILES
     Tests/AtomToolsFrameworkTest.cpp
+    Tests/ViewportInteractionImplTests.cpp
 )
\ No newline at end of file
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
index d585e81162..99beb721d6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
@@ -60,7 +60,6 @@ ly_add_target(
             Gem::AtomToolsFramework.Editor
             Gem::Atom_RPI.Public
             Gem::Atom_Feature_Common.Public
-            Gem::ImageProcessingAtom.Headers
 )
 
 ly_add_target(
@@ -113,7 +112,6 @@ ly_add_target(
     RUNTIME_DEPENDENCIES
         Gem::AtomToolsFramework.Editor
         Gem::EditorPythonBindings.Editor
-        Gem::ImageProcessingAtom.Editor
 )
 
 ly_set_gem_variant_to_load(TARGETS MaterialEditor VARIANTS Tools)
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
index e859d6a433..e37512127c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h
@@ -62,15 +62,6 @@ namespace MaterialEditor
         //! Get set of lighting preset names
         virtual MaterialViewportPresetNameSet GetLightingPresetNames() const = 0;
 
-        //! Set lighting preset preview image
-        //! @param preset used to set preview image
-        //! @param preview image
-        virtual void SetLightingPresetPreview(AZ::Render::LightingPresetPtr preset, const QImage& image) = 0;
-
-        //! Get lighting preset preview image
-        //! @param preset used to find preview image
-        virtual QImage GetLightingPresetPreview(AZ::Render::LightingPresetPtr preset) const = 0;
-
         //! Get model preset last save path
         //! @param preset to lookup last save path
         virtual AZStd::string GetLightingPresetLastSavePath(AZ::Render::LightingPresetPtr preset) const = 0;
@@ -108,15 +99,6 @@ namespace MaterialEditor
         //! Get set of model preset names
         virtual MaterialViewportPresetNameSet GetModelPresetNames() const = 0;
 
-        //! Set model preset preview image
-        //! @param preset used to set preview image
-        //! @param preview image
-        virtual void SetModelPresetPreview(AZ::Render::ModelPresetPtr preset, const QImage& image) = 0;
-
-        //! Get model preset preview image
-        //! @param preset used to find preview image
-        virtual QImage GetModelPresetPreview(AZ::Render::ModelPresetPtr preset) const = 0;
-
         //! Get model preset last save path
         //! @param preset to lookup last save path
         virtual AZStd::string GetModelPresetLastSavePath(AZ::Render::ModelPresetPtr preset) const = 0;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
index 8635d1eb3e..2d7768feec 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
@@ -12,6 +12,7 @@
 #include <Atom/RPI.Edit/Material/MaterialPropertyId.h>
 #include <Atom/RPI.Edit/Material/MaterialUtils.h>
 #include <Atom/RPI.Public/Material/Material.h>
+#include <Atom/RPI.Public/Image/ImageSystemInterface.h>
 #include <Atom/RPI.Reflect/Image/Image.h>
 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
@@ -594,7 +595,7 @@ namespace MaterialEditor
                 MaterialPropertyValue propertyValue = AtomToolsFramework::ConvertToRuntimeType(it->second.GetValue());
                 if (propertyValue.IsValid())
                 {
-                    if (!AtomToolsFramework::ConvertToExportFormat(exportPath, propertyDefinition, propertyValue))
+                    if (!AtomToolsFramework::ConvertToExportFormat(exportPath, propertyId.GetFullName(), propertyDefinition, propertyValue))
                     {
                         AZ_Error("MaterialDocument", false, "Material document property could not be converted: '%s' in '%s'.", propertyId.GetFullName().GetCStr(), m_absolutePath.c_str());
                         result = false;
@@ -708,6 +709,8 @@ namespace MaterialEditor
             AZ_Error("MaterialDocument", false, "Material document extension not supported: '%s'.", m_absolutePath.c_str());
             return false;
         }
+        
+        const bool elevateWarnings = false;
 
         // In order to support automation, general usability, and 'save as' functionality, the user must not have to wait
         // for their JSON file to be cooked by the asset processor before opening or editing it.
@@ -716,7 +719,7 @@ namespace MaterialEditor
         // Long term, the material document should not be concerned with assets at all. The viewport window should be the
         // only thing concerned with assets or instances.
         auto materialAssetResult =
-            m_materialSourceData.CreateMaterialAssetFromSourceData(Uuid::CreateRandom(), m_absolutePath, true, true, &m_sourceDependencies);
+            m_materialSourceData.CreateMaterialAssetFromSourceData(Uuid::CreateRandom(), m_absolutePath, elevateWarnings, true, &m_sourceDependencies);
         if (!materialAssetResult)
         {
             AZ_Error("MaterialDocument", false, "Material asset could not be created from source data: '%s'.", m_absolutePath.c_str());
@@ -754,7 +757,7 @@ namespace MaterialEditor
                 AZ_Error("MaterialDocument", false, "Material parent asset ID could not be created: '%s'.", m_materialSourceData.m_parentMaterial.c_str());
                 return false;
             }
-
+            
             auto parentMaterialAssetResult = parentMaterialSourceData.CreateMaterialAssetFromSourceData(
                 parentMaterialAssetIdResult.GetValue(), m_materialSourceData.m_parentMaterial, true, true);
             if (!parentMaterialAssetResult)
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
index a8f41917f9..c8df123d0d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
@@ -6,61 +6,26 @@
  *
  */
 
-#include <AzCore/Component/TickBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Jobs/JobFunction.h>
-
-#include <AzFramework/Asset/AssetSystemBus.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-
-#include <Viewport/MaterialViewportComponent.h>
-#include <Atom/Viewport/MaterialViewportNotificationBus.h>
-#include <Atom/Viewport/MaterialViewportSettings.h>
-
-#include <Atom/ImageProcessing/ImageObject.h>
-#include <Atom/ImageProcessing/ImageProcessingBus.h>
-
-#include <AzCore/Serialization/Json/JsonUtils.h>
-
-#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
-#include <Atom/RPI.Reflect/System/AnyAsset.h>
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
 #include <Atom/RPI.Edit/Common/JsonUtils.h>
+#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
+#include <Atom/RPI.Reflect/System/AnyAsset.h>
+#include <Atom/Viewport/MaterialViewportNotificationBus.h>
+#include <Atom/Viewport/MaterialViewportSettings.h>
+#include <AzCore/Component/TickBus.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Serialization/Json/JsonUtils.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/IO/LocalFileIO.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+#include <Viewport/MaterialViewportComponent.h>
 
 namespace MaterialEditor
 {
-    using LoadImageAsyncCallback = AZStd::function<void(const QImage&)>;
-    void LoadImageAsync(const AZStd::string& path, LoadImageAsyncCallback callback)
-    {
-        AZ::Job* job = AZ::CreateJobFunction([path, callback]() {
-            ImageProcessingAtom::IImageObjectPtr imageObject;
-            ImageProcessingAtom::ImageProcessingRequestBus::BroadcastResult(imageObject, &ImageProcessingAtom::ImageProcessingRequests::LoadImagePreview, path);
-
-            if (imageObject)
-            {
-                AZ::u8* imageBuf = nullptr;
-                AZ::u32 pitch = 0;
-                AZ::u32 mip = 0;
-                imageObject->GetImagePointer(mip, imageBuf, pitch);
-                const AZ::u32 width = imageObject->GetWidth(mip);
-                const AZ::u32 height = imageObject->GetHeight(mip);
-
-                QImage image(imageBuf, width, height, pitch, QImage::Format_RGBA8888);
-
-                if (callback)
-                {
-                    callback(image);
-                }
-            }
-            }, true);
-        job->Start();
-    }
-
     MaterialViewportComponent::MaterialViewportComponent()
     {
     }
@@ -162,12 +127,6 @@ namespace MaterialEditor
         m_viewportSettings =
             AZ::UserSettings::CreateFind<MaterialViewportSettings>(AZ::Crc32("MaterialViewportSettings"), AZ::UserSettings::CT_GLOBAL);
 
-        m_lightingPresetPreviewImageDefault = QImage(180, 90, QImage::Format::Format_RGBA8888);
-        m_lightingPresetPreviewImageDefault.fill(Qt::GlobalColor::black);
-
-        m_modelPresetPreviewImageDefault = QImage(90, 90, QImage::Format::Format_RGBA8888);
-        m_modelPresetPreviewImageDefault.fill(Qt::GlobalColor::black);
-
         MaterialViewportRequestBus::Handler::BusConnect();
         AzFramework::AssetCatalogEventBus::Handler::BusConnect();
     }
@@ -177,12 +136,10 @@ namespace MaterialEditor
         AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
         MaterialViewportRequestBus::Handler::BusDisconnect();
 
-        m_lightingPresetPreviewImages.clear();
         m_lightingPresetVector.clear();
         m_lightingPresetLastSavePathMap.clear();
         m_lightingPresetSelection.reset();
 
-        m_modelPresetPreviewImages.clear();
         m_modelPresetVector.clear();
         m_modelPresetLastSavePathMap.clear();
         m_modelPresetSelection.reset();
@@ -286,14 +243,6 @@ namespace MaterialEditor
             SelectLightingPreset(presetPtr);
         }
 
-        const auto& imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(presetPtr->m_skyboxImageAsset.GetId());
-        LoadImageAsync(imagePath, [presetPtr](const QImage& image) {
-            QImage imageScaled = image.scaled(180, 90, Qt::AspectRatioMode::KeepAspectRatio);
-            AZ::TickBus::QueueFunction([presetPtr, imageScaled]() {
-                MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Events::SetLightingPresetPreview, presetPtr, imageScaled);
-                });
-            });
-
         return presetPtr;
     }
 
@@ -353,17 +302,6 @@ namespace MaterialEditor
         return names;
     }
 
-    void MaterialViewportComponent::SetLightingPresetPreview(AZ::Render::LightingPresetPtr preset, const QImage& image)
-    {
-        m_lightingPresetPreviewImages[preset] = image;
-    }
-
-    QImage MaterialViewportComponent::GetLightingPresetPreview(AZ::Render::LightingPresetPtr preset) const
-    {
-        auto imageItr = m_lightingPresetPreviewImages.find(preset);
-        return imageItr != m_lightingPresetPreviewImages.end() ? imageItr->second : m_lightingPresetPreviewImageDefault;
-    }
-
     AZStd::string MaterialViewportComponent::GetLightingPresetLastSavePath(AZ::Render::LightingPresetPtr preset) const
     {
         auto pathItr = m_lightingPresetLastSavePathMap.find(preset);
@@ -382,14 +320,6 @@ namespace MaterialEditor
             SelectModelPreset(presetPtr);
         }
 
-        const auto& imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(presetPtr->m_previewImageAsset.GetId());
-        LoadImageAsync(imagePath, [presetPtr](const QImage& image) {
-            QImage imageScaled = image.scaled(90, 90, Qt::AspectRatioMode::KeepAspectRatio);
-            AZ::TickBus::QueueFunction([presetPtr, imageScaled]() {
-                MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Events::SetModelPresetPreview, presetPtr, imageScaled);
-                });
-            });
-
         return presetPtr;
     }
 
@@ -449,17 +379,6 @@ namespace MaterialEditor
         return names;
     }
 
-    void MaterialViewportComponent::SetModelPresetPreview(AZ::Render::ModelPresetPtr preset, const QImage& image)
-    {
-        m_modelPresetPreviewImages[preset] = image;
-    }
-
-    QImage MaterialViewportComponent::GetModelPresetPreview(AZ::Render::ModelPresetPtr preset) const
-    {
-        auto imageItr = m_modelPresetPreviewImages.find(preset);
-        return imageItr != m_modelPresetPreviewImages.end() ? imageItr->second : m_modelPresetPreviewImageDefault;
-    }
-
     AZStd::string MaterialViewportComponent::GetModelPresetLastSavePath(AZ::Render::ModelPresetPtr preset) const
     {
         auto pathItr = m_modelPresetLastSavePathMap.find(preset);
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
index 12475bb113..a4f94c3546 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h
@@ -58,8 +58,6 @@ namespace MaterialEditor
         void SelectLightingPreset(AZ::Render::LightingPresetPtr preset) override;
         void SelectLightingPresetByName(const AZStd::string& name) override;
         MaterialViewportPresetNameSet GetLightingPresetNames() const override;
-        void SetLightingPresetPreview(AZ::Render::LightingPresetPtr preset, const QImage& image) override;
-        QImage GetLightingPresetPreview(AZ::Render::LightingPresetPtr preset) const override;
         AZStd::string GetLightingPresetLastSavePath(AZ::Render::LightingPresetPtr preset) const override;
 
         AZ::Render::ModelPresetPtr AddModelPreset(const AZ::Render::ModelPreset& preset) override;
@@ -70,8 +68,6 @@ namespace MaterialEditor
         void SelectModelPreset(AZ::Render::ModelPresetPtr preset) override;
         void SelectModelPresetByName(const AZStd::string& name) override;
         MaterialViewportPresetNameSet GetModelPresetNames() const override;
-        void SetModelPresetPreview(AZ::Render::ModelPresetPtr preset, const QImage& image) override;
-        QImage GetModelPresetPreview(AZ::Render::ModelPresetPtr preset) const override;
         AZStd::string GetModelPresetLastSavePath(AZ::Render::ModelPresetPtr preset) const override;
 
         void SetShadowCatcherEnabled(bool enable) override;
@@ -97,12 +93,6 @@ namespace MaterialEditor
         AZ::Render::ModelPresetPtrVector m_modelPresetVector;
         AZ::Render::ModelPresetPtr m_modelPresetSelection;
 
-        AZStd::map<AZ::Render::LightingPresetPtr, QImage> m_lightingPresetPreviewImages;
-        AZStd::map<AZ::Render::ModelPresetPtr, QImage> m_modelPresetPreviewImages;
-
-        QImage m_lightingPresetPreviewImageDefault;
-        QImage m_modelPresetPreviewImageDefault;
-
         mutable AZStd::map<AZ::Render::LightingPresetPtr, AZStd::string> m_lightingPresetLastSavePathMap;
         mutable AZStd::map<AZ::Render::ModelPresetPtr, AZStd::string> m_modelPresetLastSavePathMap;
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
index 4ad87492e3..409674f0bc 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp
@@ -306,7 +306,6 @@ namespace MaterialEditor
     {
         if (!preset)
         {
-            AZ_Warning("MaterialViewportRenderer", false, "Attempting to set invalid lighting preset.");
             return;
         }
 
@@ -347,7 +346,6 @@ namespace MaterialEditor
     {
         if (!preset)
         {
-            AZ_Warning("MaterialViewportRenderer", false, "Attempting to set invalid model preset.");
             return;
         }
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp
index 72bf7fe003..f8ad038a85 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <Atom/Feature/Utils/LightingPreset.h>
+#include <Atom/RPI.Edit/Common/AssetUtils.h>
 #include <Atom/Viewport/MaterialViewportRequestBus.h>
 #include <AtomToolsFramework/Util/Util.h>
 #include <AzFramework/Application/Application.h>
@@ -27,13 +28,16 @@ namespace MaterialEditor
         MaterialViewportRequestBus::BroadcastResult(presets, &MaterialViewportRequestBus::Events::GetLightingPresets);
         AZStd::sort(presets.begin(), presets.end(), [](const auto& a, const auto& b) { return a->m_displayName < b->m_displayName; });
 
+        const int itemSize = aznumeric_cast<int>(
+            AtomToolsFramework::GetSettingOrDefault<AZ::u64>("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/LightingItemSize", 180));
+
         QListWidgetItem* selectedItem = nullptr;
         for (const auto& preset : presets)
         {
-            QImage image;
-            MaterialViewportRequestBus::BroadcastResult(image, &MaterialViewportRequestBus::Events::GetLightingPresetPreview, preset);
-
-            QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), image);
+            AZStd::string path;
+            MaterialViewportRequestBus::BroadcastResult(path, &MaterialViewportRequestBus::Events::GetLightingPresetLastSavePath, preset);
+            QListWidgetItem* item = CreateListItem(
+                preset->m_displayName.c_str(), AZ::RPI::AssetUtils::MakeAssetId(path, 0).GetValue(), QSize(itemSize, itemSize));
 
             m_listItemToPresetMap[item] = preset;
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp
index c1936cde35..f5a1677462 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp
@@ -27,13 +27,13 @@ namespace MaterialEditor
         MaterialViewportRequestBus::BroadcastResult(presets, &MaterialViewportRequestBus::Events::GetModelPresets);
         AZStd::sort(presets.begin(), presets.end(), [](const auto& a, const auto& b) { return a->m_displayName < b->m_displayName; });
 
+        const int itemSize = aznumeric_cast<int>(
+            AtomToolsFramework::GetSettingOrDefault<AZ::u64>("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/ModelItemSize", 90));
+
         QListWidgetItem* selectedItem = nullptr;
         for (const auto& preset : presets)
         {
-            QImage image;
-            MaterialViewportRequestBus::BroadcastResult(image, &MaterialViewportRequestBus::Events::GetModelPresetPreview, preset);
-
-            QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), image);
+            QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), preset->m_modelAsset.GetId(), QSize(itemSize, itemSize));
 
             m_listItemToPresetMap[item] = preset;
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp
index d3aa6350f0..f2bb84dff6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp
@@ -12,11 +12,16 @@
 #include <AzQtComponents/Components/Widgets/ElidingLabel.h>
 #include <AzQtComponents/Components/Widgets/LineEdit.h>
 #include <AzQtComponents/Components/Widgets/Text.h>
+#include <AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h>
+#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
+#include <AzToolsFramework/Thumbnails/ThumbnailWidget.h>
+#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
 #include <Window/PresetBrowserDialogs/PresetBrowserDialog.h>
 
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
+#include <QVBoxLayout>
 
 namespace MaterialEditor
 {
@@ -41,35 +46,51 @@ namespace MaterialEditor
         m_ui->m_presetList->setGridSize(QSize(0, 0));
         m_ui->m_presetList->setWrapping(true);
 
-        QObject::connect(m_ui->m_presetList, &QListWidget::currentItemChanged, [this]() { SelectCurrentPreset(); });
+        QObject::connect(m_ui->m_presetList, &QListWidget::currentItemChanged, [this](){ SelectCurrentPreset(); });
     }
 
-    QListWidgetItem* PresetBrowserDialog::CreateListItem(const QString& title, const QImage& image)
+    QListWidgetItem* PresetBrowserDialog::CreateListItem(const QString& title, const AZ::Data::AssetId& assetId, const QSize& size)
     {
+        const int itemBorder = aznumeric_cast<int>(
+            AtomToolsFramework::GetSettingOrDefault<AZ::u64>("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/ItemBorder", 4));
+        const int itemSpacing = aznumeric_cast<int>(
+            AtomToolsFramework::GetSettingOrDefault<AZ::u64>("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/ItemSpacing", 10));
+        const int headerHeight = aznumeric_cast<int>(
+            AtomToolsFramework::GetSettingOrDefault<AZ::u64>("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/HeaderHeight", 15));
+
         const QSize gridSize = m_ui->m_presetList->gridSize();
-        m_ui->m_presetList->setGridSize(
-            QSize(AZStd::max(gridSize.width(), image.width() + 10), AZStd::max(gridSize.height(), image.height() + 10)));
+        m_ui->m_presetList->setGridSize(QSize(
+            AZStd::max(gridSize.width(), size.width() + itemSpacing),
+            AZStd::max(gridSize.height(), size.height() + itemSpacing + headerHeight)));
 
         QListWidgetItem* item = new QListWidgetItem(m_ui->m_presetList);
         item->setData(Qt::UserRole, title);
-        item->setSizeHint(image.size() + QSize(4, 4));
+        item->setSizeHint(size + QSize(itemBorder, itemBorder + headerHeight));
         m_ui->m_presetList->addItem(item);
 
-        QLabel* previewImage = new QLabel(m_ui->m_presetList);
-        previewImage->setFixedSize(image.size());
-        previewImage->setMargin(0);
-        previewImage->setPixmap(QPixmap::fromImage(image));
-        previewImage->updateGeometry();
+        QWidget* itemWidget = new QWidget(m_ui->m_presetList);
+        itemWidget->setLayout(new QVBoxLayout(itemWidget));
+        itemWidget->layout()->setSpacing(0);
+        itemWidget->layout()->setMargin(0);
 
-        AzQtComponents::ElidingLabel* previewLabel = new AzQtComponents::ElidingLabel(previewImage);
-        previewLabel->setText(title);
-        previewLabel->setFixedSize(QSize(image.width(), 15));
-        previewLabel->setMargin(0);
-        previewLabel->setStyleSheet("background-color: rgb(35, 35, 35)");
-        AzQtComponents::Text::addPrimaryStyle(previewLabel);
-        AzQtComponents::Text::addLabelStyle(previewLabel);
+        AzQtComponents::ElidingLabel* header = new AzQtComponents::ElidingLabel(itemWidget);
+        header->setText(title);
+        header->setFixedSize(QSize(size.width(), headerHeight));
+        header->setMargin(0);
+        header->setStyleSheet("background-color: rgb(35, 35, 35)");
+        AzQtComponents::Text::addPrimaryStyle(header);
+        AzQtComponents::Text::addLabelStyle(header);
+        itemWidget->layout()->addWidget(header);
 
-        m_ui->m_presetList->setItemWidget(item, previewImage);
+        AzToolsFramework::Thumbnailer::ThumbnailWidget* thumbnail = new AzToolsFramework::Thumbnailer::ThumbnailWidget(itemWidget);
+        thumbnail->setFixedSize(size);
+        thumbnail->SetThumbnailKey(
+            MAKE_TKEY(AzToolsFramework::AssetBrowser::ProductThumbnailKey, assetId),
+            AzToolsFramework::Thumbnailer::ThumbnailContext::DefaultContext);
+        thumbnail->updateGeometry();
+        itemWidget->layout()->addWidget(thumbnail);
+
+        m_ui->m_presetList->setItemWidget(item, itemWidget);
 
         return item;
     }
@@ -79,15 +100,15 @@ namespace MaterialEditor
         m_ui->m_searchWidget->setReadOnly(false);
         m_ui->m_searchWidget->setContextMenuPolicy(Qt::CustomContextMenu);
         AzQtComponents::LineEdit::applySearchStyle(m_ui->m_searchWidget);
-        connect(m_ui->m_searchWidget, &QLineEdit::textChanged, this, [this]() { ApplySearchFilter(); });
-        connect(m_ui->m_searchWidget, &QWidget::customContextMenuRequested, this, [this](const QPoint& pos) { ShowSearchMenu(pos); });
+        connect(m_ui->m_searchWidget, &QLineEdit::textChanged, this, [this](){ ApplySearchFilter(); });
+        connect(m_ui->m_searchWidget, &QWidget::customContextMenuRequested, this, [this](const QPoint& pos){ ShowSearchMenu(pos); });
     }
 
     void PresetBrowserDialog::SetupDialogButtons()
     {
         connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
         connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-        connect(this, &QDialog::rejected, this, [this]() { SelectInitialPreset(); });
+        connect(this, &QDialog::rejected, this, [this](){ SelectInitialPreset(); });
     }
 
     void PresetBrowserDialog::ApplySearchFilter()
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h
index ee01737352..20e049f6f8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h
@@ -9,12 +9,12 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/std/containers/vector.h>
-
 #include <QDialog>
 #endif
 
-#include <Source/Window/PresetBrowserDialogs/ui_PresetBrowserDialog.h>
+#include <Window/PresetBrowserDialogs/ui_PresetBrowserDialog.h>
 
 class QImage;
 class QListWidgetItem;
@@ -32,7 +32,7 @@ namespace MaterialEditor
 
 protected:
         void SetupPresetList();
-        QListWidgetItem* CreateListItem(const QString& title, const QImage& image);
+        QListWidgetItem* CreateListItem(const QString& title, const AZ::Data::AssetId& assetId, const QSize& size);
 
         void SetupSearchWidget();
         void SetupDialogButtons();
diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
index 55e457926a..5a8aaf7ded 100644
--- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
+++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl
@@ -19,11 +19,11 @@
 
 #include <Atom/Utils/DdsFile.h>
 
-#include <AzFramework/API/ApplicationAPI.h>
 
 #include <AzCore/IO/GenericStreams.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/IO/FileIO.h>
+#include <AzCore/Utils/Utils.h>
 
 #ifndef SCRIPTABLE_IMGUI
 #define Scriptable_ImGui ImGui
@@ -334,11 +334,10 @@ namespace AZ::Render
 
         if (m_engineRoot.empty())
         {
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            if (engineRoot)
+            AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
+            if (!engineRoot.empty())
             {
-                m_engineRoot = AZStd::string(engineRoot);
+                m_engineRoot = AZStd::string_view(engineRoot);
             }
         }
 
diff --git a/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp b/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp
index 859b4b4dd3..7a25dfb9ff 100644
--- a/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp
+++ b/Gems/Atom/Utils/Code/Source/AssetCollectionAsyncLoader.cpp
@@ -123,6 +123,8 @@ namespace AZ
 
         // Prepare to create a cancellable job.
         AZ::JobManagerDesc desc;
+        desc.m_jobManagerName = "AssetCollectionAsyncLoader";
+
         AZ::JobManagerThreadDesc threadDesc;
         desc.m_workerThreads.push_back(threadDesc);
         m_jobManager = AZStd::make_unique<AZ::JobManager>(desc);
diff --git a/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp b/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp
index 1c5b844204..b60939b39b 100644
--- a/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp
+++ b/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp
@@ -31,7 +31,8 @@ namespace UnitTest
         {
             AllocatorsFixture::SetUp();
 
-            m_testImageFolder = AZ::IO::Path(AZ::Test::GetEngineRootPath()) / AZ::IO::Path("Gems/Atom/Utils/Code/Tests/PngTestImages", '/');
+            m_testImageFolder =
+                AZ::IO::Path(AZ::Test::GetEngineRootPath(), '/') / AZ::IO::Path("Gems/Atom/Utils/Code/Tests/PngTestImages");
             
             m_tempPngFilePath = m_testImageFolder / "temp.png";
                         
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
index d822b16486..7a980f9824 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
@@ -67,12 +67,12 @@ namespace AZ
 
         void AtomBridgeSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99));
+            provided.push_back(AZ_CRC("AtomBridgeService", 0x92d990b5));
         }
 
         void AtomBridgeSystemComponent::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99));
+            incompatible.push_back(AZ_CRC("AtomBridgeService", 0x92d990b5));
         }
 
         void AtomBridgeSystemComponent::GetRequiredServices(ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
index 12e4ccd8ad..39cc2f63b2 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
@@ -1016,6 +1016,55 @@ namespace AZ::AtomBridge
         }
     }
 
+    void AtomDebugDisplayViewportInterface::DrawWireCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height)
+    {
+        if (m_auxGeomPtr)
+        {
+            const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement();
+            const AZ::Vector3 worldCenter = ToWorldSpacePosition(center);
+            const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis);
+            m_auxGeomPtr->DrawCylinderNoEnds(
+                worldCenter, 
+                worldAxis, 
+                scale * radius, 
+                scale * height, 
+                m_rendState.m_color, 
+                AZ::RPI::AuxGeomDraw::DrawStyle::Line,
+                m_rendState.m_depthTest,
+                m_rendState.m_depthWrite,
+                m_rendState.m_faceCullMode,
+                m_rendState.m_viewProjOverrideIndex
+            );
+        }
+    }
+
+    void AtomDebugDisplayViewportInterface::DrawSolidCylinderNoEnds(
+        const AZ::Vector3& center, 
+        const AZ::Vector3& axis, 
+        float radius, 
+        float height, 
+        bool drawShaded)
+    {
+        if (m_auxGeomPtr)
+        {
+            const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement();
+            const AZ::Vector3 worldCenter = ToWorldSpacePosition(center);
+            const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis);
+            m_auxGeomPtr->DrawCylinderNoEnds(
+                worldCenter, 
+                worldAxis, 
+                scale * radius, 
+                scale * height, 
+                m_rendState.m_color, 
+                drawShaded ? AZ::RPI::AuxGeomDraw::DrawStyle::Shaded : AZ::RPI::AuxGeomDraw::DrawStyle::Solid,
+                m_rendState.m_depthTest,
+                m_rendState.m_depthWrite,
+                m_rendState.m_faceCullMode,
+                m_rendState.m_viewProjOverrideIndex
+            );
+        }
+    }
+
     void AtomDebugDisplayViewportInterface::DrawWireCapsule(
         const AZ::Vector3& center, 
         const AZ::Vector3& axis, 
@@ -1025,83 +1074,24 @@ namespace AZ::AtomBridge
         if (m_auxGeomPtr &&  radius > FLT_EPSILON &&  axis.GetLengthSq() > FLT_EPSILON)
         {
             AZ::Vector3 axisNormalized = axis.GetNormalizedEstimate();
-            SingleColorStaticSizeLineHelper<(16+1) * 5> lines; // 360/22.5 = 16, 5 possible calls to CreateArbitraryAxisArc
-            AZ::Vector3 radiusV3 = AZ::Vector3(radius);
-            float stepAngle = DegToRad(22.5f);
-            float Deg0 = DegToRad(0.0f);
 
+            const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement();
+            const AZ::Vector3 worldCenter = ToWorldSpacePosition(center);
+            const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis);
 
-            // Draw cylinder part (or just a circle around the middle)
+            // Draw cylinder part (if cylinder height is too small, ignore cylinder and just draw both hemispheres)
             if (heightStraightSection > FLT_EPSILON)
             {
-                DrawWireCylinder(center, axis, radius, heightStraightSection);
-            }
-            else
-            {
-                float Deg360 = DegToRad(360.0f);
-                CreateArbitraryAxisArc(
-                    lines,
-                    stepAngle,
-                    Deg0,
-                    Deg360,
-                    center,
-                    radiusV3,
-                    axisNormalized
-                    );
+                DrawWireCylinderNoEnds(worldCenter, worldAxis, scale * radius, scale * heightStraightSection);
             }
 
-            float Deg90 = DegToRad(90.0f);
-            float Deg180 = DegToRad(180.0f);
-
-            AZ::Vector3 ortho1Normalized, ortho2Normalized;
-            CalcBasisVectors(axisNormalized, ortho1Normalized, ortho2Normalized);
             AZ::Vector3 centerToTopCircleCenter = axisNormalized * heightStraightSection * 0.5f;
-            AZ::Vector3 topCenter = center + centerToTopCircleCenter;
-            AZ::Vector3 bottomCenter = center - centerToTopCircleCenter;
 
-            // Draw top cap as two criss-crossing 180deg arcs
-            CreateArbitraryAxisArc(
-                    lines,
-                    stepAngle,
-                    Deg90,
-                    Deg90 + Deg180,
-                    topCenter,
-                    radiusV3,
-                    ortho1Normalized
-                    );
+            // Top hemisphere
+            DrawWireHemisphere(center + centerToTopCircleCenter, worldAxis, scale * radius);
 
-            CreateArbitraryAxisArc(
-                    lines,
-                    stepAngle,
-                    Deg180,
-                    Deg180 + Deg180,
-                    topCenter,
-                    radiusV3,
-                    ortho2Normalized
-                    );
-
-            // Draw bottom cap
-            CreateArbitraryAxisArc(
-                    lines,
-                    stepAngle,
-                    -Deg90,
-                    -Deg90 + Deg180,
-                    bottomCenter,
-                    radiusV3,
-                    ortho1Normalized
-                    );
-
-            CreateArbitraryAxisArc(
-                    lines,
-                    stepAngle,
-                    Deg0,
-                    Deg0 + Deg180,
-                    bottomCenter,
-                    radiusV3,
-                    ortho2Normalized
-                    );
-
-            lines.Draw(m_auxGeomPtr, m_rendState);
+            // Bottom hemisphere
+            DrawWireHemisphere(center - centerToTopCircleCenter, -worldAxis, scale * radius);
         }
     }
 
@@ -1148,6 +1138,25 @@ namespace AZ::AtomBridge
         }
     }
 
+    void AtomDebugDisplayViewportInterface::DrawWireHemisphere(const AZ::Vector3& pos, const AZ::Vector3& axis, float radius)
+    {
+        if (m_auxGeomPtr)
+        {
+            const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement();
+            m_auxGeomPtr->DrawHemisphere(
+                ToWorldSpacePosition(pos),
+                axis,
+                scale * radius,
+                m_rendState.m_color,
+                AZ::RPI::AuxGeomDraw::DrawStyle::Line,
+                m_rendState.m_depthTest,
+                m_rendState.m_depthWrite,
+                m_rendState.m_faceCullMode,
+                m_rendState.m_viewProjOverrideIndex
+            );
+        }
+    }
+
     void AtomDebugDisplayViewportInterface::DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius)
     {
         if (m_auxGeomPtr)
@@ -1353,9 +1362,8 @@ namespace AZ::AtomBridge
         // if 2d draw need to project pos to screen first
         AzFramework::TextDrawParameters params;
         AZ::RPI::ViewportContextPtr viewportContext = GetViewportContext();
-        const auto dpiScaleFactor = viewportContext->GetDpiScalingFactor();
         params.m_drawViewportId = viewportContext->GetId(); // get the viewport ID so default viewport works
-        params.m_position = AZ::Vector3(x * dpiScaleFactor, y * dpiScaleFactor, 1.0f);
+        params.m_position = AZ::Vector3(x, y, 1.0f);
         params.m_color = m_rendState.m_color;
         params.m_scale = AZ::Vector2(size);
         params.m_hAlign = center ? AzFramework::TextHorizontalAlignment::Center : AzFramework::TextHorizontalAlignment::Left; //! Horizontal text alignment
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
index 5f902c5884..7f7af9bbcb 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h
@@ -168,9 +168,12 @@ namespace AZ::AtomBridge
         void DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded) override;
         void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override;
         void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded) override;
+        void DrawWireCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override;
+        void DrawSolidCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded) override;
         void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float heightStraightSection) override;
         void DrawWireSphere(const AZ::Vector3& pos, float radius) override;
         void DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius) override;
+        void DrawWireHemisphere(const AZ::Vector3& pos, const AZ::Vector3& axis, float radius) override;
         void DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) override;
         void DrawBall(const AZ::Vector3& pos, float radius, bool drawShaded) override;
         void DrawDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) override;
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
index 9ab25741af..3af1ad8907 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
@@ -109,12 +109,12 @@ namespace AZ
 
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
             {
-                services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0xdd5ab934));
+                services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0x66d04369));
             }
 
             static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
             {
-                services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0xdd5ab934));
+                services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0x66d04369));
             }
 
             static void Reflect(AZ::ReflectContext* context);
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
index e6439592b3..79f8d4708a 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
@@ -8,7 +8,6 @@
 #include "FlyCameraInputComponent.h"
 
 #include <ISystem.h>
-#include <ITimer.h>
 #include <IConsole.h>
 
 #include <AzCore/Component/Component.h>
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
index 86b3011836..83453f4ff1 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
@@ -561,12 +561,10 @@ uint32_t AZ::FFont::GetNumQuadsForText(const char* str, const bool asciiMultiLin
             ++numQuads;
         }
 
-        uint32_t nextCh = 0;
         const wchar_t* pChar = strW.c_str();
         while (uint32_t ch = *pChar)
         {
             ++pChar;
-            nextCh = *pChar;
 
             switch (ch)
             {
@@ -1726,15 +1724,13 @@ void AZ::FFont::DrawScreenAlignedText3d(
     {
         return;
     }
-    AZ::Vector3 positionNDC = AzFramework::WorldToScreenNdc(
-        params.m_position,
-        currentView->GetWorldToViewMatrix(),
-        currentView->GetViewToClipMatrix()
-    );
 
-    // Text behind the camera shouldn't get rendered.  WorldToScreenNDC returns values in the range 0 - 1, so Z < 0.5 is behind the screen
+    const AZ::Vector3 positionNdc = AzFramework::WorldToScreenNdc(
+        params.m_position, currentView->GetWorldToViewMatrixAsMatrix3x4(), currentView->GetViewToClipMatrix());
+
+    // Text behind the camera shouldn't get rendered.  WorldToScreenNdc returns values in the range 0 - 1, so Z < 0.5 is behind the screen
     // and >= 0.5 is in front of the screen.
-    if (positionNDC.GetZ() < 0.5f)
+    if (positionNdc.GetZ() < 0.5f)
     {
         return;
     }
@@ -1744,9 +1740,9 @@ void AZ::FFont::DrawScreenAlignedText3d(
     DrawStringUInternal(
         *internalParams.m_viewport, 
         internalParams.m_viewportContext, 
-        positionNDC.GetX() * internalParams.m_viewport->GetWidth(), 
-        (1.0f - positionNDC.GetY()) * internalParams.m_viewport->GetHeight(), 
-        positionNDC.GetZ(), // Z
+        positionNdc.GetX() * internalParams.m_viewport->GetWidth(), 
+        (1.0f - positionNdc.GetY()) * internalParams.m_viewport->GetHeight(), 
+        positionNdc.GetZ(), // Z
         text.data(),
         params.m_multiline,
         internalParams.m_ctx
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
index c0ca2fe993..fa7a0cf2bf 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
@@ -73,7 +73,7 @@ namespace AZ::Render
     void AtomViewportDisplayIconsSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
         required.push_back(AZ_CRC("RPISystem", 0xf2add773));
-        required.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99));
+        required.push_back(AZ_CRC("AtomBridgeService", 0x92d990b5));
     }
 
     void AtomViewportDisplayIconsSystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)
@@ -174,9 +174,9 @@ namespace AZ::Render
         {
             // 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);
+            const AzFramework::ScreenPoint position = AzFramework::WorldToScreen(
+                drawParameters.m_position, viewportContext->GetCameraViewMatrixAsMatrix3x4(),
+                viewportContext->GetCameraProjectionMatrix(), viewportSize);
             screenPosition.SetX(aznumeric_cast<float>(position.m_x));
             screenPosition.SetY(aznumeric_cast<float>(position.m_y));
         }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h
index 72c4ef97a8..b9c62e6fe2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h
@@ -132,6 +132,13 @@ namespace AZ
             //! Sets the Esm exponent. Higher values produce a steeper falloff between light and shadow.
             virtual void SetEsmExponent(float exponent) = 0;
 
+            //! Reduces acne by biasing the shadowmap lookup along the geometric normal.
+            //! @return Returns the amount of bias to apply.
+            virtual float GetNormalShadowBias() const = 0;
+
+            //! Reduces acne by biasing the shadowmap lookup along the geometric normal.
+            //! @param normalShadowBias Sets the amount of normal shadow bias to apply.
+            virtual void SetNormalShadowBias(float normalShadowBias) = 0;
         };
 
         //! The EBus for requests to for setting and getting light component properties.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h
index c76c922385..130e066e1a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h
@@ -57,6 +57,7 @@ namespace AZ
             // Shadows (only used for supported shapes)
             bool m_enableShadow = false;
             float m_bias = 0.1f;
+            float m_normalShadowBias = 0.0f;
             ShadowmapSize m_shadowmapMaxSize = ShadowmapSize::Size256;
             ShadowFilterMethod m_shadowFilterMethod = ShadowFilterMethod::None;
             uint16_t m_filteringSampleCount = 12;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp
index f0418a5024..91f8f1aa36 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp
@@ -34,6 +34,7 @@ namespace AZ
                     // Shadows
                     ->Field("Enable Shadow", &AreaLightComponentConfig::m_enableShadow)
                     ->Field("Shadow Bias", &AreaLightComponentConfig::m_bias)
+                    ->Field("Normal Shadow Bias", &AreaLightComponentConfig::m_normalShadowBias)
                     ->Field("Shadowmap Max Size", &AreaLightComponentConfig::m_shadowmapMaxSize)
                     ->Field("Shadow Filter Method", &AreaLightComponentConfig::m_shadowFilterMethod)
                     ->Field("Filtering Sample Count", &AreaLightComponentConfig::m_filteringSampleCount)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp
index 36cb2a7f5a..7668477690 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp
@@ -70,6 +70,8 @@ namespace AZ::Render
                 ->Event("SetEnableShadow", &AreaLightRequestBus::Events::SetEnableShadow)
                 ->Event("GetShadowBias", &AreaLightRequestBus::Events::GetShadowBias)
                 ->Event("SetShadowBias", &AreaLightRequestBus::Events::SetShadowBias)
+                ->Event("GetNormalShadowBias", &AreaLightRequestBus::Events::GetNormalShadowBias)
+                ->Event("SetNormalShadowBias", &AreaLightRequestBus::Events::SetNormalShadowBias)
                 ->Event("GetShadowmapMaxSize", &AreaLightRequestBus::Events::GetShadowmapMaxSize)
                 ->Event("SetShadowmapMaxSize", &AreaLightRequestBus::Events::SetShadowmapMaxSize)
                 ->Event("GetShadowFilterMethod", &AreaLightRequestBus::Events::GetShadowFilterMethod)
@@ -91,6 +93,7 @@ namespace AZ::Render
 
                 ->VirtualProperty("ShadowsEnabled", "GetEnableShadow", "SetEnableShadow")
                 ->VirtualProperty("ShadowBias", "GetShadowBias", "SetShadowBias")
+                ->VirtualProperty("NormalShadowBias", "GetNormalShadowBias", "SetNormalShadowBias")
                 ->VirtualProperty("ShadowmapMaxSize", "GetShadowmapMaxSize", "SetShadowmapMaxSize")
                 ->VirtualProperty("ShadowFilterMethod", "GetShadowFilterMethod", "SetShadowFilterMethod")
                 ->VirtualProperty("FilteringSampleCount", "GetFilteringSampleCount", "SetFilteringSampleCount")
@@ -302,6 +305,7 @@ namespace AZ::Render
             if (m_configuration.m_enableShadow)
             {
                 m_lightShapeDelegate->SetShadowBias(m_configuration.m_bias);
+                m_lightShapeDelegate->SetNormalShadowBias(m_configuration.m_normalShadowBias);
                 m_lightShapeDelegate->SetShadowmapMaxSize(m_configuration.m_shadowmapMaxSize);
                 m_lightShapeDelegate->SetShadowFilterMethod(m_configuration.m_shadowFilterMethod);
                 m_lightShapeDelegate->SetFilteringSampleCount(m_configuration.m_filteringSampleCount);
@@ -474,6 +478,20 @@ namespace AZ::Render
         }
     }
 
+    void AreaLightComponentController::SetNormalShadowBias(float bias)
+    {
+        m_configuration.m_normalShadowBias = bias;
+        if (m_lightShapeDelegate)
+        {
+            m_lightShapeDelegate->SetNormalShadowBias(bias);
+        }
+    }
+
+    float AreaLightComponentController::GetNormalShadowBias() const
+    {
+        return m_configuration.m_normalShadowBias;
+    }
+
     ShadowmapSize AreaLightComponentController::GetShadowmapMaxSize() const
     {
         return m_configuration.m_shadowmapMaxSize;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h
index cc6223e7e5..81299a0372 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h
@@ -86,6 +86,8 @@ namespace AZ
             void SetFilteringSampleCount(uint32_t count) override;
             float GetEsmExponent() const override;
             void SetEsmExponent(float exponent) override;
+            float GetNormalShadowBias() const override;
+            void SetNormalShadowBias(float bias) override;
 
             void HandleDisplayEntityViewport(
                 const AzFramework::ViewportInfo& viewportInfo,
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
index dfb6cf6946..f060018099 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
@@ -138,6 +138,14 @@ namespace AZ::Render
         }
     }
 
+    void DiskLightDelegate::SetNormalShadowBias(float bias)
+    {
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
+        {
+            GetFeatureProcessor()->SetNormalShadowBias(GetLightHandle(), bias);
+        }
+    }
+
     void DiskLightDelegate::SetShadowmapMaxSize(ShadowmapSize size)
     {
         if (GetShadowsEnabled() && GetLightHandle().IsValid())
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h
index 2be782c69c..c19a8d37ae 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h
@@ -46,6 +46,7 @@ namespace AZ
             void SetShadowFilterMethod(ShadowFilterMethod method) override;
             void SetFilteringSampleCount(uint32_t count) override;
             void SetEsmExponent(float exponent) override;
+            void SetNormalShadowBias(float bias) override;
 
         private:
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
index db46434d9a..02c9f77436 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
@@ -136,7 +136,7 @@ namespace AZ
                             ->Attribute(Edit::Attributes::Min, 0.0f)
                             ->Attribute(Edit::Attributes::Max, 100.0f)
                             ->Attribute(Edit::Attributes::SoftMin, 0.0f)
-                            ->Attribute(Edit::Attributes::SoftMax, 2.0f)
+                            ->Attribute(Edit::Attributes::SoftMax, 10.0f)
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                             ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
                             ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::ShadowsDisabled)
@@ -171,7 +171,16 @@ namespace AZ
                             ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                             ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
                             ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::IsEsmDisabled)
-                            ;
+                        ->DataElement(
+                            Edit::UIHandlers::Slider, &AreaLightComponentConfig::m_normalShadowBias, "Normal Shadow Bias\n",
+                            "Reduces acne by biasing the shadowmap lookup along the geometric normal.\n"
+                            "If this is 0, no biasing is applied.")
+                            ->Attribute(Edit::Attributes::Min, 0.f)
+                            ->Attribute(Edit::Attributes::Max, 10.0f)
+                            ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                            ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows)
+                            ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::ShadowsDisabled)
+                                ;
                 }
             }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h
index 336c67f55d..8b096b0367 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h
@@ -58,7 +58,8 @@ namespace AZ
             void SetShadowFilterMethod([[maybe_unused]] ShadowFilterMethod method) override {};
             void SetFilteringSampleCount([[maybe_unused]] uint32_t count) override {};
             void SetEsmExponent([[maybe_unused]] float esmExponent) override{};
-
+            void SetNormalShadowBias([[maybe_unused]] float bias) override{};
+            
         protected:
             void InitBase(EntityId entityId);
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h
index 9bb8188898..40ffaf392d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h
@@ -79,6 +79,8 @@ namespace AZ
             virtual void SetFilteringSampleCount(uint32_t count) = 0;
             //! Sets the Esm exponent to use. Higher values produce a steeper falloff between light and shadow.
             virtual void SetEsmExponent(float exponent) = 0;
+            //! Sets the normal bias. Reduces acne by biasing the shadowmap lookup along the geometric normal.
+            virtual void SetNormalShadowBias(float bias) = 0;
         };
     } //  namespace Render
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
index 661b0c6b25..f2e1f41008 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
@@ -107,4 +107,13 @@ namespace AZ::Render
             GetFeatureProcessor()->SetEsmExponent(GetLightHandle(), esmExponent);
         }
     }
+
+    void SphereLightDelegate::SetNormalShadowBias(float bias)
+    {
+        if (GetShadowsEnabled() && GetLightHandle().IsValid())
+        {
+            GetFeatureProcessor()->SetNormalShadowBias(GetLightHandle(), bias);
+        }
+    }
+
 } // namespace AZ::Render
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h
index 8bdee2442a..bad00e597c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h
@@ -36,6 +36,7 @@ namespace AZ
             void SetShadowFilterMethod(ShadowFilterMethod method) override;
             void SetFilteringSampleCount(uint32_t count) override;
             void SetEsmExponent(float esmExponent) override;
+            void SetNormalShadowBias(float bias) override;
 
         private:
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp
index 6ea7580fc6..73cfd53c21 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp
@@ -163,8 +163,6 @@ namespace AZ
                     return true;
                 }
             }
-            // If this asset didn't load or isn't a cubemap, release it.
-            configAsset.Release();
             return false;
         }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
index 0fd7b7164d..d3e125426c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
@@ -134,7 +134,7 @@ namespace AZ
                         propertyValue = AZ::RPI::MaterialPropertyValue::FromAny(propertyOverrideItr->second);
                     }
 
-                    if (!AtomToolsFramework::ConvertToExportFormat(path, propertyDefinition, propertyValue))
+                    if (!AtomToolsFramework::ConvertToExportFormat(path, propertyId.GetFullName(), propertyDefinition, propertyValue))
                     {
                         AZ_Error("AZ::Render::EditorMaterialComponentUtil", false, "Failed to export: %s", path.c_str());
                         result = false;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp
index 64bc54bae8..0cf6410fc5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp
@@ -290,14 +290,22 @@ namespace AZ
                 menuButton->setAutoRaise(true);
                 menuButton->setIcon(QIcon(":/Cards/img/UI20/Cards/menu_ico.svg"));
                 menuButton->setVisible(true);
-                QObject::connect(menuButton, &QToolButton::clicked, &dialog, [&]() {
-                    QAction* action = nullptr;
-
-                    QMenu menu(&dialog);
-                    action = menu.addAction("Clear", [&] { inspector->SetUvNameMap(RPI::MaterialModelUvOverrideMap()); });
-                    action = menu.addAction("Revert", [&] { inspector->SetUvNameMap(matModUvOverrides);; });
-                    menu.exec(QCursor::pos());
-                });
+                QObject::connect(
+                    menuButton, &QToolButton::clicked, &dialog, [&]()
+                    {
+                        QMenu menu(&dialog);
+                        menu.addAction(
+                            "Clear", [&]
+                            {
+                                inspector->SetUvNameMap(RPI::MaterialModelUvOverrideMap());
+                            });
+                        menu.addAction(
+                            "Revert", [&]
+                            {
+                                inspector->SetUvNameMap(matModUvOverrides);
+                            });
+                        menu.exec(QCursor::pos());
+                    });
 
                 QDialogButtonBox* buttonBox = new QDialogButtonBox(&dialog);
                 buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp
index 4c78a0afd7..4addbde3ef 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp
@@ -59,12 +59,12 @@ namespace AZ
 
         void OcclusionCullingPlaneComponentController::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x9123f33d));
+            provided.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x7d036c2e));
         }
 
         void OcclusionCullingPlaneComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x9123f33d));
+            incompatible.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x7d036c2e));
         }
 
         void OcclusionCullingPlaneComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
index ae5c930096..578c6e9300 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
@@ -40,6 +40,7 @@ namespace AZ
                     ->Field("bakedCubeMapQualityLevel", &EditorReflectionProbeComponent::m_bakedCubeMapQualityLevel)
                     ->Field("bakedCubeMapRelativePath", &EditorReflectionProbeComponent::m_bakedCubeMapRelativePath)
                     ->Field("authoredCubeMapAsset", &EditorReflectionProbeComponent::m_authoredCubeMapAsset)
+                    ->Field("bakeExposure", &EditorReflectionProbeComponent::m_bakeExposure)
                 ;
 
                 if (AZ::EditContext* editContext = serializeContext->GetEditContext())
@@ -62,6 +63,13 @@ namespace AZ
                                 ->Attribute(AZ::Edit::Attributes::ButtonText, "Bake Reflection Probe")
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorReflectionProbeComponent::BakeReflectionProbe)
                                 ->Attribute(AZ::Edit::Attributes::Visibility, &EditorReflectionProbeComponent::GetBakedCubemapVisibilitySetting)
+                            ->DataElement(AZ::Edit::UIHandlers::Slider, &EditorReflectionProbeComponent::m_bakeExposure, "Bake Exposure", "Exposure to use when baking the cubemap")
+                                ->Attribute(AZ::Edit::Attributes::SoftMin, -16.0f)
+                                ->Attribute(AZ::Edit::Attributes::SoftMax, 16.0f)
+                                ->Attribute(AZ::Edit::Attributes::Min, -20.0f)
+                                ->Attribute(AZ::Edit::Attributes::Max, 20.0f)
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorReflectionProbeComponent::OnBakeExposureChanged)
+                                ->Attribute(AZ::Edit::Attributes::Visibility, &EditorReflectionProbeComponent::GetBakedCubemapVisibilitySetting)
                         ->ClassElement(AZ::Edit::ClassElements::Group, "Cubemap")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->DataElement(AZ::Edit::UIHandlers::Default, &EditorReflectionProbeComponent::m_useBakedCubemap, "Use Baked Cubemap", "Selects between a cubemap that captures the environment at location in the scene or a preauthored cubemap")
@@ -111,6 +119,11 @@ namespace AZ
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
                             ->DataElement(AZ::Edit::UIHandlers::CheckBox, &ReflectionProbeComponentConfig::m_showVisualization, "Show Visualization", "Show the reflection probe visualization sphere")
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                            ->DataElement(AZ::Edit::UIHandlers::Slider, &ReflectionProbeComponentConfig::m_renderExposure, "Exposure", "Exposure to use when rendering meshes with the cubemap")
+                                ->Attribute(AZ::Edit::Attributes::SoftMin, -5.0f)
+                                ->Attribute(AZ::Edit::Attributes::SoftMax, 5.0f)
+                                ->Attribute(AZ::Edit::Attributes::Min, -20.0f)
+                                ->Attribute(AZ::Edit::Attributes::Max, 20.0f)
                         ;
                 }
             }
@@ -275,6 +288,13 @@ namespace AZ
             return AZ::Edit::PropertyRefreshLevels::None;
         }
 
+        AZ::u32 EditorReflectionProbeComponent::OnBakeExposureChanged()
+        {
+            m_controller.SetBakeExposure(m_bakeExposure);
+
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
         AZ::u32 EditorReflectionProbeComponent::GetBakedCubemapVisibilitySetting()
         {
             // controls specific to baked cubemaps call this to determine their visibility
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h
index 441da19e78..3cd017fd18 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.h
@@ -55,6 +55,7 @@ namespace AZ
             // change notifications
             AZ::u32 OnUseBakedCubemapChanged();
             AZ::u32 OnAuthoredCubemapChanged();
+            AZ::u32 OnBakeExposureChanged();
 
             // retrieves visibility for baked or authored cubemap controls
             AZ::u32 GetBakedCubemapVisibilitySetting();
@@ -77,6 +78,7 @@ namespace AZ
             AZStd::string m_bakedCubeMapRelativePath;
             Data::Asset<RPI::StreamingImageAsset> m_bakedCubeMapAsset;
             Data::Asset<RPI::StreamingImageAsset> m_authoredCubeMapAsset;
+            float m_bakeExposure = 0.0f;
 
             // flag indicating if a cubemap bake is currently in progress
             AZStd::atomic_bool m_bakeInProgress = false;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
index 4022dfda9b..017f6c9cdf 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp
@@ -35,7 +35,7 @@ namespace AZ
             if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
             {
                 serializeContext->Class<ReflectionProbeComponentConfig>()
-                    ->Version(0)
+                    ->Version(1)
                     ->Field("OuterHeight", &ReflectionProbeComponentConfig::m_outerHeight)
                     ->Field("OuterLength", &ReflectionProbeComponentConfig::m_outerLength)
                     ->Field("OuterWidth", &ReflectionProbeComponentConfig::m_outerWidth)
@@ -49,7 +49,9 @@ namespace AZ
                     ->Field("AuthoredCubeMapAsset", &ReflectionProbeComponentConfig::m_authoredCubeMapAsset)
                     ->Field("EntityId", &ReflectionProbeComponentConfig::m_entityId)
                     ->Field("UseParallaxCorrection", &ReflectionProbeComponentConfig::m_useParallaxCorrection)
-                    ->Field("ShowVisualization", &ReflectionProbeComponentConfig::m_showVisualization);
+                    ->Field("ShowVisualization", &ReflectionProbeComponentConfig::m_showVisualization)
+                    ->Field("RenderExposure", &ReflectionProbeComponentConfig::m_renderExposure)
+                    ->Field("BakeExposure", &ReflectionProbeComponentConfig::m_bakeExposure);
             }
         }
 
@@ -157,6 +159,9 @@ namespace AZ
                 cubeMapAsset.QueueLoad();
                 Data::AssetBus::MultiHandler::BusConnect(cubeMapAsset.GetId());
             }
+
+            // set cubemap render exposure
+            m_featureProcessor->SetRenderExposure(m_handle, m_configuration.m_renderExposure);
         }
 
         void ReflectionProbeComponentController::Deactivate()
@@ -284,6 +289,16 @@ namespace AZ
             m_configuration.m_innerHeight = AZStd::min(m_configuration.m_innerHeight, m_configuration.m_outerHeight);
         }
 
+        void ReflectionProbeComponentController::SetBakeExposure(float bakeExposure)
+        {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
+            m_featureProcessor->SetBakeExposure(m_handle, bakeExposure);
+        }
+
         void ReflectionProbeComponentController::BakeReflectionProbe(BuildCubeMapCallback callback, const AZStd::string& relativePath)
         {
             if (!m_featureProcessor)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
index 18e13f023b..ad7d9f7f53 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.h
@@ -68,6 +68,9 @@ namespace AZ
             Data::Asset<RPI::StreamingImageAsset> m_bakedCubeMapAsset;
             Data::Asset<RPI::StreamingImageAsset> m_authoredCubeMapAsset;
             AZ::u64 m_entityId{ EntityId::InvalidEntityId };
+
+            float m_renderExposure = 0.0f;
+            float m_bakeExposure = 0.0f;
         };
 
         class ReflectionProbeComponentController final
@@ -99,6 +102,9 @@ namespace AZ
             // returns the outer extent Aabb for this reflection
             AZ::Aabb GetAabb() const;
 
+            // set the exposure to use when baking the cubemap
+            void SetBakeExposure(float bakeExposure);
+
             // initiate the reflection probe bake, invokes callback when complete
             void BakeReflectionProbe(BuildCubeMapCallback callback, const AZStd::string& relativePath);
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp
index 91b6d2b02a..8bc9c5ac7d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp
@@ -163,9 +163,9 @@ namespace AZ
                 m_modelAsset->GetAabb().GetAsSphere(center, radius);
             }
 
-            const auto distance = radius + NearDist;
-            const auto cameraRotation = Quaternion::CreateFromAxisAngle(Vector3::CreateAxisZ(), CameraRotationAngle);
-            const auto cameraPosition = center + cameraRotation.TransformVector(Vector3(0.0f, distance, 0.0f));
+            const auto distance = fabsf(radius / sinf(FieldOfView)) + NearDist;
+            const auto cameraRotation = Quaternion::CreateFromAxisAngle(Vector3::CreateAxisX(), -CameraRotationAngle);
+            const auto cameraPosition = center + cameraRotation.TransformVector(-Vector3::CreateAxisY() * distance);
             const auto cameraTransform = Transform::CreateLookAt(cameraPosition, center);
             m_view->SetCameraTransform(Matrix3x4::CreateFromTransform(cameraTransform));
         }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h
index 7308aa19bc..dfab7a8630 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h
@@ -51,7 +51,7 @@ namespace AZ
             static constexpr float NearDist = 0.001f;
             static constexpr float FarDist = 100.0f;
             static constexpr float FieldOfView = Constants::HalfPi;
-            static constexpr float CameraRotationAngle = Constants::QuarterPi / 2.0f;
+            static constexpr float CameraRotationAngle = Constants::QuarterPi / 3.0f;
 
             RPI::ScenePtr m_scene;
             RPI::ViewPtr m_view;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp
index c2988cf53d..7fbe374286 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp
@@ -9,9 +9,11 @@
 #include <API/EditorAssetSystemAPI.h>
 #include <AssetBrowser/Thumbnails/ProductThumbnail.h>
 #include <AssetBrowser/Thumbnails/SourceThumbnail.h>
+#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 #include <Atom/RPI.Reflect/Model/ModelAsset.h>
 #include <Atom/RPI.Reflect/System/AnyAsset.h>
+#include <AtomToolsFramework/Util/Util.h>
 #include <SharedPreview/SharedPreviewUtils.h>
 
 namespace AZ
@@ -20,45 +22,69 @@ namespace AZ
     {
         namespace SharedPreviewUtils
         {
-            Data::AssetId GetAssetId(
-                AzToolsFramework::Thumbnailer::SharedThumbnailKey key,
-                const Data::AssetType& assetType,
-                const Data::AssetId& defaultAssetId)
+            AZStd::vector<AZ::Uuid> GetSupportedAssetTypes()
             {
+                return { RPI::ModelAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::AnyAsset::RTTI_Type() };
+            }
+
+            bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+            {
+                return GetSupportedAssetInfo(key).m_assetId.IsValid();
+            }
+
+            AZ::Data::AssetInfo GetSupportedAssetInfo(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+            {
+                const auto& supportedTypeIds = GetSupportedAssetTypes();
+
                 // if it's a source thumbnail key, find first product with a matching asset type
                 auto sourceKey = azrtti_cast<const AzToolsFramework::AssetBrowser::SourceThumbnailKey*>(key.data());
                 if (sourceKey)
                 {
                     bool foundIt = false;
-                    AZStd::vector<Data::AssetInfo> productsAssetInfo;
+                    AZStd::vector<AZ::Data::AssetInfo> productsAssetInfo;
                     AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
                         foundIt, &AzToolsFramework::AssetSystemRequestBus::Events::GetAssetsProducedBySourceUUID,
                         sourceKey->GetSourceUuid(), productsAssetInfo);
-                    if (!foundIt)
-                    {
-                        return defaultAssetId;
-                    }
-                    auto assetInfoIt = AZStd::find_if(
-                        productsAssetInfo.begin(), productsAssetInfo.end(),
-                        [&assetType](const Data::AssetInfo& assetInfo)
-                        {
-                            return assetInfo.m_assetType == assetType;
-                        });
-                    if (assetInfoIt == productsAssetInfo.end())
-                    {
-                        return defaultAssetId;
-                    }
 
-                    return assetInfoIt->m_assetId;
+                    // Search the product assets for a matching asset type ID in the order of the supported type IDs, which are organized by priority
+                    for (const auto& typeId : supportedTypeIds)
+                    {
+                        for (const auto& assetInfo : productsAssetInfo)
+                        {
+                            if (assetInfo.m_assetType == typeId)
+                            {
+                                return assetInfo;
+                            }
+                        }
+                    }
+                    return AZ::Data::AssetInfo();
                 }
 
                 // if it's a product thumbnail key just return its assetId
+                AZ::Data::AssetInfo assetInfo;
                 auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(key.data());
-                if (productKey && productKey->GetAssetType() == assetType)
+                if (productKey &&
+                    AZStd::find(supportedTypeIds.begin(), supportedTypeIds.end(), productKey->GetAssetType()) != supportedTypeIds.end())
                 {
-                    return productKey->GetAssetId();
+                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                        assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, productKey->GetAssetId());
                 }
-                return defaultAssetId;
+                return assetInfo;
+            }
+
+            AZ::Data::AssetId GetSupportedAssetId(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, const AZ::Data::AssetId& defaultAssetId)
+            {
+                const AZ::Data::AssetInfo assetInfo = GetSupportedAssetInfo(key);
+                return assetInfo.m_assetId.IsValid() ? assetInfo.m_assetId : defaultAssetId;
+            }
+
+            AZ::Data::AssetId GetAssetIdForProductPath(const AZStd::string_view productPath)
+            {
+                if (!productPath.empty())
+                {
+                    return AZ::RPI::AssetUtils::GetAssetIdForProductPath(productPath.data());
+                }
+                return AZ::Data::AssetId();
             }
 
             QString WordWrap(const QString& string, int maxLength)
@@ -85,32 +111,6 @@ namespace AZ
                 }
                 return result;
             }
-
-            AZStd::unordered_set<AZ::Uuid> GetSupportedAssetTypes()
-            {
-                return { RPI::AnyAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::ModelAsset::RTTI_Type() };
-            }
-
-            bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
-            {
-                for (const AZ::Uuid& typeId : SharedPreviewUtils::GetSupportedAssetTypes())
-                {
-                    const AZ::Data::AssetId& assetId = SharedPreviewUtils::GetAssetId(key, typeId);
-                    if (assetId.IsValid())
-                    {
-                        if (typeId == RPI::AnyAsset::RTTI_Type())
-                        {
-                            AZ::Data::AssetInfo assetInfo;
-                            AZ::Data::AssetCatalogRequestBus::BroadcastResult(
-                                assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
-                            return AzFramework::StringFunc::EndsWith(assetInfo.m_relativePath.c_str(), "lightingpreset.azasset");
-                        }
-                        return true;
-                    }
-                }
-
-                return false;
-            }
         } // namespace SharedPreviewUtils
     } // namespace LyIntegration
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h
index 6c5d83d22a..d215271936 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <AzCore/Asset/AssetCommon.h>
-
 #if !defined(Q_MOC_RUN)
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Asset/AssetManagerBus.h>
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>
 #endif
 
@@ -20,21 +20,25 @@ namespace AZ
     {
         namespace SharedPreviewUtils
         {
-            //! Get assetId by assetType that belongs to either source or product thumbnail key
-            Data::AssetId GetAssetId(
-                AzToolsFramework::Thumbnailer::SharedThumbnailKey key,
-                const Data::AssetType& assetType,
-                const Data::AssetId& defaultAssetId = {});
-
-            //! Word wrap function for previewer QLabel, since by default it does not break long words such as filenames, so manual word
-            //! wrap needed
-            QString WordWrap(const QString& string, int maxLength);
-
             //! Get the set of all asset types supported by the shared preview
-            AZStd::unordered_set<AZ::Uuid> GetSupportedAssetTypes();
+            AZStd::vector<AZ::Uuid> GetSupportedAssetTypes();
 
             //! Determine if a thumbnail key has an asset supported by the shared preview
             bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
+
+            //! Get assetInfo of source or product thumbnail key if asset type is supported by the shared preview
+            AZ::Data::AssetInfo GetSupportedAssetInfo(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
+
+            //! Get assetId of source or product thumbnail key if asset type is supported by the shared preview
+            AZ::Data::AssetId GetSupportedAssetId(
+                AzToolsFramework::Thumbnailer::SharedThumbnailKey key, const AZ::Data::AssetId& defaultAssetId = {});
+
+            //! Wraps AZ::RPI::AssetUtils::GetAssetIdForProductPath to handle empty productPath
+            AZ::Data::AssetId GetAssetIdForProductPath(const AZStd::string_view productPath);
+
+            //! Inserts new line characters into a string whenever the maximum number of characters per line is exceeded
+            QString WordWrap(const QString& string, int maxLength);
+
         } // namespace SharedPreviewUtils
     } // namespace LyIntegration
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp
index 5d82bac139..d07c4577e8 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp
@@ -22,18 +22,13 @@ namespace AZ
         //////////////////////////////////////////////////////////////////////////
         SharedThumbnail::SharedThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
             : Thumbnail(key)
+            , m_assetInfo(SharedPreviewUtils::GetSupportedAssetInfo(key))
         {
-            for (const AZ::Uuid& typeId : SharedPreviewUtils::GetSupportedAssetTypes())
+            if (m_assetInfo.m_assetId.IsValid())
             {
-                const AZ::Data::AssetId& assetId = SharedPreviewUtils::GetAssetId(key, typeId);
-                if (assetId.IsValid())
-                {
-                    m_assetId = assetId;
-                    m_typeId = typeId;
-                    AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Handler::BusConnect(key);
-                    AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-                    return;
-                }
+                AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Handler::BusConnect(key);
+                AzFramework::AssetCatalogEventBus::Handler::BusConnect();
+                return;
             }
 
             AZ_Error("SharedThumbnail", false, "Failed to find matching assetId for the thumbnailKey.");
@@ -43,7 +38,9 @@ namespace AZ
         void SharedThumbnail::LoadThread()
         {
             AzToolsFramework::Thumbnailer::ThumbnailerRendererRequestBus::QueueEvent(
-                m_typeId, &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail, m_key, SharedThumbnailSize);
+                m_assetInfo.m_assetType, &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail, m_key,
+                SharedThumbnailSize);
+
             // wait for response from thumbnail renderer
             m_renderWait.acquire();
         }
@@ -68,7 +65,7 @@ namespace AZ
 
         void SharedThumbnail::OnCatalogAssetChanged([[maybe_unused]] const AZ::Data::AssetId& assetId)
         {
-            if (m_assetId == assetId && m_state == State::Ready)
+            if (m_assetInfo.m_assetId == assetId && m_state == State::Ready)
             {
                 m_state = State::Unloaded;
                 Load();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h
index dee433e0bb..2d4b17a09e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h
@@ -43,8 +43,7 @@ namespace AZ
             void OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) override;
 
             AZStd::binary_semaphore m_renderWait;
-            Data::AssetId m_assetId;
-            AZ::Uuid m_typeId;
+            Data::AssetInfo m_assetInfo;
         };
 
         //! Cache configuration for shared thumbnails
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp
index c43ba5f1cf..4ee75e3436 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp
@@ -8,6 +8,7 @@
 
 #include <AtomToolsFramework/PreviewRenderer/PreviewRendererCaptureRequest.h>
 #include <AtomToolsFramework/PreviewRenderer/PreviewRendererInterface.h>
+#include <AtomToolsFramework/Util/Util.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
 #include <SharedPreview/SharedPreviewContent.h>
@@ -20,9 +21,9 @@ namespace AZ
     {
         SharedThumbnailRenderer::SharedThumbnailRenderer()
         {
-            m_defaultModelAsset.Create(DefaultModelAssetId, true);
-            m_defaultMaterialAsset.Create(DefaultMaterialAssetId, true);
-            m_defaultLightingPresetAsset.Create(DefaultLightingPresetAssetId, true);
+            m_defaultModelAsset.Create(SharedPreviewUtils::GetAssetIdForProductPath(DefaultModelPath), true);
+            m_defaultMaterialAsset.Create(SharedPreviewUtils::GetAssetIdForProductPath(DefaultMaterialPath), true);
+            m_defaultLightingPresetAsset.Create(SharedPreviewUtils::GetAssetIdForProductPath(DefaultLightingPresetPath), true);
 
             for (const AZ::Uuid& typeId : SharedPreviewUtils::GetSupportedAssetTypes())
             {
@@ -37,17 +38,66 @@ namespace AZ
             SystemTickBus::Handler::BusDisconnect();
         }
 
+        SharedThumbnailRenderer::ThumbnailConfig SharedThumbnailRenderer::GetThumbnailConfig(
+            AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey)
+        {
+            ThumbnailConfig thumbnailConfig;
+
+            const auto assetInfo = SharedPreviewUtils::GetSupportedAssetInfo(thumbnailKey);
+            if (assetInfo.m_assetType == RPI::ModelAsset::RTTI_Type())
+            {
+                static constexpr const char* MaterialAssetPathSetting =
+                    "/O3DE/Atom/CommonFeature/SharedPreview/ModelAssetType/MaterialAssetPath";
+                static constexpr const char* LightingAssetPathSetting =
+                    "/O3DE/Atom/CommonFeature/SharedPreview/ModelAssetType/LightingAssetPath";
+
+                thumbnailConfig.m_modelId = assetInfo.m_assetId;
+                thumbnailConfig.m_materialId = SharedPreviewUtils::GetAssetIdForProductPath(
+                    AtomToolsFramework::GetSettingOrDefault<AZStd::string>(MaterialAssetPathSetting, DefaultMaterialPath));
+                thumbnailConfig.m_lightingId = SharedPreviewUtils::GetAssetIdForProductPath(
+                    AtomToolsFramework::GetSettingOrDefault<AZStd::string>(LightingAssetPathSetting, DefaultLightingPresetPath));
+            }
+            else if (assetInfo.m_assetType == RPI::MaterialAsset::RTTI_Type())
+            {
+                static constexpr const char* ModelAssetPathSetting =
+                    "/O3DE/Atom/CommonFeature/SharedPreview/MaterialAssetType/ModelAssetPath";
+                static constexpr const char* LightingAssetPathSetting =
+                    "/O3DE/Atom/CommonFeature/SharedPreview/MaterialAssetType/LightingAssetPath";
+
+                thumbnailConfig.m_modelId = SharedPreviewUtils::GetAssetIdForProductPath(
+                    AtomToolsFramework::GetSettingOrDefault<AZStd::string>(ModelAssetPathSetting, DefaultModelPath));
+                thumbnailConfig.m_materialId = assetInfo.m_assetId;
+                thumbnailConfig.m_lightingId = SharedPreviewUtils::GetAssetIdForProductPath(
+                    AtomToolsFramework::GetSettingOrDefault<AZStd::string>(LightingAssetPathSetting, DefaultLightingPresetPath));
+            }
+            else if (assetInfo.m_assetType == RPI::AnyAsset::RTTI_Type())
+            {
+                static constexpr const char* ModelAssetPathSetting =
+                    "/O3DE/Atom/CommonFeature/SharedPreview/LightingAssetType/ModelAssetPath";
+                static constexpr const char* MaterialAssetPathSetting =
+                    "/O3DE/Atom/CommonFeature/SharedPreview/LightingAssetType/MaterialAssetPath";
+
+                thumbnailConfig.m_modelId = SharedPreviewUtils::GetAssetIdForProductPath(
+                    AtomToolsFramework::GetSettingOrDefault<AZStd::string>(ModelAssetPathSetting, DefaultModelPath));
+                thumbnailConfig.m_materialId = SharedPreviewUtils::GetAssetIdForProductPath(
+                    AtomToolsFramework::GetSettingOrDefault<AZStd::string>(MaterialAssetPathSetting, "materials/reflectionprobe/reflectionprobevisualization.azmaterial"));
+                thumbnailConfig.m_lightingId = assetInfo.m_assetId;
+            }
+
+            return thumbnailConfig;
+        }
+
         void SharedThumbnailRenderer::RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize)
         {
             if (auto previewRenderer = AZ::Interface<AtomToolsFramework::PreviewRendererInterface>::Get())
             {
+                const auto& thumbnailConfig = GetThumbnailConfig(thumbnailKey);
+
                 previewRenderer->AddCaptureRequest(
                     { thumbnailSize,
                       AZStd::make_shared<SharedPreviewContent>(
                           previewRenderer->GetScene(), previewRenderer->GetView(), previewRenderer->GetEntityContextId(),
-                          SharedPreviewUtils::GetAssetId(thumbnailKey, RPI::ModelAsset::RTTI_Type(), DefaultModelAssetId),
-                          SharedPreviewUtils::GetAssetId(thumbnailKey, RPI::MaterialAsset::RTTI_Type(), DefaultMaterialAssetId),
-                          SharedPreviewUtils::GetAssetId(thumbnailKey, RPI::AnyAsset::RTTI_Type(), DefaultLightingPresetAssetId),
+                          thumbnailConfig.m_modelId, thumbnailConfig.m_materialId, thumbnailConfig.m_lightingId,
                           Render::MaterialPropertyOverrideMap()),
                       [thumbnailKey]()
                       {
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h
index 4db7728109..2166ac49e7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h
@@ -33,6 +33,15 @@ namespace AZ
             ~SharedThumbnailRenderer();
 
         private:
+            struct ThumbnailConfig
+            {
+                Data::AssetId m_modelId;
+                Data::AssetId m_materialId;
+                Data::AssetId m_lightingId;
+            };
+
+            ThumbnailConfig GetThumbnailConfig(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey);
+
             //! ThumbnailerRendererRequestsBus::Handler interface overrides...
             void RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize) override;
             bool Installed() const override;
@@ -42,15 +51,12 @@ namespace AZ
 
             // Default assets to be kept loaded and used for rendering if not overridden
             static constexpr const char* DefaultLightingPresetPath = "lightingpresets/thumbnail.lightingpreset.azasset";
-            const Data::AssetId DefaultLightingPresetAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(DefaultLightingPresetPath);
             Data::Asset<RPI::AnyAsset> m_defaultLightingPresetAsset;
 
             static constexpr const char* DefaultModelPath = "models/sphere.azmodel";
-            const Data::AssetId DefaultModelAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(DefaultModelPath);
             Data::Asset<RPI::ModelAsset> m_defaultModelAsset;
 
             static constexpr const char* DefaultMaterialPath = "";
-            const Data::AssetId DefaultMaterialAssetId;
             Data::Asset<RPI::MaterialAsset> m_defaultMaterialAsset;
         };
     } // namespace LyIntegration
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
index 171c5e417f..7bf6237c1a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
@@ -196,8 +196,6 @@ namespace AZ
                 }
                 else
                 {
-                    // If this asset didn't load or isn't a cubemap, release it.
-                    m_configuration.m_cubemapAsset.Release();
                     m_featureProcessorInterface->SetCubemap(nullptr);
                 }
             }
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
index 284e1ed35d..b1c5cf299b 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
@@ -194,7 +194,6 @@ namespace AZ
                     const uint32_t originalVertex = sourceOriginalVertex[vertexIndex + vertexStart];
                     const uint32_t influenceCount = AZStd::GetMin<uint32_t>(MaxSupportedSkinInfluences, static_cast<uint32_t>(sourceSkinningInfo->GetNumInfluences(originalVertex)));
                     uint32_t influenceIndex = 0;
-                    float weightError = 1.0f;
 
                     AZStd::vector<uint32_t> localIndices;
                     for (; influenceIndex < influenceCount; ++influenceIndex)
@@ -202,7 +201,6 @@ namespace AZ
                         EMotionFX::SkinInfluence* influence = sourceSkinningInfo->GetInfluence(originalVertex, influenceIndex);
                         localIndices.push_back(static_cast<uint32_t>(influence->GetNodeNr()));
                         blendWeightBufferData[atomVertexBufferOffset + vertexIndex][influenceIndex] = influence->GetWeight();
-                        weightError -= blendWeightBufferData[atomVertexBufferOffset + vertexIndex][influenceIndex];
                     }
 
                     // Zero out any unused ids/weights
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp
index 50af91020a..82ee19b6a5 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp
@@ -6,10 +6,13 @@
  *
  */
 
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
+
 #include <AtomActorDebugDraw.h>
 #include <Atom/RPI.Public/Scene.h>
 #include <Atom/RPI.Public/AuxGeom/AuxGeomDraw.h>
 #include <Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
 #include <Integration/Rendering/RenderActorInstance.h>
 #include <Integration/Rendering/RenderActorSettings.h>
 
@@ -20,10 +23,12 @@
 #include <EMotionFX/Source/TransformData.h>
 #include <EMotionFX/Source/Mesh.h>
 #include <EMotionFX/Source/Node.h>
+#include <EMotionFX/Source/JointSelectionBus.h>
 
 namespace AZ::Render
 {
     AtomActorDebugDraw::AtomActorDebugDraw(AZ::EntityId entityId)
+        : m_entityId(entityId)
     {
         m_auxGeomFeatureProcessor = RPI::Scene::GetFeatureProcessorForEntity<RPI::AuxGeomFeatureProcessorInterface>(entityId);
     }
@@ -41,7 +46,11 @@ namespace AZ::Render
             return;
         }
 
+        const RPI::Scene* scene = RPI::Scene::GetSceneForEntityId(m_entityId);
+        const RPI::ViewportContextPtr viewport = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get()->GetViewportContextByScene(scene);
+        AzFramework::DebugDisplayRequests* debugDisplay = GetDebugDisplay(viewport->GetId());
         const AZ::Render::RenderActorSettings& renderActorSettings = EMotionFX::GetRenderActorSettings();
+        const float scaleMultiplier = CalculateScaleMultiplier(instance);
 
         // Render aabb
         if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_AABB])
@@ -49,18 +58,35 @@ namespace AZ::Render
             RenderAABB(instance, renderActorSettings.m_staticAABBColor);
         }
 
-        // Render skeleton
+        // Render simple line skeleton
         if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_LINESKELETON])
+        {
+            RenderLineSkeleton(instance, renderActorSettings.m_lineSkeletonColor);
+        }
+
+        // Render advanced skeleton
+        if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_SKELETON])
         {
             RenderSkeleton(instance, renderActorSettings.m_skeletonColor);
         }
 
+        if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_NODENAMES])
+        {
+            RenderJointNames(instance, viewport, renderActorSettings.m_jointNameColor);
+        }
+
         // Render internal EMFX debug lines.
         if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_EMFX_DEBUG])
         {
             RenderEMFXDebugDraw(instance);
         }
 
+        // Render
+        if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_NODEORIENTATION])
+        {
+            RenderNodeOrientations(instance, debugDisplay, renderActorSettings.m_nodeOrientationScale * scaleMultiplier);
+        }
+
         // Render vertex normal, face normal, tagent and wireframe.
         const bool renderVertexNormals = renderFlags[EMotionFX::ActorRenderFlag::RENDER_VERTEXNORMALS];
         const bool renderFaceNormals = renderFlags[EMotionFX::ActorRenderFlag::RENDER_FACENORMALS];
@@ -73,7 +99,6 @@ namespace AZ::Render
             const EMotionFX::Pose* pose = instance->GetTransformData()->GetCurrentPose();
             const size_t geomLODLevel = instance->GetLODLevel();
             const size_t numEnabled = instance->GetNumEnabledNodes();
-            const float scaleMultiplier = CalculateScaleMultiplier(instance);
             for (size_t i = 0; i < numEnabled; ++i)
             {
                 EMotionFX::Node* node = instance->GetActor()->GetSkeleton()->GetNode(instance->GetEnabledNode(i));
@@ -110,6 +135,29 @@ namespace AZ::Render
         return aabbRadius * 0.01f;
     }
 
+    float AtomActorDebugDraw::CalculateBoneScale(EMotionFX::ActorInstance* actorInstance, EMotionFX::Node* node)
+    {
+        // Get the transform data
+        EMotionFX::TransformData* transformData = actorInstance->GetTransformData();
+        const EMotionFX::Pose* pose = transformData->GetCurrentPose();
+
+        const size_t nodeIndex = node->GetNodeIndex();
+        const size_t parentIndex = node->GetParentIndex();
+        const AZ::Vector3 nodeWorldPos = pose->GetWorldSpaceTransform(nodeIndex).m_position;
+
+        if (parentIndex != InvalidIndex)
+        {
+            const AZ::Vector3 parentWorldPos = pose->GetWorldSpaceTransform(parentIndex).m_position;
+            const AZ::Vector3 bone = parentWorldPos - nodeWorldPos;
+            const float boneLength = bone.GetLengthEstimate();
+
+            // 10% of the bone length is the sphere size
+            return boneLength * 0.1f;
+        }
+
+        return 0.0f;
+    }
+
     void AtomActorDebugDraw::PrepareForMesh(EMotionFX::Mesh* mesh, const AZ::Transform& worldTM)
     {
         // Check if we have already prepared for the given mesh
@@ -138,6 +186,13 @@ namespace AZ::Render
         }
     }
 
+    AzFramework::DebugDisplayRequests* AtomActorDebugDraw::GetDebugDisplay(AzFramework::ViewportId viewportId)
+    {
+        AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus;
+        AzFramework::DebugDisplayRequestBus::Bind(debugDisplayBus, viewportId);
+        return AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
+    }
+
     void AtomActorDebugDraw::RenderAABB(EMotionFX::ActorInstance* instance, const AZ::Color& aabbColor)
     {
         RPI::AuxGeomDrawPtr auxGeom = m_auxGeomFeatureProcessor->GetDrawQueue();
@@ -145,7 +200,7 @@ namespace AZ::Render
         auxGeom->DrawAabb(aabb, aabbColor, RPI::AuxGeomDraw::DrawStyle::Line);
     }
 
-    void AtomActorDebugDraw::RenderSkeleton(EMotionFX::ActorInstance* instance, const AZ::Color& skeletonColor)
+    void AtomActorDebugDraw::RenderLineSkeleton(EMotionFX::ActorInstance* instance, const AZ::Color& skeletonColor)
     {
         RPI::AuxGeomDrawPtr auxGeom = m_auxGeomFeatureProcessor->GetDrawQueue();
 
@@ -158,6 +213,13 @@ namespace AZ::Render
 
         m_auxVertices.clear();
         m_auxVertices.reserve(numJoints * 2);
+        m_auxColors.clear();
+        m_auxColors.reserve(numJoints * 2);
+        AZ::Color renderColor;
+
+        const AZStd::unordered_set<size_t>* cachedSelectedJointIndices;
+        EMotionFX::JointSelectionRequestBus::BroadcastResult(
+            cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, instance);
 
         for (size_t jointIndex = 0; jointIndex < numJoints; ++jointIndex)
         {
@@ -173,22 +235,83 @@ namespace AZ::Render
                 continue;
             }
 
+            if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end())
+            {
+                renderColor = SelectedColor;
+            }
+            else
+            {
+                renderColor = skeletonColor;
+            }
+
             const AZ::Vector3 parentPos = pose->GetWorldSpaceTransform(parentIndex).m_position;
             m_auxVertices.emplace_back(parentPos);
+            m_auxColors.emplace_back(renderColor);
 
             const AZ::Vector3 bonePos = pose->GetWorldSpaceTransform(jointIndex).m_position;
             m_auxVertices.emplace_back(bonePos);
+            m_auxColors.emplace_back(renderColor);
         }
 
         RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
         lineArgs.m_verts = m_auxVertices.data();
         lineArgs.m_vertCount = static_cast<uint32_t>(m_auxVertices.size());
-        lineArgs.m_colors = &skeletonColor;
-        lineArgs.m_colorCount = 1;
+        lineArgs.m_colors = m_auxColors.data();
+        lineArgs.m_colorCount = lineArgs.m_vertCount;
         lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
         auxGeom->DrawLines(lineArgs);
     }
 
+    void AtomActorDebugDraw::RenderSkeleton(EMotionFX::ActorInstance* instance, const AZ::Color& skeletonColor)
+    {
+        RPI::AuxGeomDrawPtr auxGeom = m_auxGeomFeatureProcessor->GetDrawQueue();
+
+        const EMotionFX::TransformData* transformData = instance->GetTransformData();
+        const EMotionFX::Skeleton* skeleton = instance->GetActor()->GetSkeleton();
+        const EMotionFX::Pose* pose = transformData->GetCurrentPose();
+        const size_t numEnabled = instance->GetNumEnabledNodes();
+
+        AZ::Color renderColor = skeletonColor;
+        const AZStd::unordered_set<size_t>* cachedSelectedJointIndices;
+        EMotionFX::JointSelectionRequestBus::BroadcastResult(
+            cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, instance);
+
+        for (size_t i = 0; i < numEnabled; ++i)
+        {
+            EMotionFX::Node* joint = skeleton->GetNode(instance->GetEnabledNode(i));
+            const size_t jointIndex = joint->GetNodeIndex();
+            const size_t parentIndex = joint->GetParentIndex();
+
+            // check if this node has a parent and is a bone, if not skip it
+            if (parentIndex == InvalidIndex)
+            {
+                continue;
+            }
+
+            const AZ::Vector3 nodeWorldPos = pose->GetWorldSpaceTransform(jointIndex).m_position;
+            const AZ::Vector3 parentWorldPos = pose->GetWorldSpaceTransform(parentIndex).m_position;
+            const AZ::Vector3 bone = parentWorldPos - nodeWorldPos;
+            const AZ::Vector3 boneDirection = bone.GetNormalizedEstimate();
+            const AZ::Vector3 centerWorldPos = bone / 2 + nodeWorldPos;
+            const float boneLength = bone.GetLengthEstimate();
+            const float boneScale = CalculateBoneScale(instance, joint);
+            const float parentBoneScale = CalculateBoneScale(instance, skeleton->GetNode(parentIndex));
+            const float cylinderSize = boneLength - boneScale - parentBoneScale;
+
+            if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end())
+            {
+                renderColor = SelectedColor;
+            }
+            else
+            {
+                renderColor = skeletonColor;
+            }
+            // Render the bone cylinder, the cylinder will be directed towards the node's parent and must fit between the spheres
+            auxGeom->DrawCylinder(centerWorldPos, boneDirection, boneScale, cylinderSize, renderColor);
+            auxGeom->DrawSphere(nodeWorldPos, boneScale, renderColor);
+        }
+    }
+
     void AtomActorDebugDraw::RenderEMFXDebugDraw(EMotionFX::ActorInstance* instance)
     {
         RPI::AuxGeomDrawPtr auxGeom = m_auxGeomFeatureProcessor->GetDrawQueue();
@@ -329,15 +452,15 @@ namespace AZ::Render
                     m_auxVertices.emplace_back(position);
                     m_auxVertices.emplace_back(position + normal);
                 }
-            }
 
-            RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
-            lineArgs.m_verts = m_auxVertices.data();
-            lineArgs.m_vertCount = static_cast<uint32_t>(m_auxVertices.size());
-            lineArgs.m_colors = &vertexNormalsColor;
-            lineArgs.m_colorCount = 1;
-            lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
-            auxGeom->DrawLines(lineArgs);
+                RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
+                lineArgs.m_verts = m_auxVertices.data();
+                lineArgs.m_vertCount = static_cast<uint32_t>(m_auxVertices.size());
+                lineArgs.m_colors = &vertexNormalsColor;
+                lineArgs.m_colorCount = 1;
+                lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
+                auxGeom->DrawLines(lineArgs);
+            }
         }
     }
 
@@ -487,4 +610,159 @@ namespace AZ::Render
             auxGeom->DrawLines(lineArgs);
         }
     }
+
+    void AtomActorDebugDraw::RenderJointNames(EMotionFX::ActorInstance* actorInstance,
+        RPI::ViewportContextPtr viewportContext, const AZ::Color& jointNameColor)
+    {
+        if (!m_fontDrawInterface)
+        {
+            auto fontQueryInterface = AZ::Interface<AzFramework::FontQueryInterface>::Get();
+            if (!fontQueryInterface)
+            {
+                return;
+            }
+            m_fontDrawInterface = fontQueryInterface->GetDefaultFontDrawInterface();
+        }
+
+        if (!m_fontDrawInterface || !viewportContext || !viewportContext->GetRenderScene() ||
+            !AZ::Interface<AzFramework::FontQueryInterface>::Get())
+        {
+            return;
+        }
+
+        const AZStd::unordered_set<size_t>* cachedSelectedJointIndices;
+        EMotionFX::JointSelectionRequestBus::BroadcastResult(
+            cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, actorInstance);
+
+        const EMotionFX::Actor* actor = actorInstance->GetActor();
+        const EMotionFX::Skeleton* skeleton = actor->GetSkeleton();
+        const EMotionFX::TransformData* transformData = actorInstance->GetTransformData();
+        const EMotionFX::Pose* pose = transformData->GetCurrentPose();
+        const size_t numEnabledNodes = actorInstance->GetNumEnabledNodes();
+
+        m_drawParams.m_drawViewportId = viewportContext->GetId();
+        AzFramework::WindowSize viewportSize = viewportContext->GetViewportSize();
+        m_drawParams.m_position = AZ::Vector3(static_cast<float>(viewportSize.m_width), 0.0f, 1.0f) +
+            TopRightBorderPadding * viewportContext->GetDpiScalingFactor();
+        m_drawParams.m_scale = AZ::Vector2(BaseFontSize);
+        m_drawParams.m_hAlign = AzFramework::TextHorizontalAlignment::Right;
+        m_drawParams.m_monospace = false;
+        m_drawParams.m_depthTest = false;
+        m_drawParams.m_virtual800x600ScreenSize = false;
+        m_drawParams.m_scaleWithWindow = false;
+        m_drawParams.m_multiline = true;
+        m_drawParams.m_lineSpacing = 0.5f;
+
+        for (size_t i = 0; i < numEnabledNodes; ++i)
+        {
+            const EMotionFX::Node* joint = skeleton->GetNode(actorInstance->GetEnabledNode(i));
+            const size_t jointIndex = joint->GetNodeIndex();
+            const AZ::Vector3 worldPos = pose->GetWorldSpaceTransform(jointIndex).m_position;
+
+            m_drawParams.m_position = worldPos;
+            if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end())
+            {
+                m_drawParams.m_color = SelectedColor;
+            }
+            else
+            {
+                m_drawParams.m_color = jointNameColor;
+            }
+            m_fontDrawInterface->DrawScreenAlignedText3d(m_drawParams, joint->GetName());
+        }
+    }
+
+    void AtomActorDebugDraw::RenderNodeOrientations(EMotionFX::ActorInstance* actorInstance,
+        AzFramework::DebugDisplayRequests* debugDisplay, float scale)
+    {
+        // Get the actor and the transform data
+        const float unitScale =
+            1.0f / (float)MCore::Distance::ConvertValue(1.0f, MCore::Distance::UNITTYPE_METERS, EMotionFX::GetEMotionFX().GetUnitType());
+        const EMotionFX::Actor* actor = actorInstance->GetActor();
+        const EMotionFX::Skeleton* skeleton = actor->GetSkeleton();
+        const EMotionFX::TransformData* transformData = actorInstance->GetTransformData();
+        const EMotionFX::Pose* pose = transformData->GetCurrentPose();
+        const float constPreScale = scale * unitScale * 3.0f;
+
+        const AZStd::unordered_set<size_t>* cachedSelectedJointIndices;
+        EMotionFX::JointSelectionRequestBus::BroadcastResult(
+            cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, actorInstance);
+
+        const size_t numEnabled = actorInstance->GetNumEnabledNodes();
+        for (size_t i = 0; i < numEnabled; ++i)
+        {
+            EMotionFX::Node* joint = skeleton->GetNode(actorInstance->GetEnabledNode(i));
+            const size_t jointIndex = joint->GetNodeIndex();
+
+            static const float axisBoneScale = 50.0f;
+            const float size = CalculateBoneScale(actorInstance, joint) * constPreScale * axisBoneScale;
+            AZ::Transform worldTM = pose->GetWorldSpaceTransform(jointIndex).ToAZTransform();
+            bool selected = false;
+            if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end())
+            {
+                selected = true;
+            }
+            RenderLineAxis(debugDisplay, worldTM, size, selected);
+        }
+    }
+
+    void AtomActorDebugDraw::RenderLineAxis(
+        AzFramework::DebugDisplayRequests* debugDisplay,
+        AZ::Transform worldTM,
+        float size,
+        bool selected,
+        bool renderAxisName)
+    {
+        const float axisHeight = size * 0.7f;
+        const float frontSize = size * 5.0f + 0.2f;
+        const AZ::Vector3 position = worldTM.GetTranslation();
+
+        // Render x axis
+        {
+            AZ::Color xSelectedColor = selected ? AZ::Colors::Orange : AZ::Colors::Red;
+
+            const AZ::Vector3 xAxisDir = (worldTM.TransformPoint(AZ::Vector3(size, 0.0f, 0.0f)) - position).GetNormalized();
+            const AZ::Vector3 xAxisArrowStart = position + xAxisDir * axisHeight;
+            debugDisplay->SetColor(xSelectedColor);
+            debugDisplay->DrawArrow(position, xAxisArrowStart, size);
+
+            if (renderAxisName)
+            {
+                const AZ::Vector3 xNamePos = position + xAxisDir * (size * 1.15f);
+                debugDisplay->DrawTextLabel(xNamePos, frontSize, "X");
+            }
+        }
+
+        // Render y axis
+        {
+            AZ::Color ySelectedColor = selected ? AZ::Colors::Orange : AZ::Colors::Blue;
+
+            const AZ::Vector3 yAxisDir = (worldTM.TransformPoint(AZ::Vector3(0.0f, size, 0.0f)) - position).GetNormalized();
+            const AZ::Vector3 yAxisArrowStart = position + yAxisDir * axisHeight;
+            debugDisplay->SetColor(ySelectedColor);
+            debugDisplay->DrawArrow(position, yAxisArrowStart, size);
+
+            if (renderAxisName)
+            {
+                const AZ::Vector3 yNamePos = position + yAxisDir * (size * 1.15f);
+                debugDisplay->DrawTextLabel(yNamePos, frontSize, "Y");
+            }
+        }
+
+        // Render z axis
+        {
+            AZ::Color zSelectedColor = selected ? AZ::Colors::Orange : AZ::Colors::Green;
+
+            const AZ::Vector3 zAxisDir = (worldTM.TransformPoint(AZ::Vector3(0.0f, 0.0f, size)) - position).GetNormalized();
+            const AZ::Vector3 zAxisArrowStart = position + zAxisDir * axisHeight;
+            debugDisplay->SetColor(zSelectedColor);
+            debugDisplay->DrawArrow(position, zAxisArrowStart, size);
+
+            if (renderAxisName)
+            {
+                const AZ::Vector3 zNamePos = position + zAxisDir * (size * 1.15f);
+                debugDisplay->DrawTextLabel(zNamePos, frontSize, "Z");
+            }
+        }
+    }
 } // namespace AZ::Render
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h
index 4178ad25f1..3c0258cfef 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h
@@ -10,8 +10,15 @@
 
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/Math/Color.h>
+#include <AzFramework/Font/FontInterface.h>
 #include <Integration/Rendering/RenderFlag.h>
 #include <Integration/Rendering/RenderActorInstance.h>
+#include <Atom/RPI.Public/ViewportContext.h>
+
+namespace AzFramework
+{
+    class DebugDisplayRequests;
+}
 
 namespace EMotionFX
 {
@@ -37,9 +44,13 @@ namespace AZ::Render
 
     private:
 
+        float CalculateBoneScale(EMotionFX::ActorInstance* actorInstance, EMotionFX::Node* node);
         float CalculateScaleMultiplier(EMotionFX::ActorInstance* instance) const;
         void PrepareForMesh(EMotionFX::Mesh* mesh, const AZ::Transform& worldTM);
+        AzFramework::DebugDisplayRequests* GetDebugDisplay(AzFramework::ViewportId viewportId);
+
         void RenderAABB(EMotionFX::ActorInstance* instance, const AZ::Color& aabbColor);
+        void RenderLineSkeleton(EMotionFX::ActorInstance* instance, const AZ::Color& skeletonColor);
         void RenderSkeleton(EMotionFX::ActorInstance* instance, const AZ::Color& skeletonColor);
         void RenderEMFXDebugDraw(EMotionFX::ActorInstance* instance);
         void RenderNormals(
@@ -57,14 +68,30 @@ namespace AZ::Render
             const AZ::Color& tangentsColor, const AZ::Color& mirroredBitangentsColor, const AZ::Color& bitangentsColor);
         void RenderWireframe(EMotionFX::Mesh* mesh, const AZ::Transform& worldTM, float wireframeScale, float scaleMultiplier,
             const AZ::Color& wireframeColor);
+        void RenderJointNames(EMotionFX::ActorInstance* actorInstance, RPI::ViewportContextPtr viewportContext, const AZ::Color& jointNameColor);
+        void RenderNodeOrientations(EMotionFX::ActorInstance* actorInstance, AzFramework::DebugDisplayRequests* debugDisplay, float scale = 1.0f);
+        void RenderLineAxis(
+            AzFramework::DebugDisplayRequests* debugDisplay,
+            AZ::Transform worldTM,      //!< The world space transformation matrix to visualize. */
+            float size,                 //!< The size value in units is used to control the scaling of the axis. */
+            bool selected,              //!< Set to true if you want to render the axis using the selection color. */
+            bool renderAxisName = false);
 
-        EMotionFX::Mesh* m_currentMesh = nullptr; /**< A pointer to the mesh whose world space positions are in the pre-calculated positions buffer.
-                                           NULL in case we haven't pre-calculated any positions yet. */
-        AZStd::vector<AZ::Vector3> m_worldSpacePositions; /**< The buffer used to store world space positions for rendering normals
-                                                          tangents and the wireframe. */
+        EMotionFX::Mesh* m_currentMesh = nullptr; //!< A pointer to the mesh whose world space positions are in the pre-calculated positions buffer.
+                                                  //!< NULL in case we haven't pre-calculated any positions yet.
+        AZStd::vector<AZ::Vector3> m_worldSpacePositions; //!< The buffer used to store world space positions for rendering normals
+                                                          //!< tangents and the wireframe.
+
+        static constexpr float BaseFontSize = 0.7f;
+        const Vector3 TopRightBorderPadding = AZ::Vector3(-40.0f, 22.0f, 0.0f);
+        const AZ::Color SelectedColor = AZ::Color{ 1.0f, 0.67f, 0.0f, 1.0f };
 
         RPI::AuxGeomFeatureProcessorInterface* m_auxGeomFeatureProcessor = nullptr;
         AZStd::vector<AZ::Vector3> m_auxVertices;
         AZStd::vector<AZ::Color> m_auxColors;
+        EntityId m_entityId;
+
+        AzFramework::TextDrawParameters m_drawParams;
+        AzFramework::FontDrawInterface* m_fontDrawInterface = nullptr;
     };
 }
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
index 4d1b42a0eb..ce384a2155 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
@@ -776,12 +776,14 @@ namespace AZ
         {
             if (m_meshHandle)
             {
-                Data::Instance<RPI::ShaderResourceGroup> wrinkleMaskObjectSrg = m_meshFeatureProcessor->GetObjectSrg(*m_meshHandle);
-                if (wrinkleMaskObjectSrg)
+                const AZStd::vector<Data::Instance<RPI::ShaderResourceGroup>>& wrinkleMaskObjectSrgs = m_meshFeatureProcessor->GetObjectSrgs(*m_meshHandle);
+
+                for (auto& wrinkleMaskObjectSrg : wrinkleMaskObjectSrgs)
                 {
                     RHI::ShaderInputImageIndex wrinkleMasksIndex = wrinkleMaskObjectSrg->FindShaderInputImageIndex(Name{ "m_wrinkle_masks" });
                     RHI::ShaderInputConstantIndex wrinkleMaskWeightsIndex = wrinkleMaskObjectSrg->FindShaderInputConstantIndex(Name{ "m_wrinkle_mask_weights" });
                     RHI::ShaderInputConstantIndex wrinkleMaskCountIndex = wrinkleMaskObjectSrg->FindShaderInputConstantIndex(Name{ "m_wrinkle_mask_count" });
+
                     if (wrinkleMasksIndex.IsValid() || wrinkleMaskWeightsIndex.IsValid() || wrinkleMaskCountIndex.IsValid())
                     {
                         AZ_Error("AtomActorInstance", wrinkleMasksIndex.IsValid(), "m_wrinkle_masks not found on the ObjectSrg, but m_wrinkle_mask_weights and/or m_wrinkle_mask_count are being used.");
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRenderer.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRenderer.cpp
index a32af31d6d..ef6ff4681a 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRenderer.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRenderer.cpp
@@ -128,6 +128,7 @@ namespace EMStudio
         m_groundEntity->CreateComponent(AZ::Render::MeshComponentTypeId);
         m_groundEntity->CreateComponent(AZ::Render::MaterialComponentTypeId);
         m_groundEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
+        m_groundEntity->Init();
         m_groundEntity->Activate();
 
         Reinit();
@@ -178,20 +179,13 @@ namespace EMStudio
         if (!m_actorEntities.empty())
         {
             // Find the actor instance and calculate the center from aabb.
-            AZ::Vector3 actorCenter = AZ::Vector3::CreateZero();
             EMotionFX::Integration::ActorComponent* actorComponent =
                 m_actorEntities[0]->FindComponent<EMotionFX::Integration::ActorComponent>();
             EMotionFX::ActorInstance* actorInstance = actorComponent->GetActorInstance();
             if (actorInstance)
             {
-                actorCenter += actorInstance->GetAabb().GetCenter();
+                result = actorInstance->GetAabb().GetCenter();
             }
-            
-            // Just return the position of the first entity.
-            AZ::Transform worldTransform;
-            AZ::TransformBus::EventResult(worldTransform, m_actorEntities[0]->GetId(), &AZ::TransformBus::Events::GetWorldTM);
-            result = worldTransform.GetTranslation();
-            result += actorCenter;
         }
 
         return result;
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRequestBus.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRequestBus.h
index da4a054c53..9a0bee1fec 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRequestBus.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRequestBus.h
@@ -36,6 +36,9 @@ namespace EMStudio
         //! Set the camera view mode.
         virtual void SetCameraViewMode(CameraViewMode mode) = 0;
 
+        //! Set the camera follow up
+        virtual void SetFollowCharacter(bool follow) = 0;
+
         //! Toggle render option flag
         virtual void ToggleRenderFlag(EMotionFX::ActorRenderFlag flag) = 0;
     };
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp
index 3b53103537..0cf6dd70b3 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp
@@ -8,8 +8,10 @@
 
 #include <QToolButton>
 #include <QMenu>
+#include <QSettings>
 #include <EMStudio/AnimViewportToolBar.h>
 #include <EMStudio/AnimViewportRequestBus.h>
+#include <EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
 #include <AzCore/std/string/string.h>
 #include <AzQtComponents/Components/Widgets/ToolBar.h>
 
@@ -34,8 +36,9 @@ namespace EMStudio
 
             CreateViewOptionEntry(contextMenu, "Solid", EMotionFX::ActorRenderFlag::RENDER_SOLID);
             CreateViewOptionEntry(contextMenu, "Wireframe", EMotionFX::ActorRenderFlag::RENDER_WIREFRAME);
-            CreateViewOptionEntry(contextMenu, "Lighting", EMotionFX::ActorRenderFlag::RENDER_LIGHTING);
-            CreateViewOptionEntry(contextMenu, "Backface Culling", EMotionFX::ActorRenderFlag::RENDER_BACKFACECULLING);
+            // [EMFX-TODO] Add those option once implemented.
+            // CreateViewOptionEntry(contextMenu, "Lighting", EMotionFX::ActorRenderFlag::RENDER_LIGHTING);
+            // CreateViewOptionEntry(contextMenu, "Backface Culling", EMotionFX::ActorRenderFlag::RENDER_BACKFACECULLING);
             contextMenu->addSeparator();
             CreateViewOptionEntry(contextMenu, "Vertex Normals", EMotionFX::ActorRenderFlag::RENDER_VERTEXNORMALS);
             CreateViewOptionEntry(contextMenu, "Face Normals", EMotionFX::ActorRenderFlag::RENDER_FACENORMALS);
@@ -46,7 +49,8 @@ namespace EMStudio
             CreateViewOptionEntry(contextMenu, "Solid Skeleton", EMotionFX::ActorRenderFlag::RENDER_SKELETON);
             CreateViewOptionEntry(contextMenu, "Joint Names", EMotionFX::ActorRenderFlag::RENDER_NODENAMES);
             CreateViewOptionEntry(contextMenu, "Joint Orientations", EMotionFX::ActorRenderFlag::RENDER_NODEORIENTATION);
-            CreateViewOptionEntry(contextMenu, "Actor Bind Pose", EMotionFX::ActorRenderFlag::RENDER_ACTORBINDPOSE);
+            // [EMFX-TODO] Add those option once implemented.
+            // CreateViewOptionEntry(contextMenu, "Actor Bind Pose", EMotionFX::ActorRenderFlag::RENDER_ACTORBINDPOSE);
             contextMenu->addSeparator();
             CreateViewOptionEntry(contextMenu, "Hit Detection Colliders", EMotionFX::ActorRenderFlag::RENDER_HITDETECTION_COLLIDERS);
             CreateViewOptionEntry(contextMenu, "Ragdoll Colliders", EMotionFX::ActorRenderFlag::RENDER_RAGDOLL_COLLIDERS);
@@ -87,6 +91,19 @@ namespace EMStudio
                     // Send the reset camera event.
                     AnimViewportRequestBus::Broadcast(&AnimViewportRequestBus::Events::ResetCamera);
                 });
+
+            cameraMenu->addSeparator();
+            m_followCharacterAction = cameraMenu->addAction("Follow Character");
+            m_followCharacterAction->setCheckable(true);
+            m_followCharacterAction->setChecked(false);
+            connect(m_followCharacterAction, &QAction::triggered, this,
+                [this]()
+                {
+                    AnimViewportRequestBus::Broadcast(
+                        &AnimViewportRequestBus::Events::SetFollowCharacter, m_followCharacterAction->isChecked());
+                    ;
+                });
+
             cameraButton->setMenu(cameraMenu);
             cameraButton->setText("Camera Option");
             cameraButton->setPopupMode(QToolButton::InstantPopup);
@@ -94,6 +111,13 @@ namespace EMStudio
             cameraButton->setIcon(QIcon(":/EMotionFXAtom/Camera_category.svg"));
             addWidget(cameraButton);
         }
+
+        LoadSettings();
+    }
+
+    AnimViewportToolBar::~AnimViewportToolBar()
+    {
+        SaveSettings();
     }
 
     void AnimViewportToolBar::CreateViewOptionEntry(
@@ -129,4 +153,23 @@ namespace EMStudio
             }
         }
     }
+
+    void AnimViewportToolBar::LoadSettings()
+    {
+        AZStd::string renderFlagsFilename(EMStudioManager::GetInstance()->GetAppDataFolder());
+        renderFlagsFilename += "AnimViewportRenderFlags.cfg";
+        QSettings settings(renderFlagsFilename.c_str(), QSettings::IniFormat, this);
+
+        const bool isChecked = settings.value("CameraFollowUp", false).toBool();
+        m_followCharacterAction->setChecked(isChecked);
+    }
+
+    void AnimViewportToolBar::SaveSettings()
+    {
+        AZStd::string renderFlagsFilename(EMStudioManager::GetInstance()->GetAppDataFolder());
+        renderFlagsFilename += "AnimViewportRenderFlags.cfg";
+        QSettings settings(renderFlagsFilename.c_str(), QSettings::IniFormat, this);
+
+        settings.setValue("CameraFollowUp", m_followCharacterAction->isChecked());
+    }
 } // namespace EMStudio
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h
index 57633e5284..98b07f07dd 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h
@@ -22,14 +22,17 @@ namespace EMStudio
     {
     public:
         AnimViewportToolBar(QWidget* parent = nullptr);
-        ~AnimViewportToolBar() = default;
+        ~AnimViewportToolBar();
 
         void SetRenderFlags(EMotionFX::ActorRenderFlagBitset renderFlags);
+        void LoadSettings();
+        void SaveSettings();
 
     private:
         void CreateViewOptionEntry(
             QMenu* menu, const char* menuEntryName, uint32_t actionIndex, bool visible = true, char* iconFileName = nullptr);
 
         QAction* m_actions[EMotionFX::ActorRenderFlag::NUM_RENDERFLAGS] = { nullptr };
+        QAction* m_followCharacterAction = nullptr;
     };
 }
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
index cd362bdaf5..43d8483a6b 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
@@ -55,13 +55,13 @@ namespace EMStudio
 
     void AnimViewportWidget::Reinit(bool resetCamera)
     {
+        m_renderer->Reinit();
+        m_renderer->UpdateActorRenderFlag(m_renderFlags);
+
         if (resetCamera)
         {
             ResetCamera();
         }
-
-        m_renderer->Reinit();
-        m_renderer->UpdateActorRenderFlag(m_renderFlags);
     }
 
     EMotionFX::ActorRenderFlagBitset AnimViewportWidget::GetRenderFlags() const
@@ -147,36 +147,43 @@ namespace EMStudio
         switch (mode)
         {
         case CameraViewMode::FRONT:
-            cameraPosition.Set(0.0f, CameraDistance, targetPosition.GetZ());
+            cameraPosition.Set(targetPosition.GetX(), targetPosition.GetY() + CameraDistance, targetPosition.GetZ());
             break;
         case CameraViewMode::BACK:
-            cameraPosition.Set(0.0f, -CameraDistance, targetPosition.GetZ());
+            cameraPosition.Set(targetPosition.GetX(), targetPosition.GetY() - CameraDistance, targetPosition.GetZ());
             break;
         case CameraViewMode::TOP:
-            cameraPosition.Set(0.0f, 0.0f, CameraDistance + targetPosition.GetZ());
+            cameraPosition.Set(targetPosition.GetX(), targetPosition.GetY(), CameraDistance + targetPosition.GetZ());
             break;
         case CameraViewMode::BOTTOM:
-            cameraPosition.Set(0.0f, 0.0f, -CameraDistance + targetPosition.GetZ());
+            cameraPosition.Set(targetPosition.GetX(), targetPosition.GetY(), -CameraDistance + targetPosition.GetZ());
             break;
         case CameraViewMode::LEFT:
-            cameraPosition.Set(-CameraDistance, 0.0f, targetPosition.GetZ());
+            cameraPosition.Set(targetPosition.GetX() - CameraDistance, targetPosition.GetY(), targetPosition.GetZ());
             break;
         case CameraViewMode::RIGHT:
-            cameraPosition.Set(CameraDistance, 0.0f, targetPosition.GetZ());
+            cameraPosition.Set(targetPosition.GetX() + CameraDistance, targetPosition.GetY(), targetPosition.GetZ());
             break;
         case CameraViewMode::DEFAULT:
             // The default view mode is looking from the top left of the character.
-            cameraPosition.Set(-CameraDistance, CameraDistance, CameraDistance + targetPosition.GetZ());
+            cameraPosition.Set(
+                targetPosition.GetX() - CameraDistance, targetPosition.GetY() + CameraDistance, targetPosition.GetZ() + CameraDistance);
             break;
         }
         GetViewportContext()->SetCameraTransform(AZ::Transform::CreateLookAt(cameraPosition, targetPosition));
     }
 
+    void AnimViewportWidget::SetFollowCharacter(bool follow)
+    {
+        m_followCharacter = follow;
+    }
+
     void AnimViewportWidget::OnTick(float deltaTime, AZ::ScriptTimePoint time)
     {
         RenderViewportWidget::OnTick(deltaTime, time);
         CalculateCameraProjection();
         RenderCustomPluginData();
+        FollowCharacter();
     }
 
     void AnimViewportWidget::CalculateCameraProjection()
@@ -205,6 +212,20 @@ namespace EMStudio
         }
     }
 
+    void AnimViewportWidget::FollowCharacter()
+    {
+        if (m_followCharacter)
+        {
+            // When follow charater move is enabled, we are adding the delta of the character movement to the camera per frame.
+            AZ::Vector3 camPos = GetViewportContext()->GetCameraTransform().GetTranslation();
+            camPos += m_renderer->GetCharacterCenter() - m_prevCharacterPos;
+            AZ::Transform newCamTransform = GetViewportContext()->GetCameraTransform();
+            newCamTransform.SetTranslation(camPos);
+            GetViewportContext()->SetCameraTransform(newCamTransform);
+        }
+        m_prevCharacterPos = m_renderer->GetCharacterCenter();
+    }
+
     void AnimViewportWidget::ToggleRenderFlag(EMotionFX::ActorRenderFlag flag)
     {
         m_renderFlags[flag] = !m_renderFlags[flag];
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
index 069aebb73e..336564a9e0 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
@@ -38,6 +38,7 @@ namespace EMStudio
 
         void CalculateCameraProjection();
         void RenderCustomPluginData();
+        void FollowCharacter();
 
         void SetupCameras();
         void SetupCameraController();
@@ -48,6 +49,7 @@ namespace EMStudio
         // AnimViewportRequestBus::Handler overrides
         void ResetCamera();
         void SetCameraViewMode(CameraViewMode mode);
+        void SetFollowCharacter(bool follow);
         void ToggleRenderFlag(EMotionFX::ActorRenderFlag flag);
 
         // ViewportPluginRequestBus::Handler overrides
@@ -61,5 +63,7 @@ namespace EMStudio
         AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_translateCamera;
         AZStd::shared_ptr<AzFramework::OrbitDollyScrollCameraInput> m_orbitDollyScrollCamera;
         EMotionFX::ActorRenderFlagBitset m_renderFlags;
+        bool m_followCharacter = false;
+        AZ::Vector3 m_prevCharacterPos;
     };
 }
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
index 33ac6c6814..2d0685b67d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
@@ -508,7 +508,7 @@ def init_ly_pyside(env_dict=_SYNTH_ENV_DICT):
     site.addsitedir(str(QTFORPYTHON_PATH))
 
     O3DE_BIN_PATH = Path.joinpath(O3DE_DEV,
-                                'windows_vs2019',
+                                'windows',
                                 'bin',
                                 'profile').resolve()
     os.environ["DYNACONF_O3DE_BIN_PATH"] = str(O3DE_BIN_PATH)
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
index 5578bcd577..a9cf5e8ee5 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
@@ -532,7 +532,7 @@ if __name__ == '__main__':
     parser.add_argument('-bf', '--build-folder',
                         type=str,
                         required=False,
-                        help='The name (tag) of the o3de build folder, example build or windows_vs2019.')
+                        help='The name (tag) of the o3de build folder, example build or windows.')
     parser.add_argument('-pp', '--project-path',
                         type=pathlib.Path,
                         required=False,
diff --git a/Gems/AtomTressFX/Code/Builders/HairBuilderComponent.cpp b/Gems/AtomTressFX/Code/Builders/HairBuilderComponent.cpp
index f80261f4b5..7f99e4c55f 100644
--- a/Gems/AtomTressFX/Code/Builders/HairBuilderComponent.cpp
+++ b/Gems/AtomTressFX/Code/Builders/HairBuilderComponent.cpp
@@ -46,14 +46,6 @@ namespace AZ
             {
                 m_hairAssetBuilder.RegisterBuilder();
                 m_hairAssetHandler.Register();
-
-                // Add asset types and extensions to AssetCatalog.
-                auto assetCatalog = AZ::Data::AssetCatalogRequestBus::FindFirstHandler();
-                if (assetCatalog)
-                {
-                    assetCatalog->EnableCatalogForAsset(azrtti_typeid<HairAsset>());
-                    assetCatalog->AddExtension(AMD::TFXCombinedFileExtension);
-                }
             }
 
             void HairBuilderComponent::Deactivate()
diff --git a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp
index 5bad3ecf1c..d29bec190e 100644
--- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp
@@ -322,6 +322,10 @@ namespace AudioControls
                                 connection->m_value = value;
                                 return connection;
                             }
+                            case EACEControlType::eACET_ENVIRONMENT:
+                            {
+                                return AZStd::make_shared<IAudioConnection>(control->GetId());
+                            }
                         }
                     }
                     else
@@ -571,11 +575,11 @@ namespace AudioControls
         case eACET_RTPC:
             return eWCT_WWISE_RTPC;
         case eACET_SWITCH:
-            return AUDIO_IMPL_INVALID_TYPE;
+            return (eWCT_WWISE_SWITCH | eWCT_WWISE_GAME_STATE);
         case eACET_SWITCH_STATE:
             return (eWCT_WWISE_SWITCH | eWCT_WWISE_GAME_STATE | eWCT_WWISE_RTPC);
         case eACET_ENVIRONMENT:
-            return (eWCT_WWISE_AUX_BUS | eWCT_WWISE_SWITCH | eWCT_WWISE_GAME_STATE | eWCT_WWISE_RTPC);
+            return (eWCT_WWISE_AUX_BUS | eWCT_WWISE_RTPC);
         case eACET_PRELOAD:
             return eWCT_WWISE_SOUND_BANK;
         }
diff --git a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
index 48a16e54e6..f8505d94ea 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
@@ -168,6 +168,12 @@ namespace AudioControls
         m_pATLControlsTree->setModel(pProxyModel);
         m_pProxyModel = pProxyModel;
 
+        QAction* pAction = new QAction(tr("Delete"), this);
+        pAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        pAction->setShortcut(QKeySequence::Delete);
+        connect(pAction, SIGNAL(triggered()), this, SLOT(DeleteSelectedControl()));
+        m_pATLControlsTree->addAction(pAction);
+
         connect(m_pATLControlsTree->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SIGNAL(SelectedControlChanged()));
         connect(m_pATLControlsTree->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(StopControlExecution()));
         connect(m_pTreeModel, SIGNAL(itemChanged(QStandardItem*)), this, SLOT(ItemModified(QStandardItem*)));
diff --git a/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
index d3121f6245..e58db78538 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp
@@ -169,11 +169,9 @@ namespace AudioControls
         if (parent.isValid())
         {
             bool bChildValid = false;
-            bool bHasChildren = false;
             QModelIndex child = parent.model()->index(0, 0, parent);
             for (int i = 1; child.isValid(); ++i)
             {
-                bHasChildren = true;
                 if (ApplyFilter(child))
                 {
                     bChildValid = true;
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
index 062d14addf..311f8a98a0 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
@@ -11,7 +11,7 @@
 
 #include <ATLControlsModel.h>
 #include <AudioControlsEditorPlugin.h>
-
+#include <ImplementationManager.h>
 #include <QStandardItemModel>
 #include <QList>
 
@@ -273,6 +273,51 @@ namespace AudioControls
                 pControl->m_connectedControls = m_connectedControls;
                 pModel->OnControlModified(pControl);
 
+                auto& tmpConnectedControls1 =
+                    connectedControls.size() > m_connectedControls.size() ? connectedControls : m_connectedControls;
+                auto& tmpConnectedControls2 =
+                    connectedControls.size() > m_connectedControls.size() ? m_connectedControls : connectedControls;
+                for (auto& connection1 : tmpConnectedControls1)
+                {
+                    bool bCheck = true;
+                    for (auto& connection2 : tmpConnectedControls2)
+                    {
+                        if (connection1 == connection2)
+                        {
+                            bCheck = false;
+                            break;
+                        }
+                    }
+
+                    if (!bCheck)
+                    {
+                        continue;
+                    }
+
+                    if (IAudioSystemEditor* audioSystemImpl = CAudioControlsEditorPlugin::GetImplementationManager()->GetImplementation())
+                    {
+                        if (IAudioSystemControl* middlewareControl = audioSystemImpl->GetControl(connection1->GetID()))
+                        {
+                            if (connectedControls.size() > m_connectedControls.size())
+                            {
+                                audioSystemImpl->ConnectionRemoved(middlewareControl);
+                                pControl->SignalConnectionRemoved(middlewareControl);
+                            }
+                            else
+                            {
+                                TConnectionPtr connection =
+                                    audioSystemImpl->CreateConnectionToControl(pControl->GetType(), middlewareControl);
+                                if (connection)
+                                {
+                                    pControl->SignalConnectionAdded(middlewareControl);
+                                }
+                            }
+
+                            pControl->SignalControlModified();
+                        }
+                    }
+                }
+
                 m_name = name;
                 m_scope = scope;
                 m_isAutoLoad = isAutoLoad;
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h
index 86ea2f1807..dc64a392a5 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h
@@ -49,7 +49,6 @@ namespace AudioControls
         explicit CUndoControlAdd(CID id);
     protected:
         int GetSize() override { return sizeof(*this); }
-        QString GetDescription() override { return "Undo ATL Control Add"; }
 
         void Undo(bool bUndo) override;
         void Redo() override;
@@ -63,7 +62,6 @@ namespace AudioControls
         explicit CUndoControlRemove(AZStd::shared_ptr<CATLControl>& pControl);
     protected:
         int GetSize() override { return sizeof(*this); }
-        QString GetDescription() override { return "Undo ATL Control Remove"; }
 
         void Undo(bool bUndo) override;
         void Redo() override;
@@ -90,7 +88,6 @@ namespace AudioControls
         explicit CUndoFolderRemove(QStandardItem* pItem);
     protected:
         int GetSize() override { return sizeof(*this); }
-        QString GetDescription() override { return "Undo ATL Folder Remove"; }
 
         void Undo(bool bUndo) override;
         void Redo() override;
@@ -104,7 +101,6 @@ namespace AudioControls
         explicit CUndoFolderAdd(QStandardItem* pItem);
     protected:
         int GetSize() override { return sizeof(*this); }
-        QString GetDescription() override { return "Undo ATL Folder Add"; }
 
         void Undo(bool bUndo) override;
         void Redo() override;
@@ -118,7 +114,6 @@ namespace AudioControls
         explicit CUndoControlModified(CID id);
     protected:
         int GetSize() override { return sizeof(*this); }
-        QString GetDescription() override { return "Undo ATL Control Modify"; }
 
         void SwapData();
         void Undo(bool bUndo) override;
@@ -140,7 +135,6 @@ namespace AudioControls
 
     protected:
         int GetSize() override { return sizeof(*this); }
-        QString GetDescription() override { return "Undo ATL Control Move"; }
 
         void Undo(bool bUndo) override;
         void Redo() override;
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp
index eb022b706f..86f778bf03 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsWriter.cpp
@@ -102,7 +102,8 @@ namespace AudioControls
 
             for (auto it = librariesToDelete.begin(); it != librariesToDelete.end(); ++it)
             {
-                DeleteLibraryFile((*it).c_str());
+                auto newPathOpt = fileIO->ResolvePath(AZ::IO::PathView{ *it });
+                DeleteLibraryFile(newPathOpt.value().Native());
             }
 
             previousLibraryPaths = m_foundLibraryPaths;
diff --git a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
index bee5c1dd51..f339ff8bb3 100644
--- a/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/ImplementationManager.cpp
@@ -9,8 +9,6 @@
 
 #include <ImplementationManager.h>
 
-#include <AzFramework/Application/Application.h>
-
 #include <ATLControlsModel.h>
 #include <AudioControlsEditorPlugin.h>
 #include <IAudioSystemEditor.h>
@@ -32,10 +30,6 @@ bool CImplementationManager::LoadImplementation()
         // release the loaded implementation (if any)
         Release();
 
-        const char* engineRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-        AZ_Assert(engineRoot != nullptr, "Unable to communicate with AzFramework::ApplicationRequests::Bus");
-
         AudioControlsEditor::EditorImplPluginEventBus::Broadcast(&AudioControlsEditor::EditorImplPluginEventBus::Events::InitializeEditorImplPlugin);
     }
     else
diff --git a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
index cdd7d937e3..25981d2abd 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp
@@ -27,9 +27,9 @@ namespace AudioControls
     //-------------------------------------------------------------------------------------------//
     QConnectionsWidget::QConnectionsWidget(QWidget* parent)
         : QWidget(parent)
+        , m_control(nullptr)
         , m_notFoundColor(QColor(0xf3, 0x81, 0x1d))
         , m_localizedColor(QColor(0x42, 0x85, 0xf4))
-        , m_control(nullptr)
     {
         setupUi(this);
 
@@ -37,7 +37,6 @@ namespace AudioControls
         m_connectionList->installEventFilter(this);
 
         connect(m_connectionList, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(ShowConnectionContextMenu(const QPoint&)));
-        connect(m_connectionList, SIGNAL(itemSelectionChanged()), this, SLOT(SelectedConnectionChanged()));
     }
 
     //-------------------------------------------------------------------------------------------//
@@ -101,27 +100,6 @@ namespace AudioControls
         contextMenu.exec(m_connectionList->mapToGlobal(pos));
     }
 
-    //-------------------------------------------------------------------------------------------//
-    void QConnectionsWidget::SelectedConnectionChanged()
-    {
-        TConnectionPtr connection;
-        EACEControlType controlType = AudioControls::eACET_NUM_TYPES;
-        if (m_control)
-        {
-            QList<QListWidgetItem*> selected = m_connectionList->selectedItems();
-            if (selected.length() == 1)
-            {
-                QListWidgetItem* currentItem = selected[0];
-                if (currentItem)
-                {
-                    const CID externalId = currentItem->data(eMDR_ID).toInt();
-                    connection = m_control->GetConnection(externalId);
-                    controlType = m_control->GetType();
-                }
-            }
-        }
-    }
-
     //-------------------------------------------------------------------------------------------//
     void QConnectionsWidget::MakeConnectionTo(IAudioSystemControl* middlewareControl)
     {
diff --git a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
index 8107a37432..2adb7c592d 100644
--- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
+++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h
@@ -38,7 +38,6 @@ namespace AudioControls
 
     private slots:
         void ShowConnectionContextMenu(const QPoint& pos);
-        void SelectedConnectionChanged();
         void CurrentConnectionModified();
         void RemoveSelectedConnection();
 
diff --git a/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
index b7ed9229d8..992434ff79 100644
--- a/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
+++ b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp
@@ -343,17 +343,6 @@ namespace Audio
     {
         if (CVars::s_debugDrawOptions.AreAllFlagsActive(DebugDraw::Options::FileCacheInfo))
         {
-            EATLDataScope dataScope = eADS_ALL;
-
-            if (CVars::s_fcmDrawOptions.AreAllFlagsActive(FileCacheManagerDebugDraw::Options::Global))
-            {
-                dataScope = eADS_GLOBAL;
-            }
-            else if (CVars::s_fcmDrawOptions.AreAllFlagsActive(FileCacheManagerDebugDraw::Options::LevelSpecific))
-            {
-                dataScope = eADS_LEVEL_SPECIFIC;
-            }
-
             const auto frameTime = AZStd::chrono::system_clock::now();
 
             const float entryDrawSize = 1.5f;
@@ -830,6 +819,11 @@ namespace Audio
                 }
                 else
                 {
+                    if (!audioFileEntry->m_asyncStreamRequest)
+                    {
+                        audioFileEntry->m_asyncStreamRequest = streamer->CreateRequest();
+                    }
+
                     streamer->Read(
                         audioFileEntry->m_asyncStreamRequest,
                         audioFileEntry->m_filePath.c_str(),
diff --git a/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp b/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
index 4c0f15463a..945d4eafb0 100644
--- a/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
+++ b/Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
@@ -151,6 +151,8 @@ namespace Blast
         SaveConfiguration();
         DeactivatePhysics();
 
+        m_configuration.m_materialLibrary.Release();
+
         m_assetHandlers.clear();
     };
 
diff --git a/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h
index 31daae1a18..fe17bfaac0 100644
--- a/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h
+++ b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h
@@ -31,12 +31,12 @@ namespace Blast
     private:
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("BlastEditorService", 0x0a61cda5));
+            provided.push_back(AZ_CRC("BlastEditorService", 0xeddfed0d));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("BlastService", 0x75beae2d));
+            required.push_back(AZ_CRC("BlastService", 0x46927a9f));
         }
 
         AZStd::unique_ptr<EditorBlastChunksAssetHandler> m_editorBlastChunksAssetHandler;
diff --git a/Gems/Camera/Code/Source/CameraComponentController.cpp b/Gems/Camera/Code/Source/CameraComponentController.cpp
index b8e5738145..5b2e26b897 100644
--- a/Gems/Camera/Code/Source/CameraComponentController.cpp
+++ b/Gems/Camera/Code/Source/CameraComponentController.cpp
@@ -151,7 +151,12 @@ namespace Camera
 
     void CameraComponentController::SetShouldActivateFunction(AZStd::function<bool()> shouldActivateFunction)
     {
-        m_shouldActivateFn = shouldActivateFunction;
+        m_shouldActivateFn = AZStd::move(shouldActivateFunction);
+    }
+
+    void CameraComponentController::SetIsLockedFunction(AZStd::function<bool()> isLockedFunction)
+    {
+        m_isLockedFn = AZStd::move(isLockedFunction);
     }
 
     void CameraComponentController::Reflect(AZ::ReflectContext* context)
@@ -195,10 +200,11 @@ namespace Camera
     {
         m_onViewMatrixChanged = AZ::Event<const AZ::Matrix4x4&>::Handler([this](const AZ::Matrix4x4&)
         {
-            if (!m_updatingTransformFromEntity)
+            if (!m_updatingTransformFromEntity && !m_isLockedFn())
             {
                 AZ::TransformBus::Event(m_entityId, &AZ::TransformInterface::SetWorldTM, m_atomCamera->GetCameraTransform());
             }
+
         });
     }
 
diff --git a/Gems/Camera/Code/Source/CameraComponentController.h b/Gems/Camera/Code/Source/CameraComponentController.h
index 5eca6b1711..09af7529dc 100644
--- a/Gems/Camera/Code/Source/CameraComponentController.h
+++ b/Gems/Camera/Code/Source/CameraComponentController.h
@@ -70,6 +70,9 @@ namespace Camera
         //! Used by the Editor to disable undesirable camera changes in edit mode.
         void SetShouldActivateFunction(AZStd::function<bool()> shouldActivateFunction);
 
+        //! Defines a callback for determining whether this camera is currently locked by its transform.
+        void SetIsLockedFunction(AZStd::function<bool()> isLockedFunction);
+
         // Controller interface
         static void Reflect(AZ::ReflectContext* context);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
@@ -136,5 +139,6 @@ namespace Camera
         bool m_isActiveView = false;
 
         AZStd::function<bool()> m_shouldActivateFn;
+        AZStd::function<bool()> m_isLockedFn = []{ return false; };
     };
 } // namespace Camera
diff --git a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp
index fe49d1737a..d2f7469c58 100644
--- a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp
+++ b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp
@@ -113,7 +113,7 @@ namespace Camera
         // Set transform to that of the viewport, otherwise default to Identity matrix and 60 degree FOV
         const auto worldFromView = AzFramework::CameraTransform(cameraState);
         const auto cameraTransform = AZ::Transform::CreateFromMatrix3x3AndTranslation(
-            AZ::Matrix3x3::CreateFromMatrix4x4(worldFromView), worldFromView.GetTranslation());
+            AZ::Matrix3x3::CreateFromMatrix3x4(worldFromView), worldFromView.GetTranslation());
         AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetWorldTM, cameraTransform);
         CameraRequestBus::Event(newEntityId, &CameraComponentRequests::SetFov, AZ::RadToDeg(cameraState.m_fovOrZoom));
         undoBatch.MarkEntityDirty(newEntityId);
diff --git a/Gems/Camera/Code/Source/EditorCameraComponent.cpp b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
index cf32fdedff..4f97f27eba 100644
--- a/Gems/Camera/Code/Source/EditorCameraComponent.cpp
+++ b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
@@ -18,6 +18,7 @@
 
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/View.h>
+#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
 
 namespace Camera
 {
@@ -41,6 +42,16 @@ namespace Camera
                 return isInGameMode;
             });
 
+        // Only allow our camera to move when the transform is not locked.
+        m_controller.SetIsLockedFunction([this]()
+            {
+                bool locked = false;
+                AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult(
+                    locked, GetEntityId(), &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked);
+
+                return locked;
+            });
+
         // Call base class activate, which in turn calls Activate on our controller.
         EditorCameraComponentBase::Activate();
 
diff --git a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
index dc091db9e5..eb1fd9890c 100644
--- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
+++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
@@ -7,14 +7,14 @@
  */
 #include "ViewportCameraSelectorWindow.h"
 #include "ViewportCameraSelectorWindow_Internals.h"
-#include <qmetatype.h>
-#include <QScopedValueRollback>
-#include <QListView>
-#include <QSortFilterProxyModel>
-#include <QVBoxLayout>
-#include <QLabel>
 #include <AzToolsFramework/API/EditorCameraBus.h>
 #include <AzToolsFramework/API/ViewPaneOptions.h>
+#include <QLabel>
+#include <QListView>
+#include <QScopedValueRollback>
+#include <QSortFilterProxyModel>
+#include <QVBoxLayout>
+#include <qmetatype.h>
 
 namespace Qt
 {
@@ -64,12 +64,14 @@ namespace Camera
         CameraListModel::CameraListModel(QWidget* myParent)
             : QAbstractListModel(myParent)
         {
+            m_lastActiveCamera = AZ::EntityId();
             m_cameraItems.push_back(AZ::EntityId());
             CameraNotificationBus::Handler::BusConnect();
         }
 
         CameraListModel::~CameraListModel()
         {
+            m_firstEntry = true;
             // set the view entity id back to Invalid, thus enabling the editor camera
             EditorCameraRequests::Bus::Broadcast(&EditorCameraRequests::SetViewFromEntityPerspective, AZ::EntityId());
 
@@ -98,11 +100,13 @@ namespace Camera
         {
             // If the camera entity is not an editor camera entity, don't add it to the list.
             // This occurs when we're in simulation mode.
+
+            //We reset the m_firstEntry value so we can update m_lastActiveCamera when we remove from the cameras list
+            m_firstEntry = true;
+
             bool isEditorEntity = false;
             AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-                isEditorEntity,
-                &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity,
-                cameraId);
+                isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, cameraId);
             if (!isEditorEntity)
             {
                 return;
@@ -111,11 +115,25 @@ namespace Camera
             beginInsertRows(QModelIndex(), rowCount(), rowCount());
             m_cameraItems.push_back(cameraId);
             endInsertRows();
+
+            if (m_lastActiveCamera.IsValid() && m_lastActiveCamera == cameraId)
+            {
+                Camera::CameraRequestBus::Event(cameraId, &Camera::CameraRequestBus::Events::MakeActiveView);
+            }
         }
 
         void CameraListModel::OnCameraRemoved(const AZ::EntityId& cameraId)
         {
-            auto cameraIt = AZStd::find_if(m_cameraItems.begin(), m_cameraItems.end(),
+            //Check it is the first time we remove a camera from the list before any other addition
+            //So we don't end up with the wrong camera ID.
+            if (m_firstEntry)
+            {
+                CameraSystemRequestBus::BroadcastResult(m_lastActiveCamera, &CameraSystemRequestBus::Events::GetActiveCamera);
+                m_firstEntry = false;
+            }
+
+            auto cameraIt = AZStd::find_if(
+                m_cameraItems.begin(), m_cameraItems.end(),
                 [&cameraId](const CameraListItem& entry)
                 {
                     return entry.m_cameraId == cameraId;
@@ -162,7 +180,12 @@ namespace Camera
 
             // use the stylesheet for elements in a set where one item must be selected at all times
             setProperty("class", "SingleRequiredSelection");
-            connect(m_cameraList, &CameraListModel::rowsInserted, this, [sortedProxyModel](const QModelIndex&, int, int) { sortedProxyModel->sortColumn(); });
+            connect(
+                m_cameraList, &CameraListModel::rowsInserted, this,
+                [sortedProxyModel](const QModelIndex&, int, int)
+                {
+                    sortedProxyModel->sortColumn();
+                });
 
             // highlight the current selected camera entity
             AZ::EntityId currentSelection;
@@ -188,7 +211,8 @@ namespace Camera
 
                 QScopedValueRollback<bool> rb(m_ignoreViewportViewEntityChanged, true);
                 AZ::EntityId entityId = selectionModel()->currentIndex().data(Qt::CameraIdRole).value<AZ::EntityId>();
-                EditorCameraRequests::Bus::Broadcast(&EditorCameraRequests::SetViewAndMovementLockFromEntityPerspective, entityId, lockCameraMovement);
+                EditorCameraRequests::Bus::Broadcast(
+                    &EditorCameraRequests::SetViewAndMovementLockFromEntityPerspective, entityId, lockCameraMovement);
             }
         }
 
@@ -220,7 +244,9 @@ namespace Camera
         }
 
         // swallow mouse move events so we can disable sloppy selection
-        void ViewportCameraSelectorWindow::mouseMoveEvent(QMouseEvent*) {}
+        void ViewportCameraSelectorWindow::mouseMoveEvent(QMouseEvent*)
+        {
+        }
 
         // double click selects the entity
         void ViewportCameraSelectorWindow::mouseDoubleClickEvent([[maybe_unused]] QMouseEvent* event)
@@ -228,11 +254,13 @@ namespace Camera
             AZ::EntityId entityId = selectionModel()->currentIndex().data(Qt::CameraIdRole).value<AZ::EntityId>();
             if (entityId.IsValid())
             {
-                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList { entityId });
+                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{ entityId });
             }
             else
             {
-                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList {});
+                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{});
             }
         }
 
@@ -290,7 +318,10 @@ namespace Camera
             : QWidget(parent)
         {
             setLayout(new QVBoxLayout(this));
-            auto label = new QLabel("Select the camera you wish to view and navigate through.  Closing this window will return you to the default editor camera.", this);
+            auto label = new QLabel(
+                "Select the camera you wish to view and navigate through.  Closing this window will return you to the default editor "
+                "camera.",
+                this);
             label->setWordWrap(true);
             layout()->addWidget(label);
             layout()->addWidget(new ViewportCameraSelectorWindow(this));
@@ -309,6 +340,8 @@ namespace Camera
         viewOptions.isPreview = true;
         viewOptions.showInMenu = true;
         viewOptions.preferedDockingArea = Qt::DockWidgetArea::LeftDockWidgetArea;
-        AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequestBus::Events::RegisterViewPane, s_viewportCameraSelectorName, "Viewport", viewOptions, &Internal::CreateNewSelectionWindow);
+        AzToolsFramework::EditorRequestBus::Broadcast(
+            &AzToolsFramework::EditorRequestBus::Events::RegisterViewPane, s_viewportCameraSelectorName, "Viewport", viewOptions,
+            &Internal::CreateNewSelectionWindow);
     }
 } // namespace Camera
diff --git a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
index b07ae7789f..21f316b83d 100644
--- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
+++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
@@ -58,6 +58,11 @@ namespace Camera
         private:
             AZStd::vector<CameraListItem> m_cameraItems;
             AZ::EntityId m_sequenceCameraEntityId;
+            AZ::EntityId m_lastActiveCamera;
+
+            //Value to check that is the first time that we remove a camera before adding a new one.
+            //So we can update m_lastActiveCamera properly
+            bool m_firstEntry = true;
         };
 
         struct ViewportCameraSelectorWindow
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp
index a0a811eff0..ad2b75cca1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp
@@ -552,14 +552,6 @@ namespace EMotionFX
             motionNode->CreateMotionInstance(animGraphInstance->GetActorInstance(), this);
         }
 
-        // get the id of the currently used the motion set
-        MotionSet* motionSet = animGraphInstance->GetMotionSet();
-        uint32 motionSetID = MCORE_INVALIDINDEX32;
-        if (motionSet)
-        {
-            motionSetID = motionSet->GetID();
-        }
-
         // update the internally stored playback info
         motionNode->UpdatePlayBackInfo(animGraphInstance);
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp
index 16f192615d..00ff273187 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphReferenceNode.cpp
@@ -642,6 +642,8 @@ namespace EMotionFX
 
     void AnimGraphReferenceNode::OnAnimGraphAssetChanged()
     {
+        AnimGraphNotificationBus::Broadcast(&AnimGraphNotificationBus::Events::OnReferenceAnimGraphAboutToBeChanged, this);
+
         ReleaseAnimGraphInstances();
 
         AnimGraphNotificationBus::Broadcast(&AnimGraphNotificationBus::Events::OnReferenceAnimGraphChanged, this);
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h
new file mode 100644
index 0000000000..634456c82f
--- /dev/null
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/std/containers/unordered_set.h>
+
+namespace EMotionFX
+{
+    class JointSelectionRequests
+        : public AZ::EBusTraits
+    {
+    public:
+        virtual const AZStd::unordered_set<size_t>* FindSelectedJointIndices(EMotionFX::ActorInstance* instance) const = 0;
+    };
+    using JointSelectionRequestBus = AZ::EBus<JointSelectionRequests>;
+}
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp
index 9ad55b1c40..caf2acbaa2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-// include the required headers
 #include "EMotionFXConfig.h"
 #include "Motion.h"
 #include <MCore/Source/IDGenerator.h>
@@ -19,9 +18,9 @@
 #include "EventHandler.h"
 #include "MotionEventTable.h"
 #include <EMotionFX/Source/Allocators.h>
-#include <EMotionFX/Source/MotionData/MotionData.h>
 #include <EMotionFX/Source/Node.h>
 #include <EMotionFX/Source/TransformData.h>
+#include <EMotionFX/Source/MotionData/MotionData.h>
 
 namespace EMotionFX
 {
@@ -286,7 +285,7 @@ namespace EMotionFX
     {
         AZ_Assert(m_motionData, "Expecting motion data");
 
-        MotionData::SampleSettings sampleSettings;
+        MotionDataSampleSettings sampleSettings;
         sampleSettings.m_actorInstance = instance->GetActorInstance();
         sampleSettings.m_inPlace = instance->GetIsInPlace();
         sampleSettings.m_mirror = instance->GetMirrorMotion();
@@ -301,7 +300,7 @@ namespace EMotionFX
     {
         AZ_Assert(m_motionData, "Expecting motion data");
 
-        MotionData::SampleSettings sampleSettings;
+        MotionDataSampleSettings sampleSettings;
         sampleSettings.m_actorInstance = instance->GetActorInstance();
         sampleSettings.m_inPlace = instance->GetIsInPlace();
         sampleSettings.m_mirror = instance->GetMirrorMotion();
@@ -312,6 +311,12 @@ namespace EMotionFX
         m_motionData->SamplePose(sampleSettings, outputPose);
     }
 
+    void Motion::SamplePose(Pose* outputPose, const MotionDataSampleSettings& sampleSettings)
+    {
+        AZ_Assert(m_motionData, "Expecting motion data");
+        m_motionData->SamplePose(sampleSettings, outputPose);
+    }
+
     const MotionData* Motion::GetMotionData() const
     {
         return m_motionData;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h
index e6ec99835b..3873924b7c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h
@@ -9,14 +9,13 @@
 #pragma once
 
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <MCore/Source/StringIdPool.h>
+#include <MCore/Source/Distance.h>
 #include "EMotionFXConfig.h"
 #include "EMotionFXManager.h"
 #include "PlayBackInfo.h"
 #include "BaseObject.h"
-
-#include <MCore/Source/StringIdPool.h>
-#include <MCore/Source/Distance.h>
-
+#include <EMotionFX/Source/MotionData/MotionDataSampleSettings.h>
 
 namespace EMotionFX
 {
@@ -138,6 +137,8 @@ namespace EMotionFX
          */
         void Update(const Pose* inputPose, Pose* outputPose, MotionInstance* instance);
 
+        void SamplePose(Pose* outputPose, const MotionDataSampleSettings& sampleSettings);
+
         /**
          * Specify the actor to use as retargeting source.
          * This would be the actor from which the motion was originally exported.
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
index fe831f1df0..3950d99de0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h
@@ -9,18 +9,17 @@
 #pragma once
 
 #include <AzCore/std/smart_ptr/unique_ptr.h>
-#include <EMotionFX/Source/Allocators.h>
-#include <EMotionFX/Source/EMotionFXConfig.h>
-#include <EMotionFX/Source/EventHandler.h>
-#include <EMotionFX/Source/Transform.h>
-
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Memory/Memory.h>
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/std/containers/vector.h>
-
 #include <MCore/Source/Endian.h>
+#include <EMotionFX/Source/Allocators.h>
+#include <EMotionFX/Source/EMotionFXConfig.h>
+#include <EMotionFX/Source/EventHandler.h>
+#include <EMotionFX/Source/Transform.h>
+#include <EMotionFX/Source/MotionData/MotionDataSampleSettings.h>
 
 namespace MCore
 {
@@ -109,16 +108,6 @@ namespace EMotionFX
         using QuaternionKey = Key<AZ::Quaternion>;
         using FloatKey = Key<float>;
 
-        struct EMFX_API SampleSettings
-        {
-            const ActorInstance* m_actorInstance = nullptr;
-            const Pose* m_inputPose = nullptr;
-            float m_sampleTime = 0.0f;
-            bool m_mirror = false;
-            bool m_retarget = false;
-            bool m_inPlace = false;
-        };
-
         struct EMFX_API OptimizeSettings
         {
             AZStd::vector<size_t> m_jointIgnoreList; // The joint data indices to skip optimization for.
@@ -162,8 +151,8 @@ namespace EMotionFX
         virtual const char* GetSceneSettingsName() const = 0;
 
         // Sampling
-        virtual Transform SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const = 0;
-        virtual void SamplePose(const SampleSettings& settings, Pose* outputPose) const = 0;
+        virtual Transform SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const = 0;
+        virtual void SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const = 0;
         virtual float SampleMorph(float sampleTime, size_t morphDataIndex) const = 0;
         virtual float SampleFloat(float sampleTime, size_t morphDataIndex) const = 0;
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h
new file mode 100644
index 0000000000..ea3f766c56
--- /dev/null
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <EMotionFX/Source/EMotionFXConfig.h>
+
+namespace EMotionFX
+{
+    class ActorInstance;
+    class Pose;
+
+    struct EMFX_API MotionDataSampleSettings
+    {
+        const ActorInstance* m_actorInstance = nullptr;
+        const Pose* m_inputPose = nullptr;
+        float m_sampleTime = 0.0f;
+        bool m_mirror = false;
+        bool m_retarget = false;
+        bool m_inPlace = false;
+    };
+} // namespace EMotionFX
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
index 6ced6152e1..3078978d2c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp
@@ -74,11 +74,10 @@ namespace EMotionFX
         return values[indexA].ToQuaternion().NLerp(values[indexB].ToQuaternion(), t);
     }
 
-    Transform NonUniformMotionData::SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const
+    Transform NonUniformMotionData::SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const
     {
         const Actor* actor = settings.m_actorInstance->GetActor();
         const MotionLinkData* motionLinkData = FindMotionLinkData(actor);
-        const Skeleton* skeleton = actor->GetSkeleton();
 
         const size_t jointDataIndex = motionLinkData->GetJointDataLinks()[jointSkeletonIndex];
         if (m_additive && jointDataIndex == InvalidIndex)
@@ -88,7 +87,7 @@ namespace EMotionFX
 
         // Sample the interpolated data.
         Transform result;
-        const bool inPlace = (settings.m_inPlace && skeleton->GetNode(jointSkeletonIndex)->GetIsRootNode());
+        const bool inPlace = (settings.m_inPlace && jointSkeletonIndex == actor->GetMotionExtractionNodeIndex());
         if (jointDataIndex != InvalidIndex && !inPlace)
         {
             const JointData& jointData = m_jointData[jointDataIndex];
@@ -132,21 +131,20 @@ namespace EMotionFX
         return result;
     }
 
-    void NonUniformMotionData::SamplePose(const SampleSettings& settings, Pose* outputPose) const
+    void NonUniformMotionData::SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const
     {
         AZ_Assert(settings.m_actorInstance, "Expecting a valid actor instance.");
         const Actor* actor = settings.m_actorInstance->GetActor();
         const MotionLinkData* motionLinkData = FindMotionLinkData(actor);
        
         const ActorInstance* actorInstance = settings.m_actorInstance;
-        const Skeleton* skeleton = actor->GetSkeleton();
         const Pose* bindPose = actorInstance->GetTransformData()->GetBindPose();
         const size_t numNodes = actorInstance->GetNumEnabledNodes();
         for (size_t i = 0; i < numNodes; ++i)
         {
             const uint16 jointIndex = actorInstance->GetEnabledNode(i);
             const size_t jointDataIndex = motionLinkData->GetJointDataLinks()[jointIndex];
-            const bool inPlace = (settings.m_inPlace && skeleton->GetNode(jointIndex)->GetIsRootNode());
+            const bool inPlace = (settings.m_inPlace && jointIndex == actor->GetMotionExtractionNodeIndex());
 
             // Sample the interpolated data.
             Transform result;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
index b5d8a05c44..16b9842479 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h
@@ -55,8 +55,8 @@ namespace EMotionFX
         AZ::u32 GetStreamSaveVersion() const override;
         const char* GetSceneSettingsName() const override;
 
-        Transform SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const override;
-        void SamplePose(const SampleSettings& settings, Pose* outputPose) const override;
+        Transform SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const override;
+        void SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const override;
 
         Transform SampleJointTransform(float sampleTime, size_t jointDataIndex) const override;
         AZ::Vector3 SampleJointPosition(float sampleTime, size_t jointDataIndex) const override;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp
index c4451ff902..0f096e7a8b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp
@@ -130,7 +130,7 @@ namespace EMotionFX
         }
     }
 
-    Transform UniformMotionData::SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const
+    Transform UniformMotionData::SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const
     {
         const Actor* actor = settings.m_actorInstance->GetActor();
         const MotionLinkData* motionLinkData = FindMotionLinkData(actor);
@@ -147,8 +147,7 @@ namespace EMotionFX
         size_t indexB;
         CalculateInterpolationIndicesUniform(settings.m_sampleTime, m_sampleSpacing, m_duration, m_numSamples, indexA, indexB, t);
 
-        const Skeleton* skeleton = actor->GetSkeleton();
-        const bool inPlace = (settings.m_inPlace && skeleton->GetNode(jointSkeletonIndex)->GetIsRootNode());
+        const bool inPlace = (settings.m_inPlace && jointSkeletonIndex == actor->GetMotionExtractionNodeIndex());
 
         // Sample the interpolated data.
         Transform result;
@@ -196,7 +195,7 @@ namespace EMotionFX
         return result;
     }
 
-    void UniformMotionData::SamplePose(const SampleSettings& settings, Pose* outputPose) const
+    void UniformMotionData::SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const
     {
         AZ_Assert(settings.m_actorInstance, "Expecting a valid actor instance.");
         const Actor* actor = settings.m_actorInstance->GetActor();
@@ -210,13 +209,12 @@ namespace EMotionFX
 
         const AZStd::vector<size_t>& jointLinks = motionLinkData->GetJointDataLinks();
         const ActorInstance* actorInstance = settings.m_actorInstance;
-        const Skeleton* skeleton = actor->GetSkeleton();
         const Pose* bindPose = actorInstance->GetTransformData()->GetBindPose();
         const size_t numNodes = actorInstance->GetNumEnabledNodes();
         for (size_t i = 0; i < numNodes; ++i)
         {
             const size_t skeletonJointIndex = actorInstance->GetEnabledNode(i);
-            const bool inPlace = (settings.m_inPlace && skeleton->GetNode(skeletonJointIndex)->GetIsRootNode());
+            const bool inPlace = (settings.m_inPlace && skeletonJointIndex == actor->GetMotionExtractionNodeIndex());
 
             // Sample the interpolated data.
             Transform result;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h
index 40674cf2d1..d51f51ffd9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h
@@ -53,8 +53,8 @@ namespace EMotionFX
         const char* GetSceneSettingsName() const override;
 
         // Overloaded.
-        Transform SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const override;
-        void SamplePose(const SampleSettings& settings, Pose* outputPose) const override;
+        Transform SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const override;
+        void SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const override;
         float SampleMorph(float sampleTime, size_t morphDataIndex) const override;
         float SampleFloat(float sampleTime, size_t floatDataIndex) const override;
         Transform SampleJointTransform(float sampleTime, size_t jointDataIndex) const override;
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
index 02b3fd7649..d691f4b202 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
@@ -273,7 +273,7 @@ namespace EMotionFX
         {
             AZ::Vector3 boneCenter = nodeTransform.GetTranslation() + 0.5f * boneDirection;
             float sumDistanceFromAxisSq = 0.0f;
-            float boneLengthSqReciprocal = 1.0f / boneDirection.GetLengthSq();
+            float boneLengthSqReciprocal = 1.0f / (boneLength * boneLength);
             for (int i = 0; i < numMeshPoints; i++)
             {
                 meshPoints[i] -= boneCenter;
@@ -299,7 +299,7 @@ namespace EMotionFX
         {
             Physics::CapsuleShapeConfiguration* capsule = static_cast<Physics::CapsuleShapeConfiguration*>(collider.second.get());
             capsule->m_height = boneDirection.GetLength();
-            if (AZ::IsClose(localBoneDirection.GetLength(), 1.0f))
+            if (!localBoneDirection.IsZero())
             {
                 collider.first->m_rotation = AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), localBoneDirection.GetNormalized());
             }
@@ -309,7 +309,7 @@ namespace EMotionFX
         }
         else if (colliderType == azrtti_typeid<Physics::BoxShapeConfiguration>())
         {
-            if (AZ::IsClose(localBoneDirection.GetLength(), 1.0f))
+            if (!localBoneDirection.IsZero())
             {
                 collider.first->m_rotation = AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), localBoneDirection.GetNormalized());
             }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
index b46fa645d1..e2e2224c67 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp
@@ -581,6 +581,11 @@ namespace EMStudio
                 animGraph->SetFileName(filename.c_str());
             }
 
+            if (parameters.GetValueAsBool("updateDirtyFlag", this))
+            {
+                animGraph->SetDirtyFlag(false);
+            }
+
             GetMainWindow()->GetFileManager()->SourceAssetChanged(filename);
 
             // Add file in case it did not exist before (when saving it the first time).
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp
index b385de62be..6881e49429 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp
@@ -97,6 +97,7 @@ namespace EMStudio
         m_compileDate = AZStd::string::format("%s", MCORE_DATE);
 
         EMotionFX::SkeletonOutlinerNotificationBus::Handler::BusConnect();
+        EMotionFX::JointSelectionRequestBus::Handler::BusConnect();
 
         // log some information
         LogInfo();
@@ -107,6 +108,7 @@ namespace EMStudio
     // destructor
     EMStudioManager::~EMStudioManager()
     {
+        EMotionFX::JointSelectionRequestBus::Handler::BusDisconnect();
         EMotionFX::SkeletonOutlinerNotificationBus::Handler::BusDisconnect();
 
         if (m_eventProcessingCallback)
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h
index 4c3139b77a..1d60773e1f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h
@@ -19,6 +19,8 @@
 // include the gizmos
 #include <EMotionFX/Rendering/Common/TransformationManipulator.h>
 
+#include <EMotionFX/Source/JointSelectionBus.h>
+
 // include the EMStudio Config
 #include "EMStudioConfig.h"
 #include <MysticQt/Source/MysticQtManager.h>
@@ -52,6 +54,7 @@ namespace EMStudio
      */
     class EMSTUDIO_API EMStudioManager
         : private EMotionFX::SkeletonOutlinerNotificationBus::Handler
+        , private EMotionFX::JointSelectionRequestBus::Handler
     {
     public:
         AZ_RTTI(EMStudio::EMStudioManager, "{D45E95CF-0C7B-44F1-A9D4-99A1E12A5AB5}")
@@ -103,6 +106,15 @@ namespace EMStudio
         void SetSelectedJointIndices(const AZStd::unordered_set<size_t>& selectedJointIndices);
         const AZStd::unordered_set<size_t>& GetSelectedJointIndices() const                                { return m_selectedJointIndices; }
 
+        const AZStd::unordered_set<size_t>* FindSelectedJointIndices(EMotionFX::ActorInstance* instance) const
+        {
+            if (instance == m_commandManager->GetCurrentSelection().GetSingleActorInstance())
+            {
+                return &m_selectedJointIndices;
+            }
+            return nullptr;
+        }
+
         Workspace* GetWorkspace()                                                               { return &m_workspace; }
 
         // functions for adding/removing gizmos
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp
index d1e3dc5ebc..241412c6c8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp
@@ -545,6 +545,7 @@ namespace EMStudio
             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &RenderOptions::OnLineSkeletonColorChangedCallback)
             ->DataElement(AZ::Edit::UIHandlers::Default, &RenderOptions::m_skeletonColor, "Solid skeleton color",
                 "Solid skeleton color.")
+            ->Attribute(AZ_CRC("AlphaChannel", 0xa0cab5cf), true)
             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &RenderOptions::OnSkeletonColorChangedCallback)
             ->DataElement(AZ::Edit::UIHandlers::Default, &RenderOptions::m_selectionColor, "Selection gizmo color",
                 "Selection gizmo color")
@@ -1062,6 +1063,7 @@ namespace EMStudio
         settings.m_vertexNormalsScale = m_vertexNormalsScale;
         settings.m_faceNormalsScale = m_faceNormalsScale;
         settings.m_tangentsScale = m_tangentsScale;
+        settings.m_nodeOrientationScale = m_nodeOrientationScale;
 
         settings.m_vertexNormalsColor = m_vertexNormalsColor;
         settings.m_faceNormalsColor = m_faceNormalsColor;
@@ -1082,6 +1084,7 @@ namespace EMStudio
         settings.m_selectedClothColliderColor = m_selectedClothColliderColor;
         settings.m_simulatedObjectColliderColor = m_simulatedObjectColliderColor;
         settings.m_selectedSimulatedObjectColliderColor = m_selectedSimulatedObjectColliderColor;
+        settings.m_jointNameColor = m_nodeNameColor;
     }
 
     void RenderOptions::OnGridUnitSizeChangedCallback() const
@@ -1110,6 +1113,7 @@ namespace EMStudio
     void RenderOptions::OnNodeOrientationScaleChangedCallback() const
     {
         PluginOptionsNotificationsBus::Event(s_nodeOrientationScaleOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_nodeOrientationScaleOptionName);
+        CopyToRenderActorSettings(EMotionFX::GetRenderActorSettings());
     }
 
     void RenderOptions::OnScaleBonesOnLengthChangedCallback() const
@@ -1268,6 +1272,7 @@ namespace EMStudio
     void RenderOptions::OnSkeletonColorChangedCallback() const
     {
         PluginOptionsNotificationsBus::Event(s_skeletonColorOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_skeletonColorOptionName);
+        CopyToRenderActorSettings(EMotionFX::GetRenderActorSettings());
     }
 
     void RenderOptions::OnSelectionColorChangedCallback() const
@@ -1283,6 +1288,7 @@ namespace EMStudio
     void RenderOptions::OnNodeNameColorChangedCallback() const
     {
         PluginOptionsNotificationsBus::Event(s_nodeNameColorOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_nodeNameColorOptionName);
+        CopyToRenderActorSettings(EMotionFX::GetRenderActorSettings());
     }
 
     void RenderOptions::OnGridColorChangedCallback() const
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
index c74cb3cb0f..2c9e84c9b9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderPlugin.cpp
@@ -933,6 +933,7 @@ namespace EMStudio
 
         // save the current settings and disable rendering
         m_renderOptions.SetLastUsedLayout(layout->GetName());
+        SaveRenderOptions();
         ClearViewWidgets();
         VisibilityChanged(false);
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp
index 5e33659056..2c7532005e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp
@@ -412,11 +412,9 @@ namespace EMStudio
         if (!nodesByAnimGraph.empty())
         {
             MCore::CommandGroup commandGroup("Delete anim graph nodes");
-            AZ::u32 numNodes = 0;
 
             for (const AZStd::pair<EMotionFX::AnimGraph*, AZStd::vector<EMotionFX::AnimGraphNode*>>& animGraphAndNodes : nodesByAnimGraph)
             {
-                numNodes += static_cast<AZ::u32>(animGraphAndNodes.second.size());
                 CommandSystem::DeleteNodes(&commandGroup, animGraphAndNodes.first, animGraphAndNodes.second, true);
             }
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.cpp
index 393e26790b..3a4c2628b3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetWindow.cpp
@@ -1138,6 +1138,12 @@ namespace EMStudio
             for (size_t motionSetId = 0; motionSetId < numMotionSets; motionSetId++)
             {
                 EMotionFX::MotionSet* motionSet2 = EMotionFX::GetMotionManager().GetMotionSet(motionSetId);
+
+                if (motionSet2->GetIsOwnedByRuntime())
+                {
+                    continue;
+                }
+
                 if (motionSet2->FindMotionEntryById(motionEntry->GetId()))
                 {
                     numMotionSetContainsMotion++;
@@ -1148,12 +1154,6 @@ namespace EMStudio
                 }
             }
 
-            // If motion exists in multiple motion sets, then it should not be removed from motions window.
-            if (removeMotion && numMotionSetContainsMotion > 1)
-            {
-                continue;
-            }
-
             // check the reference counter if only one reference registered
             // two is needed because the remove motion command has to be called to have the undo/redo possible
             // without it the motion list is also not updated because the remove motion callback is not called
@@ -1170,6 +1170,12 @@ namespace EMStudio
             }
             motionIdsToRemoveString += motionEntry->GetId();
 
+            // If motion exists in multiple motion sets, then it should not be removed from motions window.
+            if (removeMotion && numMotionSetContainsMotion > 1)
+            {
+                continue;
+            }
+
             // Check if the motion is not valid, that means the motion is not loaded.
             if (removeMotion && motionEntry->GetMotion())
             {
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp
index c1e35967ec..1fd72067f0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp
@@ -482,16 +482,6 @@ namespace EMStudio
         QMenu menu(this);
         menu.setToolTipsVisible(true);
 
-        bool actorSelected = false;
-        for (const QTreeWidgetItem* item : items)
-        {
-            if (item->parent() == nullptr)
-            {
-                actorSelected = true;
-                break;
-            }
-        }
-
         bool instanceSelected = false;
         const int selectedItemCount = items.count();
         for (int i = 0; i < selectedItemCount; ++i)
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp
index 6c2ab60010..02dbb297b3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp
@@ -2152,13 +2152,6 @@ namespace EMStudio
             float startTime = copyElement.m_startTime + offset;
             float endTime   = copyElement.m_endTime + offset;
 
-            // calculate the duration of the motion event
-            float duration  = 0.0f;
-            if (MCore::Compare<float>::CheckIfIsClose(startTime, endTime, MCore::Math::epsilon) == false)
-            {
-                duration = endTime - startTime;
-            }
-
             CommandSystem::CommandHelperAddMotionEvent(trackName.c_str(), startTime, endTime, copyElement.m_eventDatas, &commandGroup);
         }
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
index 9947850471..8135f14f12 100644
--- a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
+++ b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
@@ -42,6 +42,7 @@ set(FILES
     Source/EMotionFXManager.h
     Source/EMotionFXAllocatorInitializer.cpp
     Source/EMotionFXAllocatorInitializer.h
+    Source/JointSelectionBus.h
     Source/KeyFrame.h
     Source/KeyFrame.inl
     Source/KeyFrameFinder.h
@@ -349,6 +350,7 @@ set(FILES
     Source/MotionData/MotionData.h
     Source/MotionData/MotionDataFactory.cpp
     Source/MotionData/MotionDataFactory.h
+    Source/MotionData/MotionDataSampleSettings.h
     Source/MotionData/NonUniformMotionData.cpp
     Source/MotionData/NonUniformMotionData.h
     Source/MotionData/UniformMotionData.cpp
diff --git a/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp b/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp
index dd82385092..527407aaa8 100644
--- a/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp
@@ -293,7 +293,7 @@ namespace MCore
     // check if the test point is inside the polygon
     AZ::Vector2 ClosestPointToPoly(const AZ::Vector2* polyPoints, size_t numPoints, const AZ::Vector2& testPoint)
     {
-        AZ::Vector2 result;
+        AZ::Vector2 result = AZ::Vector2::CreateZero();
         float closestDist = FLT_MAX;
         for (size_t i = 0; i < numPoints; ++i)
         {
diff --git a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp
index 5e9cf66fa7..30d54c6b7b 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp
+++ b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp
@@ -71,8 +71,6 @@ namespace MysticQt
         setWidget(m_rootSplitter);
     }
 
-
-    // destructor
     DialogStack::~DialogStack()
     {
     }
@@ -81,6 +79,14 @@ namespace MysticQt
     // get rid of all dialogs and their allocated memory
     void DialogStack::Clear()
     {
+        for (Dialog& dialog : m_dialogs)
+        {
+            if (dialog.m_dialogWidget)
+            {
+                dialog.m_dialogWidget->deleteLater();
+            }
+        }
+
         // destroy the dialogs
         m_dialogs.clear();
 
@@ -679,6 +685,4 @@ namespace MysticQt
             return;
         }
     }
-}   // namespace MysticQt
-
-#include <MysticQt/Source/moc_DialogStack.cpp>
+} // namespace MysticQt
diff --git a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h
index bf93b5d23f..64a48fb392 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h
@@ -6,10 +6,8 @@
  *
  */
 
-#ifndef __MYSTICQT_DIALOGSTACK_H
-#define __MYSTICQT_DIALOGSTACK_H
+#pragma once
 
-//
 #if !defined(Q_MOC_RUN)
 #include "MysticQtConfig.h"
 #include <QtWidgets/QWidget>
@@ -30,14 +28,10 @@ namespace MysticQt
 {
     class DialogStackSplitter;
 
-    /**
-     *
-     *
-     */
     class MYSTICQT_API DialogStack
         : public QScrollArea
     {
-        Q_OBJECT
+        Q_OBJECT // AUTOMOC
 
     public:
         DialogStack(QWidget* parent = nullptr);
@@ -89,5 +83,3 @@ namespace MysticQt
         int32                   m_prevMouseY;
     };
 }   // namespace MysticQt
-
-#endif
diff --git a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h
index c397690b16..0260d1aae5 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h
+++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h
@@ -26,6 +26,7 @@ namespace AZ::Render
         float m_faceNormalsScale = 1.0f;
         float m_tangentsScale = 1.0f;
         float m_wireframeScale = 1.0f;
+        float m_nodeOrientationScale = 1.0f;
 
         AZ::Color m_hitDetectionColliderColor{0.44f, 0.44f, 0.44f, 1.0f};
         AZ::Color m_selectedHitDetectionColliderColor{ 0.3f, 0.56f, 0.88f, 1.0f };
@@ -46,5 +47,6 @@ namespace AZ::Render
         AZ::Color m_staticAABBColor{ 0.0f, 0.7f, 0.7f, 1.0f };
         AZ::Color m_lineSkeletonColor{ 0.33333f, 1.0f, 0.0f, 1.0f };
         AZ::Color m_skeletonColor{ 0.19f, 0.58f, 0.19f, 1.0f };
+        AZ::Color m_jointNameColor{ 1.0f, 1.0f, 1.0f, 1.0f };
     };
 } // namespace AZ::Render
diff --git a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
index b7fa03998e..15037793f1 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
@@ -514,7 +514,6 @@ namespace EMotionFX
             AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
             AzToolsFramework::EditorAnimationSystemRequestsBus::Handler::BusConnect();
             AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
-            m_updateTimer.Stamp();
 
             // Register custom property handlers for the reflected property editor.
             m_propertyHandlers = RegisterPropertyTypes();
@@ -604,15 +603,8 @@ namespace EMotionFX
         }
 
         //////////////////////////////////////////////////////////////////////////
-        void SystemComponent::OnTick(float delta, AZ::ScriptTimePoint timePoint)
+        void SystemComponent::OnTick(float delta, [[maybe_unused]]AZ::ScriptTimePoint timePoint)
         {
-            AZ_UNUSED(timePoint);
-
-#if defined (EMOTIONFXANIMATION_EDITOR)
-            AZ_UNUSED(delta);
-            delta = m_updateTimer.StampAndGetDeltaTimeInSeconds();
-#endif
-
             // Flush events prior to updating EMotion FX.
             ActorNotificationBus::ExecuteQueuedEvents();
 
diff --git a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h
index 5be9afbbaa..b5b990957c 100644
--- a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h
+++ b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.h
@@ -20,7 +20,6 @@
 #include <CrySystemBus.h>
 
 #if defined (EMOTIONFXANIMATION_EDITOR)
-#   include <AzCore/Debug/Timer.h>
 #   include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #   include <AzToolsFramework/API/EditorAnimationSystemRequestBus.h>
 #   include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
@@ -117,7 +116,6 @@ namespace EMotionFX
             AzToolsFramework::AssetBrowser::SourceFileDetails GetSourceFileDetails(const char* fullSourceFileName) override;
             //////////////////////////////////////////////////////////////////////////////////////
 
-            AZ::Debug::Timer m_updateTimer;
             AZStd::vector<AzToolsFramework::PropertyHandlerBase*> m_propertyHandlers;
 #endif // EMOTIONFXANIMATION_EDITOR
 
diff --git a/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
index a377495d6c..efff992564 100644
--- a/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
+++ b/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
@@ -161,6 +161,8 @@ namespace EMotionFX
             // Make sure all nodes exist.
             ASSERT_TRUE(rootNode && pelvisNode && lHandNode && lLoArmNode && lLoLegNode && lAnkleNode &&
                 rHandNode && rLoArmNode && rLoLegNode && rAnkleNode) << "All nodes used should exist.";
+
+            m_actor->SetMotionExtractionNodeIndex(m_jackRootIndex);
         }
 
         void SetupMirrorNodes()
diff --git a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
index 2af3329203..f61c4992a6 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
@@ -330,6 +330,10 @@ namespace EMotionFX
             const QString animGraphFilename = GenerateTempAnimGraphFilename();
             SaveCurrentAnimGraph(animGraphFilename);
 
+            // Pretend editing the anim graph
+            EMotionFX::AnimGraph* animGraph = m_animGraphPlugin->GetActiveAnimGraph();
+            animGraph->SetDirtyFlag(true);
+
             // Prepare a watcher to press the ok button when the SaveDirtySettingsWindow appears.
             ModalPopupHandler saveDirtyPopupHandler;
 
diff --git a/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py b/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py
deleted file mode 100755
index e3b930e43b..0000000000
--- a/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py
+++ /dev/null
@@ -1,94 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-
-python run_EMotionFX_tests.py --config --vsVersion
-
-Example:
-python run_EMotionFX_tests.py --config profile --vsVersion vs2017
-python run_EMotionFX_tests.py --config debug --vsVersion vs2019
-
-
-Requirements:
-
-- Provide a single script that executes all your team's automated BAT/Regression tests
-
-- The script should run the tests successfully if killed in the middle and restarted
-
-- Provide any documentation needed along with the script so that other feature teams wanting to execute your tests can execute them locally
-
-- The documentation should also cover where the test results are reported and how to find failing tests and their logs
-
-
-"""
-
-import argparse
-import os
-import subprocess
-
-
-#Setup Parser
-def parser_setup():
-    parser = argparse.ArgumentParser(description='Sets up for and runs the specified EMotionFX tests')
-
-    # Configuration
-    parser.add_argument('--config', choices=['profile','debug'] , help='The Conrfiguration you have pre-build and want to run the tests on. Options[profile,debug]')
-
-    #Visual Studio Version
-    parser.add_argument('--vsVersion', choices=['vs2017','vs2019'], help='The version of Visual Studio you used to build your branch. Options[vs2017, vs2019]')
-    
-
-
-    return parser
-
-
-
-#Main Program
-def main():
-    # Set up CLI arguments for CLI argument parser
-    parser = parser_setup()
-
-    # Capture arguments and their values
-    args = parser.parse_args()
-
-
-    # Change directory to branch root
-    dev_path = os.path.join(os.path.dirname(__file__), '..', '..','..','..')
-    os.chdir(dev_path)
-    dirpath = os.getcwd()
-
-
-    vsVersion = args.vsVersion
-    config = args.config
-
-    if vsVersion == 'vs2017':
-        if config == 'profile':
-            #lmbr_test.cmd scan --dir Bin64vc141.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        elif config == 'debug':
-            #lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        else:
-            print('INVALID ARGUMENT(s)... Ending')
-    elif vsVersion == 'vs2019':
-        if config == 'profile':
-            #lmbr_test.cmd scan --dir Bin64vc142.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc142.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        elif config == 'debug':
-            #lmbr_test.cmd scan --dir Bin64vc142.Debug.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        else:
-            print('INVALID ARGUMENT(s)... Ending')
-    else:
-        print('INVALID ARGUMENT(s)... Ending')
-        
-    
-
-if __name__ == '__main__':
-    main()
diff --git a/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp b/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp
index cef8931722..f168cc5ab2 100644
--- a/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp
@@ -9,6 +9,8 @@
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Module/Module.h>
 
+#include <AzToolsFramework/API/PythonLoader.h>
+
 #include <PythonSystemComponent.h>
 #include <PythonReflectionComponent.h>
 #include <PythonMarshalComponent.h>
@@ -18,6 +20,7 @@ namespace EditorPythonBindings
 {
     class EditorPythonBindingsModule
         : public AZ::Module
+        , public AzToolsFramework::EmbeddedPython::PythonLoader
     {
     public:
         AZ_RTTI(EditorPythonBindingsModule, "{851B9E35-4FD5-49B1-8207-E40D4BBA36CC}", AZ::Module);
diff --git a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
index 876ef19803..fe9156013f 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp
@@ -597,11 +597,10 @@ namespace EditorPythonBindings
     {
         AZStd::unordered_set<AZStd::string> pyPackageSites(pythonPathStack.begin(), pythonPathStack.end());
 
-        const char* engineRoot = nullptr;
-        AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
+        AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
 
         // set PYTHON_HOME
-        AZStd::string pyBasePath = Platform::GetPythonHomePath(PY_PACKAGE, engineRoot);
+        AZStd::string pyBasePath = Platform::GetPythonHomePath(PY_PACKAGE, engineRoot.c_str());
         if (!AZ::IO::SystemFile::Exists(pyBasePath.c_str()))
         {
             AZ_Warning("python", false, "Python home path must exist! path:%s", pyBasePath.c_str());
diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h b/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h
index 143863b4c8..e2b3d1eadd 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonTestingUtility.h
@@ -135,10 +135,6 @@ namespace UnitTest
         void NormalizePath(AZStd::string& ) override {}
         void NormalizePathKeepCase(AZStd::string& ) override {}
         void CalculateBranchTokenForEngineRoot(AZStd::string& ) const override {}
-        // Gets the engine root path for testing
-        const char* GetEngineRoot() const override { return m_engineRoot.c_str(); }
-        // Retrieves the app root path for testing
-        const char* GetAppRoot() const override { return m_engineRoot.c_str(); }
 
         AZ::ComponentApplication m_app;
         AZStd::unique_ptr<FileIOHelper> m_fileIOHelper;
diff --git a/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp b/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp
index 4e06b832e1..3fb60cdaf6 100644
--- a/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp
+++ b/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <AzTest/AzTest.h>
-#include <Mocks/ITimerMock.h>
 #include <Mocks/ICryPakMock.h>
 #include <Mocks/IConsoleMock.h>
 #include <Mocks/ISystemMock.h>
@@ -106,7 +105,6 @@ struct MockGlobalEnvironment
 {
     MockGlobalEnvironment()
     {
-        m_stubEnv.pTimer = &m_stubTimer;
         m_stubEnv.pCryPak = &m_stubPak;
         m_stubEnv.pConsole = &m_stubConsole;
         m_stubEnv.pSystem = &m_stubSystem;
@@ -120,7 +118,6 @@ struct MockGlobalEnvironment
 
 private:
     SSystemGlobalEnvironment m_stubEnv;
-    testing::NiceMock<TimerMock> m_stubTimer;
     testing::NiceMock<CryPakMock> m_stubPak;
     testing::NiceMock<ConsoleMock> m_stubConsole;
     testing::NiceMock<SystemMock> m_stubSystem;
diff --git a/Gems/GameStateSamples/Assets/UI/Canvases/DefaultMainMenuScreen.uicanvas b/Gems/GameStateSamples/Assets/UI/Canvases/DefaultMainMenuScreen.uicanvas
index 2a0d6d476a..d87baa8aa2 100644
--- a/Gems/GameStateSamples/Assets/UI/Canvases/DefaultMainMenuScreen.uicanvas
+++ b/Gems/GameStateSamples/Assets/UI/Canvases/DefaultMainMenuScreen.uicanvas
@@ -753,7 +753,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -983,7 +983,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h
index 65f4298c38..920bac6516 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.h
@@ -10,6 +10,7 @@
 #include "IGestureRecognizer.h"
 
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Gestures
@@ -83,7 +84,7 @@ namespace Gestures
 
         Config m_config;
 
-        int64 m_timeOfLastEvent;
+        AZ::TimeMs m_timeOfLastEvent;
         ScreenPosition m_positionOfFirstEvent;
         ScreenPosition m_positionOfLastEvent;
 
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
index b14ef18994..8a079d7953 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
@@ -8,9 +8,8 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Time/ITime.h>
 #include <CryCommon/ISystem.h>
-#include <CryCommon/TimeValue.h>
-#include <CryCommon/ITimer.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 inline void Gestures::RecognizerClickOrTap::Config::Reflect(AZ::ReflectContext* context)
@@ -57,7 +56,7 @@ inline void Gestures::RecognizerClickOrTap::Config::Reflect(AZ::ReflectContext*
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 inline Gestures::RecognizerClickOrTap::RecognizerClickOrTap(const Config& config)
     : m_config(config)
-    , m_timeOfLastEvent(0)
+    , m_timeOfLastEvent(AZ::Time::ZeroTimeMs)
     , m_positionOfFirstEvent()
     , m_positionOfLastEvent()
     , m_currentCount(0)
@@ -77,13 +76,12 @@ inline bool Gestures::RecognizerClickOrTap::OnPressedEvent(const AZ::Vector2& sc
     {
         return false;
     }
-
-    const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
+    const AZ::TimeMs currentTime = AZ::GetRealElapsedTimeMs();
     switch (m_currentState)
     {
     case State::Idle:
     {
-        m_timeOfLastEvent = currentTime.GetValue();
+        m_timeOfLastEvent = currentTime;
         m_positionOfFirstEvent = screenPosition;
         m_positionOfLastEvent = screenPosition;
         m_currentCount = 0;
@@ -92,7 +90,7 @@ inline bool Gestures::RecognizerClickOrTap::OnPressedEvent(const AZ::Vector2& sc
     break;
     case State::Released:
     {
-        if ((currentTime.GetDifferenceInSeconds(m_timeOfLastEvent) > m_config.maxSecondsBetweenClicksOrTaps) ||
+        if ((AZ::TimeMsToSeconds(currentTime - m_timeOfLastEvent) > m_config.maxSecondsBetweenClicksOrTaps) ||
             (screenPosition.GetDistance(m_positionOfFirstEvent) > m_config.maxPixelsBetweenClicksOrTaps))
         {
             // Treat this as the start of a new tap sequence.
@@ -100,7 +98,7 @@ inline bool Gestures::RecognizerClickOrTap::OnPressedEvent(const AZ::Vector2& sc
             m_positionOfFirstEvent = screenPosition;
         }
 
-        m_timeOfLastEvent = currentTime.GetValue();
+        m_timeOfLastEvent = currentTime;
         m_positionOfLastEvent = screenPosition;
         m_currentState = State::Pressed;
     }
@@ -129,8 +127,8 @@ inline bool Gestures::RecognizerClickOrTap::OnDownEvent(const AZ::Vector2& scree
     {
     case State::Pressed:
     {
-        const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
-        if ((currentTime.GetDifferenceInSeconds(m_timeOfLastEvent) > m_config.maxSecondsHeld) ||
+        const AZ::TimeMs currentTime = AZ::GetRealElapsedTimeMs();
+        if ((AZ::TimeMsToSeconds(currentTime - m_timeOfLastEvent) > m_config.maxSecondsHeld) ||
             (screenPosition.GetDistance(m_positionOfLastEvent) > m_config.maxPixelsMoved))
         {
             // Tap recognition failed.
@@ -168,8 +166,8 @@ inline bool Gestures::RecognizerClickOrTap::OnReleasedEvent(const AZ::Vector2& s
     {
     case State::Pressed:
     {
-        const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
-        if ((currentTime.GetDifferenceInSeconds(m_timeOfLastEvent) > m_config.maxSecondsHeld) ||
+        const AZ::TimeMs currentTime = AZ::GetRealElapsedTimeMs();
+        if ((AZ::TimeMsToSeconds(currentTime - m_timeOfLastEvent) > m_config.maxSecondsHeld) ||
             (screenPosition.GetDistance(m_positionOfLastEvent) > m_config.maxPixelsMoved))
         {
             // Tap recognition failed.
@@ -179,7 +177,7 @@ inline bool Gestures::RecognizerClickOrTap::OnReleasedEvent(const AZ::Vector2& s
         else if (++m_currentCount >= m_config.minClicksOrTaps)
         {
             // Tap recognition succeeded.
-            m_timeOfLastEvent = currentTime.GetValue();
+            m_timeOfLastEvent = currentTime;
             m_positionOfLastEvent = screenPosition;
             OnDiscreteGestureRecognized();
 
@@ -190,7 +188,7 @@ inline bool Gestures::RecognizerClickOrTap::OnReleasedEvent(const AZ::Vector2& s
         else
         {
             // More taps are needed.
-            m_timeOfLastEvent = currentTime.GetValue();
+            m_timeOfLastEvent = currentTime;
             m_positionOfLastEvent = screenPosition;
             m_currentState = State::Released;
         }
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h
index 97d76b1ceb..91c045b37f 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.h
@@ -10,6 +10,7 @@
 #include "IGestureRecognizer.h"
 
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Gestures
@@ -75,7 +76,7 @@ namespace Gestures
 
         Config m_config;
 
-        int64 m_startTime;
+        AZ::TimeMs m_startTime;
         ScreenPosition m_startPosition;
         ScreenPosition m_currentPosition;
 
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
index 0c83893c9d..a0d0afe6f4 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
@@ -8,7 +8,6 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
-#include <CryCommon/ITimer.h>
 #include <CryCommon/ISystem.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -44,7 +43,7 @@ inline void Gestures::RecognizerDrag::Config::Reflect(AZ::ReflectContext* contex
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 inline Gestures::RecognizerDrag::RecognizerDrag(const Config& config)
     : m_config(config)
-    , m_startTime(0)
+    , m_startTime(AZ::Time::ZeroTimeMs)
     , m_startPosition()
     , m_currentPosition()
     , m_currentState(State::Idle)
@@ -68,7 +67,7 @@ inline bool Gestures::RecognizerDrag::OnPressedEvent(const AZ::Vector2& screenPo
     {
     case State::Idle:
     {
-        m_startTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetValue() : 0;
+        m_startTime = AZ::GetRealElapsedTimeMs();
         m_startPosition = screenPosition;
         m_currentPosition = screenPosition;
         m_currentState = State::Pressed;
@@ -101,11 +100,11 @@ inline bool Gestures::RecognizerDrag::OnDownEvent(const AZ::Vector2& screenPosit
     {
     case State::Pressed:
     {
-        const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
-        if ((currentTime.GetDifferenceInSeconds(m_startTime) >= m_config.minSecondsHeld) &&
+        const AZ::TimeMs currentTime = AZ::GetRealElapsedTimeMs();
+        if ((AZ::TimeMsToSeconds(currentTime - m_startTime) >= m_config.minSecondsHeld) &&
             (GetDistance() >= m_config.minPixelsMoved))
         {
-            m_startTime = currentTime.GetValue();
+            m_startTime = currentTime;
             m_startPosition = m_currentPosition;
             OnContinuousGestureInitiated();
             m_currentState = State::Dragging;
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
index 11bd56ff4d..a2c4a55166 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
@@ -10,8 +10,8 @@
 #include "IGestureRecognizer.h"
 
 #include <CryCommon/ISystem.h>
-#include <CryCommon/ITimer.h>
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Gestures
@@ -64,7 +64,7 @@ namespace Gestures
         AZ::Vector2 GetStartPosition() const { return m_startPosition; }
         AZ::Vector2 GetCurrentPosition() const { return m_currentPosition; }
 
-        float GetDuration() const { return (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetDifferenceInSeconds(m_startTime) : 0.0f; }
+        float GetDuration() const { return AZ::TimeUsToSeconds(AZ::GetLastSimulationTickTime() - m_startTime); }
 
     private:
         enum class State
@@ -76,7 +76,7 @@ namespace Gestures
 
         Config m_config;
 
-        int64 m_startTime;
+        AZ::TimeUs m_startTime;
         ScreenPosition m_startPosition;
         ScreenPosition m_currentPosition;
 
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
index 6af8a10890..75578edca1 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
@@ -8,7 +8,6 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
-#include <CryCommon/ITimer.h>
 #include <CryCommon/ISystem.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -44,7 +43,7 @@ inline void Gestures::RecognizerHold::Config::Reflect(AZ::ReflectContext* contex
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 inline Gestures::RecognizerHold::RecognizerHold(const Config& config)
     : m_config(config)
-    , m_startTime(0)
+    , m_startTime(AZ::Time::ZeroTimeUs)
     , m_startPosition()
     , m_currentPosition()
     , m_currentState(State::Idle)
@@ -68,7 +67,7 @@ inline bool Gestures::RecognizerHold::OnPressedEvent(const AZ::Vector2& screenPo
     {
     case State::Idle:
     {
-        m_startTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetValue() : 0;
+        m_startTime = AZ::GetLastSimulationTickTime();
         m_startPosition = screenPosition;
         m_currentPosition = screenPosition;
         m_currentState = State::Pressed;
@@ -101,13 +100,13 @@ inline bool Gestures::RecognizerHold::OnDownEvent(const AZ::Vector2& screenPosit
     {
     case State::Pressed:
     {
-        const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
         if (screenPosition.GetDistance(m_startPosition) > m_config.maxPixelsMoved)
         {
             // Hold recognition failed.
             m_currentState = State::Idle;
         }
-        else if (currentTime.GetDifferenceInSeconds(m_startTime) >= m_config.minSecondsHeld)
+        else if (const AZ::TimeUs currentTime = AZ::GetLastSimulationTickTime();
+                 AZ::TimeUsToSeconds(currentTime - m_startTime) >= m_config.minSecondsHeld)
         {
             // Hold recognition succeeded.
             OnContinuousGestureInitiated();
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h
index c5fa773339..8d5cd76e7d 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.h
@@ -10,6 +10,7 @@
 #include "IGestureRecognizer.h"
 
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Gestures
@@ -90,7 +91,7 @@ namespace Gestures
         ScreenPosition m_startPositions[2];
         ScreenPosition m_currentPositions[2];
 
-        int64_t m_lastUpdateTimes[2];
+        AZ::TimeMs m_lastUpdateTimes[2];
 
         State m_currentState;
     };
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
index 642d781c35..70231becb1 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
@@ -8,7 +8,6 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
-#include <CryCommon/ITimer.h>
 #include <CryCommon/ISystem.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -42,8 +41,8 @@ inline Gestures::RecognizerPinch::RecognizerPinch(const Config& config)
     : m_config(config)
     , m_currentState(State::Idle)
 {
-    m_lastUpdateTimes[0] = 0;
-    m_lastUpdateTimes[1] = 0;
+    m_lastUpdateTimes[0] = AZ::Time::ZeroTimeMs;
+    m_lastUpdateTimes[1] = AZ::Time::ZeroTimeMs;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -112,7 +111,7 @@ inline bool Gestures::RecognizerPinch::OnDownEvent(const AZ::Vector2& screenPosi
     }
 
     m_currentPositions[pointerIndex] = screenPosition;
-    m_lastUpdateTimes[pointerIndex] = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetValue() : 0;
+    m_lastUpdateTimes[pointerIndex] = AZ::GetRealElapsedTimeMs();
     if (m_lastUpdateTimes[0] != m_lastUpdateTimes[1])
     {
         // We need to wait until both touches have been updated this frame.
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h
index b2d31e3d4f..a07aad7d6a 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.h
@@ -10,6 +10,7 @@
 #include "IGestureRecognizer.h"
 
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Gestures
@@ -86,7 +87,7 @@ namespace Gestures
         ScreenPosition m_startPositions[2];
         ScreenPosition m_currentPositions[2];
 
-        int64_t m_lastUpdateTimes[2];
+        AZ::TimeMs m_lastUpdateTimes[2];
 
         State m_currentState;
     };
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
index 2ae504e309..894a2dd2e8 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
@@ -9,7 +9,6 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <CryCommon/ISystem.h>
-#include <CryCommon/ITimer.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 inline void Gestures::RecognizerRotate::Config::Reflect(AZ::ReflectContext* context)
@@ -42,8 +41,8 @@ inline Gestures::RecognizerRotate::RecognizerRotate(const Config& config)
     : m_config(config)
     , m_currentState(State::Idle)
 {
-    m_lastUpdateTimes[0] = 0;
-    m_lastUpdateTimes[1] = 0;
+    m_lastUpdateTimes[0] = AZ::Time::ZeroTimeMs;
+    m_lastUpdateTimes[1] = AZ::Time::ZeroTimeMs;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -101,7 +100,7 @@ inline bool Gestures::RecognizerRotate::OnDownEvent(const AZ::Vector2& screenPos
     }
 
     m_currentPositions[pointerIndex] = screenPosition;
-    m_lastUpdateTimes[pointerIndex] = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetValue() : 0;
+    m_lastUpdateTimes[pointerIndex] = AZ::GetRealElapsedTimeMs();
     if (m_lastUpdateTimes[0] != m_lastUpdateTimes[1])
     {
         // We need to wait until both touches have been updated this frame.
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h
index bf0181e2b9..ed63991b3a 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "IGestureRecognizer.h"
-#include <CryCommon/ITimer.h>
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Gestures
@@ -66,7 +66,7 @@ namespace Gestures
        AZ::Vector2 GetDirection() const { return GetDelta().GetNormalized(); }
 
        float GetDistance() const { return GetEndPosition().GetDistance(GetStartPosition()); }
-       float GetDuration() const { return CTimeValue(m_endTime).GetDifferenceInSeconds(m_startTime); }
+       float GetDuration() const { return AZ::TimeMsToSeconds(m_endTime - m_startTime); }
        float GetVelocity() const { return GetDistance() / GetDuration(); }
 
     private:
@@ -81,8 +81,8 @@ namespace Gestures
         ScreenPosition m_startPosition;
         ScreenPosition m_endPosition;
 
-        int64 m_startTime;
-        int64 m_endTime;
+        AZ::TimeMs m_startTime;
+        AZ::TimeMs m_endTime;
 
         State m_currentState;
     };
diff --git a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
index 5f879ce423..072cebcbb5 100644
--- a/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
+++ b/Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
@@ -45,8 +45,8 @@ inline Gestures::RecognizerSwipe::RecognizerSwipe(const Config& config)
     : m_config(config)
     , m_startPosition()
     , m_endPosition()
-    , m_startTime(0)
-    , m_endTime(0)
+    , m_startTime(AZ::Time::ZeroTimeMs)
+    , m_endTime(AZ::Time::ZeroTimeMs)
     , m_currentState(State::Idle)
 {
 }
@@ -68,7 +68,7 @@ inline bool Gestures::RecognizerSwipe::OnPressedEvent(const AZ::Vector2& screenP
     {
     case State::Idle:
     {
-        m_startTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetValue() : 0;
+        m_startTime = AZ::GetRealElapsedTimeMs();
         m_startPosition = screenPosition;
         m_endPosition = screenPosition;
         m_currentState = State::Pressed;
@@ -98,8 +98,8 @@ inline bool Gestures::RecognizerSwipe::OnDownEvent([[maybe_unused]] const AZ::Ve
     {
     case State::Pressed:
     {
-        const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
-        if (currentTime.GetDifferenceInSeconds(m_startTime) > m_config.maxSecondsHeld)
+        const AZ::TimeMs currentTime = AZ::GetRealElapsedTimeMs();
+        if (AZ::TimeMsToSeconds(currentTime - m_startTime) > m_config.maxSecondsHeld)
         {
             // Swipe recognition failed because we took too long.
             m_currentState = State::Idle;
@@ -134,12 +134,12 @@ inline bool Gestures::RecognizerSwipe::OnReleasedEvent(const AZ::Vector2& screen
     {
     case State::Pressed:
     {
-        const CTimeValue currentTime = (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime() : CTimeValue();
-        if ((currentTime.GetDifferenceInSeconds(m_startTime) <= m_config.maxSecondsHeld) &&
+        const AZ::TimeMs currentTime = AZ::GetRealElapsedTimeMs();
+        if ((AZ::TimeMsToSeconds(currentTime - m_startTime) <= m_config.maxSecondsHeld) &&
             (screenPosition.GetDistance(m_startPosition) >= m_config.minPixelsMoved))
         {
             // Swipe recognition succeeded.
-            m_endTime = currentTime.GetValue();
+            m_endTime = currentTime;
             m_endPosition = screenPosition;
             OnDiscreteGestureRecognized();
             m_currentState = State::Idle;
diff --git a/Gems/Gestures/Code/Tests/BaseGestureTest.h b/Gems/Gestures/Code/Tests/BaseGestureTest.h
index b0897e258a..56cc4b6777 100644
--- a/Gems/Gestures/Code/Tests/BaseGestureTest.h
+++ b/Gems/Gestures/Code/Tests/BaseGestureTest.h
@@ -6,13 +6,25 @@
  *
  */
 #pragma once
-#include <AzTest/AzTest.h>
-#include <Mocks/StubTimer.h>
-#include <Gestures/IGestureRecognizer.h>
 #include <AzCore/Memory/OSAllocator.h>
+#include <AzCore/UnitTest/Mocks/MockITime.h>
+#include <AzTest/AzTest.h>
+#include <Gestures/IGestureRecognizer.h>
 
-class BaseGestureTest
-    : public ::testing::Test
+namespace GesturesTests
+{
+    struct StubTimer : public AZ::StubTimeSystem
+    {
+        AZ::TimeMs GetRealElapsedTimeMs() const override
+        {
+            return m_realElapsedTime;
+        }
+
+        AZ::TimeMs m_realElapsedTime = AZ::Time::ZeroTimeMs;
+    };
+} // namespace GesturesTests
+
+class BaseGestureTest : public ::testing::Test
 {
 public:
     BaseGestureTest()
@@ -24,39 +36,30 @@ public:
     {
         // global environment stubs
         m_env = new(AZ_OS_MALLOC(sizeof(SSystemGlobalEnvironment), alignof(SSystemGlobalEnvironment))) SSystemGlobalEnvironment();
-        m_stubTimer = new StubTimer(1.0f / 30.0f);
         gEnv = m_env;
-        gEnv->pTimer = m_stubTimer;
-
+        m_stubTimer = new GesturesTests::StubTimer();
         // simulated position
         m_pos = AZ::Vector2(0.0f, 0.0f);
     }
 
     void TearDown() override
     {
-        gEnv->pTimer = nullptr;
         gEnv = nullptr;
-        if (m_stubTimer)
-        {
-            delete m_stubTimer;
-            m_stubTimer = nullptr;
-        }
         if (m_env)
         {
             m_env->~SSystemGlobalEnvironment();
             AZ_OS_FREE(m_env);
             m_env = nullptr;
         }
+        delete m_stubTimer;
     }
 
-
 protected:
-
     // time manipulation
 
     void SetTime(float sec)
     {
-        m_stubTimer->SetTime(sec);
+        m_stubTimer->m_realElapsedTime = AZ::SecondsToTimeMs(sec);
     }
 
     // simple position caching interface
@@ -97,9 +100,7 @@ protected:
     }
 
 private:
-    SSystemGlobalEnvironment* m_env;
-    StubTimer* m_stubTimer;
+    SSystemGlobalEnvironment* m_env = nullptr;
+    GesturesTests::StubTimer* m_stubTimer = nullptr;
     AZ::Vector2 m_pos;
 };
-
-
diff --git a/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp b/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp
index 72fca0498d..9337ae87ed 100644
--- a/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp
+++ b/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <AzTest/AzTest.h>
-#include <Mocks/StubTimer.h>
 #include <Gestures/GestureRecognizerClickOrTap.h>
 #include "BaseGestureTest.h"
 
diff --git a/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp b/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp
index bb7ac4a75a..3d39a888b5 100644
--- a/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp
+++ b/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <AzTest/AzTest.h>
-#include <Mocks/StubTimer.h>
 #include <Gestures/GestureRecognizerPinch.h>
 #include "BaseGestureTest.h"
 
diff --git a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
index 38936dc302..57de6f776a 100644
--- a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
@@ -324,8 +324,6 @@ namespace GradientSignal
 
     void GradientTransformComponent::TransformPositionToUVW(const AZ::Vector3& inPosition, AZ::Vector3& outUVW, const bool shouldNormalizeOutput, bool& wasPointRejected) const
     {
-        AZ_PROFILE_FUNCTION(Entity);
-
         AZStd::lock_guard<decltype(m_cacheMutex)> lock(m_cacheMutex);
 
         //transforming coordinate into "local" relative space of shape bounds
diff --git a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
index 6fe8d32484..021e083ea6 100644
--- a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
@@ -191,8 +191,6 @@ namespace GradientSignal
 
     float ImageGradientComponent::GetValue(const GradientSampleParams& sampleParams) const
     {
-        AZ_PROFILE_FUNCTION(Entity);
-
         AZ::Vector3 uvw = sampleParams.m_position;
 
         bool wasPointRejected = false;
diff --git a/Gems/GradientSignal/Code/Source/ImageAsset.cpp b/Gems/GradientSignal/Code/Source/ImageAsset.cpp
index c67f86c6b8..7e73dc32d6 100644
--- a/Gems/GradientSignal/Code/Source/ImageAsset.cpp
+++ b/Gems/GradientSignal/Code/Source/ImageAsset.cpp
@@ -153,8 +153,6 @@ namespace GradientSignal
 
     float GetValueFromImageAsset(const AZ::Data::Asset<ImageAsset>& imageAsset, const AZ::Vector3& uvw, float tilingX, float tilingY, float defaultValue)
     {
-        AZ_PROFILE_FUNCTION(Entity);
-
         if (imageAsset.IsReady())
         {
             const auto& image = imageAsset.Get();
diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
index dc512be8f1..1e0fab857f 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
@@ -276,6 +276,11 @@ namespace GraphCanvas
             m_subTitleWidget->SetLabel(subtitle);
             updateLayout = true;
         }
+
+        if (updateLayout)
+        {
+            UpdateLayout();
+        }
     }
 
     void GeneralNodeTitleGraphicsWidget::SetTitle(const AZStd::string& title)
@@ -463,13 +468,6 @@ namespace GraphCanvas
     {
         GRAPH_CANVAS_DETAILED_PROFILE_FUNCTION();
 
-        Styling::PaletteStyle style = m_styleHelper.GetAttribute(Styling::Attribute::PaletteStyle, Styling::PaletteStyle::Solid);
-
-        if (m_paletteOverride)
-        {
-            style = m_paletteOverride->GetAttribute(Styling::Attribute::PaletteStyle, Styling::PaletteStyle::Solid);
-        }
-        
         // Background
         QRectF bounds = boundingRect();
 
diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h
index 84963c7997..ce8ea4c8a9 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h
@@ -19,7 +19,6 @@
 #include <GraphCanvas/Components/StyleBus.h>
 #include <GraphCanvas/Components/VisualBus.h>
 #include <GraphCanvas/Types/EntitySaveData.h>
-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <Widgets/GraphCanvasLabel.h>
 
 namespace GraphCanvas
diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
index ddb5f11714..9c3fc16c50 100644
--- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
+++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
@@ -188,9 +188,7 @@ namespace GraphCanvas
     void GeneralSlotLayoutGraphicsWidget::LinearSlotGroupWidget::DisplaySlot(const AZ::EntityId& slotId)
     {
         ConnectionType connectionType = ConnectionType::CT_Invalid;
-        SlotRequestBus::EventResult(connectionType, slotId, &SlotRequests::GetConnectionType);                
-        
-        int layoutOrder = 0;
+        SlotRequestBus::EventResult(connectionType, slotId, &SlotRequests::GetConnectionType);
 
         SlotLayoutInfo slotInfo(slotId);
 
@@ -199,14 +197,14 @@ namespace GraphCanvas
             SlotUINotificationBus::MultiHandler::BusConnect(slotId);
 
             m_inputSlotSet.insert(slotId);
-            layoutOrder = LayoutSlot(m_inputs, m_inputSlots, slotInfo);
+            LayoutSlot(m_inputs, m_inputSlots, slotInfo);
         }
         else if (connectionType == CT_Output)
         {
             SlotUINotificationBus::MultiHandler::BusConnect(slotId);
 
             m_outputSlotSet.insert(slotId);
-            LayoutSlot(m_outputs, m_outputSlots, slotInfo);            
+            LayoutSlot(m_outputs, m_outputSlots, slotInfo);
         }
         else
         {
diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp
index f51c2c1272..dfcb106777 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp
@@ -58,7 +58,6 @@
 
 #include <GraphCanvas/Types/ConstructPresets.h>
 #include <GraphCanvas/Types/EntitySaveData.h>
-#include <GraphCanvas/Types/TranslationTypes.h>
 
 #include <GraphCanvas/Widgets/GraphCanvasEditor/GraphCanvasAssetEditorMainWindow.h>
 #include <GraphCanvas/Widgets/GraphCanvasMimeEvent.h>
@@ -386,6 +385,16 @@ namespace GraphCanvas
         AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::EnumerateAssets, nullptr, collectAssetsCb, postEnumerateCb);
     }
 
+    void GraphCanvasSystemComponent::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
+    {
+        AZ::Data::AssetInfo assetInfo;
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
+        if (assetInfo.m_assetType == azrtti_typeid<TranslationAsset>())
+        {
+            GraphCanvas::TranslationRequestBus::Broadcast(&GraphCanvas::TranslationRequests::Restore);
+        }
+    }
+
     void GraphCanvasSystemComponent::UnregisterAssetHandler()
     {
         if (m_assetHandler)
diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.h b/Gems/GraphCanvas/Code/Source/GraphCanvas.h
index 7a4d9677ab..0b47e9010a 100644
--- a/Gems/GraphCanvas/Code/Source/GraphCanvas.h
+++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.h
@@ -77,7 +77,10 @@ namespace GraphCanvas
         AZ::EntityId CreateVirtualChild(const AZ::EntityId& real, const AZStd::string& virtualChildElement) const override;
         ////
 
+        // AzFramework::AssetCatalogEventBus::Handler
         void OnCatalogLoaded(const char* /*catalogFile*/) override;
+        void OnCatalogAssetChanged(const AZ::Data::AssetId&) override;
+        ////
 
         AZStd::unique_ptr<TranslationAssetHandler> m_assetHandler;
 
diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
index 653aac3afc..b31bf25851 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
@@ -59,14 +59,14 @@ namespace GraphCanvas
     //!
     //! Requirements:
     //!     - Must have a top level array called "entries"
-    //!     - Must provide a "key" element for any entry added
+    //!     - Must provide a "base" element for any entry added
     //!
     //! Example:
     //! 
     //! {
     //! "entries": [
     //!     {
-    //!         "key": "Globals",
+    //!         "base": "Globals",
     //!         "details": {
     //!             "name": "My Name",
     //!             "tooltip": "My Tooltip"
@@ -90,21 +90,21 @@ namespace GraphCanvas
     //! Globals.details.somearray.0.name
     //! Globals.details.somearray.1.name
     //!
-    //! There is one important aspect however, if an element in an array has a "key" value, the value of this key
+    //! There is one important aspect however, if an element in an array has a "base" value, the value of this key
     //! will replace the index. This is useful when the index and/or ordering of an entry is not relevant or may
     //! change.
     //!
     //! "somearray": [ {
     //!         "name": "First one"
-    //!         "key": "a_key"
+    //!         "base": "a_key"
     //!      }, {
     //!         "name": "Second one",
-    //!          "key": "b_key"
+    //!          "base": "b_key"
     //!      } ]
     //!
-    //! Globals.details.somearray.0.key    == "a_key"
+    //! Globals.details.somearray.0.base   == "a_key"
     //! Globals.details.somearray.0.name   == "First one"
-    //! Globals.details.somearray.1.key    == "b_key"
+    //! Globals.details.somearray.1.base   == "b_key"
     //! Globals.details.somearray.1.name   == "Second one"
     //!
     class TranslationAssetHandler
diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
index 1b01f7885d..01a661684a 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
@@ -30,16 +30,7 @@ namespace GraphCanvas
     void TranslationAssetWorker::Activate()
     {
         // Use AssetCatalog service to register ScriptCanvas asset type and extension
-        AZ::Data::AssetType assetType(azrtti_typeid<TranslationAsset>());
-        AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddAssetType, assetType);
-        AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, assetType);
-        AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension, TranslationAsset::GetFileFilter());
-
         m_assetHandler = AZStd::make_unique<TranslationAssetHandler>();
-        if (!AZ::Data::AssetManager::Instance().GetHandler(assetType))
-        {
-            AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType);
-        }
 
         AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusConnect(GetUUID());
     }
diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
index bb42f77c49..80e488f3dc 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
@@ -11,17 +11,6 @@
 
 namespace GraphCanvas
 {
-    namespace Schema
-    {
-        namespace Field
-        {
-            static constexpr char key[]     = "key";
-            static constexpr char context[] = "context";
-            static constexpr char variant[] = "variant";
-            static constexpr char entries[] = "entries";
-        }
-    }
-
     AZ_CLASS_ALLOCATOR_IMPL(TranslationFormatSerializer, AZ::SystemAllocator, 0);
 
     void AddEntryToDatabase(const AZStd::string& baseKey, const AZStd::string& name, const rapidjson::Value& it, TranslationFormat* translationFormat)
@@ -76,8 +65,7 @@ namespace GraphCanvas
             const rapidjson::Value& array = it;
             for (rapidjson::SizeType i = 0; i < array.Size(); ++i)
             {
-                // so, here, I need to go in and if there is a "key" member within the object, then I need to use that,
-                // if there isn't, I can use the %d
+                // if there is a "base" member within the object, then use it, otherwise use the index
                 if (array[i].IsObject())
                 {
                     if (array[i].HasMember(Schema::Field::key))
diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
index fa7e6e64e1..edf3b9013b 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h
@@ -23,4 +23,15 @@ namespace GraphCanvas
         AZ::JsonSerializationResult::Result Store(rapidjson::Value& outputValue, const void* inputValue,
             const void* defaultValue, const AZ::Uuid& valueTypeId, AZ::JsonSerializerContext& context) override;
     };
+
+    namespace Schema
+    {
+        namespace Field
+        {
+            inline constexpr char key[] = "base";
+            inline constexpr char context[] = "context";
+            inline constexpr char variant[] = "variant";
+            inline constexpr char entries[] = "entries";
+        }
+    }
 }
diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h
index 4e52218721..3fbd934909 100644
--- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h
+++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h
@@ -16,7 +16,6 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
 AZ_POP_DISABLE_WARNING
 
 #include <GraphCanvas/Styling/StyleHelper.h>
-#include <GraphCanvas/Types/TranslationTypes.h>
 
 namespace GraphCanvas
 {
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h
index 513400b470..d5b8a7ff57 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h
@@ -15,7 +15,6 @@
 #include <GraphCanvas/Editor/EditorTypes.h>
 #include <GraphCanvas/Types/EntitySaveData.h>
 #include <GraphCanvas/Types/GraphCanvasGraphSerialization.h>
-#include <GraphCanvas/Types/TranslationTypes.h>
 
 #include <GraphCanvas/Components/Slots/SlotBus.h>
 
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h
index 88846739d0..6470ebfbd1 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h
@@ -11,7 +11,6 @@
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/std/string/string.h>
 
-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <GraphCanvas/Components/StyleBus.h>
 
 #include <GraphCanvas/Types/SceneMemberComponentSaveData.h>
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h
index a3f8bfb757..8df36232fe 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h
@@ -16,7 +16,6 @@
 
 #include <GraphCanvas/Types/Endpoint.h>
 #include <GraphCanvas/Types/Types.h>
-#include <GraphCanvas/Types/TranslationTypes.h>
 
 class QGraphicsLayoutItem;
 
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h
deleted file mode 100644
index 7205be7c00..0000000000
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QCoreApplication>
-
-#include <AzCore/Serialization/SerializeContext.h>
-
-namespace GraphCanvas
-{
-    struct TranslationKeyedString
-    {
-    public:
-        AZ_TYPE_INFO(TranslationKeyedString, "{B796685C-0335-4E74-9EF8-A1933E8B2142}");
-        AZ_CLASS_ALLOCATOR(TranslationKeyedString, AZ::SystemAllocator, 0);
-
-        static void Reflect(AZ::ReflectContext* context)
-        {
-            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-            if (!serializeContext)
-            {
-                return;
-            }
-
-            serializeContext->Class<TranslationKeyedString>()
-                ->Version(1)
-                ->Field("Fallback", &TranslationKeyedString::m_fallback)
-                ->Field("Context", &TranslationKeyedString::m_context)
-                ->Field("Key", &TranslationKeyedString::m_key)
-                ;
-        }
-
-        TranslationKeyedString()
-            : m_dirtyText(true)
-        {
-        }
-
-        ~TranslationKeyedString() = default;
-
-        TranslationKeyedString(const AZStd::string& fallback, const AZStd::string& context = AZStd::string(), const AZStd::string& key = AZStd::string())
-            : m_fallback(fallback)
-            , m_context(context)
-            , m_key(key)
-            , m_dirtyText(true)
-        {
-        }
-
-        const AZStd::string GetDisplayString() const
-        {
-            if (m_dirtyText)
-            {
-                const_cast<TranslationKeyedString*>(this)->TranslateString();
-            }
-
-            return m_display;
-        }
-
-        void TranslateString()
-        {
-            m_display = m_fallback;
-
-            if (!m_context.empty() && !m_key.empty())
-            {
-                AZStd::string translatedText = QCoreApplication::translate(m_context.c_str(), m_key.c_str()).toUtf8().data();
-
-                if (translatedText != m_key)
-                {
-                    m_display = translatedText;
-                }
-            }
-
-            m_dirtyText = false;
-        }
-
-        bool empty() const
-        {
-            return m_fallback.empty() && (m_context.empty() || m_key.empty());
-        }
-
-        bool operator==(const TranslationKeyedString& other) const
-        {
-            return m_fallback == other.m_fallback
-                && m_context == other.m_context
-                && m_key == other.m_key
-                ;
-        }
-
-        void Clear()
-        {
-            m_key.clear();
-            m_context.clear();
-            m_fallback.clear();
-        }
-
-        void SetFallback(const AZStd::string& fallback)
-        {
-            m_fallback = fallback;
-            m_dirtyText = true;
-        }
-        
-        AZStd::string m_context;
-        AZStd::string m_key;
-        AZStd::string m_display;
-
-    private:
-        AZStd::string m_fallback;
-
-        bool m_dirtyText;
-    };
-}
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp
index a1e921684f..854918ac19 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.cpp
@@ -119,6 +119,11 @@ namespace GraphCanvas
         m_nodePalette->setProperty("HasNoWindowDecorations", true);
         m_nodePalette->SetupNodePalette(config);
 
+        if (m_userNodePaletteWidth > 0)
+        {
+            m_nodePalette->setFixedWidth(m_userNodePaletteWidth);
+        }
+
         QWidgetAction* actionWidget = new QWidgetAction(this);
         actionWidget->setDefaultWidget(m_nodePalette);
 
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h
index a942858f56..08ee8cecbf 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/EditorContextMenu.h
@@ -63,34 +63,34 @@ namespace GraphCanvas
         void ResetSourceSlotFilter();
         void FilterForSourceSlot(const GraphId& graphId, const AZ::EntityId& sourceSlotId);
 
-    protected slots:
+    protected Q_SLOTS:
         virtual void SetupDisplay();
         virtual void HandleContextMenuSelection();
 
     protected:
+
         virtual void OnRefreshActions(const GraphId& graphId, const AZ::EntityId& targetMemberId);
 
         void keyPressEvent(QKeyEvent* keyEvent) override;
 
-        NodePaletteWidget* m_nodePalette = nullptr;
-
-    private:
-    
         void ConstructMenu();
         void AddUnprocessedActions(AZStd::vector<QAction*>& actions);
     
-        bool m_finalized;
-        bool m_isToolBarMenu;
+        NodePaletteWidget* m_nodePalette = nullptr;
+
+        bool    m_finalized;
+        bool    m_isToolBarMenu;
+        AZ::u32   m_userNodePaletteWidth = 300;
 
         EditorId                                m_editorId;
 
-        AZStd::vector< ActionGroupId >          m_actionGroupOrdering;
-        AZStd::unordered_set< ActionGroupId >   m_actionGroups;
+        AZStd::vector<ActionGroupId>          m_actionGroupOrdering;
+        AZStd::unordered_set<ActionGroupId>   m_actionGroups;
 
         AZStd::vector<QAction*> m_unprocessedFrontActions;
         AZStd::vector<QAction*> m_unprocessedActions;
         AZStd::vector<QAction*> m_unprocessedBackActions;
 
-        AZStd::unordered_map< AZStd::string, QMenu* > m_subMenuMap;
+        AZStd::unordered_map<AZStd::string, QMenu*> m_subMenuMap;
     };
 }
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp
index cbdfbfcf0c..bce17c6348 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp
@@ -9,6 +9,10 @@
 
 #include <GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h>
 
+AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
+#include <QIcon>
+AZ_POP_DISABLE_WARNING
+
 namespace GraphCanvas
 {
     ////////////////////////
@@ -19,7 +23,6 @@ namespace GraphCanvas
 
     NodePaletteTreeItem::NodePaletteTreeItem(AZStd::string_view name, EditorId editorId)
         : GraphCanvas::GraphCanvasTreeItem()
-        , m_errorIcon(":/GraphCanvasEditorResources/toast_error_icon.png")
         , m_editorId(editorId)
         , m_name(QString::fromUtf8(name.data(), static_cast<int>(name.size())))
         , m_selected(false)
@@ -88,7 +91,7 @@ namespace GraphCanvas
             case Qt::DecorationRole:
                 if (HasError())
                 {
-                    return m_errorIcon;
+                    return QIcon(":/GraphCanvasEditorResources/toast_error_icon.png");
                 }
                 break;
             default:
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h
index 3dad6fed0a..4259caf69b 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h
@@ -9,10 +9,6 @@
 
 #include <AzCore/PlatformIncl.h>
 
-AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
-#include <QIcon>
-AZ_POP_DISABLE_WARNING
-
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/string/string_view.h>
@@ -117,7 +113,6 @@ namespace GraphCanvas
     private:
 
         // Error Display
-        QIcon m_errorIcon;
         QString m_errorString;
 
         AZStd::string m_styleOverride;
diff --git a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
index b62ff303a6..455b5673d3 100644
--- a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
+++ b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
@@ -102,8 +102,7 @@ set(FILES
     StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h
     StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp
     StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h
-    StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h
-    StaticLib/GraphCanvas/Types/TranslationTypes.h
+    StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h    
     StaticLib/GraphCanvas/Types/Types.h
     StaticLib/GraphCanvas/Types/QtMetaTypes.h
     StaticLib/GraphCanvas/Widgets/Resources/default_style.json
diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h
index 15f308c4d2..99a32d965b 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h
@@ -33,7 +33,7 @@ namespace GraphModelIntegration
 
         //! Constructor
         //! \param nodeName Name of the node that will show up in the Palette
-        //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0xa6d1a85a))
+        //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0x0a1dff96))
         //! \param dataType The type of data that the InputGraphNode or OutputGraphNode will represent
         InputOutputNodePaletteItem(AZStd::string_view nodeName, GraphCanvas::EditorId editorId, GraphModel::DataTypePtr dataType)
             : DraggableNodePaletteTreeItem(nodeName, editorId)
diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h
index a0121ac035..51e1fca55b 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h
@@ -95,7 +95,7 @@ namespace GraphModelIntegration
         AZ_CLASS_ALLOCATOR(ModuleNodePaletteItem, AZ::SystemAllocator, 0);
 
         //! Constructor
-        //! \param editorId        Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0xa6d1a85a))
+        //! \param editorId        Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0x0a1dff96))
         //! \param sourceFileId    The unique id for the module node graph source file.
         //! \param sourceFilePath  The path to the module node graph source file. This will be used for node naming and debug output.
         ModuleNodePaletteItem(GraphCanvas::EditorId editorId, AZ::Uuid sourceFileId, AZStd::string_view sourceFilePath)
diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h
index 5d2914d7ad..e38e3b7478 100644
--- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h
+++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h
@@ -34,7 +34,7 @@ namespace GraphModelIntegration
 
         //! Constructor
         //! \param nodeName Name of the node that will show up in the Palette
-        //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0xa6d1a85a))
+        //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0x0a1dff96))
         StandardNodePaletteItem(AZStd::string_view nodeName, GraphCanvas::EditorId editorId)
             : DraggableNodePaletteTreeItem(nodeName, editorId)
         {
diff --git a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h
index b4428ef559..1b8c47b0ff 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestParameters.h
@@ -12,21 +12,35 @@
 
 namespace HttpRequestor
 {
-    /*
-    **
-    **  The Parameters needed to make a HTTP call and then receive the
-    **  returned JSON in a meaningful place. Examples of use are in the
-    **  HttpRequestCaller class.
-    **
-    */
-
+    //! Models the parameters needed to make a HTTP call and then receive the
+    //! returned JSON in a meaningful place. Examples of use are in the HttpRequestCaller class.
     class Parameters
     {
     public:
-        // Initializing ctor
+        // Ctors
+
+        //! @param URI A universal resource indicator representing an endpoint.
+        //! @param method The HTTP method to use, for example HTTP_GET.
+        //! @param callback The callback method to receive a HTTP call's response.
         Parameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Callback& callback);
+
+        //! @param URI A universal resource indicator representing an endpoint.
+        //! @param method The HTTP method to use, for example HTTP_GET.
+        //! @param headers A map of header names and values to use.
+        //! @param callback The callback method to receive a HTTP call's response.
         Parameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const Callback& callback);
-        Parameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const AZStd::string& body, const Callback& callback);
+
+        //! @param URI A universal resource indicator representing an endpoint.
+        //! @param method The HTTP method to use, for example HTTP_POST.
+        //! @param headers A map of header names and values to use.
+        //! @param body An data to associate with an HTTP call.
+        //! @param callback The callback method to receive a HTTP call's response.
+        Parameters(
+            const AZStd::string& URI,
+            Aws::Http::HttpMethod method,
+            const Headers& headers,
+            const AZStd::string& body,
+            const Callback& callback);
 
         // Defaults
         virtual ~Parameters() = default;
@@ -36,30 +50,49 @@ namespace HttpRequestor
         Parameters(Parameters&&) = default;
         Parameters& operator=(Parameters&&) = default;
 
-        //returns the URI in string form as an recipient of the HTTP connection
-        const Aws::String& GetURI() const { return m_URI; }
+        //! Get the URI in string form as an recipient of the HTTP connection.
+        const Aws::String& GetURI() const
+        {
+            return m_URI;
+        }
 
-        //returns the method of which the HTTP request will take. GET, POST, DELETE, PUT, or HEAD
-        Aws::Http::HttpMethod GetMethod() const { return m_method; }
+        //! Get the HTTP method configured to use for a request.
+        Aws::Http::HttpMethod GetMethod() const
+        {
+            return m_method;
+        }
 
-        //returns the list of extra headers to include in the request
-        const Headers & GetHeaders() const { return m_headers; }
+        //! Get the list of extra headers to send as part of a request.
+        //! @return A map of header-value pairs.
+        const Headers& GetHeaders() const
+        {
+            return m_headers;
+        }
 
-        //returns the stream for the body of the request
-        const std::shared_ptr<std::stringstream> & GetBodyStream() const { return m_bodyStream; }
+        //! Get an input stream that can be used to send the body of a request.
+        //! @return A string stream representing a request body.
+        const std::shared_ptr<std::stringstream>& GetBodyStream() const
+        {
+            return m_bodyStream;
+        }
 
-        //returns the function of which to feed back the JSON that the HTTP call resulted in. The function also requires the HTTPResponseCode indicating if the call was successful or failed
-        const Callback & GetCallback() const { return m_callback; }
+        //! Get the callback function for processing JSON returned in an HTTP response.
+        //! Callback functions are responsible for correctly interpreting the HTTP response code, and should communicate any
+        //! failures.
+        //! @return The callback function to process endpoint responses with.
+        const Callback& GetCallback() const
+        {
+            return m_callback;
+        }
 
     private:
-        Aws::String                             m_URI;
-        Aws::Http::HttpMethod                   m_method;
-        Headers                                 m_headers;
-        std::shared_ptr<std::stringstream>      m_bodyStream;   // required by Aws::Http::HttpRequest
-        Callback                                m_callback;
+        Aws::String m_URI;
+        Aws::Http::HttpMethod m_method;
+        Headers m_headers;
+        std::shared_ptr<std::stringstream> m_bodyStream; // required by Aws::Http::HttpRequest
+        Callback m_callback;
     };
 
-
     inline Parameters::Parameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Callback& callback)
         : m_URI(URI.c_str())
         , m_method(method)
@@ -75,7 +108,8 @@ namespace HttpRequestor
     {
     }
 
-    inline Parameters::Parameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const AZStd::string& body, const Callback& callback)
+    inline Parameters::Parameters(
+        const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const AZStd::string& body, const Callback& callback)
         : m_URI(URI.c_str())
         , m_method(method)
         , m_headers(headers)
@@ -83,6 +117,5 @@ namespace HttpRequestor
         , m_callback(callback)
     {
     }
-
 }
 
diff --git a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h
index 5ede4109bb..39cad2c720 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpRequestorBus.h
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
@@ -13,24 +12,70 @@
 
 namespace HttpRequestor
 {
-    class HttpRequestorRequests
-        : public AZ::EBusTraits
+    //! Defines request APIs for Gem. Supports making HTTP requests.
+    //! See [HTTP RFC](https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html) for expectations around methods, headers, and body.
+    class HttpRequestorRequests : public AZ::EBusTraits
     {
-
     public:
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
         static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
 
-        // Public functions
+        //! Make a RESTful call to a HTTP(s) endpoint. Receive the response, via the supplied callback as JSON.
+        //! @param URI The universal resource indicator representing the endpoint to make the request to.
+        //! @param method The HTTP method to use, for example HTTP_GET.
+        //! @param callback The callback method to receive the JSON response object.
         virtual void AddRequest(const AZStd::string& URI, Aws::Http::HttpMethod method, const Callback& callback) = 0;
-        virtual void AddRequestWithHeaders(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers & headers, const Callback& callback) = 0;
-        virtual void AddRequestWithHeadersAndBody(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers & headers, const AZStd::string& body, const Callback& callback) = 0;
-        
+
+        //! Make a RESTful call to a HTTP(s) endpoint with customized headers. Receive the response, via the supplied callback as JSON.
+        //! @param URI The universal resource indicator representing the endpoint to make the request to.
+        //! @param method The HTTP method to use, for example HTTP_GET.
+        //! @param headers A map of header names and values to set on the request.
+        //! @param callback The callback method to receive the JSON response object.
+        virtual void AddRequestWithHeaders(
+            const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const Callback& callback) = 0;
+
+        //! Make a RESTful call to a HTTP(s) endpoint with customized headers and a body. Receive the response, via the supplied callback as JSON.
+        //! @param URI The universal resource indicator representing the endpoint to make the request to.
+        //! @param method The HTTP method to use, for example HTTP_POST.
+        //! @param headers A map of header names and values to set on the request.
+        //! @param body Any HTTP request data to include in the request. Use Content-Type and Content-Length headers to specify the nature
+        //! of the body payload.
+        //! @param callback The callback method to receive the JSON response object.
+        virtual void AddRequestWithHeadersAndBody(
+            const AZStd::string& URI,
+            Aws::Http::HttpMethod method,
+            const Headers& headers,
+            const AZStd::string& body,
+            const Callback& callback) = 0;
+
+        //! Make a RESTful call to a HTTP(s) endpoint. Receive the response, via the supplied callback as text.
+        //! @param URI The universal resource indicator representing the endpoint to make the request to.
+        //! @param method The http method to use, for example HTTP_GET.
+        //! @param callback The callback method to receive the JSON response object.
         virtual void AddTextRequest(const AZStd::string& URI, Aws::Http::HttpMethod method, const TextCallback& callback) = 0;
-        virtual void AddTextRequestWithHeaders(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers & headers, const TextCallback& callback) = 0;
-        virtual void AddTextRequestWithHeadersAndBody(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers & headers, const AZStd::string& body, const TextCallback& callback) = 0;
+
+        //! Make a RESTful call to a HTTP(s) endpoint with customized headers. Receive the response, via the supplied callback as text.
+        //! @param URI The universal resource indicator representing the endpoint to make the request to.
+        //! @param method The HTTP method to use, for example HTTP_GET.
+        //! @param headers A map of header names and values to set on the request.
+        //! @param callback The callback method to receive the JSON response object.
+        virtual void AddTextRequestWithHeaders(
+            const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const TextCallback& callback) = 0;
+
+        //! Make a RESTful call to a HTTP(s) endpoint with customized headers and a body. Receive the response, via the supplied callback as text.
+        //! @param URI The universal resource indicator representing the endpoint to make the request to.
+        //! @param method The HTTP method to use, for example HTTP_POST.
+        //! @param headers A map of header names and values to set on the request.
+        //! @param body Any HTTP request data to include in the request. Use Content-Type and Content-Length headers to specify the nature of the body payload.
+        //! @param callback The callback method to receive the JSON response object.
+        virtual void AddTextRequestWithHeadersAndBody(
+            const AZStd::string& URI,
+            Aws::Http::HttpMethod method,
+            const Headers& headers,
+            const AZStd::string& body,
+            const TextCallback& callback) = 0;
     };
 
     using HttpRequestorRequestBus = AZ::EBus<HttpRequestorRequests>;
-} // namespace HttpRequestor
 
+} // namespace HttpRequestor
diff --git a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h
index 97c9150f42..0eafdad866 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTextRequestParameters.h
@@ -11,20 +11,35 @@
 
 namespace HttpRequestor
 {
-    /*
-    **
-    **  The Parameters needed to make a HTTP call and then receive the
-    **  returned TEXT from the web request without parsing it.
-    **
-    */
-
+    //! Models the parameters needed to make a HTTP call and then receive the
+    //! returned TEXT from the web request without parsing it.
     class TextParameters
     {
     public:
         // Initializing ctor
+
+        //! @param URI A universal resource indicator representing an endpoint.
+        //! @param method The HTTP method to configure.
+        //! @param callback The callback method to receive a HTTP call's response.
         TextParameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const TextCallback& callback);
+
+        //! @param URI A universal resource indicator representing an endpoint.
+        //! @param method The HTTP method to configure.
+        //! @param headers A map of header names and values to use.
+        //! @param callback The callback method to receive a HTTP call's response.
         TextParameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const TextCallback& callback);
-        TextParameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const AZStd::string& body, const TextCallback& callback);
+
+        //! @param URI A universal resource indicator representing an endpoint.
+        //! @param method The HTTP method to configure.
+        //! @param headers A map of header names and values to use.
+        //! @param body An data to associate with an HTTP call.
+        //! @param callback The callback method to receive a HTTP call's response.
+        TextParameters(
+            const AZStd::string& URI,
+            Aws::Http::HttpMethod method,
+            const Headers& headers,
+            const AZStd::string& body,
+            const TextCallback& callback);
 
         // Defaults
         ~TextParameters() = default;
@@ -34,29 +49,49 @@ namespace HttpRequestor
         TextParameters(TextParameters&&) = default;
         TextParameters& operator=(TextParameters&&) = default;
 
-        //returns the URI in string form as an recipient of the HTTP connection
-        const Aws::String& GetURI() const { return m_URI; }
+        //! Get the URI in string form as an recipient of the HTTP connection.
+        const Aws::String& GetURI() const
+        {
+            return m_URI;
+        }
 
-        //returns the method of which the HTTP request will take. GET, POST, DELETE, PUT, or HEAD
-        Aws::Http::HttpMethod GetMethod() const { return m_method; }
+        //! Get the HTTP method configured to use for a request.
+        Aws::Http::HttpMethod GetMethod() const
+        {
+            return m_method;
+        }
 
-        //returns the list of extra headers to include in the request
-        const Headers & GetHeaders() const { return m_headers; }
+        //! Get the list of extra headers to send as part of a request.
+        //! @return A map of header-value pairs.
+        const Headers& GetHeaders() const
+        {
+            return m_headers;
+        }
 
-        //returns the stream for the body of the request
-        const std::shared_ptr<std::stringstream> & GetBodyStream() const { return m_bodyStream; }
+        //! Get an input stream that can be used to send the body of a request.
+        //! @return A string stream representing a request body.
+        const std::shared_ptr<std::stringstream>& GetBodyStream() const
+        {
+            return m_bodyStream;
+        }
 
-        //returns the function of which to feed back the TEXT that the HTTP call resulted in. The function also requires the HTTPResponseCode indicating if the call was successful or failed
-        const TextCallback & GetCallback() const { return m_callback; }
+        //! Get the callback function for processing text returned in an HTTP response.
+        //! Callback functions are responsible for correctly interpreting the HTTP response code, and should communicate any
+        //! failures.
+        //! @return The callback function to process endpoint responses with.
+        const TextCallback& GetCallback() const
+        {
+            return m_callback;
+        }
 
     private:
-        Aws::String                             m_URI;
-        Aws::Http::HttpMethod                   m_method;
-        Headers                                 m_headers;
-        std::shared_ptr<std::stringstream>      m_bodyStream;
-        TextCallback                            m_callback;
+        Aws::String m_URI;
+        Aws::Http::HttpMethod m_method;
+        Headers m_headers;
+        std::shared_ptr<std::stringstream> m_bodyStream;
+        TextCallback m_callback;
     };
-    
+
     inline TextParameters::TextParameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const TextCallback& callback)
         : m_URI(URI.c_str())
         , m_method(method)
@@ -64,7 +99,8 @@ namespace HttpRequestor
     {
     }
 
-    inline TextParameters::TextParameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const TextCallback& callback)
+    inline TextParameters::TextParameters(
+        const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const TextCallback& callback)
         : m_URI(URI.c_str())
         , m_method(method)
         , m_headers(headers)
@@ -72,12 +108,17 @@ namespace HttpRequestor
     {
     }
 
-    inline TextParameters::TextParameters(const AZStd::string& URI, Aws::Http::HttpMethod method, const Headers& headers, const AZStd::string& body, const TextCallback& callback)
+    inline TextParameters::TextParameters(
+        const AZStd::string& URI,
+        Aws::Http::HttpMethod method,
+        const Headers& headers,
+        const AZStd::string& body,
+        const TextCallback& callback)
         : m_URI(URI.c_str())
         , m_method(method)
         , m_headers(headers)
-        , m_bodyStream( std::make_shared<std::stringstream>(body.c_str()) )
+        , m_bodyStream(std::make_shared<std::stringstream>(body.c_str()))
         , m_callback(callback)
     {
     }
-}
+} // namespace HttpRequestor
diff --git a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h
index a13f2f5645..42efa169dd 100644
--- a/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h
+++ b/Gems/HttpRequestor/Code/Include/HttpRequestor/HttpTypes.h
@@ -23,20 +23,16 @@ AZ_POP_DISABLE_WARNING
 
 namespace HttpRequestor
 {
-    //
-    // the call back function for http requests.
-    //
+    // A callback function for processing JSON return values from an HTTP request. This callback is responsible for correctly interpreting
+    // the HTTP response code and setting any internal information from the returned JSON object.
     using Callback = AZStd::function<void(const Aws::Utils::Json::JsonView&, Aws::Http::HttpResponseCode)>;
 
-    
-    //
-    // the call back function for any http text requests.
-    //
+    // A callback function for processing HTTP response as raw text. This callback is responsible for correctly interpreting the HTTP
+    // response code and setting any internal information from the returned data. If the data includes a JSON fragment, the callback is
+    // responsible for parsing it.
     using TextCallback = AZStd::function<void(const AZStd::string&, Aws::Http::HttpResponseCode)>;
 
-
-    //
-    // a map of REST headers.
-    //
+    // A map of REST headers.
     using Headers = AZStd::map<AZStd::string, AZStd::string>;
-}
+
+} // namespace HttpRequestor
diff --git a/Gems/ImGui/Code/Source/ImGuiManager.cpp b/Gems/ImGui/Code/Source/ImGuiManager.cpp
index d631e2f83e..f90aa60a88 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.cpp
+++ b/Gems/ImGui/Code/Source/ImGuiManager.cpp
@@ -16,6 +16,7 @@
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/std/containers/fixed_unordered_map.h>
+#include <AzCore/Time/ITime.h>
 #include <AzFramework/Input/Buses/Requests/InputTextEntryRequestBus.h>
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
@@ -23,7 +24,6 @@
 #include <AzFramework/Input/Devices/Touch/InputDeviceTouch.h>
 #include <AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard.h>
 #include <IConsole.h>
-#include <ITimer.h>
 #include <imgui/imgui_internal.h>
 #include <sstream>
 #include <string>
@@ -172,7 +172,6 @@ void ImGuiManager::Initialize()
 
     // Broadcast ImGui Ready to Listeners
     ImGuiUpdateListenerBus::Broadcast(&IImGuiUpdateListener::OnImGuiInitialize);
-    m_currentControllerIndex = -1;
     m_button1Pressed = m_button2Pressed = false;
     m_menuBarStatusChanged = false;
 
@@ -227,6 +226,7 @@ void ImGui::ImGuiManager::RestoreRenderWindowSizeToDefault()
 
 void ImGui::ImGuiManager::SetDpiScalingFactor(float dpiScalingFactor)
 {
+    ImGui::ImGuiContextScope contextScope(m_imguiContext);
     ImGuiIO& io = ImGui::GetIO();
     // Set the global font scale to size our UI to the scaling factor
     // Note: Currently we use the default, 13px fixed-size IMGUI font, so this can get somewhat blurry
@@ -235,6 +235,7 @@ void ImGui::ImGuiManager::SetDpiScalingFactor(float dpiScalingFactor)
 
 float ImGui::ImGuiManager::GetDpiScalingFactor() const
 {
+    ImGui::ImGuiContextScope contextScope(m_imguiContext);
     ImGuiIO& io = ImGui::GetIO();
     return io.FontGlobalScale;
 }
@@ -333,7 +334,8 @@ void ImGuiManager::Render()
     }
 
     // Advance ImGui by Elapsed Frame Time
-    io.DeltaTime = gEnv->pTimer->GetFrameTime();
+    const AZ::TimeUs gameTickTimeUs = AZ::GetSimulationTickDeltaTimeUs();
+    io.DeltaTime = AZ::TimeUsToSeconds(gameTickTimeUs);
     //// END FROM PREUPDATE
 
     AZ::u32 backBufferWidth = m_windowSize.m_width;
@@ -405,7 +407,7 @@ bool ImGuiManager::OnInputChannelEventFiltered(const InputChannel& inputChannel)
         // Cycle through ImGui Menu Bar States on Home button press
         if (inputChannelId == InputDeviceKeyboard::Key::NavigationHome)
         {
-            ToggleThroughImGuiVisibleState(-1);
+            ToggleThroughImGuiVisibleState();
         }
 
         // Cycle through Standalone Editor Window States
@@ -452,19 +454,10 @@ bool ImGuiManager::OnInputChannelEventFiltered(const InputChannel& inputChannel)
     }
 
     // Handle Controller Inputs
-    int inputControllerIndex = -1;
-    bool controllerInput = false;
     if (InputDeviceGamepad::IsGamepadDevice(inputDeviceId))
     {
-        inputControllerIndex = inputDeviceId.GetIndex();
-        controllerInput = true;
-    }
-
-    
-    if (controllerInput)
-    {
-        // Only pipe in Controller Nav Inputs if we are the current Controller Index and at least 1 of the two controller modes are enabled.
-        if (m_currentControllerIndex == inputControllerIndex && m_controllerModeFlags)
+        // Only pipe in Controller Nav Inputs when at least 1 of the two controller modes are enabled.
+        if (m_controllerModeFlags)
         {
             const auto lyButtonToImGuiNav = s_lyInputToImGuiNavIndexMap.find(inputChannelId);
             if (lyButtonToImGuiNav != s_lyInputToImGuiNavIndexMap.end())
@@ -475,7 +468,7 @@ bool ImGuiManager::OnInputChannelEventFiltered(const InputChannel& inputChannel)
         }
 
         //Switch menu bar display only if two buttons are pressed at the same time
-        if (inputChannelId == InputDeviceGamepad::Button::L3)
+        if (inputChannelId == InputDeviceGamepad::Button::L1)
         {
             if (inputChannel.IsStateBegan())
             {
@@ -487,7 +480,7 @@ bool ImGuiManager::OnInputChannelEventFiltered(const InputChannel& inputChannel)
                 m_menuBarStatusChanged = false;
             }
         }
-        if (inputChannelId == InputDeviceGamepad::Button::R3)
+        if (inputChannelId == InputDeviceGamepad::Button::R1)
         {
             if (inputChannel.IsStateBegan())
             {
@@ -501,7 +494,7 @@ bool ImGuiManager::OnInputChannelEventFiltered(const InputChannel& inputChannel)
         }
         if (!m_menuBarStatusChanged && m_button1Pressed && m_button2Pressed)
         {
-            ToggleThroughImGuiVisibleState(inputControllerIndex);
+            ToggleThroughImGuiVisibleState();
         }
 
         // If we have the Discrete Input Mode Enabled.. and we are in the Visible State, then consume input here
@@ -626,14 +619,13 @@ bool ImGuiManager::OnInputTextEventFiltered(const AZStd::string& textUTF8)
     return io.WantTextInput && m_clientMenuBarState == DisplayState::Visible;;
 }
 
-void ImGuiManager::ToggleThroughImGuiVisibleState(int controllerIndex)
+void ImGuiManager::ToggleThroughImGuiVisibleState()
 {
     ImGui::ImGuiContextScope contextScope(m_imguiContext);
 
     switch (m_clientMenuBarState)
     {
         case DisplayState::Hidden:
-            m_currentControllerIndex = controllerIndex;
             m_clientMenuBarState = DisplayState::Visible;
             
             // Draw the ImGui Mouse cursor if either the hardware mouse is connected, or the controller mouse is enabled.
@@ -668,7 +660,6 @@ void ImGuiManager::ToggleThroughImGuiVisibleState(int controllerIndex)
 
         default:
             m_clientMenuBarState = DisplayState::Hidden;
-            m_currentControllerIndex = -1;
 
             // Enable system cursor if it's in editor and it's not editor game mode
             if (gEnv->IsEditor() && !gEnv->IsEditorGameMode())
@@ -685,12 +676,6 @@ void ImGuiManager::ToggleThroughImGuiVisibleState(int controllerIndex)
     m_setEnabledEvent.Signal(m_clientMenuBarState == DisplayState::Hidden);
 }
 
-void ImGuiManager::ToggleThroughImGuiVisibleState()
-{
-    ToggleThroughImGuiVisibleState(-1);
-}
-
-
 void ImGuiManager::RenderImGuiBuffers(const ImVec2& scaleRects)
 {
     ImGui::ImGuiContextScope contextScope(m_imguiContext);
diff --git a/Gems/ImGui/Code/Source/ImGuiManager.h b/Gems/ImGui/Code/Source/ImGuiManager.h
index c4fa5169f7..c0071c94c5 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.h
+++ b/Gems/ImGui/Code/Source/ImGuiManager.h
@@ -76,9 +76,6 @@ namespace ImGui
         // Sets up initial window size and listens for changes
         void InitWindowSize();
 
-        // A function to toggle through the available ImGui Visibility States
-        void ToggleThroughImGuiVisibleState(int controllerIndex);
-
     private:
         ImGuiContext* m_imguiContext = nullptr;
         DisplayState m_clientMenuBarState = DisplayState::Hidden;
@@ -96,8 +93,6 @@ namespace ImGui
         std::vector<uint16> m_idxBuffer;
 
         //Controller navigation
-        static const int MaxControllerNumber = 4;
-        int m_currentControllerIndex;
         bool m_button1Pressed, m_button2Pressed, m_menuBarStatusChanged;
 
         bool m_hardwardeMouseConnected = false;
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
index 055537a8bb..0d8a3e0edd 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp
@@ -15,9 +15,7 @@
 #include <AzFramework/Entity/GameEntityContextBus.h>
 #include <AzCore/std/sort.h>
 #include <AzCore/std/string/conversions.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
 #include <IRenderAuxGeom.h>
-#include <IViewSystem.h>
 #include <IConsole.h>
 
 #include "ImGuiColorDefines.h"
@@ -138,7 +136,7 @@ namespace ImGui
 
     void ImGuiLYAssetExplorer::MeshInstanceList_CheckEntityFilter()
     {
-        // Iterate through All Meshes.. 
+        // Iterate through All Meshes..
         for (MeshInstanceDisplayList& meshInstanceList : m_meshInstanceDisplayList)
         {
             // .. reset this flag to see if any child instances pass the name filter
@@ -160,7 +158,7 @@ namespace ImGui
         // Primary on / off Switch
         ImGui::Checkbox("Mesh Debug Enabled", &m_meshDebugEnabled);
         ImGui::SameLine();
-        
+
         // Lod Debug Switch, check for changes so we can do things once at change time
         bool lodDebug = m_lodDebugEnabled;
         ImGui::Checkbox("LOD Debug", &lodDebug);
@@ -177,12 +175,12 @@ namespace ImGui
             }
         }
 
-        // If the Lod Debug is Enabled. Draw a small legend that 
+        // If the Lod Debug is Enabled. Draw a small legend that
         if (m_lodDebugEnabled)
         {
             ImGui::BeginChild("lodDebugLegend", ImVec2(0.0f, 57.0f), true);
 
-            // Text for legend. 
+            // Text for legend.
             ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, "Lod Color Legend:");
             ImGui::SameLine();
             ImGui::TextColored(s_lodColor_0, "0 ");
@@ -196,7 +194,7 @@ namespace ImGui
             ImGui::TextColored(s_lodColor_4, "4 ");
             ImGui::SameLine();
             ImGui::TextColored(s_lodColor_5, "5 ");
-            
+
             // Small boxes of each color to help with the legend
             static float s_boxSize = 21.0f;
             ImVec2 graphUpLeft(ImGui::GetWindowPos().x + 127.5f, ImGui::GetWindowPos().y + 26.0f);
@@ -229,7 +227,7 @@ namespace ImGui
                 ImVec2(graphUpLeft.x + (5 * s_boxSize), graphUpLeft.y),
                 ImVec2(graphUpLeft.x + (6 * s_boxSize), graphUpLeft.y + s_boxSize),
                 ImGui::ColorConvertFloat4ToU32(s_lodColor_5), 2.0f);
-            
+
             ImGui::EndChild();
         }
 
@@ -382,7 +380,7 @@ namespace ImGui
                     ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, " * Mesh Selection overrides Entity Selection.");
                     ImGui::EndTooltip();
                 }
-                
+
                 ImGui::TextColored(ImGui::IsWindowHovered() ? ImGui::Colors::s_NiceLabelColor : ImGui::Colors::s_PlainLabelColor, "Mouse Over For Legend and Tips");
                 ImGui::EndChild(); // MouseHover Child
                 ImGui::NextColumn();
@@ -405,7 +403,7 @@ namespace ImGui
 
                 // Before we draw all these meshes, lets mark this frame as no Mouse Over being drawn.. if any are drawn, they will set this flag
                 m_anyMousedOverForDraw = false;
-                
+
                 if (m_selectionFilter)
                 {
                     ImGui::Columns(2);
@@ -444,8 +442,8 @@ namespace ImGui
                             // Keep Count of our Mesh instances and loop through them drawing them!
                             int instanceCount = 0;
                             for (auto& meshInstance : meshInstanceList.m_instanceOptionMap)
-                            {   
-                                // See if we should 
+                            {
+                                // See if we should
                                 bool displayEntity = true;
                                 if (m_entityNameFilter)
                                 {
@@ -472,11 +470,11 @@ namespace ImGui
                                     ImGui::SameLine();
                                     ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "(% .02f, % .02f, % .02f)", (float)worldPos.GetX(), (float)worldPos.GetY(), (float)worldPos.GetZ());
                                     ImGui::EndGroup();
-                                
+
                                     // Check for and Draw Entity Instance Mouse Over
                                     meshInstance.second.m_mousedOverForDraw = false;
                                     ImGuiUpdate_DrawEntityInstanceMouseOver(meshInstanceList, meshInstance.first, entityName, meshInstance.second);
-                                
+
 
                                     if (m_selectionFilter)
                                     {
@@ -490,7 +488,7 @@ namespace ImGui
 
                             ImGui::TreePop(); // End Mesh Tree
                         }
-                        else 
+                        else
                         {
                             ImGuiUpdate_DrawMeshMouseOver(meshInstanceList);
 
@@ -559,7 +557,7 @@ namespace ImGui
             ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, "Entity: ");
             ImGui::SameLine();
             ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "%s %s", entityInstance.ToString().c_str(), entityName.c_str());
-            
+
             ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, "Mesh: ");
             ImGui::SameLine();
             ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "%s", meshDisplayList.m_meshPath.c_str());
@@ -590,7 +588,7 @@ namespace ImGui
             }
         }
 
-        // Not found, so create a new entry.. 
+        // Not found, so create a new entry..
         MeshInstanceDisplayList meshList;
         meshList.m_meshPath = meshName;
         meshList.m_passesFilter = true;
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
index d2f86a65cd..ecc97682de 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
@@ -44,11 +44,15 @@ namespace ImGui
         m_assetExplorer.Initialize();
         m_cameraMonitor.Initialize();
         m_entityOutliner.Initialize();
+
+        m_deltaTimeHistogram.Init("onTick Delta Time (Milliseconds)", 250, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f, 60.0f);
+        AZ::TickBus::Handler::BusConnect();
     }
 
     void ImGuiLYCommonMenu::Shutdown()
     {
         // Disconnect EBusses
+        AZ::TickBus::Handler::BusDisconnect();
         ImGuiUpdateListenerBus::Handler::BusDisconnect();
 
         // shutdown sub menu objects
@@ -187,6 +191,10 @@ namespace ImGui
             // Main Open 3D Engine menu
             if (ImGui::BeginMenu("O3DE"))
             {
+                if (ImGui::MenuItem("Delta Time Graph"))
+                {
+                    m_showDeltaTimeGraphs = !m_showDeltaTimeGraphs;
+                }
                 // Asset Explorer
                 if (ImGui::MenuItem("Asset Explorer"))
                 {
@@ -628,6 +636,17 @@ namespace ImGui
         m_assetExplorer.ImGuiUpdate();
         m_cameraMonitor.ImGuiUpdate();
         m_entityOutliner.ImGuiUpdate();
+        if (m_showDeltaTimeGraphs)
+        {
+            ImGui::SetNextWindowSize({ 500, 200 }, ImGuiCond_Once);
+            if (ImGui::Begin(
+                    "Delta Time Graphs", &m_showDeltaTimeGraphs,
+                    ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_HorizontalScrollbar | ImGuiWindowFlags_NoSavedSettings))
+            {
+                m_deltaTimeHistogram.Draw(ImGui::GetColumnWidth(), 100.0f);
+            }
+            ImGui::End();
+        }
     }
 
     void ImGuiLYCommonMenu::OnImGuiUpdate_DrawControllerLegend()
@@ -754,7 +773,6 @@ namespace ImGui
 
         // Set the timer and connect to tick bus to count down.
         m_telemetryCaptureTimeRemaining = m_telemetryCaptureTime;
-        AZ::TickBus::Handler::BusConnect();
 
         // Get the current ImGui Display state to restore it later.
         ImGuiManagerBus::BroadcastResult(m_telemetryCapturePreCaptureState, &IImGuiManager::GetClientMenuBarState);
@@ -774,16 +792,20 @@ namespace ImGui
 
         // Reset timer and disconnect tick bus
         m_telemetryCaptureTimeRemaining = 0.0f;
-        AZ::TickBus::Handler::BusDisconnect();
     }
 
     // OnTick just used for telemetry captures.
     void ImGuiLYCommonMenu::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
     {
-        m_telemetryCaptureTimeRemaining -= deltaTime;
-        if (m_telemetryCaptureTimeRemaining <= 0.0f)
+        m_deltaTimeHistogram.PushValue(deltaTime*1000.0f); // convert to milliseconds
+
+        if (m_telemetryCaptureTimeRemaining > 0.0f)
         {
-            StopTelemetryCapture();
+            m_telemetryCaptureTimeRemaining -= deltaTime;
+            if (m_telemetryCaptureTimeRemaining <= 0.0f)
+            {
+                StopTelemetryCapture();
+            }
         }
     }
 } // namespace ImGui
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h
index fae892b4a2..a63d2fd844 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.h
@@ -50,6 +50,8 @@ namespace ImGui
         ImGuiLYAssetExplorer m_assetExplorer;
         ImGuiLYCameraMonitor m_cameraMonitor;
         ImGuiLYEntityOutliner m_entityOutliner;
+        bool m_showDeltaTimeGraphs = false;
+        ImGui::LYImGuiUtils::HistogramContainer m_deltaTimeHistogram;
     };
 }
 
diff --git a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
index 4574b938f6..e58ea77373 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
@@ -21,6 +21,7 @@
 #include <AzToolsFramework/Commands/EntityStateCommand.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.h>
 #include <AzToolsFramework/ToolsComponents/EditorDisabledCompositionBus.h>
 #include <AzToolsFramework/ToolsComponents/EditorPendingCompositionBus.h>
@@ -103,6 +104,8 @@
 #include <Editor/Nodes/UI/GradientPreviewThumbnailItem.h>
 #include <EditorLandscapeCanvasComponent.h>
 
+#include <LmbrCentral/Shape/ReferenceShapeComponentBus.h>
+
 namespace LandscapeCanvasEditor
 {
     static const int NODE_OFFSET_X_PIXELS = 350;
@@ -200,15 +203,34 @@ namespace LandscapeCanvasEditor
     {
         using namespace AzToolsFramework;
 
-        static const QStringList preferredCategories = {
-            "Vegetation",
-            "Atom"
-        };
+        // A map of category names with preferred component names.
+        // There may be multiple component names for a category, as long as they provide different services.
+        const AZStd::map<QString, AZStd::vector<QString>> preferredComponentsByCategory = { { "Shape", { "Shape Reference" } } };
+
+        // Scan through the preferred categories to see whether any exist in the componentDataTable.
+        for (const auto& preferredComponentPair : preferredComponentsByCategory)
+        {
+            auto candidateDataTablePair = componentDataTable.find(preferredComponentPair.first);
+            if (candidateDataTablePair != componentDataTable.end())
+            {
+                // Now check all the preferred components for that category, and return the first one that exists in the candidate componentDataTable.
+                for (const auto& preferredComponentName : preferredComponentPair.second)
+                {
+                    const auto& candidateComponent = candidateDataTablePair->second.find(preferredComponentName);
+                    if (candidateComponent != candidateDataTablePair->second.end())
+                    {
+                        return candidateComponent->second->m_typeId;
+                    }
+                }
+            }
+        }
 
         // There are a couple of cases where we prefer certain categories of Components
-        // to be added over others (e.g. a Vegetation Shape Reference instead of actual LmbrCentral shapes),
+        // to be added over others,
         // so if those there are components in those categories, then choose them first.
         // Otherwise, just pick the first one in the list.
+        static const QStringList preferredCategories = { "Vegetation", "Atom" };
+
         ComponentPaletteUtil::ComponentDataTable::const_iterator categoryIt;
         for (const auto& categoryName : preferredCategories)
         {
@@ -448,6 +470,9 @@ namespace LandscapeCanvasEditor
         AZ::ComponentApplicationBus::BroadcastResult(m_serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);
         AZ_Assert(m_serializeContext, "Failed to acquire application serialize context.");
 
+        m_prefabFocusPublicInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabFocusPublicInterface>::Get();
+        AZ_Assert(m_prefabFocusPublicInterface, "LandscapeCanvas - could not get PrefabFocusPublicInterface on construction.");
+
         const GraphCanvas::EditorId& editorId = GetEditorId();
 
         // Register unique color palettes for our connections (data types)
@@ -459,6 +484,7 @@ namespace LandscapeCanvasEditor
         AzToolsFramework::EditorPickModeNotificationBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
         AzToolsFramework::EntityCompositionNotificationBus::Handler::BusConnect();
         AzToolsFramework::ToolsApplicationNotificationBus::Handler::BusConnect();
+        AzToolsFramework::Prefab::PrefabFocusNotificationBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
         AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusConnect();
         CrySystemEventBus::Handler::BusConnect();
         AZ::EntitySystemBus::Handler::BusConnect();
@@ -484,6 +510,7 @@ namespace LandscapeCanvasEditor
         AZ::EntitySystemBus::Handler::BusDisconnect();
         CrySystemEventBus::Handler::BusDisconnect();
         AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusDisconnect();
+        AzToolsFramework::Prefab::PrefabFocusNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::ToolsApplicationNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::EditorPickModeNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
@@ -1297,7 +1324,7 @@ namespace LandscapeCanvasEditor
             }
 
             // Special case for the Vegetation Area Placement Bounds, the slot actually represents a separate
-            // Vegetation Reference Shape or actual Shape component on the same Entity
+            // Reference Shape or actual Shape component on the same Entity
             AZ::Component* component = nullptr;
             auto targetBaseNode = static_cast<LandscapeCanvas::BaseNode*>(targetNode.get());
             if (targetBaseNode->GetBaseNodeType() == LandscapeCanvas::BaseNode::BaseNodeType::VegetationArea && targetSlot->GetName() == LandscapeCanvas::PLACEMENT_BOUNDS_SLOT_ID)
@@ -1373,7 +1400,7 @@ namespace LandscapeCanvasEditor
                     AzToolsFramework::EditorDisabledCompositionRequestBus::Event(targetEntityId, &AzToolsFramework::EditorDisabledCompositionRequests::GetDisabledComponents, disabledComponents);
                     for (auto disabledComponent : disabledComponents)
                     {
-                        if (disabledComponent->RTTI_GetType() == Vegetation::EditorReferenceShapeComponentTypeId)
+                        if (disabledComponent->RTTI_GetType() == LmbrCentral::EditorReferenceShapeComponentTypeId)
                         {
                             component = disabledComponent;
 
@@ -1395,7 +1422,7 @@ namespace LandscapeCanvasEditor
                     // If 'component' is still null then that means there is no Reference Shape component on our Entity, so we need to add one
                     if (!component)
                     {
-                        AZ::ComponentId componentId = AddComponentTypeIdToEntity(targetEntityId, Vegetation::EditorReferenceShapeComponentTypeId);
+                        AZ::ComponentId componentId = AddComponentTypeIdToEntity(targetEntityId, LmbrCentral::EditorReferenceShapeComponentTypeId);
 
                         component = targetEntity->FindComponent(componentId);
                     }
@@ -2500,6 +2527,24 @@ namespace LandscapeCanvasEditor
         }
     }
 
+    void MainWindow::OnPrefabFocusChanged()
+    {
+        // Make sure to close any open graphs that aren't currently in prefab focus
+        // to prevent the user from making modifications outside of the allowed focus scope
+        AZStd::vector<GraphCanvas::DockWidgetId> dockWidgetsToClose;
+        for (auto [entityId, dockWidgetId] : m_dockWidgetsByEntity)
+        {
+            if (!m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
+            {
+                dockWidgetsToClose.push_back(dockWidgetId);
+            }
+        }
+        for (auto dockWidgetId : dockWidgetsToClose)
+        {
+            CloseEditor(dockWidgetId);
+        }
+    }
+
     void MainWindow::OnPrefabInstancePropagationBegin()
     {
         // Ignore graph updates during prefab propagation because the entities will be
diff --git a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h
index e0fb2d8e10..de6b10529d 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.h
@@ -20,6 +20,7 @@
 #include <AzToolsFramework/API/EntityCompositionNotificationBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Prefab/PrefabFocusNotificationBus.h>
 #include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
@@ -31,6 +32,14 @@
 #include <LandscapeCanvas/LandscapeCanvasBus.h>
 #endif
 
+namespace AzToolsFramework
+{
+    namespace Prefab
+    {
+        class PrefabFocusPublicInterface;
+    }
+}
+
 namespace LandscapeCanvasEditor
 {
     ////////////////////////////////////////////////////////////////////////
@@ -81,6 +90,7 @@ namespace LandscapeCanvasEditor
         , private AzToolsFramework::EntityCompositionNotificationBus::Handler
         , private AzToolsFramework::PropertyEditorEntityChangeNotificationBus::MultiHandler
         , private AzToolsFramework::ToolsApplicationNotificationBus::Handler
+        , private AzToolsFramework::Prefab::PrefabFocusNotificationBus::Handler
         , private AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler
         , private CrySystemEventBus::Handler
     {
@@ -181,6 +191,9 @@ namespace LandscapeCanvasEditor
         void EntityParentChanged(AZ::EntityId entityId, AZ::EntityId newParentId, AZ::EntityId oldParentId) override;
         ////////////////////////////////////////////////////////////////////////
 
+        //! PrefabFocusNotificationBus overrides
+        void OnPrefabFocusChanged() override;
+
         //! PrefabPublicNotificationBus overrides
         void OnPrefabInstancePropagationBegin() override;
         void OnPrefabInstancePropagationEnd() override;
@@ -248,6 +261,8 @@ namespace LandscapeCanvasEditor
 
         AZ::SerializeContext* m_serializeContext = nullptr;
 
+        AzToolsFramework::Prefab::PrefabFocusPublicInterface* m_prefabFocusPublicInterface = nullptr;
+
         bool m_ignoreGraphUpdates = false;
         bool m_prefabPropagationInProgress = false;
         bool m_inObjectPickMode = false;
diff --git a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp
index 312dd0873e..b24b681dde 100644
--- a/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/Editor/Nodes/Areas/BaseAreaNode.cpp
@@ -26,6 +26,8 @@
 #include "BaseAreaNode.h"
 #include <Editor/Core/GraphContext.h>
 
+#include <LmbrCentral/Shape/ReferenceShapeComponentBus.h>
+
 namespace LandscapeCanvas
 {
     void BaseAreaNode::Reflect(AZ::ReflectContext* context)
@@ -61,7 +63,7 @@ namespace LandscapeCanvas
             return nullptr;
         }
 
-        AZ::Component* component = entity->FindComponent(Vegetation::EditorReferenceShapeComponentTypeId);
+        AZ::Component* component = entity->FindComponent(LmbrCentral::EditorReferenceShapeComponentTypeId);
         if (component)
         {
             return component;
diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg
new file mode 100644
index 0000000000..0f3982d713
--- /dev/null
+++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5789 22.9873L23.8723 19.9949L21.5789 17.0174H20.687V19.017H12.8866V20.9916H20.687V22.9873H21.5789ZM12.8866 13.0434V16.9992L16.8948 16.9985V8.10599H7.88818V11.0434H10.8866C11.9912 11.0434 12.8866 11.9388 12.8866 13.0434ZM3.89205 11.0434H5.88784V4.00632H7.90482V3.07213L5.00928 1.02013L1.87939 3.07213V4.00632H3.89205V11.0434ZM13.2463 3.21631L21.8135 3.21631L17.8709 6.66608L7.927 6.66607L13.2463 3.21631ZM22.2196 13.7975V4.6508L18.2206 8.15246V17.0128L22.2196 13.7975ZM3.90234 12.021H10.3722C11.2007 12.021 11.8722 12.6925 11.8722 13.521V21.0081H5.40235C4.57392 21.0081 3.90234 20.3365 3.90234 19.5081V12.021ZM8.70527 16.838C9.33748 16.5165 9.77437 15.8285 9.77437 15.0317C9.77437 13.9271 8.9349 13.0317 7.89937 13.0317C6.86383 13.0317 6.02437 13.9271 6.02437 15.0317C6.02437 15.8343 6.46768 16.5266 7.10739 16.845L6.14808 19.3089C6.02046 19.6367 6.26225 19.9903 6.61401 19.9903L9.22353 19.9903C9.57695 19.9903 9.81882 19.6337 9.68804 19.3053L8.70527 16.838Z" fill="#5A69A1"/>
+</svg>
diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/ShapeReference.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/ShapeReference.svg
new file mode 100644
index 0000000000..a304220c48
--- /dev/null
+++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/ShapeReference.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.50342 4.36061L7.47747 3.44014L9.96968 4.56039V2.7935L7.50829 1.71887L5.50342 2.64301V4.36061ZM3.99316 3.33915L1.07861 4.6826L1.07869 8.5229H2.82607V5.609L3.99316 5.06481V3.33915ZM11.4799 5.23924L12.5798 5.73362V6.85533L14.0063 7.64563L14.2967 7.4947L14.2966 4.6826L11.4799 3.45286V5.23924ZM1.07879 13.913L1.07872 10.0332H2.82607V12.9237L4.01036 13.4951V15.3537L1.07879 13.913ZM5.52062 16.0958V14.2239L7.37105 15.1168L8.42342 14.6693L9.29688 14.8634V16.2093L7.37105 17.0052L5.52062 16.0958ZM9.7033 19.8356L9.70321 14.9536L11.4506 15.3419V18.8462L15.9956 21.0393L21.2043 18.8243V11.6561L19.0892 10.7054V8.93214L22.9211 10.6051L22.9213 18.0941V20.0656L15.9956 22.9277L9.7033 19.8356ZM4.16865 7.26396L9.85617 10.8214L5.52028 12.8232L17.9621 15.3933L17.991 7.02899L14.0482 8.82368L7.81896 5.62147L4.16865 7.26396Z" fill="#5A69A1"/>
+</svg>
diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg
new file mode 100644
index 0000000000..51f0be0572
--- /dev/null
+++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg
@@ -0,0 +1,16 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9248 0.787842C23.1022 0.787842 23.9567 2.56631 23.9567 3.80649C23.9567 5.04668 23.9567 19.5694 23.9567 21.4299C23.9567 23.1808 22.7281 24.7445 20.9248 24.7445C19.1215 24.7445 4.6493 24.7445 2.80929 24.7445C1.38662 24.7445 0 23.3026 0 21.9465C0 20.5904 0 4.82317 0 3.4604C0 2.09762 1.3654 0.787842 2.60956 0.787842C3.85372 0.787842 18.9601 0.787842 20.9248 0.787842Z" fill="url(#paint0_linear_833_47252)"/>
+<mask id="mask0_833_47252" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9248 0.787842C23.1022 0.787842 23.9567 2.56631 23.9567 3.80649C23.9567 5.04668 23.9567 19.5694 23.9567 21.4299C23.9567 23.1808 22.7281 24.7445 20.9248 24.7445C19.1215 24.7445 4.6493 24.7445 2.80929 24.7445C1.38662 24.7445 0 23.3026 0 21.9465C0 20.5904 0 4.82317 0 3.4604C0 2.09762 1.3654 0.787842 2.60956 0.787842C3.85372 0.787842 18.9601 0.787842 20.9248 0.787842Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_833_47252)">
+<rect y="0.787842" width="24" height="24" fill="#5A69A1"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.6922 23.9873L22.9856 20.9949L20.6922 18.0174H19.8003V20.017H11.9999V21.9916H19.8003V23.9873H20.6922ZM11.9999 14.0434V17.9992L16.0081 17.9985V9.10599H7.00146V12.0434H9.9999C11.1045 12.0434 11.9999 12.9388 11.9999 14.0434ZM3.00533 12.0434H5.00112V5.00632H7.0181V4.07213L4.12256 2.02013L0.992676 4.07213V5.00632H3.00533V12.0434ZM12.3596 4.21631L20.9268 4.21631L16.9842 7.66608L7.04028 7.66607L12.3596 4.21631ZM21.3328 14.7975V5.6508L17.3339 9.15246V18.0128L21.3328 14.7975ZM3.01562 13.021H9.48551C10.3139 13.021 10.9855 13.6925 10.9855 14.521V22.0081H4.51563C3.6872 22.0081 3.01562 21.3365 3.01562 20.5081V13.021ZM7.81855 17.838C8.45076 17.5165 8.88765 16.8285 8.88765 16.0317C8.88765 14.9271 8.04818 14.0317 7.01265 14.0317C5.97711 14.0317 5.13765 14.9271 5.13765 16.0317C5.13765 16.8343 5.58096 17.5266 6.22067 17.845L5.26136 20.3089C5.13374 20.6367 5.37553 20.9903 5.72729 20.9903L8.33681 20.9903C8.69023 20.9903 8.9321 20.6337 8.80132 20.3053L7.81855 17.838Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_833_47252" x1="0" y1="0.787842" x2="0" y2="24.7445" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/ShapeReference.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/ShapeReference.svg
new file mode 100644
index 0000000000..fe6abb9fe4
--- /dev/null
+++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/ShapeReference.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0C24.0953 0 24.9498 1.77847 24.9498 3.01865C24.9498 4.25884 24.9498 18.7816 24.9498 20.6421C24.9498 22.393 23.7213 23.9567 21.918 23.9567C20.1147 23.9567 5.64246 23.9567 3.80245 23.9567C2.37978 23.9567 0.993164 22.5148 0.993164 21.1587C0.993164 19.8026 0.993164 4.03533 0.993164 2.67255C0.993164 1.30978 2.35856 0 3.60272 0C4.84688 0 19.9533 0 21.918 0Z" fill="url(#paint0_linear_946_53402)"/>
+<mask id="mask0_946_53402" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="24">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0C24.0953 0 24.9498 1.77847 24.9498 3.01865C24.9498 4.25884 24.9498 18.7816 24.9498 20.6421C24.9498 22.393 23.7213 23.9567 21.918 23.9567C20.1147 23.9567 5.64246 23.9567 3.80245 23.9567C2.37978 23.9567 0.993164 22.5148 0.993164 21.1587C0.993164 19.8026 0.993164 4.03533 0.993164 2.67255C0.993164 1.30978 2.35856 0 3.60272 0C4.84688 0 19.9533 0 21.918 0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_946_53402)">
+<rect x="0.993164" width="24" height="24" fill="#5A69A1"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.50342 4.36061L8.47747 3.44014L10.9697 4.56039V2.7935L8.50829 1.71887L6.50342 2.64301V4.36061ZM4.99316 3.33915L2.07861 4.6826L2.07869 8.5229H3.82607V5.609L4.99316 5.06481V3.33915ZM12.4799 5.23924L13.5798 5.73362V6.85533L15.0063 7.64563L15.2967 7.4947L15.2966 4.6826L12.4799 3.45286V5.23924ZM2.07879 13.913L2.07872 10.0332H3.82607V12.9237L5.01036 13.4951V15.3537L2.07879 13.913ZM6.52062 16.0958V14.2239L8.37105 15.1168L9.42342 14.6693L10.2969 14.8634V16.2093L8.37105 17.0052L6.52062 16.0958ZM10.7033 19.8356L10.7032 14.9536L12.4506 15.3419V18.8462L16.9956 21.0393L22.2043 18.8243V11.6561L20.0892 10.7054V8.93214L23.9211 10.6051L23.9213 18.0941V20.0656L16.9956 22.9277L10.7033 19.8356ZM5.16865 7.26396L10.8562 10.8214L6.52028 12.8232L18.9621 15.3933L18.991 7.02899L15.0482 8.82368L8.81896 5.62147L5.16865 7.26396Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_946_53402" x1="0.993164" y1="0" x2="0.993164" y2="23.9567" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/LmbrCentral/Assets/seedList.seed b/Gems/LmbrCentral/Assets/seedList.seed
deleted file mode 100644
index 54c12c9faa..0000000000
--- a/Gems/LmbrCentral/Assets/seedList.seed
+++ /dev/null
@@ -1,37 +0,0 @@
-<ObjectStream version="3">
-	<Class name="AZStd::vector" type="{82FC5264-88D0-57CD-9307-FC52E4DAD550}">
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{1AE9C4CB-FF24-594B-BC2F-071268E0D6AB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="engineassets/geomcaches/defaultgeomcache.cax" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{E9C38BAA-2A29-532E-AA92-4F66F95E8242}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="engineassets/textures/defaults/spot_default.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{0BFF7DC2-B7B0-530E-A70E-A082F7AF6678}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="engineassets/materials/decals/default.mtl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{1213DEB1-FC2B-566A-86AA-E82D93D8AE2F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="engineassets/materials/lens_optics.mtl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-	</Class>
-</ObjectStream>
-
diff --git a/Gems/LmbrCentral/Code/CMakeLists.txt b/Gems/LmbrCentral/Code/CMakeLists.txt
index b047a9f65e..2df0bd0632 100644
--- a/Gems/LmbrCentral/Code/CMakeLists.txt
+++ b/Gems/LmbrCentral/Code/CMakeLists.txt
@@ -13,6 +13,7 @@ ly_add_target(
     NAME LmbrCentral.Static STATIC
     NAMESPACE Gem
     FILES_CMAKE
+        lmbrcentral_headers_files.cmake
         lmbrcentral_files.cmake
         ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
@@ -27,6 +28,16 @@ ly_add_target(
             AZ::AzFramework
 )
 
+ly_add_target(
+    NAME LmbrCentral.API HEADERONLY
+    NAMESPACE Gem
+    FILES_CMAKE
+        lmbrcentral_headers_files.cmake
+    INCLUDE_DIRECTORIES
+        INTERFACE
+            include
+)
+
 ly_add_target(
     NAME LmbrCentral ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
diff --git a/Gems/LmbrCentral/Code/Mocks/LmbrCentral/Shape/MockShapes.h b/Gems/LmbrCentral/Code/Mocks/LmbrCentral/Shape/MockShapes.h
index 20be74dd90..b0118a914a 100644
--- a/Gems/LmbrCentral/Code/Mocks/LmbrCentral/Shape/MockShapes.h
+++ b/Gems/LmbrCentral/Code/Mocks/LmbrCentral/Shape/MockShapes.h
@@ -56,5 +56,73 @@ namespace UnitTest
         MOCK_METHOD1(GenerateRandomPointInside, AZ::Vector3(AZ::RandomDistributionType randomDistribution));
         MOCK_METHOD3(IntersectRay, bool(const AZ::Vector3& src, const AZ::Vector3& dir, float& distance));
     };
+
+    class MockShape : public LmbrCentral::ShapeComponentRequestsBus::Handler
+    {
+    public:
+        AZ::Entity m_entity;
+        int m_count = 0;
+
+        MockShape()
+        {
+            LmbrCentral::ShapeComponentRequestsBus::Handler::BusConnect(m_entity.GetId());
+        }
+
+        ~MockShape()
+        {
+            LmbrCentral::ShapeComponentRequestsBus::Handler::BusDisconnect();
+        }
+
+        AZ::Crc32 GetShapeType() override
+        {
+            ++m_count;
+            return AZ_CRC("TestShape", 0x856ca50c);
+        }
+
+        AZ::Aabb m_aabb = AZ::Aabb::CreateNull();
+        AZ::Aabb GetEncompassingAabb() override
+        {
+            ++m_count;
+            return m_aabb;
+        }
+
+        AZ::Transform m_localTransform = AZ::Transform::CreateIdentity();
+        AZ::Aabb m_localBounds = AZ::Aabb::CreateNull();
+        void GetTransformAndLocalBounds(AZ::Transform& transform, AZ::Aabb& bounds) override
+        {
+            ++m_count;
+            transform = m_localTransform;
+            bounds = m_localBounds;
+        }
+
+        bool m_pointInside = true;
+        bool IsPointInside([[maybe_unused]] const AZ::Vector3& point) override
+        {
+            ++m_count;
+            return m_pointInside;
+        }
+
+        float m_distanceSquaredFromPoint = 0.0f;
+        float DistanceSquaredFromPoint([[maybe_unused]] const AZ::Vector3& point) override
+        {
+            ++m_count;
+            return m_distanceSquaredFromPoint;
+        }
+
+        AZ::Vector3 m_randomPointInside = AZ::Vector3::CreateZero();
+        AZ::Vector3 GenerateRandomPointInside([[maybe_unused]] AZ::RandomDistributionType randomDistribution) override
+        {
+            ++m_count;
+            return m_randomPointInside;
+        }
+
+        bool m_intersectRay = false;
+        bool IntersectRay(
+            [[maybe_unused]] const AZ::Vector3& src, [[maybe_unused]] const AZ::Vector3& dir, [[maybe_unused]] float& distance) override
+        {
+            ++m_count;
+            return m_intersectRay;
+        }
+    };
 }
 
diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
index f723918cf3..ed707ee9b3 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
@@ -47,6 +47,7 @@ namespace LmbrCentral
             {
                 editContext->Class<EditorNavigationAreaComponent>("Navigation Area", "Navigation Area configuration")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
                         ->Attribute(AZ::Edit::Attributes::Category, "AI")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationArea.svg")
                         ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationArea.svg")
diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
index 47999dbd4b..8d8727e314 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
@@ -32,6 +32,7 @@ namespace LmbrCentral
                 editContext->Class<EditorNavigationSeedComponent>("Navigation Seed", "Determines reachable navigation nodes")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
+                        ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
                         ->Attribute(AZ::Edit::Attributes::Category, "AI")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationSeed.svg")
                         ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationSeed.svg")
diff --git a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
index 500d5c17da..9798307d51 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
@@ -120,6 +120,7 @@ namespace LmbrCentral
                 editContext->Class<NavigationComponent>(
                     "Navigation", "The Navigation component provides basic pathfinding and pathfollowing services to an entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
                     ->Attribute(AZ::Edit::Attributes::Category, "AI")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Navigation.svg")
                     ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Navigation.svg")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
index 05d8061856..7062f685c2 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
@@ -96,7 +96,7 @@ namespace LmbrCentral
         }
         else
         {
-            m_positionEntity = entityId;
+            m_currentPositionEntity = entityId;
         }
     }
 
@@ -221,26 +221,26 @@ namespace LmbrCentral
 
         if (rotationEntityId.IsValid())
         {
-            AZ::EntityBus::MultiHandler::BusConnect(rotationEntityId);
             m_currentRotationEntity = rotationEntityId;
+            AZ::EntityBus::MultiHandler::BusConnect(rotationEntityId);
         }
         else
         {
-            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
             m_currentRotationEntity = GetEntityId();
+            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
         }
 
         // Lastly, connect to the Entity used for Position
 
         if (positionEntityId.IsValid())
         {
-            AZ::EntityBus::MultiHandler::BusConnect(positionEntityId);
             m_currentPositionEntity = positionEntityId;
+            AZ::EntityBus::MultiHandler::BusConnect(positionEntityId);
         }
         else
         {
-            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
             m_currentPositionEntity = GetEntityId();
+            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
         }
 
         // Do a fetch of the transforms to sync upon connecting.
diff --git a/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp
deleted file mode 100644
index 48973b2779..0000000000
--- a/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "MaterialBuilderComponent.h"
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/IO/SystemFile.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContextConstants.inl>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzFramework/IO/LocalFileIO.h>
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/XML/rapidxml.h>
-#include <cctype>
-
-namespace MaterialBuilder
-{
-    [[maybe_unused]] const char s_materialBuilder[] = "MaterialBuilder";
-
-    namespace Internal
-    {
-        const char g_nodeNameMaterial[] = "Material";
-        const char g_nodeNameSubmaterial[] = "SubMaterials";
-        const char g_nodeNameTexture[] = "Texture";
-        const char g_nodeNameTextures[] = "Textures";
-        const char g_attributeFileName[] = "File";
-
-        const int g_numSourceImageFormats = 9;
-        const char* g_sourceImageFormats[g_numSourceImageFormats] = { ".tif", ".tiff", ".bmp", ".gif", ".jpg", ".jpeg", ".tga", ".png", ".dds" };
-        bool IsSupportedImageExtension(const AZStd::string& extension)
-        {
-            for (const char* format : g_sourceImageFormats)
-            {
-                if (extension == format)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        // Cleans up legacy pathing from older materials
-        const char* CleanLegacyPathingFromTexturePath(const char* texturePath)
-        {
-            // Copied from MaterialHelpers::SetTexturesFromXml, line 459
-            // legacy.  Some textures used to be referenced using "engine\\" or "engine/" - this is no longer valid
-            if (
-                (strlen(texturePath) > 7) &&
-                (azstrnicmp(texturePath, "engine", 6) == 0) &&
-                ((texturePath[6] == '\\') || (texturePath[6] == '/'))
-                )
-            {
-                texturePath = texturePath + 7;
-            }
-
-            // legacy:  Files were saved into a mtl with many leading forward or back slashes, we eat them all here.  We want it to start with a relative path.
-            const char* actualFileName = texturePath;
-            while ((actualFileName[0]) && ((actualFileName[0] == '\\') || (actualFileName[0] == '/')))
-            {
-                ++actualFileName;
-            }
-            return actualFileName;
-        }
-
-        // Parses the material XML for all texture paths
-        AZ::Outcome<AZStd::string, AZStd::string> GetTexturePathsFromMaterial(AZ::rapidxml::xml_node<char>* materialNode, AZStd::vector<AZStd::string>& paths)
-        {
-            AZ::Outcome<AZStd::string, AZStd::string> resultOutcome = AZ::Failure(AZStd::string(""));
-            AZStd::string success_with_warning_message;
-
-            // check if this material has a set of textures defined, and if so, grab all the paths from the textures
-            AZ::rapidxml::xml_node<char>* texturesNode = materialNode->first_node(g_nodeNameTextures);
-            if (texturesNode)
-            {
-                AZ::rapidxml::xml_node<char>* textureNode = texturesNode->first_node(g_nodeNameTexture);
-                // it is possible for an empty <Textures> node to exist for things like collision materials, so check
-                //  to make sure that there is at least one child <Texture> node before starting to iterate.
-                if (textureNode)
-                {
-                    do
-                    {
-                        AZ::rapidxml::xml_attribute<char>* fileAttribute = textureNode->first_attribute(g_attributeFileName);
-                        if (!fileAttribute)
-                        {
-                            success_with_warning_message = "Texture node exists but does not have a file attribute defined";
-                        }
-                        else
-                        {
-                            const char* rawTexturePath = fileAttribute->value();
-                            // do an initial clean-up of the path taken from the file, similar to MaterialHelpers::SetTexturesFromXml
-                            AZStd::string texturePath = CleanLegacyPathingFromTexturePath(rawTexturePath);
-                            paths.emplace_back(AZStd::move(texturePath));
-                        }
-
-                        textureNode = textureNode->next_sibling(g_nodeNameTexture);
-                    } while (textureNode);
-                }
-            }
-
-            // check to see if this material has sub materials defined. If so, recurse into this function for each sub material
-            AZ::rapidxml::xml_node<char>* subMaterialsNode = materialNode->first_node(g_nodeNameSubmaterial);
-            if (subMaterialsNode)
-            {
-                AZ::rapidxml::xml_node<char>* subMaterialNode = subMaterialsNode->first_node(g_nodeNameMaterial);
-                if (subMaterialNode == nullptr)
-                {
-                    // this is a malformed material as there is no material node child in the SubMaterials node, so error out
-                    return AZ::Failure(AZStd::string("SubMaterials node exists but does not have any child Material nodes."));
-                }
-
-                do
-                {
-                    // grab the texture paths from the submaterial, or error out if necessary
-                    AZ::Outcome<AZStd::string, AZStd::string> subMaterialTexturePathsResult = GetTexturePathsFromMaterial(subMaterialNode, paths);
-                    if (!subMaterialTexturePathsResult.IsSuccess())
-                    {
-                        return subMaterialTexturePathsResult;
-                    }
-                    else if (!subMaterialTexturePathsResult.GetValue().empty())
-                    {
-                        success_with_warning_message = subMaterialTexturePathsResult.GetValue();
-                    }
-
-                    subMaterialNode = subMaterialNode->next_sibling(g_nodeNameMaterial);
-                } while (subMaterialNode);
-            }
-
-            if (texturesNode == nullptr && subMaterialsNode == nullptr)
-            {
-                return AZ::Failure(AZStd::string("Failed to find a Textures node or SubMaterials node in this material. At least one of these must exist to be able to gather texture dependencies."));
-            }
-
-            if (!success_with_warning_message.empty())
-            {
-                return AZ::Success(success_with_warning_message);
-            }
-            return AZ::Success(AZStd::string());
-        }
-
-        // find a sequence of digits with a string starting from lastDigitIndex, and try to parse that sequence to and int
-        //  and store it in outAnimIndex.
-        bool ParseFilePathForCompleteNumber(const AZStd::string& filePath, int& lastDigitIndex, int& outAnimIndex)
-        {
-            int firstAnimIndexDigit = lastDigitIndex;
-            while (isdigit(static_cast<unsigned char>(filePath[lastDigitIndex])))
-            {
-                ++lastDigitIndex;
-            }
-            if (!AzFramework::StringFunc::LooksLikeInt(filePath.substr(firstAnimIndexDigit, lastDigitIndex - firstAnimIndexDigit).c_str(), &outAnimIndex))
-            {
-                return false;
-            }
-            return true;
-        }
-
-        // Parse the texture path for a texture animation to determine the actual names of the textures to resolve that
-        //  make up the entire sequence.
-        AZ::Outcome<void, AZStd::string> GetAllTexturesInTextureSequence(const AZStd::string& path, AZStd::vector<AZStd::string>& texturesInSequence)
-        {
-            // Taken from CShaderMan::mfReadTexSequence
-            // All comments next to variable declarations in this function are the original variable names in
-            //  CShaderMan::mfReadTexSequence, to help keep track of how these variables relate to the original function
-            AZStd::string prefix;
-            AZStd::string postfix;
-
-            AZStd::string filePath = path;  // name
-            AZStd::string extension;        // ext
-            AzFramework::StringFunc::Path::GetExtension(filePath.c_str(), extension);
-            AzFramework::StringFunc::Path::StripExtension(filePath);
-
-            // unsure if it is actually possible to enter here or the original version with '$' as the indicator
-            //  for texture sequences, but they check for both just in case, so this will match the behavior.
-            char separator = '#';           // chSep
-            int firstSeparatorIndex = static_cast<int>(filePath.find(separator));
-            if (firstSeparatorIndex == AZStd::string::npos)
-            {
-                firstSeparatorIndex = static_cast<int>(filePath.find('$'));
-                if (firstSeparatorIndex == AZStd::string::npos)
-                {
-                    return AZ::Failure(AZStd::string("Failed to find separator '#' or '$' in texture path."));
-                }
-                separator = '$';
-            }
-
-            // we don't actually care about getting the speed of the animation, so just remove everything from the
-            //  end of the string starting with the last open parenthesis
-            size_t speedStartIndex = filePath.find_last_of('(');
-            if (speedStartIndex != AZStd::string::npos)
-            {
-                AzFramework::StringFunc::LKeep(filePath, speedStartIndex);
-                AzFramework::StringFunc::Append(filePath, '\0');
-            }
-
-            // try to find where the digits start after the separator (there can be any number of separators
-            //  between the texture name prefix and where the digit range starts)
-            int firstAnimIndexDigit = -1;   // m
-            int numSeparators = 0;          // j
-            for (int stringIndex = firstSeparatorIndex; stringIndex < filePath.length(); ++stringIndex)
-            {
-                if (filePath[stringIndex] == separator)
-                {
-                    ++numSeparators;
-                    if (firstSeparatorIndex == -1)
-                    {
-                        firstSeparatorIndex = stringIndex;
-                    }
-                }
-                else if (firstSeparatorIndex > 0 && firstAnimIndexDigit < 0)
-                {
-                    firstAnimIndexDigit = stringIndex;
-                    break;
-                }
-            }
-            if (numSeparators == 0)
-            {
-                return AZ::Failure(AZStd::string("Failed to find separator '#' or '$' in texture path."));
-            }
-
-            // store off everything before the separator
-            prefix = AZStd::move(filePath.substr(0, firstSeparatorIndex));
-
-            int startAnimIndex = 0; // startn
-            int endAnimIndex = 0;   // endn
-            // we only found the separator, but no indexes, so just assume its 0 - 999
-            if (firstAnimIndexDigit < 0)
-            {
-                startAnimIndex = 0;
-                endAnimIndex = 999;
-            }
-            else
-            {
-                // find the length of the first index, then parse that to an int
-                int lastDigitIndex = firstAnimIndexDigit;
-                if (!ParseFilePathForCompleteNumber(filePath, lastDigitIndex, startAnimIndex))
-                {
-                    return AZ::Failure(AZStd::string("Failed to determine first index of the sequence after the separators in texture path."));
-                }
-
-                // reset to the start of the next index
-                ++lastDigitIndex;
-
-                // find the length of the end index, then parse that to an int
-                if (!ParseFilePathForCompleteNumber(filePath, lastDigitIndex, endAnimIndex))
-                {
-                    return AZ::Failure(AZStd::string("Failed to determine last index of the sequence after the first index of the sequence in texture path."));
-                }
-
-                // save off the rest of the string
-                postfix = AZStd::move(filePath.substr(lastDigitIndex));
-            }
-
-            int numTextures = endAnimIndex - startAnimIndex + 1;
-            const char* textureNameFormat = "%s%.*d%s%s"; // prefix, num separators (number of digits), sequence index, postfix, extension)
-            for (int sequenceIndex = 0; sequenceIndex < numTextures; ++sequenceIndex)
-            {
-                texturesInSequence.emplace_back(AZStd::move(AZStd::string::format(textureNameFormat, prefix.c_str(), numSeparators, startAnimIndex + sequenceIndex, postfix.c_str(), extension.c_str())));
-            }
-
-            return AZ::Success();
-        }
-
-        // Determine which product path to use based on the path stored in the texture, and make it relative to
-        //  the cache.
-        bool ResolveMaterialTexturePath(const AZStd::string& path, AZStd::string& outPath)
-        {
-            AZStd::string aliasedPath = path;
-
-            //if its a source image format try to load the dds
-            AZStd::string extension;
-            bool hasExtension = AzFramework::StringFunc::Path::GetExtension(path.c_str(), extension);
-
-            // Replace all supported extensions with DDS if it has an extension. If the extension exists but is not supported, fail out.
-            if (hasExtension && IsSupportedImageExtension(extension))
-            {
-                AzFramework::StringFunc::Path::ReplaceExtension(aliasedPath, ".dds");
-            }
-            else if (hasExtension)
-            {
-                AZ_Warning(s_materialBuilder, false, "Failed to resolve texture path %s as the path is not to a supported texture format. Please make sure that textures in materials are formats supported by Open 3D Engine.", aliasedPath.c_str());
-                return false;
-            }
-
-            AZStd::to_lower(aliasedPath.begin(), aliasedPath.end());
-            AzFramework::StringFunc::Path::Normalize(aliasedPath);
-
-            AZStd::string currentFolderSpecifier = AZStd::string::format(".%c", AZ_CORRECT_FILESYSTEM_SEPARATOR);
-            if (AzFramework::StringFunc::StartsWith(aliasedPath, currentFolderSpecifier))
-            {
-                AzFramework::StringFunc::Strip(aliasedPath, currentFolderSpecifier.c_str(), false, true);
-            }
-
-            AZStd::string resolvedPath;
-            char fullPathBuffer[AZ_MAX_PATH_LEN] = {};
-            // if there is an alias already at the front of the path, resolve it, and try to make it relative to the
-            //  cache (@products@). If it can't, then error out.
-            // This case handles the possibility of aliases existing in texture paths in materials that is still supported
-            //  by the legacy loading code, however it is not currently used, so the else path is always taken.
-            if (aliasedPath[0] == '@')
-            {
-                if (!AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(aliasedPath.c_str(), fullPathBuffer, AZ_MAX_PATH_LEN))
-                {
-                    AZ_Warning(s_materialBuilder, false, "Failed to resolve the alias in texture path %s. Please make sure all aliases are registered with the engine.", aliasedPath.c_str());
-                    return false;
-                }
-                resolvedPath = fullPathBuffer;
-                AzFramework::StringFunc::Path::Normalize(resolvedPath);
-                if (!AzFramework::StringFunc::Replace(resolvedPath, AZ::IO::FileIOBase::GetDirectInstance()->GetAlias("@products@"), ""))
-                {
-                    AZ_Warning(s_materialBuilder, false, "Failed to resolve aliased texture path %s to be relative to the asset cache. Please make sure this alias resolves to a path within the asset cache.", aliasedPath.c_str());
-                    return false;
-                }
-            }
-            else
-            {
-                resolvedPath = AZStd::move(aliasedPath);
-            }
-
-            // AP deferred path resolution requires UNIX separators and no leading separators, so clean up and convert here
-            if (AzFramework::StringFunc::StartsWith(resolvedPath, AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING))
-            {
-                AzFramework::StringFunc::Strip(resolvedPath, AZ_CORRECT_FILESYSTEM_SEPARATOR, false, true);
-            }
-            AzFramework::StringFunc::Replace(resolvedPath, AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING, "/");
-
-            outPath = AZStd::move(resolvedPath);
-            return true;
-        }
-
-    }
-
-    BuilderPluginComponent::BuilderPluginComponent()
-    {
-    }
-
-    BuilderPluginComponent::~BuilderPluginComponent()
-    {
-    }
-
-    void BuilderPluginComponent::Init()
-    {
-    }
-
-    void BuilderPluginComponent::Activate()
-    {
-        // Register material builder
-        AssetBuilderSDK::AssetBuilderDesc builderDescriptor;
-        builderDescriptor.m_name = "MaterialBuilderWorker";
-        builderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern("*.mtl", AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
-        builderDescriptor.m_busId = MaterialBuilderWorker::GetUUID();
-        builderDescriptor.m_version = 5;
-        builderDescriptor.m_createJobFunction = AZStd::bind(&MaterialBuilderWorker::CreateJobs, &m_materialBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
-        builderDescriptor.m_processJobFunction = AZStd::bind(&MaterialBuilderWorker::ProcessJob, &m_materialBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
-
-        // (optimization) this builder does not emit source dependencies:
-        builderDescriptor.m_flags |= AssetBuilderSDK::AssetBuilderDesc::BF_EmitsNoDependencies;
-
-        m_materialBuilder.BusConnect(builderDescriptor.m_busId);
-
-        EBUS_EVENT(AssetBuilderSDK::AssetBuilderBus, RegisterBuilderInformation, builderDescriptor);
-    }
-
-    void BuilderPluginComponent::Deactivate()
-    {
-        m_materialBuilder.BusDisconnect();
-    }
-
-    void BuilderPluginComponent::Reflect([[maybe_unused]] AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<BuilderPluginComponent, AZ::Component>()
-                ->Version(1)
-                ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }));
-        }
-    }
-
-    MaterialBuilderWorker::MaterialBuilderWorker()
-    {
-    }
-    MaterialBuilderWorker::~MaterialBuilderWorker()
-    {
-    }
-
-    void MaterialBuilderWorker::ShutDown()
-    {
-        // This will be called on a different thread than the process job thread
-        m_isShuttingDown = true;
-    }
-
-    // This happens early on in the file scanning pass.
-    // This function should always create the same jobs and not do any checking whether the job is up to date.
-    void MaterialBuilderWorker::CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response)
-    {
-        if (m_isShuttingDown)
-        {
-            response.m_result = AssetBuilderSDK::CreateJobsResultCode::ShuttingDown;
-            return;
-        }
-
-        for (const AssetBuilderSDK::PlatformInfo& info : request.m_enabledPlatforms)
-        {
-            AssetBuilderSDK::JobDescriptor descriptor;
-            descriptor.m_jobKey = "Material Builder Job";
-            descriptor.SetPlatformIdentifier(info.m_identifier.c_str());
-            descriptor.m_priority = 8; // meshes are more important (at 10) but mats are still pretty important.
-            response.m_createJobOutputs.push_back(descriptor);
-        }
-
-        response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
-    }
-
-    // The request will contain the CreateJobResponse you constructed earlier, including any keys and
-    // values you placed into the hash table
-    void MaterialBuilderWorker::ProcessJob(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response)
-    {
-        AZ_TracePrintf(AssetBuilderSDK::InfoWindow, "Starting Job.\n");
-        AZStd::string fileName;
-        AzFramework::StringFunc::Path::GetFullFileName(request.m_fullPath.c_str(), fileName);
-        AZStd::string destPath;
-
-        // Do all work inside the tempDirPath.
-        AzFramework::StringFunc::Path::ConstructFull(request.m_tempDirPath.c_str(), fileName.c_str(), destPath, true);
-
-        AZ::IO::LocalFileIO fileIO;
-        if (!m_isShuttingDown && fileIO.Copy(request.m_fullPath.c_str(), destPath.c_str()) == AZ::IO::ResultCode::Success)
-        {
-            // Push assets back into the response's product list
-            // Assets you created in your temp path can be specified using paths relative to the temp path
-            // since that is assumed where you're writing stuff.
-            AZStd::string relPath = destPath;
-            AssetBuilderSDK::ProductPathDependencySet dependencyPaths;
-            response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-            AssetBuilderSDK::JobProduct jobProduct(fileName);
-
-            bool dependencyResult = GatherProductDependencies(request.m_fullPath, dependencyPaths);
-            if (dependencyResult)
-            {
-                jobProduct.m_pathDependencies = AZStd::move(dependencyPaths);
-                jobProduct.m_dependenciesHandled = true; // We've output the dependencies immediately above so it's OK to tell the AP we've handled dependencies
-            }
-            else
-            {
-                AZ_Error(s_materialBuilder, false, "Dependency gathering for %s failed.", request.m_fullPath.c_str());
-            }
-            response.m_outputProducts.push_back(jobProduct);
-        }
-        else
-        {
-            if (m_isShuttingDown)
-            {
-                AZ_TracePrintf(AssetBuilderSDK::ErrorWindow, "Cancelled job %s because shutdown was requested.\n", request.m_fullPath.c_str());
-                response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Cancelled;
-            }
-            else
-            {
-                AZ_TracePrintf(AssetBuilderSDK::ErrorWindow, "Error during processing job %s.\n", request.m_fullPath.c_str());
-                response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Failed;
-            }
-        }
-    }
-
-    bool MaterialBuilderWorker::GetResolvedTexturePathsFromMaterial(const AZStd::string& path, AZStd::vector<AZStd::string>& resolvedPaths)
-    {
-        if (!AZ::IO::SystemFile::Exists(path.c_str()))
-        {
-            AZ_Error(s_materialBuilder, false, "Failed to find material at path %s. Please make sure this material exists on disk.", path.c_str());
-            return false;
-        }
-
-        uint64_t fileSize = AZ::IO::SystemFile::Length(path.c_str());
-        if (fileSize == 0)
-        {
-            AZ_Error(s_materialBuilder, false, "Material at path %s is an empty file. Please make sure this material was properly saved to disk.", path.c_str());
-            return false;
-        }
-
-        AZStd::vector<char> buffer(fileSize + 1);
-        buffer[fileSize] = 0;
-        if (!AZ::IO::SystemFile::Read(path.c_str(), buffer.data()))
-        {
-            AZ_Error(s_materialBuilder, false, "Failed to read material at path %s. Please make sure the file is not open or being edited by another program.", path.c_str());
-            return false;
-        }
-
-        AZ::rapidxml::xml_document<char>* xmlDoc = azcreate(AZ::rapidxml::xml_document<char>, (), AZ::SystemAllocator, "Mtl builder temp XML Reader");
-        if (!xmlDoc->parse<AZ::rapidxml::parse_no_data_nodes>(buffer.data()))
-        {
-            azdestroy(xmlDoc, AZ::SystemAllocator, AZ::rapidxml::xml_document<char>);
-            AZ_Error(s_materialBuilder, false, "Failed to parse material at path %s into XML. Please make sure that the material was properly saved to disk.", path.c_str());
-            return false;
-        }
-
-        // if the first node in this file isn't a material, this must not actually be a material so it can't have deps
-        AZ::rapidxml::xml_node<char>* rootNode = xmlDoc->first_node(Internal::g_nodeNameMaterial);
-        if (!rootNode)
-        {
-            azdestroy(xmlDoc, AZ::SystemAllocator, AZ::rapidxml::xml_document<char>);
-            AZ_Error(s_materialBuilder, false, "Failed to find root material node for material at path %s. Please make sure that the material was properly saved to disk.", path.c_str());
-            return false;
-        }
-
-        AZStd::vector<AZStd::string> texturePaths;
-        // gather all textures in the material file
-        AZ::Outcome<AZStd::string, AZStd::string> texturePathsResult = Internal::GetTexturePathsFromMaterial(rootNode, texturePaths);
-        if (!texturePathsResult.IsSuccess())
-        {
-            azdestroy(xmlDoc, AZ::SystemAllocator, AZ::rapidxml::xml_document<char>);
-            AZ_Error(s_materialBuilder, false, "Failed to gather dependencies for %s as the material file is malformed. %s", path.c_str(), texturePathsResult.GetError().c_str());
-            return false;
-        }
-        else if (!texturePathsResult.GetValue().empty())
-        {
-            AZ_Warning(s_materialBuilder, false, "Some nodes in material %s could not be read as the material is malformed. %s. Some dependencies might not be reported correctly. Please make sure that the material was properly saved to disk.", path.c_str(), texturePathsResult.GetValue().c_str());
-        }
-        azdestroy(xmlDoc, AZ::SystemAllocator, AZ::rapidxml::xml_document<char>);
-
-        // fail this if there are absolute paths.
-        for (const AZStd::string& texPath : texturePaths)
-        {
-            if (AZ::IO::PathView(texPath).IsAbsolute())
-            {
-                AZ_Warning(s_materialBuilder, false, "Skipping resolving of texture path %s in material %s as the texture path is an absolute path. Please update the texture path to be relative to the asset cache.", texPath.c_str(), path.c_str());
-                texturePaths.erase(AZStd::find(texturePaths.begin(), texturePaths.end(), texPath));
-            }
-        }
-
-        // for each path in the array, split any texture animation entry up into the individual files and add each to the list.
-        for (const AZStd::string& texPath : texturePaths)
-        {
-            if (texPath.find('#') != AZStd::string::npos)
-            {
-                AZStd::vector<AZStd::string> actualTexturePaths;
-                AZ::Outcome<void, AZStd::string> parseTextureSequenceResult = Internal::GetAllTexturesInTextureSequence(texPath, actualTexturePaths);
-                if (parseTextureSequenceResult.IsSuccess())
-                {
-                    texturePaths.erase(AZStd::find(texturePaths.begin(), texturePaths.end(), texPath));
-                    texturePaths.insert(texturePaths.end(), actualTexturePaths.begin(), actualTexturePaths.end());
-                }
-                else
-                {
-                    texturePaths.erase(AZStd::find(texturePaths.begin(), texturePaths.end(), texPath));
-                    AZ_Warning(s_materialBuilder, false, "Failed to parse texture sequence %s when trying to gather dependencies for %s. %s Please make sure the texture sequence path is formatted correctly. Registering dependencies for the texture sequence will be skipped.", texPath.c_str(), path.c_str(), parseTextureSequenceResult.GetError().c_str());
-                }
-            }
-        }
-
-        // for each texture in the file
-        for (const AZStd::string& texPath : texturePaths)
-        {
-            // if the texture path starts with a '$' then it is a special runtime defined texture, so it it doesn't have
-            //  an actual asset on disk to depend on. If the texture path doesn't have an extension, then it is a texture
-            //  that is determined at runtime (such as 'nearest_cubemap'), so also ignore those, as other things pull in
-            //  those dependencies.
-            if (AzFramework::StringFunc::StartsWith(texPath, "$") || !AzFramework::StringFunc::Path::HasExtension(texPath.c_str()))
-            {
-                continue;
-            }
-
-            // resolve the path in the file.
-            AZStd::string resolvedPath;
-            if (!Internal::ResolveMaterialTexturePath(texPath, resolvedPath))
-            {
-                AZ_Warning(s_materialBuilder, false, "Failed to resolve texture path %s to a product path when gathering dependencies for %s. Registering dependencies on this texture path will be skipped.", texPath.c_str(), path.c_str());
-                continue;
-            }
-
-            resolvedPaths.emplace_back(AZStd::move(resolvedPath));
-        }
-
-        return true;
-    }
-
-    bool MaterialBuilderWorker::PopulateProductDependencyList(AZStd::vector<AZStd::string>& resolvedPaths, AssetBuilderSDK::ProductPathDependencySet& dependencies)
-    {
-        for (const AZStd::string& texturePath : resolvedPaths)
-        {
-            if (texturePath.empty())
-            {
-                AZ_Warning(s_materialBuilder, false, "Resolved path is empty.\n");
-                return false;
-            }
-
-            dependencies.emplace(texturePath, AssetBuilderSDK::ProductPathDependencyType::ProductFile);
-        }
-        return true;
-    }
-
-    bool MaterialBuilderWorker::GatherProductDependencies(const AZStd::string& path, AssetBuilderSDK::ProductPathDependencySet& dependencies)
-    {
-        AZStd::vector<AZStd::string> resolvedTexturePaths;
-        if (!GetResolvedTexturePathsFromMaterial(path, resolvedTexturePaths))
-        {
-            return false;
-        }
-
-        if (!PopulateProductDependencyList(resolvedTexturePaths, dependencies))
-        {
-            AZ_Warning(s_materialBuilder, false, "Failed to populate dependency list for material %s with possible variants for textures.", path.c_str());
-        }
-
-        return true;
-    }
-
-    AZ::Uuid MaterialBuilderWorker::GetUUID()
-    {
-        return AZ::Uuid::CreateString("{258D34AC-12F8-4196-B535-3206D8E7287B}");
-    }
-}
diff --git a/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h b/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h
deleted file mode 100644
index a7813cf0bd..0000000000
--- a/Gems/LmbrCentral/Code/Source/Builders/MaterialBuilder/MaterialBuilderComponent.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Component/Component.h>
-#include <AssetBuilderSDK/AssetBuilderBusses.h>
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-namespace MaterialBuilder
-{
-    //! Material builder is responsible for building material files
-    class MaterialBuilderWorker
-        : public AssetBuilderSDK::AssetBuilderCommandBus::Handler
-    {
-    public:
-        MaterialBuilderWorker();
-        ~MaterialBuilderWorker();
-
-        //! Asset Builder Callback Functions
-        void CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response);
-        void ProcessJob(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response);
-
-        //!AssetBuilderSDK::AssetBuilderCommandBus interface
-        void ShutDown() override;
-
-        //! Returns the UUID for this builder
-        static AZ::Uuid GetUUID();
-
-        bool GetResolvedTexturePathsFromMaterial(const AZStd::string& path, AZStd::vector<AZStd::string>& resolvedPaths);
-        bool PopulateProductDependencyList(AZStd::vector<AZStd::string>& resolvedPaths, AssetBuilderSDK::ProductPathDependencySet& dependencies);
-
-    private:
-        bool GatherProductDependencies(const AZStd::string& path, AssetBuilderSDK::ProductPathDependencySet& dependencies);
-
-        bool m_isShuttingDown = false;
-    };
-
-    class BuilderPluginComponent
-        : public AZ::Component
-    {
-    public:
-        AZ_COMPONENT(BuilderPluginComponent, "{4D1A4B0C-54CE-4397-B8AE-ADD08898C2CD}")
-        static void Reflect(AZ::ReflectContext* context);
-
-        BuilderPluginComponent();
-
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component
-        virtual void Init(); // create objects, allocate memory and initialize yourself without reaching out to the outside world
-        virtual void Activate(); // reach out to the outside world and connect up to what you need to, register things, etc.
-        virtual void Deactivate(); // unregister things, disconnect from the outside world
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual ~BuilderPluginComponent(); // free memory an uninitialize yourself.
-
-    private:
-        MaterialBuilderWorker m_materialBuilder;
-    };
-}
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
index 027d19fdef..84ef11b35d 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
@@ -38,9 +38,6 @@
 #include "Geometry/GeometrySystemComponent.h"
 #include <Asset/AssetSystemDebugComponent.h>
 
-// Unhandled asset types
-// Material
-#include "Unhandled/Material/MaterialAssetTypeInfo.h"
 // Other
 #include "Unhandled/Other/AudioAssetTypeInfo.h"
 #include "Unhandled/Other/CharacterPhysicsAssetTypeInfo.h"
@@ -80,6 +77,7 @@
 #include "Shape/CompoundShapeComponent.h"
 #include "Shape/SplineComponent.h"
 #include "Shape/PolygonPrismShapeComponent.h"
+#include "Shape/ReferenceShapeComponent.h"
 
 namespace LmbrCentral
 {
@@ -206,6 +204,7 @@ namespace LmbrCentral
             CapsuleShapeComponent::CreateDescriptor(),
             TubeShapeComponent::CreateDescriptor(),
             CompoundShapeComponent::CreateDescriptor(),
+            ReferenceShapeComponent::CreateDescriptor(),
             SplineComponent::CreateDescriptor(),
             PolygonPrismShapeComponent::CreateDescriptor(),
             NavigationSystemComponent::CreateDescriptor(),
@@ -353,8 +352,6 @@ namespace LmbrCentral
         // Add asset types and extensions to AssetCatalog. Uses "AssetCatalogService".
         if (auto assetCatalog = AZ::Data::AssetCatalogRequestBus::FindFirstHandler(); assetCatalog)
         {
-            assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<MaterialAsset>::Uuid());
-            assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<DccMaterialAsset>::Uuid());
             assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<MeshAsset>::Uuid());
             assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<CharacterDefinitionAsset>::Uuid());
 
@@ -364,24 +361,12 @@ namespace LmbrCentral
             assetCatalog->AddExtension("dds");
             assetCatalog->AddExtension("caf");
             assetCatalog->AddExtension("xml");
-            assetCatalog->AddExtension("mtl");
-            assetCatalog->AddExtension("dccmtl");
             assetCatalog->AddExtension("sprite");
             assetCatalog->AddExtension("cax");
         }
 
         AZ::Data::AssetManagerNotificationBus::Handler::BusConnect();
 
-
-        // Register unhandled asset type info
-        // Material
-        auto materialAssetTypeInfo = aznew MaterialAssetTypeInfo();
-        materialAssetTypeInfo->Register();
-        m_unhandledAssetInfo.emplace_back(materialAssetTypeInfo);
-        // DCC Material
-        auto dccMaterialAssetTypeInfo = aznew DccMaterialAssetTypeInfo();
-        dccMaterialAssetTypeInfo->Register();
-        m_unhandledAssetInfo.emplace_back(dccMaterialAssetTypeInfo);
         // Other
         auto audioAssetTypeInfo = aznew AudioAssetTypeInfo();
         audioAssetTypeInfo->Register();
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
index 511bf98582..69e7f57de8 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp
@@ -34,6 +34,7 @@
 #include "Shape/EditorSplineComponent.h"
 #include "Shape/EditorTubeShapeComponent.h"
 #include "Shape/EditorPolygonPrismShapeComponent.h"
+#include "Shape/EditorReferenceShapeComponent.h"
 #include "Editor/EditorCommentComponent.h"
 
 #include "Shape/EditorCompoundShapeComponent.h"
@@ -43,7 +44,6 @@
 #include <Builders/BenchmarkAssetBuilder/BenchmarkAssetBuilderComponent.h>
 #include <Builders/LevelBuilder/LevelBuilderComponent.h>
 #include <Builders/LuaBuilder/LuaBuilderComponent.h>
-#include <Builders/MaterialBuilder/MaterialBuilderComponent.h>
 #include <Builders/SliceBuilder/SliceBuilderComponent.h>
 #include <Builders/TranslationBuilder/TranslationBuilderComponent.h>
 #include "Builders/CopyDependencyBuilder/CopyDependencyBuilderComponent.h"
@@ -74,6 +74,7 @@ namespace LmbrCentral
             EditorCylinderShapeComponent::CreateDescriptor(),
             EditorCapsuleShapeComponent::CreateDescriptor(),
             EditorCompoundShapeComponent::CreateDescriptor(),
+            EditorReferenceShapeComponent::CreateDescriptor(),
             EditorSplineComponent::CreateDescriptor(),
             EditorPolygonPrismShapeComponent::CreateDescriptor(),
             EditorCommentComponent::CreateDescriptor(),
@@ -84,7 +85,6 @@ namespace LmbrCentral
             CopyDependencyBuilder::CopyDependencyBuilderComponent::CreateDescriptor(),
             DependencyBuilder::DependencyBuilderComponent::CreateDescriptor(),
             LevelBuilder::LevelBuilderComponent::CreateDescriptor(),
-            MaterialBuilder::BuilderPluginComponent::CreateDescriptor(),
             SliceBuilder::BuilderPluginComponent::CreateDescriptor(),
             TranslationBuilder::BuilderPluginComponent::CreateDescriptor(),
             LuaBuilder::BuilderPluginComponent::CreateDescriptor(),
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp
index 275a50c13b..f426bc6075 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/RandomTimedSpawnerComponent.cpp
@@ -13,6 +13,7 @@
 #include <LmbrCentral/Scripting/SpawnerComponentBus.h>
 
 #include <AzCore/Component/TransformBus.h>
+#include <AzCore/Time/ITime.h>
 
 namespace LmbrCentral
 {
@@ -88,8 +89,8 @@ namespace LmbrCentral
 
     void RandomTimedSpawnerComponent::Activate()
     {
-        AZStd::chrono::system_clock::time_point now = AZStd::chrono::system_clock::now();
-        m_currentTime = AZ::ScriptTimePoint(now).GetSeconds();
+        const AZ::TimeUs elapsedTimeUs = AZ::GetElapsedTimeUs();
+        m_currentTime = AZ::TimeUsToSecondsDouble(elapsedTimeUs);
         RandomTimedSpawnerComponentRequestBus::Handler::BusConnect(GetEntityId());
 
         CalculateNextSpawnTime();
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp
index f2701473f3..7eb3c62b5d 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp
@@ -92,7 +92,7 @@ namespace LmbrCentral
                 ;
 
             behaviorContext->EBus<TagGlobalRequestBus>("TagGlobalRequestBus")
-                ->Event("RequestTaggedEntities", &TagGlobalRequestBus::Events::RequestTaggedEntities)
+                ->Event("Get Entity By Tag", &TagGlobalRequestBus::Events::RequestTaggedEntities, "RequestTaggedEntities")
                 ;
             
             behaviorContext->EBus<TagComponentNotificationsBus>("TagComponentNotificationsBus")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
index c833677b1d..f78f2f048d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
@@ -36,8 +36,8 @@ namespace LmbrCentral
                     "Axis Aligned Box Shape", "The Axis Aligned Box Shape component creates a box around the associated entity")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box_Shape.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AxisAlignedBoxShape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/axis-aligned-box-shape/")
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorReferenceShapeComponent.cpp
similarity index 70%
rename from Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
rename to Gems/LmbrCentral/Code/Source/Shape/EditorReferenceShapeComponent.cpp
index 2fe8ae1e28..aca4fbc3b0 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorReferenceShapeComponent.cpp
@@ -10,11 +10,12 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <LmbrCentral/Dependency/DependencyNotificationBus.h>
+#include<LmbrCentral/Component/EditorWrappedComponentBase.h>
 
-namespace Vegetation
+namespace LmbrCentral
 {
     void EditorReferenceShapeComponent::Reflect(AZ::ReflectContext* context)
     {
-        ReflectSubClass<EditorReferenceShapeComponent, BaseClassType>(context, 1, &EditorVegetationComponentBaseVersionConverter<typename BaseClassType::WrappedComponentType, typename BaseClassType::WrappedConfigType>);
+        ReflectSubClass<EditorReferenceShapeComponent, BaseClassType>(context, 1, &EditorWrappedComponentBaseVersionConverter<typename BaseClassType::WrappedComponentType, typename BaseClassType::WrappedConfigType, 1>);
     }
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorReferenceShapeComponent.h
similarity index 59%
rename from Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
rename to Gems/LmbrCentral/Code/Source/Shape/EditorReferenceShapeComponent.h
index d0f9bf1ea0..fd98809bcc 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorReferenceShapeComponent.h
@@ -8,24 +8,24 @@
 
 #pragma once
 
-#include <Components/ReferenceShapeComponent.h>
-#include <Vegetation/Editor/EditorVegetationComponentBase.h>
+#include <LmbrCentral/Component/EditorWrappedComponentBase.h>
+#include <Shape/ReferenceShapeComponent.h>
 
-namespace Vegetation
+namespace LmbrCentral
 {
     class EditorReferenceShapeComponent
-        : public EditorVegetationComponentBase<ReferenceShapeComponent, ReferenceShapeConfig>
+        : public EditorWrappedComponentBase<ReferenceShapeComponent, ReferenceShapeConfig>
     {
     public:
-        using BaseClassType = EditorVegetationComponentBase<ReferenceShapeComponent, ReferenceShapeConfig>;
+        using BaseClassType = EditorWrappedComponentBase<ReferenceShapeComponent, ReferenceShapeConfig>;
         AZ_EDITOR_COMPONENT(EditorReferenceShapeComponent, EditorReferenceShapeComponentTypeId, BaseClassType);
         static void Reflect(AZ::ReflectContext* context);
 
-        static constexpr const char* const s_categoryName = "Vegetation";
-        static constexpr const char* const s_componentName = "Vegetation Reference Shape";
+        static constexpr const char* const s_categoryName = "Shape";
+        static constexpr const char* const s_componentName = "Shape Reference";
         static constexpr const char* const s_componentDescription = "Enables the entity to reference and reuse shape entities";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/ShapeReference.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/ShapeReference.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp
index 340752251d..fd91c84c12 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp
@@ -22,7 +22,7 @@ namespace LmbrCentral
 {
     AZ_CLASS_ALLOCATOR_IMPL(EditorTubeShapeComponentMode, AZ::SystemAllocator, 0)
 
-    static const AZ::Crc32 s_resetVariableRadii = AZ_CRC("com.o3de.action.tubeshape.reset_radii", 0x0f2ef8e2);
+    static const AZ::Crc32 s_resetVariableRadii = AZ_CRC("com.o3de.action.tubeshape.reset_radii", 0xa987659c);
     static const char* const s_resetRadiiTitle = "Reset Radii";
     static const char* const s_resetRadiiDesc = "Reset all variable radius values to the default";
 
diff --git a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/ReferenceShapeComponent.cpp
similarity index 99%
rename from Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
rename to Gems/LmbrCentral/Code/Source/Shape/ReferenceShapeComponent.cpp
index 620e43457d..7ed79fe3a3 100644
--- a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/ReferenceShapeComponent.cpp
@@ -11,7 +11,7 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
-namespace Vegetation
+namespace LmbrCentral
 {
     void ReferenceShapeConfig::Reflect(AZ::ReflectContext* context)
     {
@@ -27,7 +27,7 @@ namespace Vegetation
             if (edit)
             {
                 edit->Class<ReferenceShapeConfig>(
-                    "Vegetation Reference Shape", "")
+                    "Shape Reference", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/ReferenceShapeComponent.h
similarity index 98%
rename from Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h
rename to Gems/LmbrCentral/Code/Source/Shape/ReferenceShapeComponent.h
index dc61768bee..b4e11b13cb 100644
--- a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/ReferenceShapeComponent.h
@@ -12,16 +12,13 @@
 #include <AzCore/Component/EntityBus.h>
 #include <AzCore/Component/TransformBus.h>
 #include <LmbrCentral/Shape/ShapeComponentBus.h>
-#include <Vegetation/Ebuses/ReferenceShapeRequestBus.h>
+#include <LmbrCentral/Shape/ReferenceShapeComponentBus.h>
 
 namespace LmbrCentral
 {
     template<typename, typename>
     class EditorWrappedComponentBase;
-}
 
-namespace Vegetation
-{
     class ReferenceShapeConfig
         : public AZ::ComponentConfig
     {
diff --git a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
deleted file mode 100644
index 24bc43740d..0000000000
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "MaterialAssetTypeInfo.h"
-
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-
-namespace LmbrCentral
-{
-    // MaterialAssetTypeInfo
-
-    MaterialAssetTypeInfo::~MaterialAssetTypeInfo()
-    {
-        Unregister();
-    }
-
-    void MaterialAssetTypeInfo::Register()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusConnect(AZ::AzTypeInfo<MaterialAsset>::Uuid());
-    }
-
-    void MaterialAssetTypeInfo::Unregister()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusDisconnect(AZ::AzTypeInfo<MaterialAsset>::Uuid());
-    }
-
-    AZ::Data::AssetType MaterialAssetTypeInfo::GetAssetType() const
-    {
-        return AZ::AzTypeInfo<MaterialAsset>::Uuid();
-    }
-
-    const char* MaterialAssetTypeInfo::GetAssetTypeDisplayName() const
-    {
-        return "Material";
-    }
-
-    const char* MaterialAssetTypeInfo::GetGroup() const
-    {
-        return "Material";
-    }
-
-    const char* MaterialAssetTypeInfo::GetBrowserIcon() const
-    {
-        return "Icons/Components/Decal.svg";
-    }
-
-    // DccMaterialAssetTypeInfo
-
-    DccMaterialAssetTypeInfo::~DccMaterialAssetTypeInfo()
-    {
-        Unregister();
-    }
-
-    void DccMaterialAssetTypeInfo::Register()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusConnect(AZ::AzTypeInfo<DccMaterialAsset>::Uuid());
-    }
-
-    void DccMaterialAssetTypeInfo::Unregister()
-    {
-        AZ::AssetTypeInfoBus::Handler::BusDisconnect(AZ::AzTypeInfo<DccMaterialAsset>::Uuid());
-    }
-
-    AZ::Data::AssetType DccMaterialAssetTypeInfo::GetAssetType() const
-    {
-        return AZ::AzTypeInfo<DccMaterialAsset>::Uuid();
-    }
-
-    const char* DccMaterialAssetTypeInfo::GetAssetTypeDisplayName() const
-    {
-        return "DccMaterial";
-    }
-
-    const char* DccMaterialAssetTypeInfo::GetGroup() const
-    {
-        return "DccMaterial";
-    }
-
-    const char* DccMaterialAssetTypeInfo::GetBrowserIcon() const
-    {
-        return "Icons/Components/Decal.svg";
-    }
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h b/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h
deleted file mode 100644
index 2eafa31b41..0000000000
--- a/Gems/LmbrCentral/Code/Source/Unhandled/Material/MaterialAssetTypeInfo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/Asset/AssetTypeInfoBus.h>
-
-namespace LmbrCentral
-{
-    class MaterialAssetTypeInfo
-        : public AZ::AssetTypeInfoBus::Handler
-    {
-    public:
-
-        AZ_CLASS_ALLOCATOR(MaterialAssetTypeInfo, AZ::SystemAllocator, 0);
-
-        ~MaterialAssetTypeInfo() override;
-
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        // AZ::AssetTypeInfoBus::Handler
-        AZ::Data::AssetType GetAssetType() const override;
-        const char* GetAssetTypeDisplayName() const override;
-        const char* GetGroup() const override;
-        const char* GetBrowserIcon() const override;
-        //////////////////////////////////////////////////////////////////////////////////////////////
-
-        void Register();
-        void Unregister();
-    };
-
-    class DccMaterialAssetTypeInfo
-        : public AZ::AssetTypeInfoBus::Handler
-    {
-    public:
-
-        AZ_CLASS_ALLOCATOR(DccMaterialAssetTypeInfo, AZ::SystemAllocator, 0);
-
-        ~DccMaterialAssetTypeInfo() override;
-
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        // AZ::AssetTypeInfoBus::Handler
-        AZ::Data::AssetType GetAssetType() const override;
-        const char* GetAssetTypeDisplayName() const override;
-        const char* GetGroup() const override;
-        const char* GetBrowserIcon() const override;
-        //////////////////////////////////////////////////////////////////////////////////////////////
-
-        void Register();
-        void Unregister();
-    };
-} // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp
deleted file mode 100644
index 3786ef7565..0000000000
--- a/Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzTest/AzTest.h>
-#include <Builders/MaterialBuilder/MaterialBuilderComponent.h>
-#include <AzTest/Utils.h>
-#include <AzCore/UnitTest/TestTypes.h>
-#include <AzCore/IO/FileIO.h>
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-#include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzCore/IO/Path/Path.h>
-#include <AzCore/Utils/Utils.h>
-
-namespace UnitTest
-{
-    using namespace MaterialBuilder;
-    using namespace AZ;
-
-    class MaterialBuilderTests
-        : public UnitTest::AllocatorsTestFixture
-        , public UnitTest::TraceBusRedirector
-    {
-    protected:
-        void SetUp() override
-        {
-            UnitTest::AllocatorsTestFixture::SetUp();
-
-            m_app.reset(aznew AzToolsFramework::ToolsApplication);
-            m_app->Start(AZ::ComponentApplication::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
-            // in the unit tests.
-            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
-            AZ::Debug::TraceMessageBus::Handler::BusConnect();
-
-            const AZStd::string engineRoot = AZ::Test::GetEngineRootPath();
-            AZ::IO::FileIOBase::GetInstance()->SetAlias("@engroot@", engineRoot.c_str());
-
-            AZ::IO::Path assetRoot(AZ::Utils::GetProjectPath());
-            assetRoot /= "Cache";
-            AZ::IO::FileIOBase::GetInstance()->SetAlias("@products@", assetRoot.c_str());
-        }
-
-        void TearDown() override
-        {
-            AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
-            m_app->Stop();
-            m_app.reset();
-
-            UnitTest::AllocatorsTestFixture::TearDown();
-        }
-
-        AZStd::string GetTestFileAliasedPath(AZStd::string_view fileName)
-        {
-            constexpr char testFileFolder[] = "@engroot@/Gems/LmbrCentral/Code/Tests/Materials/";
-            return AZStd::string::format("%s%.*s", testFileFolder, aznumeric_cast<int>(fileName.size()), fileName.data());
-        }
-
-        AZStd::string GetTestFileFullPath(AZStd::string_view fileName)
-        {
-            AZStd::string aliasedPath = GetTestFileAliasedPath(fileName);
-            char resolvedPath[AZ_MAX_PATH_LEN];
-            AZ::IO::FileIOBase::GetInstance()->ResolvePath(aliasedPath.c_str(), resolvedPath, AZ_MAX_PATH_LEN);
-            return AZStd::string(resolvedPath);
-        }
-
-        void TestFailureCase(AZStd::string_view fileName, [[maybe_unused]] int expectedErrorCount)
-        {
-            MaterialBuilderWorker worker;
-            AZStd::vector<AZStd::string> resolvedPaths;
-
-            AZStd::string absoluteMatPath = GetTestFileFullPath(fileName);
-
-            AZ_TEST_START_ASSERTTEST;
-            ASSERT_FALSE(worker.GetResolvedTexturePathsFromMaterial(absoluteMatPath, resolvedPaths));
-            AZ_TEST_STOP_ASSERTTEST(expectedErrorCount * 2); // The assert tests double count AZ errors, so just multiply expected count by 2
-            ASSERT_EQ(resolvedPaths.size(), 0);
-        }
-
-        void TestSuccessCase(AZStd::string_view fileName, AZStd::vector<const char*>& expectedTextures)
-        {
-            MaterialBuilderWorker worker;
-            AZStd::vector<AZStd::string> resolvedPaths;
-            size_t texturesInMaterialFile = expectedTextures.size();
-
-            AZStd::string absoluteMatPath = GetTestFileFullPath(fileName);
-            ASSERT_TRUE(worker.GetResolvedTexturePathsFromMaterial(absoluteMatPath, resolvedPaths));
-            ASSERT_EQ(resolvedPaths.size(), texturesInMaterialFile);
-            if (texturesInMaterialFile > 0)
-            {
-                ASSERT_THAT(resolvedPaths, testing::ElementsAreArray(expectedTextures));
-
-                AssetBuilderSDK::ProductPathDependencySet dependencies;
-                ASSERT_TRUE(worker.PopulateProductDependencyList(resolvedPaths, dependencies));
-                ASSERT_EQ(dependencies.size(), texturesInMaterialFile);
-            }
-        }
-
-        void TestSuccessCase(AZStd::string_view fileName, const char* expectedTexture)
-        {
-            AZStd::vector<const char*> expectedTextures;
-            expectedTextures.push_back(expectedTexture);
-            TestSuccessCase(fileName, expectedTextures);
-        }
-
-        void TestSuccessCaseNoDependencies(AZStd::string_view fileName)
-        {
-            AZStd::vector<const char*> expectedTextures;
-            TestSuccessCase(fileName, expectedTextures);
-        }
-
-        AZStd::unique_ptr<AzToolsFramework::ToolsApplication> m_app;
-    };
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_EmptyFile_ExpectFailure)
-    {
-        // Should fail in MaterialBuilderWorker::GetResolvedTexturePathsFromMaterial, when checking for the size of the file.
-        TestFailureCase("test_mat1.mtl", 1);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_NoChildren_ExpectFailure)
-    {
-        // Should fail in MaterialBuilderWorker::GetResolvedTexturePathsFromMaterial after calling
-        //  Internal::GetTexturePathsFromMaterial, which should return an AZ::Failure when both a Textures node and a
-        //  SubMaterials node are not found. No other AZ_Errors should be generated.
-        TestFailureCase("test_mat2.mtl", 1);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_EmptyTexturesNode_NoDependencies)
-    {
-        TestSuccessCaseNoDependencies("test_mat3.mtl");
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_EmptySubMaterialNode_ExpectFailure)
-    {
-        // Should fail in MaterialBuilderWorker::GetResolvedTexturePathsFromMaterial after calling
-        //  Internal::GetTexturePathsFromMaterial, which should return an AZ::Failure when a SubMaterials node is present,
-        //  but has no children Material node. No other AZ_Errors should be generated.
-        TestFailureCase("test_mat4.mtl", 1);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_EmptyTextureNode_NoDependencies)
-    {
-        TestSuccessCaseNoDependencies("test_mat5.mtl");
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_EmptyMaterialInSubMaterial_ExpectFailure)
-    {
-        // Should fail in MaterialBuilderWorker::GetResolvedTexturePathsFromMaterial after calling
-        //  Internal::GetTexturePathsFromMaterial, which should return an AZ::Failure when a SubMaterials node is present,
-        //  but a child Material node has no child Textures node and no child SubMaterials node. No other AZ_Errors should
-        //  be generated.
-        TestFailureCase("test_mat6.mtl", 1);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_EmptyTextureNodeInSubMaterial_NoDependencies)
-    {
-        TestSuccessCaseNoDependencies("test_mat7.mtl");
-    }
-
-#if AZ_TRAIT_OS_USE_WINDOWS_FILE_PATHS // The following test file 'test_mat8.mtl' has a windows-specific absolute path, so this test is only valid on windows
-    TEST_F(MaterialBuilderTests, MaterialBuilder_TextureAbsolutePath_NoDependencies)
-    {
-        TestSuccessCaseNoDependencies("test_mat8.mtl");
-    }
-#endif
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_TextureRuntimeAlias_NoDependencies)
-    {
-        TestSuccessCaseNoDependencies("test_mat9.mtl");
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_TextureRuntimeTexture_NoDependencies)
-    {
-        TestSuccessCaseNoDependencies("test_mat10.mtl");
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SingleMaterialSingleTexture_ValidSourceFormat)
-    {
-        // texture referenced is textures/natural/terrain/am_floor_tile_ddn.png
-        const char* expectedPath = "textures/natural/terrain/am_floor_tile_ddn.dds";
-        TestSuccessCase("test_mat11.mtl", expectedPath);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SingleMaterialSingleTexture_ValidProductFormat)
-    {
-        // texture referenced is textures/natural/terrain/am_floor_tile_ddn.dds
-        const char* expectedPath = "textures/natural/terrain/am_floor_tile_ddn.dds";
-        TestSuccessCase("test_mat12.mtl", expectedPath);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SingleMaterialSingleTexture_InvalidSourceFormat_NoDependenices)
-    {
-        // texture referenced is textures/natural/terrain/am_floor_tile_ddn.txt
-        TestSuccessCaseNoDependencies("test_mat13.mtl");
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_TextureAnimSequence)
-    {
-        AZStd::vector<const char*> expectedPaths = {
-            "path/to/my/textures/test_anim_sequence_01_texture000.dds",
-            "path/to/my/textures/test_anim_sequence_01_texture001.dds",
-            "path/to/my/textures/test_anim_sequence_01_texture002.dds",
-            "path/to/my/textures/test_anim_sequence_01_texture003.dds",
-            "path/to/my/textures/test_anim_sequence_01_texture004.dds",
-            "path/to/my/textures/test_anim_sequence_01_texture005.dds"
-        };
-        TestSuccessCase("test_mat14.mtl", expectedPaths);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SingleMaterialMultipleTexture)
-    {
-        AZStd::vector<const char*> expectedPaths = {
-            "engineassets/textures/hex.dds",
-            "engineassets/textures/hex_ddn.dds"
-        };
-        TestSuccessCase("test_mat15.mtl", expectedPaths);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_MalformedMaterial_MultipleTextures_OneEmptyTexture)
-    {
-        TestSuccessCase("test_mat16.mtl", "engineassets/textures/hex_ddn.dds");
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SingleMaterialMultipleTexture_ResolveLeadingSeparatorsAndAliases)
-    {
-        AZStd::vector<const char*> expectedPaths = {
-            "engineassets/textures/hex.dds",        // resolved from "/engineassets/textures/hex.dds"
-            "engineassets/textures/hex_ddn.dds",    // resolved from "./engineassets/textures/hex_ddn.dds"
-            "engineassets/textures/hex_spec.dds"    // resolved from "@products@/engineassets/textures/hex_spec.dds"
-        };
-        TestSuccessCase("test_mat17.mtl", expectedPaths);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SubMaterialSingleTexture)
-    {
-        AZStd::vector<const char*> expectedPaths = {
-            "engineassets/textures/scratch.dds",
-            "engineassets/textures/perlinnoise2d.dds"
-        };
-        TestSuccessCase("test_mat18.mtl", expectedPaths);
-    }
-
-    TEST_F(MaterialBuilderTests, MaterialBuilder_SubMaterialMultipleTexture)
-    {
-        AZStd::vector<const char*> expectedPaths = {
-            "engineassets/textures/scratch.dds",
-            "engineassets/textures/scratch_ddn.dds",
-            "engineassets/textures/perlinnoise2d.dds",
-            "engineassets/textures/perlinnoisenormal_ddn.dds"
-        };
-        TestSuccessCase("test_mat19.mtl", expectedPaths);
-    }
-}
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
index 73ef7143c8..0965991dfa 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
@@ -311,7 +311,6 @@ namespace UnitTest
         SerializeContext* GetSerializeContext() override { return m_serializeContext; }
         BehaviorContext* GetBehaviorContext() override { return nullptr; }
         JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
-        const char* GetAppRoot() const override { return nullptr; }
         const char* GetEngineRoot() const override { return nullptr; }
         const char* GetExecutableFolder() const override { return nullptr; }
         void EnumerateEntities(const EntityCallback& /*callback*/) override {}
diff --git a/Gems/LmbrCentral/Code/Tests/ReferenceShapeTests.cpp b/Gems/LmbrCentral/Code/Tests/ReferenceShapeTests.cpp
new file mode 100644
index 0000000000..040badf7e1
--- /dev/null
+++ b/Gems/LmbrCentral/Code/Tests/ReferenceShapeTests.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzTest/AzTest.h>
+#include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/Math/Random.h>
+#include <AzCore/Memory/MemoryComponent.h>
+
+#include <LmbrCentral/Shape/MockShapes.h>
+#include <Shape/ReferenceShapeComponent.h>
+
+namespace UnitTest
+{
+    class ReferenceComponentTests
+        : public AllocatorsFixture
+    {
+    protected:
+        AZ::ComponentApplication m_app;
+
+        void SetUp() override
+        {
+            AZ::ComponentApplication::Descriptor appDesc;
+            appDesc.m_memoryBlocksByteSize = 20 * 1024 * 1024;
+            appDesc.m_recordingMode = AZ::Debug::AllocationRecords::RECORD_NO_RECORDS;
+            appDesc.m_stackRecordLevels = 20;
+
+            m_app.Create(appDesc);
+        }
+
+        void TearDown() override
+        {
+            m_app.Destroy();
+        }
+
+        template<typename Component, typename Configuration>
+        AZStd::unique_ptr<AZ::Entity> CreateEntity(const Configuration& config, Component** ppComponent)
+        {
+            m_app.RegisterComponentDescriptor(Component::CreateDescriptor());
+
+            auto entity = AZStd::make_unique<AZ::Entity>();
+
+            if (ppComponent)
+            {
+                *ppComponent = entity->CreateComponent<Component>(config);
+            }
+            else
+            {
+                entity->CreateComponent<Component>(config);
+            }
+
+            entity->Init();
+            EXPECT_EQ(AZ::Entity::State::Init, entity->GetState());
+
+            entity->Activate();
+            EXPECT_EQ(AZ::Entity::State::Active, entity->GetState());
+
+            return entity;
+        }
+
+        template<typename ComponentA, typename ComponentB>
+        bool IsComponentCompatible()
+        {
+            AZ::ComponentDescriptor::DependencyArrayType providedServicesA;
+            ComponentA::GetProvidedServices(providedServicesA);
+
+            AZ::ComponentDescriptor::DependencyArrayType incompatibleServicesB;
+            ComponentB::GetIncompatibleServices(incompatibleServicesB);
+
+            for (auto providedServiceA : providedServicesA)
+            {
+                for (auto incompatibleServiceB : incompatibleServicesB)
+                {
+                    if (providedServiceA == incompatibleServiceB)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        template<typename ComponentA, typename ComponentB>
+        bool AreComponentsCompatible()
+        {
+            return IsComponentCompatible<ComponentA, ComponentB>() && IsComponentCompatible<ComponentB, ComponentA>();
+        }
+    };
+
+    TEST_F(ReferenceComponentTests, VerifyCompatibility)
+    {
+        EXPECT_FALSE((AreComponentsCompatible<LmbrCentral::ReferenceShapeComponent, LmbrCentral::ReferenceShapeComponent>()));
+    }
+
+    TEST_F(ReferenceComponentTests, ReferenceShapeComponent_WithValidReference)
+    {
+        UnitTest::MockShape testShape;
+
+        LmbrCentral::ReferenceShapeConfig config;
+        config.m_shapeEntityId = testShape.m_entity.GetId();
+
+        LmbrCentral::ReferenceShapeComponent* component;
+        auto entity = CreateEntity(config, &component);
+
+        AZ::RandomDistributionType randomDistribution = AZ::RandomDistributionType::Normal;
+        AZ::Vector3 randPos = AZ::Vector3::CreateOne();
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            randPos, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GenerateRandomPointInside, randomDistribution);
+        EXPECT_EQ(AZ::Vector3::CreateZero(), randPos);
+
+        testShape.m_aabb = AZ::Aabb::CreateFromPoint(AZ::Vector3(1.0f, 21.0f, 31.0f));
+        AZ::Aabb resultAABB;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultAABB, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetEncompassingAabb);
+        EXPECT_EQ(testShape.m_aabb, resultAABB);
+
+        AZ::Crc32 resultCRC = {};
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultCRC, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetShapeType);
+        EXPECT_EQ(AZ_CRC("TestShape", 0x856ca50c), resultCRC);
+
+        testShape.m_localBounds = AZ::Aabb::CreateFromPoint(AZ::Vector3(1.0f, 21.0f, 31.0f));
+        testShape.m_localTransform = AZ::Transform::CreateTranslation(testShape.m_localBounds.GetCenter());
+        AZ::Transform resultTransform = AZ::Transform::CreateIdentity();
+        AZ::Aabb resultBounds = AZ::Aabb::CreateNull();
+        LmbrCentral::ShapeComponentRequestsBus::Event(
+            entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetTransformAndLocalBounds, resultTransform, resultBounds);
+        EXPECT_EQ(testShape.m_localTransform, resultTransform);
+        EXPECT_EQ(testShape.m_localBounds, resultBounds);
+
+        testShape.m_pointInside = true;
+        bool resultPointInside = false;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultPointInside, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IsPointInside, AZ::Vector3::CreateZero());
+        EXPECT_EQ(testShape.m_pointInside, resultPointInside);
+
+        testShape.m_distanceSquaredFromPoint = 456.0f;
+        float resultdistanceSquaredFromPoint = 0;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultdistanceSquaredFromPoint, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::DistanceSquaredFromPoint,
+            AZ::Vector3::CreateZero());
+        EXPECT_EQ(testShape.m_distanceSquaredFromPoint, resultdistanceSquaredFromPoint);
+
+        testShape.m_intersectRay = false;
+        bool resultIntersectRay = false;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultIntersectRay, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IntersectRay, AZ::Vector3::CreateZero(),
+            AZ::Vector3::CreateZero(), 0.0f);
+        EXPECT_TRUE(testShape.m_intersectRay == resultIntersectRay);
+    }
+
+    TEST_F(ReferenceComponentTests, ReferenceShapeComponent_WithInvalidReference)
+    {
+        LmbrCentral::ReferenceShapeConfig config;
+        config.m_shapeEntityId = AZ::EntityId();
+
+        LmbrCentral::ReferenceShapeComponent* component;
+        auto entity = CreateEntity(config, &component);
+
+        AZ::RandomDistributionType randomDistribution = AZ::RandomDistributionType::Normal;
+        AZ::Vector3 randPos = AZ::Vector3::CreateOne();
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            randPos, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GenerateRandomPointInside, randomDistribution);
+        EXPECT_EQ(randPos, AZ::Vector3::CreateZero());
+
+        AZ::Aabb resultAABB;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultAABB, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetEncompassingAabb);
+        EXPECT_EQ(resultAABB, AZ::Aabb::CreateNull());
+
+        AZ::Crc32 resultCRC;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultCRC, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetShapeType);
+        EXPECT_EQ(resultCRC, AZ::Crc32(AZ::u32(0)));
+
+        AZ::Transform resultTransform;
+        AZ::Aabb resultBounds;
+        LmbrCentral::ShapeComponentRequestsBus::Event(
+            entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetTransformAndLocalBounds, resultTransform, resultBounds);
+        EXPECT_EQ(resultTransform, AZ::Transform::CreateIdentity());
+        EXPECT_EQ(resultBounds, AZ::Aabb::CreateNull());
+
+        bool resultPointInside = true;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultPointInside, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IsPointInside, AZ::Vector3::CreateZero());
+        EXPECT_EQ(resultPointInside, false);
+
+        float resultdistanceSquaredFromPoint = 0;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultdistanceSquaredFromPoint, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::DistanceSquaredFromPoint,
+            AZ::Vector3::CreateZero());
+        EXPECT_EQ(resultdistanceSquaredFromPoint, FLT_MAX);
+
+        bool resultIntersectRay = true;
+        LmbrCentral::ShapeComponentRequestsBus::EventResult(
+            resultIntersectRay, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IntersectRay, AZ::Vector3::CreateZero(),
+            AZ::Vector3::CreateZero(), 0.0f);
+        EXPECT_EQ(resultIntersectRay, false);
+    }
+} // namespace UnitTest
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h
index 66e992890e..b4cefa8502 100644
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h
@@ -10,7 +10,6 @@
 #include <AzCore/Asset/AssetCommon.h>
 
 #include <smartptr.h>
-#include <IStatObj.h>
 
 namespace LmbrCentral
 {
@@ -18,13 +17,8 @@ namespace LmbrCentral
         : public AZ::Data::AssetData
     {
     public:
-        using MeshPtr = IStatObj*;
-
         AZ_RTTI(MeshAsset, "{C2869E3B-DDA0-4E01-8FE3-6770D788866B}", AZ::Data::AssetData);
         AZ_CLASS_ALLOCATOR(MeshAsset, AZ::SystemAllocator, 0);
-
-        /// The assigned static mesh instance.
-        MeshPtr m_statObj = nullptr;
     };
 
     // for "character definition files"
diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h
deleted file mode 100644
index 0b8ec56a0f..0000000000
--- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Component/Entity.h>
-
-struct IRenderNode;
-
-namespace LmbrCentral
-{
-    /*!
-     * Messages services by anything that adds an IRenderNode to an Entity.
-     */
-    class RenderNodeRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        //////////////////////////////////////////////////////////////////////////
-        // EBusTraits overrides
-        // Any number of handlers per EntityId, called in order.
-        using BusIdType = AZ::EntityId;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::MultipleAndOrdered;
-        bool Compare(const RenderNodeRequests* rhs) const
-        {
-            return GetRenderNodeRequestBusOrder() < rhs->GetRenderNodeRequestBusOrder();
-        }
-        //////////////////////////////////////////////////////////////////////////
-
-        virtual IRenderNode* GetRenderNode() = 0;
-
-        //! Order in which each bus handler is invoked, lower numbers are first.
-        //! In situations where only one render node is expected,
-        //! the first bus handler is used.
-        virtual float GetRenderNodeRequestBusOrder() const = 0;
-    };
-
-    using RenderNodeRequestBus = AZ::EBus<RenderNodeRequests>;
-} // namespace LmbrCentral
diff --git a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ReferenceShapeComponentBus.h
similarity index 81%
rename from Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h
rename to Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ReferenceShapeComponentBus.h
index d6f517117b..2aec1a7614 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h
+++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Shape/ReferenceShapeComponentBus.h
@@ -11,8 +11,11 @@
 #include <AzCore/Component/ComponentBus.h>
 #include <AzCore/Component/EntityId.h>
 
-namespace Vegetation
+namespace LmbrCentral
 {
+    // Type ID for Reference EditorReferenceShapeComponent
+    static const char* EditorReferenceShapeComponentTypeId = "{21BC79CA-C2F4-428F-AF2E-B76E233D4254}";
+
     class ReferenceShapeRequests
         : public AZ::ComponentBus
     {
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
index 5c77888922..24f9ff6dcd 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake
@@ -60,6 +60,8 @@ set(FILES
     Source/Shape/EditorCompoundShapeComponent.cpp
     Source/Shape/EditorQuadShapeComponent.h
     Source/Shape/EditorQuadShapeComponent.cpp
+    Source/Shape/EditorReferenceShapeComponent.h
+    Source/Shape/EditorReferenceShapeComponent.cpp
     Source/Shape/EditorSplineComponent.h
     Source/Shape/EditorSplineComponent.cpp
     Source/Shape/EditorSplineComponentMode.h
@@ -116,8 +118,6 @@ set(FILES
     Source/Builders/LevelBuilder/LevelBuilderComponent.h
     Source/Builders/LevelBuilder/LevelBuilderWorker.cpp
     Source/Builders/LevelBuilder/LevelBuilderWorker.h
-    Source/Builders/MaterialBuilder/MaterialBuilderComponent.cpp
-    Source/Builders/MaterialBuilder/MaterialBuilderComponent.h
     Source/Builders/SliceBuilder/SliceBuilderComponent.cpp
     Source/Builders/SliceBuilder/SliceBuilderComponent.h
     Source/Builders/SliceBuilder/SliceBuilderWorker.cpp
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
index 0f0cf484d1..afba79e566 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_tests_files.cmake
@@ -21,7 +21,6 @@ set(FILES
     Tests/Builders/CopyDependencyBuilderTest.cpp
     Tests/Builders/SliceBuilderTests.cpp
     Tests/Builders/LevelBuilderTest.cpp
-    Tests/Builders/MaterialBuilderTests.cpp
     Tests/Builders/LuaBuilderTests.cpp
     Tests/Builders/SeedBuilderTests.cpp
     Source/LmbrCentral.cpp
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
index 18412e2a38..6d224250fc 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake
@@ -7,59 +7,6 @@
 #
 
 set(FILES
-    include/LmbrCentral/Ai/NavigationComponentBus.h
-    include/LmbrCentral/Ai/NavigationAreaBus.h
-    include/LmbrCentral/Ai/NavigationSystemBus.h
-    include/LmbrCentral/Ai/NavigationSeedBus.h
-    include/LmbrCentral/Animation/AttachmentComponentBus.h
-    include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
-    include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h
-    include/LmbrCentral/Audio/AudioListenerComponentBus.h
-    include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h
-    include/LmbrCentral/Audio/AudioPreloadComponentBus.h
-    include/LmbrCentral/Audio/AudioProxyComponentBus.h
-    include/LmbrCentral/Audio/AudioRtpcComponentBus.h
-    include/LmbrCentral/Audio/AudioSwitchComponentBus.h
-    include/LmbrCentral/Audio/AudioSystemComponentBus.h
-    include/LmbrCentral/Audio/AudioTriggerComponentBus.h
-    include/LmbrCentral/Bundling/BundlingSystemComponentBus.h
-    include/LmbrCentral/Geometry/GeometrySystemComponentBus.h
-    include/LmbrCentral/Dependency/DependencyMonitor.h
-    include/LmbrCentral/Dependency/DependencyMonitor.inl
-    include/LmbrCentral/Dependency/DependencyNotificationBus.h
-    include/LmbrCentral/Physics/WindVolumeRequestBus.h
-    include/LmbrCentral/Physics/ForceVolumeRequestBus.h
-    include/LmbrCentral/Physics/WaterNotificationBus.h
-    include/LmbrCentral/Rendering/DecalComponentBus.h
-    include/LmbrCentral/Rendering/LightComponentBus.h
-    include/LmbrCentral/Rendering/MaterialAsset.h
-    include/LmbrCentral/Rendering/MaterialHandle.h
-    include/LmbrCentral/Rendering/MeshAsset.h
-    include/LmbrCentral/Rendering/MeshModificationBus.h
-    include/LmbrCentral/Rendering/RenderNodeBus.h
-    include/LmbrCentral/Rendering/GiRegistrationBus.h
-    include/LmbrCentral/Rendering/RenderBoundsBus.h
-    include/LmbrCentral/Scripting/EditorTagComponentBus.h
-    include/LmbrCentral/Scripting/GameplayNotificationBus.h
-    include/LmbrCentral/Scripting/SimpleStateComponentBus.h
-    include/LmbrCentral/Scripting/SpawnerComponentBus.h
-    include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h
-    include/LmbrCentral/Scripting/TagComponentBus.h
-    include/LmbrCentral/Shape/EditorShapeComponentBus.h
-    include/LmbrCentral/Shape/ShapeComponentBus.h
-    include/LmbrCentral/Shape/SphereShapeComponentBus.h
-    include/LmbrCentral/Shape/BoxShapeComponentBus.h
-    include/LmbrCentral/Shape/CylinderShapeComponentBus.h
-    include/LmbrCentral/Shape/CapsuleShapeComponentBus.h
-    include/LmbrCentral/Shape/DiskShapeComponentBus.h
-    include/LmbrCentral/Shape/CompoundShapeComponentBus.h
-    include/LmbrCentral/Shape/QuadShapeComponentBus.h
-    include/LmbrCentral/Shape/SplineComponentBus.h
-    include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h
-    include/LmbrCentral/Shape/TubeShapeComponentBus.h
-    include/LmbrCentral/Shape/SplineAttribute.h
-    include/LmbrCentral/Shape/SplineAttribute.inl
-    include/LmbrCentral/Terrain/TerrainSystemRequestBus.h
     Source/Ai/NavigationSystemComponent.h
     Source/Ai/NavigationSystemComponent.cpp
     Source/Audio/AudioAreaEnvironmentComponent.h
@@ -140,13 +87,13 @@ set(FILES
     Source/Shape/PolygonPrismShapeComponent.cpp
     Source/Shape/TubeShapeComponent.h
     Source/Shape/TubeShapeComponent.cpp
+    Source/Shape/ReferenceShapeComponent.h
+    Source/Shape/ReferenceShapeComponent.cpp
     Source/Shape/ShapeComponentConverters.h
     Source/Shape/ShapeComponentConverters.cpp
     Source/Shape/ShapeComponentConverters.inl
     Source/Shape/ShapeGeometryUtil.h
     Source/Shape/ShapeGeometryUtil.cpp
-    Source/Unhandled/Material/MaterialAssetTypeInfo.cpp
-    Source/Unhandled/Material/MaterialAssetTypeInfo.h
     Source/Unhandled/Other/AudioAssetTypeInfo.cpp
     Source/Unhandled/Other/AudioAssetTypeInfo.h
     Source/Unhandled/Other/CharacterPhysicsAssetTypeInfo.cpp
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake
new file mode 100644
index 0000000000..270a46cf32
--- /dev/null
+++ b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake
@@ -0,0 +1,63 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    include/LmbrCentral/Ai/NavigationComponentBus.h
+    include/LmbrCentral/Ai/NavigationAreaBus.h
+    include/LmbrCentral/Ai/NavigationSystemBus.h
+    include/LmbrCentral/Ai/NavigationSeedBus.h
+    include/LmbrCentral/Animation/AttachmentComponentBus.h
+    include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h
+    include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h
+    include/LmbrCentral/Audio/AudioListenerComponentBus.h
+    include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h
+    include/LmbrCentral/Audio/AudioPreloadComponentBus.h
+    include/LmbrCentral/Audio/AudioProxyComponentBus.h
+    include/LmbrCentral/Audio/AudioRtpcComponentBus.h
+    include/LmbrCentral/Audio/AudioSwitchComponentBus.h
+    include/LmbrCentral/Audio/AudioSystemComponentBus.h
+    include/LmbrCentral/Audio/AudioTriggerComponentBus.h
+    include/LmbrCentral/Bundling/BundlingSystemComponentBus.h
+    include/LmbrCentral/Geometry/GeometrySystemComponentBus.h
+    include/LmbrCentral/Dependency/DependencyMonitor.h
+    include/LmbrCentral/Dependency/DependencyMonitor.inl
+    include/LmbrCentral/Dependency/DependencyNotificationBus.h
+    include/LmbrCentral/Physics/WindVolumeRequestBus.h
+    include/LmbrCentral/Physics/ForceVolumeRequestBus.h
+    include/LmbrCentral/Physics/WaterNotificationBus.h
+    include/LmbrCentral/Rendering/DecalComponentBus.h
+    include/LmbrCentral/Rendering/LightComponentBus.h
+    include/LmbrCentral/Rendering/MaterialAsset.h
+    include/LmbrCentral/Rendering/MaterialHandle.h
+    include/LmbrCentral/Rendering/MeshAsset.h
+    include/LmbrCentral/Rendering/MeshModificationBus.h
+    include/LmbrCentral/Rendering/GiRegistrationBus.h
+    include/LmbrCentral/Rendering/RenderBoundsBus.h
+    include/LmbrCentral/Scripting/EditorTagComponentBus.h
+    include/LmbrCentral/Scripting/GameplayNotificationBus.h
+    include/LmbrCentral/Scripting/SimpleStateComponentBus.h
+    include/LmbrCentral/Scripting/SpawnerComponentBus.h
+    include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h
+    include/LmbrCentral/Scripting/TagComponentBus.h
+    include/LmbrCentral/Shape/EditorShapeComponentBus.h
+    include/LmbrCentral/Shape/ShapeComponentBus.h
+    include/LmbrCentral/Shape/SphereShapeComponentBus.h
+    include/LmbrCentral/Shape/BoxShapeComponentBus.h
+    include/LmbrCentral/Shape/CylinderShapeComponentBus.h
+    include/LmbrCentral/Shape/CapsuleShapeComponentBus.h
+    include/LmbrCentral/Shape/DiskShapeComponentBus.h
+    include/LmbrCentral/Shape/CompoundShapeComponentBus.h
+    include/LmbrCentral/Shape/QuadShapeComponentBus.h
+    include/LmbrCentral/Shape/SplineComponentBus.h
+    include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h
+    include/LmbrCentral/Shape/TubeShapeComponentBus.h
+    include/LmbrCentral/Shape/ReferenceShapeComponentBus.h
+    include/LmbrCentral/Shape/SplineAttribute.h
+    include/LmbrCentral/Shape/SplineAttribute.inl
+    include/LmbrCentral/Terrain/TerrainSystemRequestBus.h
+)
diff --git a/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake
index c0f1ffd9ec..97e5d87829 100644
--- a/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake
+++ b/Gems/LmbrCentral/Code/lmbrcentral_tests_files.cmake
@@ -24,5 +24,6 @@ set(FILES
     Tests/SpawnerComponentTest.cpp
     Tests/SplineComponentTests.cpp
     Tests/DiskShapeTest.cpp
+    Tests/ReferenceShapeTests.cpp
     Source/LmbrCentral.cpp
 )
diff --git a/Gems/LyShine/Assets/seedList.seed b/Gems/LyShine/Assets/seedList.seed
index b19aa77191..6b53200c4a 100644
--- a/Gems/LyShine/Assets/seedList.seed
+++ b/Gems/LyShine/Assets/seedList.seed
@@ -2,8 +2,8 @@
 	<Class name="AZStd::vector" type="{82FC5264-88D0-57CD-9307-FC52E4DAD550}">
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{99FDCF74-F290-5367-BAE4-05AB38996ED8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="AZ::Uuid" field="guid" value="{44E2934E-9CB7-568F-A59C-D72D83E642F0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			<Class name="AZStd::string" field="pathHint" value="textures/cursor_default.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
diff --git a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
index ca3701743e..84ff2e19a7 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
+++ b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
@@ -27,8 +27,6 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex,
     , m_presetIndex(defaultPresetIndex)
     , m_buttons(AnchorPresets::PresetIndexCount, nullptr)
 {
-    setFixedSize(UICANVASEDITOR_ANCHOR_WIDGET_FIXED_SIZE, UICANVASEDITOR_ANCHOR_WIDGET_FIXED_SIZE);
-
     // The layout.
     QGridLayout* grid = new QGridLayout(this);
     grid->setContentsMargins(0, 0, 0, 0);
@@ -38,6 +36,7 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex,
     {
         for (int presetIndex = 0; presetIndex < AnchorPresets::PresetIndexCount; ++presetIndex)
         {
+            QLayout* boxLayout = new QVBoxLayout();
             PresetButton* button = new PresetButton(UICANVASEDITOR_ANCHOR_ICON_PATH_DEFAULT(presetIndex),
                     UICANVASEDITOR_ANCHOR_ICON_PATH_HOVER(presetIndex),
                     UICANVASEDITOR_ANCHOR_ICON_PATH_SELECTED(presetIndex),
@@ -50,8 +49,9 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex,
                         presetChanger(presetIndex);
                     },
                     this);
-
-            grid->addWidget(button, (presetIndex / 4), (presetIndex % 4));
+            boxLayout->addWidget(button);
+            boxLayout->setContentsMargins(2, 2, 2, 2);
+            grid->addItem(boxLayout, (presetIndex / 4), (presetIndex % 4));
 
             m_buttons[ presetIndex ] = button;
         }
diff --git a/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp b/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
index 8f8864106b..1e81f2e179 100644
--- a/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
@@ -13,7 +13,6 @@
 #include "AnimationContext.h"
 
 #include <LyShine/Animation/IUiAnimation.h>
-#include "ITimer.h"
 #include "GameEngine.h"
 
 #include "Objects/SelectionGroup.h"
@@ -29,6 +28,27 @@
 #include "IPostRenderer.h"
 #include "UiEditorAnimationBus.h"
 
+#include <AzCore/Time/ITime.h>
+
+namespace Internal
+{
+    float GetFrameDeltaTime()
+    {
+        const AZ::TimeUs frameDeltaTimeMs = AZ::GetSimulationTickDeltaTimeUs();
+        return AZ::TimeUsToSeconds(frameDeltaTimeMs);
+    }
+
+    float GetFrameRate()
+    {
+        const float deltaTime = GetFrameDeltaTime();
+        if (AZ::IsClose(deltaTime, 0.0f))
+        {
+            return 0.0f;
+        }
+        return 1.0f / deltaTime;
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////
 // Animation Callback.
 //////////////////////////////////////////////////////////////////////////
@@ -380,17 +400,15 @@ void CUiAnimationContext::Update()
         return;
     }
 
-    ITimer* pTimer = GetIEditor()->GetSystem()->GetITimer();
-
     AnimateActiveSequence();
 
-    float dt = pTimer->GetFrameTime();
-    m_currTime += dt * m_fTimeScale;
+    const float frameDeltaTime = Internal::GetFrameDeltaTime();
+    m_currTime += frameDeltaTime * m_fTimeScale;
 
     if (!m_recording)
     {
-        GetUiAnimationSystem()->PreUpdate(dt);
-        GetUiAnimationSystem()->PostUpdate(dt);
+        GetUiAnimationSystem()->PreUpdate(frameDeltaTime);
+        GetUiAnimationSystem()->PostUpdate(frameDeltaTime);
     }
 
     if (m_currTime > m_timeMarker.end)
@@ -444,7 +462,7 @@ void CUiAnimationContext::OnPostRender()
     {
         SUiAnimContext ac;
         ac.dt = 0;
-        ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
+        ac.fps = Internal::GetFrameRate();
         ac.time = m_currTime;
         ac.bSingleFrame = true;
         ac.bForcePlay = true;
@@ -586,7 +604,7 @@ void CUiAnimationContext::AnimateActiveSequence()
 
     SUiAnimContext ac;
     ac.dt = 0;
-    ac.fps = GetIEditor()->GetSystem()->GetITimer()->GetFrameRate();
+    ac.fps = Internal::GetFrameRate();
     ac.time = m_currTime;
     ac.bSingleFrame = true;
     ac.bForcePlay = true;
diff --git a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
index 60109fc49c..9dc44d3046 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
@@ -2182,18 +2182,6 @@ void AbstractSplineWidget::MoveSelectedKeys(Vec2 offset, bool copyKeys)
         }
     }
 
-    int rangeMin = aznumeric_cast<int>(TimeToXOfs(affectedRangeMin));
-    int rangeMax = aznumeric_cast<int>(TimeToXOfs(affectedRangeMax));
-
-    if (m_timeRange.start == affectedRangeMin)
-    {
-        rangeMin = m_rcSpline.left();
-    }
-    if (m_timeRange.end == affectedRangeMax)
-    {
-        rangeMax = m_rcSpline.right();
-    }
-
     if (m_pTimelineCtrl)
     {
         m_pTimelineCtrl->update();
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
index e6c2dda74c..9ad9a50aa5 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
@@ -257,6 +257,7 @@ BOOL CUiAnimViewDialog::OnInitDialog()
     m_wndSplitter->addWidget(m_wndDopeSheet);
     m_wndSplitter->setStretchFactor(0, 1);
     m_wndSplitter->setStretchFactor(1, 10);
+    m_wndSplitter->setChildrenCollapsible(false);
     l->addWidget(m_wndSplitter);
     w->setLayout(l);
     setCentralWidget(w);
@@ -283,6 +284,11 @@ BOOL CUiAnimViewDialog::OnInitDialog()
     m_wndCurveEditorDock->setVisible(false);
     m_wndCurveEditorDock->setEnabled(false);
 
+    // In order to prevent the track editor view from collapsing and becoming invisible, we use the
+    // minimum size of the curve editor for the track editor as well. Since both editors use the same
+    // view widget in the UI animation editor when not in 'Both' mode, the sizes can be identical.
+    m_wndDopeSheet->setMinimumSize(m_wndCurveEditor->minimumSizeHint());
+
     InitSequences();
 
     m_lazyInitDone = false;
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
index 9f67503b73..33df1b9624 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
@@ -1866,24 +1866,22 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe
 
     if (pTrack && inRange)
     {
-        bool keyCreated = false;
-        if (bTryAddKeysInGroup && pNode->GetParentNode())       // Add keys in group
+        if (bTryAddKeysInGroup && pNode->GetParentNode()) // Add keys in group
         {
             CUiAnimViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType());
             for (int i = 0; i < (int)tracksInGroup.GetCount(); ++i)
             {
                 CUiAnimViewTrack* pCurrTrack = tracksInGroup.GetTrack(i);
 
-                if (pCurrTrack->GetChildCount() == 0)   // A simple track
+                if (pCurrTrack->GetChildCount() == 0) // A simple track
                 {
                     if (IsOkToAddKeyHere(pCurrTrack, keyTime))
                     {
                         RecordTrackUndo(pCurrTrack);
                         pCurrTrack->CreateKey(keyTime);
-                        keyCreated = true;
                     }
                 }
-                else                                                                            // A compound track
+                else // A compound track
                 {
                     for (unsigned int k = 0; k < pCurrTrack->GetChildCount(); ++k)
                     {
@@ -1892,26 +1890,24 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe
                         {
                             RecordTrackUndo(pSubTrack);
                             pSubTrack->CreateKey(keyTime);
-                            keyCreated = true;
                         }
                     }
                 }
             }
         }
-        else if (pTrack->GetChildCount() == 0)          // A simple track
+        else if (pTrack->GetChildCount() == 0) // A simple track
         {
             if (IsOkToAddKeyHere(pTrack, keyTime))
             {
                 RecordTrackUndo(pTrack);
                 pTrack->CreateKey(keyTime);
-                keyCreated = true;
             }
         }
-        else                                                                                // A compound track
+        else // A compound track
         {
             if (pTrack->GetValueType() == eUiAnimValue_RGB)
             {
-                keyCreated = CreateColorKey(pTrack, keyTime);
+                CreateColorKey(pTrack, keyTime);
             }
             else
             {
@@ -1922,7 +1918,6 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe
                     if (IsOkToAddKeyHere(pSubTrack, keyTime))
                     {
                         pSubTrack->CreateKey(keyTime);
-                        keyCreated = true;
                     }
                 }
             }
@@ -2236,7 +2231,6 @@ void CUiAnimViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter*
 void CUiAnimViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CUiAnimViewTrack* pTrack, const QRect& rc)
 {
     int x0 = TimeToClient(timeRange.start);
-    float t0 = timeRange.start;
 
     const QBrush prevBrush = painter->brush();
     painter->setBrush(m_visibilityBrush);
@@ -2267,7 +2261,6 @@ void CUiAnimViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* p
             painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
         }
 
-        t0 = time;
         x0 = x;
     }
     int x = TimeToClient(timeRange.end);
diff --git a/Gems/LyShine/Code/Editor/EditorWindow.cpp b/Gems/LyShine/Code/Editor/EditorWindow.cpp
index a4ad4d7043..7b60474ed5 100644
--- a/Gems/LyShine/Code/Editor/EditorWindow.cpp
+++ b/Gems/LyShine/Code/Editor/EditorWindow.cpp
@@ -8,6 +8,7 @@
 #include "EditorCommon.h"
 #include "CanvasHelpers.h"
 #include "AssetDropHelpers.h"
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/sort.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
@@ -697,15 +698,36 @@ bool EditorWindow::SaveCanvasToXml(UiCanvasMetadata& canvasMetadata, bool forceA
         else if (recentFiles.size() > 0)
         {
             dir = Path::GetPath(recentFiles.front());
-            dir.append(canvasMetadata.m_canvasDisplayName.c_str());
         }
         // Else go to the default canvas directory
         else
         {
             dir = FileHelpers::GetAbsoluteDir(UICANVASEDITOR_CANVAS_DIRECTORY);
-            dir.append(canvasMetadata.m_canvasDisplayName.c_str());
         }
 
+        // Make sure the directory exists. If not, walk up the directory path until we find one that does
+        // so that we will have a consistent 'starting folder' in the 'AzQtComponents::FileDialog::GetSaveFileName' call
+        // across different platforms. 
+        AZ::IO::FixedMaxPath dirPath(dir.toUtf8().constData());
+
+        while (!AZ::IO::SystemFile::IsDirectory(dirPath.c_str()))
+        {
+            AZ::IO::PathView parentPath = dirPath.ParentPath();
+            if (parentPath == dirPath)
+            {
+                // We've reach the root path, need to break out whether or not
+                // the root path exists
+                break;
+            }
+            else
+            {
+                dirPath = parentPath;
+            }
+        }
+        // Append the default filename
+        dirPath /= canvasMetadata.m_canvasDisplayName;
+        dir = QString::fromUtf8(dirPath.c_str(), static_cast<int>(dirPath.Native().size()));
+
         QString filename = AzQtComponents::FileDialog::GetSaveFileName(nullptr,
             QString(),
             dir,
diff --git a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
index c128fe15b9..e350a367c6 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
@@ -49,7 +49,7 @@ PropertiesWidget::PropertiesWidget(EditorWindow* editorWindow,
         m_refreshTimer.setSingleShot(true);
     }
 
-    setMinimumWidth(250);
+    setMinimumWidth(330);
 
     ToolsApplicationEvents::Bus::Handler::BusConnect();
 }
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h
index 9fdc8e61c4..639d042b34 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h
@@ -50,7 +50,7 @@ class PropertyHandlerUiParticleColorKeyframe
 public:
     AZ_CLASS_ALLOCATOR(PropertyHandlerUiParticleColorKeyframe, AZ::SystemAllocator, 0);
 
-    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleColorKeyframeCtrl", 0x8cb3a9f1); }
+    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleColorKeyframeCtrl", 0xe3ef28b6); }
     bool IsDefaultHandler() const override { return true; }
     QWidget* CreateGUI(QWidget* pParent) override;
     void ConsumeAttribute(PropertyUiParticleColorKeyframeCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h
index 39e5dd27c2..df3983dc3e 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h
@@ -50,7 +50,7 @@ class PropertyHandlerUiParticleFloatKeyframe
 public:
     AZ_CLASS_ALLOCATOR(PropertyHandlerUiParticleFloatKeyframe, AZ::SystemAllocator, 0);
 
-    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleFloatKeyframeCtrl", 0xba9359a2); }
+    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleFloatKeyframeCtrl", 0x448a90ec); }
     bool IsDefaultHandler() const override { return true; }
     QWidget* CreateGUI(QWidget* pParent) override;
     void ConsumeAttribute(PropertyUiParticleFloatKeyframeCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
diff --git a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
index 2b31726d3e..48035af9cc 100644
--- a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
@@ -16,8 +16,6 @@
 #include "PNoise3.h"
 #include "AnimSequence.h"
 
-#include <Cry_Camera.h>
-
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <LyShine/Bus/UiAnimateEntityBus.h>
diff --git a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
index ab45042b4c..13a4ddb425 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
@@ -22,9 +22,7 @@
 #include <ISystem.h>
 #include <ILog.h>
 #include <IConsole.h>
-#include <ITimer.h>
 #include <IRenderer.h>
-#include <IViewSystem.h>
 
 //////////////////////////////////////////////////////////////////////////
 namespace
@@ -98,7 +96,7 @@ UiAnimationSystem::UiAnimationSystem()
     m_pCallback = NULL;
     m_bPaused = false;
     m_sequenceStopBehavior = eSSB_GotoEndTime;
-    m_lastUpdateTime.SetValue(0);
+    m_lastUpdateTime = AZ::Time::ZeroTimeUs;
 
     m_nextSequenceId = 1;
 }
@@ -615,20 +613,6 @@ bool UiAnimationSystem::InternalStopSequence(IUiAnimSequence* pSequence, bool bA
 //////////////////////////////////////////////////////////////////////////
 bool UiAnimationSystem::AbortSequence(IUiAnimSequence* pSequence, bool bLeaveTime)
 {
-    assert(pSequence);
-
-    // to avoid any camera blending after aborting a cut scene
-    IViewSystem* pViewSystem = gEnv->pSystem->GetIViewSystem();
-    if (pViewSystem)
-    {
-        pViewSystem->SetBlendParams(0, 0, 0);
-        IView* pView = pViewSystem->GetActiveView();
-        if (pView)
-        {
-            pView->ResetBlending();
-        }
-    }
-
     return InternalStopSequence(pSequence, true, !bLeaveTime);
 }
 
@@ -742,24 +726,27 @@ void UiAnimationSystem::StillUpdate()
 //////////////////////////////////////////////////////////////////////////
 void UiAnimationSystem::ShowPlayedSequencesDebug()
 {
-    //f32 green[4] = {0, 1, 0, 1};
-    //f32 purple[4] = {1, 0, 1, 1};
-    //f32 white[4] = {1, 1, 1, 1};
+    constexpr f32 green[4] = {0, 1, 0, 1};
+    constexpr f32 purple[4] = {1, 0, 1, 1};
+    constexpr f32 white[4] = {1, 1, 1, 1};
     float y = 10.0f;
     AZStd::vector<AZStd::string> names;
 
+    //TODO: needs an implementation
+    auto Draw2dLabel = [](float /*x*/,float /*y*/,float /*depth*/,const f32* /*color*/,bool /*center*/, const char* /*fmt*/, ...) {};
+
     for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it)
     {
         PlayingUIAnimSequence& playingSequence = *it;
 
-        if (playingSequence.sequence == NULL)
+        if (playingSequence.sequence == nullptr)
         {
             continue;
         }
 
         AZ_Assert(false,"gEnv->pRenderer is always null so it can't be used here");
-        //const char* fullname = playingSequence.sequence->GetName();
-        //gEnv->pRenderer->Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed);
+const char* fullname = playingSequence.sequence->GetName();
+Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed);
 
         y += 16.0f;
 
@@ -778,7 +765,7 @@ void UiAnimationSystem::ShowPlayedSequencesDebug()
                 names.push_back(name);
             }
 
-            //gEnv->pRenderer->Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str());
+Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str());
         }
 
         y += 32.0f;
@@ -808,7 +795,7 @@ void UiAnimationSystem::UpdateInternal(const float deltaTime, const bool bPreUpd
     }
 
     // don't update more than once if dt==0.0
-    CTimeValue curTime = gEnv->pTimer->GetFrameStartTime();
+    const AZ::TimeUs curTime = AZ::GetElapsedTimeUs();
     if (deltaTime == 0.0f && curTime == m_lastUpdateTime && !gEnv->IsEditor())
     {
         return;
diff --git a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h
index c270d9ca60..cd51cd51d0 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.h
@@ -12,6 +12,7 @@
 #include <LyShine/Animation/IUiAnimation.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/containers/map.h>
+#include <AzCore/Time/ITime.h>
 
 struct PlayingUIAnimSequence
 {
@@ -164,7 +165,7 @@ private:
 
     IUiAnimationCallback* m_pCallback;
 
-    CTimeValue m_lastUpdateTime;
+    AZ::TimeUs m_lastUpdateTime;
 
     using Sequences = AZStd::vector<AZStd::intrusive_ptr<IUiAnimSequence> >;
     Sequences m_sequences;
diff --git a/Gems/LyShine/Code/Source/Draw2d.cpp b/Gems/LyShine/Code/Source/Draw2d.cpp
index 3476c530b2..9a97f27592 100644
--- a/Gems/LyShine/Code/Source/Draw2d.cpp
+++ b/Gems/LyShine/Code/Source/Draw2d.cpp
@@ -497,7 +497,7 @@ void CDraw2d::SetSortKey(int64_t key)
 AZ::Vector2 CDraw2d::Align(AZ::Vector2 position, AZ::Vector2 size,
     HAlign horizontalAlignment, VAlign verticalAlignment)
 {
-    AZ::Vector2 result;
+    AZ::Vector2 result = AZ::Vector2::CreateZero();
     switch (horizontalAlignment)
     {
     case HAlign::Left:
diff --git a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
index 279c0527bd..831bdb048a 100644
--- a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
+++ b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
@@ -31,12 +31,12 @@ namespace LyShine
 
     void LyShineLoadScreenComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xBB5EAB17));
+        provided.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xbb5eab17));
     }
 
     void LyShineLoadScreenComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xBB5EAB17));
+        incompatible.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xbb5eab17));
     }
 
     void LyShineLoadScreenComponent::Init()
diff --git a/Gems/LyShine/Code/Source/Sprite.cpp b/Gems/LyShine/Code/Source/Sprite.cpp
index 5c7adae481..d9a0775cc1 100644
--- a/Gems/LyShine/Code/Source/Sprite.cpp
+++ b/Gems/LyShine/Code/Source/Sprite.cpp
@@ -855,7 +855,8 @@ bool CSprite::LoadImage(const AZStd::string& nameTex, AZ::Data::Instance<AZ::RPI
     image = AZ::RPI::StreamingImage::FindOrCreate(streamingImageAsset);
     if (!image)
     {
-        AZ_Error("CSprite", false, "Failed to find or create an image instance from image asset '%s'", streamingImageAsset.GetHint().c_str());
+        AZ_Error("CSprite", false, "Failed to find or create an image instance from image asset '%s', ID %s",
+            streamingImageAsset.GetHint().c_str(), streamingImageAsset.GetId().ToString<AZStd::string>().c_str());
         return false;
     }
 
diff --git a/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp b/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp
index 33c2738e54..5447d4ea97 100644
--- a/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp
+++ b/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp
@@ -3510,17 +3510,9 @@ void UiTextComponent::UnitTestLocalization(CLyShine* lyshine, IConsoleCmdArgs* /
 
     AZStd::string localizationXml("libs/localization/localization.xml");
 
-    bool initLocSuccess = false;
-
-    if (pLocMan)
+    if (!pLocMan || !pLocMan->InitLocalizationData(localizationXml.c_str()) || !pLocMan->LoadLocalizationDataByTag("init"))
     {
-        if (pLocMan->InitLocalizationData(localizationXml.c_str()))
-        {
-            if (pLocMan->LoadLocalizationDataByTag("init"))
-            {
-                initLocSuccess = true;
-            }
-        }
+        AZ_Assert(false, "Failed to load localization");
     }
 
     ComponentGetSetTextTestsLoc(lyshine);
diff --git a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
index 2edaf26909..700de3e8a1 100644
--- a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
@@ -206,19 +206,16 @@ UiCanvasFileObject* UiCanvasFileObject::LoadCanvasEntitiesFromOldFormatFile(cons
 
     // Do a sanity check that the buffer does start with the prefix that we will remove
     // Also, determine how newlines are represented in the file.
-    bool useCarriageReturnNewline = false;
     const char* suffixToRemove = nullptr;
 
     size_t prefixToRemoveLen = 0;
     if (strncmp(buffer, prefixToRemove1, strlen(prefixToRemove1)) == 0)
     {
-        useCarriageReturnNewline = false;
         prefixToRemoveLen = strlen(prefixToRemove1);
         suffixToRemove = suffixToRemove1;
     }
     else if (strncmp(buffer, prefixToRemove2, strlen(prefixToRemove2)) == 0)
     {
-        useCarriageReturnNewline = true;
         prefixToRemoveLen = strlen(prefixToRemove2);
         suffixToRemove = suffixToRemove2;
     }
@@ -257,7 +254,6 @@ UiCanvasFileObject* UiCanvasFileObject::LoadCanvasEntitiesFromOldFormatFile(cons
         {
             ++p;
             suffixToRemove = suffixToRemove2;
-            useCarriageReturnNewline = true;
         }
         if (*p == '\n')
         {
diff --git a/Gems/LyShine/Code/Source/UiFaderComponent.cpp b/Gems/LyShine/Code/Source/UiFaderComponent.cpp
index d9309a7505..cfca774612 100644
--- a/Gems/LyShine/Code/Source/UiFaderComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFaderComponent.cpp
@@ -23,8 +23,6 @@
 #include <LyShine/Bus/UiCanvasBus.h>
 #include <LyShine/IRenderGraph.h>
 
-#include <ITimer.h>
-
 #include "UiSerialize.h"
 #include "RenderToTextureBus.h"
 
diff --git a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
index 9b09630957..b68f92c0fc 100644
--- a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
@@ -19,7 +19,6 @@
 #include <LyShine/Bus/UiImageBus.h>
 #include <LyShine/Bus/UiIndexableImageBus.h>
 #include <LyShine/UiSerializeHelpers.h>
-#include <ITimer.h>
 
 namespace
 {
diff --git a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
index c6fd144d3a..25498fc316 100644
--- a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
@@ -15,6 +15,7 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/std/sort.h>
+#include <AzCore/Time/ITime.h>
 
 #include <LyShine/ISprite.h>
 
@@ -73,7 +74,7 @@ void UiParticleEmitterComponent::SetIsEmitting(bool emitParticles)
     {
         m_nextEmitTime = (m_isHitParticleCountOnActivate ? -m_particleLifetime : 0.0f);
         m_emitterAge = 0.0f;
-        m_random.SetSeed(m_isRandomSeedFixed ? m_randomSeed : gEnv->pTimer->GetAsyncTime().GetMilliSecondsAsInt64());
+        m_random.SetSeed(m_isRandomSeedFixed ? m_randomSeed : aznumeric_cast<int64_t>(AZ::GetElapsedTimeMs()));
     }
     m_isEmitting = emitParticles;
 }
diff --git a/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp b/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
index f4ea3f5e2c..b1a3530bd8 100644
--- a/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
@@ -18,7 +18,7 @@
 #include <LyShine/Bus/UiTransform2dBus.h>
 #include <LyShine/Bus/UiTransformBus.h>
 
-#include <ITimer.h>
+#include <AzCore/Time/ITime.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //! UiScrollerNotificationBus Behavior context handler class
@@ -436,7 +436,8 @@ bool UiScrollBarComponent::HandlePressed(AZ::Vector2 point, bool& shouldStayActi
             else
             {
                 // Move handle
-                m_lastMoveTime = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
+                const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+                m_lastMoveTime = AZ::TimeMsToSeconds(realTimeMs);
                 m_moveDelayTime = 0.45f;
 
                 MoveHandle(pointLoc);
@@ -617,7 +618,8 @@ void UiScrollBarComponent::InputPositionUpdate(AZ::Vector2 point)
                     LocRelativeToHandle pointLoc = GetLocationRelativeToHandle(point);
                     if (pointLoc != LocRelativeToHandle::OnHandle)
                     {
-                        const float currentTime = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
+                        const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+                        const float currentTime = AZ::TimeMsToSeconds(realTimeMs);
                         if (currentTime - m_lastMoveTime > m_moveDelayTime)
                         {
                             m_lastMoveTime = currentTime;
diff --git a/Gems/LyShine/Code/Source/UiTextComponent.cpp b/Gems/LyShine/Code/Source/UiTextComponent.cpp
index e18a9cefe2..ec17e93529 100644
--- a/Gems/LyShine/Code/Source/UiTextComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextComponent.cpp
@@ -598,7 +598,6 @@ namespace
         int curChar = 0;
         float curLineWidth = 0.0f;
         float biggestLineWidth = 0.0f;
-        float widthSum = 0.0f;
 
         // When iterating over batches, we need to know the previous
         // character, which we can only obtain if we keep track of the last
@@ -690,7 +689,6 @@ namespace
                     {
                         // Reset the current line width to account for newline
                         curLineWidth = curCharWidth;
-                        widthSum += curLineWidth;
                     }
                     else if ((lastSpace > 0) && ((curChar - lastSpace) < 16) && (curChar - lastSpace >= 0)) // 16 is the default threshold
                     {
@@ -703,7 +701,6 @@ namespace
                         }
 
                         curLineWidth = curLineWidth - lastSpaceWidth + curCharWidth;
-                        widthSum += curLineWidth;
                     }
                     else
                     {
@@ -723,7 +720,6 @@ namespace
                             biggestLineWidth = curLineWidth;
                         }
 
-                        widthSum += curLineWidth;
                         curLineWidth = curCharWidth;
                     }
 
@@ -4936,7 +4932,7 @@ AZStd::string UiTextComponent::GetLocalizedText([[maybe_unused]] const AZStd::st
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 AZ::Vector2 UiTextComponent::CalculateAlignedPositionWithYOffset(const UiTransformInterface::RectPoints& points)
 {
-    AZ::Vector2 pos;
+    AZ::Vector2 pos = AZ::Vector2::CreateZero();
     const DrawBatchLines& drawBatchLines = GetDrawBatchLines();
     size_t numLinesOfText = drawBatchLines.batchLines.size();
 
diff --git a/Gems/LyShine/Code/Source/UiTextInputComponent.cpp b/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
index e789301572..9a55a3feeb 100644
--- a/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
@@ -13,11 +13,11 @@
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Time/ITime.h>
 
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
 
 #include <IRenderer.h>
-#include <ITimer.h>
 #include <LyShine/Bus/UiElementBus.h>
 #include <LyShine/Bus/UiTransformBus.h>
 #include <LyShine/Bus/UiVisualBus.h>
@@ -745,19 +745,17 @@ void UiTextInputComponent::Update(float deltaTime)
     // update cursor blinking, only if: this component is active, and blink interval set, and there is no text selection
     if (m_isEditing && m_cursorBlinkInterval > 0.0f && m_textSelectionStartPos == m_textCursorPos)
     {
+        const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+        const float currentTime = AZ::TimeMsToSeconds(realTimeMs);
         if (m_cursorBlinkStartTime == 0.0f)
         {
-            m_cursorBlinkStartTime = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
+            m_cursorBlinkStartTime = currentTime;
         }
-        else
+        else if (currentTime - m_cursorBlinkStartTime > m_cursorBlinkInterval *  0.5f)
         {
-            const float currentTime = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
-            if (currentTime - m_cursorBlinkStartTime > m_cursorBlinkInterval *  0.5f)
-            {
-                m_textCursorColor.SetA(m_textCursorColor.GetA() ? 0.0f : 1.0f);
-                m_cursorBlinkStartTime = currentTime;
-                EBUS_EVENT_ID(m_textEntity, UiTextBus, SetSelectionRange, m_textSelectionStartPos, m_textCursorPos, m_textCursorColor);
-            }
+            m_textCursorColor.SetA(m_textCursorColor.GetA() ? 0.0f : 1.0f);
+            m_cursorBlinkStartTime = currentTime;
+            EBUS_EVENT_ID(m_textEntity, UiTextBus, SetSelectionRange, m_textSelectionStartPos, m_textCursorPos, m_textCursorColor);
         }
     }
 }
diff --git a/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
index b1adfb6157..cad2dc2b5f 100644
--- a/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
@@ -11,6 +11,7 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/std/sort.h>
+#include <AzCore/Time/ITime.h>
 
 #include <LyShine/Bus/UiTransform2dBus.h>
 #include <LyShine/Bus/UiElementBus.h>
@@ -19,8 +20,6 @@
 #include <LyShine/Bus/UiTooltipDataPopulatorBus.h>
 #include <LyShine/UiSerializeHelpers.h>
 
-#include <ITimer.h>
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC MEMBER FUNCTIONS
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -173,8 +172,8 @@ void UiTooltipDisplayComponent::Hide()
     {
         // Since sequences can't have keys that represent current values,
         // only play the hide animation if the show animation has completed.
-
-        m_timeSinceLastShown = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
+        const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+        m_timeSinceLastShown = AZ::TimeMsToSeconds(realTimeMs);
 
         EndTransitionState();
 
@@ -184,7 +183,8 @@ void UiTooltipDisplayComponent::Hide()
 
     case State::Shown:
     {
-        m_timeSinceLastShown = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
+        const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+        m_timeSinceLastShown = AZ::TimeMsToSeconds(realTimeMs);
 
         // Check if there is a hide animation to play
         IUiAnimationSystem* animSystem = nullptr;
@@ -220,7 +220,9 @@ void UiTooltipDisplayComponent::Update()
     if (m_state == State::DelayBeforeShow)
     {
         // Check if it's time to show the tooltip
-        if ((gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI) - m_stateStartTime) >= m_curDelayTime)
+        const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+        const float currentTime = AZ::TimeMsToSeconds(realTimeMs);
+        if ((currentTime - m_stateStartTime) >= m_curDelayTime)
         {
             // Make sure nothing has changed with the hover interactable
             if (m_tooltipElement.IsValid() && UiTooltipDataPopulatorBus::FindFirstHandler(m_tooltipElement))
@@ -238,7 +240,9 @@ void UiTooltipDisplayComponent::Update()
         // Check if it's time to hide the tooltip
         if (m_displayTime >= 0.0f)
         {
-            if ((gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI) - m_stateStartTime) >= m_displayTime)
+            const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+            const float currentTime = AZ::TimeMsToSeconds(realTimeMs);
+            if ((currentTime - m_stateStartTime) >= m_displayTime)
             {
                 // Hide tooltip
                 Hide();
@@ -425,7 +429,8 @@ void UiTooltipDisplayComponent::Deactivate()
 void UiTooltipDisplayComponent::SetState(State state)
 {
     m_state = state;
-    m_stateStartTime = gEnv->pTimer->GetCurrTime(ITimer::ETIMER_UI);
+    const AZ::TimeMs realTimeMs = AZ::GetRealElapsedTimeMs();
+    m_stateStartTime = AZ::TimeMsToSeconds(realTimeMs);
 
     switch (m_state)
     {
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
index 395e0dfc32..bde9a9ec8c 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
@@ -9,14 +9,11 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
-#include <LmbrCentral/Rendering/RenderNodeBus.h>
 #include <LyShine/Bus/UiCanvasBus.h>
 #include <LyShine/Bus/World/UiCanvasRefBus.h>
 
 #include <Cry_Geo.h>
 #include <IIndexedMesh.h>
-#include <IEntityRenderState.h>
-#include <IStatObj.h>
 
 #if !defined(_RELEASE)
 #include <IRenderAuxGeom.h>
diff --git a/Gems/LyShine/Code/Tests/AnimationTest.cpp b/Gems/LyShine/Code/Tests/AnimationTest.cpp
index 1fc662413f..92762d02ed 100644
--- a/Gems/LyShine/Code/Tests/AnimationTest.cpp
+++ b/Gems/LyShine/Code/Tests/AnimationTest.cpp
@@ -8,7 +8,8 @@
 
 #include "LyShineTest.h"
 #include <Mocks/ISystemMock.h>
-#include <Mocks/ITimerMock.h>
+#include <AzCore/UnitTest/Mocks/MockITime.h>
+#include <AzFramework/Application/Application.h>
 
 #include <UiCanvasComponent.h>
 #include <Animation/AnimSequence.h>
@@ -17,21 +18,26 @@
 
 namespace UnitTest
 {
-    class FrameTimerMock
-        : public TimerMock
+    struct AnimationTestStubTimer : public AZ::StubTimeSystem
     {
-    public:
-        const CTimeValue& GetFrameStartTime([[maybe_unused]] ITimer::ETimer which = ITimer::ETIMER_GAME) const override
+        AZ_RTTI(UnitTest::AnimationTestStubTimer, "{541EBC6C-E793-4433-9402-4CAD2F6770E3}", AZ::StubTimeSystem);
+
+        AZ::TimeMs GetElapsedTimeMs() const override
         {
-            return m_frameStartTime;
-        }
-        void AddFrameStartTime(float seconds)
-        {
-            m_frameStartTime += CTimeValue(seconds);
+            return AZ::TimeUsToMs(m_timeUs);
         }
 
-    private:
-        CTimeValue m_frameStartTime = CTimeValue();
+        AZ::TimeUs GetElapsedTimeUs() const override
+        {
+            return m_timeUs;
+        }
+
+        void AddFrameTime(float sec)
+        {
+            m_timeUs += AZ::SecondsToTimeUs(sec);
+        }
+
+        AZ::TimeUs m_timeUs = AZ::Time::ZeroTimeUs;
     };
 
     class TrackEventHandler
@@ -65,6 +71,22 @@ namespace UnitTest
         AZStd::vector<EventInfo> m_recievedEvents;
     };
 
+    class LyShineAnimationTestApplication : public AzFramework::Application
+    {
+    public:
+        LyShineAnimationTestApplication()
+            : AzFramework::Application()
+        {
+            m_timeSystem.reset();
+            m_timeSystem = AZStd::make_unique<UnitTest::AnimationTestStubTimer>();
+        }
+
+        UnitTest::AnimationTestStubTimer* GetTimer()
+        {
+            return azdynamic_cast<UnitTest::AnimationTestStubTimer*>(m_timeSystem.get());
+        }
+    };
+
     class LyShineAnimationTest
         : public LyShineTest
     {
@@ -74,31 +96,38 @@ namespace UnitTest
         {
         }
 
+        void SetupApplication() override
+        {
+            AZ::ComponentApplication::Descriptor appDesc;
+            appDesc.m_memoryBlocksByteSize = 10 * 1024 * 1024;
+            appDesc.m_recordingMode = AZ::Debug::AllocationRecords::RECORD_FULL;
+            appDesc.m_stackRecordLevels = 20;
+
+            m_application = aznew LyShineAnimationTestApplication();
+            m_systemEntity = m_application->Create(appDesc);
+            m_systemEntity->Init();
+            m_systemEntity->Activate();
+        }
+
         void SetupEnvironment() override
         {
             LyShineTest::SetupEnvironment();
 
-            m_data = AZStd::make_unique<Data>();
-            m_env->m_stubEnv.pTimer = &m_data->m_timer;
-
             m_canvasComponent = aznew UiCanvasComponent;
         }
 
         void TearDown() override
         {
             delete m_canvasComponent;
-            m_data.reset();
 
             UiAnimationNotificationBus::ClearQueuedEvents();
             LyShineTest::TearDown();
         }
 
-        struct Data
+        UnitTest::AnimationTestStubTimer* GetTimer()
         {
-            testing::NiceMock<FrameTimerMock> m_timer;
-        };
-
-        AZStd::unique_ptr<Data> m_data;
+            return static_cast<LyShineAnimationTestApplication*>(m_application)->GetTimer();
+        }
         UiCanvasComponent* m_canvasComponent;
     };
 
@@ -126,13 +155,14 @@ namespace UnitTest
         eventHandler.Connect(m_canvasComponent->GetEntityId());
         animSys->PlaySequence(sequence, nullptr, true, true);
 
+        UnitTest::AnimationTestStubTimer* timer = GetTimer();
         for (int frame = 0; frame < 2; ++frame)
         {
             static float deltaTime = 1.0f / 60.0f;
 
             animSys->PreUpdate(deltaTime);
             animSys->PostUpdate(deltaTime);
-            m_data->m_timer.AddFrameStartTime(deltaTime);
+            timer->AddFrameTime(deltaTime);
         }
 
         UiAnimationNotificationBus::ExecuteQueuedEvents();
diff --git a/Gems/LyShine/Code/Tests/LyShineTest.h b/Gems/LyShine/Code/Tests/LyShineTest.h
index 250b53ee40..a2383f87cc 100644
--- a/Gems/LyShine/Code/Tests/LyShineTest.h
+++ b/Gems/LyShine/Code/Tests/LyShineTest.h
@@ -37,7 +37,7 @@ namespace UnitTest
             appDesc.m_recordingMode = AZ::Debug::AllocationRecords::RECORD_FULL;
             appDesc.m_stackRecordLevels = 20;
 
-            m_systemEntity = m_application.Create(appDesc);
+            m_systemEntity = m_application->Create(appDesc);
             m_systemEntity->Init();
             m_systemEntity->Activate();
         }
@@ -54,7 +54,9 @@ namespace UnitTest
         {
             m_env.reset();
             gEnv = m_priorEnv;
-            m_application.Destroy();
+            m_application->Destroy();
+            delete m_application;
+            m_application = nullptr;
         }
 
         struct StubEnv
@@ -62,8 +64,8 @@ namespace UnitTest
             SSystemGlobalEnvironment m_stubEnv;
         };
 
-        AZ::ComponentApplication m_application;
-        AZ::Entity* m_systemEntity;
+        AZ::ComponentApplication* m_application = nullptr;
+        AZ::Entity* m_systemEntity = nullptr;
         AZStd::unique_ptr<StubEnv> m_env;
 
         SSystemGlobalEnvironment* m_priorEnv = nullptr;
diff --git a/Gems/LyShine/Code/Tests/SerializationTest.cpp b/Gems/LyShine/Code/Tests/SerializationTest.cpp
index 70ae590358..61d39294f8 100644
--- a/Gems/LyShine/Code/Tests/SerializationTest.cpp
+++ b/Gems/LyShine/Code/Tests/SerializationTest.cpp
@@ -30,7 +30,8 @@ namespace UnitTest
                 modules.emplace_back(new LyShine::LyShineModule);
             };
 
-            m_systemEntity = m_application.Create(appDesc, appStartup);
+            m_application = aznew AZ::ComponentApplication();
+            m_systemEntity = m_application->Create(appDesc, appStartup);
             m_systemEntity->Init();
             m_systemEntity->Activate();
         }
diff --git a/Gems/LyShine/Code/Tests/SpriteTest.cpp b/Gems/LyShine/Code/Tests/SpriteTest.cpp
index ff9095a7d9..2fc82546be 100644
--- a/Gems/LyShine/Code/Tests/SpriteTest.cpp
+++ b/Gems/LyShine/Code/Tests/SpriteTest.cpp
@@ -8,7 +8,6 @@
 
 #include "LyShineTest.h"
 #include <Mocks/ISystemMock.h>
-#include <Mocks/ITextureMock.h>
 #include <Sprite.h>
 
 namespace UnitTest
@@ -32,7 +31,8 @@ namespace UnitTest
                 modules.emplace_back(new LyShine::LyShineModule);
             };
 
-            m_systemEntity = m_application.Create(appDesc, appStartup);
+            m_application = aznew AZ::ComponentApplication();
+            m_systemEntity = m_application->Create(appDesc, appStartup);
             m_systemEntity->Init();
             m_systemEntity->Activate();
         }
diff --git a/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp b/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
index 65ca1ec280..8a3d9f2af6 100644
--- a/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
@@ -24,54 +24,38 @@
 #include <AzCore/IO/Streamer/StreamerComponent.h>
 #include <AzCore/Jobs/JobManagerComponent.h>
 #include <AzCore/Slice/SliceSystemComponent.h>
+#include <AzCore/UnitTest/Mocks/MockITime.h>
 
 namespace UnitTest
 {
-    class MockTimer : public ITimer
+    struct UiTooltipTestStubTimer : public AZ::StubTimeSystem
     {
-        public:
-            mutable float m_timer_count = 1.0f;
-            MOCK_METHOD0(ResetTimer, void());
-            MOCK_METHOD0(UpdateOnFrameStart, void());
-            float GetCurrTime([[maybe_unused]] ETimer which) const
-            {
-                m_timer_count += 1.0f;
-                return m_timer_count;
-            }
-            MOCK_CONST_METHOD1(GetFrameStartTime, CTimeValue&(ETimer));
-            MOCK_CONST_METHOD0(GetAsyncTime, CTimeValue());
-            MOCK_METHOD0(GetAsyncCurTime, float());
-            MOCK_CONST_METHOD1(GetFrameTime, float(ETimer));
-            MOCK_CONST_METHOD0(GetRealFrameTime, float());
-            MOCK_CONST_METHOD0(GetTimeScale, float());
-            MOCK_CONST_METHOD1(GetTimeScale, float(uint32));
-            MOCK_METHOD0(ClearTimeScales, void());
-            MOCK_METHOD2(SetTimeScale, void(float, uint32));
-            MOCK_METHOD1(EnableTimer, void(bool));
-            MOCK_CONST_METHOD0(IsTimerEnabled, bool());
-            MOCK_METHOD0(GetFrameRate, float());
-            MOCK_METHOD2(GetProfileFrameBlending, float(float*, int*));
-            MOCK_METHOD1(Serialize, void(TSerialize));
-            MOCK_METHOD2(PauseTimer, bool(ETimer, bool));
-            MOCK_METHOD1(IsTimerPaused, bool(ETimer));
-            MOCK_METHOD2(SetTimer, bool(ETimer, float));
-            MOCK_METHOD2(SecondsToDateUTC, void(time_t, struct tm&));
-            MOCK_METHOD1(DateToSecondsUTC, time_t(struct tm&));
-            MOCK_METHOD1(TicksToSeconds, float(int64));
-            MOCK_METHOD0(GetTicksPerSecond, int64());
-            MOCK_METHOD0(CreateNewTimer, ITimer*());
-            MOCK_METHOD2(EnableFixedTimeMode, void(bool, float));
+        AZ::TimeMs GetRealElapsedTimeMs() const override
+        {
+            m_time += AZ::TimeMs{ 1000 };
+            return m_time;
+        }
+        mutable AZ::TimeMs m_time = AZ::Time::ZeroTimeMs;
     };
 
     class UiTooltipTestApplication
         : public AzFramework::Application
     {
+    public:
+        UiTooltipTestApplication()
+            : AzFramework::Application()
+        {
+            m_timeSystem.reset();
+            m_timeSystem = AZStd::make_unique<UiTooltipTestStubTimer>();
+        }
+
         void Reflect(AZ::ReflectContext* context) override
         {
             AzFramework::Application::Reflect(context);
             UiSerialize::ReflectUiTypes(context); //< needed to serialize ui Anchor and Offset
         }
 
+    private:
         // override and only include system components required for tests.
         AZ::ComponentTypeList GetRequiredSystemComponents() const override
         {
@@ -153,16 +137,13 @@ namespace UnitTest
 
             return AZStd::make_tuple(uiCanvasComponent, uiTooltipDisplayComponent, uiTooltipComponent);
         }
-
     };
 
     TEST_F(UiTooltipComponentTest, UiTooltipComponent_WillAppearOnHover)
     {
-        MockTimer m_timer = MockTimer();
         SSystemGlobalEnvironment env;
         SSystemGlobalEnvironment* prevEnv = gEnv;
         gEnv = &env;
-        gEnv->pTimer = &m_timer;
         gEnv->pLyShine = nullptr;
 
         auto [uiCanvasComponent, uiTooltipDisplayComponent, uiTooltipComponent] = CreateUiCanvasWithTooltip();
@@ -186,11 +167,9 @@ namespace UnitTest
 
     TEST_F(UiTooltipComponentTest, UiTooltipComponent_HoverTooltipDisappearsOnPress)
     {
-        MockTimer m_timer = MockTimer();
         SSystemGlobalEnvironment env;
         SSystemGlobalEnvironment* prevEnv = gEnv;
         gEnv = &env;
-        gEnv->pTimer = &m_timer;
         gEnv->pLyShine = nullptr;
 
         auto [uiCanvasComponent, uiTooltipDisplayComponent, uiTooltipComponent] = CreateUiCanvasWithTooltip();
@@ -212,11 +191,9 @@ namespace UnitTest
 
     TEST_F(UiTooltipComponentTest, UiTooltipComponent_TooltipAppearsOnPress)
     {
-        MockTimer m_timer = MockTimer();
         SSystemGlobalEnvironment env;
         SSystemGlobalEnvironment* prevEnv = gEnv;
         gEnv = &env;
-        gEnv->pTimer = &m_timer;
         gEnv->pLyShine = nullptr;
 
         auto [uiCanvasComponent, uiTooltipDisplayComponent, uiTooltipComponent] = CreateUiCanvasWithTooltip();
@@ -238,11 +215,9 @@ namespace UnitTest
 
     TEST_F(UiTooltipComponentTest, UiTooltipComponent_TooltipDisappearsOnCanvasPrimaryRelease)
     {
-        MockTimer m_timer = MockTimer();
         SSystemGlobalEnvironment env;
         SSystemGlobalEnvironment* prevEnv = gEnv;
         gEnv = &env;
-        gEnv->pTimer = &m_timer;
         gEnv->pLyShine = nullptr;
 
         auto [uiCanvasComponent, uiTooltipDisplayComponent, uiTooltipComponent] = CreateUiCanvasWithTooltip();
@@ -264,11 +239,9 @@ namespace UnitTest
 
     TEST_F(UiTooltipComponentTest, UiTooltipComponent_TooltipAppearsOnClick)
     {
-        MockTimer m_timer = MockTimer();
         SSystemGlobalEnvironment env;
         SSystemGlobalEnvironment* prevEnv = gEnv;
         gEnv = &env;
-        gEnv->pTimer = &m_timer;
         gEnv->pLyShine = nullptr;
 
         auto [uiCanvasComponent, uiTooltipDisplayComponent, uiTooltipComponent] = CreateUiCanvasWithTooltip();
diff --git a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Button/Styles.uicanvas b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Button/Styles.uicanvas
index 386df81e5c..6a41034bd2 100644
--- a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Button/Styles.uicanvas
+++ b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Button/Styles.uicanvas
@@ -569,7 +569,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -591,7 +591,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -626,7 +626,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -650,7 +650,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Button_Sliced_Normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Button_Sliced_Normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -1161,7 +1161,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -1209,7 +1209,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -1227,7 +1227,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -1368,7 +1368,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_1.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_1.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -1438,7 +1438,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -1498,7 +1498,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -1516,7 +1516,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 													</Class>
 												</Class>
 											</Class>
@@ -1657,7 +1657,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_6.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_6.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -1714,7 +1714,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_7.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_7.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -1771,7 +1771,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_8.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/scroll_box_icon_8.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Image/ImageTypes.uicanvas b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Image/ImageTypes.uicanvas
index a0fbcbc0ce..0fb5e390d3 100644
--- a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Image/ImageTypes.uicanvas
+++ b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Image/ImageTypes.uicanvas
@@ -370,7 +370,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -475,7 +475,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -616,7 +616,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -757,7 +757,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -898,7 +898,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -1118,7 +1118,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 										</Class>
 									</Class>
 									<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Mask/MaskingInteractables.uicanvas b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Mask/MaskingInteractables.uicanvas
index a99a40c6be..e627fafd54 100644
--- a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Mask/MaskingInteractables.uicanvas
+++ b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Mask/MaskingInteractables.uicanvas
@@ -215,7 +215,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -240,7 +240,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonpressed.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -265,7 +265,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Button_Sliced_Normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Button_Sliced_Normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -301,7 +301,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/button.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -378,7 +378,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/CheckBox_Off.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/CheckBox_Off.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -455,7 +455,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/CheckBox_On.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/CheckBox_On.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -645,7 +645,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -716,7 +716,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -975,7 +975,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1000,7 +1000,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1052,7 +1052,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1129,7 +1129,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Slider_Fill_Sliced.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Slider_Fill_Sliced.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1206,7 +1206,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Slider_Manipulator.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Slider_Manipulator.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1296,7 +1296,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Slider_Track_Sliced.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/Slider_Track_Sliced.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1399,7 +1399,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1425,7 +1425,7 @@
 												</Class>
 												<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 													<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-														<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/slider_background_disabled.sprite" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+														<Class name="AZStd::string" field="AssetPath" value="Textures/Basic/slider_background_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 													</Class>
 												</Class>
 												<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1475,7 +1475,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/buttonslider.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1658,7 +1658,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/checkered3.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="ui/textures/lyshineexamples/checkered3.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Text/ImageMarkup.uicanvas b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Text/ImageMarkup.uicanvas
index 3bcd4f3db3..efa2e79b50 100644
--- a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Text/ImageMarkup.uicanvas
+++ b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Comp/Text/ImageMarkup.uicanvas
@@ -475,7 +475,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -854,7 +854,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Performance/DrawCallsControl.uicanvas b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Performance/DrawCallsControl.uicanvas
index 9b89289dd4..4d3f08a1cd 100644
--- a/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Performance/DrawCallsControl.uicanvas
+++ b/Gems/LyShineExamples/Assets/UI/Canvases/LyShineExamples/Performance/DrawCallsControl.uicanvas
@@ -1910,7 +1910,7 @@
 									<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 									<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 										<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-											<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+											<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 										</Class>
 									</Class>
 									<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.slice b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.slice
index 4c857ecb60..9e5c72b9ee 100644
--- a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.slice
+++ b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_Draggable.slice
@@ -64,7 +64,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 									</Class>
 								</Class>
 								<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -102,7 +102,7 @@
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 												</Class>
 											</Class>
 										</Class>
@@ -422,7 +422,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 									</Class>
 								</Class>
 								<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.slice b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.slice
index cb6f6749d4..6f00a98399 100644
--- a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.slice
+++ b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/ChildDropTargets/ChildDropTargets_EndDropTarget.slice
@@ -174,7 +174,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 									</Class>
 								</Class>
 								<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/DraggableElement.slice b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/DraggableElement.slice
index 8781688a94..3249e61b53 100644
--- a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/DraggableElement.slice
+++ b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/DragAndDrop/DraggableElement.slice
@@ -61,7 +61,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 									</Class>
 								</Class>
 								<Class name="AZStd::string" field="RenderTargetName" value="" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
@@ -99,7 +99,7 @@
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
+													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{EF8FF807-DDEE-4EB0-B678-4CA3A2C490A4}"/>
 												</Class>
 											</Class>
 										</Class>
diff --git a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/NextButton.slice b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/NextButton.slice
index 85046d4d1b..661fa6ccf3 100644
--- a/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/NextButton.slice
+++ b/Gems/LyShineExamples/Assets/UI/Slices/LyShineExamples/NextButton.slice
@@ -63,7 +63,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -118,7 +118,7 @@
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 												</Class>
 											</Class>
 											<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/seedList.seed b/Gems/LyShineExamples/Assets/seedList.seed
index 777269ee7a..d730765515 100644
--- a/Gems/LyShineExamples/Assets/seedList.seed
+++ b/Gems/LyShineExamples/Assets/seedList.seed
@@ -11,10 +11,10 @@
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{E993215C-FF5F-5891-8475-D4EDBD560807}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="textures/basic/button_sliced_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="textures/basic/button_sliced_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
@@ -27,10 +27,10 @@
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{D1276CDC-6211-5A7E-930F-8F0977FB41A6}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/button_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/button_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
@@ -43,10 +43,10 @@
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{05D7E013-3691-57AE-A712-53476BDD1EE2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/button_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
@@ -59,10 +59,10 @@
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{5FF31E55-4AE2-5A4B-BA86-CB7177F01F72}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/textinput_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/textinput_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
@@ -75,10 +75,10 @@
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{561D1ED0-13FC-5CAD-AB7E-ADE4E424028C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/textinput_hover.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/textinput_hover.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
@@ -91,26 +91,26 @@
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{28AC420F-5A90-5FC5-93AC-5CBDA82131E3}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/textinput_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/textinput_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{8B33DC4A-9DCD-5934-9B1B-161236FC4FBF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{07D54B0D-4DAF-54B0-A7D6-790C4D14A490}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
+				<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			</Class>
 			<Class name="unsigned int" field="platformFlags" value="127" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/checkbox_box_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+			<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/checkbox_box_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
diff --git a/Gems/LyShineExamples/Code/CMakeLists.txt b/Gems/LyShineExamples/Code/CMakeLists.txt
index 5cd023db02..6e8f53d5cd 100644
--- a/Gems/LyShineExamples/Code/CMakeLists.txt
+++ b/Gems/LyShineExamples/Code/CMakeLists.txt
@@ -37,7 +37,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             Gem::LyShineExamples.Static
-            Gem::LmbrCentral
+            Gem::LmbrCentral.API
 )
 
 # if enabled, LyShineExamples is used by all kinds of applications, however, the dependency to LmbrCentral is different
diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
index 6caa918227..49c319e780 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
@@ -40,12 +40,12 @@ CAnimSequence::CAnimSequence(IMovieSystem* pMovieSystem, uint32 id, SequenceType
     m_nextGenId = 1;
     m_pMovieSystem = pMovieSystem;
     m_flags = 0;
-    m_pParentSequence = NULL;
+    m_pParentSequence = nullptr;
     m_timeRange.Set(0, 10);
     m_bPaused = false;
     m_bActive = false;
     m_legacySequenceObject = nullptr;
-    m_activeDirector = NULL;
+    m_activeDirector = nullptr;
     m_activeDirectorNodeId = -1;
     m_precached = false;
     m_bResetting = false;
@@ -271,7 +271,7 @@ IAnimNode* CAnimSequence::CreateNodeInternal(AnimNodeType nodeType, uint32 nNode
         return nullptr;   // should never happen, null pointer guard
     }
 
-    CAnimNode* animNode = NULL;
+    CAnimNode* animNode = nullptr;
 
     if (nNodeId == -1)
     {
@@ -331,7 +331,7 @@ IAnimNode* CAnimSequence::CreateNodeInternal(AnimNodeType nodeType, uint32 nNode
         if (AddNode(animNode))
         {
             // If there isn't an active director, set it now.
-            if (m_activeDirector == NULL && animNode->GetType() == AnimNodeType::Director)
+            if (m_activeDirector == nullptr && animNode->GetType() == AnimNodeType::Director)
             {
                 SetActiveDirector(animNode);
             }
@@ -352,7 +352,7 @@ IAnimNode* CAnimSequence::CreateNode(XmlNodeRef node)
 {
     if (!GetMovieSystem())
     {
-        return 0;   // should never happen, null pointer guard
+        return nullptr;   // should never happen, null pointer guard
     }
 
     AnimNodeType type;
@@ -361,13 +361,13 @@ IAnimNode* CAnimSequence::CreateNode(XmlNodeRef node)
     XmlString name;
     if (!node->getAttr("Name", name))
     {
-        return 0;
+        return nullptr;
     }
 
     IAnimNode* pNewNode = CreateNode(type);
     if (!pNewNode)
     {
-        return 0;
+        return nullptr;
     }
 
     pNewNode->SetName(name);
@@ -377,7 +377,7 @@ IAnimNode* CAnimSequence::CreateNode(XmlNodeRef node)
 
     // Make sure de-serializing this node didn't just create an id conflict. This can happen sometimes
     // when copy/pasting nodes from a different sequence to this one. 
-    for (auto curNode : m_nodes)
+    for (const auto& curNode : m_nodes)
     {
         CAnimNode* animNode = static_cast<CAnimNode*>(curNode.get());
         if (animNode->GetId() == newAnimNode->GetId() && animNode != newAnimNode)
@@ -413,7 +413,7 @@ void CAnimSequence::RemoveNode(IAnimNode* node, bool removeChildRelationships)
         }
         if (removeChildRelationships && m_nodes[i]->GetParent() == node)
         {
-            m_nodes[i]->SetParent(0);
+            m_nodes[i]->SetParent(nullptr);
         }
 
         i++;
@@ -423,7 +423,7 @@ void CAnimSequence::RemoveNode(IAnimNode* node, bool removeChildRelationships)
     if (m_activeDirector == node)
     {
         // Clear the active one.
-        m_activeDirector = NULL;
+        m_activeDirector = nullptr;
         m_activeDirectorNodeId = -1;
 
         // If there is another director node, set it as active.
@@ -445,7 +445,7 @@ void CAnimSequence::RemoveAll()
     stl::free_container(m_nodes);
     stl::free_container(m_events);
     stl::free_container(m_nodesNeedToRender);
-    m_activeDirector = NULL;
+    m_activeDirector = nullptr;
     m_activeDirectorNodeId = -1;
 }
 
@@ -462,9 +462,9 @@ void CAnimSequence::Reset(bool bSeekToStart)
 
     if (!bSeekToStart)
     {
-        for (AnimNodes::iterator it = m_nodes.begin(); it != m_nodes.end(); ++it)
+        for (const auto& it :m_nodes)
         {
-            IAnimNode* animNode = it->get();
+            IAnimNode* animNode = it.get();
             static_cast<CAnimNode*>(animNode)->OnReset();
         }
         m_bResetting = false;
@@ -1091,7 +1091,7 @@ int CAnimSequence::GetTrackEventsCount() const
 //////////////////////////////////////////////////////////////////////////
 char const* CAnimSequence::GetTrackEvent(int iIndex) const
 {
-    char const* szResult = NULL;
+    char const* szResult = nullptr;
     const bool bValid = (iIndex >= 0 && iIndex < GetTrackEventsCount());
     CRY_ASSERT(bValid);
 
@@ -1153,7 +1153,7 @@ IAnimNode* CAnimSequence::FindNodeById(int nNodeId)
             return animNode;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1172,7 +1172,7 @@ IAnimNode* CAnimSequence::FindNodeByName(const char* sNodeName, const IAnimNode*
             }
         }
     }
-    return 0;
+    return nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1352,9 +1352,9 @@ bool CAnimSequence::IsAncestorOf(const IAnimSequence* sequence) const
         return false;   // should never happen, null pointer guard
     }
 
-    for (AnimNodes::const_iterator it = m_nodes.begin(); it != m_nodes.end(); ++it)
+    for (const auto& it :m_nodes)
     {
-        IAnimNode* pNode = it->get();
+        IAnimNode* pNode = it.get();
         if (pNode->GetType() == AnimNodeType::Director)
         {
             IAnimTrack* pSequenceTrack = pNode->GetTrackForParameter(AnimParamType::Sequence);
diff --git a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
index e2a9e816c6..546ec9bbe0 100644
--- a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
@@ -57,8 +57,6 @@ void CLayerNode::Initialize()
 //-----------------------------------------------------------------------------
 void CLayerNode::Animate(SAnimContext& ec)
 {
-    bool bVisibilityModified = false;
-
     int trackCount = NumTracks();
     for (int paramIndex = 0; paramIndex < trackCount; paramIndex++)
     {
@@ -93,14 +91,12 @@ void CLayerNode::Animate(SAnimContext& ec)
                     if (visible != m_bPreVisibility)
                     {
                         m_bPreVisibility = visible;
-                        bVisibilityModified = true;
                     }
                 }
                 else
                 {
                     m_bInit = true;
                     m_bPreVisibility = visible;
-                    bVisibilityModified = true;
                 }
             }
             break;
diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
index 2a9a231177..dc0782f982 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
@@ -6,11 +6,11 @@
  *
  */
 
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/std/allocator_stateless.h>
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/Time/ITime.h>
 #include <AzFramework/Components/CameraBus.h>
 #include <Maestro/Bus/SequenceComponentBus.h>
 #include "Movie.h"
@@ -35,9 +35,7 @@
 #include <ISystem.h>
 #include <ILog.h>
 #include <IConsole.h>
-#include <ITimer.h>
 #include <IRenderer.h>
-#include <IViewSystem.h>
 #include <Maestro/Types/AnimNodeType.h>
 #include <Maestro/Types/SequenceType.h>
 #include <Maestro/Types/AnimParamType.h>
@@ -208,6 +206,22 @@ namespace
     }
 }
 
+namespace Internal
+{
+    float ApplyDeltaTimeOverrideIfEnabled(float deltaTime)
+    {
+        if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
+        {
+            const AZ::TimeMs deltatimeOverride = timeSystem->GetSimulationTickDeltaOverride();
+            if (deltatimeOverride != AZ::Time::ZeroTimeMs)
+            {
+                deltaTime = AZ::TimeMsToSeconds(deltatimeOverride);
+            }
+        }
+        return deltaTime;
+    }
+} // namespace Internal
+
 //////////////////////////////////////////////////////////////////////////
 CMovieSystem::CMovieSystem(ISystem* pSystem)
 {
@@ -219,18 +233,13 @@ CMovieSystem::CMovieSystem(ISystem* pSystem)
     m_bEnableCameraShake = true;
     m_bCutscenesPausedInEditor = true;
     m_sequenceStopBehavior = eSSB_GotoEndTime;
-    m_lastUpdateTime.SetValue(0);
+    m_lastUpdateTime = AZ::Time::ZeroTimeUs;
     m_bStartCapture = false;
     m_captureFrame = -1;
     m_bEndCapture = false;
-    m_fixedTimeStepBackUp = 0;
-    m_maxStepBackUp = 0;
-    m_smoothingBackUp = 0;
+    m_fixedTimeStepBackUp = AZ::Time::ZeroTimeMs;
     m_cvar_capture_frame_once = nullptr;
     m_cvar_capture_folder = nullptr;
-    m_cvar_t_FixedStep = nullptr;
-    m_cvar_t_MaxStep = nullptr;
-    m_cvar_t_Smoothing = nullptr;
     m_cvar_sys_maxTimeStepForMovieSystem = nullptr;
     m_cvar_capture_frames = nullptr;
     m_cvar_capture_file_prefix = nullptr;
@@ -776,79 +785,65 @@ bool CMovieSystem::InternalStopSequence(IAnimSequence* sequence, bool bAbort, bo
 {
     assert(sequence != 0);
 
-    bool bRet = false;
     PlayingSequences::iterator it;
 
-    if (FindSequence(sequence, it))
+    if (!FindSequence(sequence, it))
     {
-        if (bAnimate && sequence->IsActivated())
-        {
-            if (m_sequenceStopBehavior == eSSB_GotoEndTime)
-            {
-                SAnimContext ac;
-                ac.singleFrame = true;
-                ac.time = sequence->GetTimeRange().end;
-                sequence->Animate(ac);
-            }
-            else if (m_sequenceStopBehavior == eSSB_GotoStartTime)
-            {
-                SAnimContext ac;
-                ac.singleFrame = true;
-                ac.time = sequence->GetTimeRange().start;
-                sequence->Animate(ac);
-            }
-
-            sequence->Deactivate();
-        }
-
-        // If this sequence is cut scene end it.
-        if (sequence->GetFlags() & IAnimSequence::eSeqFlags_CutScene)
-        {
-            if (!gEnv->IsEditing() || !m_bCutscenesPausedInEditor)
-            {
-                if (m_pUser)
-                {
-                    m_pUser->EndCutScene(sequence, sequence->GetCutSceneFlags(true));
-                }
-            }
-
-            sequence->SetParentSequence(NULL);
-        }
-
-        // tell all interested listeners
-        NotifyListeners(sequence, bAbort ? IMovieListener::eMovieEvent_Aborted : IMovieListener::eMovieEvent_Stopped);
-
-        // erase the sequence after notifying listeners so if they choose to they can get the ending time of this sequence
-        if (FindSequence(sequence, it))
-        {
-            m_playingSequences.erase(it);
-        }
-
-        sequence->Resume();
-        static_cast<CAnimSequence*>(sequence)->OnStop();
-        bRet = true;
+        return false;
     }
 
-    return bRet;
+    if (bAnimate && sequence->IsActivated())
+    {
+        if (m_sequenceStopBehavior == eSSB_GotoEndTime)
+        {
+            SAnimContext ac;
+            ac.singleFrame = true;
+            ac.time = sequence->GetTimeRange().end;
+            sequence->Animate(ac);
+        }
+        else if (m_sequenceStopBehavior == eSSB_GotoStartTime)
+        {
+            SAnimContext ac;
+            ac.singleFrame = true;
+            ac.time = sequence->GetTimeRange().start;
+            sequence->Animate(ac);
+        }
+
+        sequence->Deactivate();
+    }
+
+    // If this sequence is cut scene end it.
+    if (sequence->GetFlags() & IAnimSequence::eSeqFlags_CutScene)
+    {
+        if (!gEnv->IsEditing() || !m_bCutscenesPausedInEditor)
+        {
+            if (m_pUser)
+            {
+                m_pUser->EndCutScene(sequence, sequence->GetCutSceneFlags(true));
+            }
+        }
+
+        sequence->SetParentSequence(NULL);
+    }
+
+    // tell all interested listeners
+    NotifyListeners(sequence, bAbort ? IMovieListener::eMovieEvent_Aborted : IMovieListener::eMovieEvent_Stopped);
+
+    // erase the sequence after notifying listeners so if they choose to they can get the ending time of this sequence
+    if (FindSequence(sequence, it))
+    {
+        m_playingSequences.erase(it);
+    }
+
+    sequence->Resume();
+    static_cast<CAnimSequence*>(sequence)->OnStop();
+
+    return true;
 }
 
 //////////////////////////////////////////////////////////////////////////
 bool CMovieSystem::AbortSequence(IAnimSequence* sequence, bool bLeaveTime)
 {
-    assert(sequence);
-
-    // to avoid any camera blending after aborting a cut scene
-    IViewSystem* pViewSystem = gEnv->pSystem->GetIViewSystem();
-    if (pViewSystem)
-    {
-        pViewSystem->SetBlendParams(0, 0, 0);
-        IView* pView = pViewSystem->GetActiveView();
-        if (pView)
-        {
-            pView->ResetBlending();
-        }
-    }
-
     return InternalStopSequence(sequence, true, !bLeaveTime);
 }
 
@@ -911,7 +906,7 @@ void CMovieSystem::Reset(bool bPlayOnReset, bool bSeekToStart)
     InternalStopAllSequences(true, false);
 
     // Reset all sequences.
-    for (Sequences::iterator iter = m_sequences.begin(); iter != m_sequences.end(); ++iter)
+    for (Sequences::const_iterator iter = m_sequences.cbegin(); iter != m_sequences.cend(); ++iter)
     {
         IAnimSequence* pCurrentSequence = iter->get();
         NotifyListeners(pCurrentSequence, IMovieListener::eMovieEvent_Started);
@@ -945,7 +940,7 @@ void CMovieSystem::Reset(bool bPlayOnReset, bool bSeekToStart)
 //////////////////////////////////////////////////////////////////////////
 void CMovieSystem::PlayOnLoadSequences()
 {
-    for (Sequences::iterator sit = m_sequences.begin(); sit != m_sequences.end(); ++sit)
+    for (Sequences::const_iterator sit = m_sequences.cbegin(); sit != m_sequences.cend(); ++sit)
     {
         IAnimSequence* sequence = sit->get();
         if (sequence->GetFlags() & IAnimSequence::eSeqFlags_PlayOnReset)
@@ -989,16 +984,27 @@ void CMovieSystem::ShowPlayedSequencesDebug()
 {
     float y = 10.0f;
     std::vector<const char*> names;
+    std::vector<float> rows;
+    constexpr f32 green[4]  = {0, 1, 0, 1};
+    constexpr f32 purple[4] = {1, 0, 1, 1};
+    constexpr f32 white[4]  = {1, 1, 1, 1};
+
+    //TODO: needs an implementation
+    auto Draw2dLabel = [](float /*x*/,float /*y*/,float /*depth*/,const f32* /*color*/,bool /*center*/, const char* /*fmt*/, ...) {};
 
     for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it)
     {
         PlayingSequence& playingSequence = *it;
 
-        if (playingSequence.sequence == NULL)
+        if (playingSequence.sequence == nullptr)
         {
             continue;
         }
 
+        const char* fullname = playingSequence.sequence->GetName();
+
+        Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed);
+
         y += 16.0f;
 
         for (int i = 0; i < playingSequence.sequence->GetNodeCount(); ++i)
@@ -1019,9 +1025,10 @@ void CMovieSystem::ShowPlayedSequencesDebug()
             if (alreadyThere == false)
             {
                 names.push_back(name);
-            }
-        }
 
+            }
+            Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name);
+        }
         y += 32.0f;
     }
 }
@@ -1041,13 +1048,13 @@ void CMovieSystem::PreUpdate(float deltaTime)
     }
     m_newlyActivatedSequences.clear();
 
-    UpdateInternal(m_cvar_t_FixedStep ? m_cvar_t_FixedStep->GetFVal() : deltaTime, true);
+    UpdateInternal(Internal::ApplyDeltaTimeOverrideIfEnabled(deltaTime), true);
 }
 
 //////////////////////////////////////////////////////////////////////////
 void CMovieSystem::PostUpdate(float deltaTime)
 {
-    UpdateInternal(m_cvar_t_FixedStep ? m_cvar_t_FixedStep->GetFVal() : deltaTime, false);
+    UpdateInternal(Internal::ApplyDeltaTimeOverrideIfEnabled(deltaTime), false);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1061,7 +1068,7 @@ void CMovieSystem::UpdateInternal(const float deltaTime, const bool bPreUpdate)
     }
 
     // don't update more than once if dt==0.0
-    CTimeValue curTime = gEnv->pTimer->GetFrameStartTime();
+    const AZ::TimeUs curTime = AZ::GetLastSimulationTickTime();
     if (deltaTime == 0.0f && curTime == m_lastUpdateTime && !gEnv->IsEditor())
     {
         return;
@@ -1093,7 +1100,8 @@ void CMovieSystem::UpdateInternal(const float deltaTime, const bool bPreUpdate)
 
         // Skip sequence if current update does not apply
         const bool bSequenceEarlyUpdate = (playingSequence.sequence->GetFlags() & IAnimSequence::eSeqFlags_EarlyMovieUpdate) != 0;
-        if (bPreUpdate && !bSequenceEarlyUpdate || !bPreUpdate && bSequenceEarlyUpdate)
+        if ((bPreUpdate && !bSequenceEarlyUpdate ) || (!bPreUpdate && bSequenceEarlyUpdate)
+)
         {
             continue;
         }
@@ -1268,7 +1276,7 @@ void CMovieSystem::PauseCutScenes()
 {
     m_bCutscenesPausedInEditor = true;
 
-    if (m_pUser != NULL)
+    if (m_pUser != nullptr)
     {
         for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it)
         {
@@ -1290,7 +1298,7 @@ void CMovieSystem::ResumeCutScenes()
 
     m_bCutscenesPausedInEditor = false;
 
-    if (m_pUser != NULL)
+    if (m_pUser != nullptr)
     {
         for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it)
         {
@@ -1480,7 +1488,7 @@ void CMovieSystem::ListSequencesCmd([[maybe_unused]] IConsoleCmdArgs* pArgs)
 void CMovieSystem::PlaySequencesCmd(IConsoleCmdArgs* pArgs)
 {
     const char* sequenceName = pArgs->GetArg(1);
-    gEnv->pMovieSystem->PlaySequence(sequenceName, NULL, false, false);
+    gEnv->pMovieSystem->PlaySequence(sequenceName, nullptr, false, false);
 }
 #endif //#if !defined(_RELEASE)
 
@@ -1513,35 +1521,12 @@ void CMovieSystem::GoToFrame(const char* seqName, float targetFrame)
 
 void CMovieSystem::EnableFixedStepForCapture(float step)
 {
-    if (nullptr == m_cvar_t_FixedStep)
+    if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
     {
-        m_cvar_t_FixedStep = gEnv->pConsole->GetCVar("t_FixedStep");
+        m_fixedTimeStepBackUp = timeSystem->GetSimulationTickDeltaOverride();
+        timeSystem->SetSimulationTickDeltaOverride(AZ::SecondsToTimeMs(step));
     }
 
-    m_fixedTimeStepBackUp = m_cvar_t_FixedStep->GetFVal();
-    m_cvar_t_FixedStep->Set(step);
-
-    if (nullptr == m_cvar_t_MaxStep)
-    {
-        m_cvar_t_MaxStep = gEnv->pConsole->GetCVar("t_MaxStep");
-    }
-
-    // Make sure to make the max step large enough
-    m_maxStepBackUp = m_cvar_t_MaxStep->GetFVal();
-    if (step > m_maxStepBackUp)
-    {
-        m_cvar_t_MaxStep->Set(step);
-    }
-
-    if (nullptr == m_cvar_t_Smoothing)
-    {
-        m_cvar_t_Smoothing = gEnv->pConsole->GetCVar("t_Smoothing");
-    }
-
-    // Turn off framerate smoothing
-    m_smoothingBackUp = m_cvar_t_Smoothing->GetFVal();
-    m_cvar_t_Smoothing->Set(0);
-
     if (nullptr == m_cvar_sys_maxTimeStepForMovieSystem)
     {
         m_cvar_sys_maxTimeStepForMovieSystem = gEnv->pConsole->GetCVar("sys_maxTimeStepForMovieSystem");
@@ -1557,9 +1542,10 @@ void CMovieSystem::EnableFixedStepForCapture(float step)
 
 void CMovieSystem::DisableFixedStepForCapture()
 {
-    m_cvar_t_FixedStep->Set(m_fixedTimeStepBackUp);
-    m_cvar_t_MaxStep->Set(m_maxStepBackUp);
-    m_cvar_t_Smoothing->Set(m_smoothingBackUp);
+    if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
+    {
+        timeSystem->SetSimulationTickDeltaOverride(m_fixedTimeStepBackUp);
+    }
     m_cvar_sys_maxTimeStepForMovieSystem->Set(m_maxTimeStepForMovieSystemBackUp);
 }
 
diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.h b/Gems/Maestro/Code/Source/Cinematics/Movie.h
index 15295da353..ab2c2e649b 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Movie.h
+++ b/Gems/Maestro/Code/Source/Cinematics/Movie.h
@@ -14,6 +14,7 @@
 
 #pragma once
 #include <AzCore/std/containers/map.h>
+#include <AzCore/Time/ITime.h>
 
 #include <CryCommon/TimeValue.h>
 #include <CryCommon/StaticInstance.h>
@@ -235,7 +236,7 @@ private:
     IMovieUser* m_pUser;
     IMovieCallback* m_pCallback;
 
-    CTimeValue m_lastUpdateTime;
+    AZ::TimeUs m_lastUpdateTime;
 
     typedef AZStd::vector<AZStd::intrusive_ptr<IAnimSequence> > Sequences;
     Sequences m_sequences;
@@ -268,15 +269,10 @@ private:
     int m_captureFrame;
     bool m_bEndCapture;
     ICaptureKey m_captureKey;
-    float m_fixedTimeStepBackUp;
-    float m_maxStepBackUp;
-    float m_smoothingBackUp;
+    AZ::TimeMs m_fixedTimeStepBackUp;
     float m_maxTimeStepForMovieSystemBackUp;
     ICVar* m_cvar_capture_frame_once;
     ICVar* m_cvar_capture_folder;
-    ICVar* m_cvar_t_FixedStep;
-    ICVar* m_cvar_t_MaxStep;
-    ICVar* m_cvar_t_Smoothing;
     ICVar* m_cvar_sys_maxTimeStepForMovieSystem;
     ICVar* m_cvar_capture_frames;
     ICVar* m_cvar_capture_file_prefix;
diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
index b93215d397..8e6ebb9fe9 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
@@ -6,12 +6,12 @@
  *
  */
 
-
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Math/Transform.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzCore/Time/ITime.h>
 #include <AzFramework/Components/CameraBus.h>
 
 #include "MathConversion.h"
@@ -24,7 +24,6 @@
 #include "GotoTrack.h"
 #include "CaptureTrack.h"
 #include "ISystem.h"
-#include "ITimer.h"
 #include "AnimAZEntityNode.h"
 #include "AnimComponentNode.h"
 #include "Movie.h"
@@ -36,7 +35,6 @@
 
 #include <IAudioSystem.h>
 #include <IConsole.h>
-#include <IViewSystem.h>
 
 #define s_nodeParamsInitialized s_nodeParamsInitializedScene
 #define s_nodeParams s_nodeParamsSene
@@ -199,9 +197,8 @@ CAnimSceneNode::CAnimSceneNode(const int id)
     m_lastCaptureKey = -1;
     m_bLastCapturingEnded = true;
     m_captureFrameCount = 0;
-    m_cvar_t_FixedStep = NULL;
-    m_pCamNodeOnHoldForInterp = 0;
-    m_CurrentSelectTrack = 0;
+    m_pCamNodeOnHoldForInterp = nullptr;
+    m_CurrentSelectTrack = nullptr;
     m_CurrentSelectTrackKeyNumber = 0;
     m_lastPrecachePoint = -1.f;
     SetName("Scene");
@@ -304,7 +301,6 @@ void CAnimSceneNode::Activate(bool bActivate)
             pSequenceTrack->GetKey(currKey, &key);
 
             IAnimSequence* pSequence = GetSequenceFromSequenceKey(key);
-            
             if (pSequence)
             {
                 if (bActivate)
@@ -329,11 +325,6 @@ void CAnimSceneNode::Activate(bool bActivate)
             }
         }
     }
-
-    if (m_cvar_t_FixedStep == NULL)
-    {
-        m_cvar_t_FixedStep = gEnv->pConsole->GetCVar("t_FixedStep");
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -344,12 +335,12 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
         return;
     }
 
-    CSelectTrack* cameraTrack = NULL;
-    CEventTrack* pEventTrack = NULL;
-    CSequenceTrack* pSequenceTrack = NULL;
-    CConsoleTrack* pConsoleTrack = NULL;
-    CGotoTrack* pGotoTrack = NULL;
-    CCaptureTrack* pCaptureTrack = NULL;
+    CSelectTrack* cameraTrack = nullptr;
+    CEventTrack* pEventTrack = nullptr;
+    CSequenceTrack* pSequenceTrack = nullptr;
+    CConsoleTrack* pConsoleTrack = nullptr;
+    CGotoTrack* pGotoTrack = nullptr;
+    CCaptureTrack* pCaptureTrack = nullptr;
     /*
     bool bTimeJump = false;
     if (ec.time < m_time)
@@ -422,14 +413,15 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
                 timeScale = .0f;
             }
             
-            // if set, disable fixed time step cvar so timewarping will have an affect. We never set it back though - that is
-            // likely a bug!
-            if (m_cvar_t_FixedStep && m_cvar_t_FixedStep->GetFVal() != .0f)
+            if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
             {
-                m_cvar_t_FixedStep->Set(.0f);
+                m_simulationTickOverrideBackup = timeSystem->GetSimulationTickDeltaOverride();
+                // if set, disable fixed time step cvar so timewarping will have an affect.
+                timeSystem->SetSimulationTickDeltaOverride(AZ::Time::ZeroTimeMs);
+
+                m_timeScaleBackup = timeSystem->GetSimulationTickScale();
+                timeSystem->SetSimulationTickScale(timeScale);
             }
-            gEnv->pTimer->SetTimeScale(timeScale, ITimer::eTSC_Trackview);
-            
         }
         break;
         case AnimParamType::FixedTimeStep:
@@ -440,9 +432,12 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
             {
                 timeStep = 0;
             }
-            if (m_cvar_t_FixedStep)
+
+            if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
             {
-                m_cvar_t_FixedStep->Set(timeStep);
+                m_simulationTickOverrideBackup = timeSystem->GetSimulationTickDeltaOverride();
+                // if set, disable fixed time step cvar so timewarping will have an affect.
+                timeSystem->SetSimulationTickDeltaOverride(AZ::SecondsToTimeMs(timeStep));
             }
         }
         break;
@@ -454,7 +449,7 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
     // Check if a camera override is set by CVar
     const char* overrideCamName = gEnv->pMovieSystem->GetOverrideCamName();
     AZ::EntityId overrideCamId;
-    if (overrideCamName != 0 && strlen(overrideCamName) > 0)
+    if (overrideCamName != nullptr && strlen(overrideCamName) > 0)
     {
         // overriding with a Camera Component entity is done by entityId (as names are not unique among AZ::Entities) - try to convert string to u64 to see if it's an id
         AZ::u64 u64Id = strtoull(overrideCamName, nullptr, /*base (radix)*/ 10);
@@ -622,17 +617,18 @@ void CAnimSceneNode::OnReset()
     m_bLastCapturingEnded = true;
     m_captureFrameCount = 0;
 
-    if (GetTrackForParameter(AnimParamType::TimeWarp))
+    if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
     {
-        gEnv->pTimer->SetTimeScale(1.0f, ITimer::eTSC_Trackview);
-        if (m_cvar_t_FixedStep)
+        if (GetTrackForParameter(AnimParamType::TimeWarp))
         {
-            m_cvar_t_FixedStep->Set(0);
+            timeSystem->SetSimulationTickScale(m_timeScaleBackup);
+            timeSystem->SetSimulationTickDeltaOverride(m_simulationTickOverrideBackup);
+        }
+
+        if (GetTrackForParameter(AnimParamType::FixedTimeStep))
+        {
+            timeSystem->SetSimulationTickDeltaOverride(m_simulationTickOverrideBackup);
         }
-    }
-    if (GetTrackForParameter(AnimParamType::FixedTimeStep) && m_cvar_t_FixedStep)
-    {
-        m_cvar_t_FixedStep->Set(0);
     }
 }
 
@@ -788,7 +784,7 @@ void CAnimSceneNode::ApplyCameraKey(ISelectKey& key, SAnimContext& ec)
     if (!bInterpolateCamera && m_pCamNodeOnHoldForInterp)
     {
         m_pCamNodeOnHoldForInterp->SetSkipInterpolatedCameraNode(false);
-        m_pCamNodeOnHoldForInterp = 0;
+        m_pCamNodeOnHoldForInterp = nullptr;
     }
 
     SCameraParams cameraParams;
@@ -796,22 +792,9 @@ void CAnimSceneNode::ApplyCameraKey(ISelectKey& key, SAnimContext& ec)
     cameraParams.fov = 0;
     cameraParams.justActivated = true;
 
-    // Init the defaults with the current view settings.
     // With component entities, the fov and near plane may be animated on an 
     // entity with a Camera component. Don't stomp the values if this update happens
     // after those properties are animated.
-    AZ_Assert(gEnv && gEnv->pSystem, "Expected valid gEnv->pSystem");
-    IViewSystem* viewSystem = gEnv->pSystem->GetIViewSystem();
-    if (viewSystem)
-    {
-        IView* view = viewSystem->GetActiveView();
-        if (view)
-        {
-            SViewParams params = *view->GetCurrentParams();
-            cameraParams.fov = params.fov;
-            cameraParams.nearZ = params.nearplane;
-        }
-    }
 
     ///////////////////////////////////////////////////////////////////
     // find the Scene Camera (Camera Component Camera)  
@@ -878,9 +861,9 @@ void CAnimSceneNode::ApplyCameraKey(ISelectKey& key, SAnimContext& ec)
             }
 
             IAnimNode* prevCameraAnimNode = m_pSequence->FindNodeByName(prevKey.szSelection.c_str(), this);
-            if (prevCameraAnimNode == NULL)
+            if (prevCameraAnimNode == nullptr)
             {
-                prevCameraAnimNode = m_pSequence->FindNodeByName(prevKey.szSelection.c_str(), NULL);
+                prevCameraAnimNode = m_pSequence->FindNodeByName(prevKey.szSelection.c_str(), nullptr);
             }
 
             if (prevCameraAnimNode && prevCameraAnimNode->GetType() == AnimNodeType::Camera && prevCameraAnimNode->GetTrackForParameter(AnimParamType::FOV))
@@ -947,35 +930,33 @@ void CAnimSceneNode::ApplyAudioKey(char const* const sTriggerName, bool const bP
 //////////////////////////////////////////////////////////////////////////
 void CAnimSceneNode::ApplySequenceKey(IAnimTrack* pTrack, [[maybe_unused]] int nPrevKey, int nCurrKey, ISequenceKey& key, SAnimContext& ec)
 {
-    if (nCurrKey >= 0)
+    if (nCurrKey < 0)
     {
-        IAnimSequence* pSequence = GetSequenceFromSequenceKey(key);
-        if (pSequence)
-        {
-            float startTime = -FLT_MAX;
-            float endTime = -FLT_MAX;
+        return;
+    }
+    IAnimSequence* pSequence = GetSequenceFromSequenceKey(key);
+    if (!pSequence)
+    {
+        return;
+    }
 
-            if (key.bOverrideTimes)
-            {
-                key.fDuration = (key.fEndTime - key.fStartTime) > 0.0f ? (key.fEndTime - key.fStartTime) : 0.0f;
-                startTime = key.fStartTime;
-                endTime = key.fEndTime;
-            }
-            else
-            {
-                key.fDuration = pSequence->GetTimeRange().Length();
-            }
+    if (key.bOverrideTimes)
+    {
+        key.fDuration = (key.fEndTime - key.fStartTime) > 0.0f ? (key.fEndTime - key.fStartTime) : 0.0f;
+    }
+    else
+    {
+        key.fDuration = pSequence->GetTimeRange().Length();
+    }
 
-            pTrack->SetKey(nCurrKey, &key);
+    pTrack->SetKey(nCurrKey, &key);
 
-            SAnimContext newAnimContext = ec;
-            newAnimContext.time = std::min(ec.time - key.time + key.fStartTime, key.fDuration + key.fStartTime);
+    SAnimContext newAnimContext = ec;
+    newAnimContext.time = std::min(ec.time - key.time + key.fStartTime, key.fDuration + key.fStartTime);
 
-            if (static_cast<CAnimSequence*>(pSequence)->GetTime() != newAnimContext.time)
-            {
-                pSequence->Animate(newAnimContext);
-            }
-        }
+    if (static_cast<CAnimSequence*>(pSequence)->GetTime() != newAnimContext.time)
+    {
+        pSequence->Animate(newAnimContext);
     }
 }
 
diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.h b/Gems/Maestro/Code/Source/Cinematics/SceneNode.h
index c577839fce..6435b48953 100644
--- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.h
+++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #include <AzCore/std/containers/map.h>
+#include <AzCore/Time/ITime.h>
 
 #include "AnimNode.h"
 #include "SoundTrack.h"
@@ -149,7 +150,8 @@ private:
 
     std::vector<SSoundInfo> m_SoundInfo;
 
-    ICVar* m_cvar_t_FixedStep;
+    AZ::TimeMs m_simulationTickOverrideBackup = AZ::Time::ZeroTimeMs;
+    float m_timeScaleBackup = 1.0f;
 };
 
 #endif // CRYINCLUDE_CRYMOVIE_SCENENODE_H
diff --git a/Gems/Maestro/Code/Tests/MaestroTest.cpp b/Gems/Maestro/Code/Tests/MaestroTest.cpp
index 1607d35296..1724e090aa 100644
--- a/Gems/Maestro/Code/Tests/MaestroTest.cpp
+++ b/Gems/Maestro/Code/Tests/MaestroTest.cpp
@@ -8,7 +8,6 @@
 
 #include <AzTest/AzTest.h>
 #include <AzCore/UnitTest/UnitTest.h>
-#include <Mocks/ITimerMock.h>
 #include <Mocks/ICryPakMock.h>
 #include <Mocks/IConsoleMock.h>
 #include <AzCore/Memory/OSAllocator.h>
@@ -33,7 +32,6 @@ protected:
     {
         AZ_TEST_CLASS_ALLOCATOR(MockHolder);
 
-        NiceMock<TimerMock> timer;
         NiceMock<CryPakMock> pak;
         NiceMock<ConsoleMock> console;
     };
@@ -51,7 +49,6 @@ protected:
         // manage their lifetime, so this solution manages the lifetime
         // and ordering via the heap.
         m_mocks = new MockHolder();
-        m_stubEnv.pTimer = &m_mocks->timer;
         m_stubEnv.pCryPak = &m_mocks->pak;
         m_stubEnv.pConsole = &m_mocks->console;
         gEnv = &m_stubEnv;
diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt
index 559fa23553..afe40408ab 100644
--- a/Gems/Multiplayer/Code/CMakeLists.txt
+++ b/Gems/Multiplayer/Code/CMakeLists.txt
@@ -86,44 +86,24 @@ ly_create_alias(NAME Multiplayer.Servers NAMESPACE Gem TARGETS Gem::Multiplayer
 
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
-        NAME Multiplayer.Builders.Static STATIC
+        NAME Multiplayer.Tools.Static STATIC
         NAMESPACE Gem
         FILES_CMAKE
             multiplayer_tools_files.cmake
-        COMPILE_DEFINITIONS
-            PUBLIC
-                MULTIPLAYER_TOOLS
         INCLUDE_DIRECTORIES
             PRIVATE
-                .
-                Source
                 ${pal_source_dir}
-            PUBLIC
-                Include
-        BUILD_DEPENDENCIES
-            PUBLIC
-                AZ::AzToolsFramework
-                Gem::Multiplayer.Static
-    )
-
-    # by naming this target Multiplayer.Builders it ensures that it is loaded
-    # in any pipeline tools (Like Asset Processor, AssetBuilder, etc)
-    ly_add_target(
-        NAME Multiplayer.Builders GEM_MODULE
-        NAMESPACE Gem
-        FILES_CMAKE
-            multiplayer_tools_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
+                AZ::AzNetworking
                 Source
                 .
             PUBLIC
                 Include
         BUILD_DEPENDENCIES
-            PRIVATE
-                Gem::Multiplayer.Builders.Static
-        RUNTIME_DEPENDENCIES
-            Gem::Multiplayer.Editor
+            PUBLIC
+                AZ::AzCore
+                AZ::AzFramework
+                AZ::AzNetworking
+                AZ::AzToolsFramework
     )
 
     ly_add_target(
@@ -152,11 +132,12 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Gem::Atom_RPI.Public
                 Gem::Atom_RHI.Reflect
                 Gem::Multiplayer.Static
-                Gem::Multiplayer.Builders
+                Gem::Multiplayer.Tools.Static
     )
-
+    
+    ly_create_alias(NAME Multiplayer.Builders  NAMESPACE Gem TARGETS Gem::Multiplayer.Editor)
     # use the Multiplayer.Editor module in tools like the Editor:  Such tools also get the visual debug view:
-    ly_create_alias(NAME Multiplayer.Tools     NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug Gem::Multiplayer.Builders)
+    ly_create_alias(NAME Multiplayer.Tools     NAMESPACE Gem TARGETS Gem::Multiplayer.Debug Gem::Multiplayer.Builders)
 endif()
 
 if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
@@ -207,7 +188,8 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                     AZ::AzTest
                     AZ::AzTestShared
                     AZ::AzToolsFrameworkTestCommon
-                    Gem::Multiplayer.Builders.Static
+                    Gem::Multiplayer.Static
+                    Gem::Multiplayer.Tools.Static
         )
         ly_add_googletest(
             NAME Gem::Multiplayer.Builders.Tests
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Header.jinja b/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Header.jinja
index 5cfeb250fa..58a47b336f 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Header.jinja
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Header.jinja
@@ -443,35 +443,31 @@ namespace {{ Component.attrib['Namespace'] }}
         {{ DeclareNetworkPropertyAccessors(Component, 'Autonomous', 'Authority', false)|indent(8) -}}
         {{ DeclareNetworkPropertyAccessors(Component, 'Autonomous', 'Authority', true)|indent(8) -}}
         {{ DeclareArchetypePropertyGetters(Component)|indent(8) -}}
-        {{ DeclareRpcInvocations(Component, 'Client', 'Authority', false)|indent(8) -}}
-        {{ DeclareRpcInvocations(Component, 'Client', 'Authority', true)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Autonomous', 'Authority', false)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Autonomous', 'Authority', true)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Authority', 'Autonomous', false)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Authority', 'Autonomous', true)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Authority', 'Client', false)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Authority', 'Client', true)|indent(8) -}}
+
+        //! RPC Handlers: Override handlers in order to implement what happens after receiving an RPC
         {{ AutoComponentMacros.DeclareRpcHandlers(Component, 'Server', 'Authority', false)|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcHandlers(Component, 'Client', 'Authority', false)|indent(8) -}}
         {{ AutoComponentMacros.DeclareRpcHandlers(Component, 'Autonomous', 'Authority', false)|indent(8) -}}
         {{ AutoComponentMacros.DeclareRpcHandlers(Component, 'Authority', 'Autonomous', false)|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcSignals(Component, 'Server', 'Authority')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcSignals(Component, 'Client', 'Authority')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcSignals(Component, 'Autonomous', 'Authority')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcSignals(Component, 'Authority', 'Autonomous')|indent(8) -}}
+
+        //! RPC Event Getters: Subscribe to these events and get notified when an RPC is received
         {{ AutoComponentMacros.DeclareRpcEventGetters(Component, 'Server', 'Authority')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcEventGetters(Component, 'Client', 'Authority')|indent(8) -}}
         {{ AutoComponentMacros.DeclareRpcEventGetters(Component, 'Autonomous', 'Authority')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcEventGetters(Component, 'Authority', 'Autonomous')|indent(8) }}
+        {{ AutoComponentMacros.DeclareRpcEventGetters(Component, 'Authority', 'Autonomous')|indent(8) -}}
+
 {% for Service in Component.iter('ComponentRelation') %}
 {%      if (Service.attrib['HasController']|booleanTrue) and (Service.attrib['Constraint'] != 'Incompatible') %}
         {{ Service.attrib['Namespace'] }}::{{ Service.attrib['Name'] }}Controller* Get{{ Service.attrib['Name'] }}Controller();
 {%      endif %}
 {% endfor %}
-        
+
     protected:
         {{ AutoComponentMacros.DeclareRpcEvents(Component, 'Server', 'Authority')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcEvents(Component, 'Client', 'Authority')|indent(8) -}}
         {{ AutoComponentMacros.DeclareRpcEvents(Component, 'Autonomous', 'Authority')|indent(8) -}}
         {{ AutoComponentMacros.DeclareRpcEvents(Component, 'Authority', 'Autonomous')|indent(8) }}
     };
@@ -517,6 +513,8 @@ namespace {{ Component.attrib['Namespace'] }}
         {{ DeclareNetworkPropertyGetters(Component, 'Autonomous', 'Authority', false)|indent(8) -}}
         {{ DeclareArchetypePropertyGetters(Component)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Server', 'Authority', false)|indent(8) -}}
+
+        //! RPC Event Getters: Subscribe to these events and get notified when this component receives an RPC
         {{ AutoComponentMacros.DeclareRpcEventGetters(Component, 'Authority', 'Client')|indent(8) -}}
 
         //! MultiplayerComponent interface
@@ -541,9 +539,13 @@ namespace {{ Component.attrib['Namespace'] }}
         {{ DeclareNetworkPropertyGetters(Component, 'Authority', 'Client', true)|indent(8) -}}
         {{ DeclareNetworkPropertyGetters(Component, 'Autonomous', 'Authority', true)|indent(8) -}}
         {{ DeclareRpcInvocations(Component, 'Server', 'Authority', true)|indent(8) -}}
+
+        //! RPC Handlers: Override handlers in order to implement what happens after receiving an RPC
         {{ AutoComponentMacros.DeclareRpcHandlers(Component, 'Authority', 'Client', false)|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcSignals(Component, 'Authority', 'Client')|indent(8) -}}
-        {{ AutoComponentMacros.DeclareRpcEvents(Component, 'Authority', 'Client')|indent(8) }}
+
+        //! RPC Events: Subscribe to these events and get notified when an RPC is received
+        {{ AutoComponentMacros.DeclareRpcEvents(Component, 'Authority', 'Client')|indent(8) -}}
+
 {% for Service in Component.iter('ComponentRelation') %}
 {%      if Service.attrib['Constraint'] != 'Incompatible' %}
         const {{ Service.attrib['Namespace'] }}::{{ Service.attrib['Name'] }}* Get{{ Service.attrib['Name'] }}() const;
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Source.jinja
index cf62f6f901..d0b77159f8 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/AutoGen/AutoComponent_Source.jinja
@@ -308,13 +308,21 @@ void {{ ClassName }}::Set{{ UpperFirst(Property.attrib['Name']) }}(const {{ Prop
 {% endmacro %}
 {#
 
+#}
+{% macro PrintRpcParameters(printPrefix, paramDefines) %}
+{% if paramDefines|count > 0 %}
+{{ printPrefix }}{{ ', '.join(paramDefines) }}
+{% endif %}
+{% endmacro %}
+{#
+
 #}
 {% macro DefineRpcInvocation(Component, ClassName, Property, InvokeFrom, HandleOn) %}
 {%     set paramNames   = [] %}
 {%     set paramTypes   = [] %}
 {%     set paramDefines = [] %}
 {{     AutoComponentMacros.ParseRpcParams(Property, paramNames, paramTypes, paramDefines) }}
-void {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramDefines) }})
+void {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}({{ PrintRpcParameters('', paramDefines) }})
 {
     constexpr Multiplayer::RpcIndex rpcId = static_cast<Multiplayer::RpcIndex>({{ UpperFirst(Component.attrib['Name']) }}Internal::RemoteProcedure::{{ UpperFirst(Property.attrib['Name']) }});
 {% if Property.attrib['IsReliable']|booleanTrue %}
@@ -340,27 +348,11 @@ void {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(par
 {% endmacro %}
 {#
 
-#}
-{% macro DefineRpcSignal(Component, ClassName, Property, InvokeFrom) %}
-{%     set paramNames   = [] %}
-{%     set paramTypes   = [] %}
-{%     set paramDefines = [] %}
-{{     AutoComponentMacros.ParseRpcParams(Property, paramNames, paramTypes, paramDefines) }}
-void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramDefines) }})
-{
-    m_{{ UpperFirst(Property.attrib['Name']) }}Event.Signal({{ ', '.join(paramNames) }});
-}
-{% endmacro %}
-{#
-
 #}
 {% macro DefineRpcInvocations(Component, ClassName, InvokeFrom, HandleOn, IsProtected) %}
 {% call(Property) AutoComponentMacros.ParseRemoteProcedures(Component, InvokeFrom, HandleOn) %}
 {%    if Property.attrib['IsPublic']|booleanTrue != IsProtected %}
 {{ DefineRpcInvocation(Component, ClassName, Property, InvokeFrom, HandleOn) -}}
-{%    if Property.attrib['GenerateEventBindings']|booleanTrue == true %}
-{{ DefineRpcSignal(Component, ClassName, Property, InvokeFrom) -}}
-{% endif %}
 {%    endif %}
 {% endcall %}
 {% endmacro %}
@@ -374,33 +366,46 @@ void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.jo
 {%     set paramTypes   = [] %}
 {%     set paramDefines = [] %}
 {{     AutoComponentMacros.ParseRpcParams(Property, paramNames, paramTypes, paramDefines) }}
-            ->Method("{{ UpperFirst(Property.attrib['Name']) }}", [](const {{ ClassName }}* self, {{ ', '.join(paramDefines) }}) {
-                        self->m_controller->{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramNames) }});
+            ->Method("{{ UpperFirst(Property.attrib['Name']) }}", []({{ ClassName }}* self{{ PrintRpcParameters(', ', paramDefines) }}) {
+{%                    if (InvokeFrom == 'Server')  %}
+                        self->{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramNames) }});
+{%                    elif (InvokeFrom == 'Authority') or (InvokeFrom == 'Autonomous') %}
+                        if (self->m_controller)
+                        {
+                            self->m_controller->{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramNames) }});
+                        }
+                        else
+                        {
+                            AZ_Warning("Network RPC", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }} method failed. Entity '%s' (id: %s) {{ ClassName }} is missing the network controller. This remote-procedure can only be invoked from {{InvokeFrom}} network entities, because this entity doesn't have a controller, it must not be a {{InvokeFrom}} entity. Please check your network context before attempting to call {{ UpperFirst(Property.attrib['Name']) }}.", self->GetEntity()->GetName().c_str(), self->GetEntityId().ToString().c_str())
+                        }
+{%                    endif %}
                     })
-            ->Method("{{ UpperFirst(Property.attrib['Name']) }}ByEntityId", [](AZ::EntityId id, {{ ', '.join(paramDefines) }}) {
+            ->Method("{{ UpperFirst(Property.attrib['Name']) }}ByEntityId", [](AZ::EntityId id{{ PrintRpcParameters(', ', paramDefines) }}) {
 
                         AZ::Entity* entity = AZ::Interface<AZ::ComponentApplicationRequests>::Get()->FindEntity(id);
                         if (!entity)
                         {
-                            AZ_Warning("Network Property", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str())
+                            AZ_Warning("Network RPC", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str())
                             return;
                         }
 
                         {{ ClassName }}* networkComponent = entity->FindComponent<{{ ClassName }}>();
                         if (!networkComponent)
                         {
-                            AZ_Warning("Network Property", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
+                            AZ_Warning("Network RPC", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
                             return;
                         }
-
+{%                    if (InvokeFrom == 'Server') %}
+                        networkComponent->{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramNames) }});
+{%                    elif (InvokeFrom == 'Authority') or (InvokeFrom == 'Autonomous') %}
                         {{ ClassName }}Controller* controller = static_cast<{{ ClassName }}Controller*>(networkComponent->GetController());
                         if (!controller)
                         {
-                            AZ_Warning("Network Property", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId method failed. Entity '%s' (id: %s) {{ ClassName }} is missing the network controller. This RemoteProcedure can only be invoked from {{InvokeFrom}} network entities, because this entity doesn't have a controller, it must not be a {{InvokeFrom}} entity. Please check your network context before attempting to call {{ UpperFirst(Property.attrib['Name']) }}.", entity->GetName().c_str(), id.ToString().c_str())
+                            AZ_Warning("Network RPC", false, "{{ ClassName }} {{ UpperFirst(Property.attrib['Name']) }}ByEntityId method failed. Entity '%s' (id: %s) {{ ClassName }} is missing the network controller. This RemoteProcedure can only be invoked from {{InvokeFrom}} network entities, because this entity doesn't have a controller, it must not be a {{InvokeFrom}} entity. Please check your network context before attempting to call {{ UpperFirst(Property.attrib['Name']) }}.", entity->GetName().c_str(), id.ToString().c_str())
                             return;
                         }
-
                         controller->{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(paramNames) }});
+{%                    endif %}
                     }, { { { "Source", "The Source containing the {{ ClassName }}Controller" }{% for paramName in paramNames %}, {"{{ paramName }}"}{% endfor %}}})
                 ->Attribute(AZ::Script::Attributes::ToolTip, "{{Property.attrib['Description']}}")
 {%    endif %}
@@ -436,9 +441,13 @@ void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.jo
 {%     set paramTypes   = [] %}
 {%     set paramDefines = [] %}
 {{     AutoComponentMacros.ParseRpcParams(Property, paramNames, paramTypes, paramDefines) }}
-        ->Method("Get{{ UpperFirst(Property.attrib['Name']) }}Event", [](const {{ ClassName }}* self) -> AZ::Event<{{ ', '.join(paramTypes) }}>&
+        ->Method("Get{{ UpperFirst(Property.attrib['Name']) }}Event", []({{ ClassName }}* self) -> AZ::Event<{{ ', '.join(paramTypes) }}>&
         {
+{%        if HandleOn == 'Client' %}
+            return self->Get{{ UpperFirst(Property.attrib['Name']) }}Event();
+{%        elif (HandleOn == 'Authority') or (HandleOn == 'Autonomous') %}
             return self->m_controller->Get{{ UpperFirst(Property.attrib['Name']) }}Event();
+{%        endif %}
         })
             ->Attribute(AZ::Script::Attributes::AzEventDescription, {{ LowerFirst(Property.attrib['Name']) }}EventDesc)
         ->Method("Get{{ UpperFirst(Property.attrib['Name']) }}EventByEntityId", [](AZ::EntityId id) -> AZ::Event<{{ ', '.join(paramTypes) }}>*
@@ -456,7 +465,9 @@ void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.jo
                 AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }}EventByEntityId failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
                 return nullptr;
             }
-
+{%        if HandleOn == 'Client' %}
+            return &networkComponent->Get{{ UpperFirst(Property.attrib['Name']) }}Event();
+{%        elif (HandleOn == 'Authority') or (HandleOn == 'Autonomous') %}
             {{ ClassName }}Controller* controller = static_cast<{{ ClassName }}Controller*>(networkComponent->GetController());
             if (!controller)
             {
@@ -465,6 +476,7 @@ void {{ ClassName }}::Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.jo
             }
 
             return &controller->Get{{ UpperFirst(Property.attrib['Name']) }}Event();
+{%        endif %}
         })
             ->Attribute(AZ::Script::Attributes::AzEventDescription, AZStd::move({{ LowerFirst(Property.attrib['Name']) }}EventDesc))
 {% endif %}
@@ -493,30 +505,32 @@ case {{ UpperFirst(Component.attrib['Name']) }}Internal::RemoteProcedure::{{ Upp
             if (m_controller)
             {
                 AZ_Assert(GetNetBindComponent()->GetNetEntityRole() == Multiplayer::NetEntityRole::Authority, "Entity proxy does not have authority");
-                m_controller->Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection, {{ ', '.join(rpcParamList) }});
-{% if Property.attrib['GenerateEventBindings']|booleanTrue == true %}
-                m_controller->Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(rpcParamList) }});
-{% endif %}
+                m_controller->Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection{{ PrintRpcParameters(', ', rpcParamList) }});
+{%            if (Property.attrib['GenerateEventBindings']|booleanTrue == true) %}
+                m_controller->Get{{ UpperFirst(Property.attrib['Name']) }}Event().Signal({{ PrintRpcParameters('', rpcParamList) }});
+{%            endif %}
             }
-{% if Property.attrib['IsReliable']|booleanTrue %}
-{# if the rpc is not reliable we can simply drop it, also note message reliability type is default reliable in EntityRpcMessage #}
             else // Note that this rpc is marked reliable, trigger the appropriate rpc event so it can be forwarded
             {
+{%            if Property.attrib['IsReliable']|booleanTrue %}
+{#              if the rpc is not reliable we can simply drop it, also note message reliability type is default reliable in EntityRpcMessage #}
                 m_netBindComponent->{{ "GetSend" + InvokeFrom + "To" + HandleOn + "RpcEvent" }}().Signal(message);
+{%            endif %}
             }
-
-{% endif %}
 {% elif HandleOn == 'Autonomous' %}
             if (m_controller)
             {
                 AZ_Assert(GetNetBindComponent()->GetNetEntityRole() == Multiplayer::NetEntityRole::Autonomous, "Entity proxy does not have autonomy");
-                m_controller->Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection, {{ ', '.join(rpcParamList) }});
-{% if Property.attrib['GenerateEventBindings']|booleanTrue == true %}
-                m_controller->Signal{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(rpcParamList) }});
-{% endif %}
+                m_controller->Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection{{ PrintRpcParameters(', ', rpcParamList) }});
+{%            if Property.attrib['GenerateEventBindings']|booleanTrue == true %}
+                m_controller->Get{{ UpperFirst(Property.attrib['Name']) }}Event().Signal({{ PrintRpcParameters('', rpcParamList) }});
+{%            endif %}
             }
-{% else %}
-            Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection, {{ ', '.join(rpcParamList) }});
+{% elif HandleOn == 'Client' %}
+            Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection{{ PrintRpcParameters(', ', rpcParamList) }});
+{%        if Property.attrib['GenerateEventBindings']|booleanTrue == true %}
+            m_{{ UpperFirst(Property.attrib['Name']) }}Event.Signal({{ PrintRpcParameters('', rpcParamList) }});
+{%        endif %}
 {% endif %}
         }
         else if (paramsSerialized)
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h
index 678ec2d6fd..08ba541a1b 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/LocalPredictionPlayerInputComponent.h
@@ -99,8 +99,8 @@ namespace Multiplayer
         double m_moveAccumulator = 0.0;
         double m_clientBankedTime = 0.0;
 
-        AZ::TimeMs m_lastInputReceivedTimeMs = AZ::TimeMs{ 0 };
-        AZ::TimeMs m_lastCorrectionSentTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_lastInputReceivedTimeMs = AZ::Time::ZeroTimeMs;
+        AZ::TimeMs m_lastCorrectionSentTimeMs = AZ::Time::ZeroTimeMs;
 
         ClientInputId m_clientInputId = ClientInputId{ 0 }; // Clients incrementing inputId
         ClientInputId m_lastClientInputId = ClientInputId{ 0 }; // Last inputId processed by the server
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
index 7245dbde9b..3c1dd370cd 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
@@ -265,7 +265,7 @@ namespace Multiplayer
         }
     private:
         HostFrameId m_previousHostFrameId = InvalidHostFrameId;
-        AZ::TimeMs m_previousHostTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_previousHostTimeMs = AZ::Time::ZeroTimeMs;
         AzNetworking::ConnectionId m_previousRewindConnectionId = AzNetworking::InvalidConnectionId;
         float m_previousBlendFactor = DefaultBlendFactor;
     };
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h
index 98a7b165f8..7bd0e9f527 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/MultiplayerStats.h
@@ -27,7 +27,7 @@ namespace Multiplayer
         uint64_t m_serverConnectionCount = 0;
 
         uint64_t m_recordMetricIndex = 0;
-        AZ::TimeMs m_totalHistoryTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_totalHistoryTimeMs = AZ::Time::ZeroTimeMs;
 
         static const uint32_t RingbufferSamples = 32;
         using MetricRingbuffer = AZStd::array<uint64_t, RingbufferSamples>;
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/EntityReplicationManager.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/EntityReplicationManager.h
index 74935d5746..6bd22b39a1 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/EntityReplicationManager.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkEntity/EntityReplication/EntityReplicationManager.h
@@ -201,9 +201,9 @@ namespace Multiplayer
         AZStd::unique_ptr<IReplicationWindow> m_replicationWindow;
         AZStd::unique_ptr<IEntityDomain> m_remoteEntityDomain;
 
-        AZ::TimeMs m_entityActivationTimeSliceMs = AZ::TimeMs{ 0 };
-        AZ::TimeMs m_entityPendingRemovalMs = AZ::TimeMs{ 0 };
-        AZ::TimeMs m_frameTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_entityActivationTimeSliceMs = AZ::Time::ZeroTimeMs;
+        AZ::TimeMs m_entityPendingRemovalMs = AZ::Time::ZeroTimeMs;
+        AZ::TimeMs m_frameTimeMs = AZ::Time::ZeroTimeMs;
         HostId m_remoteHostId = InvalidHostId;
         uint32_t m_maxRemoteEntitiesPendingCreationCount = AZStd::numeric_limits<uint32_t>::max();
         uint32_t m_maxPayloadSize = 0;
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h
index 1e02d6bf56..8e2e809e72 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkInput/NetworkInput.h
@@ -75,7 +75,7 @@ namespace Multiplayer
         MultiplayerComponentInputVector m_componentInputs;
         ClientInputId m_inputId = ClientInputId{ 0 };
         HostFrameId m_hostFrameId = InvalidHostFrameId;
-        AZ::TimeMs m_hostTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_hostTimeMs = AZ::Time::ZeroTimeMs;
         float m_hostBlendFactor = 0.f;
         ConstNetworkEntityHandle m_owner;
         bool m_wasAttached = false;
diff --git a/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp b/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
index 96d6a5e31e..262f9d524f 100644
--- a/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/LocalPredictionPlayerInputComponent.cpp
@@ -66,11 +66,6 @@ namespace Multiplayer
         }
     }
 
-    inline double ConvertTimeMsToSeconds(AZ::TimeMs value)
-    {
-        return static_cast<double>(static_cast<AZ::TimeMs>(value)) / 1000.0;
-    }
-
     void LocalPredictionPlayerInputComponent::LocalPredictionPlayerInputComponent::Reflect(AZ::ReflectContext* context)
     {
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
@@ -162,7 +157,7 @@ namespace Multiplayer
         }
 
         const AZ::TimeMs currentTimeMs = AZ::GetElapsedTimeMs();
-        const double clientInputRateSec = ConvertTimeMsToSeconds(cl_InputRateMs);
+        const double clientInputRateSec = AZ::TimeMsToSecondsDouble(cl_InputRateMs);
         m_lastInputReceivedTimeMs = currentTimeMs;
 
         // Keep track of last inputs received, also allows us to update frame ids
@@ -267,7 +262,7 @@ namespace Multiplayer
             return;
         }
 
-        const double clientInputRateSec = ConvertTimeMsToSeconds(cl_InputRateMs);
+        const double clientInputRateSec = AZ::TimeMsToSecondsDouble(cl_InputRateMs);
 
         // Copy array so we can modify input ids
         NetworkInputMigrationVector inputArrayCopy = inputArray;
@@ -342,7 +337,7 @@ namespace Multiplayer
         // If this correction is for a move outside our input history window, just start replaying from the oldest move we have available
         const uint32_t startReplayIndex = (inputHistorySize > historicalDelta) ? (inputHistorySize - historicalDelta) : 0;
 
-        const double clientInputRateSec = ConvertTimeMsToSeconds(cl_InputRateMs);
+        const double clientInputRateSec = AZ::TimeMsToSecondsDouble(cl_InputRateMs);
         for (uint32_t replayIndex = startReplayIndex; replayIndex < inputHistorySize; ++replayIndex)
         {
             // Reprocess the input for this frame
@@ -423,9 +418,9 @@ namespace Multiplayer
 
     void LocalPredictionPlayerInputComponentController::UpdateAutonomous(AZ::TimeMs deltaTimeMs)
     {
-        const double deltaTime = ConvertTimeMsToSeconds(deltaTimeMs);
-        const double clientInputRateSec = ConvertTimeMsToSeconds(cl_InputRateMs);
-        const double maxRewindHistory = ConvertTimeMsToSeconds(cl_MaxRewindHistoryMs);
+        const double deltaTime = AZ::TimeMsToSecondsDouble(deltaTimeMs);
+        const double clientInputRateSec = AZ::TimeMsToSecondsDouble(cl_InputRateMs);
+        const double maxRewindHistory = AZ::TimeMsToSecondsDouble(cl_MaxRewindHistoryMs);
 
 #ifndef AZ_RELEASE_BUILD
         m_moveAccumulator += deltaTime * cl_DebugHackTimeMultiplier;
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp
index 392b020748..2989b7629e 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.cpp
@@ -13,7 +13,7 @@ namespace Multiplayer
     // This can be used to help mitigate client side performance when large numbers of entities are created off the network
     AZ_CVAR(uint32_t, cl_ClientMaxRemoteEntitiesPendingCreationCount, AZStd::numeric_limits<uint32_t>::max(), nullptr, AZ::ConsoleFunctorFlags::DontReplicate, "Maximum number of entities that we have sent to the client, but have not had a confirmation back from the client");
     AZ_CVAR(AZ::TimeMs, cl_ClientEntityReplicatorPendingRemovalTimeMs, AZ::TimeMs{ 10000 }, nullptr, AZ::ConsoleFunctorFlags::DontReplicate, "How long should wait prior to removing an entity for the client through a change in the replication window, entity deletes are still immediate");
-    AZ_CVAR(AZ::TimeMs, cl_DefaultNetworkEntityActivationTimeSliceMs, AZ::TimeMs{ 0 }, nullptr, AZ::ConsoleFunctorFlags::DontReplicate, "Max Ms to use to activate entities coming from the network, 0 means instantiate everything");
+    AZ_CVAR(AZ::TimeMs, cl_DefaultNetworkEntityActivationTimeSliceMs, AZ::Time::ZeroTimeMs, nullptr, AZ::ConsoleFunctorFlags::DontReplicate, "Max Ms to use to activate entities coming from the network, 0 means instantiate everything");
 
     ClientToServerConnectionData::ClientToServerConnectionData
     (
diff --git a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugHierarchyReporter.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugHierarchyReporter.cpp
index ad28307204..78963439ed 100644
--- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugHierarchyReporter.cpp
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugHierarchyReporter.cpp
@@ -27,7 +27,7 @@ namespace Multiplayer
         CollectHierarchyRoots();
 
         AZ::EntitySystemBus::Handler::BusConnect();
-        m_updateDebugOverlay.Enqueue(AZ::TimeMs{ 0 }, true);
+        m_updateDebugOverlay.Enqueue(AZ::Time::ZeroTimeMs, true);
     }
 
     MultiplayerDebugHierarchyReporter::~MultiplayerDebugHierarchyReporter()
diff --git a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugPerEntityReporter.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugPerEntityReporter.cpp
index adfef397b6..a53420da84 100644
--- a/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugPerEntityReporter.cpp
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugPerEntityReporter.cpp
@@ -127,7 +127,7 @@ namespace Multiplayer
     MultiplayerDebugPerEntityReporter::MultiplayerDebugPerEntityReporter()
         : m_updateDebugOverlay([this]() { UpdateDebugOverlay(); }, AZ::Name("UpdateDebugPerEntityOverlay"))
     {
-        m_updateDebugOverlay.Enqueue(AZ::TimeMs{ 0 }, true);
+        m_updateDebugOverlay.Enqueue(AZ::Time::ZeroTimeMs, true);
 
         m_eventHandlers.m_entitySerializeStart = decltype(m_eventHandlers.m_entitySerializeStart)([this](AzNetworking::SerializerMode mode, AZ::EntityId entityId, const char* entityName)
             {
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
index 59446e9889..b896f35b71 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
@@ -35,7 +35,7 @@ namespace Multiplayer
     {
         m_networkEditorInterface = AZ::Interface<INetworking>::Get()->CreateNetworkInterface(
             AZ::Name(MpEditorInterfaceName), ProtocolType::Tcp, TrustZone::ExternalClientToServer, *this);
-        m_networkEditorInterface->SetTimeoutMs(AZ::TimeMs{ 0 }); // Disable timeouts on this network interface
+        m_networkEditorInterface->SetTimeoutMs(AZ::Time::ZeroTimeMs); // Disable timeouts on this network interface
 
         // Wait to activate the editor-server until LegacySystemInterfaceCreated so that the logging system is ready
         // Automated testing listens for these logs
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
index 8f11985cba..ec783808a2 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
@@ -14,11 +14,8 @@
 #include <MultiplayerSystemComponent.h>
 #include <PythonEditorEventsBus.h>
 #include <Editor/MultiplayerEditorSystemComponent.h>
-#include <Source/AutoGen/Multiplayer.AutoPackets.h>
 
-#include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Console/IConsole.h>
-#include <AzCore/Console/ILogger.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Utils/Utils.h>
@@ -133,6 +130,7 @@ namespace Multiplayer
         AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
         AzFramework::GameEntityContextEventBus::Handler::BusDisconnect();
         MultiplayerEditorServerRequestBus::Handler::BusDisconnect();
+        AZ::TickBus::Handler::BusDisconnect();
     }
 
     void MultiplayerEditorSystemComponent::NotifyRegisterViews()
@@ -157,12 +155,20 @@ namespace Multiplayer
             [[fallthrough]];
         case eNotify_OnEndGameMode:
             // Kill the configured server if it's active
-            if (m_serverProcess)
+            AZ::TickBus::Handler::BusDisconnect();
+            if (m_serverProcessWatcher)
             {
-                m_serverProcess->TerminateProcess(0);
-                m_serverProcess = nullptr;
+                m_serverProcessWatcher->TerminateProcess(0);
+                if (m_serverProcessTracePrinter)
+                {
+                    m_serverProcessTracePrinter->Pump();
+                    m_serverProcessTracePrinter->WriteCurrentString(true);
+                    m_serverProcessTracePrinter->WriteCurrentString(false);
+                }
+                m_serverProcessWatcher = nullptr;
+                m_serverProcessTracePrinter = nullptr;
             }
-
+            
             if (INetworkInterface* editorNetworkInterface = AZ::Interface<INetworking>::Get()->RetrieveNetworkInterface(AZ::Name(MpEditorInterfaceName)))
             {
                 editorNetworkInterface->Disconnect(m_editorConnId, AzNetworking::DisconnectReason::TerminatedByClient);
@@ -181,7 +187,7 @@ namespace Multiplayer
         }
     }
 
-    AzFramework::ProcessWatcher* LaunchEditorServer()
+    void MultiplayerEditorSystemComponent::LaunchEditorServer()
     {
         // Assemble the server's path
         AZ::CVarFixedString serverProcess = editorsv_process;
@@ -207,12 +213,22 @@ namespace Multiplayer
         {
             server_rhi = static_cast<AZ::CVarFixedString>(editorsv_rhi_override);
         }
+
+        const auto console = AZ::Interface<AZ::IConsole>::Get();
+        AZ::CVarFixedString sv_defaultPlayerSpawnAsset;
+
+        if (console->GetCvarValue("sv_defaultPlayerSpawnAsset", sv_defaultPlayerSpawnAsset) != AZ::GetValueResult::Success)
+        {
+            AZ_Assert( false,
+                "MultiplayerEditorSystemComponent::LaunchEditorServer failed! Could not find the sv_defaultPlayerSpawnAsset cvar; the editor-server "
+                "will fall back to using some other default player! Please update this code to use a valid cvar!")
+        }
         
         processLaunchInfo.m_commandlineParameters = AZStd::string::format(
             R"("%s" --project-path "%s" --editorsv_isDedicated true --sv_defaultPlayerSpawnAsset "%s" --rhi "%s")",
             serverPath.c_str(),
             AZ::Utils::GetProjectPath().c_str(),
-            static_cast<AZ::CVarFixedString>(sv_defaultPlayerSpawnAsset).c_str(),
+            sv_defaultPlayerSpawnAsset.c_str(),
             server_rhi.GetCStr()
         );
         processLaunchInfo.m_showWindow = true;
@@ -220,13 +236,21 @@ namespace Multiplayer
 
         // Launch the Server
         AzFramework::ProcessWatcher* outProcess = AzFramework::ProcessWatcher::LaunchProcess(
-            processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_NONE);
+            processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_STDINOUT);
 
         AZ_Error(
             "MultiplayerEditor", processLaunchInfo.m_launchResult != AzFramework::ProcessLauncher::ProcessLaunchResult::PLR_MissingFile,
             "LaunchEditorServer failed! The ServerLauncher binary is missing! (%s)  Please build server launcher.", serverPath.c_str())
 
-        return outProcess;
+        // Stop the previous server if one exists
+        if (m_serverProcessWatcher)
+        {
+            AZ::TickBus::Handler::BusDisconnect();
+            m_serverProcessWatcher->TerminateProcess(0);
+        }
+        m_serverProcessWatcher.reset(outProcess);
+        m_serverProcessTracePrinter = AZStd::make_unique<ProcessCommunicatorTracePrinter>(m_serverProcessWatcher->GetCommunicator(), "EditorServer");
+        AZ::TickBus::Handler::BusConnect();
     }
 
     void MultiplayerEditorSystemComponent::OnGameEntitiesStarted()
@@ -286,7 +310,7 @@ namespace Multiplayer
             editorNetworkInterface->Listen(editorsv_port);
 
             // Launch the editor-server
-            m_serverProcess = LaunchEditorServer();
+            LaunchEditorServer();
         }
         else
         {
@@ -393,4 +417,20 @@ namespace Multiplayer
     {
         return PyIsInGameMode();
     }
+
+    void MultiplayerEditorSystemComponent::OnTick(float, AZ::ScriptTimePoint)
+    {
+        if (m_serverProcessTracePrinter)
+        {
+            m_serverProcessTracePrinter->Pump();
+        }
+        else
+        {
+            AZ::TickBus::Handler::BusDisconnect();
+            AZ_Warning(
+                "MultiplayerEditorSystemComponent", false,
+                "The server process trace printer is NULL so we won't be able to pipe server logs to the editor. Please update the code to call AZ::TickBus::Handler::BusDisconnect whenever the editor-server is terminated.")
+        }
+    }
+
 }
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
index 77b41a5dc4..5e49f8f08d 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
@@ -13,14 +13,12 @@
 #include <Multiplayer/Editor/MultiplayerPythonEditorEventsBus.h>
 #include <IEditor.h>
 
-#include <Editor/MultiplayerEditorConnection.h>
-
 #include <AzCore/Component/Component.h>
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/Console/IConsole.h>
-#include <AzCore/Console/ILogger.h>
 #include <AzFramework/Entity/GameEntityContextBus.h>
 #include <AzFramework/Process/ProcessWatcher.h>
+#include <AzFramework/Process/ProcessCommunicatorTracePrinter.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 
 namespace AzNetworking
@@ -52,6 +50,7 @@ namespace Multiplayer
         , private AzToolsFramework::EditorEvents::Bus::Handler
         , private IEditorNotifyListener
         , private MultiplayerEditorServerRequestBus::Handler
+        , private AZ::TickBus::Handler
     {
     public:
         AZ_COMPONENT(MultiplayerEditorSystemComponent, "{9F335CC0-5574-4AD3-A2D8-2FAEF356946C}");
@@ -84,7 +83,9 @@ namespace Multiplayer
         bool IsInGameMode() override;
         //! @}
 
-    private:    
+    private:
+        void LaunchEditorServer();
+        
         //! EditorEvents::Handler overrides
         //! @{
         void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
@@ -101,8 +102,14 @@ namespace Multiplayer
         void SendEditorServerLevelDataPacket(AzNetworking::IConnection* connection) override;
         //! @}
 
+        //! AZ::TickBus::Handler
+        //! @{
+        void OnTick(float, AZ::ScriptTimePoint) override;
+        //! @}
+
         IEditor* m_editor = nullptr;
-        AzFramework::ProcessWatcher* m_serverProcess = nullptr;
+        AZStd::unique_ptr<AzFramework::ProcessWatcher> m_serverProcessWatcher = nullptr;
+        AZStd::unique_ptr<ProcessCommunicatorTracePrinter> m_serverProcessTracePrinter = nullptr;
         AzNetworking::ConnectionId m_editorConnId;
 
         ServerAcceptanceReceivedEvent::Handler m_serverAcceptanceReceivedHandler;
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
index 030964d81c..830f0e2ef4 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp
@@ -6,10 +6,9 @@
  *
  */
 
+#include <MultiplayerToolsSystemComponent.h>
 #include <AzNetworking/Framework/NetworkingSystemComponent.h>
 #include <Multiplayer/Components/NetBindComponent.h>
-#include <Multiplayer/Components/NetworkHierarchyChildComponent.h>
-#include <Multiplayer/Components/NetworkHierarchyRootComponent.h>
 #include <Source/MultiplayerGem.h>
 #include <Source/MultiplayerSystemComponent.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
@@ -20,25 +19,32 @@ namespace Multiplayer
     MultiplayerModule::MultiplayerModule()
         : AZ::Module()
     {
-        m_descriptors.insert(m_descriptors.end(), {
-            AzNetworking::NetworkingSystemComponent::CreateDescriptor(),
-            MultiplayerSystemComponent::CreateDescriptor(),
-            NetBindComponent::CreateDescriptor(),
-            NetworkSpawnableHolderComponent::CreateDescriptor(),
-        });
+        m_descriptors.insert(
+            m_descriptors.end(),
+            {
+                AzNetworking::NetworkingSystemComponent::CreateDescriptor(),
+                MultiplayerSystemComponent::CreateDescriptor(),
+                NetBindComponent::CreateDescriptor(),
+                NetworkSpawnableHolderComponent::CreateDescriptor(),
+#ifdef MULTIPLAYER_EDITOR
+                MultiplayerToolsSystemComponent::CreateDescriptor(),
+#endif
+            });
 
         CreateComponentDescriptors(m_descriptors);
     }
 
     AZ::ComponentTypeList MultiplayerModule::GetRequiredSystemComponents() const
     {
-        return AZ::ComponentTypeList
-        {
+        return AZ::ComponentTypeList{
             azrtti_typeid<AzNetworking::NetworkingSystemComponent>(),
             azrtti_typeid<MultiplayerSystemComponent>(),
+#ifdef MULTIPLAYER_EDITOR
+            azrtti_typeid<MultiplayerToolsSystemComponent>(),
+#endif
         };
     }
-}
+} // namespace Multiplayer
 
 #if !defined(MULTIPLAYER_EDITOR)
 AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer, Multiplayer::MultiplayerModule);
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
index 53707523bb..dd2e7956ca 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h
@@ -37,8 +37,6 @@ namespace AzNetworking
 
 namespace Multiplayer
 {
-    AZ_CVAR_EXTERNED(AZ::CVarFixedString, sv_defaultPlayerSpawnAsset);
-
     //! Multiplayer system component wraps the bridging logic between the game and transport layer.
     class MultiplayerSystemComponent final
         : public AZ::Component
@@ -178,7 +176,7 @@ namespace Multiplayer
         AZStd::queue<AZStd::string> m_pendingConnectionTickets;
         AZStd::unordered_map<uint64_t, NetEntityId> m_playerRejoinData;
 
-        AZ::TimeMs m_lastReplicatedHostTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_lastReplicatedHostTimeMs = AZ::Time::ZeroTimeMs;
         HostFrameId m_lastReplicatedHostFrameId = HostFrameId(0);
 
         uint64_t m_temporaryUserIdentifier = 0; // Used in the event of a migration or rejoin
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp
similarity index 66%
rename from Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp
rename to Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp
index ecda82a31b..058517d5dc 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <MultiplayerToolsModule.h>
+#include <MultiplayerToolsSystemComponent.h>
 #include <Pipeline/NetworkPrefabProcessor.h>
 
 #include <AzCore/Serialization/Json/RegistrationContext.h>
@@ -39,22 +39,4 @@ namespace Multiplayer
     {
         m_didProcessNetPrefabs = didProcessNetPrefabs;
     }
-
-    MultiplayerToolsModule::MultiplayerToolsModule()
-        : AZ::Module()
-    {
-        m_descriptors.insert(m_descriptors.end(), {
-            MultiplayerToolsSystemComponent::CreateDescriptor(),
-        });
-    }
-
-    AZ::ComponentTypeList MultiplayerToolsModule::GetRequiredSystemComponents() const
-    {
-        return AZ::ComponentTypeList
-        {
-            azrtti_typeid<MultiplayerToolsSystemComponent>(),
-        };
-    }
 } // namespace Multiplayer
-
-AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer_Tools, Multiplayer::MultiplayerToolsModule);
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h
similarity index 72%
rename from Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h
rename to Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h
index d0a6a81afb..3c4f8ea7a3 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h
+++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h
@@ -37,19 +37,5 @@ namespace Multiplayer
 
         bool m_didProcessNetPrefabs = false;
     };
-
-    class MultiplayerToolsModule
-        : public AZ::Module
-    {
-    public:
-
-        AZ_RTTI(MultiplayerToolsModule, "{3F726172-21FC-48FA-8CFA-7D87EBA07E55}", AZ::Module);
-        AZ_CLASS_ALLOCATOR(MultiplayerToolsModule, AZ::SystemAllocator, 0);
-
-        MultiplayerToolsModule();
-        ~MultiplayerToolsModule() override = default;
-
-        AZ::ComponentTypeList GetRequiredSystemComponents() const override;
-    };
 } // namespace Multiplayer
 
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
index 583671d1f3..e095af4ae7 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.cpp
@@ -54,10 +54,10 @@ namespace Multiplayer
         m_maxPayloadSize = connection.GetConnectionMtu() - UdpPacketHeaderSerializeSize - ReplicationManagerPacketOverhead;
 
         // Schedule ClearRemovedReplicators()
-        m_clearRemovedReplicators.Enqueue(AZ::TimeMs{ 0 }, true);
+        m_clearRemovedReplicators.Enqueue(AZ::Time::ZeroTimeMs, true);
 
         // Start window update events
-        m_updateWindow.Enqueue(AZ::TimeMs{ 0 }, true);
+        m_updateWindow.Enqueue(AZ::Time::ZeroTimeMs, true);
 
         INetworkEntityManager* networkEntityManager = GetNetworkEntityManager();
         if (networkEntityManager != nullptr)
@@ -97,7 +97,7 @@ namespace Multiplayer
                     notReadyEntities.push_back(entityId);
                 }
             }
-            if (m_entityActivationTimeSliceMs > AZ::TimeMs{ 0 } && AZ::GetElapsedTimeMs() > endTimeMs)
+            if (m_entityActivationTimeSliceMs > AZ::Time::ZeroTimeMs && AZ::GetElapsedTimeMs() > endTimeMs)
             {
                 // If we go over our timeslice, break out the loop
                 break;
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp
index 67527bf962..935850a795 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicator.cpp
@@ -344,7 +344,7 @@ namespace Multiplayer
     void EntityReplicator::SetPendingRemoval(AZ::TimeMs pendingRemovalTimeMs)
     {
         AZ_Assert(m_propertyPublisher, "Only valid if we are publishing updates");
-        if (pendingRemovalTimeMs > AZ::TimeMs{ 0 })
+        if (pendingRemovalTimeMs > AZ::Time::ZeroTimeMs)
         {
             if (!IsPendingRemoval())
             {
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
index c0e5c09c7b..8cbe542568 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.cpp
@@ -26,7 +26,7 @@ namespace Multiplayer
 
     bool PropertySubscriber::IsDeleting() const
     {
-        return m_markForRemovalTimeMs > AZ::TimeMs{ 0 };
+        return m_markForRemovalTimeMs > AZ::Time::ZeroTimeMs;
     }
 
     bool PropertySubscriber::IsDeleted() const
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h
index 286509b798..7f1a43a743 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/PropertySubscriber.h
@@ -40,6 +40,6 @@ namespace Multiplayer
 
         // The last packet to have been received about this entity
         AzNetworking::PacketId m_lastReceivedPacketId = AzNetworking::InvalidPacketId;
-        AZ::TimeMs m_markForRemovalTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_markForRemovalTimeMs = AZ::Time::ZeroTimeMs;
     };
 }
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
index 6885d78075..fa524d464a 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
@@ -123,7 +123,7 @@ namespace Multiplayer
                 AZ_Assert(entityHandle.GetNetBindComponent(), "No NetBindComponent found on networked entity");
             }
             m_removeList.push_back(entityHandle.GetNetEntityId());
-            m_removeEntitiesEvent.Enqueue(AZ::TimeMs{ 0 });
+            m_removeEntitiesEvent.Enqueue(AZ::Time::ZeroTimeMs);
         }
     }
 
diff --git a/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h
index 2bcf019623..5e865d801c 100644
--- a/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h
+++ b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.h
@@ -44,7 +44,7 @@ namespace Multiplayer
 
         HostFrameId m_hostFrameId = HostFrameId{ 0 };
         HostFrameId m_unalteredFrameId = HostFrameId{ 0 };
-        AZ::TimeMs m_hostTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_hostTimeMs = AZ::Time::ZeroTimeMs;
         float m_hostBlendFactor = DefaultBlendFactor;
         AzNetworking::ConnectionId m_rewindingConnectionId = AzNetworking::InvalidConnectionId;
     };
diff --git a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
index bec659180c..2a6baed411 100644
--- a/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
+++ b/Gems/Multiplayer/Code/Source/Pipeline/NetworkPrefabProcessor.cpp
@@ -53,7 +53,7 @@ namespace Multiplayer
             ;
 
             serializeContext->Class<NetworkPrefabProcessor, PrefabProcessor>()
-                ->Version(3)
+                ->Version(4)
                 ->Field("SerializationFormat", &NetworkPrefabProcessor::m_serializationFormat)
             ;
         }
@@ -146,6 +146,8 @@ namespace Multiplayer
         networkSpawnableAsset.Create(networkSpawnable->GetId());
         networkSpawnableAsset.SetAutoLoadBehavior(AZ::Data::AssetLoadBehavior::PreLoad);
 
+        AZStd::unordered_set<AZ::EntityId> prefabNetEntityIds;
+
         for (auto* prefabEntity : prefabNetEntities)
         {
             Instance* instance = netEntityToInstanceMap[prefabEntity];
@@ -158,6 +160,22 @@ namespace Multiplayer
             netEntity->InvalidateDependencies();
             netEntity->EvaluateDependencies();
 
+            auto* transformComponent = netEntity->FindComponent<AzFramework::TransformComponent>();
+            if (transformComponent)
+            {
+                AZ::EntityId parentId = transformComponent->GetParentId();
+                if (parentId.IsValid() && !prefabNetEntityIds.contains(parentId))
+                {
+                    // Clear parent ID for net entities parented to a non-net entity.
+                    // To be addressed by the spawnable aliases system where non-net entities
+                    // will be spawned together with the networked ones in which case we'll keep
+                    // the cross-spawnable references.
+                    transformComponent->SetParent(AZ::EntityId());
+                }
+            }
+
+            prefabNetEntityIds.insert(netEntity->GetId());
+
             // Insert the entity into the target net spawnable
             netSpawnableEntities.emplace_back(netEntity);
         }
diff --git a/Gems/Multiplayer/Code/Tests/CommonBenchmarkSetup.h b/Gems/Multiplayer/Code/Tests/CommonBenchmarkSetup.h
index 3e4a33290a..c352dc2bbf 100644
--- a/Gems/Multiplayer/Code/Tests/CommonBenchmarkSetup.h
+++ b/Gems/Multiplayer/Code/Tests/CommonBenchmarkSetup.h
@@ -14,6 +14,7 @@
 #include <AzCore/Console/Console.h>
 #include <AzCore/Name/Name.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/UnitTest/Mocks/MockITime.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <benchmark/benchmark.h>
 #include <Multiplayer/Components/NetBindComponent.h>
@@ -41,7 +42,6 @@ namespace Multiplayer
         AZ::SerializeContext* GetSerializeContext() override { return {}; }
         AZ::BehaviorContext* GetBehaviorContext() override { return {}; }
         AZ::JsonRegistrationContext* GetJsonRegistrationContext() override { return {}; }
-        const char* GetAppRoot() const override { return {}; }
         const char* GetEngineRoot() const override { return {}; }
         const char* GetExecutableFolder() const override { return {}; }
         void QueryApplicationType([[maybe_unused]] AZ::ApplicationTypeQuery& appType) const override {}
@@ -93,20 +93,6 @@ namespace Multiplayer
         }
     };
 
-    class BenchmarkTime : public AZ::ITime
-    {
-    public:
-        AZ::TimeMs GetElapsedTimeMs() const override
-        {
-            return {};
-        }
-
-        AZ::TimeUs GetElapsedTimeUs() const override
-        {
-            return {};
-        }
-    };
-
     class BenchmarkNetworkTime : public Multiplayer::INetworkTime
     {
     public:
@@ -350,8 +336,7 @@ namespace Multiplayer
             // Without Multiplayer::RegisterMultiplayerComponents() the stats go to invalid id, which is fine for unit tests
             GetMultiplayer()->GetStats().ReserveComponentStats(Multiplayer::InvalidNetComponentId, 50, 0);
 
-            m_Time = AZStd::make_unique<BenchmarkTime>();
-            AZ::Interface<AZ::ITime>::Register(m_Time.get());
+            m_Time = AZStd::make_unique<AZ::StubTimeSystem>();
 
             m_NetworkTime = AZStd::make_unique<BenchmarkNetworkTime>();
             AZ::Interface<INetworkTime>::Register(m_NetworkTime.get());
@@ -382,7 +367,6 @@ namespace Multiplayer
             m_ConnectionListener.reset();
 
             AZ::Interface<INetworkTime>::Unregister(m_NetworkTime.get());
-            AZ::Interface<AZ::ITime>::Unregister(m_Time.get());
             AZ::Interface<IMultiplayer>::Unregister(m_Multiplayer.get());
             AZ::Interface<AZ::ComponentApplicationRequests>::Unregister(m_ComponentApplicationRequests.get());
 
@@ -415,7 +399,7 @@ namespace Multiplayer
 
         AZStd::unique_ptr<BenchmarkMultiplayer> m_Multiplayer;
         AZStd::unique_ptr<BenchmarkNetworkEntityManager> m_NetworkEntityManager;
-        AZStd::unique_ptr<BenchmarkTime> m_Time;
+        AZStd::unique_ptr<AZ::StubTimeSystem> m_Time;
         AZStd::unique_ptr<BenchmarkNetworkTime> m_NetworkTime;
 
         AZStd::unique_ptr<BenchmarkMultiplayerConnection> m_Connection;
diff --git a/Gems/Multiplayer/Code/Tests/CommonHierarchySetup.h b/Gems/Multiplayer/Code/Tests/CommonHierarchySetup.h
index 1b64efc5e2..cdc4724c70 100644
--- a/Gems/Multiplayer/Code/Tests/CommonHierarchySetup.h
+++ b/Gems/Multiplayer/Code/Tests/CommonHierarchySetup.h
@@ -18,6 +18,7 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UnitTest/UnitTest.h>
+#include <AzCore/UnitTest/Mocks/MockITime.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzNetworking/Serialization/NetworkInputSerializer.h>
 #include <AzNetworking/Serialization/NetworkOutputSerializer.h>
@@ -117,8 +118,7 @@ namespace Multiplayer
             ON_CALL(*m_mockNetworkEntityManager, GetEntity(_)).WillByDefault(Invoke(this, &HierarchyTests::GetEntity));
             ON_CALL(*m_mockNetworkEntityManager, GetNetEntityIdById(_)).WillByDefault(Invoke(this, &HierarchyTests::GetNetEntityIdById));
 
-            m_mockTime = AZStd::make_unique<NiceMock<MockTime>>();
-            AZ::Interface<AZ::ITime>::Register(m_mockTime.get());
+            m_mockTime = AZStd::make_unique<AZ::NiceTimeSystemMock>();
 
             m_eventScheduler = AZStd::make_unique<AZ::EventSchedulerSystemComponent>();
 
@@ -168,7 +168,6 @@ namespace Multiplayer
             m_networkEntityAuthorityTracker.reset();
 
             AZ::Interface<INetworkTime>::Unregister(m_mockNetworkTime.get());
-            AZ::Interface<AZ::ITime>::Unregister(m_mockTime.get());
             AZ::Interface<INetworkEntityManager>::Unregister(m_mockNetworkEntityManager.get());
             AZ::Interface<IMultiplayer>::Unregister(m_mockMultiplayer.get());
             AZ::Interface<AZ::ComponentApplicationRequests>::Unregister(m_mockComponentApplicationRequests.get());
@@ -207,8 +206,8 @@ namespace Multiplayer
 
         AZStd::unique_ptr<NiceMock<MockMultiplayer>> m_mockMultiplayer;
         AZStd::unique_ptr<MockNetworkEntityManager> m_mockNetworkEntityManager;
-        AZStd::unique_ptr<NiceMock<MockTime>> m_mockTime;
         AZStd::unique_ptr<AZ::EventSchedulerSystemComponent> m_eventScheduler;
+        AZStd::unique_ptr<AZ::NiceTimeSystemMock> m_mockTime;
         AZStd::unique_ptr<NiceMock<MockNetworkTime>> m_mockNetworkTime;
 
         AZStd::unique_ptr<NiceMock<IMultiplayerConnectionMock>> m_mockConnection;
diff --git a/Gems/Multiplayer/Code/Tests/MockInterfaces.h b/Gems/Multiplayer/Code/Tests/MockInterfaces.h
index f5207d94c8..1060006169 100644
--- a/Gems/Multiplayer/Code/Tests/MockInterfaces.h
+++ b/Gems/Multiplayer/Code/Tests/MockInterfaces.h
@@ -103,13 +103,6 @@ namespace UnitTest
         MOCK_METHOD3(OnDisconnect, void(IConnection*, DisconnectReason, TerminationEndpoint));
     };
 
-    class MockTime : public AZ::ITime
-    {
-    public:
-        MOCK_CONST_METHOD0(GetElapsedTimeUs, AZ::TimeUs());
-        MOCK_CONST_METHOD0(GetElapsedTimeMs, AZ::TimeMs());
-    };
-
     class MockNetworkTime : public Multiplayer::INetworkTime
     {
     public:
@@ -149,7 +142,6 @@ namespace UnitTest
         MOCK_METHOD0(GetSerializeContext, AZ::SerializeContext* ());
         MOCK_METHOD0(GetBehaviorContext, AZ::BehaviorContext* ());
         MOCK_METHOD0(GetJsonRegistrationContext, AZ::JsonRegistrationContext* ());
-        MOCK_CONST_METHOD0(GetAppRoot, const char* ());
         MOCK_CONST_METHOD0(GetEngineRoot, const char* ());
         MOCK_CONST_METHOD0(GetExecutableFolder, const char* ());
         MOCK_METHOD0(GetDrillerManager, AZ::Debug::DrillerManager* ());
diff --git a/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp b/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
index f6e5d82703..ec6b30ca15 100644
--- a/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
@@ -12,7 +12,7 @@
 #include <Multiplayer/NetworkTime/RewindableObject.h>
 #include <Source/NetworkTime/NetworkTime.h>
 #include <AzCore/Console/LoggerSystemComponent.h>
-#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/Time/TimeSystem.h>
 #include <AzCore/UnitTest/TestTypes.h>
 
 namespace UnitTest
@@ -23,7 +23,7 @@ namespace UnitTest
     public:
         Multiplayer::NetworkTime m_networkTime;
         AZ::LoggerSystemComponent m_loggerComponent;
-        AZ::TimeSystemComponent m_timeComponent;
+        AZ::TimeSystem m_timeSystem;
     };
 
     static constexpr uint32_t RewindableContainerSize = 7;
@@ -43,7 +43,7 @@ namespace UnitTest
         // 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 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(idx), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(idx + 1, test.size());
             EXPECT_EQ(idx, test.back());
         }
@@ -70,9 +70,9 @@ namespace UnitTest
         EXPECT_TRUE(test.empty());
 
         // Test rewind for pop_back and clear
-        Multiplayer::ScopedAlterTime pop_time(static_cast<Multiplayer::HostFrameId>(RewindableContainerSize), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+        Multiplayer::ScopedAlterTime pop_time(static_cast<Multiplayer::HostFrameId>(RewindableContainerSize), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
         EXPECT_EQ(RewindableContainerSize - 1, test.size());
-        Multiplayer::ScopedAlterTime clear_time(static_cast<Multiplayer::HostFrameId>(RewindableContainerSize + 1), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+        Multiplayer::ScopedAlterTime clear_time(static_cast<Multiplayer::HostFrameId>(RewindableContainerSize + 1), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
         EXPECT_EQ(0, test.size());
 
         // Test copy_values and resize_no_construct
@@ -100,7 +100,7 @@ namespace UnitTest
         // 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 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(idx), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             for (uint32_t testIdx = 0; testIdx < RewindableContainerSize; ++testIdx)
             {
                 if (testIdx < idx)
diff --git a/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp b/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp
index 04de971f0d..0ff2c977d0 100644
--- a/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/RewindableObjectTests.cpp
@@ -10,7 +10,7 @@
 #include <Multiplayer/NetworkTime/RewindableObject.h>
 #include <Source/NetworkTime/NetworkTime.h>
 #include <AzCore/Console/LoggerSystemComponent.h>
-#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/Time/TimeSystem.h>
 #include <AzCore/UnitTest/TestTypes.h>
 
 namespace UnitTest
@@ -21,7 +21,7 @@ namespace UnitTest
     public:
         Multiplayer::NetworkTime m_networkTime;
         AZ::LoggerSystemComponent m_loggerComponent;
-        AZ::TimeSystemComponent m_timeComponent;
+        AZ::TimeSystem m_timeSystem;
     };
 
     static constexpr uint32_t RewindableBufferFrames = 32;
@@ -39,7 +39,7 @@ namespace UnitTest
 
         for (uint32_t i = 0; i < 16; ++i)
         {
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(i, test);
         }
 
@@ -52,7 +52,7 @@ namespace UnitTest
 
         for (uint32_t i = 16; i < 48; ++i)
         {
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(i, test);
         }
     }
@@ -70,15 +70,15 @@ namespace UnitTest
 
         {
             // Test that Get/GetPrevious return different value when not on the owning connection
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames - 1), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames - 1), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(RewindableBufferFrames - 1, test.Get());
             EXPECT_EQ(RewindableBufferFrames - 2, test.GetPrevious());
         }
 
         // Test that Get/GetPrevious return the unaltered frame on the owning conection
-        Multiplayer::GetNetworkTime()->AlterTime(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames - 1), AZ::TimeMs{ 0 }, 1.f, AzNetworking::ConnectionId(0));
+        Multiplayer::GetNetworkTime()->AlterTime(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames - 1), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::ConnectionId(0));
         {
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames - 1), AZ::TimeMs{ 0 }, 1.f, AzNetworking::ConnectionId(0));
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames - 1), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::ConnectionId(0));
             test.SetOwningConnectionId(AzNetworking::ConnectionId(0));
             EXPECT_EQ(RewindableBufferFrames - 1, test.Get());
             EXPECT_EQ(RewindableBufferFrames - 1, test.GetPrevious());
@@ -99,7 +99,7 @@ namespace UnitTest
 
         {
             // Note that we didn't actually set any value for time rewindableBufferFrames, so we're testing fetching a value past the last time set
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(RewindableBufferFrames), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(RewindableBufferFrames - 1, test);
         }
     }
@@ -122,7 +122,7 @@ namespace UnitTest
 
         for (uint32_t i = 0; i < RewindableBufferFrames; ++i)
         {
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             const Object& value = test;
             EXPECT_EQ(value.value, i);
         }
@@ -131,19 +131,19 @@ namespace UnitTest
     TEST_F(RewindableObjectTests, TestBackfillOnLargeTimestep)
     {
         Multiplayer::RewindableObject<uint32_t, RewindableBufferFrames> test(0);
-        Multiplayer::ScopedAlterTime time1(static_cast<Multiplayer::HostFrameId>(0), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+        Multiplayer::ScopedAlterTime time1(static_cast<Multiplayer::HostFrameId>(0), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
         test = 1;
 
-        Multiplayer::ScopedAlterTime time2(static_cast<Multiplayer::HostFrameId>(31), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+        Multiplayer::ScopedAlterTime time2(static_cast<Multiplayer::HostFrameId>(31), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
         test = 2;
 
         for (uint32_t i = 0; i < 31; ++i)
         {
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(i), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(1, test);
         }
 
-        Multiplayer::ScopedAlterTime time3(static_cast<Multiplayer::HostFrameId>(31), AZ::TimeMs{ 0 }, 1.f,  AzNetworking::InvalidConnectionId);
+        Multiplayer::ScopedAlterTime time3(static_cast<Multiplayer::HostFrameId>(31), AZ::Time::ZeroTimeMs, 1.f,  AzNetworking::InvalidConnectionId);
         EXPECT_EQ(2, test);
     }
 
@@ -159,7 +159,7 @@ namespace UnitTest
 
         for (uint32_t i = 0; i < 1000; ++i)
         {
-            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(1000 - i), AZ::TimeMs{ 0 }, 1.f, AzNetworking::InvalidConnectionId);
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(1000 - i), AZ::Time::ZeroTimeMs, 1.f, AzNetworking::InvalidConnectionId);
             EXPECT_EQ(1000, test);
         }
     }
diff --git a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
index aa948f4e75..b180e239a2 100644
--- a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake
@@ -10,6 +10,6 @@ set(FILES
     Include/Multiplayer/IMultiplayerTools.h
     Source/Pipeline/NetworkPrefabProcessor.cpp
     Source/Pipeline/NetworkPrefabProcessor.h
-    Source/MultiplayerToolsModule.h
-    Source/MultiplayerToolsModule.cpp
+    Source/MultiplayerToolsSystemComponent.cpp
+    Source/MultiplayerToolsSystemComponent.h
 )
diff --git a/Gems/NvCloth/Code/Tests/NvClothTest.cpp b/Gems/NvCloth/Code/Tests/NvClothTest.cpp
index e5b0b8fee8..bc1868a5b1 100644
--- a/Gems/NvCloth/Code/Tests/NvClothTest.cpp
+++ b/Gems/NvCloth/Code/Tests/NvClothTest.cpp
@@ -144,10 +144,7 @@ namespace UnitTest
     {
         m_cloth->GetClothConfigurator()->SetTransform(m_clothTransform);
 
-        static float time = 0.0f;
-        static float velocity = 1.0f;
-
-        time += deltaTime;
+        constexpr float velocity = 1.0f;
 
         for (auto& sphere : m_sphereColliders)
         {
diff --git a/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg b/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg
new file mode 100644
index 0000000000..f616a26381
--- /dev/null
+++ b/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.4136 12.1206L12.978 2.21481L2.54248 12.1206L12.978 21.3836L23.4136 12.1206ZM17.5499 9.4842L20.6092 12.0824L12.978 18.1512L5.4399 12.0824L6.97886 10.8946L8.56141 10.5414L9.95877 8.15224L11.4198 9.4842L12.978 6.22736L14.7794 8.96805L15.7346 10.2098L17.5499 9.4842Z" fill="#DD7F6D"/>
+</svg>
diff --git a/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg b/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg
new file mode 100644
index 0000000000..fbfed18e46
--- /dev/null
+++ b/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.522 0.799194C23.6993 0.799194 24.5538 2.57766 24.5538 3.81785C24.5538 5.05803 24.5538 19.5808 24.5538 21.4413C24.5538 23.1922 23.3253 24.7559 21.522 24.7559C19.7187 24.7559 5.24647 24.7559 3.40646 24.7559C1.98378 24.7559 0.597168 23.314 0.597168 21.9579C0.597168 20.6018 0.597168 4.83452 0.597168 3.47175C0.597168 2.10897 1.96257 0.799194 3.20673 0.799194C4.45089 0.799194 19.5573 0.799194 21.522 0.799194Z" fill="url(#paint0_linear_826_47191)"/>
+<mask id="mask0_826_47191" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.522 0.799194C23.6993 0.799194 24.5538 2.57766 24.5538 3.81785C24.5538 5.05803 24.5538 19.5808 24.5538 21.4413C24.5538 23.1922 23.3253 24.7559 21.522 24.7559C19.7187 24.7559 5.24647 24.7559 3.40646 24.7559C1.98378 24.7559 0.597168 23.314 0.597168 21.9579C0.597168 20.6018 0.597168 4.83452 0.597168 3.47175C0.597168 2.10897 1.96257 0.799194 3.20673 0.799194C4.45089 0.799194 19.5573 0.799194 21.522 0.799194Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47191)">
+<rect x="0.597168" y="0.799194" width="24" height="24" fill="#DD7F6D"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.0327 12.8374L12.5972 2.93161L2.16162 12.8374L12.5972 22.1004L23.0327 12.8374ZM17.169 10.201L20.2283 12.7992L12.5972 18.868L5.05904 12.7992L6.598 11.6114L8.18055 11.2582L9.57791 8.86903L11.039 10.201L12.5972 6.94416L14.3986 9.68485L15.3538 10.9266L17.169 10.201Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_826_47191" x1="0.597168" y1="0.799194" x2="0.597168" y2="24.7558" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index bb3d7c08a2..f045d6b00d 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -182,14 +182,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             Gem::LmbrCentral
     )
 
-    if(PAL_TRAIT_JOINTS_TYPED_TEST_CASE)
-        ly_add_source_properties(
-            SOURCES Tests/PhysXJointsTest.cpp
-            PROPERTY COMPILE_DEFINITIONS 
-            VALUES ENABLE_JOINTS_TYPED_TEST_CASE
-        )
-    endif()
-
     ly_add_googletest(
         NAME Gem::PhysX.Tests
     )
@@ -224,6 +216,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                     AZ::AzTestShared
                     AZ::AzTest
                     AZ::AzToolsFrameworkTestCommon
+                    AZ::AzManipulatorTestFramework.Static
                     Gem::PhysX.Static
                     Gem::PhysX.Mocks
                     Gem::PhysX.Editor.Static
diff --git a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
index ea08bb8160..67917bc49a 100644
--- a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
@@ -59,7 +59,7 @@ namespace PhysX
         m_dimensionsManipulators.InstallAxisMouseMoveCallback(
             [this, idPair] (const AzToolsFramework::LinearManipulator::Action& action)
         {
-            OnManipulatorMoved(action.LocalScaleOffset() + m_initialScale, idPair);
+            OnManipulatorMoved(action.m_start.m_sign * action.LocalScaleOffset() + m_initialScale, idPair);
         });
 
         m_dimensionsManipulators.InstallUniformLeftMouseDownCallback(
diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
index 5de625f679..b91b3e5bb9 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
@@ -7,31 +7,31 @@
  */
 
 #include "ColliderComponentMode.h"
+#include "ColliderAssetScaleMode.h"
+#include "ColliderBoxMode.h"
+#include "ColliderCapsuleMode.h"
 #include "ColliderOffsetMode.h"
 #include "ColliderRotationMode.h"
-#include "ColliderBoxMode.h"
 #include "ColliderSphereMode.h"
-#include "ColliderCapsuleMode.h"
-#include "ColliderAssetScaleMode.h"
 
 #include <Editor/Source/ComponentModes/PhysXSubComponentModeBase.h>
 #include <PhysX/EditorColliderComponentRequestBus.h>
 
 #include <AzFramework/Physics/ShapeConfiguration.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/ComponentModes/BoxComponentMode.h>
 #include <AzToolsFramework/ComponentModes/BoxViewportEdit.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
 namespace PhysX
 {
     namespace
     {
         //! Uri's for shortcut actions.
-        const AZ::Crc32 SetDimensionsSubModeActionUri = AZ_CRC("com.o3de.action.physx.setdimensionssubmode", 0x77b70dd6);
-        const AZ::Crc32 SetOffsetSubModeActionUri = AZ_CRC("com.o3de.action.physx.setoffsetsubmode", 0xc06132e5);
-        const AZ::Crc32 SetRotationSubModeActionUri = AZ_CRC("com.o3de.action.physx.setrotationsubmode", 0xc4225918);
-        const AZ::Crc32 ResetSubModeActionUri = AZ_CRC("com.o3de.action.physx.resetsubmode", 0xb70b120e);
-    }
+        const AZ::Crc32 SetDimensionsSubModeActionUri = AZ_CRC("com.o3de.action.physx.setdimensionssubmode", 0x508b1781);
+        const AZ::Crc32 SetOffsetSubModeActionUri = AZ_CRC("com.o3de.action.physx.setoffsetsubmode", 0x777ac743);
+        const AZ::Crc32 SetRotationSubModeActionUri = AZ_CRC("com.o3de.action.physx.setrotationsubmode", 0xf1a8f3ff);
+        const AZ::Crc32 ResetSubModeActionUri = AZ_CRC("com.o3de.action.physx.resetsubmode", 0x599d1594);
+    } // namespace
 
     AZ_CLASS_ALLOCATOR_IMPL(ColliderComponentMode, AZ::SystemAllocator, 0);
 
@@ -39,19 +39,17 @@ namespace PhysX
         : AzToolsFramework::ComponentModeFramework::EditorBaseComponentMode(entityComponentIdPair, componentType)
     {
         CreateSubModes();
+        CreateSubModeSelectionCluster();
         ColliderComponentModeRequestBus::Handler::BusConnect(entityComponentIdPair);
         ColliderComponentModeUiRequestBus::Handler::BusConnect(entityComponentIdPair);
-
-        CreateSubModeSelectionCluster();
     }
 
     ColliderComponentMode::~ColliderComponentMode()
     {
-        RemoveSubModeSelectionCluster();
-
         ColliderComponentModeUiRequestBus::Handler::BusDisconnect();
         ColliderComponentModeRequestBus::Handler::BusDisconnect();
 
+        RemoveSubModeSelectionCluster();
         m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair());
     }
 
@@ -62,39 +60,41 @@ namespace PhysX
 
     AZStd::vector<AzToolsFramework::ActionOverride> ColliderComponentMode::PopulateActionsImpl()
     {
-
-        AzToolsFramework::ActionOverride setDimensionsModeAction;
-        setDimensionsModeAction.SetUri(SetDimensionsSubModeActionUri);
-        setDimensionsModeAction.SetKeySequence(QKeySequence(Qt::Key_1));
-        setDimensionsModeAction.SetTitle("Set Resize Mode");
-        setDimensionsModeAction.SetTip("Set resize mode");
-        setDimensionsModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair());
-        setDimensionsModeAction.SetCallback([this]()
-        {
-            SetCurrentMode(SubMode::Dimensions);
-        });
-
         AzToolsFramework::ActionOverride setOffsetModeAction;
         setOffsetModeAction.SetUri(SetOffsetSubModeActionUri);
-        setOffsetModeAction.SetKeySequence(QKeySequence(Qt::Key_2));
+        setOffsetModeAction.SetKeySequence(QKeySequence(Qt::Key_1));
         setOffsetModeAction.SetTitle("Set Offset Mode");
         setOffsetModeAction.SetTip("Set offset mode");
         setOffsetModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair());
-        setOffsetModeAction.SetCallback([this]()
-        {
-            SetCurrentMode(SubMode::Offset);
-        });
+        setOffsetModeAction.SetCallback(
+            [this]()
+            {
+                SetCurrentMode(SubMode::Offset);
+            });
 
         AzToolsFramework::ActionOverride setRotationModeAction;
         setRotationModeAction.SetUri(SetRotationSubModeActionUri);
-        setRotationModeAction.SetKeySequence(QKeySequence(Qt::Key_3));
+        setRotationModeAction.SetKeySequence(QKeySequence(Qt::Key_2));
         setRotationModeAction.SetTitle("Set Rotation Mode");
         setRotationModeAction.SetTip("Set rotation mode");
         setRotationModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair());
-        setRotationModeAction.SetCallback([this]()
-        {
-            SetCurrentMode(SubMode::Rotation);
-        });
+        setRotationModeAction.SetCallback(
+            [this]()
+            {
+                SetCurrentMode(SubMode::Rotation);
+            });
+
+        AzToolsFramework::ActionOverride setDimensionsModeAction;
+        setDimensionsModeAction.SetUri(SetDimensionsSubModeActionUri);
+        setDimensionsModeAction.SetKeySequence(QKeySequence(Qt::Key_3));
+        setDimensionsModeAction.SetTitle("Set Resize Mode");
+        setDimensionsModeAction.SetTip("Set resize mode");
+        setDimensionsModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair());
+        setDimensionsModeAction.SetCallback(
+            [this]()
+            {
+                SetCurrentMode(SubMode::Dimensions);
+            });
 
         AzToolsFramework::ActionOverride resetModeAction;
         resetModeAction.SetUri(ResetSubModeActionUri);
@@ -102,12 +102,13 @@ namespace PhysX
         resetModeAction.SetTitle("Reset Current Mode");
         resetModeAction.SetTip("Reset current mode");
         resetModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair());
-        resetModeAction.SetCallback([this]()
-        {
-            ResetCurrentMode();
-        });
+        resetModeAction.SetCallback(
+            [this]()
+            {
+                ResetCurrentMode();
+            });
 
-        return {setDimensionsModeAction, setOffsetModeAction, setRotationModeAction, resetModeAction };
+        return { setDimensionsModeAction, setOffsetModeAction, setRotationModeAction, resetModeAction };
     }
 
     void ColliderComponentMode::CreateSubModes()
@@ -141,7 +142,7 @@ namespace PhysX
         if (mouseInteraction.m_mouseEvent == AzToolsFramework::ViewportInteraction::MouseEvent::Wheel &&
             mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl())
         {
-            int direction = MouseWheelDelta(mouseInteraction) > 0.0f ? 1 : -1;
+            const int direction = MouseWheelDelta(mouseInteraction) > 0.0f ? -1 : 1;
             AZ::u32 currentModeIndex = static_cast<AZ::u32>(m_subMode);
             AZ::u32 numSubModes = static_cast<AZ::u32>(SubMode::NumModes);
             AZ::u32 nextModeIndex = (currentModeIndex + numSubModes + direction) % m_subModes.size();
@@ -159,10 +160,17 @@ namespace PhysX
 
     void ColliderComponentMode::SetCurrentMode(SubMode newMode)
     {
-        AZ_Assert(m_subModes.count(newMode) > 0, "Submode not found:%d", newMode);
+        AZ_Assert(m_subModes.find(newMode) != m_subModes.end(), "Submode not found:%d", newMode);
         m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair());
         m_subMode = newMode;
         m_subModes[m_subMode]->Setup(GetEntityComponentIdPair());
+
+        const auto modeIndex = static_cast<size_t>(newMode);
+        AZ_Assert(modeIndex < m_buttonIds.size(), "Invalid mode index %i.", modeIndex);
+        AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
+            AzToolsFramework::ViewportUi::DefaultViewportId,
+            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_modeSelectionClusterId,
+            m_buttonIds[modeIndex]);
     }
 
     AzToolsFramework::ViewportUi::ClusterId ColliderComponentMode::GetClusterId() const
@@ -172,36 +180,40 @@ namespace PhysX
 
     AzToolsFramework::ViewportUi::ButtonId ColliderComponentMode::GetOffsetButtonId() const
     {
-        return m_offsetModeButtonId;
+        return m_buttonIds[static_cast<size_t>(SubMode::Offset)];
     }
 
     AzToolsFramework::ViewportUi::ButtonId ColliderComponentMode::GetRotationButtonId() const
     {
-        return m_rotationModeButtonId;
+        return m_buttonIds[static_cast<size_t>(SubMode::Rotation)];
     }
 
     AzToolsFramework::ViewportUi::ButtonId ColliderComponentMode::GetDimensionsButtonId() const
     {
-        return m_dimensionsModeButtonId;
+        return m_buttonIds[static_cast<size_t>(SubMode::Dimensions)];
+    }
+
+    AZStd::string ColliderComponentMode::GetComponentModeName() const
+    {
+        return "Collider Edit Mode";
     }
 
     void RefreshUI()
     {
         /// The reason this is in a free function is because ColliderComponentMode
         /// privately inherits from ToolsApplicationNotificationBus. Trying to invoke
-        /// the bus inside the class scope causes the compiler to complain it's not accessible 
-        /// to due private inheritence. 
-        /// Using the global namespace operator :: should have fixed that, except there 
+        /// the bus inside the class scope causes the compiler to complain it's not accessible
+        /// to due private inheritence.
+        /// Using the global namespace operator :: should have fixed that, except there
         /// is a bug in the microsoft compiler meaning it doesn't work. So this is a work around.
         AzToolsFramework::ToolsApplicationNotificationBus::Broadcast(
-            &AzToolsFramework::ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay,
-            AzToolsFramework::Refresh_Values);
+            &AzToolsFramework::ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values);
     }
 
     void ColliderComponentMode::ResetCurrentMode()
     {
         m_subModes[m_subMode]->ResetValues(GetEntityComponentIdPair());
-        m_subModes[m_subMode]->Refresh(GetEntityComponentIdPair()); 
+        m_subModes[m_subMode]->Refresh(GetEntityComponentIdPair());
         RefreshUI();
     }
 
@@ -225,8 +237,8 @@ namespace PhysX
     void ColliderComponentMode::RemoveSubModeSelectionCluster()
     {
         AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-            AzToolsFramework::ViewportUi::DefaultViewportId,
-            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RemoveCluster, m_modeSelectionClusterId);
+            AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RemoveCluster,
+            m_modeSelectionClusterId);
     }
 
     void ColliderComponentMode::CreateSubModeSelectionCluster()
@@ -237,29 +249,37 @@ namespace PhysX
             &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft);
 
         // create and register the buttons
-        m_dimensionsModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Scale");
-        m_offsetModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Move");
-        m_rotationModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Rotate");
+        m_buttonIds.resize(static_cast<size_t>(SubMode::NumModes));
+        m_buttonIds[static_cast<size_t>(SubMode::Offset)] = RegisterClusterButton(m_modeSelectionClusterId, "Move");
+        m_buttonIds[static_cast<size_t>(SubMode::Rotation)] = RegisterClusterButton(m_modeSelectionClusterId, "Rotate");
+        m_buttonIds[static_cast<size_t>(SubMode::Dimensions)] = RegisterClusterButton(m_modeSelectionClusterId, "Scale");
 
-        const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId) {
-            if (buttonId == m_dimensionsModeButtonId)
-            {
-                SetCurrentMode(SubMode::Dimensions);
-            }
-            else if (buttonId == m_offsetModeButtonId)
+        SetCurrentMode(SubMode::Offset);
+
+        const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId)
+        {
+            if (buttonId == m_buttonIds[static_cast<size_t>(SubMode::Offset)])
             {
                 SetCurrentMode(SubMode::Offset);
             }
-            else if (buttonId == m_rotationModeButtonId)
+            else if (buttonId == m_buttonIds[static_cast<size_t>(SubMode::Rotation)])
             {
                 SetCurrentMode(SubMode::Rotation);
             }
+            else if (buttonId == m_buttonIds[static_cast<size_t>(SubMode::Dimensions)])
+            {
+                SetCurrentMode(SubMode::Dimensions);
+            }
+            else
+            {
+                AZ_Error("PhysX Collider Component Mode", false, "Unrecognized button ID.");
+            }
         };
-        
+
         m_modeSelectionHandler = AZ::Event<AzToolsFramework::ViewportUi::ButtonId>::Handler(onButtonClicked);
         AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
             AzToolsFramework::ViewportUi::DefaultViewportId,
-            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler,
-            m_modeSelectionClusterId, m_modeSelectionHandler);
+            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler, m_modeSelectionClusterId,
+            m_modeSelectionHandler);
     }
-}
+} // namespace PhysX
diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.h b/Gems/PhysX/Code/Editor/ColliderComponentMode.h
index b4ca060065..a756075513 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.h
@@ -31,21 +31,23 @@ namespace PhysX
         ColliderComponentMode(const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType);
         ~ColliderComponentMode();
 
-        // EditorBaseComponentMode ...
+        // EditorBaseComponentMode overrides ...
         void Refresh() override;
         AZStd::vector<AzToolsFramework::ActionOverride> PopulateActionsImpl() override;
         AZStd::vector<AzToolsFramework::ViewportUi::ClusterId> PopulateViewportUiImpl() override;
 
-        // ColliderComponentModeBus ...
+        // ColliderComponentModeBus overrides ...
         SubMode GetCurrentMode() override;
         void SetCurrentMode(SubMode index) override;
 
-        // ColliderComponentModeUiBus ...
+        // ColliderComponentModeUiBus overrides ...
         AzToolsFramework::ViewportUi::ButtonId GetOffsetButtonId() const override;
         AzToolsFramework::ViewportUi::ButtonId GetRotationButtonId() const override;
         AzToolsFramework::ViewportUi::ClusterId GetClusterId() const override;
         AzToolsFramework::ViewportUi::ButtonId GetDimensionsButtonId() const override;
 
+        // ComponentMode overrides ...
+        AZStd::string GetComponentModeName() const override;
     private:
         
         // AzToolsFramework::ViewportInteraction::ViewportSelectionRequests ...
@@ -63,12 +65,9 @@ namespace PhysX
 
         AzToolsFramework::ViewportUi::ClusterId
             m_modeSelectionClusterId; //!< Viewport UI cluster for changing sub mode.
-        AzToolsFramework::ViewportUi::ButtonId
-            m_dimensionsModeButtonId; //!< Id of the Viewport UI button for resize/dimensions mode.
-        AzToolsFramework::ViewportUi::ButtonId
-            m_offsetModeButtonId; //!< Id of the Viewport UI button for offset mode.
-        AzToolsFramework::ViewportUi::ButtonId
-            m_rotationModeButtonId; //!< Id of the Viewport UI button for rotation mode.
+
+        AZStd::vector<AzToolsFramework::ViewportUi::ButtonId> m_buttonIds; //!< Ids for the Viewport UI buttons for each mode.
+
         AZ::Event<AzToolsFramework::ViewportUi::ButtonId>::Handler
             m_modeSelectionHandler; //!< Event handler for sub mode changes.
     };
diff --git a/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h b/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h
index 289215067a..05072f699a 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h
+++ b/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h
@@ -19,9 +19,9 @@ namespace PhysX
     public:
         enum class SubMode : AZ::u32
         {
-            Dimensions,
             Offset,
             Rotation,
+            Dimensions,
             NumModes
         };
 
diff --git a/Gems/PhysX/Code/Editor/DebugDraw.cpp b/Gems/PhysX/Code/Editor/DebugDraw.cpp
index 90a1eb6004..a54230ec38 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.cpp
+++ b/Gems/PhysX/Code/Editor/DebugDraw.cpp
@@ -687,6 +687,53 @@ namespace PhysX
             [[maybe_unused]] const AZ::Vector3& colliderScale,
             [[maybe_unused]] const bool forceUniformScaling) const
         {
+            const int numColumns = heightfieldShapeConfig.GetNumColumns();
+            const int numRows = heightfieldShapeConfig.GetNumRows();
+
+            const float minXBounds = -(numColumns * heightfieldShapeConfig.GetGridResolution().GetX()) / 2.0f;
+            const float minYBounds = -(numRows * heightfieldShapeConfig.GetGridResolution().GetY()) / 2.0f;
+
+            auto heights = heightfieldShapeConfig.GetSamples();
+            
+            for (int xIndex = 0; xIndex < numColumns - 1; xIndex++)
+            {
+                for (int yIndex = 0; yIndex < numRows - 1; yIndex++)
+                {
+                    const int index0 = yIndex * numColumns + xIndex;
+                    const int index1 = yIndex * numColumns + xIndex + 1;
+                    const int index2 = (yIndex + 1) * numColumns + xIndex;
+                    const int index3 = (yIndex + 1) * numColumns + xIndex + 1;
+
+                    const float x0 = minXBounds + heightfieldShapeConfig.GetGridResolution().GetX() * xIndex;
+                    const float x1 = minXBounds + heightfieldShapeConfig.GetGridResolution().GetX() * (xIndex + 1);
+                    const float y0 = minYBounds + heightfieldShapeConfig.GetGridResolution().GetY() * yIndex;
+                    const float y1 = minYBounds + heightfieldShapeConfig.GetGridResolution().GetY() * (yIndex + 1);
+
+                    // Always draw top and left line of quad
+                    debugDisplay.DrawLine(
+                        AZ::Vector3(x0, y0, heights[index0].m_height),
+                        AZ::Vector3(x1, y0, heights[index1].m_height));
+                    debugDisplay.DrawLine(
+                        AZ::Vector3(x0, y0, heights[index0].m_height),
+                        AZ::Vector3(x0, y1, heights[index2].m_height));
+
+                    // Draw bottom line in last row
+                    if (yIndex == numRows - 2)
+                    {
+                        debugDisplay.DrawLine(
+                            AZ::Vector3(x1, y1, heights[index3].m_height),
+                            AZ::Vector3(x0, y1, heights[index2].m_height));
+                    }
+
+                    // Draw right line in last column
+                    if (xIndex == numColumns - 2)
+                    {
+                        debugDisplay.DrawLine(
+                            AZ::Vector3(x1, y0, heights[index1].m_height),
+                            AZ::Vector3(x1, y1, heights[index3].m_height));
+                    }
+                }
+            }
         }
 
         AZ::Transform Collider::GetColliderLocalTransform(
diff --git a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
index 02e684de63..166c44de22 100644
--- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
@@ -11,6 +11,7 @@
 #include <Editor/EditorJointConfiguration.h>
 #include <Source/EditorColliderComponent.h>
 #include <Source/EditorRigidBodyComponent.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 
 namespace
 {
@@ -213,7 +214,7 @@ namespace PhysX
         if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
             serializeContext->Class<EditorJointConfig>()
-                ->Version(4, &EditorJointConfig::VersionConverter)
+                ->Version(5, &EditorJointConfig::VersionConverter)
                 ->Field("Local Position", &EditorJointConfig::m_localPosition)
                 ->Field("Local Rotation", &EditorJointConfig::m_localRotation)
                 ->Field("Parent Entity", &EditorJointConfig::m_leadEntity)
@@ -228,6 +229,12 @@ namespace PhysX
 
             if (auto* editContext = serializeContext->GetEditContext())
             {
+                editContext->Enum<EditorJointConfig::DisplaySetupState>("Joint Display Setup State", "Options for displaying joint setup.")
+                    ->Value("Never", EditorJointConfig::DisplaySetupState::Never)
+                    ->Value("Selected", EditorJointConfig::DisplaySetupState::Selected)
+                    ->Value("Always", EditorJointConfig::DisplaySetupState::Always)
+                    ;
+
                 editContext->Class<PhysX::EditorJointConfig>(
                     "PhysX Joint Configuration", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
@@ -244,8 +251,11 @@ namespace PhysX
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorJointConfig::ValidateLeadEntityId)
                     ->DataElement(0, &PhysX::EditorJointConfig::m_selfCollide, "Lead-Follower Collide"
                         , "When active, the lead and follower pair will collide with each other.")
-                    ->DataElement(0, &PhysX::EditorJointConfig::m_displayJointSetup, "Display Setup in Viewport"
-                        , "Display joint setup in the viewport.")
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::ComboBox, &PhysX::EditorJointConfig::m_displayJointSetup, "Display Setup in Viewport"
+                        , "Never = Not shown."
+                        "Select = Show setup display when entity is selected."
+                        "Always = Always show setup display.")
                     ->Attribute(AZ::Edit::Attributes::ReadOnly, &EditorJointConfig::IsInComponentMode)
                     ->DataElement(0, &PhysX::EditorJointConfig::m_selectLeadOnSnap, "Select Lead on Snap"
                         , "Select lead entity on snap to position in component mode.")
@@ -306,6 +316,23 @@ namespace PhysX
             m_followerEntity);
     }
 
+    bool EditorJointConfig::ShowSetupDisplay() const
+    {
+        switch(m_displayJointSetup)
+        {
+        case DisplaySetupState::Always:
+            return true;
+        case DisplaySetupState::Selected:
+            {
+                bool showSetup = false;
+                AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+                    showSetup, m_followerEntity, &AzToolsFramework::EditorEntityInfoRequests::IsSelected);
+                return showSetup;
+            }
+        }
+        return false;
+    }
+
     bool EditorJointConfig::IsInComponentMode() const
     {
         return m_inComponentMode;
@@ -343,6 +370,31 @@ namespace PhysX
             }
         }
 
+        // convert m_displayJointSetup from a bool to the enum with the option Never,Selected,Always show joint setup helpers.
+        if (classElement.GetVersion() <= 4)
+        {
+            // get the current bool setting and remove it.
+            bool oldSetting = false;
+            const int displayJointSetupIndex = classElement.FindElement(AZ_CRC_CE("Display Debug"));
+            if (displayJointSetupIndex >= 0)
+            {
+                AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(displayJointSetupIndex);
+                elementNode.GetData<bool>(oldSetting);
+                classElement.RemoveElement(displayJointSetupIndex);
+            }
+
+            //if the old setting was on set it to 'Selected'. otherwise 'Never'
+            if (oldSetting)
+            {
+                classElement.AddElementWithData(context, "Display Debug", EditorJointConfig::DisplaySetupState::Selected);
+            }
+            else
+            {
+                classElement.AddElementWithData(context, "Display Debug", EditorJointConfig::DisplaySetupState::Never);
+            }
+        }
+
+
         return result;
     }
 
diff --git a/Gems/PhysX/Code/Editor/EditorJointConfiguration.h b/Gems/PhysX/Code/Editor/EditorJointConfiguration.h
index 89ab31e4a7..f3dcd4afed 100644
--- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.h
+++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.h
@@ -100,12 +100,21 @@ namespace PhysX
         AZ_TYPE_INFO(EditorJointConfig, "{8A966D65-CA97-4786-A13C-ACAA519D97EA}");
         static void Reflect(AZ::ReflectContext* context);
 
+        enum class DisplaySetupState : AZ::u8
+        {
+            Never = 0,
+            Selected,
+            Always
+        };
+
         void SetLeadEntityId(AZ::EntityId leadEntityId);
         JointGenericProperties ToGenericProperties() const;
         JointComponentConfiguration ToGameTimeConfig() const;
 
+        bool ShowSetupDisplay() const;
+
         bool m_breakable = false;
-        bool m_displayJointSetup = false;
+        DisplaySetupState m_displayJointSetup = DisplaySetupState::Selected;
         bool m_inComponentMode = false;
         bool m_selectLeadOnSnap = true;
         bool m_selfCollide = false;
@@ -129,3 +138,8 @@ namespace PhysX
     };
 
 } // namespace PhysX
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(PhysX::EditorJointConfig::DisplaySetupState, "{17EBE6BD-289A-4326-8A24-DCE3B7FEC51E}");
+} // namespace AZ
diff --git a/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp b/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp
index ce95e27db3..08e31a89f0 100644
--- a/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp
@@ -307,7 +307,16 @@ namespace PhysX
 
     AZStd::vector<AzToolsFramework::ViewportUi::ClusterId> JointsComponentMode::PopulateViewportUiImpl()
     {
-        return AZStd::vector<AzToolsFramework::ViewportUi::ClusterId>(m_modeSelectionClusterIds.begin(), m_modeSelectionClusterIds.end());
+        AZStd::vector<AzToolsFramework::ViewportUi::ClusterId> ids;
+        ids.reserve(m_modeSelectionClusterIds.size());
+        for (auto clusterid : m_modeSelectionClusterIds)
+        {
+            if (clusterid != AzToolsFramework::ViewportUi::InvalidClusterId)
+            {
+                ids.emplace_back(clusterid);
+            }
+        }
+        return ids;
     }
 
     void JointsComponentMode::SetCurrentMode(JointsComponentModeCommon::SubComponentModes::ModeType newMode, ButtonData& buttonData)
@@ -353,31 +362,64 @@ namespace PhysX
 
     void JointsComponentMode::SetupSubModes(const AZ::EntityComponentIdPair& entityComponentIdPair)
     {
-        //create the 3 cluster groups
-        for (auto& clusterId : m_modeSelectionClusterIds)
-        {
-            AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
-                clusterId, AzToolsFramework::ViewportUi::DefaultViewportId,
-                &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster,
-                AzToolsFramework::ViewportUi::Alignment::TopLeft);
-        }
-
         //retrieve the enabled sub components from the entity
         AZStd::vector<JointsComponentModeCommon::SubModeParamaterState> subModesState;
         EditorJointRequestBus::EventResult(subModesState, entityComponentIdPair, &EditorJointRequests::GetSubComponentModesState);
 
+        //group 1 is always available so create it
+        AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
+            m_modeSelectionClusterIds[static_cast<int>(ClusterGroups::Group1)], AzToolsFramework::ViewportUi::DefaultViewportId,
+            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft);
+
+        //check if groups 2 and/or 3 need to be created
+        for (auto [modeType, _] : subModesState)
+        {
+            const AzToolsFramework::ViewportUi::ClusterId group2Id = GetClusterId(ClusterGroups::Group2);
+            const AzToolsFramework::ViewportUi::ClusterId group3Id = GetClusterId(ClusterGroups::Group3);
+            switch (modeType)
+            {
+            case JointsComponentModeCommon::SubComponentModes::ModeType::Damping:
+            case JointsComponentModeCommon::SubComponentModes::ModeType::Stiffness:
+            case JointsComponentModeCommon::SubComponentModes::ModeType::TwistLimits:
+            case JointsComponentModeCommon::SubComponentModes::ModeType::SwingLimits:
+                {
+                    if (group2Id == AzToolsFramework::ViewportUi::InvalidClusterId)
+                    {
+                        AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
+                            m_modeSelectionClusterIds[static_cast<int>(ClusterGroups::Group2)],
+                            AzToolsFramework::ViewportUi::DefaultViewportId,
+                            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster,
+                            AzToolsFramework::ViewportUi::Alignment::TopLeft);
+                    }
+                }
+                break;
+            case JointsComponentModeCommon::SubComponentModes::ModeType::MaxForce:
+            case JointsComponentModeCommon::SubComponentModes::ModeType::MaxTorque:
+                {
+                    if (group3Id == AzToolsFramework::ViewportUi::InvalidClusterId)
+                    {
+                        AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
+                            m_modeSelectionClusterIds[static_cast<int>(ClusterGroups::Group3)],
+                            AzToolsFramework::ViewportUi::DefaultViewportId,
+                            &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster,
+                            AzToolsFramework::ViewportUi::Alignment::TopLeft);
+                    }
+                }
+                break;
+            default:
+                AZ_Error("Joints", false, "Joints component mode cluster UI setup found unknown sub mode.");
+                break;
+            }
+            //if both are created - break;
+            if (group2Id != AzToolsFramework::ViewportUi::InvalidClusterId && group3Id != AzToolsFramework::ViewportUi::InvalidClusterId)
+            {
+                break;
+            }
+        }
+
         const AzToolsFramework::ViewportUi::ClusterId group1ClusterId = GetClusterId(ClusterGroups::Group1);
         const AzToolsFramework::ViewportUi::ClusterId group2ClusterId = GetClusterId(ClusterGroups::Group2);
-        //hide cluster 2, if something is added to it. it will make is visible
-        AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-            AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible,
-            group2ClusterId, false);
-
         const AzToolsFramework::ViewportUi::ClusterId group3ClusterId = GetClusterId(ClusterGroups::Group3);
-        // hide cluster 3, if something is added to it. it will make is visible
-        AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-            AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible,
-            group3ClusterId, false);
 
         //translation and rotation are enabled for all joints in group 1
         m_subModes[JointsComponentModeCommon::SubComponentModes::ModeType::Translation] =
@@ -408,10 +450,6 @@ namespace PhysX
                         Internal::RegisterClusterButton(group3ClusterId, "joints/MaxForce", SubModeData::MaxForceToolTip);
                     m_buttonData[JointsComponentModeCommon::SubComponentModes::ModeType::MaxForce] =
                         ButtonData{ group3ClusterId, buttonId };
-
-                    AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                        AzToolsFramework::ViewportUi::DefaultViewportId,
-                        &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, group3ClusterId, true);
                 }
                 break;
             case JointsComponentModeCommon::SubComponentModes::ModeType::MaxTorque:
@@ -424,10 +462,6 @@ namespace PhysX
                         Internal::RegisterClusterButton(group3ClusterId, "joints/MaxTorque", SubModeData::MaxTorqueToolTip);
                     m_buttonData[JointsComponentModeCommon::SubComponentModes::ModeType::MaxTorque] =
                         ButtonData{ group3ClusterId, buttonId };
-                        
-                    AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                        AzToolsFramework::ViewportUi::DefaultViewportId,
-                        &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, group3ClusterId, true);
                 }
                 break;
             case JointsComponentModeCommon::SubComponentModes::ModeType::Damping:
@@ -439,10 +473,6 @@ namespace PhysX
                     const AzToolsFramework::ViewportUi::ButtonId buttonId =
                         Internal::RegisterClusterButton(group2ClusterId, "joints/Damping", SubModeData::DampingToolTip);
                     m_buttonData[JointsComponentModeCommon::SubComponentModes::ModeType::Damping] = ButtonData{ group2ClusterId, buttonId };
-                        
-                    AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                        AzToolsFramework::ViewportUi::DefaultViewportId,
-                        &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, group2ClusterId, true);
                 }
                 break;
             case JointsComponentModeCommon::SubComponentModes::ModeType::Stiffness:
@@ -455,10 +485,6 @@ namespace PhysX
                         Internal::RegisterClusterButton(group2ClusterId, "joints/Stiffness", SubModeData::StiffnessToolTip);
                     m_buttonData[JointsComponentModeCommon::SubComponentModes::ModeType::Stiffness] =
                         ButtonData{ group2ClusterId, buttonId };
-
-                    AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                        AzToolsFramework::ViewportUi::DefaultViewportId,
-                        &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, group2ClusterId, true);
                 }
                 break;
             case JointsComponentModeCommon::SubComponentModes::ModeType::TwistLimits:
@@ -473,10 +499,6 @@ namespace PhysX
                         Internal::RegisterClusterButton(group2ClusterId, "joints/TwistLimits", SubModeData::TwistLimitsToolTip);
                     m_buttonData[JointsComponentModeCommon::SubComponentModes::ModeType::TwistLimits] =
                         ButtonData{ group2ClusterId, buttonId };
-
-                    AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                        AzToolsFramework::ViewportUi::DefaultViewportId,
-                        &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, group2ClusterId, true);
                 }
                 break;
             case JointsComponentModeCommon::SubComponentModes::ModeType::SwingLimits:
@@ -489,10 +511,6 @@ namespace PhysX
                         Internal::RegisterClusterButton(group2ClusterId, "joints/SwingLimits", SubModeData::SwingLimitsToolTip);
                     m_buttonData[JointsComponentModeCommon::SubComponentModes::ModeType::SwingLimits] =
                         ButtonData{ group2ClusterId, buttonId };
-
-                    AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                        AzToolsFramework::ViewportUi::DefaultViewportId,
-                        &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterVisible, group2ClusterId, true);
                 }
                 break;
             case JointsComponentModeCommon::SubComponentModes::ModeType::SnapPosition:
@@ -517,6 +535,9 @@ namespace PhysX
                         ButtonData{ group1ClusterId, buttonId };
                 }
                 break;
+            default:
+                AZ_Error("Joints", false, "Joints component mode cluster button setup found unknown sub mode.");
+                break;
             }
         }
 
@@ -560,10 +581,13 @@ namespace PhysX
 
         for (int i = 0; i < static_cast<int>(ClusterGroups::GroupCount); i++)
         {
-            AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                AzToolsFramework::ViewportUi::DefaultViewportId,
-                &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler, m_modeSelectionClusterIds[i],
-                m_modeSelectionHandlers[i]);
+            if (m_modeSelectionClusterIds[i] != AzToolsFramework::ViewportUi::InvalidClusterId)
+            {
+                AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
+                    AzToolsFramework::ViewportUi::DefaultViewportId,
+                    &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler,
+                    m_modeSelectionClusterIds[i], m_modeSelectionHandlers[i]);
+            }
         }
         
         // set the translate as enabled by default.
@@ -588,10 +612,14 @@ namespace PhysX
     {
         for (auto clusterid : m_modeSelectionClusterIds)
         {
-            AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
-                AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RemoveCluster,
-                clusterid);
+            if (clusterid != AzToolsFramework::ViewportUi::InvalidClusterId)
+            {
+                AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event(
+                    AzToolsFramework::ViewportUi::DefaultViewportId,
+                    &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RemoveCluster, clusterid);
+            }
         }
+        m_modeSelectionClusterIds.assign(static_cast<int>(ClusterGroups::GroupCount), AzToolsFramework::ViewportUi::InvalidClusterId);
     }
 
     AzToolsFramework::ViewportUi::ClusterId JointsComponentMode::GetClusterId(ClusterGroups group)
diff --git a/Gems/PhysX/Code/Mocks/PhysX/MockPhysXHeightfieldProviderComponent.h b/Gems/PhysX/Code/Mocks/PhysX/MockPhysXHeightfieldProviderComponent.h
index 7e500881c0..d462c30158 100644
--- a/Gems/PhysX/Code/Mocks/PhysX/MockPhysXHeightfieldProviderComponent.h
+++ b/Gems/PhysX/Code/Mocks/PhysX/MockPhysXHeightfieldProviderComponent.h
@@ -69,6 +69,10 @@ namespace UnitTest
         MOCK_CONST_METHOD1(UpdateHeights, AZStd::vector<float>(const AZ::Aabb& dirtyRegion));
         MOCK_CONST_METHOD1(UpdateHeightsAndMaterials, AZStd::vector<Physics::HeightMaterialPoint>(const AZ::Aabb& dirtyRegion));
         MOCK_CONST_METHOD0(GetHeightfieldAabb, AZ::Aabb());
+        MOCK_CONST_METHOD0(GetHeightfieldMinHeight, float());
+        MOCK_CONST_METHOD0(GetHeightfieldMaxHeight, float());
+        MOCK_CONST_METHOD0(GetHeightfieldGridColumns, int32_t());
+        MOCK_CONST_METHOD0(GetHeightfieldGridRows, int32_t());
     };
 
 } // namespace UnitTest
diff --git a/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp b/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
index bc9265a92a..fb8e61289d 100644
--- a/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
+++ b/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
@@ -13,7 +13,7 @@
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzCore/std/string/conversions.h>
 #include <PxPhysicsAPI.h>
-#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Utils/Utils.h>
 
 namespace PhysX
 {
@@ -108,8 +108,7 @@ namespace PhysX
                     AzFramework::StringFunc::Append(filename, m_config.m_pvdConfigurationData.m_fileName.c_str());
                     AzFramework::StringFunc::Append(filename, ".pxd2");
 
-                    AZStd::string rootDirectory;
-                    AZ::ComponentApplicationBus::BroadcastResult(rootDirectory, &AZ::ComponentApplicationRequests::GetAppRoot);
+                    AZStd::string rootDirectory{ AZStd::string_view(AZ::Utils::GetEnginePath()) };
 
                     // Create the full filepath.
                     AZStd::string safeFilePath;
diff --git a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
index fa71fa0061..d7065a869d 100644
--- a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
@@ -215,7 +215,7 @@ namespace PhysX
     {
         EditorJointComponent::DisplayEntityViewport(viewportInfo, debugDisplay);
 
-        if (!m_config.m_displayJointSetup && 
+        if (!m_config.ShowSetupDisplay() && 
             !m_config.m_inComponentMode)
         {
             return;
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index 262e40cb99..7e1d1c341f 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -760,7 +760,7 @@ namespace PhysX
         if (asset == m_shapeConfiguration.m_physicsAsset.m_pxAsset)
         {
             m_shapeConfiguration.m_physicsAsset.m_pxAsset = asset;
-            m_shapeConfiguration.m_physicsAsset.m_configuration.m_asset = m_shapeConfiguration.m_physicsAsset.m_pxAsset;
+            m_shapeConfiguration.m_physicsAsset.m_configuration.m_asset = asset;
 
             UpdateMaterialSlotsFromMeshAsset();
             CreateStaticEditorCollider();
@@ -785,7 +785,9 @@ namespace PhysX
     {
         const PhysX::EditorRigidBodyComponent* entityRigidbody = m_entity->FindComponent<PhysX::EditorRigidBodyComponent>();
 
-        if (m_shapeConfiguration.m_physicsAsset.m_pxAsset && (m_shapeConfiguration.m_shapeType == Physics::ShapeType::PhysicsAsset) && entityRigidbody)
+        if (entityRigidbody &&
+            m_shapeConfiguration.m_shapeType == Physics::ShapeType::PhysicsAsset &&
+            m_shapeConfiguration.m_physicsAsset.m_pxAsset.IsReady())
         {
             AZStd::vector<AZStd::shared_ptr<Physics::Shape>> shapes;
             Utils::GetShapesFromAsset(m_shapeConfiguration.m_physicsAsset.m_configuration, m_configuration, m_hasNonUniformScale,
diff --git a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp
index 0f09258524..fb0a38fa18 100644
--- a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp
@@ -34,8 +34,8 @@ namespace PhysX
                     "PhysX Heightfield Collider", "Creates geometry in the PhysX simulation based on an attached heightfield component")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCollider.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXHeightfieldCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(
                             AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx/heightfield-collider/")
diff --git a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
index 1b575074e2..f009c990b4 100644
--- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
@@ -211,7 +211,7 @@ namespace PhysX
     {
         EditorJointComponent::DisplayEntityViewport(viewportInfo, debugDisplay);
 
-        if (!m_config.m_displayJointSetup && 
+        if (!m_config.ShowSetupDisplay() && 
             !m_config.m_inComponentMode)
         {
             return;
diff --git a/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp b/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp
index 3558c9fb56..107bced7f2 100644
--- a/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp
+++ b/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp
@@ -224,8 +224,22 @@ namespace PhysX {
                 physx::PxJointLimitCone limitCone(swingLimitY, swingLimitZ);
                 joint->setSwingLimit(limitCone);
 
-                const float twistLower = AZ::DegToRad(AZStd::GetMin(configuration.m_twistLimitLower, configuration.m_twistLimitUpper));
-                const float twistUpper = AZ::DegToRad(AZStd::GetMax(configuration.m_twistLimitLower, configuration.m_twistLimitUpper));
+                float twistLower = AZ::DegToRad(AZStd::GetMin(configuration.m_twistLimitLower, configuration.m_twistLimitUpper));
+                float twistUpper = AZ::DegToRad(AZStd::GetMax(configuration.m_twistLimitLower, configuration.m_twistLimitUpper));
+                // make sure there is at least a small difference between the lower and upper limits to avoid problems in PhysX
+                const float minTwistLimitRangeRadians = AZ::DegToRad(JointConstants::MinTwistLimitRangeDegrees);
+                if (const float twistLimitRange = twistUpper - twistLower;
+                    twistLimitRange < minTwistLimitRangeRadians)
+                {
+                    if (twistUpper > 0.0f)
+                    {
+                        twistLower -= (minTwistLimitRangeRadians - twistLimitRange);
+                    }
+                    else
+                    {
+                        twistUpper += (minTwistLimitRangeRadians - twistLimitRange);
+                    }
+                }
                 physx::PxJointAngularLimitPair twistLimitPair(twistLower, twistUpper);
                 joint->setTwistLimit(twistLimitPair);
 
diff --git a/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.h b/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.h
index 7a30473dac..a99eb7aacb 100644
--- a/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.h
+++ b/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.h
@@ -18,9 +18,11 @@ namespace PhysX
 {
     namespace JointConstants
     {
-        // Setting swing limits to very small values can cause extreme stability problems, so clamp above a small
+        // Setting joint limits to very small values can cause extreme stability problems, so clamp above a small
         // threshold.
         static const float MinSwingLimitDegrees = 1.0f;
+        // Minimum range between lower and upper twist limits.
+        static const float MinTwistLimitRangeDegrees = 1.0f;
     } // namespace JointConstants
 
     namespace Utils
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
index 4ed2825cc2..46f4c04880 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
@@ -344,6 +344,55 @@ namespace PhysX
                 bool isAcceleration = true;
                 return physx::PxD6JointDrive(stiffness, damping, forceLimit, isAcceleration);
             }
+
+            AZStd::vector<DepthData> ComputeHierarchyDepths(const AZStd::vector<size_t>& parentIndices)
+            {
+                const size_t numNodes = parentIndices.size();
+                AZStd::vector<DepthData> nodeDepths(numNodes);
+                for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++)
+                {
+                    nodeDepths[nodeIndex] = { -1, nodeIndex };
+                }
+
+                for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++)
+                {
+                    if (nodeDepths[nodeIndex].m_depth != -1)
+                    {
+                        continue;
+                    }
+                    int depth = -1; // initial depth value for this node
+                    int ancestorDepth = 0; // the depth of the first ancestor we find when iteratively visiting parents
+                    bool ancestorFound = false; // whether we have found either an ancestor which already has a depth value, or the root
+                    size_t currentIndex = nodeIndex;
+                    while (!ancestorFound)
+                    {
+                        depth++;
+                        if (depth > numNodes)
+                        {
+                            AZ_Error("PhysX Ragdoll", false, "Loop detected in hierarchy depth computation.");
+                            return nodeDepths;
+                        }
+                        const size_t parentIndex = parentIndices[currentIndex];
+
+                        if (parentIndex >= numNodes || nodeDepths[currentIndex].m_depth != -1)
+                        {
+                            ancestorFound = true;
+                            ancestorDepth = (nodeDepths[currentIndex].m_depth != -1) ? nodeDepths[currentIndex].m_depth : 0;
+                        }
+
+                        currentIndex = parentIndex;
+                    }
+
+                    currentIndex = nodeIndex;
+                    for (int i = depth; i >= 0; i--)
+                    {
+                        nodeDepths[currentIndex] = { ancestorDepth + i, currentIndex };
+                        currentIndex = parentIndices[currentIndex];
+                    }
+                }
+
+                return nodeDepths;
+            }
         } // namespace Characters
     } // namespace Utils
 } // namespace PhysX
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
index 0f51a5d9b9..245dc01abd 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
@@ -49,6 +49,18 @@ namespace PhysX
             //! @param forceLimit The upper limit on the force the joint can apply to reach its target.
             //! @return The created joint drive.
             physx::PxD6JointDrive CreateD6JointDrive(float strength, float dampingRatio, float forceLimit);
+
+            //! Contains information about a node in a hierarchy and how deep it is in the hierarchy relative to the root.
+            struct DepthData
+            {
+                int m_depth = -1; //!< Depth of the joint in the hierarchy. The root has depth 0, its children depth 1, and so on.
+                size_t m_index = 0; //<! Index of the joint in the hierarchy.
+            };
+
+            //! Given information about the parent nodes for each node in a hierarchy, computes how deep each node is in the
+            //! hierarchy relative to the root level. Assumes that the input parent index data corresponds to a tree structure, i.e.
+            //! does not contain any cycles.
+            AZStd::vector<DepthData> ComputeHierarchyDepths(const AZStd::vector<size_t>& parentIndices);
         } // namespace Characters
     } // namespace Utils
 } // namespace PhysX
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
index 57972fea3e..7615a175d1 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
@@ -7,20 +7,20 @@
  */
 
 #include <AzCore/Component/Entity.h>
-#include <PhysXCharacters/API/CharacterUtils.h>
 #include <AzCore/Component/TransformBus.h>
-#include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/std/sort.h>
 #include <AzFramework/Physics/CharacterPhysicsDataBus.h>
+#include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
 #include <AzFramework/Physics/PhysicsScene.h>
 #include <AzFramework/Physics/SystemBus.h>
-#include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
+#include <PhysXCharacters/API/CharacterUtils.h>
 #include <PhysXCharacters/Components/RagdollComponent.h>
 
 namespace PhysX
 {
-    bool RagdollComponent::VersionConverter(AZ::SerializeContext& context,
-        AZ::SerializeContext::DataElementNode& classElement)
+    bool RagdollComponent::VersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
     {
         // The element "PhysXRagdoll" was changed from a shared pointer to a unique pointer, but a version converter was
         // not added at the time.  This means there may be serialized data with either the shared or unique pointer, but
@@ -76,13 +76,13 @@ namespace PhysX
                 ->Field("EnableJointProjection", &RagdollComponent::m_enableJointProjection)
                 ->Field("ProjectionLinearTol", &RagdollComponent::m_jointProjectionLinearTolerance)
                 ->Field("ProjectionAngularTol", &RagdollComponent::m_jointProjectionAngularToleranceDegrees)
-                ;
+                ->Field("EnableMassRatioClamping", &RagdollComponent::m_enableMassRatioClamping)
+                ->Field("MaxMassRatio", &RagdollComponent::m_maxMassRatio);
 
             AZ::EditContext* editContext = serializeContext->GetEditContext();
             if (editContext)
             {
-                editContext->Class<RagdollComponent>(
-                    "PhysX Ragdoll", "Creates a PhysX ragdoll simulation for an animation actor.")
+                editContext->Class<RagdollComponent>("PhysX Ragdoll", "Creates a PhysX ragdoll simulation for an animation actor.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXRagdoll.svg")
@@ -90,34 +90,49 @@ namespace PhysX
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx/ragdoll/")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_positionIterations, "Position Iteration Count",
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_positionIterations, "Position Iteration Count",
                         "The frequency at which ragdoll collider positions are resolved. Higher values can increase fidelity but decrease "
                         "performance. Very high values might introduce instability.")
                     ->Attribute(AZ::Edit::Attributes::Min, 1)
                     ->Attribute(AZ::Edit::Attributes::Max, 255)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_velocityIterations, "Velocity Iteration Count",
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_velocityIterations, "Velocity Iteration Count",
                         "The frequency at which ragdoll collider velocities are resolved. Higher values can increase fidelity but decrease "
                         "performance. Very high values might introduce instability.")
                     ->Attribute(AZ::Edit::Attributes::Min, 1)
                     ->Attribute(AZ::Edit::Attributes::Max, 255)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_enableJointProjection,
-                        "Enable Joint Projection", "When active, preserves joint constraints in volatile simulations. "
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_enableJointProjection, "Enable Joint Projection",
+                        "When active, preserves joint constraints in volatile simulations. "
                         "Might not be physically correct in all simulations.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionLinearTolerance,
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionLinearTolerance,
                         "Joint Projection Linear Tolerance",
                         "Maximum linear joint error. Projection is applied to linear joint errors above this value.")
                     ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                     ->Attribute(AZ::Edit::Attributes::Step, 1e-3f)
                     ->Attribute(AZ::Edit::Attributes::Visibility, &RagdollComponent::IsJointProjectionVisible)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionAngularToleranceDegrees,
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionAngularToleranceDegrees,
                         "Joint Projection Angular Tolerance",
                         "Maximum angular joint error. Projection is applied to angular joint errors above this value.")
                     ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                     ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
                     ->Attribute(AZ::Edit::Attributes::Suffix, " degrees")
                     ->Attribute(AZ::Edit::Attributes::Visibility, &RagdollComponent::IsJointProjectionVisible)
-                    ;
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_enableMassRatioClamping, "Enable Mass Ratio Clamping",
+                        "When active, ragdoll node mass values may be overridden to avoid unstable mass ratios.")
+                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &RagdollComponent::m_maxMassRatio, "Maximum Mass Ratio",
+                        "The mass of the child body of a joint may be clamped to avoid its ratio with the parent "
+                        "body mass exceeding this threshold.")
+                    ->Attribute(AZ::Edit::Attributes::Min, 1.0f)
+                    ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &RagdollComponent::IsMaxMassRatioVisible);
             }
         }
 
@@ -126,11 +141,16 @@ namespace PhysX
         }
     }
 
-    bool RagdollComponent::IsJointProjectionVisible()
+    bool RagdollComponent::IsJointProjectionVisible() const
     {
         return m_enableJointProjection;
     }
 
+    bool RagdollComponent::IsMaxMassRatioVisible() const
+    {
+        return m_enableMassRatioClamping;
+    }
+
     // AZ::Component
     void RagdollComponent::Init()
     {
@@ -272,7 +292,6 @@ namespace PhysX
             return ragdoll->IsSimulated();
         }
         return false;
-        
     }
 
     AZ::Aabb RagdollComponent::GetAabb() const
@@ -318,20 +337,19 @@ namespace PhysX
 
         if (numNodes == 0)
         {
-            AZ_Error("PhysX Ragdoll Component", false,
-                "Ragdoll configuration has 0 nodes, ragdoll will not be created for entity \"%s\".",
+            AZ_Error(
+                "PhysX Ragdoll Component", false, "Ragdoll configuration has 0 nodes, ragdoll will not be created for entity \"%s\".",
                 GetEntity()->GetName().c_str());
             return;
         }
 
-        
         ragdollConfiguration.m_parentIndices.resize(numNodes);
         for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++)
         {
             AZStd::string parentName;
             AZStd::string nodeName = ragdollConfiguration.m_nodes[nodeIndex].m_debugName;
-            AzFramework::CharacterPhysicsDataRequestBus::EventResult(parentName, GetEntityId(),
-                &AzFramework::CharacterPhysicsDataRequests::GetParentNodeName, nodeName);
+            AzFramework::CharacterPhysicsDataRequestBus::EventResult(
+                parentName, GetEntityId(), &AzFramework::CharacterPhysicsDataRequests::GetParentNodeName, nodeName);
             AZ::Outcome<size_t> parentIndex = Utils::Characters::GetNodeIndex(ragdollConfiguration, parentName);
             ragdollConfiguration.m_parentIndices[nodeIndex] = parentIndex ? parentIndex.GetValue() : SIZE_MAX;
 
@@ -339,8 +357,8 @@ namespace PhysX
         }
 
         Physics::RagdollState bindPose;
-        AzFramework::CharacterPhysicsDataRequestBus::EventResult(bindPose, GetEntityId(),
-            &AzFramework::CharacterPhysicsDataRequests::GetBindPose, ragdollConfiguration);
+        AzFramework::CharacterPhysicsDataRequestBus::EventResult(
+            bindPose, GetEntityId(), &AzFramework::CharacterPhysicsDataRequests::GetBindPose, ragdollConfiguration);
 
         AZ::Transform entityTransform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(entityTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
@@ -354,13 +372,12 @@ namespace PhysX
             m_ragdollHandle = sceneInterface->AddSimulatedBody(m_attachedSceneHandle, &ragdollConfiguration);
         }
         auto* ragdoll = GetPhysXRagdoll();
-        if (ragdoll == nullptr ||
-            m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle)
+        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 = ragdoll->GetPxRigidDynamic(nodeIndex))
@@ -389,17 +406,63 @@ namespace PhysX
             }
         }
 
+        // If mass ratio clamping is enabled, iterate out from the root and clamp mass values
+        if (m_enableMassRatioClamping)
+        {
+            const float maxMassRatio = AZStd::GetMax(1.0f + AZ::Constants::FloatEpsilon, m_maxMassRatio);
+
+            // figure out the depth of each node in the tree, so that nodes can be visited from the root outwards
+            AZStd::vector<Utils::Characters::DepthData> nodeDepths =
+                Utils::Characters::ComputeHierarchyDepths(ragdollConfiguration.m_parentIndices);
+
+            AZStd::sort(
+                nodeDepths.begin(), nodeDepths.end(),
+                [](const Utils::Characters::DepthData& d1, const Utils::Characters::DepthData& d2)
+                {
+                    return d1.m_depth < d2.m_depth;
+                });
+
+            bool massesClamped = false;
+            for (const auto& nodeDepth : nodeDepths)
+            {
+                const size_t nodeIndex = nodeDepth.m_index;
+                const size_t parentIndex = ragdollConfiguration.m_parentIndices[nodeIndex];
+                if (parentIndex < numNodes)
+                {
+                    AzPhysics::RigidBody& nodeRigidBody = ragdoll->GetNode(nodeIndex)->GetRigidBody();
+                    const float originalMass = nodeRigidBody.GetMass();
+                    const float parentMass = ragdoll->GetNode(parentIndex)->GetRigidBody().GetMass();
+                    const float minMass = parentMass / maxMassRatio;
+                    const float maxMass = parentMass;
+                    if (originalMass < minMass || originalMass > maxMass)
+                    {
+                        const float clampedMass = AZStd::clamp(originalMass, minMass, maxMass);
+                        nodeRigidBody.SetMass(clampedMass);
+                        massesClamped = true;
+                        if (!AZ::IsClose(originalMass, 0.0f))
+                        {
+                            // scale the inertia proportionally to how the mass was modified
+                            auto pxRigidBody = static_cast<physx::PxRigidDynamic*>(nodeRigidBody.GetNativePointer());
+                            pxRigidBody->setMassSpaceInertiaTensor(clampedMass / originalMass * pxRigidBody->getMassSpaceInertiaTensor());
+                        }
+                    }
+                }
+            }
+
+            AZ_WarningOnce("PhysX Ragdoll", !massesClamped,
+                "Mass values for ragdoll on entity \"%s\" were modified based on max mass ratio setting to avoid instability.",
+                GetEntity()->GetName().c_str());
+        }
+
         AzFramework::RagdollPhysicsRequestBus::Handler::BusConnect(GetEntityId());
         AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusConnect(GetEntityId());
 
-        AzFramework::RagdollPhysicsNotificationBus::Event(GetEntityId(),
-            &AzFramework::RagdollPhysicsNotifications::OnRagdollActivated);
+        AzFramework::RagdollPhysicsNotificationBus::Event(GetEntityId(), &AzFramework::RagdollPhysicsNotifications::OnRagdollActivated);
     }
 
     void RagdollComponent::DestroyRagdoll()
     {
-        if (m_ragdollHandle != AzPhysics::InvalidSimulatedBodyHandle && 
-            m_attachedSceneHandle != AzPhysics::InvalidSceneHandle)
+        if (m_ragdollHandle != AzPhysics::InvalidSimulatedBodyHandle && m_attachedSceneHandle != AzPhysics::InvalidSceneHandle)
         {
             AzFramework::RagdollPhysicsRequestBus::Handler::BusDisconnect();
             AzFramework::RagdollPhysicsNotificationBus::Event(
@@ -421,8 +484,7 @@ namespace PhysX
 
     const Ragdoll* RagdollComponent::GetPhysXRagdollConst() const
     {
-        if (m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle ||
-            m_attachedSceneHandle == AzPhysics::InvalidSceneHandle)
+        if (m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle || m_attachedSceneHandle == AzPhysics::InvalidSceneHandle)
         {
             return nullptr;
         }
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
index 63dd1354dd..3ef59bf623 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
@@ -103,7 +103,8 @@ namespace PhysX
         Ragdoll* GetPhysXRagdoll();
         const Ragdoll* GetPhysXRagdollConst() const;
 
-        bool IsJointProjectionVisible();
+        bool IsJointProjectionVisible() const;
+        bool IsMaxMassRatioVisible() const;
 
         AzPhysics::SimulatedBodyHandle m_ragdollHandle = AzPhysics::InvalidSimulatedBodyHandle;
         AzPhysics::SceneHandle m_attachedSceneHandle = AzPhysics::InvalidSceneHandle;
@@ -119,5 +120,9 @@ namespace PhysX
         float m_jointProjectionLinearTolerance = 1e-3f;
         /// Angular joint error (in degrees) above which projection will be applied.
         float m_jointProjectionAngularToleranceDegrees = 1.0f;
+        /// Allows ragdoll node mass values to be overridden to avoid unstable mass ratios.
+        bool m_enableMassRatioClamping = false;
+        /// If mass ratio clamping is enabled, masses will be clamped to within this ratio.
+        float m_maxMassRatio = 2.0f;
     };
 } // namespace PhysX
diff --git a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
index e6a2b35d36..1d078bb505 100644
--- a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake
@@ -7,5 +7,3 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
-
diff --git a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
index 0d9c4f1e3a..43c92ab916 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -7,7 +7,6 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
      ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-linux TARGETS poly2tri PACKAGE_HASH b16eef8f0bc469de0e3056d28d7484cf42659667e39b68b239f0d3a4cbb533d0) 
diff --git a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
index 141a80ae59..992280bceb 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -7,7 +7,6 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
      ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-mac TARGETS poly2tri PACKAGE_HASH 23e49e6b06d79327985d17b40bff20ab202519c283a842378f5f1791c1bf8dbc) 
diff --git a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
index 7abd7ab9e9..336bb89c40 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -7,7 +7,6 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE TRUE)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
      ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-windows TARGETS poly2tri PACKAGE_HASH 5fea2bf294e5130e0654fbfa39f192e6369f3853901dde90bb9b3f3a11edcb1e) 
diff --git a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
index 6316fa60c6..1d078bb505 100644
--- a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
+++ b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake
@@ -7,4 +7,3 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
-set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE)
diff --git a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
index 0ae09d704b..7d54a813c0 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
+++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
@@ -1225,10 +1225,10 @@ namespace PhysX
         AZ_PROFILE_DATAPOINT(Physics, stats.getNbBroadPhaseRemoves(), RootCategory, BroadphaseSubCategory, "BroadPhaseRemoves");
 
         // Compute pair stats for all geometry types
+#if AZ_PROFILE_DATAPOINT
         AZ::u32 ccdPairs = 0;
         AZ::u32 modifiedPairs = 0;
         AZ::u32 triggerPairs = 0;
-
         for (AZ::u32 i = 0; i < PxGeometryType::eGEOMETRY_COUNT; i++)
         {
             // stat[i][j] = stat[j][i], hence, discarding the symmetric entries
@@ -1241,6 +1241,7 @@ namespace PhysX
                 triggerPairs += stats.getRbPairStats(physx::PxSimulationStatistics::eTRIGGER_PAIRS, firstGeom, secondGeom);
             }
         }
+#endif
 
         [[maybe_unused]] const char* CollisionsSubCategory = "Collisions";
         AZ_PROFILE_DATAPOINT(Physics, ccdPairs, RootCategory, CollisionsSubCategory, "CCDPairs");
diff --git a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
index 1f393386f8..5722d1a397 100644
--- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
@@ -8,10 +8,13 @@
 
 #include "TestColliderComponent.h"
 
+#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
 #include <AZTestShared/Math/MathTestHelpers.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
 #include <AzToolsFramework/ViewportSelection/EditorDefaultSelection.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <Tests/Viewport/ViewportUiManagerTests.cpp>
@@ -66,7 +69,7 @@ namespace UnitTest
 
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // When the mouse wheel is scrolled while holding ctrl
         AzToolsFramework::ViewportInteraction::MouseInteractionEvent
@@ -84,7 +87,7 @@ namespace UnitTest
         // Then the component mode is cycled.
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
         EXPECT_EQ(handled, MouseInteractionResult::Viewport);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
     }
 
     TEST_F(PhysXColliderComponentModeTest, MouseWheelDownShouldSetPreviousMode)
@@ -95,7 +98,7 @@ namespace UnitTest
 
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // When the mouse wheel is scrolled while holding ctrl
         AzToolsFramework::ViewportInteraction::MouseInteractionEvent
@@ -116,7 +119,7 @@ namespace UnitTest
         EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Rotation, subMode);
     }
 
-    TEST_F(PhysXColliderComponentModeTest, PressingKey1ShouldSetSizeMode)
+    TEST_F(PhysXColliderComponentModeTest, PressingKey1ShouldSetOffsetMode)
     {
         // Given there is a collider component in component mode.
         CreateColliderComponent();
@@ -124,17 +127,17 @@ namespace UnitTest
 
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // When the '1' key is pressed
         QTest::keyPress(&m_editorActions.m_componentModeWidget, Qt::Key_1);
 
-        // Then the component mode is set to Size.
+        // Then the component mode is set to Offset.
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
     }
 
-    TEST_F(PhysXColliderComponentModeTest, PressingKey2ShouldSetSizeMode)
+    TEST_F(PhysXColliderComponentModeTest, PressingKey2ShouldSetRotationMode)
     {
         // Given there is a collider component in component mode.
         auto colliderEntity = CreateColliderComponent();
@@ -143,14 +146,14 @@ namespace UnitTest
 
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // When the '2' key is pressed
         QTest::keyPress(&m_editorActions.m_componentModeWidget, Qt::Key_2);
 
-        // Then the component mode is set to Offset.
+        // Then the component mode is set to Rotation.
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Rotation, subMode);
     }
 
     TEST_F(PhysXColliderComponentModeTest, PressingKey3ShouldSetSizeMode)
@@ -162,14 +165,14 @@ namespace UnitTest
 
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // When the '3' key is pressed
         QTest::keyPress(&m_editorActions.m_componentModeWidget, Qt::Key_3);
 
-        // Then the component mode is set to Rotation.
+        // Then the component mode is set to Size.
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Rotation, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
     }
 
     TEST_F(PhysXColliderComponentModeTest, PressingKeyRShouldResetSphereRadius)
@@ -292,7 +295,7 @@ namespace UnitTest
         // Check preconditions
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // Get the cluster and button Ids
         AzToolsFramework::ViewportUi::ClusterId modeSelectionClusterId;
@@ -327,7 +330,7 @@ namespace UnitTest
         // Check preconditions
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // Get the cluster and button Ids
         AzToolsFramework::ViewportUi::ClusterId modeSelectionClusterId;
@@ -362,7 +365,7 @@ namespace UnitTest
         // Check preconditions
         PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes;
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
-        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
+        EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode);
 
         // Get the cluster and button Ids
         AzToolsFramework::ViewportUi::ClusterId modeSelectionClusterId;
@@ -386,4 +389,52 @@ namespace UnitTest
         PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode);
         EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode);
     }
+
+    using PhysXColliderComponentModeManipulatorTest =
+        UnitTest::IndirectCallManipulatorViewportInteractionFixtureMixin<PhysXColliderComponentModeTest>;
+
+    TEST_F(PhysXColliderComponentModeManipulatorTest, AssetScaleManipulatorsScaleInCorrectDirection)
+    {
+        auto colliderEntity = CreateColliderComponent();
+        colliderEntity->FindComponent<TestColliderComponentMode>()->SetShapeType(Physics::ShapeType::PhysicsAsset);
+        colliderEntity->FindComponent<TestColliderComponentMode>()->SetAssetScale(AZ::Vector3::CreateOne());
+        EnterComponentMode<TestColliderComponentMode>();
+        PhysX::ColliderComponentModeRequestBus::Broadcast(&PhysX::ColliderComponentModeRequests::SetCurrentMode,
+            PhysX::ColliderComponentModeRequests::SubMode::Dimensions);
+
+        // position the camera so the X axis manipulator will be flipped
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromQuaternionAndTranslation(
+                AZ::Quaternion::CreateRotationZ(-AZ::Constants::QuarterPi), AZ::Vector3(-5.0f, -5.0f, 0.0f)));
+
+        // select a point in world space slightly displaced from the position of the entity in the negative x direction
+        // in order to grab the X manipulator
+        const float x = 0.1f;
+        const float xDelta = 0.1f;
+        const AZ::Vector3 worldStart(-x, 0.0f, 0.0f);
+
+        // position in world space to drag to
+        const AZ::Vector3 worldEnd(-(x + xDelta), 0.0f, 0.0f);
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to interact with the x scale manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        const auto worldToScreenMultiplier = 1.0f / AzToolsFramework::CalculateScreenToWorldMultiplier(worldStart, m_cameraState);
+        const auto assetScale = colliderEntity->FindComponent<TestColliderComponentMode>()->GetAssetScale();
+        // need quite a large tolerance because using screen co-ordinates limits precision
+        const float tolerance = 0.01f;
+        EXPECT_NEAR(assetScale.GetX(), 1.0f + xDelta * worldToScreenMultiplier, tolerance);
+        EXPECT_NEAR(assetScale.GetY(), 1.0f, tolerance);
+        EXPECT_NEAR(assetScale.GetZ(), 1.0f, tolerance);
+    }
 } // namespace UnitTest
diff --git a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
index 3a7eac0884..8a624e0223 100644
--- a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
@@ -267,8 +267,6 @@ namespace PhysX
         EXPECT_GT(followerEndPosition.GetZ(), followerPosition.GetZ());
     }
 
-// for some reason TYPED_TEST_CASE with the fixture is not working on Android + Linux
-#ifdef ENABLE_JOINTS_TYPED_TEST_CASE
     template<class JointConfigurationType>
     class PhysXJointsApiTest : public PhysX::GenericPhysicsInterfaceTest
     {
@@ -347,5 +345,4 @@ namespace PhysX
 
         EXPECT_GT(childCurrentPos.GetX(), this->m_childInitialPos.GetX());
     }
-#endif // ENABLE_JOINTS_TYPED_TEST_CASE
 }
diff --git a/Gems/PhysX/Code/Tests/RagdollTests.cpp b/Gems/PhysX/Code/Tests/RagdollTests.cpp
index 30e9400790..ff4637fd6e 100644
--- a/Gems/PhysX/Code/Tests/RagdollTests.cpp
+++ b/Gems/PhysX/Code/Tests/RagdollTests.cpp
@@ -367,4 +367,19 @@ namespace PhysX
         float minZ = ragdoll->GetAabb().GetMin().GetZ();
         EXPECT_NEAR(minZ, 0.0f, 0.05f);
     }
+
+    TEST(ComputeHierarchyDepthsTest, DepthValuesCorrect)
+    {
+        AZStd::vector<size_t> parentIndices =
+            { 3, 5, AZStd::numeric_limits<size_t>::max(), 1, 2, 9, 7, 4, 0, 6, 11, 12, 5, 14, 15, 16, 5, 18, 19, 4, 21, 22, 4 };
+
+        const AZStd::vector<Utils::Characters::DepthData> nodeDepths = Utils::Characters::ComputeHierarchyDepths(parentIndices);
+
+        std::vector<int> expectedDepths = { 8, 6, 0, 7, 1, 5, 3, 2, 9, 4, 8, 7, 6, 9, 8, 7, 6, 4, 3, 2, 4, 3, 2 };
+
+        for (size_t i = 0; i < parentIndices.size(); i++)
+        {
+            EXPECT_EQ(nodeDepths[i].m_depth, expectedDepths[i]);
+        }
+    }
 } // namespace PhysX
diff --git a/Gems/PhysX/Code/Tests/TestColliderComponent.h b/Gems/PhysX/Code/Tests/TestColliderComponent.h
index 91d3f16122..52b208ea80 100644
--- a/Gems/PhysX/Code/Tests/TestColliderComponent.h
+++ b/Gems/PhysX/Code/Tests/TestColliderComponent.h
@@ -67,13 +67,13 @@ namespace UnitTest
 
     private:
         AzToolsFramework::ComponentModeFramework::ComponentModeDelegate m_componentModeDelegate;
-        AZ::Vector3 m_offset;
-        AZ::Quaternion m_rotation;
-        AZ::Transform m_transform;
-        Physics::ShapeType m_shapeType;
-        float m_sphereRadius;
-        float m_capsuleHeight;
-        float m_capsuleRadius;
-        AZ::Vector3 m_assetScale;
+        AZ::Vector3 m_offset = AZ::Vector3::CreateZero();
+        AZ::Quaternion m_rotation = AZ::Quaternion::CreateIdentity();
+        AZ::Transform m_transform = AZ::Transform::CreateIdentity();
+        Physics::ShapeType m_shapeType = Physics::ShapeType::PhysicsAsset;
+        float m_sphereRadius = 0.5f;
+        float m_capsuleHeight = 1.0f;
+        float m_capsuleRadius = 0.25f;
+        AZ::Vector3 m_assetScale = AZ::Vector3::CreateOne();
     };
 } // namespace UnitTest
diff --git a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h
index 14f37ef01e..fc0d60640c 100644
--- a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h
+++ b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h
@@ -32,7 +32,7 @@ namespace PhysXDebug
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("PhysXDebugEditorService", 0xe3dde7d8));
+            provided.push_back(AZ_CRC("PhysXDebugEditorService", 0xf8611967));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
diff --git a/Gems/PhysXDebug/Code/Source/SystemComponent.h b/Gems/PhysXDebug/Code/Source/SystemComponent.h
index 83756f20f9..34c8142bac 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.h
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.h
@@ -16,7 +16,6 @@
 #include <PhysXDebug/PhysXDebugBus.h>
 #include <PxPhysicsAPI.h>
 
-#include <Cry_Camera.h>
 #include <IRenderAuxGeom.h>
 #include <CryCommon/CrySystemBus.h>
 
diff --git a/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp b/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp
index 17ed4d9c0c..bcfedad8a8 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp
+++ b/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp
@@ -8,12 +8,16 @@
 
 #include <PrefabGroup/ProceduralAssetHandler.h>
 #include <AzCore/Asset/AssetTypeInfoBus.h>
+#include <AzCore/Serialization/Json/JsonUtils.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/FileFunc/FileFunc.h>
-#include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
+#include <AzQtComponents/Components/Widgets/FileDialog.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
 #include <AzToolsFramework/Prefab/PrefabLoaderInterface.h>
+#include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/Procedural/ProceduralPrefabAsset.h>
-#include <AzCore/Serialization/Json/JsonUtils.h>
+#include <QMenu>
 
 namespace AZ::Prefab
 {
@@ -21,6 +25,7 @@ namespace AZ::Prefab
 
     class PrefabGroupAssetHandler::AssetTypeInfoHandler final
         : public AZ::AssetTypeInfoBus::Handler
+        , protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
     {
     public:
         AZ_CLASS_ALLOCATOR(AssetTypeInfoHandler, AZ::SystemAllocator, 0);
@@ -31,15 +36,21 @@ namespace AZ::Prefab
         const char* GetGroup() const override;
         const char* GetBrowserIcon() const override;
         void GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions) override;
+
+        // AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
+        void AddContextMenuActions(QWidget* caller, QMenu* menu, const AZStd::vector<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>& entries) override;
+        bool SaveAsAuthoredPrefab(const AZ::Data::AssetId& assetId, const char* destinationFilename);
     };
 
     PrefabGroupAssetHandler::AssetTypeInfoHandler::AssetTypeInfoHandler()
     {
         AZ::AssetTypeInfoBus::Handler::BusConnect(azrtti_typeid<ProceduralPrefabAsset>());
+        AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
     }
 
     PrefabGroupAssetHandler::AssetTypeInfoHandler::~AssetTypeInfoHandler()
     {
+        AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
         AZ::AssetTypeInfoBus::Handler::BusDisconnect(azrtti_typeid<ProceduralPrefabAsset>());
     }
 
@@ -68,6 +79,84 @@ namespace AZ::Prefab
         extensions.push_back(PrefabGroupAssetHandler::s_Extension);
     }
 
+    void PrefabGroupAssetHandler::AssetTypeInfoHandler::AddContextMenuActions(
+        [[maybe_unused]] QWidget* caller,
+        QMenu* menu,
+        const AZStd::vector<AzToolsFramework::AssetBrowser::AssetBrowserEntry*>& entries)
+    {
+        using namespace AzToolsFramework::AssetBrowser;
+        auto entryIt = AZStd::find_if
+        (
+            entries.begin(),
+            entries.end(),
+            [](const AssetBrowserEntry* entry) -> bool
+            {
+                return entry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Product;
+            }
+        );
+
+        if (entryIt == entries.end())
+        {
+            return;
+        }
+        else  if ((*entryIt)->GetEntryType() == AssetBrowserEntry::AssetEntryType::Product)
+        {
+            ProductAssetBrowserEntry* product = azrtti_cast<ProductAssetBrowserEntry*>(*entryIt);
+            if (product->GetAssetType() == azrtti_typeid<ProceduralPrefabAsset>())
+            {
+                AZ::Data::AssetId assetId = product->GetAssetId();
+                menu->addAction("Save as Prefab...", [assetId, this]()
+                {
+                    QString filePath = AzQtComponents::FileDialog::GetSaveFileName(nullptr, QString("Save to file"), "", QString("Prefab file (*.prefab)"));
+                    if (filePath.isEmpty())
+                    {
+                        return;
+                    }
+                    if (SaveAsAuthoredPrefab(assetId, filePath.toUtf8().data()))
+                    {
+                        AZ_Printf("Prefab", "Prefab was saved to a .prefab file %s", filePath.toUtf8().data());
+                    }
+                });
+            }
+        }
+    }
+
+    bool PrefabGroupAssetHandler::AssetTypeInfoHandler::SaveAsAuthoredPrefab(const AZ::Data::AssetId& assetId, const char* destinationFilename)
+    {
+        using namespace AzToolsFramework::Prefab;
+        using namespace AZ::Data;
+
+        auto procPrefabAsset = AssetManager::Instance().GetAsset<ProceduralPrefabAsset>(assetId, AssetLoadBehavior::Default);
+        const auto status = AssetManager::Instance().BlockUntilLoadComplete(procPrefabAsset);
+        if (status != AssetData::AssetStatus::Ready)
+        {
+            return false;
+        }
+
+        auto* prefabLoaderInterface = AZ::Interface<PrefabLoaderInterface>::Get();
+        if (!prefabLoaderInterface)
+        {
+            return false;
+        }
+
+        const auto templateId = procPrefabAsset.GetAs<ProceduralPrefabAsset>()->GetTemplateId();
+        AZStd::string outputJson;
+        if (prefabLoaderInterface->SaveTemplateToString(templateId, outputJson) == false)
+        {
+            return false;
+        }
+
+        const auto fileMode = AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath | AZ::IO::OpenMode::ModeText;
+        AZ::IO::FileIOStream outputFileStream;
+        if (outputFileStream.Open(destinationFilename, fileMode) == false)
+        {
+            return false;
+        }
+
+        outputFileStream.Write(outputJson.size(), outputJson.data());
+        return true;
+    }
+
     // PrefabGroupAssetHandler
 
     AZStd::string_view PrefabGroupAssetHandler::s_Extension{ "procprefab" };
diff --git a/Gems/Profiler/Code/Source/CpuProfilerImpl.cpp b/Gems/Profiler/Code/Source/CpuProfilerImpl.cpp
index f0d39d48e4..23a3bbbea4 100644
--- a/Gems/Profiler/Code/Source/CpuProfilerImpl.cpp
+++ b/Gems/Profiler/Code/Source/CpuProfilerImpl.cpp
@@ -8,7 +8,6 @@
 
 #include <CpuProfilerImpl.h>
 
-#include <AzCore/Debug/Timer.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Statistics/StatisticalProfilerProxy.h>
diff --git a/Gems/Profiler/Code/Source/CpuProfilerImpl.h b/Gems/Profiler/Code/Source/CpuProfilerImpl.h
index 6611fbd1e5..c97e45e69c 100644
--- a/Gems/Profiler/Code/Source/CpuProfilerImpl.h
+++ b/Gems/Profiler/Code/Source/CpuProfilerImpl.h
@@ -150,7 +150,7 @@ namespace Profiler
 
         AZStd::mutex m_continuousCaptureEndingMutex;
 
-        AZStd::atomic_bool m_continuousCaptureInProgress;
+        AZStd::atomic_bool m_continuousCaptureInProgress = false;
 
         // Stores multiple frames of profiling data, size is controlled by MaxFramesToSave. Flushed when EndContinuousCapture is called.
         // Ring buffer so that we can have fast append of new data + removal of old profiling data with good cache locality.
diff --git a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp
index 26c2f9f974..1cb13fe4ac 100644
--- a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp
+++ b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp
@@ -23,9 +23,13 @@
 #include <AzCore/std/sort.h>
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/std/time.h>
+#include <AzCore/Time/ITime.h>
 
 namespace Profiler
 {
+    constexpr AZStd::sys_time_t ProfilerViewEdgePadding = 5000;
+    constexpr size_t InitialCpuTimingStatsAllocation = 8;
+
     namespace CpuProfilerImGuiHelper
     {
         float TicksToMs(double ticks)
@@ -435,6 +439,11 @@ namespace Profiler
         m_tableData.clear();
         m_groupRegionMap.clear();
 
+        // Since we don't serialize the frame boundaries, we will use "Component application simulation tick" from
+        // ComponentApplication::Tick as a heuristic.
+        static const AZ::Name::Hash frameBoundaryHash = AZ::Name("Component application simulation tick").GetHash();
+
+        AZStd::sys_time_t frameTime = 0;
         for (const auto& entry : deserializedData)
         {
             const auto [groupNameItr, wasGroupNameInserted] = m_deserializedStringPool.emplace(entry.m_groupName.GetCStr());
@@ -445,10 +454,12 @@ namespace Profiler
             const CachedTimeRegion newRegion(*groupRegionNameItr, entry.m_stackDepth, entry.m_startTick, entry.m_endTick);
             m_savedData[entry.m_threadId].push_back(newRegion);
 
-            // Since we don't serialize the frame boundaries, we need to use the RPI's OnSystemTick event as a heuristic.
-            const static AZ::Name frameBoundaryName = AZ::Name("RPISystem: OnSystemTick");
-            if (entry.m_regionName == frameBoundaryName)
+            if (entry.m_regionName.GetHash() == frameBoundaryHash)
             {
+                if (!m_frameEndTicks.empty())
+                {
+                    frameTime = entry.m_endTick - m_frameEndTicks.back();
+                }
                 m_frameEndTicks.push_back(entry.m_endTick);
             }
 
@@ -462,9 +473,9 @@ namespace Profiler
             m_groupRegionMap[*groupNameItr][*regionNameItr].RecordRegion(newRegion, entry.m_threadId);
         }
 
-        // Update viewport bounds with some added UX fudge factor
-        m_viewportStartTick = deserializedData.back().m_startTick - 1000;
-        m_viewportEndTick = deserializedData.back().m_endTick + 1000;
+        // Update viewport bounds to the estimated final frame time with some padding
+        m_viewportStartTick = m_frameEndTicks.back() - frameTime - ProfilerViewEdgePadding;
+        m_viewportEndTick = m_frameEndTicks.back() + ProfilerViewEdgePadding;
 
         // Invariant: each vector in m_savedData must be sorted so that we can efficiently cull region data.
         for (auto& [threadId, singleThreadData] : m_savedData)
@@ -642,21 +653,13 @@ namespace Profiler
         m_cpuTimingStatisticsWhenPause.clear();
         if (auto statsProfiler = AZ::Interface<StatisticalProfilerProxy>::Get(); statsProfiler)
         {
-            auto& rhiMetrics = statsProfiler->GetProfiler(AZ_CRC_CE("RHI"));
-
-            const NamedRunningStatistic* frameTimeMetric = rhiMetrics.GetStatistic(AZ_CRC_CE("Frame to Frame Time"));
-            if (frameTimeMetric)
-            {
-                m_frameToFrameTime = static_cast<AZStd::sys_time_t>(frameTimeMetric->GetMostRecentSample());
-            }
-
             AZStd::vector<NamedRunningStatistic*> statistics;
-            rhiMetrics.GetStatsManager().GetAllStatistics(statistics);
+            statistics.reserve(InitialCpuTimingStatsAllocation);
 
+            statsProfiler->GetAllStatisticsOfUnits(statistics, "clocks");
             for (NamedRunningStatistic* stat : statistics)
             {
                 m_cpuTimingStatisticsWhenPause.push_back({ stat->GetName(), stat->GetMostRecentSample() });
-                stat->Reset();
             }
         }
     }
@@ -731,7 +734,11 @@ namespace Profiler
 
     void ImGuiCpuProfiler::CullFrameData()
     {
-        const AZStd::sys_time_t deleteBeforeTick = AZStd::GetTimeNowTicks() - m_frameToFrameTime * m_framesToCollect;
+        const AZ::TimeUs delta = AZ::GetRealTickDeltaTimeUs();
+        const float deltaTimeInSeconds = AZ::TimeUsToSeconds(delta);
+        const AZStd::sys_time_t frameToFrameTime = static_cast<AZStd::sys_time_t>(deltaTimeInSeconds * AZStd::GetTimeTicksPerSecond());
+
+        const AZStd::sys_time_t deleteBeforeTick = AZStd::GetTimeNowTicks() - frameToFrameTime * m_framesToCollect;
 
         // Remove old frame boundary data
         auto firstBoundaryToKeepItr = AZStd::upper_bound(m_frameEndTicks.begin(), m_frameEndTicks.end(), deleteBeforeTick);
diff --git a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h
index 2e01b8fd6b..d5d27632f8 100644
--- a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h
+++ b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h
@@ -89,7 +89,7 @@ namespace Profiler
         struct CpuTimingEntry
         {
             const AZStd::string& m_name;
-            double m_executeDuration;
+            double m_executeDuration = 0;
         };
 
         ImGuiCpuProfiler() = default;
@@ -175,8 +175,8 @@ namespace Profiler
         AZ::u64 m_savedRegionCount = 0;
 
         // Viewport tick bounds, these are used to convert tick space -> screen space and cull so we only draw onscreen objects
-        AZStd::sys_time_t m_viewportStartTick;
-        AZStd::sys_time_t m_viewportEndTick;
+        AZStd::sys_time_t m_viewportStartTick = 0;
+        AZStd::sys_time_t m_viewportEndTick = 0;
 
         // Map to store each thread's TimeRegions, individual vectors are sorted by start tick
         // note: we use size_t as a proxy for thread_id because native_thread_id_type differs differs from
@@ -215,7 +215,6 @@ namespace Profiler
 
         // Last captured CPU timing statistics
         AZStd::vector<CpuTimingEntry> m_cpuTimingStatisticsWhenPause;
-        AZStd::sys_time_t m_frameToFrameTime{};
 
         AZ::IO::FixedMaxPath m_lastCapturedFilePath;
 
diff --git a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp
index d7143a159a..2675855e4b 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp
@@ -9,12 +9,15 @@
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Module/Module.h>
 
+#include <AzToolsFramework/API/PythonLoader.h>
+
 #include <PythonAssetBuilderSystemComponent.h>
 
 namespace PythonAssetBuilder
 {
     class PythonAssetBuilderModule
         : public AZ::Module
+        , public AzToolsFramework::EmbeddedPython::PythonLoader
     {
     public:
         AZ_RTTI(PythonAssetBuilderModule, "{35C9457E-54C2-474C-AEBE-5A70CC1D435D}", AZ::Module);
@@ -31,9 +34,7 @@ namespace PythonAssetBuilder
         // Add required SystemComponents to the SystemEntity.
         AZ::ComponentTypeList GetRequiredSystemComponents() const override
         {
-            return AZ::ComponentTypeList {
-                azrtti_typeid<PythonAssetBuilderSystemComponent>(),
-            };
+            return AZ::ComponentTypeList{};
         }
     };
 }
diff --git a/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py
index 2578efeae2..d105ecdb43 100755
--- a/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py
+++ b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py
@@ -95,7 +95,7 @@ class SceneManifest():
     def __init__(self):
         self.manifest = {'values': []}
 
-    def add_mesh_group(self, name) -> dict:
+    def add_mesh_group(self, name: str) -> dict:
         meshGroup =  {}
         meshGroup['$type'] = '{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup'
         meshGroup['name'] = name
@@ -104,7 +104,7 @@ class SceneManifest():
         self.manifest['values'].append(meshGroup)
         return meshGroup
 
-    def add_prefab_group(self, name, id, json) -> dict:
+    def add_prefab_group(self, name: str, id: str, json: dict) -> dict:
         prefabGroup = {}
         prefabGroup['$type'] = '{99FE3C6F-5B55-4D8B-8013-2708010EC715} PrefabGroup'
         prefabGroup['name'] = name
@@ -113,30 +113,164 @@ class SceneManifest():
         self.manifest['values'].append(prefabGroup)
         return prefabGroup
 
-    def mesh_group_select_node(self, meshGroup, nodeName):
-        meshGroup['nodeSelectionList']['selectedNodes'].append(nodeName)
+    def mesh_group_select_node(self, mesh_group: dict, node_name: str) -> None:
+        mesh_group['nodeSelectionList']['selectedNodes'].append(node_name)
 
-    def mesh_group_unselect_node(self, meshGroup, nodeName):
-        meshGroup['nodeSelectionList']['unselectedNodes'].append(nodeName)
+    def mesh_group_unselect_node(self, mesh_group: dict, node_name: str) -> None:
+        mesh_group['nodeSelectionList']['unselectedNodes'].append(node_name)
 
-    def mesh_group_add_advanced_coordinate_system(self, meshGroup, originNodeName, translation, rotation, scale):
-        originRule =  {}
-        originRule['$type'] = 'CoordinateSystemRule'
-        originRule['useAdvancedData'] = True
-        originRule['originNodeName'] = '' if originNodeName is None else originNodeName
+    def mesh_group_add_advanced_coordinate_system(self, mesh_group: dict, origin_node_name: str, translation: object,
+                                                  rotation: object, scale: float) -> None:
+        origin_rule = {
+            '$type': 'CoordinateSystemRule',
+            'useAdvancedData': True,
+            'originNodeName': '' if origin_node_name is None else origin_node_name
+        }
         if translation is not None:
-            originRule['translation'] = translation
+            origin_rule['translation'] = translation
         if rotation is not None:
-            originRule['rotation'] = rotation
+            origin_rule['rotation'] = rotation
         if scale != 1.0:
-            originRule['scale'] = scale
-        meshGroup['rules']['rules'].append(originRule)
+            origin_rule['scale'] = scale
+        mesh_group['rules']['rules'].append(origin_rule)
 
-    def mesh_group_add_comment(self, meshGroup, comment):
-        commentRule =  {}
-        commentRule['$type'] = 'CommentRule'
-        commentRule['comment'] = comment
-        meshGroup['rules']['rules'].append(commentRule)
+    def mesh_group_add_comment(self, mesh_group: dict, comment: str) -> None:
+        commentRule = {
+            '$type': 'CommentRule',
+            'comment': comment
+        }
+        mesh_group['rules']['rules'].append(commentRule)
+
+    def __default_or_value(self, val, default):
+        return default if val is None else val
+
+    def mesh_group_add_cloth_rule(self, mesh_group: dict, cloth_node_name: str,
+                                  inverse_masses_stream_name: str, inverse_masses_channel: int,
+                                  motion_constraints_stream_name: str, motion_constraints_channel: int,
+                                  backstop_stream_name: str, backstop_offset_channel: int,
+                                  backstop_radius_channel: int) -> None:
+        """
+        Adds a Cloth rule. 0 = Red, 1 = Green, 2 = Blue, 3 = Alpha
+        :param mesh_group: Mesh Group to add the cloth rule to
+        :param cloth_node_name: Name of the node that the rule applies to
+        :param inverse_masses_stream_name: Name of the color stream to use for inverse masses
+        :param inverse_masses_channel: Color channel (index) for inverse masses
+        :param motion_constraints_stream_name: Name of the color stream to use for motion constraints
+        :param motion_constraints_channel: Color channel (index) for motion constraints
+        :param backstop_stream_name: Name of the color stream to use for backstop
+        :param backstop_offset_channel: Color channel (index) for backstop offset value
+        :param backstop_radius_channel: Color chnanel (index) for backstop radius value
+        """
+        cloth_rule = {
+            '$type': 'ClothRule',
+            'meshNodeName': cloth_node_name,
+            'inverseMassesStreamName': self.__default_or_value(inverse_masses_stream_name, 'Default: 1.0')
+        }
+
+        if inverse_masses_channel is not None:
+            cloth_rule['inverseMassesChannel'] = inverse_masses_channel
+        cloth_rule['motionConstraintsStreamName'] = self.__default_or_value(motion_constraints_stream_name, 'Default: 1.0')
+        if motion_constraints_channel is not None:
+            cloth_rule['motionConstraintsChannel'] = motion_constraints_channel
+        cloth_rule['backstopStreamName'] = self.__default_or_value(backstop_stream_name, 'None')
+        if backstop_offset_channel is not None:
+            cloth_rule['backstopOffsetChannel'] = backstop_offset_channel
+        if backstop_radius_channel is not None:
+            cloth_rule['backstopRadiusChannel'] = backstop_radius_channel
+        mesh_group['rules']['rules'].append(cloth_rule)
+
+    def mesh_group_add_lod_rule(self, mesh_group: dict) -> dict:
+        """
+        Adds an LOD rule
+        :param mesh_group: Mesh Group to add the rule to
+        :return: LOD rule
+        """
+        lod_rule = {
+            '$type': '{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule',
+            'nodeSelectionList': []
+        }
+
+        mesh_group['rules']['rules'].append(lod_rule)
+        return lod_rule
+
+    def lod_rule_add_lod(self, lod_rule: dict) -> dict:
+        """
+        Adds an LOD level to the LOD rule.  Nodes are added in order.  The first node added represents LOD1, 2nd LOD2, etc
+        :param lod_rule: LOD rule to add the LOD level to
+        :return: LOD level
+        """
+        lod = {'selectedNodes': [], 'unselectedNodes': []}
+        lod_rule['nodeSelectionList'].append(lod)
+        return lod
+
+    def lod_select_node(self, lod: dict, selected_node: str) -> None:
+        """
+        Adds a node as a selected node
+        :param lod: LOD level to add the node to
+        :param selected_node: Path of the node
+        """
+        lod['selectedNodes'].append(selected_node)
+
+    def lod_unselect_node(self, lod: dict, unselected_node: str) -> None:
+        """
+        Adds a node as an unselected node
+        :param lod: LOD rule to add the node to
+        :param unselected_node: Path of the node
+        """
+        lod['unselectedNodes'].append(unselected_node)
+
+    def mesh_group_add_advanced_mesh_rule(self, mesh_group: dict, use_32bit_vertices: bool, merge_meshes: bool,
+                                          use_custom_normals: bool,
+                                          vertex_color_stream: str) -> None:
+        """
+        Adds an Advanced Mesh rule
+        :param mesh_group: Mesh Group to add the rule to
+        :param use_32bit_vertices: False = 16bit vertex position precision. True = 32bit vertex position precision
+        :param merge_meshes: Merge all meshes into a single mesh
+        :param use_custom_normals: True = use normals from DCC tool.  False = average normals
+        :param vertex_color_stream: Color stream name to use for Vertex Coloring
+        """
+        rule = {
+            '$type': 'StaticMeshAdvancedRule',
+            'use32bitVertices': self.__default_or_value(use_32bit_vertices, False),
+            'mergeMeshes': self.__default_or_value(merge_meshes, True),
+            'useCustomNormals': self.__default_or_value(use_custom_normals, True)
+        }
+
+        if vertex_color_stream is not None:
+            rule['vertexColorStreamName'] = vertex_color_stream
+
+        mesh_group['rules']['rules'].append(rule)
+
+    def mesh_group_add_skin_rule(self, mesh_group: dict, max_weights_per_vertex: int, weight_threshold: float) -> None:
+        """
+        Adds a Skin rule
+        :param mesh_group: Mesh Group to add the rule to
+        :param max_weights_per_vertex: Max number of joints that can influence a vertex
+        :param weight_threshold: Weight values below this value will be treated as 0
+        """
+        rule = {
+            '$type': 'SkinRule',
+            'maxWeightsPerVertex': self.__default_or_value(max_weights_per_vertex, 4),
+            'weightThreshold': self.__default_or_value(weight_threshold, 0.001)
+        }
+
+        mesh_group['rules']['rules'].append(rule)
+
+    def mesh_group_add_tangent_rule(self, mesh_group: dict, tangent_space: int, tspace_method: int) -> None:
+        """
+        Adds a Tangent rule to control tangent space generation
+        :param mesh_group: Mesh Group to add the rule to
+        :param tangent_space: Tangent space source. 0 = Scene, 1 = MikkT Tangent Generation
+        :param tspace_method: MikkT Generation method. 0 = TSpace, 1 = TSpaceBasic
+        """
+        rule = {
+            '$type': 'TangentsRule',
+            'tangentSpace': self.__default_or_value(tangent_space, 1),
+            'tSpaceMethod': self.__default_or_value(tspace_method, 0)
+        }
+
+        mesh_group['rules']['rules'].append(rule)
 
     def export(self):
         return json.dumps(self.manifest)
diff --git a/Gems/QtForPython/Code/CMakeLists.txt b/Gems/QtForPython/Code/CMakeLists.txt
index 48ce5c02d3..da763978a6 100644
--- a/Gems/QtForPython/Code/CMakeLists.txt
+++ b/Gems/QtForPython/Code/CMakeLists.txt
@@ -21,7 +21,8 @@ ly_add_target(
     NAME QtForPython.Editor.Static STATIC
     NAMESPACE Gem
     FILES_CMAKE
-        qtforpython_editor_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+        qtforpython_editor_files.cmake
+        ${CMAKE_CURRENT_SOURCE_DIR}/Source/Platform/${PAL_PLATFORM_NAME}/qtforpython_editor_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     PLATFORM_INCLUDE_FILES
         ${common_source_dir}/${PAL_TRAIT_COMPILER_ID}/qtforpython_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
     INCLUDE_DIRECTORIES
@@ -45,6 +46,9 @@ ly_add_target(
     NAMESPACE Gem
     FILES_CMAKE
         qtforpython_shared_files.cmake
+    INCLUDE_DIRECTORIES
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}/Source/Platform/${PAL_PLATFORM_NAME}
     BUILD_DEPENDENCIES
         PRIVATE
             Gem::QtForPython.Editor.Static
diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h
new file mode 100644
index 0000000000..dfdf2a66dc
--- /dev/null
+++ b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Debug/Trace.h>
+#include <dlfcn.h>
+
+namespace QtForPython
+{
+    const char* s_libPythonLibraryFile = "libpython3.7m.so.1.0";
+    const char* s_libPyside2LibraryFile = "libpyside2.abi3.so.5.14";
+    const char* s_libShibokenLibraryFile = "libshiboken2.abi3.so.5.14";
+    const char* s_libQt5TestLibraryFile = "libQt5Test.so.5";
+
+    class InitializeEmbeddedPyside2
+    {
+    public:
+        InitializeEmbeddedPyside2()
+        {
+            m_libPythonLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libPythonLibraryFile);
+            m_libPyside2LibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libPyside2LibraryFile);
+            m_libShibokenLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libShibokenLibraryFile);
+            m_libQt5TestLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libQt5TestLibraryFile);
+        }
+        virtual ~InitializeEmbeddedPyside2()
+        {
+            InitializeEmbeddedPyside2::UnloadModule(m_libQt5TestLibraryFile);
+            InitializeEmbeddedPyside2::UnloadModule(m_libShibokenLibraryFile);
+            InitializeEmbeddedPyside2::UnloadModule(m_libPyside2LibraryFile);
+            InitializeEmbeddedPyside2::UnloadModule(m_libPythonLibraryFile);
+        }
+
+    private:
+        static void* LoadModule(const char* moduleToLoad)
+        {
+            void* moduleHandle = dlopen(moduleToLoad, RTLD_NOW | RTLD_GLOBAL);
+            if (!moduleHandle)
+            {
+                [[maybe_unused]] const char* loadError = dlerror();
+                AZ_Error("QtForPython", false, "Unable to load python library %s for Pyside2: %s", moduleToLoad,
+                         loadError ? loadError : "Unknown Error");
+            }
+            return moduleHandle;
+        }
+
+        static void UnloadModule(void* moduleHandle)
+        {
+            if (moduleHandle)
+            {
+                dlclose(moduleHandle);
+            }
+        }
+
+        void* m_libPythonLibraryFile;
+        void* m_libPyside2LibraryFile;
+        void* m_libShibokenLibraryFile;
+        void* m_libQt5TestLibraryFile;
+    };
+} // namespace QtForPython
diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake
index 236043e893..789d2afae2 100644
--- a/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_BUILD_QTFORPYTHON_SUPPORTED FALSE)
+set(PAL_TRAIT_BUILD_QTFORPYTHON_SUPPORTED TRUE)
diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake b/Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake
new file mode 100644
index 0000000000..54c588a247
--- /dev/null
+++ b/Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake
@@ -0,0 +1,11 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    InitializeEmbeddedPyside2.h
+)
diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h b/Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h
similarity index 52%
rename from Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h
rename to Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h
index 1a0b774b97..819764620b 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h
@@ -7,4 +7,12 @@
  */
 #pragma once
 
-#include <AzFramework/Archive/ArchiveVars_Linux.h>
+namespace QtForPython
+{
+    class InitializeEmbeddedPyside2
+    {
+    public:
+        InitializeEmbeddedPyside2() = default;
+        virtual ~InitializeEmbeddedPyside2() = default;
+    };
+} // namespace QtForPython
diff --git a/Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake b/Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake
new file mode 100644
index 0000000000..54c588a247
--- /dev/null
+++ b/Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake
@@ -0,0 +1,11 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    InitializeEmbeddedPyside2.h
+)
diff --git a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h b/Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h
similarity index 52%
rename from Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h
rename to Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h
index 42a2a43006..819764620b 100644
--- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h
+++ b/Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h
@@ -7,4 +7,12 @@
  */
 #pragma once
 
-#include <AzFramework/Archive/ArchiveVars_Android.h>
+namespace QtForPython
+{
+    class InitializeEmbeddedPyside2
+    {
+    public:
+        InitializeEmbeddedPyside2() = default;
+        virtual ~InitializeEmbeddedPyside2() = default;
+    };
+} // namespace QtForPython
diff --git a/Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake b/Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake
new file mode 100644
index 0000000000..54c588a247
--- /dev/null
+++ b/Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake
@@ -0,0 +1,11 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    InitializeEmbeddedPyside2.h
+)
diff --git a/Gems/QtForPython/Code/Source/QtForPythonModule.cpp b/Gems/QtForPython/Code/Source/QtForPythonModule.cpp
index 1ed79310b4..ad39d0b82c 100644
--- a/Gems/QtForPython/Code/Source/QtForPythonModule.cpp
+++ b/Gems/QtForPython/Code/Source/QtForPythonModule.cpp
@@ -8,13 +8,17 @@
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Module/Module.h>
+#include <AzCore/Debug/Trace.h>
 
 #include <QtForPythonSystemComponent.h>
 
+#include "InitializeEmbeddedPyside2.h"
+
 namespace QtForPython
 {
     class QtForPythonModule
         : public AZ::Module
+        , private InitializeEmbeddedPyside2
     {
     public:
         AZ_RTTI(QtForPythonModule, "{81545CD5-79FA-47CE-96F2-1A9C5D59B4B9}", AZ::Module);
@@ -22,11 +26,13 @@ namespace QtForPython
 
         QtForPythonModule()
             : AZ::Module()
+            , InitializeEmbeddedPyside2()
         {
             m_descriptors.insert(m_descriptors.end(), {
                 QtForPythonSystemComponent::CreateDescriptor(),
             });
         }
+        ~QtForPythonModule() override = default;
 
         /**
          * Add required SystemComponents to the SystemEntity.
diff --git a/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp
index 83a158dd18..240beff78e 100644
--- a/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp
+++ b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp
@@ -203,10 +203,6 @@ namespace QtForPython
     {
         QtBootstrapParameters params;
        
-#if !defined(Q_OS_WIN)
-#error Unsupported OS platform for this QtForPython gem
-#endif
-
         params.m_mainWindowId = 0;
         using namespace AzToolsFramework;
         QWidget* activeWindow = nullptr;
diff --git a/Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake b/Gems/QtForPython/Code/Source/qtforpython_editor_files.cmake
similarity index 100%
rename from Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake
rename to Gems/QtForPython/Code/Source/qtforpython_editor_files.cmake
diff --git a/Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake b/Gems/QtForPython/Code/qtforpython_editor_files.cmake
similarity index 100%
rename from Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake
rename to Gems/QtForPython/Code/qtforpython_editor_files.cmake
diff --git a/Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp
new file mode 100644
index 0000000000..caa9e9bf54
--- /dev/null
+++ b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <SaveDataSystemComponent.h>
+
+#include <AzCore/IO/SystemFile.h>
+#include <AzCore/IO/Path/Path.h>
+#include <AzCore/std/string/conversions.h>
+#include <AzCore/Utils/Utils.h>
+#include <AzCore/PlatformIncl.h>
+
+#include <sys/types.h>
+#include <pwd.h>
+#include <unistd.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+namespace SaveData
+{
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    //! Platform specific implementation for the save data system component on Linux
+    class SaveDataSystemComponentLinux : public SaveDataSystemComponent::Implementation
+    {
+    public:
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        static constexpr const char* DefaultSaveDataDirectoryName = "SaveData";
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        // Allocator
+        AZ_CLASS_ALLOCATOR(SaveDataSystemComponentLinux, AZ::SystemAllocator, 0);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! Constructor
+        //! \param[in] saveDataSystemComponent Reference to the parent being implemented
+        SaveDataSystemComponentLinux(SaveDataSystemComponent& saveDataSystemComponent);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! Destructor
+        ~SaveDataSystemComponentLinux() override;
+
+    protected:
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! \ref SaveData::SaveDataSystemComponent::Implementation::SaveDataBuffer
+        void SaveDataBuffer(const SaveDataRequests::SaveDataBufferParams& saveDataBufferParams) override;
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! \ref SaveData::SaveDataSystemComponent::Implementation::LoadDataBuffer
+        void LoadDataBuffer(const SaveDataRequests::LoadDataBufferParams& loadDataBufferParams) override;
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! \ref SaveData::SaveDataSystemComponent::Implementation::SetSaveDataDirectoryPath
+        void SetSaveDataDirectoryPath(const char* saveDataDirectoryPath) override;
+
+    private:
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! Convenience function to construct the full save data file path.
+        //! \param[in] dataBufferName The name of the save data buffer.
+        //! \param[in] localUserId The local user id the save data buffer is associated with.
+        AZ::IO::Path GetSaveDataFilePath(const AZStd::string& dataBufferName,
+                                         AzFramework::LocalUserId localUserId);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        //! The absolute path to the application's save data dircetory.
+        AZ::IO::Path m_saveDataDirectoryPathAbsolute;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    AZ::IO::Path GetDefaultLinuxUserSaveDataPath()
+    {
+        // First priority for the home directory is the 'HOME' environment variable
+        const char* homeDir = getenv("HOME");
+        if (homeDir == nullptr)
+        {
+            // If the 'HOME' environment variable is not set, then retrieve it from the 'getpwuid' 
+            // system call
+            auto uid = getuid();
+            auto pwuid = getpwuid(uid);
+            homeDir = pwuid->pw_dir;
+        }
+
+        AZ_Assert(homeDir, "Unable to determine home directory for current Linux user");
+        if (homeDir == nullptr)
+        {
+            homeDir = "/tmp";
+        }
+
+        AZ::IO::Path homePath {homeDir};
+
+        // $HOME/.local/share is the standard directory where user data is stored on Ubuntu
+        return homePath / ".local" / "share";
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    AZStd::string GetExecutableName()
+    {
+        char moduleFileName[AZ_MAX_PATH_LEN];
+        AZ::Utils::GetExecutablePath(moduleFileName, AZ_MAX_PATH_LEN);
+
+        AZ::IO::Path executableFullPath {moduleFileName};
+        AZStd::string moduleFileNameString {executableFullPath.Filename().Native()};
+        return moduleFileNameString;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    SaveDataSystemComponent::Implementation* SaveDataSystemComponent::Implementation::Create(SaveDataSystemComponent& saveDataSystemComponent)
+    {
+        return aznew SaveDataSystemComponentLinux(saveDataSystemComponent);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    SaveDataSystemComponentLinux::SaveDataSystemComponentLinux(SaveDataSystemComponent& saveDataSystemComponent)
+        : SaveDataSystemComponent::Implementation(saveDataSystemComponent)
+        , m_saveDataDirectoryPathAbsolute(GetDefaultLinuxUserSaveDataPath() /
+                                          GetExecutableName().c_str() /
+                                          DefaultSaveDataDirectoryName)
+    {
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    SaveDataSystemComponentLinux::~SaveDataSystemComponentLinux()
+    {
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void SaveDataSystemComponentLinux::SaveDataBuffer(const SaveDataRequests::SaveDataBufferParams& saveDataBufferParams)
+    {
+        const AZStd::string absoluteFilePath = GetSaveDataFilePath(saveDataBufferParams.dataBufferName,
+                                                                   saveDataBufferParams.localUserId).c_str();
+        SaveDataBufferToFileSystem(saveDataBufferParams, absoluteFilePath);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void SaveDataSystemComponentLinux::LoadDataBuffer(const SaveDataRequests::LoadDataBufferParams& loadDataBufferParams)
+    {
+        const AZStd::string absoluteFilePath = GetSaveDataFilePath(loadDataBufferParams.dataBufferName,
+                                                                   loadDataBufferParams.localUserId).c_str();
+        LoadDataBufferFromFileSystem(loadDataBufferParams, absoluteFilePath);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    void SaveDataSystemComponentLinux::SetSaveDataDirectoryPath(const char* saveDataDirectoryPath)
+    {
+        AZ::IO::Path saveDataDirectoryBasicPath { saveDataDirectoryPath };
+
+        if (saveDataDirectoryBasicPath.IsAbsolute())
+        {
+            m_saveDataDirectoryPathAbsolute = saveDataDirectoryBasicPath;
+        }
+        else
+        {
+            m_saveDataDirectoryPathAbsolute = GetDefaultLinuxUserSaveDataPath() / saveDataDirectoryBasicPath;
+        }
+
+        AZ_Assert(!m_saveDataDirectoryPathAbsolute.empty(), "Cannot set an empty save data directory path.");
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    AZ::IO::Path SaveDataSystemComponentLinux::GetSaveDataFilePath(const AZStd::string& dataBufferName,
+                                                                   AzFramework::LocalUserId localUserId)
+    {
+        AZ::IO::Path saveDataFilePath = m_saveDataDirectoryPathAbsolute;
+        if (localUserId != AzFramework::LocalUserIdNone)
+        {
+            saveDataFilePath /= AZStd::string::format("User_%u", localUserId);
+        }
+        saveDataFilePath /= dataBufferName;
+        return saveDataFilePath;
+    }
+} // namespace SaveData
diff --git a/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake
index 2ef4de6b91..42209a111c 100644
--- a/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake
+++ b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake
@@ -7,7 +7,7 @@
 #
 
 set(FILES
-    ../Common/Unimplemented/SaveData_SystemComponent_Unimplemented.cpp
+    SaveData_SystemComponent_Linux.cpp
     SaveData_Traits_Platform.h
     SaveData_Traits_Linux.h
 )
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names
index 98a2d3f85b..d77596c36e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "On Collision Begin event",
+            "base": "On Collision Begin event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,49 +9,49 @@
             },
             "slots": [
                 {
-                    "key": "Simulated Body Handle",
+                    "base": "Simulated Body Handle",
                     "details": {
                         "name": "Simulated Body Handle"
                     }
                 },
                 {
-                    "key": "Collision Event",
+                    "base": "Collision Event",
                     "details": {
                         "name": "Collision Event"
                     }
                 },
                 {
-                    "key": "On Collision Begin event",
+                    "base": "On Collision Begin event",
                     "details": {
                         "name": "On Collision Begin event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names
index 4844732dd4..1d2c622e8c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "On Collision End event",
+            "base": "On Collision End event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,49 +9,49 @@
             },
             "slots": [
                 {
-                    "key": "Simulated Body Handle",
+                    "base": "Simulated Body Handle",
                     "details": {
                         "name": "Simulated Body Handle"
                     }
                 },
                 {
-                    "key": "Collision Event",
+                    "base": "Collision Event",
                     "details": {
                         "name": "Collision Event"
                     }
                 },
                 {
-                    "key": "On Collision End event",
+                    "base": "On Collision End event",
                     "details": {
                         "name": "On Collision End event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names
index 7ee4cd8f5c..c685623d88 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "On Collision Persist event",
+            "base": "On Collision Persist event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,49 +9,49 @@
             },
             "slots": [
                 {
-                    "key": "Simulated Body Handle",
+                    "base": "Simulated Body Handle",
                     "details": {
                         "name": "Simulated Body Handle"
                     }
                 },
                 {
-                    "key": "Collision Event",
+                    "base": "Collision Event",
                     "details": {
                         "name": "Collision Event"
                     }
                 },
                 {
-                    "key": "On Collision Persist event",
+                    "base": "On Collision Persist event",
                     "details": {
                         "name": "On Collision Persist event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names
index 7841a0bc78..dce2578ca9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "On Gravity Changed event",
+            "base": "On Gravity Changed event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,49 +9,49 @@
             },
             "slots": [
                 {
-                    "key": "Scene Handle",
+                    "base": "Scene Handle",
                     "details": {
                         "name": "Scene Handle"
                     }
                 },
                 {
-                    "key": "Gravity Vector",
+                    "base": "Gravity Vector",
                     "details": {
                         "name": "Gravity Vector"
                     }
                 },
                 {
-                    "key": "On Gravity Changed event",
+                    "base": "On Gravity Changed event",
                     "details": {
                         "name": "On Gravity Changed event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names
index b1adfeb30b..0850092f0f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "On Trigger Enter event",
+            "base": "On Trigger Enter event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,49 +9,49 @@
             },
             "slots": [
                 {
-                    "key": "Simulated Body Handle",
+                    "base": "Simulated Body Handle",
                     "details": {
                         "name": "Simulated Body Handle"
                     }
                 },
                 {
-                    "key": "Trigger Event",
+                    "base": "Trigger Event",
                     "details": {
                         "name": "Trigger Event"
                     }
                 },
                 {
-                    "key": "On Trigger Enter event",
+                    "base": "On Trigger Enter event",
                     "details": {
                         "name": "On Trigger Enter event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names
index 0c70ada73d..87c1c8e65f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "On Trigger Exit event",
+            "base": "On Trigger Exit event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,49 +9,49 @@
             },
             "slots": [
                 {
-                    "key": "Simulated Body Handle",
+                    "base": "Simulated Body Handle",
                     "details": {
                         "name": "Simulated Body Handle"
                     }
                 },
                 {
-                    "key": "Trigger Event",
+                    "base": "Trigger Event",
                     "details": {
                         "name": "Trigger Event"
                     }
                 },
                 {
-                    "key": "On Trigger Exit event",
+                    "base": "On Trigger Exit event",
                     "details": {
                         "name": "On Trigger Exit event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names
index 3cbbe32b4d..cbf2b98cb2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Postsimulate event",
+            "base": "Postsimulate event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,43 +9,43 @@
             },
             "slots": [
                 {
-                    "key": "Tick time",
+                    "base": "Tick time",
                     "details": {
                         "name": "Tick time"
                     }
                 },
                 {
-                    "key": "Postsimulate event",
+                    "base": "Postsimulate event",
                     "details": {
                         "name": "Postsimulate event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names
index d3fb8cca6e..d71831f458 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Presimulate event",
+            "base": "Presimulate event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,43 +9,43 @@
             },
             "slots": [
                 {
-                    "key": "Tick time",
+                    "base": "Tick time",
                     "details": {
                         "name": "Tick time"
                     }
                 },
                 {
-                    "key": "Presimulate event",
+                    "base": "Presimulate event",
                     "details": {
                         "name": "Presimulate event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names
index 09ec65d790..6460d967b9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SettingsRegistry Notify Event",
+            "base": "SettingsRegistry Notify Event",
             "context": "AZEventHandler",
             "variant": "",
             "details": {
@@ -9,43 +9,43 @@
             },
             "slots": [
                 {
-                    "key": "Json Path",
+                    "base": "Json Path",
                     "details": {
                         "name": "Json Path"
                     }
                 },
                 {
-                    "key": "SettingsRegistry Notify Event",
+                    "base": "SettingsRegistry Notify Event",
                     "details": {
                         "name": "SettingsRegistry Notify Event"
                     }
                 },
                 {
-                    "key": "Connect",
+                    "base": "Connect",
                     "details": {
                         "name": "Connect"
                     }
                 },
                 {
-                    "key": "Disconnect",
+                    "base": "Disconnect",
                     "details": {
                         "name": "Disconnect"
                     }
                 },
                 {
-                    "key": "On Connected",
+                    "base": "On Connected",
                     "details": {
                         "name": "On Connected"
                     }
                 },
                 {
-                    "key": "On Disconnected",
+                    "base": "On Disconnected",
                     "details": {
                         "name": "On Disconnected"
                     }
                 },
                 {
-                    "key": "OnEvent",
+                    "base": "OnEvent",
                     "details": {
                         "name": "OnEvent"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names
new file mode 100644
index 0000000000..fbcc3c69c0
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names
@@ -0,0 +1,147 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftAcceptMatchRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Accept Match Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetAcceptMatch",
+                    "details": {
+                        "name": "Get Accept Match"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}",
+                            "details": {
+                                "name": "Accept Match Request",
+                                "tooltip": "The container for AcceptMatch request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Accept Match"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAcceptMatch",
+                    "details": {
+                        "name": "Set Accept Match"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}",
+                            "details": {
+                                "name": "Accept Match Request",
+                                "tooltip": "The container for AcceptMatch request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Accept Match"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPlayerIds",
+                    "details": {
+                        "name": "Get Player Ids"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}",
+                            "details": {
+                                "name": "Accept Match Request",
+                                "tooltip": "The container for AcceptMatch request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
+                            "details": {
+                                "name": "Player Ids"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlayerIds",
+                    "details": {
+                        "name": "Set Player Ids"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}",
+                            "details": {
+                                "name": "Accept Match Request",
+                                "tooltip": "The container for AcceptMatch request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
+                            "details": {
+                                "name": "Player Ids"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetTicketId",
+                    "details": {
+                        "name": "Get Ticket Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}",
+                            "details": {
+                                "name": "Accept Match Request",
+                                "tooltip": "The container for AcceptMatch request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Ticket Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetTicketId",
+                    "details": {
+                        "name": "Set Ticket Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}",
+                            "details": {
+                                "name": "Accept Match Request",
+                                "tooltip": "The container for AcceptMatch request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Ticket Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names
new file mode 100644
index 0000000000..38de95185f
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names
@@ -0,0 +1,275 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftCreateSessionOnQueueRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Create Session On Queue Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetPlacementId",
+                    "details": {
+                        "name": "Get Placement Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session On Queue Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Placement Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlacementId",
+                    "details": {
+                        "name": "Set Placement Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session On Queue Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Placement Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetQueueName",
+                    "details": {
+                        "name": "Get Queue Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session On Queue Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Queue Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetQueueName",
+                    "details": {
+                        "name": "Set Queue Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session On Queue Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Queue Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSessionName",
+                    "details": {
+                        "name": "Get Session Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Session Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSessionName",
+                    "details": {
+                        "name": "Set Session Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Session Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaxPlayer",
+                    "details": {
+                        "name": "Get Max Player"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Max Player"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetMaxPlayer",
+                    "details": {
+                        "name": "Set Max Player"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Max Player"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSessionProperties",
+                    "details": {
+                        "name": "Get Session Properties"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Session Properties"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSessionProperties",
+                    "details": {
+                        "name": "Set Session Properties"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Session Properties"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetCreatorId",
+                    "details": {
+                        "name": "Get Creator Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Creator Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetCreatorId",
+                    "details": {
+                        "name": "Set Creator Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Creator Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names
new file mode 100644
index 0000000000..3924b7164d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names
@@ -0,0 +1,317 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftCreateSessionRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Create Session Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetIdempotencyToken",
+                    "details": {
+                        "name": "Get Idempotency Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Idempotency Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetIdempotencyToken",
+                    "details": {
+                        "name": "Set Idempotency Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Idempotency Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAliasId",
+                    "details": {
+                        "name": "Get Alias Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Alias Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAliasId",
+                    "details": {
+                        "name": "Set Alias Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Alias Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSessionName",
+                    "details": {
+                        "name": "Get Session Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Session Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSessionName",
+                    "details": {
+                        "name": "Set Session Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Session Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaxPlayer",
+                    "details": {
+                        "name": "Get Max Player"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Max Player"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetMaxPlayer",
+                    "details": {
+                        "name": "Set Max Player"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Max Player"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSessionProperties",
+                    "details": {
+                        "name": "Get Session Properties"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Session Properties"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSessionProperties",
+                    "details": {
+                        "name": "Set Session Properties"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Session Properties"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetFleetId",
+                    "details": {
+                        "name": "Get Fleet Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Fleet Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetFleetId",
+                    "details": {
+                        "name": "Set Fleet Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}",
+                            "details": {
+                                "name": "AWS Game Lift Create Session Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Fleet Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetCreatorId",
+                    "details": {
+                        "name": "Get Creator Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Creator Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetCreatorId",
+                    "details": {
+                        "name": "Set Creator Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}",
+                            "details": {
+                                "name": "Create Session Request",
+                                "tooltip": "The container for CreateSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Creator Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names
new file mode 100644
index 0000000000..c4a8a515de
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names
@@ -0,0 +1,147 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftJoinSessionRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Join Session Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetPlayerData",
+                    "details": {
+                        "name": "Get Player Data"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}",
+                            "details": {
+                                "name": "Join Session Request",
+                                "tooltip": "The container for JoinSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Data"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlayerData",
+                    "details": {
+                        "name": "Set Player Data"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}",
+                            "details": {
+                                "name": "Join Session Request",
+                                "tooltip": "The container for JoinSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Data"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPlayerId",
+                    "details": {
+                        "name": "Get Player Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}",
+                            "details": {
+                                "name": "Join Session Request",
+                                "tooltip": "The container for JoinSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlayerId",
+                    "details": {
+                        "name": "Set Player Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}",
+                            "details": {
+                                "name": "Join Session Request",
+                                "tooltip": "The container for JoinSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSessionId",
+                    "details": {
+                        "name": "Get Session Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}",
+                            "details": {
+                                "name": "Join Session Request",
+                                "tooltip": "The container for JoinSession request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Session Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSessionId",
+                    "details": {
+                        "name": "Set Session Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}",
+                            "details": {
+                                "name": "Join Session Request",
+                                "tooltip": "The container for JoinSession request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Session Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names
new file mode 100644
index 0000000000..372cbdb019
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names
@@ -0,0 +1,183 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftPlayer",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Player",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetLatencyInMs",
+                    "details": {
+                        "name": "Get Latency In Ms"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{3F80885A-9011-5172-8D94-87108B31D950}",
+                            "details": {
+                                "name": "Latency In Ms"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetLatencyInMs",
+                    "details": {
+                        "name": "Set Latency In Ms"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        },
+                        {
+                            "typeid": "{3F80885A-9011-5172-8D94-87108B31D950}",
+                            "details": {
+                                "name": "Latency In Ms"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPlayerAttributes",
+                    "details": {
+                        "name": "Get Player Attributes"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Player Attributes"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlayerAttributes",
+                    "details": {
+                        "name": "Set Player Attributes"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        },
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Player Attributes"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPlayerId",
+                    "details": {
+                        "name": "Get Player Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlayerId",
+                    "details": {
+                        "name": "Set Player Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetTeam",
+                    "details": {
+                        "name": "Get Team"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Team"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetTeam",
+                    "details": {
+                        "name": "Set Team"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}",
+                            "details": {
+                                "name": "AWS Game Lift Player"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Team"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names
new file mode 100644
index 0000000000..c2300b23bc
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names
@@ -0,0 +1,317 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftSearchSessionsRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Search Sessions Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetLocation",
+                    "details": {
+                        "name": "Get Location"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}",
+                            "details": {
+                                "name": "AWS Game Lift Search Sessions Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Location"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetLocation",
+                    "details": {
+                        "name": "Set Location"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}",
+                            "details": {
+                                "name": "AWS Game Lift Search Sessions Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Location"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetFleetId",
+                    "details": {
+                        "name": "Get Fleet Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}",
+                            "details": {
+                                "name": "AWS Game Lift Search Sessions Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Fleet Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetFleetId",
+                    "details": {
+                        "name": "Set Fleet Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}",
+                            "details": {
+                                "name": "AWS Game Lift Search Sessions Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Fleet Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNextToken",
+                    "details": {
+                        "name": "Get Next Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Next Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetNextToken",
+                    "details": {
+                        "name": "Set Next Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Next Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSortExpression",
+                    "details": {
+                        "name": "Get Sort Expression"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Sort Expression"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSortExpression",
+                    "details": {
+                        "name": "Set Sort Expression"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Sort Expression"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAliasId",
+                    "details": {
+                        "name": "Get Alias Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}",
+                            "details": {
+                                "name": "AWS Game Lift Search Sessions Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Alias Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAliasId",
+                    "details": {
+                        "name": "Set Alias Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}",
+                            "details": {
+                                "name": "AWS Game Lift Search Sessions Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Alias Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetFilterExpression",
+                    "details": {
+                        "name": "Get Filter Expression"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Filter Expression"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetFilterExpression",
+                    "details": {
+                        "name": "Set Filter Expression"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Filter Expression"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaxResult",
+                    "details": {
+                        "name": "Get Max Result"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "Max Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetMaxResult",
+                    "details": {
+                        "name": "Set Max Result"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}",
+                            "details": {
+                                "name": "Search Sessions Request",
+                                "tooltip": "The container for SearchSessions request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "Max Result"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names
new file mode 100644
index 0000000000..735f6d77f6
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names
@@ -0,0 +1,143 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftStartMatchmakingRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Start Matchmaking Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetTicketId",
+                    "details": {
+                        "name": "Get Ticket Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{70B47776-E8E7-4993-BEC3-5CAEC3D48E47}",
+                            "details": {
+                                "name": "Start Matchmaking Request",
+                                "tooltip": "The container for StartMatchmaking request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Ticket Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetTicketId",
+                    "details": {
+                        "name": "Set Ticket Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{70B47776-E8E7-4993-BEC3-5CAEC3D48E47}",
+                            "details": {
+                                "name": "Start Matchmaking Request",
+                                "tooltip": "The container for StartMatchmaking request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Ticket Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetConfigurationName",
+                    "details": {
+                        "name": "Get Configuration Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}",
+                            "details": {
+                                "name": "AWS Game Lift Start Matchmaking Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Configuration Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetConfigurationName",
+                    "details": {
+                        "name": "Set Configuration Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}",
+                            "details": {
+                                "name": "AWS Game Lift Start Matchmaking Request"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Configuration Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPlayers",
+                    "details": {
+                        "name": "Get Players"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}",
+                            "details": {
+                                "name": "AWS Game Lift Start Matchmaking Request"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EE12B610-77DD-56DD-AB5A-16A537F2CE5E}",
+                            "details": {
+                                "name": "Players"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPlayers",
+                    "details": {
+                        "name": "Set Players"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}",
+                            "details": {
+                                "name": "AWS Game Lift Start Matchmaking Request"
+                            }
+                        },
+                        {
+                            "typeid": "{EE12B610-77DD-56DD-AB5A-16A537F2CE5E}",
+                            "details": {
+                                "name": "Players"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names
new file mode 100644
index 0000000000..fa9c71dae6
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names
@@ -0,0 +1,59 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftStopMatchmakingRequest",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Stop Matchmaking Request",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "GetTicketId",
+                    "details": {
+                        "name": "Get Ticket Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6132E293-65EF-4DC2-A8A0-00269697229D}",
+                            "details": {
+                                "name": "Stop Matchmaking Request",
+                                "tooltip": "The container for StopMatchmaking request parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Ticket Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetTicketId",
+                    "details": {
+                        "name": "Set Ticket Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6132E293-65EF-4DC2-A8A0-00269697229D}",
+                            "details": {
+                                "name": "Stop Matchmaking Request",
+                                "tooltip": "The container for StopMatchmaking request parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Ticket Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names
new file mode 100644
index 0000000000..68e19cbfca
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names
@@ -0,0 +1,57 @@
+{
+    "entries": [
+        {
+            "base": "AWSMetrics_AttributesSubmissionList",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Attributes Submission List",
+                "category": "AWS Metrics"
+            },
+            "methods": [
+                {
+                    "base": "Getattributes",
+                    "details": {
+                        "name": "Get Attributes"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B1106C14-D22B-482F-B33E-B6E154A53798}",
+                            "details": {
+                                "name": "Attribute Submission List"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{1C1ABE6D-94D2-5CFD-A502-8813300FEC8D}",
+                            "details": {
+                                "name": "Metrics Attribute"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setattributes",
+                    "details": {
+                        "name": "Set Attributes"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B1106C14-D22B-482F-B33E-B6E154A53798}",
+                            "details": {
+                                "name": "Attribute Submission List"
+                            }
+                        },
+                        {
+                            "typeid": "{1C1ABE6D-94D2-5CFD-A502-8813300FEC8D}",
+                            "details": {
+                                "name": "Metrics Attribute"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names
new file mode 100644
index 0000000000..a3ac9a92c5
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names
@@ -0,0 +1,131 @@
+{
+    "entries": [
+        {
+            "base": "AWSMetrics_MetricsAttribute",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Metrics Attribute",
+                "category": "AWS Metrics"
+            },
+            "methods": [
+                {
+                    "base": "SetName",
+                    "context": "AWSMetrics_MetricsAttribute",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke SetName"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after SetName is invoked"
+                    },
+                    "details": {
+                        "name": "Set Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6483F481-0C18-4171-8B59-A44F2F28EAE5}",
+                            "details": {
+                                "name": "Metrics Attribute"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetStrValue",
+                    "context": "AWSMetrics_MetricsAttribute",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke SetStrValue"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after SetStrValue is invoked"
+                    },
+                    "details": {
+                        "name": "Set String Value"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6483F481-0C18-4171-8B59-A44F2F28EAE5}",
+                            "details": {
+                                "name": "Metrics Attribute"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetIntValue",
+                    "context": "AWSMetrics_MetricsAttribute",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke SetIntValue"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after SetIntValue is invoked"
+                    },
+                    "details": {
+                        "name": "Set Int Value"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6483F481-0C18-4171-8B59-A44F2F28EAE5}",
+                            "details": {
+                                "name": "Metrics Attribute"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetDoubleValue",
+                    "context": "AWSMetrics_MetricsAttribute",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke SetDoubleValue"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after SetDoubleValue is invoked"
+                    },
+                    "details": {
+                        "name": "Set Double Value"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6483F481-0C18-4171-8B59-A44F2F28EAE5}",
+                            "details": {
+                                "name": "Metrics Attribute"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names
new file mode 100644
index 0000000000..46ba1bad8d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names
@@ -0,0 +1,81 @@
+{
+    "entries": [
+        {
+            "base": "AWSScriptBehaviorDynamoDB",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "AWS Dynamo DB",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "GetItem",
+                    "context": "AWSScriptBehaviorDynamoDB",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke GetItem"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after GetItem is invoked"
+                    },
+                    "details": {
+                        "name": "Get Item",
+                        "category": "Other"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Table Resource Key"
+                            }
+                        },
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Key Map"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetItemRaw",
+                    "context": "AWSScriptBehaviorDynamoDB",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke GetItemRaw"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after GetItemRaw is invoked"
+                    },
+                    "details": {
+                        "name": "Get Item Raw",
+                        "category": "Other"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Table"
+                            }
+                        },
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Key Map"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names
new file mode 100644
index 0000000000..db4a42a152
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names
@@ -0,0 +1,79 @@
+{
+    "entries": [
+        {
+            "base": "AWSScriptBehaviorLambda",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "AWS Lambda",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "Invoke",
+                    "context": "AWSScriptBehaviorLambda",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Invoke"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Invoke is invoked"
+                    },
+                    "details": {
+                        "name": "Invoke"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Function Resource Key"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Payload"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "InvokeRaw",
+                    "context": "AWSScriptBehaviorLambda",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke InvokeRaw"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after InvokeRaw is invoked"
+                    },
+                    "details": {
+                        "name": "Invoke Raw"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Function Name"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Payload"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names
new file mode 100644
index 0000000000..c4dd1d5827
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names
@@ -0,0 +1,155 @@
+{
+    "entries": [
+        {
+            "base": "AWSScriptBehaviorS3",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "AWS S3",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "GetObject",
+                    "context": "AWSScriptBehaviorS3",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke GetObject"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after GetObject is invoked"
+                    },
+                    "details": {
+                        "name": "Get Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Bucket Resource Key"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Object Key"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "File"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetObjectRaw",
+                    "context": "AWSScriptBehaviorS3",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke GetObjectRaw"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after GetObjectRaw is invoked"
+                    },
+                    "details": {
+                        "name": "Get Object Raw"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Bucket"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Object Key"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "File"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HeadObject",
+                    "context": "AWSScriptBehaviorS3",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke HeadObject"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after HeadObject is invoked"
+                    },
+                    "details": {
+                        "name": "Head Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Bucket Resource Key"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "OBject Key"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HeadObjectRaw",
+                    "context": "AWSScriptBehaviorS3",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke HeadObjectRaw"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after HeadObjectRaw is invoked"
+                    },
+                    "details": {
+                        "name": "Head Object Raw"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Bucket"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Object Key"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names
new file mode 100644
index 0000000000..9526e9d8af
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names
@@ -0,0 +1,581 @@
+{
+    "entries": [
+        {
+            "base": "AZ::SceneAPI::Containers::SceneGraph",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Scene Graph",
+                "category": "Scene Graph"
+            },
+            "methods": [
+                {
+                    "base": "GetNodeChild",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Child"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Child is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Child"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "FindWithPath",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Find With Path"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Find With Path is invoked"
+                    },
+                    "details": {
+                        "name": "Find With Path"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Path"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HasNodeChild",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Has Node Child"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Has Node Child is invoked"
+                    },
+                    "details": {
+                        "name": "Has Node Child"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Has Node Child"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HasNodeParent",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Has Node Parent"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Has Node Parent is invoked"
+                    },
+                    "details": {
+                        "name": "Has Node Parent"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Has Node Parent"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNodeSibling",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Sibling"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Sibling is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Sibling"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HasNodeSibling",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Has Node Sibling"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Has Node Sibling is invoked"
+                    },
+                    "details": {
+                        "name": "Has Node Sibling"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Has Node Sibling"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsNodeEndPoint",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Node End Point"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Node End Point is invoked"
+                    },
+                    "details": {
+                        "name": "Is Node End Point"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Node End Point"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNodeCount",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Count"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Count is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Count"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Node Count"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HasNodeContent",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Has Node Content"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Has Node Content is invoked"
+                    },
+                    "details": {
+                        "name": "Has Node Content"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Has Node Content"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNodeContent",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Content"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Content is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Content"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{3EF0DDEC-C734-4804-BE99-82058FEBDA71}",
+                            "details": {
+                                "name": "Graph Object Proxy"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNodeName",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Name"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Name is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}",
+                            "details": {
+                                "name": "Node Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetRoot",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Root"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Root is invoked"
+                    },
+                    "details": {
+                        "name": "Get Root"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNodeSeperationCharacter",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Separation Character"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Separation Character is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Separation Character"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Separation Character"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNodeParent",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Node Parent"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Node Parent is invoked"
+                    },
+                    "details": {
+                        "name": "Get Node Parent"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "FindWithRootAndPath",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Find With Root And Path"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Find With Root And Path is invoked"
+                    },
+                    "details": {
+                        "name": "Find With Root And Path"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "Scene Graph"
+                            }
+                        },
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Path"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
+                            "details": {
+                                "name": "Node Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsValidName",
+                    "context": "AZ::SceneAPI::Containers::SceneGraph",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Valid Name"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Valid Name is invoked"
+                    },
+                    "details": {
+                        "name": "Is Valid Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Valid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names
new file mode 100644
index 0000000000..49dd69edf3
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names
@@ -0,0 +1,52 @@
+{
+    "entries": [
+        {
+            "base": "AZ::SceneAPI::DataTypes::IMeshData::Face",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Mesh Data Face",
+                "category": "Scene Graph"
+            },
+            "methods": [
+                {
+                    "base": "GetVertexIndex",
+                    "context": "AZ::SceneAPI::DataTypes::IMeshData::Face",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Vertex Index"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Vertex Index is invoked"
+                    },
+                    "details": {
+                        "name": "Get Vertex Index"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F9F49C1A-014F-46F5-A46F-B56D8CB46C2B}",
+                            "details": {
+                                "name": "Mesh Data Face"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Face Index"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Index"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names
index 50a563d9c4..370d185ab1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names
@@ -1,33 +1,313 @@
 {
     "entries": [
         {
-            "key": "AcesParameterOverrides",
+            "base": "AcesParameterOverrides",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "AcesParameterOverrides"
+                "name": "Aces Parameter Overrides",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "LoadPreset",
+                    "base": "LoadPreset",
                     "context": "AcesParameterOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke LoadPreset"
+                        "tooltip": "When signaled, this will invoke Load Preset"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after LoadPreset is invoked"
+                        "tooltip": "Signaled after Load Preset is invoked"
                     },
                     "details": {
-                        "name": "AcesParameterOverrides::LoadPreset",
-                        "category": "Other"
+                        "name": "Load Preset"
                     },
                     "params": [
                         {
                             "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
                             "details": {
-                                "name": "AcesParameterOverrides*"
+                                "name": "Aces Parameter Overrides"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_4000Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type 4000 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_2000Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type 2000 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetapplyCATD60toD65",
+                    "details": {
+                        "name": "Get Apply CATD 60 to D65"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetapplyCATD60toD65",
+                    "details": {
+                        "name": "Set Apply CATD 60 to D65"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_48Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type 48 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes",
+                    "details": {
+                        "name": "Get Output Device Transform Type Num Output Device Transform Types"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_1000Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type 1000 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetapplyDesaturation",
+                    "details": {
+                        "name": "Get Apply Desaturation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetapplyDesaturation",
+                    "details": {
+                        "name": "Setapply Desaturation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getpreset",
+                    "details": {
+                        "name": "Getpreset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{B94085B7-C0D4-466A-A791-188A4559EC8D}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setpreset",
+                    "details": {
+                        "name": "Setpreset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        },
+                        {
+                            "typeid": "{B94085B7-C0D4-466A-A791-188A4559EC8D}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetalterSurround",
+                    "details": {
+                        "name": "Getalter Surround"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetalterSurround",
+                    "details": {
+                        "name": "Setalter Surround"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetoverrideDefaults",
+                    "details": {
+                        "name": "Getoverride Defaults"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetoverrideDefaults",
+                    "details": {
+                        "name": "Setoverride Defaults"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+                            "details": {
+                                "name": "Aces Parameter Overrides"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names
index a87e636a17..b6092e23f7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ActorComponent",
+            "base": "ActorComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names
index 54155ecbde..d026c998ba 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "AnimationData",
+            "base": "AnimationData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names
index c74a066f94..c9a8cfe791 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names
@@ -1,33 +1,33 @@
 {
     "entries": [
         {
-            "key": "AssetData",
+            "base": "AssetData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "AssetData"
+                "name": "Asset Data",
+                "category": "Asset"
             },
             "methods": [
                 {
-                    "key": "GetUseCount",
+                    "base": "GetUseCount",
                     "context": "AssetData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseCount"
+                        "tooltip": "When signaled, this will invoke Get Use Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseCount is invoked"
+                        "tooltip": "Signaled after Get Use Count is invoked"
                     },
                     "details": {
-                        "name": "AssetData::GetUseCount",
-                        "category": "Other"
+                        "name": "Get Use Count"
                     },
                     "params": [
                         {
                             "typeid": "{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}",
                             "details": {
-                                "name": "AssetData*"
+                                "name": "Asset Data"
                             }
                         }
                     ],
@@ -35,37 +35,37 @@
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Use Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "AssetData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsLoading"
+                        "tooltip": "When signaled, this will invoke Is Loading"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsLoading is invoked"
+                        "tooltip": "Signaled after Is Loading is invoked"
                     },
                     "details": {
-                        "name": "AssetData::IsLoading",
+                        "name": "Is Loading",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}",
                             "details": {
-                                "name": "AssetData*"
+                                "name": "Asset Data"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Include Queued"
                             }
                         }
                     ],
@@ -73,31 +73,30 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Loading"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "AssetData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsError"
+                        "tooltip": "When signaled, this will invoke Is Error"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsError is invoked"
+                        "tooltip": "Signaled after Is Error is invoked"
                     },
                     "details": {
-                        "name": "AssetData::IsError",
-                        "category": "Other"
+                        "name": "Is Error"
                     },
                     "params": [
                         {
                             "typeid": "{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}",
                             "details": {
-                                "name": "AssetData*"
+                                "name": "Asset Data"
                             }
                         }
                     ],
@@ -105,31 +104,30 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Error"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "AssetData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsReady"
+                        "tooltip": "When signaled, this will invoke Is Ready"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsReady is invoked"
+                        "tooltip": "Signaled after Is Ready is invoked"
                     },
                     "details": {
-                        "name": "AssetData::IsReady",
-                        "category": "Other"
+                        "name": "Is Ready"
                     },
                     "params": [
                         {
                             "typeid": "{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}",
                             "details": {
-                                "name": "AssetData*"
+                                "name": "Asset Data"
                             }
                         }
                     ],
@@ -137,31 +135,30 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Ready"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "AssetData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetId"
+                        "tooltip": "When signaled, this will invoke Get Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetId is invoked"
+                        "tooltip": "Signaled after Get Id is invoked"
                     },
                     "details": {
-                        "name": "AssetData::GetId",
-                        "category": "Other"
+                        "name": "Get Id"
                     },
                     "params": [
                         {
                             "typeid": "{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}",
                             "details": {
-                                "name": "AssetData*"
+                                "name": "Asset Data"
                             }
                         }
                     ],
@@ -169,7 +166,7 @@
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "const AssetId&"
+                                "name": "Asset Id"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names
index 53c6c5022c..18c20bbd5a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names
@@ -1,15 +1,16 @@
 {
     "entries": [
         {
-            "key": "AssetId",
+            "base": "AssetId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "AssetId"
+                "name": "Asset Id",
+                "category": "Asset"
             },
             "methods": [
                 {
-                    "key": "CreateString",
+                    "base": "CreateString",
                     "context": "AssetId",
                     "entry": {
                         "name": "In",
@@ -20,14 +21,13 @@
                         "tooltip": "Signaled after CreateString is invoked"
                     },
                     "details": {
-                        "name": "AssetId::CreateString",
-                        "category": "Other"
+                        "name": "Create String"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "String"
                             }
                         }
                     ],
@@ -35,13 +35,13 @@
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "AssetId",
                     "entry": {
                         "name": "In",
@@ -52,14 +52,13 @@
                         "tooltip": "Signaled after IsValid is invoked"
                     },
                     "details": {
-                        "name": "AssetId::IsValid",
-                        "category": "Other"
+                        "name": "Is Valid"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId*"
+                                "name": "Asset Id"
                             }
                         }
                     ],
@@ -67,13 +66,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Valid"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "AssetId",
                     "entry": {
                         "name": "In",
@@ -84,14 +83,13 @@
                         "tooltip": "Signaled after ToString is invoked"
                     },
                     "details": {
-                        "name": "AssetId::ToString",
-                        "category": "Other"
+                        "name": "To String"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "const AssetId*"
+                                "name": "Asset Id"
                             }
                         }
                     ],
@@ -99,13 +97,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "String"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsEqual",
+                    "base": "IsEqual",
                     "context": "AssetId",
                     "entry": {
                         "name": "In",
@@ -116,20 +114,19 @@
                         "tooltip": "Signaled after IsEqual is invoked"
                     },
                     "details": {
-                        "name": "AssetId::IsEqual",
-                        "category": "Other"
+                        "name": "Is Equal"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "const AssetId&"
+                                "name": "Asset Id"
                             }
                         },
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "const AssetId&"
+                                "name": "Asset Id"
                             }
                         }
                     ],
@@ -137,7 +134,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Equal"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names
index ca82ec4783..db6fe2d2e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names
@@ -1,12 +1,102 @@
 {
     "entries": [
         {
-            "key": "AssetInfo",
+            "base": "AssetInfo",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "AssetInfo"
-            }
+                "name": "Asset Info"
+            },
+            "methods": [
+                {
+                    "base": "GetassetId",
+                    "details": {
+                        "name": "Get Asset Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E6D8372B-8419-4287-B478-1353709A972F}",
+                            "details": {
+                                "name": "Asset Info"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
+                            "details": {
+                                "name": "Asset Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetassetType",
+                    "details": {
+                        "name": "Get Asset Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E6D8372B-8419-4287-B478-1353709A972F}",
+                            "details": {
+                                "name": "Asset Info"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "Type"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetsizeBytes",
+                    "details": {
+                        "name": "Get Size Bytes"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E6D8372B-8419-4287-B478-1353709A972F}",
+                            "details": {
+                                "name": "Asset Info"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Size"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetrelativePath",
+                    "details": {
+                        "name": "Get Relative Path"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E6D8372B-8419-4287-B478-1353709A972F}",
+                            "details": {
+                                "name": "Asset Info"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Relative Path"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names
index 966764e44a..b5c7982730 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names
@@ -1,12 +1,57 @@
 {
     "entries": [
         {
-            "key": "AtomToolsDocumentSystemSettings",
+            "base": "AtomToolsDocumentSystemSettings",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "AtomToolsDocumentSystemSettings"
-            }
+                "name": "Document System Settings",
+                "category": "Atom Tools"
+            },
+            "methods": [
+                {
+                    "base": "GetshowReloadDocumentPrompt",
+                    "details": {
+                        "name": "Get Show Reload Document Prompt"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E576D4F-A74A-4326-9135-C07284D0A3B9}",
+                            "details": {
+                                "name": "Document System Settings"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enabled"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetshowReloadDocumentPrompt",
+                    "details": {
+                        "name": "Set Show Reload Document Prompt"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E576D4F-A74A-4326-9135-C07284D0A3B9}",
+                            "details": {
+                                "name": "Document System Settings"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enabled"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names
new file mode 100644
index 0000000000..c041aa00ff
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names
@@ -0,0 +1,145 @@
+{
+    "entries": [
+        {
+            "base": "AuthenticationTokens",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Authentication Tokens",
+                "category": "AWS Client Auth"
+            },
+            "methods": [
+                {
+                    "base": "GetAccessToken",
+                    "details": {
+                        "name": "Get Access Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Tokens"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Access Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAccessToken",
+                    "details": {
+                        "name": "Set Access Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Tokens"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Access Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOpenIdToken",
+                    "context": "getter",
+                    "details": {
+                        "name": "Get OpenId Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Token"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "OpenId Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetOpenIdToken",
+                    "context": "setter",
+                    "details": {
+                        "name": "Set OpenId Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Token"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "OpenId Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetRefreshToken",
+                    "context": "getter",
+                    "details": {
+                        "name": "Get Refresh Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Token"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Refresh Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetRefreshToken",
+                    "context": "setter",
+                    "details": {
+                        "name": "Set Refresh Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Token"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Refresh Token"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names
index 005a2d564e..c5fc0fe1f3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names
@@ -1,12 +1,99 @@
 {
     "entries": [
         {
-            "key": "AxisType",
+            "base": "AxisType",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "AxisType"
-            }
+                "name": "Axis Type",
+                "category": "Constants"
+            },
+            "methods": [
+                {
+                    "base": "GetZNegative",
+                    "details": {
+                        "name": "Get -Z"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "-Z"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetZPositive",
+                    "details": {
+                        "name": "Get +Z"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "+Z"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetYPositive",
+                    "details": {
+                        "name": "Get +Y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "+Y"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetXNegative",
+                    "details": {
+                        "name": "Get -X"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "-X"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetXPositive",
+                    "details": {
+                        "name": "Get +X"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "+X"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetYNegative",
+                    "details": {
+                        "name": "Get -Y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "-Y"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names
new file mode 100644
index 0000000000..b78273d630
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names
@@ -0,0 +1,141 @@
+{
+    "entries": [
+        {
+            "base": "AzFramework::SurfaceData::SurfacePoint",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Surface Point",
+                "category": "Surface Data"
+            },
+            "methods": [
+                {
+                    "base": "Getposition",
+                    "details": {
+                        "name": "Get Position"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setposition",
+                    "details": {
+                        "name": "Set Position"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getnormal",
+                    "details": {
+                        "name": "Get Normal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Normal"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setnormal",
+                    "details": {
+                        "name": "Set Normal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Normal"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetsurfaceTags",
+                    "details": {
+                        "name": "Get Surface Tags"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}",
+                            "details": {
+                                "name": "Surface Tags"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetsurfaceTags",
+                    "details": {
+                        "name": "Set Surface Tags"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        },
+                        {
+                            "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}",
+                            "details": {
+                                "name": "Surface Tags"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names
new file mode 100644
index 0000000000..04aa2f21c2
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names
@@ -0,0 +1,105 @@
+{
+    "entries": [
+        {
+            "base": "BlastActorData",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Actor Data",
+                "category": "Blast"
+            },
+            "methods": [
+                {
+                    "base": "GetEntityId",
+                    "details": {
+                        "name": "Get Entity Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+                            "details": {
+                                "name": "Blast Actor Data*",
+                                "tooltip": "Represents Blast Actor in a Script Canvas friendly format."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetEntityId",
+                    "details": {
+                        "name": "Set Entity Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+                            "details": {
+                                "name": "Blast Actor Data*",
+                                "tooltip": "Represents Blast Actor in a Script Canvas friendly format."
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetIsStatic",
+                    "details": {
+                        "name": "Get Is Static"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+                            "details": {
+                                "name": "Blast Actor Data*",
+                                "tooltip": "Represents Blast Actor in a Script Canvas friendly format."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Static"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetIsStatic",
+                    "details": {
+                        "name": "Set Is Static"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+                            "details": {
+                                "name": "Blast Actor Data*",
+                                "tooltip": "Represents Blast Actor in a Script Canvas friendly format."
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Static"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names
index 640613b7b0..61b54272a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "BlendShapeAnimationData",
+            "base": "BlendShapeAnimationData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names
index f450864610..b83eb56d2a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names
@@ -1,45 +1,45 @@
 {
     "entries": [
         {
-            "key": "BlendShapeData",
+            "base": "BlendShapeData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "BlendShapeData"
+                "name": "Blend Shape Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetUV",
+                    "base": "GetUV",
                     "context": "BlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUV"
+                        "tooltip": "When signaled, this will invoke Get UV"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUV is invoked"
+                        "tooltip": "Signaled after Get UV is invoked"
                     },
                     "details": {
-                        "name": "BlendShapeData::GetUV",
-                        "category": "Other"
+                        "name": "Get UV"
                     },
                     "params": [
                         {
                             "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}",
                             "details": {
-                                "name": "BlendShapeData*"
+                                "name": "Blend Shape Data"
                             }
                         },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Vertex Index"
                             }
                         },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "UV Set Index"
                             }
                         }
                     ],
@@ -47,37 +47,36 @@
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "const Vector2&"
+                                "name": "UV"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTangent",
+                    "base": "GetTangent",
                     "context": "BlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTangent"
+                        "tooltip": "When signaled, this will invoke Get Tangent"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTangent is invoked"
+                        "tooltip": "Signaled after Get Tangent is invoked"
                     },
                     "details": {
-                        "name": "BlendShapeData::GetTangent",
-                        "category": "Other"
+                        "name": "Get Tangent"
                     },
                     "params": [
                         {
                             "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}",
                             "details": {
-                                "name": "const BlendShapeData&"
+                                "name": "Blend Shape Data"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         }
                     ],
@@ -85,37 +84,36 @@
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4"
+                                "name": "Tangents"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBitangent",
+                    "base": "GetBitangent",
                     "context": "BlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBitangent"
+                        "tooltip": "When signaled, this will invoke Get Bitangent"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBitangent is invoked"
+                        "tooltip": "Signaled after Get Bitangent is invoked"
                     },
                     "details": {
-                        "name": "BlendShapeData::GetBitangent",
-                        "category": "Other"
+                        "name": "Get Bi-Tangent"
                     },
                     "params": [
                         {
                             "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}",
                             "details": {
-                                "name": "const BlendShapeData&"
+                                "name": "Blend Shape Data"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         }
                     ],
@@ -123,43 +121,42 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Bi-Tangent"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "context": "BlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColor"
+                        "tooltip": "When signaled, this will invoke Get Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColor is invoked"
+                        "tooltip": "Signaled after Get Color is invoked"
                     },
                     "details": {
-                        "name": "BlendShapeData::GetColor",
-                        "category": "Other"
+                        "name": "Get Color"
                     },
                     "params": [
                         {
                             "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}",
                             "details": {
-                                "name": "const BlendShapeData&"
+                                "name": "Blend Shape Data"
                             }
                         },
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "unsigned char"
+                                "name": "Color Set Index"
                             }
                         },
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "unsigned char"
+                                "name": "Color Index"
                             }
                         }
                     ],
@@ -167,7 +164,7 @@
                         {
                             "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}",
                             "details": {
-                                "name": "SceneAPI::DataTypes::Color"
+                                "name": "Color"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names
index 2d4d4c2f92..b7bee4aee2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names
@@ -1,39 +1,39 @@
 {
     "entries": [
         {
-            "key": "BlendShapeDataFace",
+            "base": "BlendShapeDataFace",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "BlendShapeDataFace"
+                "name": "Blend Shape Data Face",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetVertexIndex",
+                    "base": "GetVertexIndex",
                     "context": "BlendShapeDataFace",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetVertexIndex"
+                        "tooltip": "When signaled, this will invoke Get Vertex Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetVertexIndex is invoked"
+                        "tooltip": "Signaled after Get Vertex Index is invoked"
                     },
                     "details": {
-                        "name": "BlendShapeDataFace::GetVertexIndex",
-                        "category": "Other"
+                        "name": "Get Vertex Index"
                     },
                     "params": [
                         {
                             "typeid": "{C972EC9A-3A5C-47CD-9A92-ECB4C0C0451C}",
                             "details": {
-                                "name": "const SceneAPI::DataTypes::IBlendShapeData::Face&"
+                                "name": "Blend Shape Data Face"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Face Index"
                             }
                         }
                     ],
@@ -41,7 +41,7 @@
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Vertex Index"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names
index b5cad7c12d..67818b0d8d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names
@@ -1,12 +1,59 @@
 {
     "entries": [
         {
-            "key": "BoxShapeConfig",
+            "base": "BoxShapeConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "BoxShapeConfig"
-            }
+                "name": "Box Shape Config",
+                "category": "Rendering/Shapes"
+            },
+            "methods": [
+                {
+                    "base": "GetDimensions",
+                    "details": {
+                        "name": "Get Dimensions"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F034FBA2-AC2F-4E66-8152-14DFB90D6283}",
+                            "details": {
+                                "name": "Box Shape Config",
+                                "tooltip": "Box shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Dimensions"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetDimensions",
+                    "details": {
+                        "name": "Set Dimensions"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F034FBA2-AC2F-4E66-8152-14DFB90D6283}",
+                            "details": {
+                                "name": "Box Shape Config",
+                                "tooltip": "Box shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Dimensions"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names
index 1b0a02f28e..7a687e359e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CameraComponent",
+            "base": "CameraComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names
index 5172f2b9b9..8b96624e57 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names
@@ -1,12 +1,103 @@
 {
     "entries": [
         {
-            "key": "CapsuleShapeConfig",
+            "base": "CapsuleShapeConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "CapsuleShapeConfig"
-            }
+                "name": "Capsule Shape Config",
+                "category": "Rendering/Shapes"
+            },
+            "methods": [
+                {
+                    "base": "GetHeight",
+                    "details": {
+                        "name": "Get Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}",
+                            "details": {
+                                "name": "Capsule Shape Config",
+                                "tooltip": "Capsule shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetHeight",
+                    "details": {
+                        "name": "Set Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}",
+                            "details": {
+                                "name": "Capsule Shape Config",
+                                "tooltip": "Capsule shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetRadius",
+                    "details": {
+                        "name": "Get Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}",
+                            "details": {
+                                "name": "Capsule Shape Config",
+                                "tooltip": "Capsule shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetRadius",
+                    "details": {
+                        "name": "Set Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}",
+                            "details": {
+                                "name": "Capsule Shape Config",
+                                "tooltip": "Capsule shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names
new file mode 100644
index 0000000000..da4fd03629
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names
@@ -0,0 +1,141 @@
+{
+    "entries": [
+        {
+            "base": "ClientAuthAWSCredentials",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "AWS Client Auth Credentials",
+                "category": "AWS Client Auth"
+            },
+            "methods": [
+                {
+                    "base": "GetAWSAccessKeyId",
+                    "details": {
+                        "name": "Get AWS Access Key Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+                            "details": {
+                                "name": "AWS ClientAuth Credentials"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AWS Access Key Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAWSAccessKeyId",
+                    "details": {
+                        "name": "Set AWS Access Key Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+                            "details": {
+                                "name": "AWS ClientAuth Credentials"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AWS Access Key Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAWSSecretKey",
+                    "details": {
+                        "name": "Get AWS Secret Key"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+                            "details": {
+                                "name": "AWS ClientAuth Credentials"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AWS Secret Key"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAWSSecretKey",
+                    "details": {
+                        "name": "Set AWS Secret Key"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+                            "details": {
+                                "name": "AWS ClientAuth Credentials"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AWS Secret Key"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAWSSessionToken",
+                    "details": {
+                        "name": "Get AWS Session Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+                            "details": {
+                                "name": "AWS ClientAuth Credentials"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AWS Session Token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAWSSessionToken",
+                    "details": {
+                        "name": "Set AWS Session Token"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+                            "details": {
+                                "name": "AWS ClientAuth Credentials"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AWS Session Token"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names
index 3613a3631f..5d4d37d1f3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names
@@ -1,33 +1,32 @@
 {
     "entries": [
         {
-            "key": "CollisionEvent",
+            "base": "CollisionEvent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "CollisionEvent"
+                "name": "Collision Event"
             },
             "methods": [
                 {
-                    "key": "GetBody1EntityId",
+                    "base": "GetBody1EntityId",
                     "context": "CollisionEvent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBody1EntityId"
+                        "tooltip": "When signaled, this will invoke Get Body 1 Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBody1EntityId is invoked"
+                        "tooltip": "Signaled after Get Body 1 Entity Id is invoked"
                     },
                     "details": {
-                        "name": "CollisionEvent::Get Body 1 EntityId",
-                        "category": "Other"
+                        "name": "Get Body 1 Entity Id"
                     },
                     "params": [
                         {
                             "typeid": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}",
                             "details": {
-                                "name": "CollisionEvent*"
+                                "name": "Collision Event"
                             }
                         }
                     ],
@@ -35,32 +34,31 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBody2EntityId",
+                    "base": "GetBody2EntityId",
                     "context": "CollisionEvent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBody2EntityId"
+                        "tooltip": "When signaled, this will invoke Get Body 2 Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBody2EntityId is invoked"
+                        "tooltip": "Signaled after Get Body 2 Entity Id is invoked"
                     },
                     "details": {
-                        "name": "CollisionEvent::Get Body 2 EntityId",
-                        "category": "Other"
+                        "name": "Get Body 2 Entity Id"
                     },
                     "params": [
                         {
                             "typeid": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}",
                             "details": {
-                                "name": "CollisionEvent*"
+                                "name": "Collision Event"
                             }
                         }
                     ],
@@ -68,11 +66,33 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
+                },
+                {
+                    "base": "GetContacts",
+                    "details": {
+                        "name": "Get Contacts"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}",
+                            "details": {
+                                "name": "Collision Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{009022A1-16A5-50B0-958F-F69C729985A3}",
+                            "details": {
+                                "name": "Contacts"
+                            }
+                        }
+                    ]
                 }
             ]
         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names
index ba4a63ebe2..2892f8b5c5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CollisionGroup",
+            "base": "CollisionGroup",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names
index b9a8574451..32213e9d4b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names
@@ -1,34 +1,33 @@
 {
     "entries": [
         {
-            "key": "ComponentId",
+            "base": "ComponentId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "ComponentID",
+                "name": "Component Id",
                 "category": "Entity"
             },
             "methods": [
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "ComponentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsValid"
+                        "tooltip": "When signaled, this will invoke Is Valid"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsValid is invoked"
+                        "tooltip": "Signaled after Is Valid is invoked"
                     },
                     "details": {
-                        "name": "ComponentId::IsValid",
-                        "category": "Entity"
+                        "name": "Is Valid"
                     },
                     "params": [
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId*"
+                                "name": "Behavior Component Id*"
                             }
                         }
                     ],
@@ -36,13 +35,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Valid"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "ComponentId",
                     "entry": {
                         "name": "In",
@@ -53,20 +52,19 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "ComponentId::Equal",
-                        "category": "Entity"
+                        "name": "Equal"
                     },
                     "params": [
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId*"
+                                "name": "Behavior Component Id"
                             }
                         },
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "const BehaviorComponentId&"
+                                "name": "Behavior Component Id"
                             }
                         }
                     ],
@@ -74,31 +72,30 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Equal"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "ComponentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "ComponentId::ToString",
-                        "category": "Entity"
+                        "name": "To String"
                     },
                     "params": [
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId*"
+                                "name": "Behavior Component Id*"
                             }
                         }
                     ],
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names
index 0e0fdad150..e51e6c292b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ConstantGradientComponent",
+            "base": "ConstantGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names
index ed5c46c4fa..c7110f1a52 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ConstantGradientConfig",
+            "base": "ConstantGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names
index 068759089b..515acd65a8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names
@@ -1,12 +1,183 @@
 {
     "entries": [
         {
-            "key": "Contact",
+            "base": "Contact",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Contact"
-            }
+                "name": "Contact",
+                "category": "Physics"
+            },
+            "methods": [
+                {
+                    "base": "GetPosition",
+                    "details": {
+                        "name": "Get Position"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPosition",
+                    "details": {
+                        "name": "Set Position"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetNormal",
+                    "details": {
+                        "name": "Get Normal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetNormal",
+                    "details": {
+                        "name": "Set Normal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetImpulse",
+                    "details": {
+                        "name": "Get Impulse"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetImpulse",
+                    "details": {
+                        "name": "Set Impulse"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSeparation",
+                    "details": {
+                        "name": "Get Separation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSeparation",
+                    "details": {
+                        "name": "Set Separation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+                            "details": {
+                                "name": "Contact"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names
index 39791a3b8b..aae928f16f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CryRange",
+            "base": "CryRange",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names
index 633933e188..47a676caf5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names
@@ -1,12 +1,103 @@
 {
     "entries": [
         {
-            "key": "CylinderShapeConfig",
+            "base": "CylinderShapeConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "CylinderShapeConfig"
-            }
+                "name": "Cylinder Shape Config",
+                "category": "Rendering/Shapes"
+            },
+            "methods": [
+                {
+                    "base": "GetHeight",
+                    "details": {
+                        "name": "Get Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}",
+                            "details": {
+                                "name": "Cylinder Shape Config",
+                                "tooltip": "Cylinder shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetHeight",
+                    "details": {
+                        "name": "Set Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}",
+                            "details": {
+                                "name": "Cylinder Shape Config",
+                                "tooltip": "Cylinder shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetRadius",
+                    "details": {
+                        "name": "Get Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}",
+                            "details": {
+                                "name": "Cylinder Shape Config",
+                                "tooltip": "Cylinder shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetRadius",
+                    "details": {
+                        "name": "Set Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}",
+                            "details": {
+                                "name": "Cylinder Shape Config",
+                                "tooltip": "Cylinder shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names
index 82cd174850..c23fa14503 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names
@@ -1,12 +1,59 @@
 {
     "entries": [
         {
-            "key": "DiskShapeConfig",
+            "base": "DiskShapeConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "DiskShapeConfig"
-            }
+                "name": "Disk Shape Config",
+                "category": "Rendering/Shapes"
+            },
+            "methods": [
+                {
+                    "base": "GetRadius",
+                    "details": {
+                        "name": "Get Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{24EC2919-F198-4871-8404-F6DE8A16275E}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Disk shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetRadius",
+                    "details": {
+                        "name": "Set Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{24EC2919-F198-4871-8404-F6DE8A16275E}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Disk shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names
index 6911c3d15e..2addd0d656 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "DisplaySettingsState",
+            "base": "DisplaySettingsState",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "DisplaySettingsState",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names
index 36d4024bce..e3b269f248 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "DitherGradientComponent",
+            "base": "DitherGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names
index bdbf4d34e4..94ee3bc7c7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "DitherGradientConfig",
+            "base": "DitherGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names
index 9ff8e9933c..d07b60cb07 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorActorComponent",
+            "base": "EditorActorComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names
index ad933a1918..23724acac1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorCameraComponent",
+            "base": "EditorCameraComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names
index f8cdb2e825..415af30964 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorLayerComponent",
+            "base": "EditorLayerComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateLayerEntityFromName",
+                    "base": "CreateLayerEntityFromName",
                     "context": "EditorLayerComponent",
                     "entry": {
                         "name": "In",
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "RecoverLayer",
+                    "base": "RecoverLayer",
                     "context": "EditorLayerComponent",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names
index fbb74f130d..5b20e07711 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorMaterialComponentSlot",
+            "base": "EditorMaterialComponentSlot",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names
index 32e5072aa2..7e29d2e3cb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorSequenceComponent",
+            "base": "EditorSequenceComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names
index 8ae6402242..fa1366b36a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorSimpleMotionComponent",
+            "base": "EditorSimpleMotionComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names
index 11b6390631..cb681cedbd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorTransformBus",
+            "base": "EditorTransformBus",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names
index 86c3415b37..389c88d709 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names	
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names	
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Entity Transform",
+            "base": "Entity Transform",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Rotate",
+                    "base": "Rotate",
                     "context": "Entity Transform",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names
index 258e490a4e..22a3a46c7c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names
@@ -1,41 +1,41 @@
 {
     "entries": [
         {
-            "key": "Entity",
+            "base": "Entity",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Entity",
+                "name": "Behavior Entity",
                 "category": "Entity"
             },
             "methods": [
                 {
-                    "key": "GetComponentName",
+                    "base": "GetComponentName",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetComponentName"
+                        "tooltip": "When signaled, this will invoke Get Component Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetComponentName is invoked"
+                        "tooltip": "Signaled after Get Component Name is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetComponentName",
-                        "category": "Entity"
+                        "name": "Get Component Name",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId"
+                                "name": "Behavior Component Id"
                             }
                         }
                     ],
@@ -43,38 +43,38 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::vector<AZ::u64, allocator>"
+                                "name": "Component Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetComponentType",
+                    "base": "GetComponentType",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetComponentType"
+                        "tooltip": "When signaled, this will invoke Get Component Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetComponentType is invoked"
+                        "tooltip": "Signaled after Get Component Type is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetComponentType",
-                        "category": "Entity"
+                        "name": "Get Component Type",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId"
+                                "name": "Behavior Component Id"
                             }
                         }
                     ],
@@ -82,44 +82,44 @@
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "Uuid"
+                                "name": "Type"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateComponent",
+                    "base": "CreateComponent",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateComponent"
+                        "tooltip": "When signaled, this will invoke Create Component"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateComponent is invoked"
+                        "tooltip": "Signaled after Create Component is invoked"
                     },
                     "details": {
-                        "name": "Entity::CreateComponent",
-                        "category": "Entity"
+                        "name": "Create Component",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "const AZ::Uuid&"
+                                "name": "Component Type"
                             }
                         },
                         {
                             "typeid": "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}",
                             "details": {
-                                "name": "const ComponentConfig*"
+                                "name": "Component Config*"
                             }
                         }
                     ],
@@ -127,38 +127,38 @@
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "Number"
+                                "name": "Behavior Component Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DestroyComponent",
+                    "base": "DestroyComponent",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DestroyComponent"
+                        "tooltip": "When signaled, this will invoke Destroy Component"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DestroyComponent is invoked"
+                        "tooltip": "Signaled after Destroy Component is invoked"
                     },
                     "details": {
-                        "name": "Entity::DestroyComponent",
-                        "category": "Entity"
+                        "name": "Destroy Component",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId"
+                                "name": "Behavior Component Id"
                             }
                         }
                     ],
@@ -166,38 +166,38 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "FindComponentOfType",
+                    "base": "FindComponentOfType",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindComponentOfType"
+                        "tooltip": "When signaled, this will invoke Find Component Of Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindComponentOfType is invoked"
+                        "tooltip": "Signaled after Find Component Of Type is invoked"
                     },
                     "details": {
-                        "name": "Entity::FindComponentOfType",
-                        "category": "Entity"
+                        "name": "Find Component Of Type",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "const AZ::Uuid&"
+                                "name": "Component Type"
                             }
                         }
                     ],
@@ -205,44 +205,44 @@
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "Component ID"
+                                "name": "Behavior Component Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetComponentConfiguration",
+                    "base": "SetComponentConfiguration",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetComponentConfiguration"
+                        "tooltip": "When signaled, this will invoke Set Component Configuration"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetComponentConfiguration is invoked"
+                        "tooltip": "Signaled after Set Component Configuration is invoked"
                     },
                     "details": {
-                        "name": "Entity::SetComponentConfiguration",
-                        "category": "Entity"
+                        "name": "Set Component Configuration",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId"
+                                "name": "Behavior Component Id"
                             }
                         },
                         {
                             "typeid": "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}",
                             "details": {
-                                "name": "const ComponentConfig&"
+                                "name": "Component Config"
                             }
                         }
                     ],
@@ -250,31 +250,31 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsValid"
+                        "tooltip": "When signaled, this will invoke Is Valid"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsValid is invoked"
+                        "tooltip": "Signaled after Is Valid is invoked"
                     },
                     "details": {
-                        "name": "Entity::IsValid",
-                        "category": "Entity/Game Entity"
+                        "name": "Is Valid",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "EntityID",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -283,13 +283,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Valid"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
@@ -300,14 +300,14 @@
                         "tooltip": "Signaled after GetId is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetId",
-                        "category": "Entity"
+                        "name": "Get Id",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -316,14 +316,14 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityID",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOwningContextId",
+                    "base": "GetOwningContextId",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
@@ -334,14 +334,13 @@
                         "tooltip": "Signaled after GetOwningContextId is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetOwningContextId",
-                        "category": "Entity"
+                        "name": "Get Owning Context Id"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -350,31 +349,31 @@
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "Uuid"
+                                "name": "Context Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetComponents",
+                    "base": "GetComponents",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetComponents"
+                        "tooltip": "When signaled, this will invoke Get Components"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetComponents is invoked"
+                        "tooltip": "Signaled after Get Components is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetComponents",
-                        "category": "Entity"
+                        "name": "Get Components",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -389,32 +388,32 @@
                     ]
                 },
                 {
-                    "key": "FindAllComponentsOfType",
+                    "base": "FindAllComponentsOfType",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindAllComponentsOfType"
+                        "tooltip": "When signaled, this will invoke Find All Components Of Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindAllComponentsOfType is invoked"
+                        "tooltip": "Signaled after Find All Components Of Type is invoked"
                     },
                     "details": {
-                        "name": "Entity::FindAllComponentsOfType",
-                        "category": "Entity"
+                        "name": "Find All Components Of Type",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "const AZ::Uuid&"
+                                "name": "Component Type"
                             }
                         }
                     ],
@@ -422,44 +421,44 @@
                         {
                             "typeid": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                             "details": {
-                                "name": "AZStd::vector<AZ::u64, allocator>"
+                                "name": "Components"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetComponentConfiguration",
+                    "base": "GetComponentConfiguration",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetComponentConfiguration"
+                        "tooltip": "When signaled, this will invoke Get Component Configuration"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetComponentConfiguration is invoked"
+                        "tooltip": "Signaled after Get Component Configuration is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetComponentConfiguration",
-                        "category": "Entity"
+                        "name": "Get Component Configuration",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
                             "details": {
-                                "name": "BehaviorComponentId"
+                                "name": "Behavior Component Id"
                             }
                         },
                         {
                             "typeid": "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}",
                             "details": {
-                                "name": "ComponentConfig&"
+                                "name": "Component Config"
                             }
                         }
                     ],
@@ -467,62 +466,62 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetName",
+                    "base": "SetName",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetName"
+                        "tooltip": "When signaled, this will invoke Set Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetName is invoked"
+                        "tooltip": "Signaled after Set Name is invoked"
                     },
                     "details": {
-                        "name": "Entity::SetName",
-                        "category": "Entity"
+                        "name": "Set Name",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsActivated",
+                    "base": "IsActivated",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsActivated"
+                        "tooltip": "When signaled, this will invoke Is Activated"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsActivated is invoked"
+                        "tooltip": "Signaled after Is Activated is invoked"
                     },
                     "details": {
-                        "name": "Entity::IsActivated",
-                        "category": "Entity"
+                        "name": "Is Activated",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -531,13 +530,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Activated"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Activate",
+                    "base": "Activate",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
@@ -548,21 +547,21 @@
                         "tooltip": "Signaled after Activate is invoked"
                     },
                     "details": {
-                        "name": "Entity::Activate",
-                        "category": "Entity"
+                        "name": "Activate",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Deactivate",
+                    "base": "Deactivate",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
@@ -573,39 +572,39 @@
                         "tooltip": "Signaled after Deactivate is invoked"
                     },
                     "details": {
-                        "name": "Entity::Deactivate",
-                        "category": "Entity"
+                        "name": "Deactivate",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetName",
+                    "base": "GetName",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetName"
+                        "tooltip": "When signaled, this will invoke Get Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetName is invoked"
+                        "tooltip": "Signaled after Get Name is invoked"
                     },
                     "details": {
-                        "name": "Entity::GetName",
-                        "category": "Entity"
+                        "name": "GetName",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -614,13 +613,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "String"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Exists",
+                    "base": "Exists",
                     "context": "Entity",
                     "entry": {
                         "name": "In",
@@ -631,14 +630,14 @@
                         "tooltip": "Signaled after Exists is invoked"
                     },
                     "details": {
-                        "name": "Entity::Exists",
-                        "category": "Entity"
+                        "name": "Exists",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
                             "details": {
-                                "name": "BehaviorEntity*",
+                                "name": "Behavior Entity",
                                 "tooltip": "Entity"
                             }
                         }
@@ -647,7 +646,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Exists"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names
index 65f9f52bd9..50268aecb5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EntityComponentIdPair",
+            "base": "EntityComponentIdPair",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetEntityId",
+                    "base": "GetEntityId",
                     "context": "EntityComponentIdPair",
                     "entry": {
                         "name": "In",
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "EntityComponentIdPair",
                     "entry": {
                         "name": "In",
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "EntityComponentIdPair",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names
index fe98c15e8c..ea810ec9f0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EntityEntity_VM",
+            "base": "EntityEntity_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "EntityEntity_VM",
                     "entry": {
                         "name": "In",
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "EntityEntity_VM",
                     "entry": {
                         "name": "In",
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "GetEntityForward",
+                    "base": "GetEntityForward",
                     "context": "EntityEntity_VM",
                     "entry": {
                         "name": "In",
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "key": "IsActive",
+                    "base": "IsActive",
                     "context": "EntityEntity_VM",
                     "entry": {
                         "name": "In",
@@ -147,7 +147,7 @@
                     ]
                 },
                 {
-                    "key": "GetEntityRight",
+                    "base": "GetEntityRight",
                     "context": "EntityEntity_VM",
                     "entry": {
                         "name": "In",
@@ -186,7 +186,7 @@
                     ]
                 },
                 {
-                    "key": "GetEntityUp",
+                    "base": "GetEntityUp",
                     "context": "EntityEntity_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityTransform.names
new file mode 100644
index 0000000000..d86c656b89
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityTransform.names
@@ -0,0 +1,46 @@
+{
+    "entries": [
+        {
+            "base": "Entity Transform",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Entity Transform",
+                "category": "Entity/Transform"
+            },
+            "methods": [
+                {
+                    "base": "Rotate",
+                    "context": "Entity Transform",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Rotate"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Rotate is invoked"
+                    },
+                    "details": {
+                        "name": "Rotate"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity",
+                                "tooltip": "The entity to apply the rotation on."
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Euler Angles",
+                                "tooltip": "Euler angles, Pitch/Yaw/Roll."
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names
index c536170171..3389be627a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EntityType",
+            "base": "EntityType",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names
index 121cf63347..a6a5e8142a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ExecutionStateInterpretedPerActivation",
+            "base": "ExecutionStateInterpretedPerActivation",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names
index f0138954e0..416c6b2f5b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ExecutionStateInterpretedPerActivationOnGraphStart",
+            "base": "ExecutionStateInterpretedPerActivationOnGraphStart",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names
index fdd633d126..0dd0d06720 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ExecutionStateInterpretedPure",
+            "base": "ExecutionStateInterpretedPure",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names
index c979b46dbd..94204607cc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ExecutionStateInterpretedPureOnGraphStart",
+            "base": "ExecutionStateInterpretedPureOnGraphStart",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names
index 3fa218a880..3303bba243 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ExecutionStateInterpretedSingleton",
+            "base": "ExecutionStateInterpretedSingleton",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names
index a8035016f6..ed46be444d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names
@@ -1,12 +1,225 @@
 {
     "entries": [
         {
-            "key": "ExportProduct",
+            "base": "ExportProduct",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "ExportProduct"
-            }
+                "name": "Export Product",
+                "category": "Scene"
+            },
+            "methods": [
+                {
+                    "base": "GetsubId",
+                    "details": {
+                        "name": "Getsub Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetsubId",
+                    "details": {
+                        "name": "Setsub Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        },
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetproductDependencies",
+                    "details": {
+                        "name": "Getproduct Dependencies"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
+                            "details": {
+                                "name": "AZ Std::vector< SceneAPI:: Events:: Export Product, allocator>&"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetproductDependencies",
+                    "details": {
+                        "name": "Setproduct Dependencies"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        },
+                        {
+                            "typeid": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
+                            "details": {
+                                "name": "const AZ Std::vector< SceneAPI:: Events:: Export Product, allocator>"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetassetType",
+                    "details": {
+                        "name": "Getasset Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetassetType",
+                    "details": {
+                        "name": "Setasset Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        },
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getfilename",
+                    "details": {
+                        "name": "Getfilename"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setfilename",
+                    "details": {
+                        "name": "Setfilename"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetsourceId",
+                    "details": {
+                        "name": "Getsource Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetsourceId",
+                    "details": {
+                        "name": "Setsource Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
+                            "details": {
+                                "name": "SceneAPI:: Events:: Export Product*"
+                            }
+                        },
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names
index e2dac48874..c70e872bf5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names
@@ -1,107 +1,97 @@
 {
     "entries": [
         {
-            "key": "ExportProductList",
+            "base": "ExportProductList",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "ExportProductList"
+                "name": "Export Product List",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "AddProduct",
+                    "base": "AddProduct",
                     "context": "ExportProductList",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke AddProduct"
+                        "tooltip": "When signaled, this will invoke Add Product"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after AddProduct is invoked"
+                        "tooltip": "Signaled after Add Product is invoked"
                     },
                     "details": {
-                        "name": "ExportProductList::AddProduct",
-                        "category": "Other"
+                        "name": "Add Product"
                     },
                     "params": [
                         {
                             "typeid": "{1C76A51F-431B-4987-B653-CFCC940D0D0F}",
                             "details": {
-                                "name": "SceneAPI::Events::ExportProductList&"
+                                "name": ""
                             }
                         },
                         {
                             "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
                             "details": {
-                                "name": "SceneAPI::Events::ExportProduct&"
+                                "name": ""
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetProducts",
+                    "base": "GetProducts",
                     "context": "ExportProductList",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetProducts"
+                        "tooltip": "When signaled, this will invoke Get Products"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetProducts is invoked"
+                        "tooltip": "Signaled after Get Products is invoked"
                     },
                     "details": {
-                        "name": "ExportProductList::GetProducts",
-                        "category": "Other"
+                        "name": "Get Products"
                     },
-                    "params": [
-                        {
-                            "typeid": "{1C76A51F-431B-4987-B653-CFCC940D0D0F}",
-                            "details": {
-                                "name": "SceneAPI::Events::ExportProductList*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                             "details": {
-                                "name": "const AZStd::vector<SceneAPI::Events::ExportProduct, allocator>"
+                                "name": "const AZ Std::vector< SceneAPI:: Events:: Export Product, allocator>"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AddDependencyToProduct",
+                    "base": "AddDependencyToProduct",
                     "context": "ExportProductList",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke AddDependencyToProduct"
+                        "tooltip": "When signaled, this will invoke Add Dependency To Product"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after AddDependencyToProduct is invoked"
+                        "tooltip": "Signaled after Add Dependency To Product is invoked"
                     },
                     "details": {
-                        "name": "ExportProductList::AddDependencyToProduct",
-                        "category": "Other"
+                        "name": "Add Dependency To Product"
                     },
                     "params": [
                         {
                             "typeid": "{1C76A51F-431B-4987-B653-CFCC940D0D0F}",
                             "details": {
-                                "name": "SceneAPI::Events::ExportProductList*"
+                                "name": ""
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
                             "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}",
                             "details": {
-                                "name": "SceneAPI::Events::ExportProduct&"
+                                "name": ""
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names
index ef15a10176..fc0bf98597 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names
@@ -1,12 +1,266 @@
 {
     "entries": [
         {
-            "key": "ExposureControlConfig",
+            "base": "ExposureControlConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "ExposureControlConfig"
-            }
+                "name": "Exposure Control Config"
+            },
+            "methods": [
+                {
+                    "base": "GetautoExposureSpeedUp",
+                    "details": {
+                        "name": "Get Auto Exposure Speed Up"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Speed Up"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetautoExposureSpeedUp",
+                    "details": {
+                        "name": "Set Auto Exposure Speed Up"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Speed Up"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetautoExposureSpeedDown",
+                    "details": {
+                        "name": "Get Auto Exposure Speed Down"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Speed Down"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetautoExposureSpeedDown",
+                    "details": {
+                        "name": "Setauto Exposure Speed Down"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Exposure Speed Down"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetautoExposureMax",
+                    "details": {
+                        "name": "Get Auto Exposure Max"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Max"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetautoExposureMax",
+                    "details": {
+                        "name": "Set Auto Exposure Max"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Max"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetautoExposureMin",
+                    "details": {
+                        "name": "Get Auto Exposure Min"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Min"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetautoExposureMin",
+                    "details": {
+                        "name": "Set Auto Exposure Min"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Auto Exposure Min"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetexposureControlType",
+                    "details": {
+                        "name": "Get Exposure Control Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Exposure Control Type"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetexposureControlType",
+                    "details": {
+                        "name": "Set Exposure Control Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        },
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Exposure Control Type"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetcompensateValue",
+                    "details": {
+                        "name": "Get Compensate Value"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Compensate Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetcompensateValue",
+                    "details": {
+                        "name": "Set Compensate Value"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Compensate Value"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names
index 686f40b859..27dab194a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GameplayNotificationId",
+            "base": "GameplayNotificationId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "GameplayNotificationId",
                     "entry": {
                         "name": "In",
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "GameplayNotificationId",
                     "entry": {
                         "name": "In",
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "Clone",
+                    "base": "Clone",
                     "context": "GameplayNotificationId",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names
index 233f8b4ba9..8db90358b4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GradientSampleParams",
+            "base": "GradientSampleParams",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names
index ebf2a37da5..681731b74a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names
@@ -1,12 +1,563 @@
 {
     "entries": [
         {
-            "key": "GradientSampler",
+            "base": "GradientSampler",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "GradientSampler"
-            }
+                "name": "Gradient Sampler",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "Getscale",
+                    "details": {
+                        "name": "Getscale"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setscale",
+                    "details": {
+                        "name": "Setscale"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetoutputMin",
+                    "details": {
+                        "name": "Getoutput Min"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetoutputMin",
+                    "details": {
+                        "name": "Setoutput Min"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getrotation",
+                    "details": {
+                        "name": "Getrotation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setrotation",
+                    "details": {
+                        "name": "Setrotation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetinputMin",
+                    "details": {
+                        "name": "Getinput Min"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetinputMin",
+                    "details": {
+                        "name": "Setinput Min"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetinvertInput",
+                    "details": {
+                        "name": "Getinvert Input"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetinvertInput",
+                    "details": {
+                        "name": "Setinvert Input"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetinputMid",
+                    "details": {
+                        "name": "Getinput Mid"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetinputMid",
+                    "details": {
+                        "name": "Setinput Mid"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetenableTransforms",
+                    "details": {
+                        "name": "Getenable Transforms"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetenableTransforms",
+                    "details": {
+                        "name": "Setenable Transforms"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getopacity",
+                    "details": {
+                        "name": "Getopacity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setopacity",
+                    "details": {
+                        "name": "Setopacity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetenableLevels",
+                    "details": {
+                        "name": "Getenable Levels"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetenableLevels",
+                    "details": {
+                        "name": "Setenable Levels"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetinputMax",
+                    "details": {
+                        "name": "Getinput Max"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetinputMax",
+                    "details": {
+                        "name": "Setinput Max"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetoutputMax",
+                    "details": {
+                        "name": "Getoutput Max"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetoutputMax",
+                    "details": {
+                        "name": "Setoutput Max"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Gettranslation",
+                    "details": {
+                        "name": "Gettranslation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Settranslation",
+                    "details": {
+                        "name": "Settranslation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetgradientId",
+                    "details": {
+                        "name": "Getgradient Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetgradientId",
+                    "details": {
+                        "name": "Setgradient Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+                            "details": {
+                                "name": "Gradient Sampler"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names
index 16b8c9437d..dbc0134c40 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GradientSurfaceDataComponent",
+            "base": "GradientSurfaceDataComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names
index c176bcd603..0a488feb78 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GradientSurfaceDataConfig",
+            "base": "GradientSurfaceDataConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "context": "GradientSurfaceDataConfig",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "context": "GradientSurfaceDataConfig",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "context": "GradientSurfaceDataConfig",
                     "entry": {
                         "name": "In",
@@ -109,7 +109,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "context": "GradientSurfaceDataConfig",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names
index 007c0f28a3..f0f587922a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GradientTransformComponent",
+            "base": "GradientTransformComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names
index 8686f131d6..1156dfc75e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GradientTransformConfig",
+            "base": "GradientTransformConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names
index 67c5edb8e7..232ec5f34a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GraphModelSlotId",
+            "base": "GraphModelSlotId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names
index 2dc1fd3ce8..6642870078 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names
@@ -1,71 +1,56 @@
 {
     "entries": [
         {
-            "key": "IAnimationData",
+            "base": "IAnimationData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "IAnimationData"
+                "name": "IAnimation Data",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetKeyFrameCount",
+                    "base": "GetKeyFrameCount",
                     "context": "IAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKeyFrameCount"
+                        "tooltip": "When signaled, this will invoke Get Key Frame Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKeyFrameCount is invoked"
+                        "tooltip": "Signaled after Get Key Frame Count is invoked"
                     },
                     "details": {
-                        "name": "IAnimationData::GetKeyFrameCount",
-                        "category": "Other"
+                        "name": "Get Key Frame Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{62B0571C-6EFF-42FA-902A-85AC744E04F2}",
-                            "details": {
-                                "name": "IAnimationData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKeyFrame",
+                    "base": "GetKeyFrame",
                     "context": "IAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKeyFrame"
+                        "tooltip": "When signaled, this will invoke Get Key Frame"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKeyFrame is invoked"
+                        "tooltip": "Signaled after Get Key Frame is invoked"
                     },
                     "details": {
-                        "name": "IAnimationData::GetKeyFrame",
-                        "category": "Other"
+                        "name": "Get Key Frame"
                     },
                     "params": [
-                        {
-                            "typeid": "{62B0571C-6EFF-42FA-902A-85AC744E04F2}",
-                            "details": {
-                                "name": "IAnimationData*"
-                            }
-                        },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ],
@@ -73,34 +58,25 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "const Matrix 3x 4&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTimeStepBetweenFrames",
+                    "base": "GetTimeStepBetweenFrames",
                     "context": "IAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTimeStepBetweenFrames"
+                        "tooltip": "When signaled, this will invoke Get Time Step Between Frames"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTimeStepBetweenFrames is invoked"
+                        "tooltip": "Signaled after Get Time Step Between Frames is invoked"
                     },
                     "details": {
-                        "name": "IAnimationData::GetTimeStepBetweenFrames",
-                        "category": "Other"
+                        "name": "Get Time Step Between Frames"
                     },
-                    "params": [
-                        {
-                            "typeid": "{62B0571C-6EFF-42FA-902A-85AC744E04F2}",
-                            "details": {
-                                "name": "IAnimationData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names
index a326b0b586..d07ba28e39 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names
@@ -1,36 +1,28 @@
 {
     "entries": [
         {
-            "key": "IBlendShapeAnimationData",
+            "base": "IBlendShapeAnimationData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "IBlendShapeAnimationData"
+                "name": "IBlend Shape Animation Data",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetBlendShapeName",
+                    "base": "GetBlendShapeName",
                     "context": "IBlendShapeAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlendShapeName"
+                        "tooltip": "When signaled, this will invoke Get Blend Shape Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlendShapeName is invoked"
+                        "tooltip": "Signaled after Get Blend Shape Name is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeAnimationData::GetBlendShapeName",
-                        "category": "Other"
+                        "name": "Get Blend Shape Name"
                     },
-                    "params": [
-                        {
-                            "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}",
-                            "details": {
-                                "name": "IBlendShapeAnimationData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
@@ -41,63 +33,47 @@
                     ]
                 },
                 {
-                    "key": "GetKeyFrameCount",
+                    "base": "GetKeyFrameCount",
                     "context": "IBlendShapeAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKeyFrameCount"
+                        "tooltip": "When signaled, this will invoke Get Key Frame Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKeyFrameCount is invoked"
+                        "tooltip": "Signaled after Get Key Frame Count is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeAnimationData::GetKeyFrameCount",
-                        "category": "Other"
+                        "name": "Get Key Frame Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}",
-                            "details": {
-                                "name": "IBlendShapeAnimationData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKeyFrame",
+                    "base": "GetKeyFrame",
                     "context": "IBlendShapeAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKeyFrame"
+                        "tooltip": "When signaled, this will invoke Get Key Frame"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKeyFrame is invoked"
+                        "tooltip": "Signaled after Get Key Frame is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeAnimationData::GetKeyFrame",
-                        "category": "Other"
+                        "name": "Get Key Frame"
                     },
                     "params": [
-                        {
-                            "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}",
-                            "details": {
-                                "name": "IBlendShapeAnimationData*"
-                            }
-                        },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ],
@@ -111,28 +87,19 @@
                     ]
                 },
                 {
-                    "key": "GetTimeStepBetweenFrames",
+                    "base": "GetTimeStepBetweenFrames",
                     "context": "IBlendShapeAnimationData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTimeStepBetweenFrames"
+                        "tooltip": "When signaled, this will invoke Get Time Step Between Frames"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTimeStepBetweenFrames is invoked"
+                        "tooltip": "Signaled after Get Time Step Between Frames is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeAnimationData::GetTimeStepBetweenFrames",
-                        "category": "Other"
+                        "name": "Get Time Step Between Frames"
                     },
-                    "params": [
-                        {
-                            "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}",
-                            "details": {
-                                "name": "IBlendShapeAnimationData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names
index 5c4f91be1a..70210664dc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names
@@ -1,35 +1,29 @@
 {
     "entries": [
         {
-            "key": "IBlendShapeData",
+            "base": "IBlendShapeData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "IBlendShapeData"
+                "name": "IBlend Shape Data",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetNormal",
+                    "base": "GetNormal",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNormal"
+                        "tooltip": "When signaled, this will invoke Get Normal"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNormal is invoked"
+                        "tooltip": "Signaled after Get Normal is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetNormal",
-                        "category": "Other"
+                        "name": "Get Normal"
                     },
                     "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -41,33 +35,26 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFaceVertexIndex",
+                    "base": "GetFaceVertexIndex",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFaceVertexIndex"
+                        "tooltip": "When signaled, this will invoke Get Face Vertex Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFaceVertexIndex is invoked"
+                        "tooltip": "Signaled after Get Face Vertex Index is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetFaceVertexIndex",
-                        "category": "Other"
+                        "name": "Get Face Vertex Index"
                     },
                     "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -91,27 +78,20 @@
                     ]
                 },
                 {
-                    "key": "GetFaceInfo",
+                    "base": "GetFaceInfo",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFaceInfo"
+                        "tooltip": "When signaled, this will invoke Get Face Info"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFaceInfo is invoked"
+                        "tooltip": "Signaled after Get Face Info is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetFaceInfo",
-                        "category": "Other"
+                        "name": "Get Face Info"
                     },
                     "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -123,33 +103,26 @@
                         {
                             "typeid": "{C972EC9A-3A5C-47CD-9A92-ECB4C0C0451C}",
                             "details": {
-                                "name": "const SceneAPI::DataTypes::IBlendShapeData::Face&"
+                                "name": "const SceneAPI:: Data Types::I Blend Shape Data:: Face&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPosition",
+                    "base": "GetPosition",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPosition"
+                        "tooltip": "When signaled, this will invoke Get Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPosition is invoked"
+                        "tooltip": "Signaled after Get Position is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetPosition",
-                        "category": "Other"
+                        "name": "Get Position"
                     },
                     "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -161,33 +134,26 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUsedPointIndexForControlPoint",
+                    "base": "GetUsedPointIndexForControlPoint",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUsedPointIndexForControlPoint"
+                        "tooltip": "When signaled, this will invoke Get Used Point Index For Control Point"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUsedPointIndexForControlPoint is invoked"
+                        "tooltip": "Signaled after Get Used Point Index For Control Point is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetUsedPointIndexForControlPoint",
-                        "category": "Other"
+                        "name": "Get Used Point Index For Control Point"
                     },
                     "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
@@ -205,28 +171,19 @@
                     ]
                 },
                 {
-                    "key": "GetVertexCount",
+                    "base": "GetVertexCount",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetVertexCount"
+                        "tooltip": "When signaled, this will invoke Get Vertex Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetVertexCount is invoked"
+                        "tooltip": "Signaled after Get Vertex Count is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetVertexCount",
-                        "category": "Other"
+                        "name": "Get Vertex Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
@@ -237,28 +194,19 @@
                     ]
                 },
                 {
-                    "key": "GetFaceCount",
+                    "base": "GetFaceCount",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFaceCount"
+                        "tooltip": "When signaled, this will invoke Get Face Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFaceCount is invoked"
+                        "tooltip": "Signaled after Get Face Count is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetFaceCount",
-                        "category": "Other"
+                        "name": "Get Face Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
@@ -269,27 +217,20 @@
                     ]
                 },
                 {
-                    "key": "GetControlPointIndex",
+                    "base": "GetControlPointIndex",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetControlPointIndex"
+                        "tooltip": "When signaled, this will invoke Get Control Point Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetControlPointIndex is invoked"
+                        "tooltip": "Signaled after Get Control Point Index is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetControlPointIndex",
-                        "category": "Other"
+                        "name": "Get Control Point Index"
                     },
                     "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
@@ -307,33 +248,24 @@
                     ]
                 },
                 {
-                    "key": "GetUsedControlPointCount",
+                    "base": "GetUsedControlPointCount",
                     "context": "IBlendShapeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUsedControlPointCount"
+                        "tooltip": "When signaled, this will invoke Get Used Control Point Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUsedControlPointCount is invoked"
+                        "tooltip": "Signaled after Get Used Control Point Count is invoked"
                     },
                     "details": {
-                        "name": "IBlendShapeData::GetUsedControlPointCount",
-                        "category": "Other"
+                        "name": "Get Used Control Point Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}",
-                            "details": {
-                                "name": "IBlendShapeData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names
index a330f6bdae..b804be2319 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "IGraphObject",
+            "base": "IGraphObject",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names
index 608c225f3d..fa7950a47c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names
@@ -1,36 +1,28 @@
 {
     "entries": [
         {
-            "key": "IMeshData",
+            "base": "IMeshData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "IMeshData"
+                "name": "IMesh Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetUnitSizeInMeters",
+                    "base": "GetUnitSizeInMeters",
                     "context": "IMeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUnitSizeInMeters"
+                        "tooltip": "When signaled, this will invoke Get Unit Size In Meters"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUnitSizeInMeters is invoked"
+                        "tooltip": "Signaled after Get Unit Size In Meters is invoked"
                     },
                     "details": {
-                        "name": "IMeshData::GetUnitSizeInMeters",
-                        "category": "Other"
+                        "name": "Get Unit Size In Meters"
                     },
-                    "params": [
-                        {
-                            "typeid": "{B94A59C0-F3A5-40A0-B541-7E36B6576C4A}",
-                            "details": {
-                                "name": "IMeshData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
@@ -41,28 +33,19 @@
                     ]
                 },
                 {
-                    "key": "GetOriginalUnitSizeInMeters",
+                    "base": "GetOriginalUnitSizeInMeters",
                     "context": "IMeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOriginalUnitSizeInMeters"
+                        "tooltip": "When signaled, this will invoke Get Original Unit Size In Meters"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOriginalUnitSizeInMeters is invoked"
+                        "tooltip": "Signaled after Get Original Unit Size In Meters is invoked"
                     },
                     "details": {
-                        "name": "IMeshData::GetOriginalUnitSizeInMeters",
-                        "category": "Other"
+                        "name": "Get Original Unit Size In Meters"
                     },
-                    "params": [
-                        {
-                            "typeid": "{B94A59C0-F3A5-40A0-B541-7E36B6576C4A}",
-                            "details": {
-                                "name": "IMeshData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names
index 186eee8f38..194c7eb028 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ImageGradientComponent",
+            "base": "ImageGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names
index d774b0d054..75e0b09edf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ImageGradientConfig",
+            "base": "ImageGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names
index 69ce4ef1ce..868a2eba61 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names
@@ -1,12 +1,449 @@
 {
     "entries": [
         {
-            "key": "InputDeviceGamepad",
+            "base": "InputDeviceGamepad",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "InputDeviceGamepad"
-            }
+                "name": "Input Device Gamepad",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "gamepad_button_l3",
+                    "details": {
+                        "name": "gamepad_button_l3"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r_x",
+                    "details": {
+                        "name": "gamepad_thumbstick_r_x"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l_up",
+                    "details": {
+                        "name": "gamepad_thumbstick_l_up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_trigger_l2",
+                    "details": {
+                        "name": "gamepad_trigger_l2"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_r3",
+                    "details": {
+                        "name": "gamepad_button_r3"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r_left",
+                    "details": {
+                        "name": "gamepad_thumbstick_r_left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_r1",
+                    "details": {
+                        "name": "gamepad_button_r1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_b",
+                    "details": {
+                        "name": "gamepad_button_b"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l",
+                    "details": {
+                        "name": "gamepad_thumbstick_l"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_d_right",
+                    "details": {
+                        "name": "gamepad_button_d_right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r_up",
+                    "details": {
+                        "name": "gamepad_thumbstick_r_up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r_y",
+                    "details": {
+                        "name": "gamepad_thumbstick_r_y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l_left",
+                    "details": {
+                        "name": "gamepad_thumbstick_l_left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r",
+                    "details": {
+                        "name": "gamepad_thumbstick_r"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r_right",
+                    "details": {
+                        "name": "gamepad_thumbstick_r_right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_d_up",
+                    "details": {
+                        "name": "gamepad_button_d_up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l_x",
+                    "details": {
+                        "name": "gamepad_thumbstick_l_x"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_d_down",
+                    "details": {
+                        "name": "gamepad_button_d_down"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_select",
+                    "details": {
+                        "name": "gamepad_button_select"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_y",
+                    "details": {
+                        "name": "gamepad_button_y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l_right",
+                    "details": {
+                        "name": "gamepad_thumbstick_l_right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_l1",
+                    "details": {
+                        "name": "gamepad_button_l1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l_down",
+                    "details": {
+                        "name": "gamepad_thumbstick_l_down"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_start",
+                    "details": {
+                        "name": "gamepad_button_start"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_x",
+                    "details": {
+                        "name": "gamepad_button_x"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_d_left",
+                    "details": {
+                        "name": "gamepad_button_d_left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_trigger_r2",
+                    "details": {
+                        "name": "gamepad_trigger_r2"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_button_a",
+                    "details": {
+                        "name": "gamepad_button_a"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_r_down",
+                    "details": {
+                        "name": "gamepad_thumbstick_r_down"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gamepad_thumbstick_l_y",
+                    "details": {
+                        "name": "gamepad_thumbstick_l_y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names
new file mode 100644
index 0000000000..4cd51e56c9
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names
@@ -0,0 +1,113 @@
+{
+    "entries": [
+        {
+            "base": "InputDeviceGestures",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Input Device Gestures",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "gesture_swipe",
+                    "details": {
+                        "name": "gesture_swipe"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gesture_rotate",
+                    "details": {
+                        "name": "gesture_rotate"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gesture_hold",
+                    "details": {
+                        "name": "gesture_hold"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gesture_pinch",
+                    "details": {
+                        "name": "gesture_pinch"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gesture_double_press",
+                    "details": {
+                        "name": "gesture_double_press"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "gesture_drag",
+                    "details": {
+                        "name": "gesture_drag"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names
index f041229250..2df09ea536 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names
@@ -1,12 +1,1597 @@
 {
     "entries": [
         {
-            "key": "InputDeviceKeyboard",
+            "base": "InputDeviceKeyboard",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "InputDeviceKeyboard"
-            }
+                "name": "Input Device Keyboard",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "keyboard_key_windows_system_scroll_lock",
+                    "details": {
+                        "name": "keyboard_key_windows_system_scroll_lock"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_semicolon",
+                    "details": {
+                        "name": "keyboard_key_punctuation_semicolon"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_7",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 7"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F11",
+                    "details": {
+                        "name": "keyboard_key_function_F 11"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_B",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_B"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_R",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_R"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F10",
+                    "details": {
+                        "name": "keyboard_key_function_F 10"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_backslash",
+                    "details": {
+                        "name": "keyboard_key_punctuation_backslash"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_bracket_r",
+                    "details": {
+                        "name": "keyboard_key_punctuation_bracket_r"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F16",
+                    "details": {
+                        "name": "keyboard_key_function_F 16"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_5",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 5"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F01",
+                    "details": {
+                        "name": "keyboard_key_function_F 01"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_A",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_A"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_hyphen",
+                    "details": {
+                        "name": "keyboard_key_punctuation_hyphen"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_4",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 4"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_O",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_O"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_E",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_E"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_windows_system_pause",
+                    "details": {
+                        "name": "keyboard_key_windows_system_pause"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_F",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_F"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_windows_system_print",
+                    "details": {
+                        "name": "keyboard_key_windows_system_print"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F14",
+                    "details": {
+                        "name": "keyboard_key_function_F 14"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_alt_l",
+                    "details": {
+                        "name": "keyboard_key_modifier_alt_l"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_edit_space",
+                    "details": {
+                        "name": "keyboard_key_edit_space"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_1",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F02",
+                    "details": {
+                        "name": "keyboard_key_function_F 02"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_enter",
+                    "details": {
+                        "name": "keyboard_key_numpad_enter"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_1",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_ctrl_r",
+                    "details": {
+                        "name": "keyboard_key_modifier_ctrl_r"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_D",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_D"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_num_lock",
+                    "details": {
+                        "name": "keyboard_key_num_lock"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_decimal",
+                    "details": {
+                        "name": "keyboard_key_numpad_decimal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_8",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 8"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_V",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_V"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_home",
+                    "details": {
+                        "name": "keyboard_key_navigation_home"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_5",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 5"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_H",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_H"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_tilde",
+                    "details": {
+                        "name": "keyboard_key_punctuation_tilde"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_end",
+                    "details": {
+                        "name": "keyboard_key_navigation_end"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_equals",
+                    "details": {
+                        "name": "keyboard_key_punctuation_equals"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_0",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 0"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F13",
+                    "details": {
+                        "name": "keyboard_key_function_F 13"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_period",
+                    "details": {
+                        "name": "keyboard_key_punctuation_period"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_U",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_U"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_page_down",
+                    "details": {
+                        "name": "keyboard_key_navigation_page_down"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_T",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_T"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_super_r",
+                    "details": {
+                        "name": "keyboard_key_modifier_super_r"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_3",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 3"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_2",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 2"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_I",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_I"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_divide",
+                    "details": {
+                        "name": "keyboard_key_numpad_divide"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_arrow_left",
+                    "details": {
+                        "name": "keyboard_key_navigation_arrow_left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_edit_capslock",
+                    "details": {
+                        "name": "keyboard_key_edit_capslock"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_S",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_S"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_G",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_G"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F03",
+                    "details": {
+                        "name": "keyboard_key_function_F 03"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_escape",
+                    "details": {
+                        "name": "keyboard_key_escape"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F15",
+                    "details": {
+                        "name": "keyboard_key_function_F 15"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_super_l",
+                    "details": {
+                        "name": "keyboard_key_modifier_super_l"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_4",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 4"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_arrow_up",
+                    "details": {
+                        "name": "keyboard_key_navigation_arrow_up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F17",
+                    "details": {
+                        "name": "keyboard_key_function_F 17"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_6",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 6"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_alt_r",
+                    "details": {
+                        "name": "keyboard_key_modifier_alt_r"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_Q",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_Q"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_subtract",
+                    "details": {
+                        "name": "keyboard_key_numpad_subtract"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_X",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_X"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_delete",
+                    "details": {
+                        "name": "keyboard_key_navigation_delete"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_bracket_l",
+                    "details": {
+                        "name": "keyboard_key_punctuation_bracket_l"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_8",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 8"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F07",
+                    "details": {
+                        "name": "keyboard_key_function_F 07"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_C",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_C"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F20",
+                    "details": {
+                        "name": "keyboard_key_function_F 20"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_insert",
+                    "details": {
+                        "name": "keyboard_key_navigation_insert"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_page_up",
+                    "details": {
+                        "name": "keyboard_key_navigation_page_up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_2",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 2"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_shift_l",
+                    "details": {
+                        "name": "keyboard_key_modifier_shift_l"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_P",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_P"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_apostrophe",
+                    "details": {
+                        "name": "keyboard_key_punctuation_apostrophe"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_Y",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_Y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F09",
+                    "details": {
+                        "name": "keyboard_key_function_F 09"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_9",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 9"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F06",
+                    "details": {
+                        "name": "keyboard_key_function_F 06"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_L",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_L"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_slash",
+                    "details": {
+                        "name": "keyboard_key_punctuation_slash"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F19",
+                    "details": {
+                        "name": "keyboard_key_function_F 19"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_K",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_K"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_0",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 0"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_edit_enter",
+                    "details": {
+                        "name": "keyboard_key_edit_enter"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_multiply",
+                    "details": {
+                        "name": "keyboard_key_numpad_multiply"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_Z",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_Z"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F08",
+                    "details": {
+                        "name": "keyboard_key_function_F 08"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_3",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 3"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_edit_tab",
+                    "details": {
+                        "name": "keyboard_key_edit_tab"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F18",
+                    "details": {
+                        "name": "keyboard_key_function_F 18"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_shift_r",
+                    "details": {
+                        "name": "keyboard_key_modifier_shift_r"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_J",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_J"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_punctuation_comma",
+                    "details": {
+                        "name": "keyboard_key_punctuation_comma"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_supplementary_iso",
+                    "details": {
+                        "name": "keyboard_key_supplementary_iso"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_arrow_right",
+                    "details": {
+                        "name": "keyboard_key_navigation_arrow_right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_edit_backspace",
+                    "details": {
+                        "name": "keyboard_key_edit_backspace"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F12",
+                    "details": {
+                        "name": "keyboard_key_function_F 12"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_navigation_arrow_down",
+                    "details": {
+                        "name": "keyboard_key_navigation_arrow_down"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_add",
+                    "details": {
+                        "name": "keyboard_key_numpad_add"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_6",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 6"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F05",
+                    "details": {
+                        "name": "keyboard_key_function_F 05"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_M",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_M"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_modifier_ctrl_l",
+                    "details": {
+                        "name": "keyboard_key_modifier_ctrl_l"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_W",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_W"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_9",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_ 9"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_function_F04",
+                    "details": {
+                        "name": "keyboard_key_function_F 04"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_alphanumeric_N",
+                    "details": {
+                        "name": "keyboard_key_alphanumeric_N"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "keyboard_key_numpad_7",
+                    "details": {
+                        "name": "keyboard_key_numpad_ 7"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names
index 92421945e7..e265506eef 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names
@@ -1,12 +1,155 @@
 {
     "entries": [
         {
-            "key": "InputDeviceMotion",
+            "base": "InputDeviceMotion",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "InputDeviceMotion"
-            }
+                "name": "Input Device Motion",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "motion_orientation_current",
+                    "details": {
+                        "name": "motion_orientation_current"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_rotation_rate_unbiased",
+                    "details": {
+                        "name": "motion_rotation_rate_unbiased"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_rotation_rate_raw",
+                    "details": {
+                        "name": "motion_rotation_rate_raw"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_magnetic_field_north",
+                    "details": {
+                        "name": "motion_magnetic_field_north"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_acceleration_gravity",
+                    "details": {
+                        "name": "motion_acceleration_gravity"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_acceleration_raw",
+                    "details": {
+                        "name": "motion_acceleration_raw"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_acceleration_user",
+                    "details": {
+                        "name": "motion_acceleration_user"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_magnetic_field_raw",
+                    "details": {
+                        "name": "motion_magnetic_field_raw"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "motion_magnetic_field_unbiased",
+                    "details": {
+                        "name": "motion_magnetic_field_unbiased"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names
index 762d2fe576..c4f7f76a77 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names
@@ -1,12 +1,141 @@
 {
     "entries": [
         {
-            "key": "InputDeviceMouse",
+            "base": "InputDeviceMouse",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "InputDeviceMouse"
-            }
+                "name": "Input Device Mouse",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "mouse_delta_z",
+                    "details": {
+                        "name": "mouse_delta_z"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_button_other2",
+                    "details": {
+                        "name": "mouse_button_other 2"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_delta_x",
+                    "details": {
+                        "name": "mouse_delta_x"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_button_middle",
+                    "details": {
+                        "name": "mouse_button_middle"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_delta_y",
+                    "details": {
+                        "name": "mouse_delta_y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_button_right",
+                    "details": {
+                        "name": "mouse_button_right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_button_left",
+                    "details": {
+                        "name": "mouse_button_left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "mouse_button_other1",
+                    "details": {
+                        "name": "mouse_button_other 1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names
index 082e6e65cf..aa37285487 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names
@@ -1,12 +1,169 @@
 {
     "entries": [
         {
-            "key": "InputDeviceTouch",
+            "base": "InputDeviceTouch",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "InputDeviceTouch"
-            }
+                "name": "Input Device Touch",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "touch_index_7",
+                    "details": {
+                        "name": "touch_index_ 7"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_8",
+                    "details": {
+                        "name": "touch_index_ 8"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_6",
+                    "details": {
+                        "name": "touch_index_ 6"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_5",
+                    "details": {
+                        "name": "touch_index_ 5"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_3",
+                    "details": {
+                        "name": "touch_index_ 3"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_4",
+                    "details": {
+                        "name": "touch_index_ 4"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_2",
+                    "details": {
+                        "name": "touch_index_ 2"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_0",
+                    "details": {
+                        "name": "touch_index_ 0"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_9",
+                    "details": {
+                        "name": "touch_index_ 9"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "touch_index_1",
+                    "details": {
+                        "name": "touch_index_ 1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names
index 770640e7f7..71162dbc06 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names
@@ -1,12 +1,71 @@
 {
     "entries": [
         {
-            "key": "InputDeviceVirtualKeyboard",
+            "base": "InputDeviceVirtualKeyboard",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "InputDeviceVirtualKeyboard"
-            }
+                "name": "Input Device Virtual Keyboard",
+                "category": "Input"
+            },
+            "methods": [
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "virtual_keyboard_edit_enter",
+                    "details": {
+                        "name": "virtual_keyboard_edit_enter"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "virtual_keyboard_edit_clear",
+                    "details": {
+                        "name": "virtual_keyboard_edit_clear"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "virtual_keyboard_navigation_back",
+                    "details": {
+                        "name": "virtual_keyboard_navigation_back"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names
index e964bd2518..c510b34efd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names
@@ -1,34 +1,33 @@
 {
     "entries": [
         {
-            "key": "InputEventNotificationId",
+            "base": "InputEventNotificationId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Input Event Notification ID",
-                "category": "Gameplay/Input"
+                "name": "Input",
+                "category": "Gameplay"
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "InputEventNotificationId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "InputEventNotificationId::ToString",
-                        "category": "Gameplay/Input"
+                        "name": "To String"
                     },
                     "params": [
                         {
                             "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
                             "details": {
-                                "name": "InputEventNotificationId*"
+                                "name": "Input Event Notification Id"
                             }
                         }
                     ],
@@ -42,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "InputEventNotificationId",
                     "entry": {
                         "name": "In",
@@ -53,20 +52,19 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "InputEventNotificationId::Equal",
-                        "category": "Gameplay/Input"
+                        "name": "Equal"
                     },
                     "params": [
                         {
                             "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
                             "details": {
-                                "name": "InputEventNotificationId*"
+                                "name": "Input Event Notification Id"
                             }
                         },
                         {
                             "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
                             "details": {
-                                "name": "const InputEventNotificationId&"
+                                "name": "Input Event Notification Id"
                             }
                         }
                     ],
@@ -74,13 +72,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Equal"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Clone",
+                    "base": "Clone",
                     "context": "InputEventNotificationId",
                     "entry": {
                         "name": "In",
@@ -91,14 +89,13 @@
                         "tooltip": "Signaled after Clone is invoked"
                     },
                     "details": {
-                        "name": "InputEventNotificationId::Clone",
-                        "category": "Gameplay/Input"
+                        "name": "Clone"
                     },
                     "params": [
                         {
                             "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
                             "details": {
-                                "name": "InputEventNotificationId*"
+                                "name": "Input Event Notification Id"
                             }
                         }
                     ],
@@ -106,39 +103,36 @@
                         {
                             "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
                             "details": {
-                                "name": "InputEventNotificationID"
+                                "name": "Input Event Notification Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateInputEventNotificationId",
+                    "base": "CreateInputEventNotificationId",
                     "context": "InputEventNotificationId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateInputEventNotificationId"
+                        "tooltip": "When signaled, this will invoke Create Input Event Notification Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateInputEventNotificationId is invoked"
+                        "tooltip": "Signaled after Create Input Event Notification Id is invoked"
                     },
                     "details": {
-                        "name": "InputEventNotificationId::CreateInputEventNotificationId",
-                        "category": "Gameplay/Input"
+                        "name": "Create Input Event Notification Id"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "localUserId",
-                                "tooltip": "Local user ID (0-3, or -1 for all users)"
+                                "name": "Local User Id"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "actionName",
-                                "tooltip": "The name of the Input event action"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -146,7 +140,111 @@
                         {
                             "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
                             "details": {
-                                "name": "InputEventNotificationID"
+                                "name": "Input Event Notification Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetactionNameCrc",
+                    "details": {
+                        "name": "Get Action Name Tag"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
+                            "details": {
+                                "name": "Input Event Notification Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Tag"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetactionNameCrc",
+                    "details": {
+                        "name": "Set Action Name Tag"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
+                            "details": {
+                                "name": "Input Event Notification Id"
+                            }
+                        },
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Tag"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetlocalUserId",
+                    "details": {
+                        "name": "Get Local User Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
+                            "details": {
+                                "name": "Input Event Notification Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Local User Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetlocalUserId",
+                    "details": {
+                        "name": "Set Local User Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
+                            "details": {
+                                "name": "Input Event Notification Id"
+                            }
+                        },
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Local User Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetactionName",
+                    "details": {
+                        "name": "Set Action Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
+                            "details": {
+                                "name": "Input Event Notification Id"
+                            }
+                        },
+                        {
+                            "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
+                            "details": {
+                                "name": "Action Name"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names
index 8e72ef70d6..80153489d0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "InvertGradientComponent",
+            "base": "InvertGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names
index 21840537c4..0c7f50683f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "InvertGradientConfig",
+            "base": "InvertGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names
index 08c34aea98..c44335f796 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "LevelsGradientComponent",
+            "base": "LevelsGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names
index badb39ba8e..6b1b6f5d1f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "LevelsGradientConfig",
+            "base": "LevelsGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names
index 2ff191ad6c..9695d74586 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names
@@ -1,12 +1,350 @@
 {
     "entries": [
         {
-            "key": "LightConfig",
+            "base": "LightConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "LightConfig"
-            }
+                "name": "Light Config"
+            },
+            "methods": [
+                {
+                    "base": "GetshadowmapSize",
+                    "details": {
+                        "name": "Get Shadowmap Size"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}",
+                            "details": {
+                                "name": "Shadowmap Size"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetshadowmapSize",
+                    "details": {
+                        "name": "Set Shadowmap Size"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}",
+                            "details": {
+                                "name": "Shadowmap Size"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetshadowCascadeCount",
+                    "details": {
+                        "name": "Get Shadow Cascade Count"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{ECA0B403-C4F8-4B86-95FC-81688D046E40}",
+                            "details": {
+                                "name": "Shadow Cascade Count"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetshadowCascadeCount",
+                    "details": {
+                        "name": "Set Shadow Cascade Count"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{ECA0B403-C4F8-4B86-95FC-81688D046E40}",
+                            "details": {
+                                "name": "Shadow Cascade Count"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetenableShadowDebugColoring",
+                    "details": {
+                        "name": "Get Enable Shadow Debug Coloring"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enable"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetenableShadowDebugColoring",
+                    "details": {
+                        "name": "Set Enable Shadow Debug Coloring"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enable"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getintensity",
+                    "details": {
+                        "name": "Get Intensity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Intensity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setintensity",
+                    "details": {
+                        "name": "Set Intensity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Intensity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetshadowRatioLogarithmUniform",
+                    "details": {
+                        "name": "Get Shadow Ratio Logarithm Uniform"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Ratio Logarithm Uniform"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetshadowRatioLogarithmUniform",
+                    "details": {
+                        "name": "Set Shadow Ratio Logarithm Uniform"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Ratio Logarithm Uniform"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getcolor",
+                    "details": {
+                        "name": "Get Color"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setcolor",
+                    "details": {
+                        "name": "Set Color"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getdirection",
+                    "details": {
+                        "name": "Get Direction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setdirection",
+                    "details": {
+                        "name": "Set Direction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetshadowFarClipDistance",
+                    "details": {
+                        "name": "Get Shadow Far Clip Distance"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Far Clip Distance"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetshadowFarClipDistance",
+                    "details": {
+                        "name": "Set Shadow Far Clip Distance"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{02644F52-9483-47A8-9028-37671695C34E}",
+                            "details": {
+                                "name": "Light Config"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Far Clip Distance"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names
index 3bad4ebca7..2de6836faf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names
@@ -1,12 +1,434 @@
 {
     "entries": [
         {
-            "key": "LightingPreset",
+            "base": "LightingPreset",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "LightingPreset"
-            }
+                "name": "Lighting Preset"
+            },
+            "methods": [
+                {
+                    "base": "GetshadowCatcherOpacity",
+                    "details": {
+                        "name": "Get Shadow Catcher Opacity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Catcher Opacity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetshadowCatcherOpacity",
+                    "details": {
+                        "name": "Set Shadow Catcher Opacity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Catcher Opacity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetskyboxExposure",
+                    "details": {
+                        "name": "Get Skybox Exposure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Skybox Exposure"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetskyboxExposure",
+                    "details": {
+                        "name": "Set Skybox Exposure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Skybox Exposure"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getlights",
+                    "details": {
+                        "name": "Get Lights"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
+                            "details": {
+                                "name": "Light Configs"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setlights",
+                    "details": {
+                        "name": "Set Lights"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
+                            "details": {
+                                "name": "Light Configs"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetiblExposure",
+                    "details": {
+                        "name": "Get IBL Exposure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "IBL Exposure"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetiblExposure",
+                    "details": {
+                        "name": "Set IBL Exposure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "IBL Exposure"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetskyboxImageAsset",
+                    "details": {
+                        "name": "Get Skybox Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "Skybox Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetskyboxImageAsset",
+                    "details": {
+                        "name": "Set Skybox Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "Skybox Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetiblSpecularImageAsset",
+                    "details": {
+                        "name": "Get IBL Specular Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "IBL Specular Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetiblSpecularImageAsset",
+                    "details": {
+                        "name": "Set IBL Specular Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "IBL Specular Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetdisplayName",
+                    "details": {
+                        "name": "Get Display Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Display Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetdisplayName",
+                    "details": {
+                        "name": "Set Display Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Display Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetalternateSkyboxImageAsset",
+                    "details": {
+                        "name": "Get Alternate Skybox Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "Alternate Skybox Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetalternateSkyboxImageAsset",
+                    "details": {
+                        "name": "Set Alternate Skybox Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "Alternate Skybox Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetiblDiffuseImageAsset",
+                    "details": {
+                        "name": "Get IBL Diffuse Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "IBL Diffuse Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetiblDiffuseImageAsset",
+                    "details": {
+                        "name": "Set IBL Diffuse Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "IBL Diffuse Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getexposure",
+                    "details": {
+                        "name": "Get Exposure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setexposure",
+                    "details": {
+                        "name": "Set Exposure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+                            "details": {
+                                "name": "Lighting Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+                            "details": {
+                                "name": "Exposure Control Config"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names
new file mode 100644
index 0000000000..1289b55ba3
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names
@@ -0,0 +1,103 @@
+{
+    "entries": [
+        {
+            "base": "LmbrCentral::QuadShapeConfig",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Quad Shape Config",
+                "category": "Rendering/Shapes"
+            },
+            "methods": [
+                {
+                    "base": "GetWidth",
+                    "details": {
+                        "name": "Get Width"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Quad shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetWidth",
+                    "details": {
+                        "name": "Set Width"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Quad shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeight",
+                    "details": {
+                        "name": "Get Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Quad shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetHeight",
+                    "details": {
+                        "name": "Set Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Quad shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names
index a77e2615b8..99a0fa5f78 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names
@@ -1,41 +1,117 @@
 {
     "entries": [
         {
-            "key": "MaterialAssignment",
+            "base": "MaterialAssignment",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MaterialAssignment"
+                "name": "Material Assignment",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "MaterialAssignment",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignment::ToString",
-                        "category": "Other"
+                        "name": "To String"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "String"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetmaterialAsset",
+                    "details": {
+                        "name": "Get Material Asset"
                     },
                     "params": [
                         {
                             "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignment*"
+                                "name": "Material Assignment"
                             }
                         }
                     ],
                     "results": [
                         {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "typeid": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "Material Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetmaterialAsset",
+                    "details": {
+                        "name": "Set Material Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}",
+                            "details": {
+                                "name": "Material Assignment"
+                            }
+                        },
+                        {
+                            "typeid": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
+                            "details": {
+                                "name": "Material Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetpropertyOverrides",
+                    "details": {
+                        "name": "Get Property Overrides"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}",
+                            "details": {
+                                "name": "Material Assignment"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
+                            "details": {
+                                "name": "Override"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetpropertyOverrides",
+                    "details": {
+                        "name": "Set Property Overrides"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}",
+                            "details": {
+                                "name": "Material Assignment"
+                            }
+                        },
+                        {
+                            "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
+                            "details": {
+                                "name": "Override"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names
index 6a5c0d5b60..47dc8122a1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names
@@ -1,201 +1,232 @@
 {
     "entries": [
         {
-            "key": "MaterialAssignmentId",
+            "base": "MaterialAssignmentId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MaterialAssignmentId"
+                "name": "Material Assignment Id",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "MaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignmentId::ToString",
-                        "category": "Other"
+                        "name": "To String"
                     },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "String"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsAssetOnly",
+                    "base": "IsAssetOnly",
                     "context": "MaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsAssetOnly"
+                        "tooltip": "When signaled, this will invoke Is Asset Only"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsAssetOnly is invoked"
+                        "tooltip": "Signaled after Is Asset Only is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignmentId::IsAssetOnly",
-                        "category": "Other"
+                        "name": "Is Asset Only"
                     },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Asset Only"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsSlotIdOnly",
+                    "base": "IsSlotIdOnly",
                     "context": "MaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsSlotIdOnly"
+                        "tooltip": "When signaled, this will invoke Is Slot Id Only"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsSlotIdOnly is invoked"
+                        "tooltip": "Signaled after Is Slot Id Only is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignmentId::IsSlotIdOnly",
-                        "category": "Other"
+                        "name": "Is Slot Id Only"
                     },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Slot Id Only"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsLodAndSlotId",
+                    "base": "IsLodAndSlotId",
                     "context": "MaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsLodAndSlotId"
+                        "tooltip": "When signaled, this will invoke Is Lod And Slot Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsLodAndSlotId is invoked"
+                        "tooltip": "Signaled after Is Lod And Slot Id is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignmentId::IsLodAndSlotId",
-                        "category": "Other"
+                        "name": "Is Lod And Slot Id"
                     },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Lod And Slot Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsDefault",
+                    "base": "IsDefault",
                     "context": "MaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsDefault"
+                        "tooltip": "When signaled, this will invoke Is Default"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsDefault is invoked"
+                        "tooltip": "Signaled after Is Default is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignmentId::IsDefault",
-                        "category": "Other"
+                        "name": "Is Default"
                     },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Default"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsLodAndAsset",
+                    "base": "IsLodAndAsset",
                     "context": "MaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsLodAndAsset"
+                        "tooltip": "When signaled, this will invoke Is Lod And Asset"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsLodAndAsset is invoked"
+                        "tooltip": "Signaled after Is Lod And Asset is invoked"
                     },
                     "details": {
-                        "name": "MaterialAssignmentId::IsLodAndAsset",
-                        "category": "Other"
+                        "name": "Is Lod And Asset"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Lod And Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetlodIndex",
+                    "details": {
+                        "name": "Get LOD Index"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId*"
+                                "name": "Material Assignment Id"
                             }
                         }
                     ],
                     "results": [
                         {
-                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "bool"
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetlodIndex",
+                    "details": {
+                        "name": "Set LOD Index"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "Material Assignment Id"
+                            }
+                        },
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetmaterialSlotStableId",
+                    "details": {
+                        "name": "Get Material Slot Stable Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "Material Assignment Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetmaterialSlotStableId",
+                    "details": {
+                        "name": "Set Material Slot Stable Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "Material Assignment Id"
+                            }
+                        },
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Value"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names
index 66798ef901..e167ff79a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names
@@ -1,12 +1,59 @@
 {
     "entries": [
         {
-            "key": "MaterialComponentConfig",
+            "base": "MaterialComponentConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MaterialComponentConfig"
-            }
+                "name": "Material Component Config",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "Getmaterials",
+                    "details": {
+                        "name": "Get Materials"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3366C279-32AE-48F6-839B-7700AE117A54}",
+                            "details": {
+                                "name": "",
+                                "tooltip": "Material Component Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
+                            "details": {
+                                "name": "Material Assignment Map"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setmaterials",
+                    "details": {
+                        "name": "Set Materials"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3366C279-32AE-48F6-839B-7700AE117A54}",
+                            "details": {
+                                "name": "",
+                                "tooltip": "Material Component Config"
+                            }
+                        },
+                        {
+                            "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
+                            "details": {
+                                "name": "Material Assignment Map"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names
index fc1aaa0e0b..c7e5b5814d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names
@@ -1,70 +1,51 @@
 {
     "entries": [
         {
-            "key": "MaterialData",
+            "base": "MaterialData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MaterialData"
+                "name": "Material Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetBaseColor",
+                    "base": "GetBaseColor",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBaseColor"
+                        "tooltip": "When signaled, this will invoke Get Base Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBaseColor is invoked"
+                        "tooltip": "Signaled after Get Base Color is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetBaseColor",
-                        "category": "Other"
+                        "name": "Get Base Color"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUseRoughnessMap",
+                    "base": "GetUseRoughnessMap",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseRoughnessMap"
+                        "tooltip": "When signaled, this will invoke Get Use Roughness Map"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseRoughnessMap is invoked"
+                        "tooltip": "Signaled after Get Use Roughness Map is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetUseRoughnessMap",
-                        "category": "Other"
+                        "name": "Get Use Roughness Map"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -75,29 +56,19 @@
                     ]
                 },
                 {
-                    "key": "GetShininess",
+                    "base": "GetShininess",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShininess"
+                        "tooltip": "When signaled, this will invoke Get Shininess"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShininess is invoked"
+                        "tooltip": "Signaled after Get Shininess is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetShininess",
-                        "category": "Other"
+                        "name": "Get Shininess"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
@@ -108,29 +79,19 @@
                     ]
                 },
                 {
-                    "key": "GetUseEmissiveMap",
+                    "base": "GetUseEmissiveMap",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseEmissiveMap"
+                        "tooltip": "When signaled, this will invoke Get Use Emissive Map"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseEmissiveMap is invoked"
+                        "tooltip": "Signaled after Get Use Emissive Map is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetUseEmissiveMap",
-                        "category": "Other"
+                        "name": "Get Use Emissive Map"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -141,161 +102,111 @@
                     ]
                 },
                 {
-                    "key": "GetEmissiveColor",
+                    "base": "GetEmissiveColor",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEmissiveColor"
+                        "tooltip": "When signaled, this will invoke Get Emissive Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEmissiveColor is invoked"
+                        "tooltip": "Signaled after Get Emissive Color is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetEmissiveColor",
-                        "category": "Other"
+                        "name": "Get Emissive Color"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSpecularColor",
+                    "base": "GetSpecularColor",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSpecularColor"
+                        "tooltip": "When signaled, this will invoke Get Specular Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSpecularColor is invoked"
+                        "tooltip": "Signaled after Get Specular Color is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetSpecularColor",
-                        "category": "Other"
+                        "name": "Get Specular Color"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUniqueId",
+                    "base": "GetUniqueId",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUniqueId"
+                        "tooltip": "When signaled, this will invoke Get Unique Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUniqueId is invoked"
+                        "tooltip": "Signaled after Get Unique Id is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetUniqueId",
-                        "category": "Other"
+                        "name": "Get Unique Id"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetDiffuseColor",
+                    "base": "GetDiffuseColor",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDiffuseColor"
+                        "tooltip": "When signaled, this will invoke Get Diffuse Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDiffuseColor is invoked"
+                        "tooltip": "Signaled after Get Diffuse Color is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetDiffuseColor",
-                        "category": "Other"
+                        "name": "Get Diffuse Color"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEmissiveIntensity",
+                    "base": "GetEmissiveIntensity",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEmissiveIntensity"
+                        "tooltip": "When signaled, this will invoke Get Emissive Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEmissiveIntensity is invoked"
+                        "tooltip": "Signaled after Get Emissive Intensity is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetEmissiveIntensity",
-                        "category": "Other"
+                        "name": "Get Emissive Intensity"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
@@ -306,62 +217,42 @@
                     ]
                 },
                 {
-                    "key": "GetMaterialName",
+                    "base": "GetMaterialName",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaterialName"
+                        "tooltip": "When signaled, this will invoke Get Material Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaterialName is invoked"
+                        "tooltip": "Signaled after Get Material Name is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetMaterialName",
-                        "category": "Other"
+                        "name": "Get Material Name"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "const AZ Std::basic_string<char, AZ Std::char_traits<char>, alloc"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUseMetallicMap",
+                    "base": "GetUseMetallicMap",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseMetallicMap"
+                        "tooltip": "When signaled, this will invoke Get Use Metallic Map"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseMetallicMap is invoked"
+                        "tooltip": "Signaled after Get Use Metallic Map is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetUseMetallicMap",
-                        "category": "Other"
+                        "name": "Get Use Metallic Map"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -372,29 +263,19 @@
                     ]
                 },
                 {
-                    "key": "GetMetallicFactor",
+                    "base": "GetMetallicFactor",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMetallicFactor"
+                        "tooltip": "When signaled, this will invoke Get Metallic Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMetallicFactor is invoked"
+                        "tooltip": "Signaled after Get Metallic Factor is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetMetallicFactor",
-                        "category": "Other"
+                        "name": "Get Metallic Factor"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
@@ -405,29 +286,19 @@
                     ]
                 },
                 {
-                    "key": "GetRoughnessFactor",
+                    "base": "GetRoughnessFactor",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRoughnessFactor"
+                        "tooltip": "When signaled, this will invoke Get Roughness Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRoughnessFactor is invoked"
+                        "tooltip": "Signaled after Get Roughness Factor is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetRoughnessFactor",
-                        "category": "Other"
+                        "name": "Get Roughness Factor"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
@@ -438,29 +309,19 @@
                     ]
                 },
                 {
-                    "key": "GetUseAOMap",
+                    "base": "GetUseAOMap",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseAOMap"
+                        "tooltip": "When signaled, this will invoke Get UseAO Map"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseAOMap is invoked"
+                        "tooltip": "Signaled after Get UseAO Map is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetUseAOMap",
-                        "category": "Other"
+                        "name": "Get UseAO Map"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -471,28 +332,20 @@
                     ]
                 },
                 {
-                    "key": "GetTexture",
+                    "base": "GetTexture",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTexture"
+                        "tooltip": "When signaled, this will invoke Get Texture"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTexture is invoked"
+                        "tooltip": "Signaled after Get Texture is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetTexture",
-                        "category": "Other"
+                        "name": "Get Texture"
                     },
                     "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
@@ -504,35 +357,25 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "const AZ Std::basic_string<char, AZ Std::char_traits<char>, alloc"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsNoDraw",
+                    "base": "IsNoDraw",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsNoDraw"
+                        "tooltip": "When signaled, this will invoke Is No Draw"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsNoDraw is invoked"
+                        "tooltip": "Signaled after Is No Draw is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::IsNoDraw",
-                        "category": "Other"
+                        "name": "Is No Draw"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -543,29 +386,19 @@
                     ]
                 },
                 {
-                    "key": "GetOpacity",
+                    "base": "GetOpacity",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOpacity"
+                        "tooltip": "When signaled, this will invoke Get Opacity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOpacity is invoked"
+                        "tooltip": "Signaled after Get Opacity is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetOpacity",
-                        "category": "Other"
+                        "name": "Get Opacity"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "MaterialData*",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
@@ -576,29 +409,19 @@
                     ]
                 },
                 {
-                    "key": "GetUseColorMap",
+                    "base": "GetUseColorMap",
                     "context": "MaterialData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseColorMap"
+                        "tooltip": "When signaled, this will invoke Get Use Color Map"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseColorMap is invoked"
+                        "tooltip": "Signaled after Get Use Color Map is invoked"
                     },
                     "details": {
-                        "name": "MaterialData::GetUseColorMap",
-                        "category": "Other"
+                        "name": "Get Use Color Map"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
-                            "details": {
-                                "name": "const MaterialData&",
-                                "tooltip": "Material configuration for the parent."
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -607,6 +430,132 @@
                             }
                         }
                     ]
+                },
+                {
+                    "base": "GetNormal",
+                    "details": {
+                        "name": "Get Normal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDiffuse",
+                    "details": {
+                        "name": "Get Diffuse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSpecular",
+                    "details": {
+                        "name": "Get Specular"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetBump",
+                    "details": {
+                        "name": "Get Bump"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetEmissive",
+                    "details": {
+                        "name": "Get Emissive"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetRoughness",
+                    "details": {
+                        "name": "Get Roughness"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetBaseColor",
+                    "details": {
+                        "name": "Get Base Color"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAmbientOcclusion",
+                    "details": {
+                        "name": "Get Ambient Occlusion"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMetallic",
+                    "details": {
+                        "name": "Get Metallic"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
                 }
             ]
         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names
index 4ff9bc2ffa..4cb39e58a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "Math",
+            "base": "Math",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Trigonometry",
+                "name": "Functions",
                 "category": "Math"
             },
             "methods": [
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -21,20 +21,20 @@
                         "tooltip": "Signaled after DivideByNumber is invoked"
                     },
                     "details": {
-                        "name": "Math::Divide By Number",
-                        "category": "Math"
+                        "name": "Divide By Number",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "X"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Y"
                             }
                         }
                     ],
@@ -42,13 +42,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Round",
+                    "base": "Round",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -59,15 +59,14 @@
                         "tooltip": "Signaled after Round is invoked"
                     },
                     "details": {
-                        "name": "Math::Round",
-                        "category": "Math/Number"
+                        "name": "Round",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Number to round"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -75,14 +74,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Rounded number"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Sqrt",
+                    "base": "Sqrt",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -93,15 +91,14 @@
                         "tooltip": "Signaled after Sqrt is invoked"
                     },
                     "details": {
-                        "name": "Math::Sqrt",
-                        "category": "Math/Number"
+                        "name": "Sqrt",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Number to get the square root of"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -109,14 +106,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Square root of the number"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Mod",
+                    "base": "Mod",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -127,22 +123,20 @@
                         "tooltip": "Signaled after Mod is invoked"
                     },
                     "details": {
-                        "name": "Math::Mod",
-                        "category": "Math/Number"
+                        "name": "Mod",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Dividend",
-                                "tooltip": "The number to be divided"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Divisor",
-                                "tooltip": "The number to be divided by"
+                                "name": "B"
                             }
                         }
                     ],
@@ -150,14 +144,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Remainder",
-                                "tooltip": "The remainder of the division between the two inputs"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Ceil",
+                    "base": "Ceil",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -168,15 +161,14 @@
                         "tooltip": "Signaled after Ceil is invoked"
                     },
                     "details": {
-                        "name": "Math::Ceil",
-                        "category": "Math/Number"
+                        "name": "Ceil",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "The number to be rounded up"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -184,14 +176,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Ceiling",
-                                "tooltip": "The value rounded up"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsEven",
+                    "base": "IsEven",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -202,15 +193,14 @@
                         "tooltip": "Signaled after IsEven is invoked"
                     },
                     "details": {
-                        "name": "Math::IsEven",
-                        "category": "Math/Number"
+                        "name": "Is Even",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Number to be checked"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -218,14 +208,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean",
-                                "tooltip": "Returns true if the number is even; false if not"
+                                "name": "Is Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -236,29 +225,26 @@
                         "tooltip": "Signaled after IsClose is invoked"
                     },
                     "details": {
-                        "name": "Math::IsClose",
-                        "category": "Math/Number"
+                        "name": "Is Close",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "Number A",
-                                "tooltip": "Number to compare"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "Number B",
-                                "tooltip": "Number to compare"
+                                "name": "B"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "Tolerance",
-                                "tooltip": "The value range to check the numbers against"
+                                "name": "Tolerance"
                             }
                         }
                     ],
@@ -266,13 +252,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Close"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ArcSin",
+                    "base": "ArcSin",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -283,15 +269,14 @@
                         "tooltip": "Signaled after ArcSin is invoked"
                     },
                     "details": {
-                        "name": "Math::ArcSin",
-                        "category": "Math"
+                        "name": "Arc Sin",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -299,14 +284,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ArcTan",
+                    "base": "ArcTan",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -317,15 +301,14 @@
                         "tooltip": "Signaled after ArcTan is invoked"
                     },
                     "details": {
-                        "name": "Math::ArcTan",
-                        "category": "Math"
+                        "name": "Arc Tan",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -333,14 +316,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Max",
+                    "base": "Max",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -351,22 +333,20 @@
                         "tooltip": "Signaled after Max is invoked"
                     },
                     "details": {
-                        "name": "Math::Max",
-                        "category": "Math/Number"
+                        "name": "Max",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number A",
-                                "tooltip": "Number to be compared"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number B",
-                                "tooltip": "Number to be compared"
+                                "name": "B"
                             }
                         }
                     ],
@@ -374,14 +354,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Max",
-                                "tooltip": "The largest between two numbers"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Tan",
+                    "base": "Tan",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -392,15 +371,14 @@
                         "tooltip": "Signaled after Tan is invoked"
                     },
                     "details": {
-                        "name": "Math::Tan",
-                        "category": "Math"
+                        "name": "Tan",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -408,14 +386,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ArcTan2",
+                    "base": "ArcTan2",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -426,22 +403,20 @@
                         "tooltip": "Signaled after ArcTan2 is invoked"
                     },
                     "details": {
-                        "name": "Math::ArcTan2",
-                        "category": "Math"
+                        "name": "Arc Tan 2",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle A",
-                                "tooltip": "Angle as radians"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle B",
-                                "tooltip": "Angle as radians"
+                                "name": "B"
                             }
                         }
                     ],
@@ -449,14 +424,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Floor",
+                    "base": "Floor",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -467,15 +441,14 @@
                         "tooltip": "Signaled after Floor is invoked"
                     },
                     "details": {
-                        "name": "Math::Floor",
-                        "category": "Math/Number"
+                        "name": "Floor",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "The number to be rounded down"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -483,14 +456,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Floor",
-                                "tooltip": "The value rounded down"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Min",
+                    "base": "Min",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -501,22 +473,20 @@
                         "tooltip": "Signaled after Min is invoked"
                     },
                     "details": {
-                        "name": "Math::Min",
-                        "category": "Math/Number"
+                        "name": "Min",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number A",
-                                "tooltip": "Number to be compared"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number B",
-                                "tooltip": "Number to be compared"
+                                "name": "B"
                             }
                         }
                     ],
@@ -524,14 +494,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Min",
-                                "tooltip": "The smallest between two numbers"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -542,26 +511,26 @@
                         "tooltip": "Signaled after Lerp is invoked"
                     },
                     "details": {
-                        "name": "Math::Lerp",
-                        "category": "Math/Number"
+                        "name": "Lerp",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "a"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "b"
+                                "name": "B"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "t"
+                                "name": "Time"
                             }
                         }
                     ],
@@ -569,13 +538,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "LerpInverse",
+                    "base": "LerpInverse",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -586,26 +555,26 @@
                         "tooltip": "Signaled after LerpInverse is invoked"
                     },
                     "details": {
-                        "name": "Math::LerpInverse",
-                        "category": "Math/Number"
+                        "name": "LerpInverse",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "a"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "b"
+                                "name": "B"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "value"
+                                "name": "Time"
                             }
                         }
                     ],
@@ -613,13 +582,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsOdd",
+                    "base": "IsOdd",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -630,15 +599,14 @@
                         "tooltip": "Signaled after IsOdd is invoked"
                     },
                     "details": {
-                        "name": "Math::IsOdd",
-                        "category": "Math/Number"
+                        "name": "Is Odd",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Number to be checked"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -646,14 +614,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean",
-                                "tooltip": "Returns true if the number is not even; false if it is"
+                                "name": "Is Odd"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Abs",
+                    "base": "Abs",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -664,14 +631,13 @@
                         "tooltip": "Signaled after Abs is invoked"
                     },
                     "details": {
-                        "name": "Math::Abs",
-                        "category": "Math"
+                        "name": "Abs"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -679,13 +645,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RadToDeg",
+                    "base": "RadToDeg",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -696,15 +662,14 @@
                         "tooltip": "Signaled after RadToDeg is invoked"
                     },
                     "details": {
-                        "name": "Math::RadToDeg",
-                        "category": "Math"
+                        "name": "Radians To Degrees",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Radians",
-                                "tooltip": "Radians to be converted"
+                                "name": "Radians"
                             }
                         }
                     ],
@@ -712,14 +677,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Degrees",
-                                "tooltip": "Degrees from radians"
+                                "name": "Degrees"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Sin",
+                    "base": "Sin",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -730,15 +694,14 @@
                         "tooltip": "Signaled after Sin is invoked"
                     },
                     "details": {
-                        "name": "Math::Sin",
-                        "category": "Math"
+                        "name": "Sin",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Number as radians"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -746,14 +709,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Number as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Cos",
+                    "base": "Cos",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -764,15 +726,14 @@
                         "tooltip": "Signaled after Cos is invoked"
                     },
                     "details": {
-                        "name": "Math::Cos",
-                        "category": "Math"
+                        "name": "Cos",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -780,14 +741,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ArcCos",
+                    "base": "ArcCos",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -798,15 +758,14 @@
                         "tooltip": "Signaled after ArcCos is invoked"
                     },
                     "details": {
-                        "name": "Math::ArcCos",
-                        "category": "Math"
+                        "name": "Arc Cos",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -814,14 +773,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Angle",
-                                "tooltip": "Angle as radians"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Sign",
+                    "base": "Sign",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -832,15 +790,14 @@
                         "tooltip": "Signaled after Sign is invoked"
                     },
                     "details": {
-                        "name": "Math::Sign",
-                        "category": "Math/Number"
+                        "name": "Sign",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Number to check"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -848,14 +805,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Sign",
-                                "tooltip": "Returns 1 if the number is positive and -1 if the number is negative"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -866,29 +822,26 @@
                         "tooltip": "Signaled after Clamp is invoked"
                     },
                     "details": {
-                        "name": "Math::Clamp",
-                        "category": "Math/Number"
+                        "name": "Clamp",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "Value to be clamped"
+                                "name": "Value"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Min",
-                                "tooltip": "The minimum value to clamp to"
+                                "name": "Minimum"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Max",
-                                "tooltip": "The maximum value to clamp to"
+                                "name": "Maximum"
                             }
                         }
                     ],
@@ -896,14 +849,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "The result of the clamp"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSinCos",
+                    "base": "GetSinCos",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -914,32 +866,32 @@
                         "tooltip": "Signaled after GetSinCos is invoked"
                     },
                     "details": {
-                        "name": "Math::GetSinCos",
-                        "category": "Math"
+                        "name": "Get Sin Cos",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float&"
+                                "name": "Sin"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float&"
+                                "name": "Cos"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DegToRad",
+                    "base": "DegToRad",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -950,15 +902,14 @@
                         "tooltip": "Signaled after DegToRad is invoked"
                     },
                     "details": {
-                        "name": "Math::DegToRad",
-                        "category": "Math"
+                        "name": "Degrees To Radians",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Degrees",
-                                "tooltip": "Degrees to be converted"
+                                "name": "Degrees"
                             }
                         }
                     ],
@@ -966,14 +917,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Radians",
-                                "tooltip": "Radians from degrees"
+                                "name": "Radians"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Pow",
+                    "base": "Pow",
                     "context": "Math",
                     "entry": {
                         "name": "In",
@@ -984,22 +934,20 @@
                         "tooltip": "Signaled after Pow is invoked"
                     },
                     "details": {
-                        "name": "Math::Pow",
-                        "category": "Math/Number"
+                        "name": "Pow",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "The value to be raised"
+                                "name": "Value"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Exponent",
-                                "tooltip": "The power exponent"
+                                "name": "Exponent"
                             }
                         }
                     ],
@@ -1007,8 +955,7 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Number",
-                                "tooltip": "The result of the number raised to the power exponent"
+                                "name": "Result"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names
index b8a8e84eea..56f6267643 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathAABB_VM",
+            "base": "MathAABB_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Overlaps",
+                    "base": "Overlaps",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "SurfaceArea",
+                    "base": "SurfaceArea",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "ToSphere",
+                    "base": "ToSphere",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "FromOBB",
+                    "base": "FromOBB",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -143,7 +143,7 @@
                     ]
                 },
                 {
-                    "key": "Translate",
+                    "base": "Translate",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -181,7 +181,7 @@
                     ]
                 },
                 {
-                    "key": "ContainsVector3",
+                    "base": "ContainsVector3",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -219,7 +219,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -257,7 +257,7 @@
                     ]
                 },
                 {
-                    "key": "FromPoint",
+                    "base": "FromPoint",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "key": "Null",
+                    "base": "Null",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "key": "YExtent",
+                    "base": "YExtent",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "key": "ContainsAABB",
+                    "base": "ContainsAABB",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -421,7 +421,7 @@
                     ]
                 },
                 {
-                    "key": "Expand",
+                    "base": "Expand",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -459,7 +459,7 @@
                     ]
                 },
                 {
-                    "key": "Extents",
+                    "base": "Extents",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -491,7 +491,7 @@
                     ]
                 },
                 {
-                    "key": "FromCenterHalfExtents",
+                    "base": "FromCenterHalfExtents",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -529,7 +529,7 @@
                     ]
                 },
                 {
-                    "key": "GetMin",
+                    "base": "GetMin",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -561,7 +561,7 @@
                     ]
                 },
                 {
-                    "key": "ApplyTransform",
+                    "base": "ApplyTransform",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -599,7 +599,7 @@
                     ]
                 },
                 {
-                    "key": "Center",
+                    "base": "Center",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -631,7 +631,7 @@
                     ]
                 },
                 {
-                    "key": "FromMinMax",
+                    "base": "FromMinMax",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -669,7 +669,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -701,7 +701,7 @@
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -733,7 +733,7 @@
                     ]
                 },
                 {
-                    "key": "GetMax",
+                    "base": "GetMax",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -765,7 +765,7 @@
                     ]
                 },
                 {
-                    "key": "XExtent",
+                    "base": "XExtent",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -797,7 +797,7 @@
                     ]
                 },
                 {
-                    "key": "AddPoint",
+                    "base": "AddPoint",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -835,7 +835,7 @@
                     ]
                 },
                 {
-                    "key": "AddAABB",
+                    "base": "AddAABB",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -873,7 +873,7 @@
                     ]
                 },
                 {
-                    "key": "FromCenterRadius",
+                    "base": "FromCenterRadius",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
@@ -911,7 +911,7 @@
                     ]
                 },
                 {
-                    "key": "ZExtent",
+                    "base": "ZExtent",
                     "context": "MathAABB_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names
index d63799df8b..cc13a61532 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathColor_VM",
+            "base": "MathColor_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "One",
+                    "base": "One",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "LinearToGamma",
+                    "base": "LinearToGamma",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -65,7 +65,7 @@
                     ]
                 },
                 {
-                    "key": "FromVector3",
+                    "base": "FromVector3",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -135,7 +135,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -167,7 +167,7 @@
                     ]
                 },
                 {
-                    "key": "Dot3",
+                    "base": "Dot3",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -243,7 +243,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -331,7 +331,7 @@
                     ]
                 },
                 {
-                    "key": "FromVector3AndNumber",
+                    "base": "FromVector3AndNumber",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "key": "GammaToLinear",
+                    "base": "GammaToLinear",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -401,7 +401,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -483,7 +483,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByColor",
+                    "base": "MultiplyByColor",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -521,7 +521,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
@@ -559,7 +559,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "MathColor_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names
index 1b2b5a4e7d..339b02c5fd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathCrc32_VM",
+            "base": "MathCrc32_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "FromString",
+                    "base": "FromString",
                     "context": "MathCrc32_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names
index a66332a5fa..b1722ef645 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathMatrix3x3_VM",
+            "base": "MathMatrix3x3_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Transpose",
+                    "base": "Transpose",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "Zero",
+                    "base": "Zero",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -65,7 +65,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -103,7 +103,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -147,7 +147,7 @@
                     ]
                 },
                 {
-                    "key": "Invert",
+                    "base": "Invert",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -179,7 +179,7 @@
                     ]
                 },
                 {
-                    "key": "GetDiagonal",
+                    "base": "GetDiagonal",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -211,7 +211,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumn",
+                    "base": "GetColumn",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -249,7 +249,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -287,7 +287,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -325,7 +325,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -357,7 +357,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -395,7 +395,7 @@
                     ]
                 },
                 {
-                    "key": "ToAdjugate",
+                    "base": "ToAdjugate",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -471,7 +471,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByMatrix",
+                    "base": "MultiplyByMatrix",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -509,7 +509,7 @@
                     ]
                 },
                 {
-                    "key": "IsOrthogonal",
+                    "base": "IsOrthogonal",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -541,7 +541,7 @@
                     ]
                 },
                 {
-                    "key": "Orthogonalize",
+                    "base": "Orthogonalize",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -573,7 +573,7 @@
                     ]
                 },
                 {
-                    "key": "GetRows",
+                    "base": "GetRows",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -605,7 +605,7 @@
                     ]
                 },
                 {
-                    "key": "FromCrossProduct",
+                    "base": "FromCrossProduct",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -637,7 +637,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumns",
+                    "base": "GetColumns",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -669,7 +669,7 @@
                     ]
                 },
                 {
-                    "key": "FromTransform",
+                    "base": "FromTransform",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -701,7 +701,7 @@
                     ]
                 },
                 {
-                    "key": "FromScale",
+                    "base": "FromScale",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -733,7 +733,7 @@
                     ]
                 },
                 {
-                    "key": "ToScale",
+                    "base": "ToScale",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -765,7 +765,7 @@
                     ]
                 },
                 {
-                    "key": "FromQuaternion",
+                    "base": "FromQuaternion",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -797,7 +797,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -835,7 +835,7 @@
                     ]
                 },
                 {
-                    "key": "GetRow",
+                    "base": "GetRow",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -873,7 +873,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationYDegrees",
+                    "base": "FromRotationYDegrees",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -905,7 +905,7 @@
                     ]
                 },
                 {
-                    "key": "FromRows",
+                    "base": "FromRows",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -949,7 +949,7 @@
                     ]
                 },
                 {
-                    "key": "FromDiagonal",
+                    "base": "FromDiagonal",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -981,7 +981,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationZDegrees",
+                    "base": "FromRotationZDegrees",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -1013,7 +1013,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix4x4",
+                    "base": "FromMatrix4x4",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -1045,7 +1045,7 @@
                     ]
                 },
                 {
-                    "key": "FromColumns",
+                    "base": "FromColumns",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -1089,7 +1089,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationXDegrees",
+                    "base": "FromRotationXDegrees",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
@@ -1121,7 +1121,7 @@
                     ]
                 },
                 {
-                    "key": "ToDeterminant",
+                    "base": "ToDeterminant",
                     "context": "MathMatrix3x3_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names
index ec8549b966..7df54c7060 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathMatrix4x4_VM",
+            "base": "MathMatrix4x4_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetRow",
+                    "base": "GetRow",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationXDegrees",
+                    "base": "FromRotationXDegrees",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationZDegrees",
+                    "base": "FromRotationZDegrees",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "FromRows",
+                    "base": "FromRows",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -161,7 +161,7 @@
                     ]
                 },
                 {
-                    "key": "ToScale",
+                    "base": "ToScale",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -193,7 +193,7 @@
                     ]
                 },
                 {
-                    "key": "FromQuaternion",
+                    "base": "FromQuaternion",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -225,7 +225,7 @@
                     ]
                 },
                 {
-                    "key": "FromScale",
+                    "base": "FromScale",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -257,7 +257,7 @@
                     ]
                 },
                 {
-                    "key": "FromTransform",
+                    "base": "FromTransform",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "key": "GetTranslation",
+                    "base": "GetTranslation",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -321,7 +321,7 @@
                     ]
                 },
                 {
-                    "key": "FromQuaternionAndTranslation",
+                    "base": "FromQuaternionAndTranslation",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -359,7 +359,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumn",
+                    "base": "GetColumn",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -397,7 +397,7 @@
                     ]
                 },
                 {
-                    "key": "GetDiagonal",
+                    "base": "GetDiagonal",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "key": "Invert",
+                    "base": "Invert",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -461,7 +461,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -505,7 +505,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3",
+                    "base": "FromMatrix3x3",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -537,7 +537,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumns",
+                    "base": "GetColumns",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -569,7 +569,7 @@
                     ]
                 },
                 {
-                    "key": "GetRows",
+                    "base": "GetRows",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -601,7 +601,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByMatrix",
+                    "base": "MultiplyByMatrix",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -639,7 +639,7 @@
                     ]
                 },
                 {
-                    "key": "FromDiagonal",
+                    "base": "FromDiagonal",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -671,7 +671,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationYDegrees",
+                    "base": "FromRotationYDegrees",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -703,7 +703,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -747,7 +747,7 @@
                     ]
                 },
                 {
-                    "key": "Transpose",
+                    "base": "Transpose",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -779,7 +779,7 @@
                     ]
                 },
                 {
-                    "key": "FromColumns",
+                    "base": "FromColumns",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -829,7 +829,7 @@
                     ]
                 },
                 {
-                    "key": "FromTranslation",
+                    "base": "FromTranslation",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -861,7 +861,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -893,7 +893,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
@@ -931,7 +931,7 @@
                     ]
                 },
                 {
-                    "key": "Zero",
+                    "base": "Zero",
                     "context": "MathMatrix4x4_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names
index 4776bbbd8a..4932723ee9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathOBB_VM",
+            "base": "MathOBB_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetPosition",
+                    "base": "GetPosition",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetAxisY",
+                    "base": "GetAxisY",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
@@ -73,7 +73,7 @@
                     ]
                 },
                 {
-                    "key": "GetAxisX",
+                    "base": "GetAxisX",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "FromAabb",
+                    "base": "FromAabb",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
@@ -137,7 +137,7 @@
                     ]
                 },
                 {
-                    "key": "FromPositionRotationAndHalfLengths",
+                    "base": "FromPositionRotationAndHalfLengths",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
@@ -181,7 +181,7 @@
                     ]
                 },
                 {
-                    "key": "GetAxisZ",
+                    "base": "GetAxisZ",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
@@ -213,7 +213,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathOBB_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names
index adea5df187..36d88d5fe9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathPlane_VM",
+            "base": "MathPlane_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetPlaneEquationCoefficients",
+                    "base": "GetPlaneEquationCoefficients",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetDistance",
+                    "base": "GetDistance",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -73,7 +73,7 @@
                     ]
                 },
                 {
-                    "key": "Project",
+                    "base": "Project",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "FromNormalAndPoint",
+                    "base": "FromNormalAndPoint",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -181,7 +181,7 @@
                     ]
                 },
                 {
-                    "key": "Transform",
+                    "base": "Transform",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -219,7 +219,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceToPoint",
+                    "base": "DistanceToPoint",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -257,7 +257,7 @@
                     ]
                 },
                 {
-                    "key": "FromCoefficients",
+                    "base": "FromCoefficients",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -307,7 +307,7 @@
                     ]
                 },
                 {
-                    "key": "FromNormalAndDistance",
+                    "base": "FromNormalAndDistance",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "key": "GetNormal",
+                    "base": "GetNormal",
                     "context": "MathPlane_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names
index 4fc4390979..cc9f2ba875 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathQuaternion_VM",
+            "base": "MathQuaternion_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "RotationYDegrees",
+                    "base": "RotationYDegrees",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "LengthReciprocal",
+                    "base": "LengthReciprocal",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -143,7 +143,7 @@
                     ]
                 },
                 {
-                    "key": "CreateFromEulerAngles",
+                    "base": "CreateFromEulerAngles",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -187,7 +187,7 @@
                     ]
                 },
                 {
-                    "key": "IsIdentity",
+                    "base": "IsIdentity",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -225,7 +225,7 @@
                     ]
                 },
                 {
-                    "key": "FromTransform",
+                    "base": "FromTransform",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -257,7 +257,7 @@
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -301,7 +301,7 @@
                     ]
                 },
                 {
-                    "key": "RotationZDegrees",
+                    "base": "RotationZDegrees",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -333,7 +333,7 @@
                     ]
                 },
                 {
-                    "key": "ConvertTransformToRotation",
+                    "base": "ConvertTransformToRotation",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -365,7 +365,7 @@
                     ]
                 },
                 {
-                    "key": "ShortestArc",
+                    "base": "ShortestArc",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -403,7 +403,7 @@
                     ]
                 },
                 {
-                    "key": "RotationXDegrees",
+                    "base": "RotationXDegrees",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -473,7 +473,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -517,7 +517,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -549,7 +549,7 @@
                     ]
                 },
                 {
-                    "key": "Conjugate",
+                    "base": "Conjugate",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -581,7 +581,7 @@
                     ]
                 },
                 {
-                    "key": "ToAngleDegrees",
+                    "base": "ToAngleDegrees",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -613,7 +613,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -651,7 +651,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -683,7 +683,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -721,7 +721,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -759,7 +759,7 @@
                     ]
                 },
                 {
-                    "key": "Slerp",
+                    "base": "Slerp",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -803,7 +803,7 @@
                     ]
                 },
                 {
-                    "key": "InvertFull",
+                    "base": "InvertFull",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -835,7 +835,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix4x4",
+                    "base": "FromMatrix4x4",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -867,7 +867,7 @@
                     ]
                 },
                 {
-                    "key": "RotateVector3",
+                    "base": "RotateVector3",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -905,7 +905,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3",
+                    "base": "FromMatrix3x3",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -937,7 +937,7 @@
                     ]
                 },
                 {
-                    "key": "Squad",
+                    "base": "Squad",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -993,7 +993,7 @@
                     ]
                 },
                 {
-                    "key": "FromAxisAngleDegrees",
+                    "base": "FromAxisAngleDegrees",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -1031,7 +1031,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -1063,7 +1063,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -1095,7 +1095,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
@@ -1133,7 +1133,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByRotation",
+                    "base": "MultiplyByRotation",
                     "context": "MathQuaternion_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names
index 0ac7a5b5a0..9dffa229ca 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathRandom_VM",
+            "base": "MathRandom_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "RandomPointOnSphere",
+                    "base": "RandomPointOnSphere",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInCircle",
+                    "base": "RandomPointInCircle",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -73,7 +73,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInSquare",
+                    "base": "RandomPointInSquare",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "RandomUnitVector2",
+                    "base": "RandomUnitVector2",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "RandomVector2",
+                    "base": "RandomVector2",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -167,7 +167,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInCylinder",
+                    "base": "RandomPointInCylinder",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "RandomQuaternion",
+                    "base": "RandomQuaternion",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -243,7 +243,7 @@
                     ]
                 },
                 {
-                    "key": "RandomVector4",
+                    "base": "RandomVector4",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -281,7 +281,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInBox",
+                    "base": "RandomPointInBox",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointOnCircle",
+                    "base": "RandomPointOnCircle",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInEllipsoid",
+                    "base": "RandomPointInEllipsoid",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -377,7 +377,7 @@
                     ]
                 },
                 {
-                    "key": "RandomInteger",
+                    "base": "RandomInteger",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInWedge",
+                    "base": "RandomPointInWedge",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -477,7 +477,7 @@
                     ]
                 },
                 {
-                    "key": "RandomGrayscale",
+                    "base": "RandomGrayscale",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -515,7 +515,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInCone",
+                    "base": "RandomPointInCone",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -553,7 +553,7 @@
                     ]
                 },
                 {
-                    "key": "RandomColor",
+                    "base": "RandomColor",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -591,7 +591,7 @@
                     ]
                 },
                 {
-                    "key": "RandomNumber",
+                    "base": "RandomNumber",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -629,7 +629,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInSphere",
+                    "base": "RandomPointInSphere",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -661,7 +661,7 @@
                     ]
                 },
                 {
-                    "key": "RandomUnitVector3",
+                    "base": "RandomUnitVector3",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -685,7 +685,7 @@
                     ]
                 },
                 {
-                    "key": "RandomVector3",
+                    "base": "RandomVector3",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
@@ -723,7 +723,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInArc",
+                    "base": "RandomPointInArc",
                     "context": "MathRandom_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names
index da20b78d90..392596d90b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathTransform_VM",
+            "base": "MathTransform_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "RotationZDegrees",
+                    "base": "RotationZDegrees",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetUp",
+                    "base": "GetUp",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "GetForward",
+                    "base": "GetForward",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -117,7 +117,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -161,7 +161,7 @@
                     ]
                 },
                 {
-                    "key": "RotationXDegrees",
+                    "base": "RotationXDegrees",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -193,7 +193,7 @@
                     ]
                 },
                 {
-                    "key": "FromTranslation",
+                    "base": "FromTranslation",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -225,7 +225,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -257,7 +257,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByUniformScale",
+                    "base": "MultiplyByUniformScale",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -295,7 +295,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByTransform",
+                    "base": "MultiplyByTransform",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -333,7 +333,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotation",
+                    "base": "FromRotation",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -365,7 +365,7 @@
                     ]
                 },
                 {
-                    "key": "RotationYDegrees",
+                    "base": "RotationYDegrees",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -397,7 +397,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationAndTranslation",
+                    "base": "FromRotationAndTranslation",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector3",
+                    "base": "MultiplyByVector3",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -473,7 +473,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector4",
+                    "base": "MultiplyByVector4",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -511,7 +511,7 @@
                     ]
                 },
                 {
-                    "key": "ToScale",
+                    "base": "ToScale",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -543,7 +543,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3",
+                    "base": "FromMatrix3x3",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -575,7 +575,7 @@
                     ]
                 },
                 {
-                    "key": "GetRight",
+                    "base": "GetRight",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -613,7 +613,7 @@
                     ]
                 },
                 {
-                    "key": "IsOrthogonal",
+                    "base": "IsOrthogonal",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -651,7 +651,7 @@
                     ]
                 },
                 {
-                    "key": "Orthogonalize",
+                    "base": "Orthogonalize",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -683,7 +683,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3AndTranslation",
+                    "base": "FromMatrix3x3AndTranslation",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -721,7 +721,7 @@
                     ]
                 },
                 {
-                    "key": "FromScale",
+                    "base": "FromScale",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
@@ -753,7 +753,7 @@
                     ]
                 },
                 {
-                    "key": "GetTranslation",
+                    "base": "GetTranslation",
                     "context": "MathTransform_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names
index 58fcdad8e0..d394306ed0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names
@@ -1,35 +1,33 @@
 {
     "entries": [
         {
-            "key": "MathUtils",
+            "base": "MathUtils",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Math",
+                "name": "Utilities",
                 "category": "Math"
             },
             "methods": [
                 {
-                    "key": "ConvertEulerDegreesToQuaternion",
+                    "base": "ConvertEulerDegreesToQuaternion",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertEulerDegreesToQuaternion"
+                        "tooltip": "When signaled, this will invoke Convert Euler Angles To Quaternion"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertEulerDegreesToQuaternion is invoked"
+                        "tooltip": "Signaled after Convert Euler Angles To Quaternion is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertEulerDegreesToQuaternion",
-                        "category": "Math/Quaternion"
+                        "name": "Convert Euler Angles To Quaternion"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in degrees"
+                                "name": "Angles (Degrees)"
                             }
                         }
                     ],
@@ -37,33 +35,31 @@
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Quaternion",
-                                "tooltip": "Angle as a quaternion"
+                                "name": "Quaternion"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertEulerDegreesToTransformPrecise",
+                    "base": "ConvertEulerDegreesToTransformPrecise",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertEulerDegreesToTransformPrecise"
+                        "tooltip": "When signaled, this will invoke Convert Euler Angles To Transform (Precise)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertEulerDegreesToTransformPrecise is invoked"
+                        "tooltip": "Signaled after Convert Euler Angles To Transform (Precise) is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertEulerDegreesToTransformPrecise",
-                        "category": "Math/Transform"
+                        "name": "Convert Euler Angles To Transform (Precise)",
+                        "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in degrees"
+                                "name": "Angles (Degrees)"
                             }
                         }
                     ],
@@ -71,33 +67,30 @@
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "Transform from a Euler angle"
+                                "name": "Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertEulerDegreesToTransform",
+                    "base": "ConvertEulerDegreesToTransform",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertEulerDegreesToTransform"
+                        "tooltip": "When signaled, this will invoke Convert Euler Angles To Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertEulerDegreesToTransform is invoked"
+                        "tooltip": "Signaled after Convert Euler Angles To Transform is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertEulerDegreesToTransform",
-                        "category": "Math/Transform"
+                        "name": "Convert Euler Angles To Transform"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in degrees"
+                                "name": "Angles (Degrees)"
                             }
                         }
                     ],
@@ -105,33 +98,30 @@
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "Transform from a Euler angle"
+                                "name": "Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertQuaternionToEulerRadians",
+                    "base": "ConvertQuaternionToEulerRadians",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertQuaternionToEulerRadians"
+                        "tooltip": "When signaled, this will invoke Convert Quaternion To Euler Angles (Radians)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertQuaternionToEulerRadians is invoked"
+                        "tooltip": "Signaled after Convert Quaternion To Euler Angles (Radians) is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertQuaternionToEulerRadians",
-                        "category": "Math/Quaternion"
+                        "name": "Convert Quaternion To Euler Angles (Radians)"
                     },
                     "params": [
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Quaternion",
-                                "tooltip": "Quaternion angle"
+                                "name": "Quaternion"
                             }
                         }
                     ],
@@ -139,47 +129,43 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in radians"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateLookAt",
+                    "base": "CreateLookAt",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateLookAt"
+                        "tooltip": "When signaled, this will invoke Create Look At"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateLookAt is invoked"
+                        "tooltip": "Signaled after Create Look At is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::CreateLookAt",
-                        "category": "Math/Transform"
+                        "name": "Create Look At"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "From Position",
-                                "tooltip": "The position looking from"
+                                "name": "From"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Target Position",
-                                "tooltip": "The position looking at"
+                                "name": "To"
                             }
                         },
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "Forward Axis",
-                                "tooltip": "1 == X, 2 == -X, 3 == Y, 4 == -Y, 5 == Z, 6 == -Z"
+                                "name": "Axis",
+                                "tooltip": "0: X+, 1: X-, 2: Y+, 3: Y-, 4: Z+, 5: Z-"
                             }
                         }
                     ],
@@ -187,33 +173,30 @@
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "The look at rotation expressed as a transform"
+                                "name": "Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertTransformToEulerRadians",
+                    "base": "ConvertTransformToEulerRadians",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertTransformToEulerRadians"
+                        "tooltip": "When signaled, this will invoke Convert Transform To Euler Angles (Radians)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertTransformToEulerRadians is invoked"
+                        "tooltip": "Signaled after Convert Transform To Euler Angles (Radians) is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertTransformToEulerRadians",
-                        "category": "Math/Transform"
+                        "name": "Convert Transform To Euler Angles (Radians)"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "The rotation from the transform is used for the conversion"
+                                "name": "Transform"
                             }
                         }
                     ],
@@ -221,33 +204,30 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in radians"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertQuaternionToEulerDegrees",
+                    "base": "ConvertQuaternionToEulerDegrees",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertQuaternionToEulerDegrees"
+                        "tooltip": "When signaled, this will invoke Convert Quaternion To Euler Angles (Degrees)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertQuaternionToEulerDegrees is invoked"
+                        "tooltip": "Signaled after Convert Quaternion To Euler Angles (Degrees) is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertQuaternionToEulerDegrees",
-                        "category": "Math/Quaternion"
+                        "name": "Convert Quaternion To Euler Angles (Degrees)"
                     },
                     "params": [
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Quaternion",
-                                "tooltip": "Quaternion angle"
+                                "name": "Quaternion"
                             }
                         }
                     ],
@@ -255,33 +235,30 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in degrees"
+                                "name": "Angles (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertTransformToEulerDegrees",
+                    "base": "ConvertTransformToEulerDegrees",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertTransformToEulerDegrees"
+                        "tooltip": "When signaled, this will invoke Convert Transform To Euler Angles (Degrees)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertTransformToEulerDegrees is invoked"
+                        "tooltip": "Signaled after Convert Transform To Euler Angles (Degrees) is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertTransformToEulerDegrees",
-                        "category": "Math/Transform"
+                        "name": "Convert Transform To Euler Angles (Degrees)"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "The rotation from the transform is used for the conversion"
+                                "name": "Transform"
                             }
                         }
                     ],
@@ -289,33 +266,30 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in degrees"
+                                "name": "Angles (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ConvertEulerRadiansToQuaternion",
+                    "base": "ConvertEulerRadiansToQuaternion",
                     "context": "MathUtils",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertEulerRadiansToQuaternion"
+                        "tooltip": "When signaled, this will invoke Convert Euler Angles (Radians) To Quaternion"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertEulerRadiansToQuaternion is invoked"
+                        "tooltip": "Signaled after Convert Euler Angles (Radians) To Quaternion is invoked"
                     },
                     "details": {
-                        "name": "MathUtils::ConvertEulerRadiansToQuaternion",
-                        "category": "Math/Quaternion"
+                        "name": "Convert Euler Angles (Radians) To Quaternion"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Euler Angle",
-                                "tooltip": "Euler angle in radians"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ],
@@ -323,8 +297,7 @@
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Quaternion",
-                                "tooltip": "Angle as a quaternion"
+                                "name": "Quaternion"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names
index aefb8a3b4b..ad6cca60a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathVector2_VM",
+            "base": "MathVector2_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "DirectionTo",
+                    "base": "DirectionTo",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -91,7 +91,7 @@
                     ]
                 },
                 {
-                    "key": "Project",
+                    "base": "Project",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -167,7 +167,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -243,7 +243,7 @@
                     ]
                 },
                 {
-                    "key": "Angle",
+                    "base": "Angle",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -275,7 +275,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -307,7 +307,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -427,7 +427,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -465,7 +465,7 @@
                     ]
                 },
                 {
-                    "key": "Slerp",
+                    "base": "Slerp",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -509,7 +509,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -547,7 +547,7 @@
                     ]
                 },
                 {
-                    "key": "SetY",
+                    "base": "SetY",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -585,7 +585,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -629,7 +629,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -667,7 +667,7 @@
                     ]
                 },
                 {
-                    "key": "IsNormalized",
+                    "base": "IsNormalized",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -705,7 +705,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -737,7 +737,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -769,7 +769,7 @@
                     ]
                 },
                 {
-                    "key": "ToPerpendicular",
+                    "base": "ToPerpendicular",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -801,7 +801,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -833,7 +833,7 @@
                     ]
                 },
                 {
-                    "key": "Max",
+                    "base": "Max",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -871,7 +871,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -909,7 +909,7 @@
                     ]
                 },
                 {
-                    "key": "Absolute",
+                    "base": "Absolute",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -941,7 +941,7 @@
                     ]
                 },
                 {
-                    "key": "SetX",
+                    "base": "SetX",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -979,7 +979,7 @@
                     ]
                 },
                 {
-                    "key": "Min",
+                    "base": "Min",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -1017,7 +1017,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByVector",
+                    "base": "DivideByVector",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -1055,7 +1055,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceSquared",
+                    "base": "DistanceSquared",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -1093,7 +1093,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
@@ -1125,7 +1125,7 @@
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "MathVector2_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names
index 001fc94f4d..445031012f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathVector3_VM",
+            "base": "MathVector3_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Reciprocal",
+                    "base": "Reciprocal",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "Project",
+                    "base": "Project",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -117,7 +117,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -187,7 +187,7 @@
                     ]
                 },
                 {
-                    "key": "SetZ",
+                    "base": "SetZ",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -225,7 +225,7 @@
                     ]
                 },
                 {
-                    "key": "Max",
+                    "base": "Max",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -263,7 +263,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -301,7 +301,7 @@
                     ]
                 },
                 {
-                    "key": "Absolute",
+                    "base": "Absolute",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -333,7 +333,7 @@
                     ]
                 },
                 {
-                    "key": "BuildTangentBasis",
+                    "base": "BuildTangentBasis",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -365,7 +365,7 @@
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -409,7 +409,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -447,7 +447,7 @@
                     ]
                 },
                 {
-                    "key": "Slerp",
+                    "base": "Slerp",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -491,7 +491,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -529,7 +529,7 @@
                     ]
                 },
                 {
-                    "key": "SetY",
+                    "base": "SetY",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -567,7 +567,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -611,7 +611,7 @@
                     ]
                 },
                 {
-                    "key": "Cross",
+                    "base": "Cross",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -649,7 +649,7 @@
                     ]
                 },
                 {
-                    "key": "DirectionTo",
+                    "base": "DirectionTo",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -693,7 +693,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -731,7 +731,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -763,7 +763,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -801,7 +801,7 @@
                     ]
                 },
                 {
-                    "key": "IsPerpendicular",
+                    "base": "IsPerpendicular",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -845,7 +845,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -877,7 +877,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -915,7 +915,7 @@
                     ]
                 },
                 {
-                    "key": "IsNormalized",
+                    "base": "IsNormalized",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -953,7 +953,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -985,7 +985,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1029,7 +1029,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1067,7 +1067,7 @@
                     ]
                 },
                 {
-                    "key": "SetX",
+                    "base": "SetX",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1105,7 +1105,7 @@
                     ]
                 },
                 {
-                    "key": "LengthReciprocal",
+                    "base": "LengthReciprocal",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1137,7 +1137,7 @@
                     ]
                 },
                 {
-                    "key": "Min",
+                    "base": "Min",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1175,7 +1175,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceSquared",
+                    "base": "DistanceSquared",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1213,7 +1213,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1245,7 +1245,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByVector",
+                    "base": "DivideByVector",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
@@ -1283,7 +1283,7 @@
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "MathVector3_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names
index 87654cb3f9..5caadf4728 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MathVector4_VM",
+            "base": "MathVector4_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "SetW",
+                    "base": "SetW",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "SetX",
+                    "base": "SetX",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -85,7 +85,7 @@
                     ]
                 },
                 {
-                    "key": "IsNormalized",
+                    "base": "IsNormalized",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -123,7 +123,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -155,7 +155,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -193,7 +193,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -225,7 +225,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -263,7 +263,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -313,7 +313,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -377,7 +377,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -415,7 +415,7 @@
                     ]
                 },
                 {
-                    "key": "DirectionTo",
+                    "base": "DirectionTo",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -459,7 +459,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByVector",
+                    "base": "DivideByVector",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -497,7 +497,7 @@
                     ]
                 },
                 {
-                    "key": "LengthReciprocal",
+                    "base": "LengthReciprocal",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -529,7 +529,7 @@
                     ]
                 },
                 {
-                    "key": "SetZ",
+                    "base": "SetZ",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -567,7 +567,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -599,7 +599,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -637,7 +637,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -681,7 +681,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -719,7 +719,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -757,7 +757,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -795,7 +795,7 @@
                     ]
                 },
                 {
-                    "key": "Reciprocal",
+                    "base": "Reciprocal",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -827,7 +827,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -865,7 +865,7 @@
                     ]
                 },
                 {
-                    "key": "Absolute",
+                    "base": "Absolute",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
@@ -897,7 +897,7 @@
                     ]
                 },
                 {
-                    "key": "SetY",
+                    "base": "SetY",
                     "context": "MathVector4_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names
index d3b492ff31..e8a695f972 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Math_VM",
+            "base": "Math_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "ThreeGeneric",
+                    "base": "ThreeGeneric",
                     "context": "Math_VM",
                     "entry": {
                         "name": "In",
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyAndAdd",
+                    "base": "MultiplyAndAdd",
                     "context": "Math_VM",
                     "entry": {
                         "name": "In",
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "StringToNumber",
+                    "base": "StringToNumber",
                     "context": "Math_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names
index 7aea9d3918..4b529d8dda 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Matrix3x4",
+            "base": "Matrix3x4",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateZero",
+                    "base": "CreateZero",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -20,86 +20,86 @@
                         "tooltip": "Signaled after CreateZero is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateZero",
-                        "category": "Other"
+                        "name": "Create Zero",
+                        "tooltip": "Creates a Matrix3x4 with all values zero"
                     },
                     "results": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRotationPartFromQuaternion",
+                    "base": "SetRotationPartFromQuaternion",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRotationPartFromQuaternion"
+                        "tooltip": "When signaled, this will invoke Set Rotation Part From Quaternion"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRotationPartFromQuaternion is invoked"
+                        "tooltip": "Signaled after Set Rotation Part From Quaternion is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetRotationPartFromQuaternion",
-                        "category": "Other"
+                        "name": "Set Rotation Part From Quaternion",
+                        "tooltip": "Sets the 3x3 part of the matrix from a quaternion"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "const Quaternion&"
+                                "name": "Quaternion"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromColumns",
+                    "base": "CreateFromColumns",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromColumns"
+                        "tooltip": "When signaled, this will invoke Create From Columns"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromColumns is invoked"
+                        "tooltip": "Signaled after Create From Columns is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromColumns",
-                        "category": "Other"
+                        "name": "Create From Columns",
+                        "tooltip": "Constructs from individual columns"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 1"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 2"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 3"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 4"
                             }
                         }
                     ],
@@ -107,43 +107,43 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsClose"
+                        "tooltip": "When signaled, this will invoke Is Close"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsClose is invoked"
+                        "tooltip": "Signaled after Is Close is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::IsClose",
-                        "category": "Other"
+                        "name": "Is Close",
+                        "tooltip": "Tests element-wise whether this matrix is close to another matrix, within the specified tolerance"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "B"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Tolerance"
                             }
                         }
                     ],
@@ -151,37 +151,37 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Close"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsOrthogonal",
+                    "base": "IsOrthogonal",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsOrthogonal"
+                        "tooltip": "When signaled, this will invoke Is Orthogonal"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsOrthogonal is invoked"
+                        "tooltip": "Signaled after Is Orthogonal is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::IsOrthogonal",
-                        "category": "Other"
+                        "name": "Is Orthogonal",
+                        "tooltip": "Tests if the 3x3 part of the matrix is orthogonal"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Tolerance"
                             }
                         }
                     ],
@@ -189,13 +189,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Orthogonal"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Orthogonalize",
+                    "base": "Orthogonalize",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -206,38 +206,38 @@
                         "tooltip": "Signaled after Orthogonalize is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::Orthogonalize",
-                        "category": "Other"
+                        "name": "Orthogonalize",
+                        "tooltip": "Modifies the basis vectors of the matrix to be orthogonal and unit length"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromMatrix3x3",
+                    "base": "CreateFromMatrix3x3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromMatrix3x3"
+                        "tooltip": "When signaled, this will invoke Create From Matrix3x3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromMatrix3x3 is invoked"
+                        "tooltip": "Signaled after Create From Matrix3x3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromMatrix3x3",
-                        "category": "Other"
+                        "name": "Create From Matrix3x3",
+                        "tooltip": "Constructs from a Matrix3x3, with translation set to zero"
                     },
                     "params": [
                         {
                             "typeid": "{15A4332F-7C3F-4A58-AC35-50E1CE53FB9C}",
                             "details": {
-                                "name": "const Matrix3x3&"
+                                "name": "Matrix3x3"
                             }
                         }
                     ],
@@ -245,31 +245,31 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RetrieveScale",
+                    "base": "RetrieveScale",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RetrieveScale"
+                        "tooltip": "When signaled, this will invoke Retrieve Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RetrieveScale is invoked"
+                        "tooltip": "Signaled after Retrieve Scale is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::RetrieveScale",
-                        "category": "Other"
+                        "name": "Retrieve Scale",
+                        "tooltip": "Gets the scale part of the transformation (the length of the basis vectors)"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -277,31 +277,31 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateRotationX",
+                    "base": "CreateRotationX",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateRotationX"
+                        "tooltip": "When signaled, this will invoke Create Rotation X"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateRotationX is invoked"
+                        "tooltip": "Signaled after Create Rotation X is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateRotationX",
-                        "category": "Other"
+                        "name": "Create Rotation X",
+                        "tooltip": "Sets the matrix to be a rotation around the X-axis, specified in radians"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angle (Radians)"
                             }
                         }
                     ],
@@ -309,37 +309,36 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromMatrix3x3AndTranslation",
+                    "base": "CreateFromMatrix3x3AndTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromMatrix3x3AndTranslation"
+                        "tooltip": "When signaled, this will invoke Create From Matrix3x3 And Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromMatrix3x3AndTranslation is invoked"
+                        "tooltip": "Signaled after Create From Matrix3x3 And Translation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromMatrix3x3AndTranslation",
-                        "category": "Other"
+                        "name": "Create From Matrix3x3 And Translation"
                     },
                     "params": [
                         {
                             "typeid": "{15A4332F-7C3F-4A58-AC35-50E1CE53FB9C}",
                             "details": {
-                                "name": "const Matrix3x3&"
+                                "name": "Matrix3x3"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Translation"
                             }
                         }
                     ],
@@ -347,13 +346,13 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -364,14 +363,13 @@
                         "tooltip": "Signaled after ToString is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::ToString",
-                        "category": "Other"
+                        "name": "To String"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -379,31 +377,31 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "String"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExtractScale",
+                    "base": "ExtractScale",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ExtractScale"
+                        "tooltip": "When signaled, this will invoke Extract Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ExtractScale is invoked"
+                        "tooltip": "Signaled after Extract Scale is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::ExtractScale",
-                        "category": "Other"
+                        "name": "Extract Scale",
+                        "tooltip": "Gets the scale part of the transformation as in RetrieveScale, and also removes this scaling from the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -411,31 +409,30 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTranspose",
+                    "base": "GetTranspose",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTranspose"
+                        "tooltip": "When signaled, this will invoke Get Transpose"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTranspose is invoked"
+                        "tooltip": "Signaled after Get Transpose is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetTranspose",
-                        "category": "Other"
+                        "name": "Get Transpose"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -443,67 +440,67 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Transpose"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "InvertFast",
+                    "base": "InvertFast",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke InvertFast"
+                        "tooltip": "When signaled, this will invoke Invert Fast"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after InvertFast is invoked"
+                        "tooltip": "Signaled after Invert Fast is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::InvertFast",
-                        "category": "Other"
+                        "name": "Invert Fast",
+                        "tooltip": "Inverts the transformation represented by the matrix, assuming the 3x3 part is orthogonal"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Inverted"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromRows",
+                    "base": "CreateFromRows",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromRows"
+                        "tooltip": "When signaled, this will invoke Create From Rows"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromRows is invoked"
+                        "tooltip": "Signaled after Create From Rows is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromRows",
-                        "category": "Other"
+                        "name": "Create From Rows",
+                        "tooltip": "Constructs from individual rows"
                     },
                     "params": [
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Row 1"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Row 2"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Row 3"
                             }
                         }
                     ],
@@ -511,31 +508,31 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateTranslation",
+                    "base": "CreateTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateTranslation"
+                        "tooltip": "When signaled, this will invoke Create Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateTranslation is invoked"
+                        "tooltip": "Signaled after Create Translation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateTranslation",
-                        "category": "Other"
+                        "name": "Create Translation",
+                        "tooltip": "Sets the matrix to be a translation matrix, with 3x3 part set to the identity"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Translation"
                             }
                         }
                     ],
@@ -543,13 +540,13 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTranspose3x3",
+                    "base": "GetTranspose3x3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -560,14 +557,14 @@
                         "tooltip": "Signaled after GetTranspose3x3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetTranspose3x3",
-                        "category": "Other"
+                        "name": "Get Transpose 3x3",
+                        "tooltip": "Gets the matrix obtained by transposing the 3x3 part of the matrix, leaving the translation untouched"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -575,73 +572,73 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Transpose"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetColumn",
+                    "base": "SetColumn",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColumn"
+                        "tooltip": "When signaled, this will invoke Set Column"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColumn is invoked"
+                        "tooltip": "Signaled after Set Column is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetColumn",
-                        "category": "Other"
+                        "name": "Set Column",
+                        "tooltip": "Sets the specified column"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Column Index"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Vector3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetRow",
+                    "base": "GetRow",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRow"
+                        "tooltip": "When signaled, this will invoke Get Row"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRow is invoked"
+                        "tooltip": "Signaled after Get Row is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetRow",
-                        "category": "Other"
+                        "name": "Get Row",
+                        "tooltip": "Gets the specified row"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Row Index"
                             }
                         }
                     ],
@@ -655,7 +652,7 @@
                     ]
                 },
                 {
-                    "key": "GetInverseFast",
+                    "base": "GetInverseFast",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -666,14 +663,14 @@
                         "tooltip": "Signaled after GetInverseFast is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetInverseFast",
-                        "category": "Other"
+                        "name": "GetInverseFast",
+                        "tooltip": "Gets the inverse of the transformation represented by the matrix.\nThis function works for any matrix, even if they have scaling or skew.\nIf the 3x3 part of the matrix is orthogonal then \ref GetInverseFast is much faster"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -681,31 +678,32 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Inverse"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOrthogonalized",
+                    "base": "GetOrthogonalized",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOrthogonalized"
+                        "tooltip": "When signaled, this will invoke Get Orthogonalized"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOrthogonalized is invoked"
+                        "tooltip": "Signaled after Get Orthogonalized is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetOrthogonalized",
-                        "category": "Other"
+                        "name": "Get Orthogonalized",
+                        "tooltip": "Returns an orthogonal matrix based on this matrix"
+                        
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -713,13 +711,13 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Orthogonalized"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Multiply3x3",
+                    "base": "Multiply3x3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -730,20 +728,20 @@
                         "tooltip": "Signaled after Multiply3x3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::Multiply3x3",
-                        "category": "Other"
+                        "name": "Multiply 3x3",
+                        "tooltip": "Post-multiplies the matrix by a vector, using only the 3x3 part of the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Vector3"
                             }
                         }
                     ],
@@ -751,31 +749,31 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsFinite"
+                        "tooltip": "When signaled, this will invoke Is Finite"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsFinite is invoked"
+                        "tooltip": "Signaled after Is Finite is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::IsFinite",
-                        "category": "Other"
+                        "name": "Is Finite",
+                        "tooltip": "Checks whether the elements of the matrix are all finite"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -783,31 +781,31 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Finite"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromQuaternion",
+                    "base": "CreateFromQuaternion",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromQuaternion"
+                        "tooltip": "When signaled, this will invoke Create From Quaternion"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromQuaternion is invoked"
+                        "tooltip": "Signaled after Create From Quaternion is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromQuaternion",
-                        "category": "Other"
+                        "name": "Create From Quaternion",
+                        "tooltip": "Sets the matrix from a quaternion, with translation set to zero"
                     },
                     "params": [
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "const Quaternion&"
+                                "name": "Quaternion"
                             }
                         }
                     ],
@@ -815,117 +813,117 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBasisAndTranslation",
+                    "base": "SetBasisAndTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBasisAndTranslation"
+                        "tooltip": "When signaled, this will invoke Set Basis And Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBasisAndTranslation is invoked"
+                        "tooltip": "Signaled after Set Basis And Translation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetBasisAndTranslation",
-                        "category": "Other"
+                        "name": "Set Basis And Translation",
+                        "tooltip": "Sets the three basis vectors and the translation"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Basis X"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Basis Y"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Basis Z"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MultiplyVector4",
+                    "base": "MultiplyVector4",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke MultiplyVector4"
+                        "tooltip": "When signaled, this will invoke Multiply Vector4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after MultiplyVector4 is invoked"
+                        "tooltip": "Signaled after Multiply Vector4 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::MultiplyVector4",
-                        "category": "Other"
+                        "name": "Multiply Vector4",
+                        "tooltip": "Operator for transforming a Vector4"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
-                        {
-                            "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
-                            "details": {
-                                "name": "const Vector4&"
-                            }
-                        }
-                    ],
-                    "results": [
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
                                 "name": "Vector4"
                             }
                         }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
                     ]
                 },
                 {
-                    "key": "CreateScale",
+                    "base": "CreateScale",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateScale"
+                        "tooltip": "When signaled, this will invoke Create Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateScale is invoked"
+                        "tooltip": "Signaled after Create Scale is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateScale",
-                        "category": "Other"
+                        "name": "Create Scale",
+                        "tooltip": "Sets the matrix to be a scale matrix, with translation set to zero"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Scale"
                             }
                         }
                     ],
@@ -933,31 +931,31 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateDiagonal",
+                    "base": "CreateDiagonal",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateDiagonal"
+                        "tooltip": "When signaled, this will invoke Create Diagonal"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateDiagonal is invoked"
+                        "tooltip": "Signaled after Create Diagonal is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateDiagonal",
-                        "category": "Other"
+                        "name": "Create Diagonal",
+                        "tooltip": "Sets the matrix to be a diagonal matrix, with translation set to zero"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Diagonal"
                             }
                         }
                     ],
@@ -965,31 +963,31 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTranslation",
+                    "base": "GetTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTranslation"
+                        "tooltip": "When signaled, this will invoke Get Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTranslation is invoked"
+                        "tooltip": "Signaled after Get Translation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetTranslation",
-                        "category": "Other"
+                        "name": "Get Translation",
+                        "tooltip": "Gets the translation"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -997,127 +995,127 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "InvertFull",
+                    "base": "InvertFull",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke InvertFull"
+                        "tooltip": "When signaled, this will invoke Invert Full"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after InvertFull is invoked"
+                        "tooltip": "Signaled after Invert Full is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::InvertFull",
-                        "category": "Other"
+                        "name": "Invert Full",
+                        "tooltip": "Inverts the transformation represented by the matrix\nThis function works for any matrix, even if they have scaling or skew\nIf the 3x3 part of the matrix is orthogonal then \ref InvertFast is much faster"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Inverted"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetColumns",
+                    "base": "SetColumns",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColumns"
+                        "tooltip": "When signaled, this will invoke Set Columns"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColumns is invoked"
+                        "tooltip": "Signaled after Set Columns is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetColumns",
-                        "category": "Other"
+                        "name": "Set Columns",
+                        "tooltip": "Sets all the columns of the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 1"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 2"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 3"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Column 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetElement",
+                    "base": "SetElement",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetElement"
+                        "tooltip": "When signaled, this will invoke Set Element"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetElement is invoked"
+                        "tooltip": "Signaled after Set Element is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetElement",
-                        "category": "Other"
+                        "name": "Set Element",
+                        "tooltip": "Sets the element in the specified row and column\nAccessing individual elements can be slower than working with entire rows"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Row"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Column"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -1128,20 +1126,20 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::Equal",
-                        "category": "Other"
+                        "name": "Equal",
+                        "tooltip": "Compares if two Matrix3x4 are equal"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "A"
                             }
                         },
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "B"
                             }
                         }
                     ],
@@ -1149,31 +1147,31 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Equal"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetDeterminant3x3",
+                    "base": "GetDeterminant3x3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDeterminant3x3"
+                        "tooltip": "When signaled, this will invoke Get Determinant 3x3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDeterminant3x3 is invoked"
+                        "tooltip": "Signaled after Get Determinant 3x3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetDeterminant3x3",
-                        "category": "Other"
+                        "name": "Get Determinant 3x3",
+                        "tooltip": "Calculates the determinant of the 3x3 part of the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -1181,61 +1179,61 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Determinant"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColumns",
+                    "base": "GetColumns",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColumns"
+                        "tooltip": "When signaled, this will invoke Get Columns"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColumns is invoked"
+                        "tooltip": "Signaled after Get Columns is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetColumns",
-                        "category": "Other"
+                        "name": "Get Columns",
+                        "tooltip": "Gets all the columns of the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Column 1"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Column 2"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Column 3"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Column 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRows",
+                    "base": "SetRows",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -1246,62 +1244,62 @@
                         "tooltip": "Signaled after SetRows is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetRows",
-                        "category": "Other"
+                        "name": "SetRows",
+                        "tooltip": "Sets all rows of the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Row 1"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Row 2"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Row 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMultipliedByScale",
+                    "base": "GetMultipliedByScale",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMultipliedByScale"
+                        "tooltip": "When signaled, this will invoke Get Multiplied By Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMultipliedByScale is invoked"
+                        "tooltip": "Signaled after Get Multiplied By Scale is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetMultipliedByScale",
-                        "category": "Other"
+                        "name": "Get Multiplied By Scale",
+                        "tooltip": "Gets a copy of the Matrix3x4 and multiplies it by the specified scale"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Scale"
                             }
                         }
                     ],
@@ -1309,31 +1307,31 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateRotationZ",
+                    "base": "CreateRotationZ",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateRotationZ"
+                        "tooltip": "When signaled, this will invoke Create Rotation Z"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateRotationZ is invoked"
+                        "tooltip": "Signaled after Create Rotation Z is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateRotationZ",
-                        "category": "Other"
+                        "name": "CreateRotationZ",
+                        "tooltip": "Sets the matrix to be a rotation around the Z-axis, specified in radians"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angle (Radians)"
                             }
                         }
                     ],
@@ -1341,37 +1339,37 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromQuaternionAndTranslation",
+                    "base": "CreateFromQuaternionAndTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromQuaternionAndTranslation"
+                        "tooltip": "When signaled, this will invoke Create From Quaternion And Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromQuaternionAndTranslation is invoked"
+                        "tooltip": "Signaled after Create From Quaternion And Translation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromQuaternionAndTranslation",
-                        "category": "Other"
+                        "name": "Create From Quaternion And Translation",
+                        "tooltip": "Sets the matrix from a quaternion and a translation"
                     },
                     "params": [
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "const Quaternion&"
+                                "name": "Quaternion"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Translation"
                             }
                         }
                     ],
@@ -1379,37 +1377,37 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetRowAsVector3",
+                    "base": "GetRowAsVector3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRowAsVector3"
+                        "tooltip": "When signaled, this will invoke Get Row As Vector3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRowAsVector3 is invoked"
+                        "tooltip": "Signaled after Get Row As Vector3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetRowAsVector3",
-                        "category": "Other"
+                        "name": "Get Row As Vector3",
+                        "tooltip": "Gets the specified row as a Vector3"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Row"
                             }
                         }
                     ],
@@ -1417,37 +1415,37 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MultiplyMatrix3x4",
+                    "base": "MultiplyMatrix3x4",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke MultiplyMatrix3x4"
+                        "tooltip": "When signaled, this will invoke Multiply Matrix3x4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after MultiplyMatrix3x4 is invoked"
+                        "tooltip": "Signaled after Multiply Matrix3x4 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::MultiplyMatrix3x4",
-                        "category": "Other"
+                        "name": "Multiply Matrix3x4",
+                        "tooltip": "Operator for matrix-matrix multiplication"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Multiplicand"
                             }
                         }
                     ],
@@ -1455,55 +1453,55 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetRows",
+                    "base": "GetRows",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRows"
+                        "tooltip": "When signaled, this will invoke Get Rows"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRows is invoked"
+                        "tooltip": "Signaled after Get Rows is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetRows",
-                        "category": "Other"
+                        "name": "GetRows",
+                        "tooltip": "Gets all rows of the matrix"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4*"
+                                "name": "Row 1"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4*"
+                                "name": "Row 2"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4*"
+                                "name": "Row 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Clone",
+                    "base": "Clone",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -1514,14 +1512,14 @@
                         "tooltip": "Signaled after Clone is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::Clone",
-                        "category": "Other"
+                        "name": "Clone",
+                        "tooltip": "Returns a deep copy of the provided Matrix3x4"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -1529,75 +1527,75 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Clone"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MultiplyVector3",
+                    "base": "MultiplyVector3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke MultiplyVector3"
+                        "tooltip": "When signaled, this will invoke Multiply Vector3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after MultiplyVector3 is invoked"
+                        "tooltip": "Signaled after Multiply Vector3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::MultiplyVector3",
-                        "category": "Other"
+                        "name": "Multiply Vector3",
+                        "tooltip": "perator for transforming a Vector3"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "const Vector3&"
-                            }
-                        }
-                    ],
-                    "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
                                 "name": "Vector3"
                             }
                         }
-                    ]
-                },
-                {
-                    "key": "CreateIdentity",
-                    "context": "Matrix3x4",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateIdentity"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after CreateIdentity is invoked"
-                    },
-                    "details": {
-                        "name": "Matrix3x4::CreateIdentity",
-                        "category": "Other"
-                    },
+                    ],
                     "results": [
                         {
-                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBasisAndTranslation",
+                    "base": "CreateIdentity",
+                    "context": "Matrix3x4",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Create Identity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Create Identity is invoked"
+                    },
+                    "details": {
+                        "name": "Create Identity",
+                        "tooltip": "Creates an identity Matrix3x4"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetBasisAndTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -1608,62 +1606,62 @@
                         "tooltip": "Signaled after GetBasisAndTranslation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetBasisAndTranslation",
-                        "category": "Other"
+                        "name": "GetBasisAndTranslation",
+                        "tooltip": "Gets the three basis vectors and the translation"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Basis X"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Basis Y"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Basis Z"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3*"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateFromValue",
+                    "base": "CreateFromValue",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateFromValue"
+                        "tooltip": "When signaled, this will invoke Create From Value"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateFromValue is invoked"
+                        "tooltip": "Signaled after Create From Value is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateFromValue",
-                        "category": "Other"
+                        "name": "Create From Value",
+                        "tooltip": "Constructs a matrix with all components set to the specified value"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -1671,43 +1669,43 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetElement"
+                        "tooltip": "When signaled, this will invoke Get Element"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetElement is invoked"
+                        "tooltip": "Signaled after Get Element is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetElement",
-                        "category": "Other"
+                        "name": "Get Element",
+                        "tooltip": "Gets the element in the specified row and column\nAccessing individual elements can be slower than working with entire rows"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Row"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Column"
                             }
                         }
                     ],
@@ -1715,37 +1713,37 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Transpose3x3",
+                    "base": "Transpose3x3",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Transpose3x3"
+                        "tooltip": "When signaled, this will invoke Transpose 3x3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Transpose3x3 is invoked"
+                        "tooltip": "Signaled after Transpose 3x3 is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::Transpose3x3",
-                        "category": "Other"
+                        "name": "Transpose 3x3",
+                        "tooltip": "Gets the matrix obtained by transposing the 3x3 part of the matrix, leaving the translation untouched"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Transpose",
+                    "base": "Transpose",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -1756,38 +1754,38 @@
                         "tooltip": "Signaled after Transpose is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::Transpose",
-                        "category": "Other"
+                        "name": "Transpose",
+                        "tooltip": "Transposes the 3x3 part of the matrix, and sets the translation part to zero"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateRotationY",
+                    "base": "CreateRotationY",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateRotationY"
+                        "tooltip": "When signaled, this will invoke Create Rotation Y"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateRotationY is invoked"
+                        "tooltip": "Signaled after Create Rotation Y is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::CreateRotationY",
-                        "category": "Other"
+                        "name": "Create Rotation Y",
+                        "tooltip": "Sets the matrix to be a rotation around the Y-axis, specified in radians"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angle (Radians)"
                             }
                         }
                     ],
@@ -1795,13 +1793,13 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRow",
+                    "base": "SetRow",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
@@ -1812,50 +1810,50 @@
                         "tooltip": "Signaled after SetRow is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetRow",
-                        "category": "Other"
+                        "name": "Set Row",
+                        "tooltip": "Sets the specified row"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Row Index"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "Vector4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetInverseFull",
+                    "base": "GetInverseFull",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetInverseFull"
+                        "tooltip": "When signaled, this will invoke Get Inverse Full"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetInverseFull is invoked"
+                        "tooltip": "Signaled after Get Inverse Full is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetInverseFull",
-                        "category": "Other"
+                        "name": "Get Inverse Full",
+                        "tooltip": "Gets the inverse of the transformation represented by the matrix\nThis function works for any matrix, even if they have scaling or skew\nIf the 3x3 part of the matrix is orthogonal then \ref GetInverseFast is much faster"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         }
                     ],
@@ -1863,37 +1861,37 @@
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColumn",
+                    "base": "GetColumn",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColumn"
+                        "tooltip": "When signaled, this will invoke Get Column"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColumn is invoked"
+                        "tooltip": "Signaled after Get Column is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::GetColumn",
-                        "category": "Other"
+                        "name": "Get Column",
+                        "tooltip": "Gets the specified column"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "const Matrix3x4&"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Column Index"
                             }
                         }
                     ],
@@ -1901,37 +1899,213 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Column"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTranslation",
+                    "base": "SetTranslation",
                     "context": "Matrix3x4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTranslation"
+                        "tooltip": "When signaled, this will invoke Set Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTranslation is invoked"
+                        "tooltip": "Signaled after Set Translation is invoked"
                     },
                     "details": {
-                        "name": "Matrix3x4::SetTranslation",
-                        "category": "Other"
+                        "name": "Set Translation",
+                        "tooltip": "Sets the translation"
                     },
                     "params": [
                         {
                             "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
                             "details": {
-                                "name": "Matrix3x4*"
+                                "name": "Source"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "Translation"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "basisX",
+                    "context": "Getter",
+                    "details": {
+                        "name": "Get Basis X"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Basis X"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "basisX",
+                    "context": "Setter",
+                    "details": {
+                        "name": "Set Basis X"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Basis X"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "basisY",
+                    "context": "Getter",
+                    "details": {
+                        "name": "Get Basis Y"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Basis Y"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "basisY",
+                    "context": "Setter",
+                    "details": {
+                        "name": "Set Basis Y"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Basis Y"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "basisZ",
+                    "context": "Getter",
+                    "details": {
+                        "name": "Get Basis Z"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Basis Z"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "basisZ",
+                    "context": "Setter",
+                    "details": {
+                        "name": "Set Basis Z"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Basis Z"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "translation",
+                    "context": "Getter",
+                    "details": {
+                        "name": "Get Translation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Translation"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "translation",
+                    "context": "Setter",
+                    "details": {
+                        "name": "Set Translation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+                            "details": {
+                                "name": "Source"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Translation"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names
index 9e6b60edbb..cb88951159 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names
@@ -1,35 +1,29 @@
 {
     "entries": [
         {
-            "key": "MeshData",
+            "base": "MeshData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MeshData"
+                "name": "Mesh Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetVertexIndex",
+                    "base": "GetVertexIndex",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetVertexIndex"
+                        "tooltip": "When signaled, this will invoke Get Vertex Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetVertexIndex is invoked"
+                        "tooltip": "Signaled after Get Vertex Index is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetVertexIndex",
-                        "category": "Other"
+                        "name": "Get Vertex Index"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
@@ -53,27 +47,20 @@
                     ]
                 },
                 {
-                    "key": "GetPosition",
+                    "base": "GetPosition",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPosition"
+                        "tooltip": "When signaled, this will invoke Get Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPosition is invoked"
+                        "tooltip": "Signaled after Get Position is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetPosition",
-                        "category": "Other"
+                        "name": "Get Position"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -85,33 +72,26 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFaceInfo",
+                    "base": "GetFaceInfo",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFaceInfo"
+                        "tooltip": "When signaled, this will invoke Get Face Info"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFaceInfo is invoked"
+                        "tooltip": "Signaled after Get Face Info is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetFaceInfo",
-                        "category": "Other"
+                        "name": "Get Face Info"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -123,34 +103,25 @@
                         {
                             "typeid": "{F9F49C1A-014F-46F5-A46F-B56D8CB46C2B}",
                             "details": {
-                                "name": "const AZ::SceneAPI::DataTypes::IMeshData::Face&"
+                                "name": "const AZ:: SceneAPI:: Data Types::I Mesh Data:: Face&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "HasNormalData",
+                    "base": "HasNormalData",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke HasNormalData"
+                        "tooltip": "When signaled, this will invoke Has Normal Data"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after HasNormalData is invoked"
+                        "tooltip": "Signaled after Has Normal Data is invoked"
                     },
                     "details": {
-                        "name": "MeshData::HasNormalData",
-                        "category": "Other"
+                        "name": "Has Normal Data"
                     },
-                    "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -161,27 +132,20 @@
                     ]
                 },
                 {
-                    "key": "GetNormal",
+                    "base": "GetNormal",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNormal"
+                        "tooltip": "When signaled, this will invoke Get Normal"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNormal is invoked"
+                        "tooltip": "Signaled after Get Normal is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetNormal",
-                        "category": "Other"
+                        "name": "Get Normal"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -193,33 +157,26 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUsedPointIndexForControlPoint",
+                    "base": "GetUsedPointIndexForControlPoint",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUsedPointIndexForControlPoint"
+                        "tooltip": "When signaled, this will invoke Get Used Point Index For Control Point"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUsedPointIndexForControlPoint is invoked"
+                        "tooltip": "Signaled after Get Used Point Index For Control Point is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetUsedPointIndexForControlPoint",
-                        "category": "Other"
+                        "name": "Get Used Point Index For Control Point"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
@@ -237,28 +194,19 @@
                     ]
                 },
                 {
-                    "key": "GetVertexCount",
+                    "base": "GetVertexCount",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetVertexCount"
+                        "tooltip": "When signaled, this will invoke Get Vertex Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetVertexCount is invoked"
+                        "tooltip": "Signaled after Get Vertex Count is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetVertexCount",
-                        "category": "Other"
+                        "name": "Get Vertex Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
@@ -269,28 +217,19 @@
                     ]
                 },
                 {
-                    "key": "GetFaceCount",
+                    "base": "GetFaceCount",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFaceCount"
+                        "tooltip": "When signaled, this will invoke Get Face Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFaceCount is invoked"
+                        "tooltip": "Signaled after Get Face Count is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetFaceCount",
-                        "category": "Other"
+                        "name": "Get Face Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
@@ -301,59 +240,43 @@
                     ]
                 },
                 {
-                    "key": "GetUsedControlPointCount",
+                    "base": "GetUsedControlPointCount",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUsedControlPointCount"
+                        "tooltip": "When signaled, this will invoke Get Used Control Point Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUsedControlPointCount is invoked"
+                        "tooltip": "Signaled after Get Used Control Point Count is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetUsedControlPointCount",
-                        "category": "Other"
+                        "name": "Get Used Control Point Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFaceMaterialId",
+                    "base": "GetFaceMaterialId",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFaceMaterialId"
+                        "tooltip": "When signaled, this will invoke Get Face Material Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFaceMaterialId is invoked"
+                        "tooltip": "Signaled after Get Face Material Id is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetFaceMaterialId",
-                        "category": "Other"
+                        "name": "Get Face Material Id"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
@@ -371,27 +294,20 @@
                     ]
                 },
                 {
-                    "key": "GetControlPointIndex",
+                    "base": "GetControlPointIndex",
                     "context": "MeshData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetControlPointIndex"
+                        "tooltip": "When signaled, this will invoke Get Control Point Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetControlPointIndex is invoked"
+                        "tooltip": "Signaled after Get Control Point Index is invoked"
                     },
                     "details": {
-                        "name": "MeshData::GetControlPointIndex",
-                        "category": "Other"
+                        "name": "Get Control Point Index"
                     },
                     "params": [
-                        {
-                            "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
-                            "details": {
-                                "name": "MeshData*"
-                            }
-                        },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names
index e46faa5cfa..94bb07c7bd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names
@@ -1,71 +1,56 @@
 {
     "entries": [
         {
-            "key": "MeshVertexBitangentData",
+            "base": "MeshVertexBitangentData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MeshVertexBitangentData"
+                "name": "Mesh Vertex Bitangent Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetCount",
+                    "base": "GetCount",
                     "context": "MeshVertexBitangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCount"
+                        "tooltip": "When signaled, this will invoke Get Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCount is invoked"
+                        "tooltip": "Signaled after Get Count is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexBitangentData::GetCount",
-                        "category": "Other"
+                        "name": "Get Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}",
-                            "details": {
-                                "name": "MeshVertexBitangentData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBitangent",
+                    "base": "GetBitangent",
                     "context": "MeshVertexBitangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBitangent"
+                        "tooltip": "When signaled, this will invoke Get Bitangent"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBitangent is invoked"
+                        "tooltip": "Signaled after Get Bitangent is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexBitangentData::GetBitangent",
-                        "category": "Other"
+                        "name": "Get Bitangent"
                     },
                     "params": [
-                        {
-                            "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}",
-                            "details": {
-                                "name": "MeshVertexBitangentData*"
-                            }
-                        },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ],
@@ -73,66 +58,76 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "const Vector3&"
+                                "name": "const Vector 3&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBitangentSetIndex",
+                    "base": "GetBitangentSetIndex",
                     "context": "MeshVertexBitangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBitangentSetIndex"
+                        "tooltip": "When signaled, this will invoke Get Bitangent Set Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBitangentSetIndex is invoked"
+                        "tooltip": "Signaled after Get Bitangent Set Index is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexBitangentData::GetBitangentSetIndex",
-                        "category": "Other"
+                        "name": "Get Bitangent Set Index"
                     },
-                    "params": [
-                        {
-                            "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}",
-                            "details": {
-                                "name": "MeshVertexBitangentData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetGenerationMethod",
+                    "base": "GetGenerationMethod",
                     "context": "MeshVertexBitangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetGenerationMethod"
+                        "tooltip": "When signaled, this will invoke Get Generation Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetGenerationMethod is invoked"
+                        "tooltip": "Signaled after Get Generation Method is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexBitangentData::GetGenerationMethod",
-                        "category": "Other"
+                        "name": "Get Generation Method"
                     },
-                    "params": [
+                    "results": [
                         {
-                            "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}",
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "MeshVertexBitangentData*"
+                                "name": "int"
                             }
                         }
-                    ],
+                    ]
+                },
+                {
+                    "base": "GetFromSourceScene",
+                    "details": {
+                        "name": "Get From Source Scene"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMikkT",
+                    "details": {
+                        "name": "Get MikkT"
+                    },
                     "results": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names
index 961508f944..ef3d2d6966 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names
@@ -1,36 +1,28 @@
 {
     "entries": [
         {
-            "key": "MeshVertexColorData",
+            "base": "MeshVertexColorData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MeshVertexColorData"
+                "name": "Mesh Vertex Color Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetCustomName",
+                    "base": "GetCustomName",
                     "context": "MeshVertexColorData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCustomName"
+                        "tooltip": "When signaled, this will invoke Get Custom Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCustomName is invoked"
+                        "tooltip": "Signaled after Get Custom Name is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexColorData::GetCustomName",
-                        "category": "Other"
+                        "name": "Get Custom Name"
                     },
-                    "params": [
-                        {
-                            "typeid": "{17477B86-B163-4574-8FB2-4916BC218B3D}",
-                            "details": {
-                                "name": "const MeshVertexColorData&"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
@@ -41,63 +33,47 @@
                     ]
                 },
                 {
-                    "key": "GetCount",
+                    "base": "GetCount",
                     "context": "MeshVertexColorData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCount"
+                        "tooltip": "When signaled, this will invoke Get Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCount is invoked"
+                        "tooltip": "Signaled after Get Count is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexColorData::GetCount",
-                        "category": "Other"
+                        "name": "Get Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{17477B86-B163-4574-8FB2-4916BC218B3D}",
-                            "details": {
-                                "name": "MeshVertexColorData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "context": "MeshVertexColorData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColor"
+                        "tooltip": "When signaled, this will invoke Get Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColor is invoked"
+                        "tooltip": "Signaled after Get Color is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexColorData::GetColor",
-                        "category": "Other"
+                        "name": "Get Color"
                     },
                     "params": [
-                        {
-                            "typeid": "{17477B86-B163-4574-8FB2-4916BC218B3D}",
-                            "details": {
-                                "name": "MeshVertexColorData*"
-                            }
-                        },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ],
@@ -105,7 +81,7 @@
                         {
                             "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}",
                             "details": {
-                                "name": "const SceneAPI::DataTypes::Color&"
+                                "name": "const SceneAPI:: Data Types:: Color&"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names
index 6866276dca..c31e00a38e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names
@@ -1,71 +1,56 @@
 {
     "entries": [
         {
-            "key": "MeshVertexTangentData",
+            "base": "MeshVertexTangentData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MeshVertexTangentData"
+                "name": "Mesh Vertex Tangent Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetCount",
+                    "base": "GetCount",
                     "context": "MeshVertexTangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCount"
+                        "tooltip": "When signaled, this will invoke Get Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCount is invoked"
+                        "tooltip": "Signaled after Get Count is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexTangentData::GetCount",
-                        "category": "Other"
+                        "name": "Get Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}",
-                            "details": {
-                                "name": "MeshVertexTangentData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTangent",
+                    "base": "GetTangent",
                     "context": "MeshVertexTangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTangent"
+                        "tooltip": "When signaled, this will invoke Get Tangent"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTangent is invoked"
+                        "tooltip": "Signaled after Get Tangent is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexTangentData::GetTangent",
-                        "category": "Other"
+                        "name": "Get Tangent"
                     },
                     "params": [
-                        {
-                            "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}",
-                            "details": {
-                                "name": "MeshVertexTangentData*"
-                            }
-                        },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ],
@@ -73,66 +58,76 @@
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "const Vector4&"
+                                "name": "const Vector 4&"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTangentSetIndex",
+                    "base": "GetTangentSetIndex",
                     "context": "MeshVertexTangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTangentSetIndex"
+                        "tooltip": "When signaled, this will invoke Get Tangent Set Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTangentSetIndex is invoked"
+                        "tooltip": "Signaled after Get Tangent Set Index is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexTangentData::GetTangentSetIndex",
-                        "category": "Other"
+                        "name": "Get Tangent Set Index"
                     },
-                    "params": [
-                        {
-                            "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}",
-                            "details": {
-                                "name": "MeshVertexTangentData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetGenerationMethod",
+                    "base": "GetGenerationMethod",
                     "context": "MeshVertexTangentData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetGenerationMethod"
+                        "tooltip": "When signaled, this will invoke Get Generation Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetGenerationMethod is invoked"
+                        "tooltip": "Signaled after Get Generation Method is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexTangentData::GetGenerationMethod",
-                        "category": "Other"
+                        "name": "Get Generation Method"
                     },
-                    "params": [
+                    "results": [
                         {
-                            "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}",
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "MeshVertexTangentData*"
+                                "name": "int"
                             }
                         }
-                    ],
+                    ]
+                },
+                {
+                    "base": "GetFromSourceScene",
+                    "details": {
+                        "name": "Get From Source Scene"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMikkT",
+                    "details": {
+                        "name": "Get MikkT"
+                    },
                     "results": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names
index 474a4b91b3..b9b2c3252b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names
@@ -1,36 +1,28 @@
 {
     "entries": [
         {
-            "key": "MeshVertexUVData",
+            "base": "MeshVertexUVData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MeshVertexUVData"
+                "name": "Mesh VertexUV Data",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetCustomName",
+                    "base": "GetCustomName",
                     "context": "MeshVertexUVData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCustomName"
+                        "tooltip": "When signaled, this will invoke Get Custom Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCustomName is invoked"
+                        "tooltip": "Signaled after Get Custom Name is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexUVData::GetCustomName",
-                        "category": "Other"
+                        "name": "Get Custom Name"
                     },
-                    "params": [
-                        {
-                            "typeid": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}",
-                            "details": {
-                                "name": "const MeshVertexUVData&"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
@@ -41,39 +33,30 @@
                     ]
                 },
                 {
-                    "key": "GetCount",
+                    "base": "GetCount",
                     "context": "MeshVertexUVData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCount"
+                        "tooltip": "When signaled, this will invoke Get Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCount is invoked"
+                        "tooltip": "Signaled after Get Count is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexUVData::GetCount",
-                        "category": "Other"
+                        "name": "Get Count"
                     },
-                    "params": [
-                        {
-                            "typeid": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}",
-                            "details": {
-                                "name": "MeshVertexUVData*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUV",
+                    "base": "GetUV",
                     "context": "MeshVertexUVData",
                     "entry": {
                         "name": "In",
@@ -84,20 +67,13 @@
                         "tooltip": "Signaled after GetUV is invoked"
                     },
                     "details": {
-                        "name": "MeshVertexUVData::GetUV",
-                        "category": "Other"
+                        "name": "GetUV"
                     },
                     "params": [
-                        {
-                            "typeid": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}",
-                            "details": {
-                                "name": "MeshVertexUVData*"
-                            }
-                        },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ],
@@ -105,7 +81,7 @@
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "const Vector2&"
+                                "name": "const Vector 2&"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names
index f0aa39575a..d25ce96a86 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MixedGradientComponent",
+            "base": "MixedGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names
index c603845990..a9d42f497a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MixedGradientConfig",
+            "base": "MixedGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetNumLayers",
+                    "base": "GetNumLayers",
                     "context": "MixedGradientConfig",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "AddLayer",
+                    "base": "AddLayer",
                     "context": "MixedGradientConfig",
                     "entry": {
                         "name": "In",
@@ -65,7 +65,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveLayer",
+                    "base": "RemoveLayer",
                     "context": "MixedGradientConfig",
                     "entry": {
                         "name": "In",
@@ -95,7 +95,7 @@
                     ]
                 },
                 {
-                    "key": "GetLayer",
+                    "base": "GetLayer",
                     "context": "MixedGradientConfig",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names
index b8588fa56c..e192fe2c63 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "MixedGradientLayer",
+            "base": "MixedGradientLayer",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names
index be96ebd842..c69a75db5e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names
@@ -1,12 +1,140 @@
 {
     "entries": [
         {
-            "key": "ModelPreset",
+            "base": "ModelPreset",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "ModelPreset"
-            }
+                "name": "Model Preset"
+            },
+            "methods": [
+                {
+                    "base": "GetdisplayName",
+                    "details": {
+                        "name": "Get Display Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+                            "details": {
+                                "name": "Model Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Display Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetdisplayName",
+                    "details": {
+                        "name": "Set Display Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+                            "details": {
+                                "name": "Model Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Display Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetmodelAsset",
+                    "details": {
+                        "name": "Get Model Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+                            "details": {
+                                "name": "Model Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
+                            "details": {
+                                "name": "Model Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetmodelAsset",
+                    "details": {
+                        "name": "Set Model Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+                            "details": {
+                                "name": "Model Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
+                            "details": {
+                                "name": "Model Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetpreviewImageAsset",
+                    "details": {
+                        "name": "Get Preview Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+                            "details": {
+                                "name": "Model Preset"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "Preview Image Asset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetpreviewImageAsset",
+                    "details": {
+                        "name": "Set Preview Image Asset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+                            "details": {
+                                "name": "Model Preset"
+                            }
+                        },
+                        {
+                            "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+                            "details": {
+                                "name": "Preview Image Asset"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names
index b75bf1286a..fccd0720b5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names
@@ -1,12 +1,353 @@
 {
     "entries": [
         {
-            "key": "MotionEvent",
+            "base": "MotionEvent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "MotionEvent"
-            }
+                "name": "Motion Event",
+                "category": "Animation"
+            },
+            "methods": [
+                {
+                    "base": "GetlocalWeight",
+                    "details": {
+                        "name": "Get Local Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Local Weight"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetlocalWeight",
+                    "details": {
+                        "name": "Set Local Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Local Weight"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetglobalWeight",
+                    "details": {
+                        "name": "Get Global Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Global Weight"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetglobalWeight",
+                    "details": {
+                        "name": "Set Global Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Global Weight"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Gettime",
+                    "details": {
+                        "name": "Get Time"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Time"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Settime",
+                    "details": {
+                        "name": "Set Time"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Time"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GeteventType",
+                    "details": {
+                        "name": "Get Event Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Event Type"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SeteventType",
+                    "details": {
+                        "name": "Set Event Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Event Type"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GeteventTypeName",
+                    "details": {
+                        "name": "Get Event Type Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Event Type Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SeteventTypeName",
+                    "details": {
+                        "name": "Set Event Type Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Event Type Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetisEventStart",
+                    "details": {
+                        "name": "Get Is Event Start"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Event Start"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetisEventStart",
+                    "details": {
+                        "name": "Set Is Event Start"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Event Start"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getparameter",
+                    "details": {
+                        "name": "Get Parameter"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Parameter"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setparameter",
+                    "details": {
+                        "name": "Set Parameter"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "Parameter"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetentityId",
+                    "details": {
+                        "name": "Get Entity Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetentityId",
+                    "details": {
+                        "name": "Set Entity Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+                            "details": {
+                                "name": "Motion Event"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names
similarity index 53%
rename from Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names
rename to Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names
index 32e587c80f..d7ed32a229 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names	
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names
@@ -1,41 +1,42 @@
 {
     "entries": [
         {
-            "key": "Tag Helper",
+            "base": "MultiplayerSystemComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Tag Helper"
+                "name": "Multiplayer"
             },
             "methods": [
                 {
-                    "key": "GetEntitiesbyTag",
-                    "context": "Tag Helper",
+                    "base": "GetOnClientDisconnectedEvent",
+                    "context": "MultiplayerSystemComponent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEntitiesbyTag"
+                        "tooltip": "When signaled, this will invoke Get On Client Disconnected Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEntitiesbyTag is invoked"
+                        "tooltip": "Signaled after Get On Client Disconnected Event is invoked"
                     },
                     "details": {
-                        "name": "Tag Helper::Get Entities by Tag",
-                        "category": "Gameplay/Tag"
+                        "name": "Get On Client Disconnected Event",
+                        "category": "Other"
                     },
                     "params": [
                         {
-                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const Crc32&"
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ],
                     "results": [
                         {
-                            "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
+                            "typeid": "{F429F985-AF00-529B-8449-16E56694E5F9}",
                             "details": {
-                                "name": "AZStd::vector<EntityId, allocator>"
+                                "name": "Event"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names
index 1104d336a2..a6625f39d1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names
@@ -1,36 +1,28 @@
 {
     "entries": [
         {
-            "key": "Name",
+            "base": "Name",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Name"
+                "name": "Name",
+                "category": "Utilities"
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "Name",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "Name::ToString",
-                        "category": "Other"
+                        "name": "To String"
                     },
-                    "params": [
-                        {
-                            "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
-                            "details": {
-                                "name": "Name*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
@@ -41,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "Set",
+                    "base": "Set",
                     "context": "Name",
                     "entry": {
                         "name": "In",
@@ -52,47 +44,37 @@
                         "tooltip": "Signaled after Set is invoked"
                     },
                     "details": {
-                        "name": "Name::Set",
-                        "category": "Other"
+                        "name": "Set"
                     },
                     "params": [
                         {
                             "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
                             "details": {
-                                "name": "Name*"
+                                "name": "Name"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": ""
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsEmpty",
+                    "base": "IsEmpty",
                     "context": "Name",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsEmpty"
+                        "tooltip": "When signaled, this will invoke Is Empty"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsEmpty is invoked"
+                        "tooltip": "Signaled after Is Empty is invoked"
                     },
                     "details": {
-                        "name": "Name::IsEmpty",
-                        "category": "Other"
+                        "name": "Is Empty"
                     },
-                    "params": [
-                        {
-                            "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
-                            "details": {
-                                "name": "Name*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -103,7 +85,7 @@
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "Name",
                     "entry": {
                         "name": "In",
@@ -114,20 +96,13 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "Name::Equal",
-                        "category": "Other"
+                        "name": "Equal"
                     },
                     "params": [
                         {
                             "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
                             "details": {
-                                "name": "Name*"
-                            }
-                        },
-                        {
-                            "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
-                            "details": {
-                                "name": "const Name&"
+                                "name": "Name"
                             }
                         }
                     ],
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names
new file mode 100644
index 0000000000..0a5f5f8de8
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names
@@ -0,0 +1,147 @@
+{
+    "entries": [
+        {
+            "base": "NetBindComponent",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Net Entity",
+                "category": "Multiplayer"
+            },
+            "methods": [
+                {
+                    "base": "IsNetEntityRoleAuthority",
+                    "context": "NetBindComponent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Net Entity Role Authority"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Net Entity Role Authority is invoked"
+                    },
+                    "details": {
+                        "name": "Is Role Authority",
+                        "category": "Other"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Role Authority"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsNetEntityRoleAutonomous",
+                    "context": "NetBindComponent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke IsNetEntityRoleAutonomous"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Net Entity Role Autonomous is invoked"
+                    },
+                    "details": {
+                        "name": "Is Role Autonomous",
+                        "category": "Other"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Role Autonomous"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsNetEntityRoleClient",
+                    "context": "NetBindComponent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Role Client"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Role Client is invoked"
+                    },
+                    "details": {
+                        "name": "Is Role Client",
+                        "category": "Other"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Role Client"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsNetEntityRoleServer",
+                    "context": "NetBindComponent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Role Server"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Role Server is invoked"
+                    },
+                    "details": {
+                        "name": "Is Role Server",
+                        "category": "Other"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Role Server"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names
new file mode 100644
index 0000000000..011315360d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names
@@ -0,0 +1,136 @@
+{
+    "entries": [
+        {
+            "base": "NetworkTestPlayerComponentNetworkInput",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Network Test Player Component Network Input",
+                "category": "Automated Testing"
+            },
+            "methods": [
+                {
+                    "base": "CreateFromValues",
+                    "context": "NetworkTestPlayerComponentNetworkInput",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Create From Values"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Create From Values is invoked"
+                    },
+                    "details": {
+                        "name": "Create From Values"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Forward Back"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Left Right"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "FwdBack",
+                    "details": {
+                        "name": "Get Forward Back"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Forward Back"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "FwdBack",
+                    "details": {
+                        "name": "Set Forward Back"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Forward Back"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "LeftRight",
+                    "details": {
+                        "name": "Get Left Right"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Left Right"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "LeftRight",
+                    "details": {
+                        "name": "Set Left Right"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Left Right"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names
index 2cfbfb6ff8..1a47f39a19 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "NodeIndex",
+            "base": "NodeIndex",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "NodeIndex"
+                "name": "Node Index"
             },
             "methods": [
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "NodeIndex",
                     "entry": {
                         "name": "In",
@@ -20,20 +20,13 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "NodeIndex::Equal",
-                        "category": "Other"
+                        "name": "Equal"
                     },
                     "params": [
                         {
                             "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
                             "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*"
-                            }
-                        },
-                        {
-                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
-                            "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex"
+                                "name": ""
                             }
                         }
                     ],
@@ -47,60 +40,42 @@
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "NodeIndex",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "NodeIndex::ToString",
-                        "category": "Other"
+                        "name": "To String"
                     },
-                    "params": [
-                        {
-                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
-                            "details": {
-                                "name": "const AZ::SceneAPI::Containers::SceneGraph::NodeIndex&"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "AZ Std::basic_string<char, AZ Std::char_traits<char>, allocator>"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "NodeIndex",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsValid"
+                        "tooltip": "When signaled, this will invoke Is Valid"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsValid is invoked"
+                        "tooltip": "Signaled after Is Valid is invoked"
                     },
                     "details": {
-                        "name": "NodeIndex::IsValid",
-                        "category": "Other"
+                        "name": "Is Valid"
                     },
-                    "params": [
-                        {
-                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
-                            "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -111,7 +86,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "NodeIndex",
                     "entry": {
                         "name": "In",
@@ -122,20 +97,13 @@
                         "tooltip": "Signaled after Distance is invoked"
                     },
                     "details": {
-                        "name": "NodeIndex::Distance",
-                        "category": "Other"
+                        "name": "Distance"
                     },
                     "params": [
                         {
                             "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
                             "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*"
-                            }
-                        },
-                        {
-                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
-                            "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex"
+                                "name": ""
                             }
                         }
                     ],
@@ -149,28 +117,19 @@
                     ]
                 },
                 {
-                    "key": "AsNumber",
+                    "base": "AsNumber",
                     "context": "NodeIndex",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke AsNumber"
+                        "tooltip": "When signaled, this will invoke As Number"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after AsNumber is invoked"
+                        "tooltip": "Signaled after As Number is invoked"
                     },
                     "details": {
-                        "name": "NodeIndex::AsNumber",
-                        "category": "Other"
+                        "name": "As Number"
                     },
-                    "params": [
-                        {
-                            "typeid": "{4AD18037-E629-480D-8165-997A137327FD}",
-                            "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names
index eefbac6a0b..31eae88454 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names
@@ -1,12 +1,85 @@
 {
     "entries": [
         {
-            "key": "OutputDeviceTransformType",
+            "base": "OutputDeviceTransformType",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "OutputDeviceTransformType"
-            }
+                "name": "Output Device Transform Type",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes",
+                    "details": {
+                        "name": "Get Output Device Transform Type_ Num Output Device Transform Types"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_4000Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type_ 4000 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_2000Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type_ 2000 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_100Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type_ 100 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetOutputDeviceTransformType_48Nits",
+                    "details": {
+                        "name": "Get Output Device Transform Type_ 48 Nits"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names
index 6acda4e4e1..1f84509238 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "PerlinGradientComponent",
+            "base": "PerlinGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names
index 3f36153bb8..970558cfd9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "PerlinGradientConfig",
+            "base": "PerlinGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names
index 19894bcc21..07faa4053b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names
@@ -1,33 +1,32 @@
 {
     "entries": [
         {
-            "key": "PhysicsScene",
+            "base": "PhysicsScene",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "PhysicsScene"
+                "name": "Physics Scene"
             },
             "methods": [
                 {
-                    "key": "GetOnGravityChangeEvent",
+                    "base": "GetOnGravityChangeEvent",
                     "context": "PhysicsScene",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnGravityChangeEvent"
+                        "tooltip": "When signaled, this will invoke Get On Gravity Change Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnGravityChangeEvent is invoked"
+                        "tooltip": "Signaled after Get On Gravity Change Event is invoked"
                     },
                     "details": {
-                        "name": "PhysicsScene::GetOnGravityChangeEvent",
-                        "category": "Other"
+                        "name": "Get On Gravity Change Event"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Scene Name"
                             }
                         }
                     ],
@@ -35,31 +34,30 @@
                         {
                             "typeid": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}",
                             "details": {
-                                "name": "Event<tuple<Crc32 AZ::s8 > const Vector3& >*"
+                                "name": "Gravity Change Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "QueryScene",
+                    "base": "QueryScene",
                     "context": "PhysicsScene",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke QueryScene"
+                        "tooltip": "When signaled, this will invoke Query Scene"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after QueryScene is invoked"
+                        "tooltip": "Signaled after Query Scene is invoked"
                     },
                     "details": {
-                        "name": "PhysicsScene::QueryScene",
-                        "category": "Other"
+                        "name": "Query Scene"
                     },
                     "params": [
                         {
                             "typeid": "{52BD8163-BDC4-4B09-ABB2-11DD1F601FFD}",
                             "details": {
-                                "name": "Scene*"
+                                "name": "Scene"
                             }
                         },
                         {
@@ -74,7 +72,7 @@
                         {
                             "typeid": "{BAFCC4E7-A06B-4909-B2AE-C89D9E84FE4E}",
                             "details": {
-                                "name": "SceneQueryHits"
+                                "name": "Scene Query Hits"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names
index bd2751ecca..d1eb03798d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names
@@ -1,87 +1,85 @@
 {
     "entries": [
         {
-            "key": "PhysicsSystemInterface",
+            "base": "PhysicsSystemInterface",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "PhysicsSystemInterface"
+                "name": "Physics System",
+                "category": "PhysX"
             },
             "methods": [
                 {
-                    "key": "GetOnPresimulateEvent",
+                    "base": "GetOnPresimulateEvent",
                     "context": "PhysicsSystemInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnPresimulateEvent"
+                        "tooltip": "When signaled, this will invoke Get On Pre Simulate Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnPresimulateEvent is invoked"
+                        "tooltip": "Signaled after Get On Pre Simulate Event is invoked"
                     },
                     "details": {
-                        "name": "PhysicsSystemInterface::GetOnPresimulateEvent",
-                        "category": "Other"
+                        "name": "Get On Pre Simulate Event"
                     },
                     "results": [
                         {
                             "typeid": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}",
                             "details": {
-                                "name": "Event<float >*"
+                                "name": "Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOnPostsimulateEvent",
+                    "base": "GetOnPostsimulateEvent",
                     "context": "PhysicsSystemInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnPostsimulateEvent"
+                        "tooltip": "When signaled, this will invoke Get On Post Simulate Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnPostsimulateEvent is invoked"
+                        "tooltip": "Signaled after Get On Post Simulate Event is invoked"
                     },
                     "details": {
-                        "name": "PhysicsSystemInterface::GetOnPostsimulateEvent",
-                        "category": "Other"
+                        "name": "Get On Post Simulate Event"
                     },
                     "results": [
                         {
                             "typeid": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}",
                             "details": {
-                                "name": "Event<float >*"
+                                "name": "Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSceneHandle",
+                    "base": "GetSceneHandle",
                     "context": "PhysicsSystemInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSceneHandle"
+                        "tooltip": "When signaled, this will invoke Get Scene Handle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSceneHandle is invoked"
+                        "tooltip": "Signaled after Get Scene Handle is invoked"
                     },
                     "details": {
-                        "name": "PhysicsSystemInterface::GetSceneHandle",
-                        "category": "Other"
+                        "name": "Get Scene Handle"
                     },
                     "params": [
                         {
                             "typeid": "{B6F4D92A-061B-4CB3-AAB5-984B599A53AE}",
                             "details": {
-                                "name": "SystemInterface*"
+                                "name": "System Interface"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Scene Name"
                             }
                         }
                     ],
@@ -89,37 +87,36 @@
                         {
                             "typeid": "{36669095-4036-5479-B116-41A32E4E16EA}",
                             "details": {
-                                "name": "tuple<Crc32 AZ::s8 >"
+                                "name": "Scene Handle"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetScene",
+                    "base": "GetScene",
                     "context": "PhysicsSystemInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetScene"
+                        "tooltip": "When signaled, this will invoke Get Scene"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetScene is invoked"
+                        "tooltip": "Signaled after Get Scene is invoked"
                     },
                     "details": {
-                        "name": "PhysicsSystemInterface::GetScene",
-                        "category": "Other"
+                        "name": "Get Scene"
                     },
                     "params": [
                         {
                             "typeid": "{B6F4D92A-061B-4CB3-AAB5-984B599A53AE}",
                             "details": {
-                                "name": "SystemInterface*"
+                                "name": "System Interface"
                             }
                         },
                         {
                             "typeid": "{36669095-4036-5479-B116-41A32E4E16EA}",
                             "details": {
-                                "name": "tuple<Crc32 AZ::s8 >"
+                                "name": "Scene Handle"
                             }
                         }
                     ],
@@ -127,7 +124,7 @@
                         {
                             "typeid": "{52BD8163-BDC4-4B09-ABB2-11DD1F601FFD}",
                             "details": {
-                                "name": "Scene*"
+                                "name": "Scene"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names
index b7a5be6da9..c07b27df44 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Platform",
+            "base": "Platform",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -10,25 +10,24 @@
             },
             "methods": [
                 {
-                    "key": "GetName",
+                    "base": "GetName",
                     "context": "Platform",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetName"
+                        "tooltip": "When signaled, this will invoke Get Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetName is invoked"
+                        "tooltip": "Signaled after Get Name is invoked"
                     },
                     "details": {
-                        "name": "Platform::GetName",
-                        "category": "Utilities"
+                        "name": "Get Name"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Id"
                             }
                         }
                     ],
@@ -36,7 +35,91 @@
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "Number"
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMac",
+                    "details": {
+                        "name": "Get Mac"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetLinux",
+                    "details": {
+                        "name": "Get Linux"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetiOS",
+                    "details": {
+                        "name": "Get iOS"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetWindows64",
+                    "details": {
+                        "name": "Get Windows64"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAndroid64",
+                    "details": {
+                        "name": "Get Android64"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetCurrent",
+                    "details": {
+                        "name": "Get Current"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Id"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names
index 34c4ad5bf0..3b2cc44451 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names
@@ -1,12 +1,62 @@
 {
     "entries": [
         {
-            "key": "PolygonPrism",
+            "base": "PolygonPrism",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "PolygonPrism"
-            }
+                "name": "Polygon Prism",
+                "category": "Shape"
+            },
+            "methods": [
+                {
+                    "base": "height",
+                    "details": {
+                        "name": "Get Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F01C8BDD-6F24-4344-8945-521A8750B30B}",
+                            "details": {
+                                "name": "Polygon Prism",
+                                "tooltip": "Polygon prism shape"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "vertexContainer",
+                    "details": {
+                        "name": "Get Vertex Container"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F01C8BDD-6F24-4344-8945-521A8750B30B}",
+                            "details": {
+                                "name": "Polygon Prism",
+                                "tooltip": "Polygon prism shape"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EBE98B36-0783-5226-9739-064BD41EBB52}",
+                            "details": {
+                                "name": "Vertex Container",
+                                "tooltip": "Vertex data"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names
index 6a778c30a2..45a805a43b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names
@@ -1,12 +1,59 @@
 {
     "entries": [
         {
-            "key": "PositionSplineQueryResult",
+            "base": "PositionSplineQueryResult",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "PositionSplineQueryResult"
-            }
+                "name": "Position Spline Query Result",
+                "category": "Physics"
+            },
+            "methods": [
+                {
+                    "base": "GetsplineAddress",
+                    "details": {
+                        "name": "Getspline Address"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E35DCF28-1AC3-49E8-A0AB-2F6115348F45}",
+                            "details": {
+                                "name": "Position Spline Query Result"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{865BA2EC-43C5-4E1F-9B6F-2D63F6DC2E70}",
+                            "details": {
+                                "name": "Spline Address"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetdistanceSq",
+                    "details": {
+                        "name": "Getdistance Sq"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E35DCF28-1AC3-49E8-A0AB-2F6115348F45}",
+                            "details": {
+                                "name": "Position Spline Query Result"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names
index 5768ce41f2..6c2372d99c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "PosterizeGradientComponent",
+            "base": "PosterizeGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names
index bea4631714..03b82c4262 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "PosterizeGradientConfig",
+            "base": "PosterizeGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names
index a4da66e5fd..8224b2617c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "PropertyTreeEditor",
+            "base": "PropertyTreeEditor",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "ResetContainer",
+                    "base": "ResetContainer",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "CompareProperty",
+                    "base": "CompareProperty",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -91,7 +91,7 @@
                     ]
                 },
                 {
-                    "key": "IsContainer",
+                    "base": "IsContainer",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "GetContainerCount",
+                    "base": "GetContainerCount",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -167,7 +167,7 @@
                     ]
                 },
                 {
-                    "key": "SetProperty",
+                    "base": "SetProperty",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -211,7 +211,7 @@
                     ]
                 },
                 {
-                    "key": "AppendContainerItem",
+                    "base": "AppendContainerItem",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -255,7 +255,7 @@
                     ]
                 },
                 {
-                    "key": "GetProperty",
+                    "base": "GetProperty",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "key": "AddContainerItem",
+                    "base": "AddContainerItem",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -343,7 +343,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveContainerItem",
+                    "base": "RemoveContainerItem",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -387,7 +387,7 @@
                     ]
                 },
                 {
-                    "key": "BuildPathsListWithTypes",
+                    "base": "BuildPathsListWithTypes",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "key": "HasAttribute",
+                    "base": "HasAttribute",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -463,7 +463,7 @@
                     ]
                 },
                 {
-                    "key": "BuildPathsList",
+                    "base": "BuildPathsList",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -495,7 +495,7 @@
                     ]
                 },
                 {
-                    "key": "SetVisibleEnforcement",
+                    "base": "SetVisibleEnforcement",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -525,7 +525,7 @@
                     ]
                 },
                 {
-                    "key": "UpdateContainerItem",
+                    "base": "UpdateContainerItem",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
@@ -575,7 +575,7 @@
                     ]
                 },
                 {
-                    "key": "GetContainerItem",
+                    "base": "GetContainerItem",
                     "context": "PropertyTreeEditor",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names
index 44d606200e..3c8442e38f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names
@@ -1,12 +1,80 @@
 {
     "entries": [
         {
-            "key": "PythonBehaviorInfo",
+            "base": "PythonBehaviorInfo",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "PythonBehaviorInfo"
-            }
+                "name": "Python Behavior Info"
+            },
+            "methods": [
+                {
+                    "base": "GetclassName",
+                    "details": {
+                        "name": "Getclass Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8055BD03-5B3B-490D-AEC5-1B1E2616D529}",
+                            "details": {
+                                "name": "const Python Behavior Info&"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetclassUuid",
+                    "details": {
+                        "name": "Getclass Uuid"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8055BD03-5B3B-490D-AEC5-1B1E2616D529}",
+                            "details": {
+                                "name": "const Python Behavior Info&"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetmethodList",
+                    "details": {
+                        "name": "Getmethod List"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8055BD03-5B3B-490D-AEC5-1B1E2616D529}",
+                            "details": {
+                                "name": "Python Behavior Info*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
+                            "details": {
+                                "name": "AZ Std::vector"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names
index 39484e12ca..528f0f6ba1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "RandomGradientComponent",
+            "base": "RandomGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names
index 437018b5ee..16cde16465 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "RandomGradientConfig",
+            "base": "RandomGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names
index 580b4b9b73..7be82eb510 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "RandomTimedSpawnerComponent",
+            "base": "RandomTimedSpawnerComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names
index d8bae42895..9dc7d5c1da 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names
@@ -1,12 +1,81 @@
 {
     "entries": [
         {
-            "key": "RaySplineQueryResult",
+            "base": "RaySplineQueryResult",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "RaySplineQueryResult"
-            }
+                "name": "Ray Spline Query Result",
+                "category": "Physics"
+            },
+            "methods": [
+                {
+                    "base": "GetsplineAddress",
+                    "details": {
+                        "name": "Getspline Address"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{FE862126-C838-4999-9B7B-4AEEA5507A49}",
+                            "details": {
+                                "name": "Ray Spline Query Result"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{865BA2EC-43C5-4E1F-9B6F-2D63F6DC2E70}",
+                            "details": {
+                                "name": "Spline Address"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetdistanceSq",
+                    "details": {
+                        "name": "Getdistance Sq"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{FE862126-C838-4999-9B7B-4AEEA5507A49}",
+                            "details": {
+                                "name": "Ray Spline Query Result"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetrayDistance",
+                    "details": {
+                        "name": "Getray Distance"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{FE862126-C838-4999-9B7B-4AEEA5507A49}",
+                            "details": {
+                                "name": "Ray Spline Query Result"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names
index f8e307243e..f55bd9b2fc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ReferenceGradientComponent",
+            "base": "ReferenceGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names
index f54a665d2d..75c14d2132 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ReferenceGradientConfig",
+            "base": "ReferenceGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names
new file mode 100644
index 0000000000..c312519f02
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names
@@ -0,0 +1,58 @@
+{
+    "entries": [
+        {
+            "base": "ReferenceShapeConfig",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "ReferenceShapeConfig"
+            },
+            "methods": [
+                {
+                    "base": "shapeEntityId",
+                    "details": {
+                        "name": "ReferenceShapeConfig::shapeEntityId::Getter"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3E49974D-2EE0-4AF9-92B9-229A22B515C3}",
+                            "details": {
+                                "name": "ReferenceShapeConfig*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "EntityId&",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "shapeEntityId",
+                    "details": {
+                        "name": "ReferenceShapeConfig::shapeEntityId::Setter"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3E49974D-2EE0-4AF9-92B9-229A22B515C3}",
+                            "details": {
+                                "name": "ReferenceShapeConfig*"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "const EntityId&",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names
new file mode 100644
index 0000000000..5f05143021
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names
@@ -0,0 +1,99 @@
+{
+    "entries": [
+        {
+            "base": "Render::DisplayMapperOperationType",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Display Mapper Operation Type",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplayMapperOperationType_GammaSRGB",
+                    "details": {
+                        "name": "Get Display Mapper Operation Type_ GammaSRGB"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDisplayMapperOperationType_Invalid",
+                    "details": {
+                        "name": "Get Display Mapper Operation Type_ Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDisplayMapperOperationType_Passthrough",
+                    "details": {
+                        "name": "Get Display Mapper Operation Type_ Passthrough"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDisplayMapperOperationType_Reinhard",
+                    "details": {
+                        "name": "Get Display Mapper Operation Type_ Reinhard"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDisplayMapperOperationType_Aces",
+                    "details": {
+                        "name": "Get Display Mapper Operation Type_ Aces"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDisplayMapperOperationType_AcesLut",
+                    "details": {
+                        "name": "Get Display Mapper Operation Type_ Aces Lut"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names
new file mode 100644
index 0000000000..bde0892936
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names
@@ -0,0 +1,85 @@
+{
+    "entries": [
+        {
+            "base": "Render::ShadowmapSize",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Shadowmap Size",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowmapSize_512",
+                    "details": {
+                        "name": "Get Shadowmap Size_ 512"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetShadowmapSize_1024",
+                    "details": {
+                        "name": "Get Shadowmap Size_ 1024"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetShadowmapSize_2048",
+                    "details": {
+                        "name": "Get Shadowmap Size_ 2048"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetShadowmapSize_256",
+                    "details": {
+                        "name": "Get Shadowmap Size_ 256"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetShadowmapSize_None",
+                    "details": {
+                        "name": "Get Shadowmap Size_ None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names
index d0b45d418a..6625e13e6b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names
@@ -1,41 +1,32 @@
 {
     "entries": [
         {
-            "key": "RuntimeData",
+            "base": "RuntimeData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "RuntimeData"
+                "name": "Runtime Data"
             },
             "methods": [
                 {
-                    "key": "GetRequiredAssets",
+                    "base": "GetRequiredAssets",
                     "context": "RuntimeData",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRequiredAssets"
+                        "tooltip": "When signaled, this will invoke Get Required Assets"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRequiredAssets is invoked"
+                        "tooltip": "Signaled after Get Required Assets is invoked"
                     },
                     "details": {
-                        "name": "RuntimeData::GetRequiredAssets",
-                        "category": "Other"
+                        "name": "Get Required Assets"
                     },
-                    "params": [
-                        {
-                            "typeid": "{A935EBBC-D167-4C59-927C-5D98C6337B9C}",
-                            "details": {
-                                "name": "const RuntimeData&"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                             "details": {
-                                "name": "AZStd::vector<Asset<RuntimeAsset>, allocator>"
+                                "name": "AZ Std::vector< Asset< Runtime Asset>, allocator>"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names
index 38c123e0cf..7a00163d89 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names
@@ -1,27 +1,69 @@
 {
     "entries": [
         {
-            "key": "Scene",
+            "base": "Scene",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Scene"
+                "name": "Scene",
+                "category": "Scene"
             },
             "methods": [
                 {
-                    "key": "GetOriginalSceneOrientation",
+                    "base": "GetOriginalSceneOrientation",
                     "context": "Scene",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOriginalSceneOrientation"
+                        "tooltip": "When signaled, this will invoke Get Original Scene Orientation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOriginalSceneOrientation is invoked"
+                        "tooltip": "Signaled after Get Original Scene Orientation is invoked"
                     },
                     "details": {
-                        "name": "Scene::GetOriginalSceneOrientation",
-                        "category": "Other"
+                        "name": "Get Original Scene Orientation"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSceneOrientation_XUp",
+                    "details": {
+                        "name": "Get Scene Orientation_X Up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSceneOrientation_NegYUp",
+                    "details": {
+                        "name": "Get Scene Orientation_ NegY Up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetwatchFolder",
+                    "details": {
+                        "name": "Getwatch Folder"
                     },
                     "params": [
                         {
@@ -31,6 +73,194 @@
                             }
                         }
                     ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSceneOrientation_NegZUp",
+                    "details": {
+                        "name": "Get Scene Orientation_ NegZ Up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getgraph",
+                    "details": {
+                        "name": "Getgraph"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}",
+                            "details": {
+                                "name": "Scene*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}",
+                            "details": {
+                                "name": "AZ:: SceneAPI:: Containers:: Scene Graph&"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetsourceGuid",
+                    "details": {
+                        "name": "Getsource Guid"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}",
+                            "details": {
+                                "name": "Scene*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSceneOrientation_YUp",
+                    "details": {
+                        "name": "Get Scene Orientation_Y Up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetsourceFilename",
+                    "details": {
+                        "name": "Getsource Filename"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}",
+                            "details": {
+                                "name": "Scene*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetmanifestFilename",
+                    "details": {
+                        "name": "Getmanifest Filename"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}",
+                            "details": {
+                                "name": "Scene*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSceneOrientation_NegXUp",
+                    "details": {
+                        "name": "Get Scene Orientation_ NegX Up"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Getname"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}",
+                            "details": {
+                                "name": "Scene*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getmanifest",
+                    "details": {
+                        "name": "Getmanifest"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}",
+                            "details": {
+                                "name": "Scene*"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{9274AD17-3212-4651-9F3B-7DCCB080E467}",
+                            "details": {
+                                "name": "Scene Manifest"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSceneOrientation_ZUp",
+                    "details": {
+                        "name": "Get Scene Orientation_Z Up"
+                    },
                     "results": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names
index f3bb103ae3..5c7fb58120 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names
@@ -1,33 +1,33 @@
 {
     "entries": [
         {
-            "key": "SceneGraphName",
+            "base": "SceneGraphName",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SceneGraphName"
+                "name": "Scene Graph Name",
+                "category": "Scene Graph"
             },
             "methods": [
                 {
-                    "key": "GetPath",
+                    "base": "GetPath",
                     "context": "SceneGraphName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPath"
+                        "tooltip": "When signaled, this will invoke Get Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPath is invoked"
+                        "tooltip": "Signaled after Get Path is invoked"
                     },
                     "details": {
-                        "name": "SceneGraphName::GetPath",
-                        "category": "Other"
+                        "name": "Get Path"
                     },
                     "params": [
                         {
                             "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}",
                             "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::Name*"
+                                "name": "Scene Graph Name"
                             }
                         }
                     ],
@@ -35,31 +35,30 @@
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "Path"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetName",
+                    "base": "GetName",
                     "context": "SceneGraphName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetName"
+                        "tooltip": "When signaled, this will invoke Get Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetName is invoked"
+                        "tooltip": "Signaled after Get Name is invoked"
                     },
                     "details": {
-                        "name": "SceneGraphName::GetName",
-                        "category": "Other"
+                        "name": "Get Name"
                     },
                     "params": [
                         {
                             "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}",
                             "details": {
-                                "name": "AZ::SceneAPI::Containers::SceneGraph::Name*"
+                                "name": "Scene Graph Name"
                             }
                         }
                     ],
@@ -67,31 +66,30 @@
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "SceneGraphName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "SceneGraphName::ToString",
-                        "category": "Other"
+                        "name": "To String"
                     },
                     "params": [
                         {
                             "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}",
                             "details": {
-                                "name": "const AZ::SceneAPI::Containers::SceneGraph::Name&"
+                                "name": "Scene Graph Name"
                             }
                         }
                     ],
@@ -99,7 +97,7 @@
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "String"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names
index ede7f6ea12..151b93f217 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names
@@ -1,39 +1,33 @@
 {
     "entries": [
         {
-            "key": "SceneManifest",
+            "base": "SceneManifest",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SceneManifest"
+                "name": "Scene Manifest",
+                "category": "Scene"
             },
             "methods": [
                 {
-                    "key": "ImportFromJson",
+                    "base": "ImportFromJson",
                     "context": "SceneManifest",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ImportFromJson"
+                        "tooltip": "When signaled, this will invoke Import From Json"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ImportFromJson is invoked"
+                        "tooltip": "Signaled after Import From Json is invoked"
                     },
                     "details": {
-                        "name": "SceneManifest::ImportFromJson",
-                        "category": "Other"
+                        "name": "Import From Json"
                     },
                     "params": [
-                        {
-                            "typeid": "{9274AD17-3212-4651-9F3B-7DCCB080E467}",
-                            "details": {
-                                "name": "SceneManifest&"
-                            }
-                        },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": ""
                             }
                         }
                     ],
@@ -47,33 +41,24 @@
                     ]
                 },
                 {
-                    "key": "ExportToJson",
+                    "base": "ExportToJson",
                     "context": "SceneManifest",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ExportToJson"
+                        "tooltip": "When signaled, this will invoke Export To Json"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ExportToJson is invoked"
+                        "tooltip": "Signaled after Export To Json is invoked"
                     },
                     "details": {
-                        "name": "SceneManifest::ExportToJson",
-                        "category": "Other"
+                        "name": "Export To Json"
                     },
-                    "params": [
-                        {
-                            "typeid": "{9274AD17-3212-4651-9F3B-7DCCB080E467}",
-                            "details": {
-                                "name": "SceneManifest&"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "AZ Std::basic_string<char, AZ Std::char_traits<char>, allocator>"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names
index 731a41bac1..1aa7a6642c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SceneQueries",
+            "base": "SceneQueries",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateRayCastRequest",
+                    "base": "CreateRayCastRequest",
                     "context": "SceneQueries",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names
index 8cad1c3269..1a38873aaa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ScriptTimePoint",
+            "base": "ScriptTimePoint",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -10,28 +10,19 @@
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "ScriptTimePoint",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "ScriptTimePoint::ToString",
-                        "category": "Timing"
+                        "name": "To String"
                     },
-                    "params": [
-                        {
-                            "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}",
-                            "details": {
-                                "name": "ScriptTimePoint*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
@@ -42,65 +33,47 @@
                     ]
                 },
                 {
-                    "key": "GetSeconds",
+                    "base": "GetSeconds",
                     "context": "ScriptTimePoint",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSeconds"
+                        "tooltip": "When signaled, this will invoke Get Seconds"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSeconds is invoked"
+                        "tooltip": "Signaled after Get Seconds is invoked"
                     },
                     "details": {
-                        "name": "ScriptTimePoint::GetSeconds",
-                        "category": "Timing"
+                        "name": "Get Seconds"
                     },
-                    "params": [
-                        {
-                            "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}",
-                            "details": {
-                                "name": "ScriptTimePoint*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "Number"
+                                "name": "Seconds"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMilliseconds",
+                    "base": "GetMilliseconds",
                     "context": "ScriptTimePoint",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMilliseconds"
+                        "tooltip": "When signaled, this will invoke Get Milliseconds"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMilliseconds is invoked"
+                        "tooltip": "Signaled after Get Milliseconds is invoked"
                     },
                     "details": {
-                        "name": "ScriptTimePoint::GetMilliseconds",
-                        "category": "Timing"
+                        "name": "Get Milliseconds"
                     },
-                    "params": [
-                        {
-                            "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}",
-                            "details": {
-                                "name": "ScriptTimePoint*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "Number"
+                                "name": "Milliseconds"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names
index 851aef1fda..693e465864 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SearchFilter",
+            "base": "SearchFilter",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names
index 59c9be78f7..c330e85e85 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SequenceComponent",
+            "base": "SequenceComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names
index 31cfa551b4..660fb5206f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names
@@ -1,39 +1,39 @@
 {
     "entries": [
         {
-            "key": "SettingsRegistryInterface",
+            "base": "SettingsRegistryInterface",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SettingsRegistryInterface"
+                "name": "Settings Registry",
+                "category": "Registry"
             },
             "methods": [
                 {
-                    "key": "GetFloat",
+                    "base": "GetFloat",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFloat"
+                        "tooltip": "When signaled, this will invoke Get Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFloat is invoked"
+                        "tooltip": "Signaled after Get Float is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::GetFloat",
-                        "category": "Other"
+                        "name": "Get Float"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -41,43 +41,42 @@
                         {
                             "typeid": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
                             "details": {
-                                "name": "AZStd::optional<double>"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFloat",
+                    "base": "SetFloat",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFloat"
+                        "tooltip": "When signaled, this will invoke Set Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFloat is invoked"
+                        "tooltip": "Signaled after Set Float is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::SetFloat",
-                        "category": "Other"
+                        "name": "Set Float"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -85,37 +84,36 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RemoveKey",
+                    "base": "RemoveKey",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RemoveKey"
+                        "tooltip": "When signaled, this will invoke Remove Key"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RemoveKey is invoked"
+                        "tooltip": "Signaled after Remove Key is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::RemoveKey",
-                        "category": "Other"
+                        "name": "Remove Key"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -123,43 +121,42 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetInt",
+                    "base": "SetInt",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetInt"
+                        "tooltip": "When signaled, this will invoke Set Int"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetInt is invoked"
+                        "tooltip": "Signaled after Set Int is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::SetInt",
-                        "category": "Other"
+                        "name": "Set Int"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}",
                             "details": {
-                                "name": "AZ::s64"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -167,43 +164,42 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetUInt",
+                    "base": "SetUInt",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetUInt"
+                        "tooltip": "When signaled, this will invoke Set UInt"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetUInt is invoked"
+                        "tooltip": "Signaled after Set UInt is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::SetUInt",
-                        "category": "Other"
+                        "name": "Set UInt"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Value"
                             }
                         }
                     ],
@@ -211,37 +207,36 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBool",
+                    "base": "GetBool",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBool"
+                        "tooltip": "When signaled, this will invoke Get Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBool is invoked"
+                        "tooltip": "Signaled after Get Bool is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::GetBool",
-                        "category": "Other"
+                        "name": "Get Bool"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -249,37 +244,36 @@
                         {
                             "typeid": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
                             "details": {
-                                "name": "AZStd::optional<bool>"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetInt",
+                    "base": "GetInt",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetInt"
+                        "tooltip": "When signaled, this will invoke Get Int"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetInt is invoked"
+                        "tooltip": "Signaled after Get Int is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::GetInt",
-                        "category": "Other"
+                        "name": "Get Int"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -287,37 +281,36 @@
                         {
                             "typeid": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
                             "details": {
-                                "name": "AZStd::optional<AZ::s64>"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUInt",
+                    "base": "GetUInt",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUInt"
+                        "tooltip": "When signaled, this will invoke Get UInt"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUInt is invoked"
+                        "tooltip": "Signaled after Get UInt is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::GetUInt",
-                        "category": "Other"
+                        "name": "Get UInt"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -325,25 +318,24 @@
                         {
                             "typeid": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
                             "details": {
-                                "name": "AZStd::optional<AZ::u64>"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNotifyEvent",
+                    "base": "GetNotifyEvent",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNotifyEvent"
+                        "tooltip": "When signaled, this will invoke Get Notify Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNotifyEvent is invoked"
+                        "tooltip": "Signaled after Get Notify Event is invoked"
                     },
                     "details": {
-                        "name": "Get Notify Event",
-                        "subtitle": "Settings Registry"
+                        "name": "Get Notify Event"
                     },
                     "params": [
                         {
@@ -357,43 +349,43 @@
                         {
                             "typeid": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}",
                             "details": {
-                                "name": "Event"
+                                "name": "Script Notify Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MergeSettings",
+                    "base": "MergeSettings",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke MergeSettings"
+                        "tooltip": "When signaled, this will invoke Merge Settings"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after MergeSettings is invoked"
+                        "tooltip": "Signaled after Merge Settings is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::MergeSettings",
-                        "category": "Other"
+                        "name": "Merge Settings"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Format",
+                                "tooltip": "0: Json Path, 1: Json Merge Patch"
                             }
                         }
                     ],
@@ -401,49 +393,49 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MergeSettingsFile",
+                    "base": "MergeSettingsFile",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke MergeSettingsFile"
+                        "tooltip": "When signaled, this will invoke Merge Settings File"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after MergeSettingsFile is invoked"
+                        "tooltip": "Signaled after Merge Settings File is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::MergeSettingsFile",
-                        "category": "Other"
+                        "name": "Merge Settings File"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "Root Key"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Format",
+                                "tooltip": "0: Json Path, 1: Json Merge Patch"
                             }
                         }
                     ],
@@ -451,37 +443,36 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetString",
+                    "base": "GetString",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetString"
+                        "tooltip": "When signaled, this will invoke Get String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetString is invoked"
+                        "tooltip": "Signaled after Get String is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::GetString",
-                        "category": "Other"
+                        "name": "Get String"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -489,31 +480,30 @@
                         {
                             "typeid": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
                             "details": {
-                                "name": "AZStd::optional<AZStd::basic_string<char, AZStd::char_traits<char>, allocator>>"
+                                "name": "Output"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsValid"
+                        "tooltip": "When signaled, this will invoke Is Valid"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsValid is invoked"
+                        "tooltip": "Signaled after Is Valid is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::IsValid",
-                        "category": "Other"
+                        "name": "Is Valid"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         }
                     ],
@@ -521,49 +511,48 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MergeSettingsFolder",
+                    "base": "MergeSettingsFolder",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke MergeSettingsFolder"
+                        "tooltip": "When signaled, this will invoke Merge Settings Folder"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after MergeSettingsFolder is invoked"
+                        "tooltip": "Signaled after Merge Settings Folder is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::MergeSettingsFolder",
-                        "category": "Other"
+                        "name": "Merge Settings Folder"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}",
                             "details": {
-                                "name": "const SpecializationsProxy&"
+                                "name": "Specializations Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -571,43 +560,42 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBool",
+                    "base": "SetBool",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBool"
+                        "tooltip": "When signaled, this will invoke Set Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBool is invoked"
+                        "tooltip": "Signaled after Set Bool is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::SetBool",
-                        "category": "Other"
+                        "name": "Set Bool"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ],
@@ -615,43 +603,42 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetString",
+                    "base": "SetString",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetString"
+                        "tooltip": "When signaled, this will invoke Set String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetString is invoked"
+                        "tooltip": "Signaled after Set String is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::SetString",
-                        "category": "Other"
+                        "name": "Set String"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -659,37 +646,36 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DumpSettings",
+                    "base": "DumpSettings",
                     "context": "SettingsRegistryInterface",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DumpSettings"
+                        "tooltip": "When signaled, this will invoke Dump Settings"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DumpSettings is invoked"
+                        "tooltip": "Signaled after Dump Settings is invoked"
                     },
                     "details": {
-                        "name": "SettingsRegistryInterface::DumpSettings",
-                        "category": "Other"
+                        "name": "Dump Settings"
                     },
                     "params": [
                         {
                             "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
                             "details": {
-                                "name": "SettingsRegistryScriptProxy*"
+                                "name": "Settings Registry Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "JSON Path"
                             }
                         }
                     ],
@@ -697,7 +683,7 @@
                         {
                             "typeid": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
                             "details": {
-                                "name": "AZStd::optional<AZStd::basic_string<char, AZStd::char_traits<char>, allocator>>"
+                                "name": "Output"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names
index 94fe0bb982..0e081769b4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShaderCollectionItem",
+            "base": "ShaderCollectionItem",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetShaderAsset",
+                    "base": "GetShaderAsset",
                     "context": "ShaderCollectionItem",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetShaderAssetId",
+                    "base": "GetShaderAssetId",
                     "context": "ShaderCollectionItem",
                     "entry": {
                         "name": "In",
@@ -73,7 +73,7 @@
                     ]
                 },
                 {
-                    "key": "GetShaderVariantId",
+                    "base": "GetShaderVariantId",
                     "context": "ShaderCollectionItem",
                     "entry": {
                         "name": "In",
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetShaderOptionGroup",
+                    "base": "GetShaderOptionGroup",
                     "context": "ShaderCollectionItem",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names
index 59c02d8c6d..24c1085b7d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShaderOptionGroup",
+            "base": "ShaderOptionGroup",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetValueByOptionName",
+                    "base": "GetValueByOptionName",
                     "context": "ShaderOptionGroup",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "GetShaderOptionDescriptors",
+                    "base": "GetShaderOptionDescriptors",
                     "context": "ShaderOptionGroup",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "GetShaderVariantId",
+                    "base": "GetShaderVariantId",
                     "context": "ShaderOptionGroup",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names
index 011619c1e3..f89b6017a6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names
@@ -1,41 +1,117 @@
 {
     "entries": [
         {
-            "key": "ShaderSemantic",
+            "base": "ShaderSemantic",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "ShaderSemantic"
+                "name": "Shader Semantic",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "ShaderSemantic",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "ShaderSemantic::ToString",
-                        "category": "Other"
+                        "name": "To String"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "String"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getname",
+                    "details": {
+                        "name": "Get Name"
                     },
                     "params": [
                         {
                             "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}",
                             "details": {
-                                "name": "ShaderSemantic*"
+                                "name": "Shader Semantic"
                             }
                         }
                     ],
                     "results": [
                         {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setname",
+                    "details": {
+                        "name": "Set Name"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}",
+                            "details": {
+                                "name": "Shader Semantic"
+                            }
+                        },
+                        {
+                            "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
+                            "details": {
+                                "name": "Name"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getindex",
+                    "details": {
+                        "name": "Get Index"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}",
+                            "details": {
+                                "name": "Shader Semantic"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Index"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setindex",
+                    "details": {
+                        "name": "Set Index"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}",
+                            "details": {
+                                "name": "Shader Semantic"
+                            }
+                        },
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "Index"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names
index c6aa37ec83..b56def1788 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShaderVariantId",
+            "base": "ShaderVariantId",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "ShaderVariantId",
                     "entry": {
                         "name": "In",
@@ -47,7 +47,7 @@
                     ]
                 },
                 {
-                    "key": "IsEmpty",
+                    "base": "IsEmpty",
                     "context": "ShaderVariantId",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names
index 215b56ccee..3f503edf3c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShaderVariantInfo",
+            "base": "ShaderVariantInfo",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names
index d8ff471af0..42dc75b474 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShaderVariantListSourceData",
+            "base": "ShaderVariantListSourceData",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names
index 1935304451..728a4412b5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShapeAreaFalloffGradientComponent",
+            "base": "ShapeAreaFalloffGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names
index 03da764cf9..32fd92f533 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShapeAreaFalloffGradientConfig",
+            "base": "ShapeAreaFalloffGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names
index 28e1361b0d..b4da62d2e8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names
@@ -1,40 +1,108 @@
 {
     "entries": [
         {
-            "key": "SimpleAssetReferenceBase",
+            "base": "SimpleAssetReferenceBase",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SimpleAssetReferenceBase"
+                "name": "Simple Asset Reference"
             },
             "methods": [
                 {
-                    "key": "SetAssetPath",
+                    "base": "SetAssetPath",
                     "context": "SimpleAssetReferenceBase",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAssetPath"
+                        "tooltip": "When signaled, this will invoke Set Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAssetPath is invoked"
+                        "tooltip": "Signaled after Set Asset Path is invoked"
                     },
                     "details": {
-                        "name": "SimpleAssetReferenceBase::SetAssetPath",
-                        "category": "Other"
+                        "name": "Set Asset Path"
                     },
                     "params": [
                         {
                             "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}",
                             "details": {
-                                "name": "SimpleAssetReferenceBase*",
+                                "name": "Asset path",
                                 "tooltip": "Asset reference as a project-relative path"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetassetPath",
+                    "details": {
+                        "name": "Get Asset Path"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}",
+                            "details": {
+                                "name": "Asset path",
+                                "tooltip": "Asset reference as a project-relative path"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetassetType",
+                    "details": {
+                        "name": "Get Asset Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}",
+                            "details": {
+                                "name": "Asset path",
+                                "tooltip": "Asset reference as a project-relative path"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetfileFilter",
+                    "details": {
+                        "name": "Get File Filter"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}",
+                            "details": {
+                                "name": "Asset path",
+                                "tooltip": "Asset reference as a project-relative path"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names
index 9867741842..cac9c16821 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SimpleMotionComponent",
+            "base": "SimpleMotionComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names
index e950654cad..05f66ca154 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names
@@ -1,33 +1,32 @@
 {
     "entries": [
         {
-            "key": "SimulatedBody",
+            "base": "SimulatedBody",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SimulatedBody"
+                "name": "Simulated Body"
             },
             "methods": [
                 {
-                    "key": "GetOnCollisionEndEvent",
+                    "base": "GetOnCollisionEndEvent",
                     "context": "SimulatedBody",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnCollisionEndEvent"
+                        "tooltip": "When signaled, this will invoke Get On Collision End Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnCollisionEndEvent is invoked"
+                        "tooltip": "Signaled after Get On Collision End Event is invoked"
                     },
                     "details": {
-                        "name": "SimulatedBody::GetOnCollisionEndEvent",
-                        "category": "Other"
+                        "name": "Get On Collision End Event"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -36,31 +35,30 @@
                         {
                             "typeid": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}",
                             "details": {
-                                "name": "Event<tuple<Crc32 int > const CollisionEvent& >*"
+                                "name": "Collision Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOnCollisionPersistEvent",
+                    "base": "GetOnCollisionPersistEvent",
                     "context": "SimulatedBody",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnCollisionPersistEvent"
+                        "tooltip": "When signaled, this will invoke Get On Collision Persist Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnCollisionPersistEvent is invoked"
+                        "tooltip": "Signaled after Get On Collision Persist Event is invoked"
                     },
                     "details": {
-                        "name": "SimulatedBody::GetOnCollisionPersistEvent",
-                        "category": "Other"
+                        "name": "Get On Collision Persist Event"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -69,31 +67,30 @@
                         {
                             "typeid": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}",
                             "details": {
-                                "name": "Event<tuple<Crc32 int > const CollisionEvent& >*"
+                                "name": "Collision Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOnTriggerEnterEvent",
+                    "base": "GetOnTriggerEnterEvent",
                     "context": "SimulatedBody",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnTriggerEnterEvent"
+                        "tooltip": "When signaled, this will invoke Get On Trigger Enter Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnTriggerEnterEvent is invoked"
+                        "tooltip": "Signaled after Get On Trigger Enter Event is invoked"
                     },
                     "details": {
-                        "name": "SimulatedBody::GetOnTriggerEnterEvent",
-                        "category": "Other"
+                        "name": "Get On Trigger Enter Event"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -102,31 +99,30 @@
                         {
                             "typeid": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}",
                             "details": {
-                                "name": "Event<tuple<Crc32 int > const TriggerEvent& >*"
+                                "name": "Trigger Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOnCollisionBeginEvent",
+                    "base": "GetOnCollisionBeginEvent",
                     "context": "SimulatedBody",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnCollisionBeginEvent"
+                        "tooltip": "When signaled, this will invoke Get On Collision Begin Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnCollisionBeginEvent is invoked"
+                        "tooltip": "Signaled after Get On Collision Begin Event is invoked"
                     },
                     "details": {
-                        "name": "SimulatedBody::GetOnCollisionBeginEvent",
-                        "category": "Other"
+                        "name": "Get On Collision Begin Event"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -135,31 +131,31 @@
                         {
                             "typeid": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}",
                             "details": {
-                                "name": "Event<tuple<Crc32 int > const CollisionEvent& >*"
+                                "name": "Collision Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOnTriggerExitEvent",
+                    "base": "GetOnTriggerExitEvent",
                     "context": "SimulatedBody",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOnTriggerExitEvent"
+                        "tooltip": "When signaled, this will invoke Get On Trigger Exit Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOnTriggerExitEvent is invoked"
+                        "tooltip": "Signaled after Get On Trigger Exit Event is invoked"
                     },
                     "details": {
-                        "name": "SimulatedBody::GetOnTriggerExitEvent",
+                        "name": "Get On Trigger Exit Event",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -168,7 +164,7 @@
                         {
                             "typeid": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}",
                             "details": {
-                                "name": "Event<tuple<Crc32 int > const TriggerEvent& >*"
+                                "name": "Trigger Event"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names
index 003b833a1d..3aa69fd61a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SliceInstanceAddress",
+            "base": "SliceInstanceAddress",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "SliceInstanceAddress",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names
index b9edb1cfa1..b914cad636 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "SliceInstantiationTicket",
+            "base": "SliceInstantiationTicket",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
                 "name": "Slice Instantiation Ticket",
-                "category": "Gameplay"
+                "category": "Slices"
             },
             "methods": [
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "SliceInstantiationTicket",
                     "entry": {
                         "name": "In",
@@ -21,20 +21,13 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "SliceInstantiationTicket::Equal",
-                        "category": "Gameplay"
+                        "name": "Equal"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket*"
-                            }
-                        },
-                        {
-                            "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
-                            "details": {
-                                "name": "const SliceInstantiationTicket&"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ],
@@ -42,71 +35,53 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "bool"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "SliceInstantiationTicket",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "SliceInstantiationTicket::ToString",
-                        "category": "Gameplay"
+                        "name": "To String"
                     },
-                    "params": [
-                        {
-                            "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
-                            "details": {
-                                "name": "SliceInstantiationTicket*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "AZ Std::basic_string<char, AZ Std::char_traits<char>, allocator>"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "SliceInstantiationTicket",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsValid"
+                        "tooltip": "When signaled, this will invoke Is Valid"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsValid is invoked"
+                        "tooltip": "Signaled after Is Valid is invoked"
                     },
                     "details": {
-                        "name": "SliceInstantiationTicket::IsValid",
-                        "category": "Gameplay"
+                        "name": "Is Valid"
                     },
-                    "params": [
-                        {
-                            "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
-                            "details": {
-                                "name": "SliceInstantiationTicket*"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "bool"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names
index 2fff9e6f59..260bfce9a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names
@@ -1,12 +1,147 @@
 {
     "entries": [
         {
-            "key": "SmoothStep",
+            "base": "SmoothStep",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SmoothStep"
-            }
+                "name": "Smooth Step",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "GetfalloffMidpoint",
+                    "details": {
+                        "name": "Getfalloff Midpoint"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+                            "details": {
+                                "name": "Smooth Step Gradient",
+                                "tooltip": "Smooth Step Gradient"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetfalloffMidpoint",
+                    "details": {
+                        "name": "Setfalloff Midpoint"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+                            "details": {
+                                "name": "Smooth Step Gradient",
+                                "tooltip": "Smooth Step Gradient"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetfalloffRange",
+                    "details": {
+                        "name": "Getfalloff Range"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+                            "details": {
+                                "name": "Smooth Step Gradient",
+                                "tooltip": "Smooth Step Gradient"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetfalloffRange",
+                    "details": {
+                        "name": "Setfalloff Range"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+                            "details": {
+                                "name": "Smooth Step Gradient",
+                                "tooltip": "Smooth Step Gradient"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetfalloffStrength",
+                    "details": {
+                        "name": "Getfalloff Strength"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+                            "details": {
+                                "name": "Smooth Step Gradient",
+                                "tooltip": "Smooth Step Gradient"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetfalloffStrength",
+                    "details": {
+                        "name": "Setfalloff Strength"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+                            "details": {
+                                "name": "Smooth Step Gradient",
+                                "tooltip": "Smooth Step Gradient"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names
index 42374f5c08..63bbb21361 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SmoothStepGradientComponent",
+            "base": "SmoothStepGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names
index d9d27df79b..29331f4a45 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SmoothStepGradientConfig",
+            "base": "SmoothStepGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names
index f78e690f18..0956b4294c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names
@@ -1,12 +1,99 @@
 {
     "entries": [
         {
-            "key": "SpawnerConfig",
+            "base": "SpawnerConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SpawnerConfig"
-            }
+                "name": "Spawner Config",
+                "category": "Gameplay/Spawner"
+            },
+            "methods": [
+                {
+                    "base": "GetspawnOnActivate",
+                    "details": {
+                        "name": "Get Spawn On Activate"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}",
+                            "details": {
+                                "name": "Spawner Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetspawnOnActivate",
+                    "details": {
+                        "name": "Set Spawn On Activate"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}",
+                            "details": {
+                                "name": "Spawner Config"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetdestroyOnDeactivate",
+                    "details": {
+                        "name": "Get Destroy On Deactivate"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}",
+                            "details": {
+                                "name": "Spawner Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetdestroyOnDeactivate",
+                    "details": {
+                        "name": "Set Destroy On Deactivate"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}",
+                            "details": {
+                                "name": "Spawner Config"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names
index db5ae9fccf..6e7070b006 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names
@@ -1,39 +1,40 @@
 {
     "entries": [
         {
-            "key": "Specializations",
+            "base": "Specializations",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Specializations"
+                "name": "Specializations",
+                "category": "Registry"
             },
             "methods": [
                 {
-                    "key": "GetPriority",
+                    "base": "GetPriority",
                     "context": "Specializations",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPriority"
+                        "tooltip": "When signaled, this will invoke Get Priority"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPriority is invoked"
+                        "tooltip": "Signaled after Get Priority is invoked"
                     },
                     "details": {
-                        "name": "Specializations::GetPriority",
+                        "name": "Get Priority",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}",
                             "details": {
-                                "name": "SpecializationsProxy*"
+                                "name": "Specializations Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "Specialization"
                             }
                         }
                     ],
@@ -41,31 +42,30 @@
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Priority"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCount",
+                    "base": "GetCount",
                     "context": "Specializations",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCount"
+                        "tooltip": "When signaled, this will invoke Get Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCount is invoked"
+                        "tooltip": "Signaled after Get Count is invoked"
                     },
                     "details": {
-                        "name": "Specializations::GetCount",
-                        "category": "Other"
+                        "name": "Get Count"
                     },
                     "params": [
                         {
                             "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}",
                             "details": {
-                                "name": "SpecializationsProxy*"
+                                "name": "Specializations Proxy"
                             }
                         }
                     ],
@@ -73,13 +73,13 @@
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Contains",
+                    "base": "Contains",
                     "context": "Specializations",
                     "entry": {
                         "name": "In",
@@ -90,20 +90,19 @@
                         "tooltip": "Signaled after Contains is invoked"
                     },
                     "details": {
-                        "name": "Specializations::Contains",
-                        "category": "Other"
+                        "name": "Contains"
                     },
                     "params": [
                         {
                             "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}",
                             "details": {
-                                "name": "SpecializationsProxy*"
+                                "name": "Specializations Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "Specialization"
                             }
                         }
                     ],
@@ -111,13 +110,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Contains"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Append",
+                    "base": "Append",
                     "context": "Specializations",
                     "entry": {
                         "name": "In",
@@ -128,20 +127,19 @@
                         "tooltip": "Signaled after Append is invoked"
                     },
                     "details": {
-                        "name": "Specializations::Append",
-                        "category": "Other"
+                        "name": "Append"
                     },
                     "params": [
                         {
                             "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}",
                             "details": {
-                                "name": "SpecializationsProxy*"
+                                "name": "Specializations Proxy"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "Specialization"
                             }
                         }
                     ],
@@ -149,37 +147,36 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSpecialization",
+                    "base": "GetSpecialization",
                     "context": "Specializations",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSpecialization"
+                        "tooltip": "When signaled, this will invoke Get Specialization"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSpecialization is invoked"
+                        "tooltip": "Signaled after Get Specialization is invoked"
                     },
                     "details": {
-                        "name": "Specializations::GetSpecialization",
-                        "category": "Other"
+                        "name": "Get Specialization"
                     },
                     "params": [
                         {
                             "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}",
                             "details": {
-                                "name": "SpecializationsProxy*"
+                                "name": "Specializations Proxy"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         }
                     ],
@@ -187,7 +184,7 @@
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": "AZStd::basic_string_view<char, AZStd::char_traits<char>>"
+                                "name": "Specialization"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names
index be4d2dbdb2..9fe47a8724 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names
@@ -1,12 +1,59 @@
 {
     "entries": [
         {
-            "key": "SphereShapeConfig",
+            "base": "SphereShapeConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SphereShapeConfig"
-            }
+                "name": "Sphere Shape Config",
+                "category": "Rendering/Shapes"
+            },
+            "methods": [
+                {
+                    "base": "GetRadius",
+                    "details": {
+                        "name": "Get Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{4AADFD75-48A7-4F31-8F30-FE4505F09E35}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Sphere shape configuration parameters"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetRadius",
+                    "details": {
+                        "name": "Set Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{4AADFD75-48A7-4F31-8F30-FE4505F09E35}",
+                            "details": {
+                                "name": "Configuration",
+                                "tooltip": "Sphere shape configuration parameters"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names
index 3bee4fbec1..1bc9b2414d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names
@@ -1,51 +1,48 @@
 {
     "entries": [
         {
-            "key": "String",
+            "base": "String",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "String"
+                "name": "Utilities",
+                "category": "String"
             },
             "methods": [
                 {
-                    "key": "ReplaceString",
+                    "base": "ReplaceString",
                     "context": "String",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ReplaceString"
+                        "tooltip": "When signaled, this will invoke Replace String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ReplaceString is invoked"
+                        "tooltip": "Signaled after Replace String is invoked"
                     },
                     "details": {
-                        "name": "String::Replace String",
-                        "category": "Other"
+                        "name": "Replace String"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>&"
+                                "name": "Replace",
+                                "tooltip": "The substring to search for."
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "With",
+                                "tooltip": "The string to replace the substring with."
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Case Sensitive",
+                                "tooltip": "Take into account the case of the string when searching."
                             }
                         }
                     ],
@@ -53,13 +50,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "AZ Std::basic_string<char, AZ Std::char_traits<char>, allocator>"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Join",
+                    "base": "Join",
                     "context": "String",
                     "entry": {
                         "name": "In",
@@ -70,20 +67,14 @@
                         "tooltip": "Signaled after Join is invoked"
                     },
                     "details": {
-                        "name": "String::Join",
-                        "category": "Other"
+                        "name": "Join"
                     },
                     "params": [
-                        {
-                            "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
-                            "details": {
-                                "name": "const AZStd::vector<AZStd::basic_string<char, AZStd::char_trait"
-                            }
-                        },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Separator",
+                                "tooltip": "Will use this string when concatenating the strings from the array."
                             }
                         }
                     ],
@@ -91,43 +82,38 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::basic_string<char, AZStd::char_traits<char>, allocator>"
+                                "name": "AZ Std::basic_string<char, AZ Std::char_traits<char>, allocator>"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "StartsWith",
+                    "base": "StartsWith",
                     "context": "String",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke StartsWith"
+                        "tooltip": "When signaled, this will invoke Starts With"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after StartsWith is invoked"
+                        "tooltip": "Signaled after Starts With is invoked"
                     },
                     "details": {
-                        "name": "String::Starts With",
-                        "category": "Other"
+                        "name": "Starts With"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Pattern",
+                                "tooltip": "The substring to search for."
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Case Sensitive",
+                                "tooltip": "Take into account the case of the string when searching."
                             }
                         }
                     ],
@@ -141,43 +127,39 @@
                     ]
                 },
                 {
-                    "key": "ContainsString",
+                    "base": "ContainsString",
                     "context": "String",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ContainsString"
+                        "tooltip": "When signaled, this will invoke Contains String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ContainsString is invoked"
+                        "tooltip": "Signaled after Contains String is invoked"
                     },
                     "details": {
-                        "name": "String::Contains String",
-                        "category": "Other"
+                        "name": "Contains String"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Pattern",
+                                "tooltip": "The substring to search for."
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Search From End",
+                                "tooltip": "Start the match checking from the end of a string."
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Case Sensitive",
+                                "tooltip": "Take into account the case of the string when searching."
                             }
                         }
                     ],
@@ -185,13 +167,13 @@
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Split",
+                    "base": "Split",
                     "context": "String",
                     "entry": {
                         "name": "In",
@@ -202,20 +184,14 @@
                         "tooltip": "Signaled after Split is invoked"
                     },
                     "details": {
-                        "name": "String::Split",
-                        "category": "Other"
+                        "name": "Split"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Delimiters",
+                                "tooltip": "The characters that can be used as delimiters."
                             }
                         }
                     ],
@@ -223,34 +199,25 @@
                         {
                             "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                             "details": {
-                                "name": "AZStd::vector<AZStd::basic_string<char, AZStd::char_traits<char>, allocator>, allocator>"
+                                "name": "AZ Std::vector<AZ Std::basic_string<char, AZ Std::char_traits<char>, allocator>, allocator>"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsValidFindPosition",
+                    "base": "IsValidFindPosition",
                     "context": "String",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsValidFindPosition"
+                        "tooltip": "When signaled, this will invoke Is Valid Find Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsValidFindPosition is invoked"
+                        "tooltip": "Signaled after Is Valid Find Position is invoked"
                     },
                     "details": {
-                        "name": "String::Is Valid Find Position",
-                        "category": "Other"
+                        "name": "Is Valid Find Position"
                     },
-                    "params": [
-                        {
-                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
-                            "details": {
-                                "name": "AZ::u64"
-                            }
-                        }
-                    ],
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
@@ -261,37 +228,32 @@
                     ]
                 },
                 {
-                    "key": "EndsWith",
+                    "base": "EndsWith",
                     "context": "String",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke EndsWith"
+                        "tooltip": "When signaled, this will invoke Ends With"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after EndsWith is invoked"
+                        "tooltip": "Signaled after Ends With is invoked"
                     },
                     "details": {
-                        "name": "String::Ends With",
-                        "category": "Other"
+                        "name": "Ends With"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Pattern",
+                                "tooltip": "The substring to search for."
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Case Sensitive",
+                                "tooltip": "Take into account the case of the string when searching."
                             }
                         }
                     ],
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names
index 38a203d02f..86a0f9e3c0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "String_VM",
+            "base": "String_VM",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "ToLower",
+                    "base": "ToLower",
                     "context": "String_VM",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "ToUpper",
+                    "base": "ToUpper",
                     "context": "String_VM",
                     "entry": {
                         "name": "In",
@@ -73,7 +73,7 @@
                     ]
                 },
                 {
-                    "key": "Substring",
+                    "base": "Substring",
                     "context": "String_VM",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names
index c42e70fd88..6d5e6004b3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SurfaceAltitudeGradientComponent",
+            "base": "SurfaceAltitudeGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names
index 2886505974..55f73fe1a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SurfaceAltitudeGradientConfig",
+            "base": "SurfaceAltitudeGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "context": "SurfaceAltitudeGradientConfig",
                     "entry": {
                         "name": "In",
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "context": "SurfaceAltitudeGradientConfig",
                     "entry": {
                         "name": "In",
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "context": "SurfaceAltitudeGradientConfig",
                     "entry": {
                         "name": "In",
@@ -112,7 +112,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "context": "SurfaceAltitudeGradientConfig",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names
index e82633638e..d3c50d9034 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SurfaceMaskGradientComponent",
+            "base": "SurfaceMaskGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names
index 126e5cb118..4bf5c687ec 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SurfaceMaskGradientConfig",
+            "base": "SurfaceMaskGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "context": "SurfaceMaskGradientConfig",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "context": "SurfaceMaskGradientConfig",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "context": "SurfaceMaskGradientConfig",
                     "entry": {
                         "name": "In",
@@ -109,7 +109,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "context": "SurfaceMaskGradientConfig",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names
index 94dbbf61a6..dad8d7b765 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SurfaceSlopeGradientComponent",
+            "base": "SurfaceSlopeGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names
index c57eb21d4b..4a9e8e25dd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SurfaceSlopeGradientConfig",
+            "base": "SurfaceSlopeGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "context": "SurfaceSlopeGradientConfig",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "context": "SurfaceSlopeGradientConfig",
                     "entry": {
                         "name": "In",
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "context": "SurfaceSlopeGradientConfig",
                     "entry": {
                         "name": "In",
@@ -109,7 +109,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "context": "SurfaceSlopeGradientConfig",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names
index 0e950bcdbd..52c8078238 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names
@@ -1,12 +1,99 @@
 {
     "entries": [
         {
-            "key": "SurfaceTagWeight",
+            "base": "SurfaceTagWeight",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "SurfaceTagWeight"
-            }
+                "name": "Surface Tag Weight",
+                "category": "Surface Data"
+            },
+            "methods": [
+                {
+                    "base": "GetsurfaceType",
+                    "details": {
+                        "name": "Get Surface Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
+                            "details": {
+                                "name": "Surface Tag Weight"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Tag"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetsurfaceType",
+                    "details": {
+                        "name": "Set Surface Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
+                            "details": {
+                                "name": "Surface Tag Weight"
+                            }
+                        },
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Tag"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getweight",
+                    "details": {
+                        "name": "Get Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
+                            "details": {
+                                "name": "Surface Tag Weight"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Weight"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setweight",
+                    "details": {
+                        "name": "Set Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
+                            "details": {
+                                "name": "Surface Tag Weight"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Weight"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names
index dd5a04064c..03702818ca 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TestTupleMethods",
+            "base": "TestTupleMethods",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Three",
+                    "base": "Three",
                     "context": "TestTupleMethods",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names
index ea113281c7..1418df947e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ThresholdGradientComponent",
+            "base": "ThresholdGradientComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names
index 9fc1ac28ca..4ca077834f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ThresholdGradientConfig",
+            "base": "ThresholdGradientConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names
index db75d9c39b..58d8b41aac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names
@@ -1,12 +1,169 @@
 {
     "entries": [
         {
-            "key": "TickOrder",
+            "base": "TickOrder",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "TickOrder"
-            }
+                "name": "Tick Order",
+                "category": "Timing"
+            },
+            "methods": [
+                {
+                    "base": "GetPhysics",
+                    "details": {
+                        "name": "Get Physics"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAnimation",
+                    "details": {
+                        "name": "Get Animation"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPreRender",
+                    "details": {
+                        "name": "Get Pre Render"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetGame",
+                    "details": {
+                        "name": "Get Game"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetInput",
+                    "details": {
+                        "name": "Get Input"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAttachment",
+                    "details": {
+                        "name": "Get Attachment"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPlacement",
+                    "details": {
+                        "name": "Get Placement"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDefault",
+                    "details": {
+                        "name": "Get Default"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetFirst",
+                    "details": {
+                        "name": "Get First"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetUI",
+                    "details": {
+                        "name": "GetUI"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetLast",
+                    "details": {
+                        "name": "Get Last"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names
index 5c7d439587..ebf6400d43 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TransformComponent",
+            "base": "TransformComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names
index f13c9a8f80..3c5ade5a55 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names
@@ -1,76 +1,316 @@
 {
     "entries": [
         {
-            "key": "TransformConfig",
+            "base": "TransformConfig",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Transform",
+                "name": "Transform Config",
                 "category": "Entity"
             },
             "methods": [
                 {
-                    "key": "SetTransform",
+                    "base": "SetTransform",
                     "context": "TransformConfig",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTransform"
+                        "tooltip": "When signaled, this will invoke Set Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTransform is invoked"
+                        "tooltip": "Signaled after Set Transform is invoked"
                     },
                     "details": {
-                        "name": "TransformConfig::SetTransform",
-                        "category": "Entity"
+                        "name": "Set Transform"
                     },
                     "params": [
                         {
                             "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
                             "details": {
-                                "name": "TransformConfig*"
+                                "name": "Transform Config"
                             }
                         },
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "const Transform&"
+                                "name": "Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalAndWorldTransform",
+                    "base": "SetLocalAndWorldTransform",
                     "context": "TransformConfig",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLocalAndWorldTransform"
+                        "tooltip": "When signaled, this will invoke Set Local And World Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLocalAndWorldTransform is invoked"
+                        "tooltip": "Signaled after Set Local And World Transform is invoked"
                     },
                     "details": {
-                        "name": "TransformConfig::SetLocalAndWorldTransform",
-                        "category": "Entity"
+                        "name": "Set Local And World Transform"
                     },
                     "params": [
                         {
                             "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
                             "details": {
-                                "name": "TransformConfig*"
+                                "name": "Transform Config"
                             }
                         },
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "const Transform&"
+                                "name": "Local"
                             }
                         },
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "const Transform&"
+                                "name": "World"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetparentActivationTransformMode",
+                    "details": {
+                        "name": "Get Parent Activation Transform Mode"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Mode",
+                                "tooltip": "0: Maintain Original Relative Transform\n1: Maintain Current World Transform"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetparentActivationTransformMode",
+                    "details": {
+                        "name": "Set Parent Activation Transform Mode"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Mode",
+                                "tooltip": "0: Maintain Original Relative Transform\n1: Maintain Current World Transform"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetparentId",
+                    "details": {
+                        "name": "Get Parent Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Parent Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetparentId",
+                    "details": {
+                        "name": "Set Parent Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Parent Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetworldTransform",
+                    "details": {
+                        "name": "Get World Transform"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+                            "details": {
+                                "name": "World"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetworldTransform",
+                    "details": {
+                        "name": "Set World Transform"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        },
+                        {
+                            "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+                            "details": {
+                                "name": "World"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaintainCurrentWorldTransform",
+                    "details": {
+                        "name": "Get Maintain Current World Transform"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetisStatic",
+                    "details": {
+                        "name": "Get Is Static"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Static"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetisStatic",
+                    "details": {
+                        "name": "Set Is Static"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Static"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaintainOriginalRelativeTransform",
+                    "details": {
+                        "name": "Get Maintain Original Relative Transform"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetlocalTransform",
+                    "details": {
+                        "name": "Get Local Transform"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+                            "details": {
+                                "name": "Local"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetlocalTransform",
+                    "details": {
+                        "name": "Set Local Transform"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}",
+                            "details": {
+                                "name": "Transform Config"
+                            }
+                        },
+                        {
+                            "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+                            "details": {
+                                "name": "Local"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names
index ecac2ac2d5..7dd601aab9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names
@@ -1,33 +1,33 @@
 {
     "entries": [
         {
-            "key": "TriggerEvent",
+            "base": "TriggerEvent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "TriggerEvent"
+                "name": "Trigger Event"
             },
             "methods": [
                 {
-                    "key": "GetTriggerEntityId",
+                    "base": "GetTriggerEntityId",
                     "context": "TriggerEvent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTriggerEntityId"
+                        "tooltip": "When signaled, this will invoke Get Trigger Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTriggerEntityId is invoked"
+                        "tooltip": "Signaled after Get Trigger Entity Id is invoked"
                     },
                     "details": {
-                        "name": "TriggerEvent::Get Trigger EntityId",
+                        "name": "Get Trigger Entity Id",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{7A0851A3-2CBD-4A03-85D5-1C40221E7F61}",
                             "details": {
-                                "name": "TriggerEvent*"
+                                "name": "Trigger Event"
                             }
                         }
                     ],
@@ -35,32 +35,32 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOtherEntityId",
+                    "base": "GetOtherEntityId",
                     "context": "TriggerEvent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOtherEntityId"
+                        "tooltip": "When signaled, this will invoke Get Other Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOtherEntityId is invoked"
+                        "tooltip": "Signaled after Get Other Entity Id is invoked"
                     },
                     "details": {
-                        "name": "TriggerEvent::Get Other EntityId",
+                        "name": "Get Other Entity Id",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{7A0851A3-2CBD-4A03-85D5-1C40221E7F61}",
                             "details": {
-                                "name": "TriggerEvent*"
+                                "name": "Trigger Event"
                             }
                         }
                     ],
@@ -68,7 +68,7 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names
index 4157b33300..5cb7fe9b2d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TypeExposition",
+            "base": "TypeExposition",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "Reflect_AZStd__array_AZ__Vector3_2",
+                    "base": "Reflect_AZStd__array_AZ__Vector3_2",
                     "context": "TypeExposition",
                     "entry": {
                         "name": "In",
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "Reflect_AZ__Outcome_AZ__Vector3_void",
+                    "base": "Reflect_AZ__Outcome_AZ__Vector3_void",
                     "context": "TypeExposition",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names
index 57abfbff4b..ecbd6b8618 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names
@@ -1,191 +1,341 @@
 {
     "entries": [
         {
-            "key": "UVCoords",
+            "base": "UVCoords",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
                 "name": "UV Coords",
-                "category": "UI/LyShine Examples"
+                "category": "UI/UI Examples"
             },
             "methods": [
                 {
-                    "key": "SetUVCoords",
+                    "base": "SetUVCoords",
                     "context": "UVCoords",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetUVCoords"
+                        "tooltip": "When signaled, this will invoke SetUV Coords"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetUVCoords is invoked"
+                        "tooltip": "Signaled after SetUV Coords is invoked"
                     },
                     "details": {
-                        "name": "UVCoords::SetUVCoords",
-                        "category": "UI/LyShine Examples"
+                        "name": "Set UV Coords"
                     },
                     "params": [
                         {
                             "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
                             "details": {
-                                "name": "UV Coords",
-                                "tooltip": "The UV coordinates to set"
+                                "name": "UV Rect"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The lower X UV coordinate [0-1]"
+                                "name": "Left"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The higher Y UV coordinate [0-1]"
+                                "name": "Top"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The higher X UV coordinate [0-1]"
+                                "name": "Right"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The lower Y UV coordinate [0-1]"
+                                "name": "Bottom"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBottom",
+                    "base": "SetBottom",
                     "context": "UVCoords",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBottom"
+                        "tooltip": "When signaled, this will invoke Set Bottom"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBottom is invoked"
+                        "tooltip": "Signaled after Set Bottom is invoked"
                     },
                     "details": {
-                        "name": "UVCoords::SetBottom",
-                        "category": "UI/LyShine Examples"
+                        "name": "Set Bottom"
                     },
                     "params": [
                         {
                             "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
                             "details": {
-                                "name": "UV Coords",
-                                "tooltip": "The UV coordinates to set"
+                                "name": "UV Rect"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The lower Y UV coordinate [0-1]"
+                                "name": "Bottom"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRight",
+                    "base": "SetRight",
                     "context": "UVCoords",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRight"
+                        "tooltip": "When signaled, this will invoke Set Right"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRight is invoked"
+                        "tooltip": "Signaled after Set Right is invoked"
                     },
                     "details": {
-                        "name": "UVCoords::SetRight",
-                        "category": "UI/LyShine Examples"
+                        "name": "Set Right"
                     },
                     "params": [
                         {
                             "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
                             "details": {
-                                "name": "UV Coords",
-                                "tooltip": "The UV coordinates to set"
+                                "name": "UV Rect"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The higher X UV coordinate [0-1]"
+                                "name": "Right"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTop",
+                    "base": "SetTop",
                     "context": "UVCoords",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTop"
+                        "tooltip": "When signaled, this will invoke Set Top"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTop is invoked"
+                        "tooltip": "Signaled after Set Top is invoked"
                     },
                     "details": {
-                        "name": "UVCoords::SetTop",
-                        "category": "UI/LyShine Examples"
+                        "name": "Set Top"
                     },
                     "params": [
                         {
                             "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
                             "details": {
-                                "name": "UV Coords",
-                                "tooltip": "The UV coordinates to set"
+                                "name": "UV Rect"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The higher Y UV coordinate [0-1]"
+                                "name": "Top"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLeft",
+                    "base": "SetLeft",
                     "context": "UVCoords",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLeft"
+                        "tooltip": "When signaled, this will invoke Set Left"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLeft is invoked"
+                        "tooltip": "Signaled after Set Left is invoked"
                     },
                     "details": {
-                        "name": "UVCoords::SetLeft",
-                        "category": "UI/LyShine Examples"
+                        "name": "Set Left"
                     },
                     "params": [
                         {
                             "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
                             "details": {
-                                "name": "UV Coords",
-                                "tooltip": "The UV coordinates to set"
+                                "name": "UV Rect"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "Sets the lower X UV coordinate [0-1]"
+                                "name": "Left"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getleft",
+                    "details": {
+                        "name": "Left"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Left"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setleft",
+                    "details": {
+                        "name": "Set Left"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Left"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Gettop",
+                    "details": {
+                        "name": "Top"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Top"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Settop",
+                    "details": {
+                        "name": "Set Top"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Top"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getright",
+                    "details": {
+                        "name": "Get Right"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Right"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setright",
+                    "details": {
+                        "name": "Set Right"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Right"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getbottom",
+                    "details": {
+                        "name": "Get Bottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Bottom"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setbottom",
+                    "details": {
+                        "name": "Bottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+                            "details": {
+                                "name": "UV Rect"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Bottom"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names
index fce8a21930..69c64e6c7a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiAnchors",
+            "base": "UiAnchors",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -10,182 +10,332 @@
             },
             "methods": [
                 {
-                    "key": "SetBottom",
+                    "base": "SetBottom",
                     "context": "UiAnchors",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBottom"
+                        "tooltip": "When signaled, this will invoke Set Bottom"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBottom is invoked"
+                        "tooltip": "Signaled after Set Bottom is invoked"
                     },
                     "details": {
-                        "name": "UiAnchors::SetBottom",
-                        "category": "UI"
+                        "name": "Set Bottom"
                     },
                     "params": [
                         {
                             "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
                             "details": {
-                                "name": "Anchors",
-                                "tooltip": "The anchors for which to set the bottom anchor"
+                                "name": "Anchors"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The bottom anchor [0-1]"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRight",
+                    "base": "SetRight",
                     "context": "UiAnchors",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRight"
+                        "tooltip": "When signaled, this will invoke Set Right"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRight is invoked"
+                        "tooltip": "Signaled after Set Right is invoked"
                     },
                     "details": {
-                        "name": "UiAnchors::SetRight",
-                        "category": "UI"
+                        "name": "Set Right"
                     },
                     "params": [
                         {
                             "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
                             "details": {
-                                "name": "Anchors",
-                                "tooltip": "The anchors for which to set the right anchor"
+                                "name": "Anchors"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The right anchor [0-1]"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTop",
+                    "base": "SetTop",
                     "context": "UiAnchors",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTop"
+                        "tooltip": "When signaled, this will invoke Set Top"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTop is invoked"
+                        "tooltip": "Signaled after Set Top is invoked"
                     },
                     "details": {
-                        "name": "UiAnchors::SetTop",
-                        "category": "UI"
+                        "name": "Set Top"
                     },
                     "params": [
                         {
                             "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
                             "details": {
-                                "name": "Anchors",
-                                "tooltip": "The anchors for which to set the top anchor"
+                                "name": "Anchors"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The top anchor [0-1]"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLeft",
+                    "base": "SetLeft",
                     "context": "UiAnchors",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLeft"
+                        "tooltip": "When signaled, this will invoke Set Left"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLeft is invoked"
+                        "tooltip": "Signaled after Set Left is invoked"
                     },
                     "details": {
-                        "name": "UiAnchors::SetLeft",
-                        "category": "UI"
+                        "name": "Set Left"
                     },
                     "params": [
                         {
                             "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
                             "details": {
-                                "name": "Anchors",
-                                "tooltip": "The anchors for which to set the left anchor"
+                                "name": "Anchors"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The left anchor [0-1]"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAnchors",
+                    "base": "SetAnchors",
                     "context": "UiAnchors",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAnchors"
+                        "tooltip": "When signaled, this will invoke Set Anchors"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAnchors is invoked"
+                        "tooltip": "Signaled after Set Anchors is invoked"
                     },
                     "details": {
-                        "name": "UiAnchors::SetAnchors",
-                        "category": "UI"
+                        "name": "Set Anchors"
                     },
                     "params": [
                         {
                             "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
                             "details": {
-                                "name": "Anchors",
-                                "tooltip": "The anchors to set"
+                                "name": "Anchors"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The left anchor [0-1]"
+                                "name": "float"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The top anchor [0-1]"
+                                "name": "float"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The right anchor [0-1]"
+                                "name": "float"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The bottom anchor [0-1]"
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getleft",
+                    "details": {
+                        "name": "Getleft"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setleft",
+                    "details": {
+                        "name": "Setleft"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Gettop",
+                    "details": {
+                        "name": "Gettop"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Settop",
+                    "details": {
+                        "name": "Settop"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getright",
+                    "details": {
+                        "name": "Getright"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setright",
+                    "details": {
+                        "name": "Setright"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getbottom",
+                    "details": {
+                        "name": "Getbottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setbottom",
+                    "details": {
+                        "name": "Setbottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+                            "details": {
+                                "name": "Anchors"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names
index 6266f8234c..7f7fcd9478 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiFaderComponent",
+            "base": "UiFaderComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names
index 66935473be..42ce5b7de3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiImageComponent",
+            "base": "UiImageComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names
index e0f2292b8d..86c01c7510 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiImageSequenceComponent",
+            "base": "UiImageSequenceComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names
index 123be9bca5..d7f8882110 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiLayoutCellComponent",
+            "base": "UiLayoutCellComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names
index 7962c9e48b..bc37e12574 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiLayoutColumnComponent",
+            "base": "UiLayoutColumnComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names
index 7617b10f9c..7f576d62e9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiLayoutRowComponent",
+            "base": "UiLayoutRowComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names
index dcf4704ca1..8115b68587 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiOffsets",
+            "base": "UiOffsets",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -10,182 +10,332 @@
             },
             "methods": [
                 {
-                    "key": "SetBottom",
+                    "base": "SetBottom",
                     "context": "UiOffsets",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBottom"
+                        "tooltip": "When signaled, this will invoke Set Bottom"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBottom is invoked"
+                        "tooltip": "Signaled after Set Bottom is invoked"
                     },
                     "details": {
-                        "name": "UiOffsets::SetBottom",
-                        "category": "UI"
+                        "name": "Set Bottom"
                     },
                     "params": [
                         {
                             "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
                             "details": {
-                                "name": "Offsets",
-                                "tooltip": "The Offsets for which to set the bottom offset"
+                                "name": "Offsets"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The offset from the anchors to the bottom edge of the element"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRight",
+                    "base": "SetRight",
                     "context": "UiOffsets",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRight"
+                        "tooltip": "When signaled, this will invoke Set Right"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRight is invoked"
+                        "tooltip": "Signaled after Set Right is invoked"
                     },
                     "details": {
-                        "name": "UiOffsets::SetRight",
-                        "category": "UI"
+                        "name": "Set Right"
                     },
                     "params": [
                         {
                             "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
                             "details": {
-                                "name": "Offsets",
-                                "tooltip": "The offsets for which to set the right offset"
+                                "name": "Offsets"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The offset from the anchors to the right edge of the element"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOffsets",
+                    "base": "SetOffsets",
                     "context": "UiOffsets",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOffsets"
+                        "tooltip": "When signaled, this will invoke Set Offsets"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOffsets is invoked"
+                        "tooltip": "Signaled after Set Offsets is invoked"
                     },
                     "details": {
-                        "name": "UiOffsets::SetOffsets",
-                        "category": "UI"
+                        "name": "Set Offsets"
                     },
                     "params": [
                         {
                             "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
                             "details": {
-                                "name": "Offsets",
-                                "tooltip": "The offsets to set"
+                                "name": "Offsets"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The offset from the anchors to the left edge of the element"
+                                "name": "Left"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The offset from the anchors to the top edge of the element"
+                                "name": "Top"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The offset from the anchors to the right edge of the element"
+                                "name": "Right"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The offset from the anchors to the bottom edge of the element"
+                                "name": "Bottom"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTop",
+                    "base": "SetTop",
                     "context": "UiOffsets",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTop"
+                        "tooltip": "When signaled, this will invoke Set Top"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTop is invoked"
+                        "tooltip": "Signaled after Set Top is invoked"
                     },
                     "details": {
-                        "name": "UiOffsets::SetTop",
-                        "category": "UI"
+                        "name": "Set Top"
                     },
                     "params": [
                         {
                             "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
                             "details": {
-                                "name": "Offsets",
-                                "tooltip": "The offsets for which to set the top offset"
+                                "name": "Offsets"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The offset from the anchors to the top edge of the element"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLeft",
+                    "base": "SetLeft",
                     "context": "UiOffsets",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLeft"
+                        "tooltip": "When signaled, this will invoke Set Left"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLeft is invoked"
+                        "tooltip": "Signaled after Set Left is invoked"
                     },
                     "details": {
-                        "name": "UiOffsets::SetLeft",
-                        "category": "UI"
+                        "name": "Set Left"
                     },
                     "params": [
                         {
                             "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
                             "details": {
-                                "name": "Offsets",
-                                "tooltip": "The offsets for which to set the left offset"
+                                "name": "Offsets"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The offset from the anchors to the left edge of the element"
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getleft",
+                    "details": {
+                        "name": "Get Left"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setleft",
+                    "details": {
+                        "name": "Set Left"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Gettop",
+                    "details": {
+                        "name": "Get Top"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Settop",
+                    "details": {
+                        "name": "Set Top"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getright",
+                    "details": {
+                        "name": "Get Right"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setright",
+                    "details": {
+                        "name": "Set Right"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getbottom",
+                    "details": {
+                        "name": "Get Bottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setbottom",
+                    "details": {
+                        "name": "Set Bottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+                            "details": {
+                                "name": "Offsets"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Value"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names
index 296735cd1d..4249172ac9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiPadding",
+            "base": "UiPadding",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
@@ -10,182 +10,332 @@
             },
             "methods": [
                 {
-                    "key": "SetPadding",
+                    "base": "SetPadding",
                     "context": "UiPadding",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPadding"
+                        "tooltip": "When signaled, this will invoke Set Padding"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPadding is invoked"
+                        "tooltip": "Signaled after Set Padding is invoked"
                     },
                     "details": {
-                        "name": "UiPadding::SetPadding",
-                        "category": "UI"
+                        "name": "Set Padding"
                     },
                     "params": [
                         {
                             "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
                             "details": {
-                                "name": "Padding",
-                                "tooltip": "The padding to set"
+                                "name": "Padding"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The padding inside the left edge of the element"
+                                "name": "int"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The padding inside the top edge of the element"
+                                "name": "int"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The padding inside the right edge of the element"
+                                "name": "int"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The padding inside the bottom edge of the element"
+                                "name": "int"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBottom",
+                    "base": "SetBottom",
                     "context": "UiPadding",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBottom"
+                        "tooltip": "When signaled, this will invoke Set Bottom"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBottom is invoked"
+                        "tooltip": "Signaled after Set Bottom is invoked"
                     },
                     "details": {
-                        "name": "UiPadding::SetBottom",
-                        "category": "UI"
+                        "name": "Set Bottom"
                     },
                     "params": [
                         {
                             "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
                             "details": {
-                                "name": "Padding",
-                                "tooltip": "The padding for which to set the bottom padding"
+                                "name": "Padding"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Bottom",
-                                "tooltip": "The padding inside the bottom edge of the element"
+                                "name": "int"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRight",
+                    "base": "SetRight",
                     "context": "UiPadding",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRight"
+                        "tooltip": "When signaled, this will invoke Set Right"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRight is invoked"
+                        "tooltip": "Signaled after Set Right is invoked"
                     },
                     "details": {
-                        "name": "UiPadding::SetRight",
-                        "category": "UI"
+                        "name": "Set Right"
                     },
                     "params": [
                         {
                             "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
                             "details": {
-                                "name": "Padding",
-                                "tooltip": "The padding for which to set the right padding"
+                                "name": "Padding"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Right",
-                                "tooltip": "The padding inside the right edge of the element"
+                                "name": "int"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTop",
+                    "base": "SetTop",
                     "context": "UiPadding",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTop"
+                        "tooltip": "When signaled, this will invoke Set Top"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTop is invoked"
+                        "tooltip": "Signaled after Set Top is invoked"
                     },
                     "details": {
-                        "name": "UiPadding::SetTop",
-                        "category": "UI"
+                        "name": "Set Top"
                     },
                     "params": [
                         {
                             "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
                             "details": {
-                                "name": "Padding",
-                                "tooltip": "The padding for which to set the top padding"
+                                "name": "Padding"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Top",
-                                "tooltip": "The padding inside the top edge of the element"
+                                "name": "int"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLeft",
+                    "base": "SetLeft",
                     "context": "UiPadding",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLeft"
+                        "tooltip": "When signaled, this will invoke Set Left"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLeft is invoked"
+                        "tooltip": "Signaled after Set Left is invoked"
                     },
                     "details": {
-                        "name": "UiPadding::SetLeft",
-                        "category": "UI"
+                        "name": "Set Left"
                     },
                     "params": [
                         {
                             "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
                             "details": {
-                                "name": "Padding",
-                                "tooltip": "The padding for which to set the left padding"
+                                "name": "Padding"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Left",
-                                "tooltip": "The padding inside the left edge of the element"
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getleft",
+                    "details": {
+                        "name": "Getleft"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setleft",
+                    "details": {
+                        "name": "Setleft"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getright",
+                    "details": {
+                        "name": "Getright"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setright",
+                    "details": {
+                        "name": "Setright"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Gettop",
+                    "details": {
+                        "name": "Gettop"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Settop",
+                    "details": {
+                        "name": "Settop"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getbottom",
+                    "details": {
+                        "name": "Getbottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Setbottom",
+                    "details": {
+                        "name": "Setbottom"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+                            "details": {
+                                "name": "Padding"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names
index ba5463b7a0..8218d063fb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiParticleEmitterComponent",
+            "base": "UiParticleEmitterComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names
index 81a27fcdf1..13a890a74e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiScrollBarComponent",
+            "base": "UiScrollBarComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names
index 269ae95c1c..52a5928940 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiSliderComponent",
+            "base": "UiSliderComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names
index ffed23d747..e611e3bc50 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiTextComponent",
+            "base": "UiTextComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names
index ca2bd78b61..872ee6c4b0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiTextInputComponent",
+            "base": "UiTextInputComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names
index b39c29cf97..436f9265b7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiTooltipDisplayComponent",
+            "base": "UiTooltipDisplayComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names
index 4f0a04958a..dd8b4126c6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiTransform2dComponent",
+            "base": "UiTransform2dComponent",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names
index c5eefda46c..160f0563c1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names	
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names	
@@ -1,15 +1,16 @@
 {
     "entries": [
         {
-            "key": "Unit Testing",
+            "base": "Unit Testing",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "Unit Testing"
+                "name": "Unit Testing",
+                "category": "Tests"
             },
             "methods": [
                 {
-                    "key": "ExpectLessThanEqual",
+                    "base": "ExpectLessThanEqual",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -20,39 +21,39 @@
                         "tooltip": "Signaled after ExpectLessThanEqual is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect Less Than Equal",
+                        "name": "Expect Less Than Equal",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Candidate"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Reference"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectGreaterThanEqual",
+                    "base": "ExpectGreaterThanEqual",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -70,32 +71,32 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Candidate"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Reference"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MarkComplete",
+                    "base": "MarkComplete",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -106,27 +107,27 @@
                         "tooltip": "Signaled after MarkComplete is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Mark Complete",
+                        "name": "Mark Complete",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectTrue",
+                    "base": "ExpectTrue",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -137,33 +138,33 @@
                         "tooltip": "Signaled after ExpectTrue is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect True",
+                        "name": "Expect True",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Candidate"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Checkpoint",
+                    "base": "Checkpoint",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -174,27 +175,27 @@
                         "tooltip": "Signaled after Checkpoint is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Checkpoint",
+                        "name": "Checkpoint",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectFalse",
+                    "base": "ExpectFalse",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -205,33 +206,33 @@
                         "tooltip": "Signaled after ExpectFalse is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect False",
+                        "name": "Expect False",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Candidate"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectEqual",
+                    "base": "ExpectEqual",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -242,39 +243,39 @@
                         "tooltip": "Signaled after ExpectEqual is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect Equal",
+                        "name": "Expect Equal",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
                             "details": {
-                                "name": "Aabb"
+                                "name": "Candidate"
                             }
                         },
                         {
                             "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
                             "details": {
-                                "name": "Aabb"
+                                "name": "Reference"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectLessThan",
+                    "base": "ExpectLessThan",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -285,70 +286,70 @@
                         "tooltip": "Signaled after ExpectLessThan is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect Less Than",
+                        "name": "Expect Less Than",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Candidate"
                             }
                         },
                         {
                             "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
                             "details": {
-                                "name": "double"
+                                "name": "Reference"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AddSuccess",
+                    "base": "AddSuccess",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke AddSuccess"
+                        "tooltip": "When signaled, this will invoke Add Success"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after AddSuccess is invoked"
+                        "tooltip": "Signaled after Add Success is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Add Success",
+                        "name": "Add Success",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectNotEqual",
+                    "base": "ExpectNotEqual",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -359,14 +360,14 @@
                         "tooltip": "Signaled after ExpectNotEqual is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect Not Equal",
+                        "name": "Expect Not Equal",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
@@ -385,13 +386,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ExpectGreaterThan",
+                    "base": "ExpectGreaterThan",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -402,14 +403,14 @@
                         "tooltip": "Signaled after ExpectGreaterThan is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Expect Greater Than",
+                        "name": "Expect Greater Than",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
@@ -428,13 +429,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AddFailure",
+                    "base": "AddFailure",
                     "context": "Unit Testing",
                     "entry": {
                         "name": "In",
@@ -445,21 +446,21 @@
                         "tooltip": "Signaled after AddFailure is invoked"
                     },
                     "details": {
-                        "name": "Unit Testing::Add Failure",
+                        "name": "Add Failure",
                         "category": "Other"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "const EntityId&",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "const AZStd::basic_string<char, AZStd::char_traits<char>, alloc"
+                                "name": "Report"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names
new file mode 100644
index 0000000000..64ecdb414a
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names
@@ -0,0 +1,484 @@
+{
+    "entries": [
+        {
+            "base": "Unit Testing",
+            "context": "BehaviorClass",
+            "variant": "",
+            "details": {
+                "name": "Unit Testing"
+            },
+            "methods": [
+                {
+                    "base": "ExpectLessThanEqual",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect Less Than Equal"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect Less Than Equal is invoked"
+                    },
+                    "details": {
+                        "name": "Expect Less Than Equal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "left of <="
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Reference",
+                                "tooltip": "right of <="
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectGreaterThanEqual",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect Greater Than Equal"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect Greater Than Equal is invoked"
+                    },
+                    "details": {
+                        "name": "Expect Greater Than Equal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "left of >="
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Reference",
+                                "tooltip": "right of >="
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "MarkComplete",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Mark Complete"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Mark Complete is invoked"
+                    },
+                    "details": {
+                        "name": "Mark Complete"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectTrue",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect True"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect True is invoked"
+                    },
+                    "details": {
+                        "name": "Expect True"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "a value that must be true"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Checkpoint",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Checkpoint"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Checkpoint is invoked"
+                    },
+                    "details": {
+                        "name": "Checkpoint"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectFalse",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect False"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect False is invoked"
+                    },
+                    "details": {
+                        "name": "Expect False"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "a value that must be false"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectEqual",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect Equal"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect Equal is invoked"
+                    },
+                    "details": {
+                        "name": "Expect Equal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "left of =="
+                            }
+                        },
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "Reference",
+                                "tooltip": "right of =="
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectLessThan",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect Less Than"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect Less Than is invoked"
+                    },
+                    "details": {
+                        "name": "Expect Less Than"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "left of <"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Reference",
+                                "tooltip": "right of <"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddSuccess",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Success"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Success is invoked"
+                    },
+                    "details": {
+                        "name": "Add Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectNotEqual",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect Not Equal"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect Not Equal is invoked"
+                    },
+                    "details": {
+                        "name": "Expect Not Equal"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "left of !="
+                            }
+                        },
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "Reference",
+                                "tooltip": "right of !="
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ExpectGreaterThan",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Expect Greater Than"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Expect Greater Than is invoked"
+                    },
+                    "details": {
+                        "name": "Expect Greater Than"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Candidate",
+                                "tooltip": "left of >"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "Reference",
+                                "tooltip": "right of >"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddFailure",
+                    "context": "Unit Testing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Failure"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Failure is invoked"
+                    },
+                    "details": {
+                        "name": "Add Failure"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Report",
+                                "tooltip": "additional notes for the test report"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names
index dbed05c272..504c64f4b3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names
@@ -1,66 +1,62 @@
 {
     "entries": [
         {
-            "key": "Uuid",
+            "base": "Uuid",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "UUID",
+                "name": "Uuid",
                 "category": "Utilities"
             },
             "methods": [
                 {
-                    "key": "CreateRandom",
+                    "base": "CreateRandom",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateRandom"
+                        "tooltip": "When signaled, this will invoke Create Random"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateRandom is invoked"
+                        "tooltip": "Signaled after Create Random is invoked"
                     },
                     "details": {
-                        "name": "Uuid::CreateRandom",
-                        "category": "Utilities"
+                        "name": "Create Random"
                     },
                     "results": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "UUID",
-                                "tooltip": "Universally Unique Identifier"
+                                "name": "Uuid"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateNull",
+                    "base": "CreateNull",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateNull"
+                        "tooltip": "When signaled, this will invoke Create Null"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateNull is invoked"
+                        "tooltip": "Signaled after Create Null is invoked"
                     },
                     "details": {
-                        "name": "Uuid::CreateNull",
-                        "category": "Utilities"
+                        "name": "Create Null"
                     },
                     "results": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "Null UUID",
-                                "tooltip": "Null Universally Unique Identifier"
+                                "name": "Uuid"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Create",
+                    "base": "Create",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
@@ -71,8 +67,7 @@
                         "tooltip": "Signaled after Create is invoked"
                     },
                     "details": {
-                        "name": "Uuid::Create",
-                        "category": "Utilities"
+                        "name": "Create"
                     },
                     "results": [
                         {
@@ -84,25 +79,24 @@
                     ]
                 },
                 {
-                    "key": "CreateName",
+                    "base": "CreateName",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateName"
+                        "tooltip": "When signaled, this will invoke Create Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateName is invoked"
+                        "tooltip": "Signaled after Create Name is invoked"
                     },
                     "details": {
-                        "name": "Uuid::CreateName",
-                        "category": "Utilities"
+                        "name": "Create Name"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -116,7 +110,7 @@
                     ]
                 },
                 {
-                    "key": "Clone",
+                    "base": "Clone",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
@@ -127,14 +121,13 @@
                         "tooltip": "Signaled after Clone is invoked"
                     },
                     "details": {
-                        "name": "Uuid::Clone",
-                        "category": "Utilities"
+                        "name": "Clone"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "const AZ::Uuid&"
+                                "name": "Uuid"
                             }
                         }
                     ],
@@ -148,31 +141,30 @@
                     ]
                 },
                 {
-                    "key": "LessThan",
+                    "base": "LessThan",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke LessThan"
+                        "tooltip": "When signaled, this will invoke Less Than"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after LessThan is invoked"
+                        "tooltip": "Signaled after Less Than is invoked"
                     },
                     "details": {
-                        "name": "Uuid::LessThan",
-                        "category": "Utilities"
+                        "name": "Less Than"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid*"
+                                "name": "Uuid"
                             }
                         },
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "const AZ::Uuid&"
+                                "name": "Uuid"
                             }
                         }
                     ],
@@ -180,32 +172,30 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Less Than"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsNull",
+                    "base": "IsNull",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsNull"
+                        "tooltip": "When signaled, this will invoke Is Null"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsNull is invoked"
+                        "tooltip": "Signaled after Is Null is invoked"
                     },
                     "details": {
-                        "name": "Uuid::IsNull",
-                        "category": "Utilities"
+                        "name": "Is Null"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "UUID",
-                                "tooltip": "Universally Unique Identifier"
+                                "name": "Uuid"
                             }
                         }
                     ],
@@ -213,37 +203,36 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Null"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateString",
+                    "base": "CreateString",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateString"
+                        "tooltip": "When signaled, this will invoke Create String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateString is invoked"
+                        "tooltip": "Signaled after Create String is invoked"
                     },
                     "details": {
-                        "name": "Uuid::CreateString",
-                        "category": "Utilities"
+                        "name": "Create String"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "const char*"
+                                "name": "String"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Size"
                             }
                         }
                     ],
@@ -257,26 +246,24 @@
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ToString"
+                        "tooltip": "When signaled, this will invoke To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ToString is invoked"
+                        "tooltip": "Signaled after To String is invoked"
                     },
                     "details": {
-                        "name": "Uuid::ToString",
-                        "category": "Utilities"
+                        "name": "To String"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "UUID",
-                                "tooltip": "Universally Unique Identifier"
+                                "name": "Uuid"
                             }
                         }
                     ],
@@ -290,7 +277,7 @@
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "Uuid",
                     "entry": {
                         "name": "In",
@@ -301,22 +288,19 @@
                         "tooltip": "Signaled after Equal is invoked"
                     },
                     "details": {
-                        "name": "Uuid::Equal",
-                        "category": "Utilities"
+                        "name": "Equal"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "UUID A",
-                                "tooltip": "Universally Unique Identifier A"
+                                "name": "Uuid"
                             }
                         },
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "UUID B",
-                                "tooltip": "Universally Unique Identifier B"
+                                "name": "Uuid"
                             }
                         }
                     ],
@@ -324,7 +308,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Boolean"
+                                "name": "Is Equal"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names
index e7636f6353..a6efefc37e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names
@@ -1,12 +1,103 @@
 {
     "entries": [
         {
-            "key": "VertexColor",
+            "base": "VertexColor",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
-                "name": "VertexColor"
-            }
+                "name": "Vertex Color",
+                "category": "Rendering"
+            },
+            "methods": [
+                {
+                    "base": "Getred",
+                    "details": {
+                        "name": "Get Red"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Red"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getgreen",
+                    "details": {
+                        "name": "Get Green"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Green"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getblue",
+                    "details": {
+                        "name": "Get Blue"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Blue"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Getalpha",
+                    "details": {
+                        "name": "Get Alpha"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Alpha"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names
index 7a5a2c6d09..6d88ffc05b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ViewPaneOptions",
+            "base": "ViewPaneOptions",
             "context": "BehaviorClass",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names
index dd039b28e9..94be770939 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "AWSCognitoAuthorizationNotificationBus",
+            "base": "AWSCognitoAuthorizationNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "AWSCognitoAuthorizationNotificationBus",
-                "category": "EBus Handlers"
+                "name": "AWS Cognito Authorization",
+                "category": "AWS Core"
             },
             "methods": [
                 {
-                    "key": "OnRequestAWSCredentialsSuccess",
+                    "base": "OnRequestAWSCredentialsSuccess",
                     "details": {
-                        "name": "OnRequestAWSCredentialsSuccess"
+                        "name": "On Request AWS Credentials Success"
                     },
                     "params": [
                         {
                             "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
                             "details": {
-                                "name": "ClientAuthAWSCredentials"
+                                "name": "AWS Client Auth Credentials"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnRequestAWSCredentialsFail",
+                    "base": "OnRequestAWSCredentialsFail",
                     "details": {
-                        "name": "OnRequestAWSCredentialsFail"
+                        "name": "On Request AWS Credentials Fail"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Error"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names
new file mode 100644
index 0000000000..0286fffc7d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names
@@ -0,0 +1,151 @@
+{
+    "entries": [
+        {
+            "base": "AWSCognitoUserManagementNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "AWS Cognito User Management",
+                "category": "AWS Client Auth"
+            },
+            "methods": [
+                {
+                    "base": "OnEmailSignUpSuccess",
+                    "details": {
+                        "name": "On Email Sign Up Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnEmailSignUpFail",
+                    "details": {
+                        "name": "On Email Sign Up Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnPhoneSignUpSuccess",
+                    "details": {
+                        "name": "On Phone Sign Up Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnPhoneSignUpFail",
+                    "details": {
+                        "name": "On Phone Sign Up Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnConfirmSignUpSuccess",
+                    "details": {
+                        "name": "On Confirm Sign Up Success"
+                    }
+                },
+                {
+                    "base": "OnConfirmSignUpFail",
+                    "details": {
+                        "name": "On Confirm Sign Up Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnForgotPasswordSuccess",
+                    "details": {
+                        "name": "On Forgot Password Success"
+                    }
+                },
+                {
+                    "base": "OnForgotPasswordFail",
+                    "details": {
+                        "name": "On Forgot Password Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnConfirmForgotPasswordSuccess",
+                    "details": {
+                        "name": "On Confirm Forgot Password Success"
+                    }
+                },
+                {
+                    "base": "OnConfirmForgotPasswordFail",
+                    "details": {
+                        "name": "On Confirm Forgot Password Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnEnableMFASuccess",
+                    "details": {
+                        "name": "On Enable MFA Success"
+                    }
+                },
+                {
+                    "base": "OnEnableMFAFail",
+                    "details": {
+                        "name": "On Enable MFA Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names
new file mode 100644
index 0000000000..77e324d882
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names
@@ -0,0 +1,43 @@
+{
+    "entries": [
+        {
+            "base": "AWSDynamoDBBehaviorNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "AWS Dynamo DB",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "OnGetItemSuccess",
+                    "details": {
+                        "name": "On Get Item Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnGetItemError",
+                    "details": {
+                        "name": "On Get Item Error"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names
new file mode 100644
index 0000000000..b02432eb5f
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names
@@ -0,0 +1,43 @@
+{
+    "entries": [
+        {
+            "base": "AWSLambdaBehaviorNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "AWS Lambda",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "OnInvokeSuccess",
+                    "details": {
+                        "name": "On Invoke Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnInvokeError",
+                    "details": {
+                        "name": "On Invoke Error"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names
index 1aa4c85f74..22a39aece5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "AWSMetricsNotificationBus",
+            "base": "AWSMetricsNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "AWSMetricsNotificationBus",
-                "category": "EBus Handlers"
+                "name": "AWS Metrics",
+                "category": "AWS Core"
             },
             "methods": [
                 {
-                    "key": "OnSendMetricsSuccess",
+                    "base": "OnSendMetricsSuccess",
                     "details": {
-                        "name": "OnSendMetricsSuccess"
+                        "name": "On Send Metrics Success"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Request Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnSendMetricsFailure",
+                    "base": "OnSendMetricsFailure",
                     "details": {
-                        "name": "OnSendMetricsFailure"
+                        "name": "On Send Metrics Failure"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Request Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Error"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names
new file mode 100644
index 0000000000..38b0d6467d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names
@@ -0,0 +1,71 @@
+{
+    "entries": [
+        {
+            "base": "AWSS3BehaviorNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "AWS S3",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "OnHeadObjectSuccess",
+                    "details": {
+                        "name": "On Head Object Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnHeadObjectError",
+                    "details": {
+                        "name": "On Head Object Error"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnGetObjectSuccess",
+                    "details": {
+                        "name": "On Get Object Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnGetObjectError",
+                    "details": {
+                        "name": "On Get Object Error"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names
index c4f08cd6f8..4ea752408b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names
@@ -1,37 +1,38 @@
 {
     "entries": [
         {
-            "key": "ActorComponentNotificationBus",
+            "base": "ActorComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "ActorComponentNotificationBus"
+                "name": "Actor",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "OnActorInstanceCreated",
+                    "base": "OnActorInstanceCreated",
                     "details": {
-                        "name": "OnActorInstanceCreated"
+                        "name": "On Actor Instance Created"
                     },
                     "params": [
                         {
                             "typeid": "{280A0170-EB6A-4E90-B2F1-E18D8EAEFB36}",
                             "details": {
-                                "name": ""
+                                "name": "Actor Instance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnActorInstanceDestroyed",
+                    "base": "OnActorInstanceDestroyed",
                     "details": {
-                        "name": "OnActorInstanceDestroyed"
+                        "name": "On Actor Instance Destroyed"
                     },
                     "params": [
                         {
                             "typeid": "{280A0170-EB6A-4E90-B2F1-E18D8EAEFB36}",
                             "details": {
-                                "name": ""
+                                "name": "Actor Instance"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names
index a43f1d827c..103b584015 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ActorNotificationBus",
+            "base": "ActorNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnMotionEvent",
+                    "base": "OnMotionEvent",
                     "details": {
                         "name": "On Motion Event"
                     },
@@ -18,13 +18,13 @@
                         {
                             "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
                             "details": {
-                                "name": "MotionEvent"
+                                "name": "Motion Event"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnMotionLoop",
+                    "base": "OnMotionLoop",
                     "details": {
                         "name": "On Motion Loop"
                     },
@@ -38,7 +38,7 @@
                     ]
                 },
                 {
-                    "key": "OnStateEntering",
+                    "base": "OnStateEntering",
                     "details": {
                         "name": "On State Entering"
                     },
@@ -52,7 +52,7 @@
                     ]
                 },
                 {
-                    "key": "OnStateEntered",
+                    "base": "OnStateEntered",
                     "details": {
                         "name": "On State Entered"
                     },
@@ -66,7 +66,7 @@
                     ]
                 },
                 {
-                    "key": "OnStateExiting",
+                    "base": "OnStateExiting",
                     "details": {
                         "name": "On State Exiting"
                     },
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "OnStateExited",
+                    "base": "OnStateExited",
                     "details": {
                         "name": "On State Exited"
                     },
@@ -94,7 +94,7 @@
                     ]
                 },
                 {
-                    "key": "OnStateTransitionStart",
+                    "base": "OnStateTransitionStart",
                     "details": {
                         "name": "On State Transition Start"
                     },
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "key": "OnStateTransitionEnd",
+                    "base": "OnStateTransitionEnd",
                     "details": {
                         "name": "On State Transition End"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names
index 4b0b1a6399..f34fe7445a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names
@@ -1,229 +1,230 @@
 {
     "entries": [
         {
-            "key": "AnimGraphComponentNotificationBus",
+            "base": "AnimGraphComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "AnimGraphComponentNotificationBus"
+                "name": "Anim Graph",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "OnAnimGraphInstanceCreated",
+                    "base": "OnAnimGraphInstanceCreated",
                     "details": {
-                        "name": "OnAnimGraphInstanceCreated"
+                        "name": "On Anim Graph Instance Created"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphInstanceDestroyed",
+                    "base": "OnAnimGraphInstanceDestroyed",
                     "details": {
-                        "name": "OnAnimGraphInstanceDestroyed"
+                        "name": "On Anim Graph Instance Destroyed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphFloatParameterChanged",
+                    "base": "OnAnimGraphFloatParameterChanged",
                     "details": {
-                        "name": "OnAnimGraphFloatParameterChanged"
+                        "name": "On Anim Graph Float Parameter Changed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Previous Value"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Current Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphBoolParameterChanged",
+                    "base": "OnAnimGraphBoolParameterChanged",
                     "details": {
-                        "name": "OnAnimGraphBoolParameterChanged"
+                        "name": "On Anim Graph Bool Parameter Changed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Previous Value"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Current Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphStringParameterChanged",
+                    "base": "OnAnimGraphStringParameterChanged",
                     "details": {
-                        "name": "OnAnimGraphStringParameterChanged"
+                        "name": "On Anim Graph String Parameter Changed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Previous Value"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Current Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphVector2ParameterChanged",
+                    "base": "OnAnimGraphVector2ParameterChanged",
                     "details": {
-                        "name": "OnAnimGraphVector2ParameterChanged"
+                        "name": "On Anim Graph Vector2 Parameter Changed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Previous Value"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Current Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphVector3ParameterChanged",
+                    "base": "OnAnimGraphVector3ParameterChanged",
                     "details": {
-                        "name": "OnAnimGraphVector3ParameterChanged"
+                        "name": "On Anim Graph Vector3 Parameter Changed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Previous Value"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Current Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnAnimGraphRotationParameterChanged",
+                    "base": "OnAnimGraphRotationParameterChanged",
                     "details": {
-                        "name": "OnAnimGraphRotationParameterChanged"
+                        "name": "On Anim Graph Rotation Parameter Changed"
                     },
                     "params": [
                         {
                             "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}",
                             "details": {
-                                "name": ""
+                                "name": "Anim Graph Instance"
                             }
                         },
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Quaternion"
+                                "name": "Previous Value"
                             }
                         },
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Quaternion"
+                                "name": "Current Value"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names
index 4ce39f83cb..76c3024999 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "AttachmentComponentNotificationBus",
+            "base": "AttachmentComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,33 +10,31 @@
             },
             "methods": [
                 {
-                    "key": "OnAttached",
+                    "base": "OnAttached",
                     "details": {
-                        "name": "On Attached",
-                        "tooltip": "Notifies when the entity is attached"
+                        "name": "On Attached"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "Target",
-                                "tooltip": "ID of the target being attached to"
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnDetached",
+                    "base": "OnDetached",
                     "details": {
-                        "name": "On Detached",
-                        "tooltip": "Notifies when the entity is detached"
+                        "name": "On Detached"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "Target",
-                                "tooltip": "ID of the target being detached from"
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names
index adf505b728..7909af5ebd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names	
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names	
@@ -1,23 +1,24 @@
 {
     "entries": [
         {
-            "key": "Audio System Component Notifications",
+            "base": "Audio System Component Notifications",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "Audio System Component Notifications"
+                "name": "Audio System",
+                "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "OnGamePaused",
+                    "base": "OnGamePaused",
                     "details": {
-                        "name": "OnGamePaused"
+                        "name": "On Game Paused"
                     }
                 },
                 {
-                    "key": "OnGameUnpaused",
+                    "base": "OnGameUnpaused",
                     "details": {
-                        "name": "OnGameUnpaused"
+                        "name": "On Game Unpaused"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names
index d134f20f74..45baf45199 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "AudioTriggerComponentNotificationBus",
+            "base": "AudioTriggerComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnTriggerFinished",
+                    "base": "OnTriggerFinished",
                     "details": {
                         "name": "On Trigger Finished",
                         "tooltip": "Executes when an audio trigger has finished playing (the sound has ended)."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names
new file mode 100644
index 0000000000..c567504c83
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names
@@ -0,0 +1,187 @@
+{
+    "entries": [
+        {
+            "base": "AuthenticationProviderNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "AWS Authentication Provider",
+                "category": "AWS Client Auth"
+            },
+            "methods": [
+                {
+                    "base": "OnPasswordGrantSingleFactorSignInSuccess",
+                    "details": {
+                        "name": "On Password Grant Single Factor Sign In Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Tokens"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnPasswordGrantSingleFactorSignInFail",
+                    "details": {
+                        "name": "On Password Grant Single Factor Sign In Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnPasswordGrantMultiFactorSignInSuccess",
+                    "details": {
+                        "name": "On Password Grant Multi Factor Sign In Success"
+                    }
+                },
+                {
+                    "base": "OnPasswordGrantMultiFactorSignInFail",
+                    "details": {
+                        "name": "On Password Grant Multi Factor Sign In Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnPasswordGrantMultiFactorConfirmSignInSuccess",
+                    "details": {
+                        "name": "On Password Grant Multi Factor Confirm Sign In Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "AuthenticationTokens"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnPasswordGrantMultiFactorConfirmSignInFail",
+                    "details": {
+                        "name": "On Password Grant Multi Factor Confirm Sign In Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnDeviceCodeGrantSignInSuccess",
+                    "details": {
+                        "name": "On Device Code Grant Sign In Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "User Code"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Verification URL"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Code Expiration (Seconds)"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnDeviceCodeGrantSignInFail",
+                    "details": {
+                        "name": "On Device Code Grant Sign In Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnDeviceCodeGrantConfirmSignInSuccess",
+                    "details": {
+                        "name": "On Device Code Grant Confirm Sign In Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Tokens"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnDeviceCodeGrantConfirmSignInFail",
+                    "details": {
+                        "name": "On Device Code Grant Confirm Sign In Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnRefreshTokensSuccess",
+                    "details": {
+                        "name": "On Refresh Tokens Success"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+                            "details": {
+                                "name": "Authentication Tokens"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnRefreshTokensFail",
+                    "details": {
+                        "name": "On Refresh Tokens Fail"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Error"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names
new file mode 100644
index 0000000000..b083994547
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names
@@ -0,0 +1,45 @@
+{
+    "entries": [
+        {
+            "base": "BlastFamilyComponentNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "Blast Family",
+                "category": "Blast"
+            },
+            "methods": [
+                {
+                    "base": "OnActorCreated",
+                    "details": {
+                        "name": "On Actor Created"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+                            "details": {
+                                "name": "Blast Actor Data",
+                                "tooltip": "Represents Blast Actor in a Script Canvas friendly format."
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OnActorDestroyed",
+                    "details": {
+                        "name": "On Actor Destroyed"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+                            "details": {
+                                "name": "Blast Actor Data",
+                                "tooltip": "Represents Blast Actor in a Script Canvas friendly format."
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names
index 033836c2cb..d1c0a4942e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names
@@ -1,53 +1,54 @@
 {
     "entries": [
         {
-            "key": "CameraNotificationBus",
+            "base": "CameraNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "CameraNotificationBus"
+                "name": "Camera",
+                "category": "Camera"
             },
             "methods": [
                 {
-                    "key": "OnCameraAdded",
+                    "base": "OnCameraAdded",
                     "details": {
-                        "name": "OnCameraAdded"
+                        "name": "On Camera Added"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnCameraRemoved",
+                    "base": "OnCameraRemoved",
                     "details": {
-                        "name": "OnCameraRemoved"
+                        "name": "On Camera Removed"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnActiveViewChanged",
+                    "base": "OnActiveViewChanged",
                     "details": {
-                        "name": "OnActiveViewChanged"
+                        "name": "On Active View Changed"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names
index bf835079c8..76327e1006 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CollisionNotificationBus",
+            "base": "CollisionNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCollisionBegin",
+                    "base": "OnCollisionBegin",
                     "details": {
                         "name": "On Collision Begin"
                     },
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "OnCollisionPersist",
+                    "base": "OnCollisionPersist",
                     "details": {
                         "name": "On Collision Persist",
                         "tooltip": "Raised while this collider is in contact with another collider"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "OnCollisionEnd",
+                    "base": "OnCollisionEnd",
                     "details": {
                         "name": "On Collision End",
                         "tooltip": "Raised when a collider loses contact with another collider"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names
index e96eef8e46..0f990a40b1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names
@@ -1,23 +1,24 @@
 {
     "entries": [
         {
-            "key": "ConsoleNotificationBus",
+            "base": "ConsoleNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "ConsoleNotificationBus"
+                "name": "Console",
+                "category": "Utilities"
             },
             "methods": [
                 {
-                    "key": "OnConsoleCommandExecuted",
+                    "base": "OnConsoleCommandExecuted",
                     "details": {
-                        "name": "OnConsoleCommandExecuted"
+                        "name": "On Console Command Executed"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Command"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names
index 2dfae7ace9..391f467a6b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorComponentModeNotificationBus",
+            "base": "EditorComponentModeNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "ActiveComponentModeChanged",
+                    "base": "ActiveComponentModeChanged",
                     "details": {
                         "name": "ActiveComponentModeChanged"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names
index 699b59c46c..52472570a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorEntityContextNotificationBus",
+            "base": "EditorEntityContextNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "OnEditorEntityCreated",
+                    "base": "OnEditorEntityCreated",
                     "details": {
                         "name": "OnEditorEntityCreated"
                     },
@@ -24,7 +24,7 @@
                     ]
                 },
                 {
-                    "key": "OnEditorEntityDeleted",
+                    "base": "OnEditorEntityDeleted",
                     "details": {
                         "name": "OnEditorEntityDeleted"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names
index 7aa15f1009..6327d02fb3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EditorEventBus",
+            "base": "EditorEventBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "NotifyRegisterViews",
+                    "base": "NotifyRegisterViews",
                     "details": {
                         "name": "NotifyRegisterViews"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names
index b72951159e..3e3cec1916 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "EntityBus",
+            "base": "EntityBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnEntityActivated",
+                    "base": "OnEntityActivated",
                     "details": {
                         "name": "On Entity Activated",
                         "tooltip": "Signals that an entity was activated"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnEntityDeactivated",
+                    "base": "OnEntityDeactivated",
                     "details": {
                         "name": "On Entity Deactivated",
                         "tooltip": "Signals that an entity is being deactivated"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names
new file mode 100644
index 0000000000..e4c43e1d30
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names
@@ -0,0 +1,49 @@
+{
+    "entries": [
+        {
+            "base": "ForceRegionNotificationBus",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "Force Region",
+                "category": "Physics"
+            },
+            "methods": [
+                {
+                    "base": "OnCalculateNetForce",
+                    "details": {
+                        "name": "On Calculate Net Force"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names
index a3067cb11a..ab5be84903 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureNotificationBus",
+            "base": "FrameCaptureNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCaptureFinished",
+                    "base": "OnCaptureFinished",
                     "details": {
                         "name": "OnCaptureFinished"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names
index 7a62831c76..4b0b9d1ef5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GlobalScriptEvents",
+            "base": "GlobalScriptEvents",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,13 +9,13 @@
             },
             "methods": [
                 {
-                    "key": "Void",
+                    "base": "Void",
                     "details": {
                         "name": "Void"
                     }
                 },
                 {
-                    "key": "Not",
+                    "base": "Not",
                     "details": {
                         "name": "Not"
                     },
@@ -37,7 +37,7 @@
                     ]
                 },
                 {
-                    "key": "Increment",
+                    "base": "Increment",
                     "details": {
                         "name": "Increment"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names
index 5aea1ad6b7..b3893a3486 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names
@@ -1,23 +1,24 @@
 {
     "entries": [
         {
-            "key": "InputSystemNotificationBus",
+            "base": "InputSystemNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "InputSystemNotificationBus"
+                "name": "Input System",
+                "category": "Input"
             },
             "methods": [
                 {
-                    "key": "OnPreInputUpdate",
+                    "base": "OnPreInputUpdate",
                     "details": {
-                        "name": "OnPreInputUpdate"
+                        "name": "On Pre Input Update"
                     }
                 },
                 {
-                    "key": "OnPostInputUpdate",
+                    "base": "OnPostInputUpdate",
                     "details": {
-                        "name": "OnPostInputUpdate"
+                        "name": "On Post Input Update"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names
index bb23219646..ed27ffe5e1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "LocalScriptEvents",
+            "base": "LocalScriptEvents",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,13 +9,13 @@
             },
             "methods": [
                 {
-                    "key": "Void",
+                    "base": "Void",
                     "details": {
                         "name": "Void"
                     }
                 },
                 {
-                    "key": "Not",
+                    "base": "Not",
                     "details": {
                         "name": "Not"
                     },
@@ -37,7 +37,7 @@
                     ]
                 },
                 {
-                    "key": "Increment",
+                    "base": "Increment",
                     "details": {
                         "name": "Increment"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names
index 6d1ff93ed4..e27ea1f05b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names
@@ -1,24 +1,24 @@
 {
     "entries": [
         {
-            "key": "LookAtNotification",
+            "base": "LookAtNotification",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "LookAtNotification",
-                "tooltip": "Notifications for the Look At Component"
+                "name": "Look At",
+                "category": "Gameplay"
             },
             "methods": [
                 {
-                    "key": "OnTargetChanged",
+                    "base": "OnTargetChanged",
                     "details": {
-                        "name": "OnTargetChanged"
+                        "name": "On Target Changed"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names
index a62652ba47..08e5be460a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names
@@ -1,17 +1,18 @@
 {
     "entries": [
         {
-            "key": "MeshComponentNotificationBus",
+            "base": "MeshComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "MeshComponentNotificationBus"
+                "name": "Mesh",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "OnModelReady",
+                    "base": "OnModelReady",
                     "details": {
-                        "name": "OnModelReady"
+                        "name": "On Model Ready"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names
index 7a939652fb..15e4a9a85f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names
@@ -1,83 +1,83 @@
 {
     "entries": [
         {
-            "key": "NavigationComponentNotificationBus",
+            "base": "NavigationComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "NavigationComponentNotificationBus",
-                "category": "EBus Handlers"
+                "name": "Movement",
+                "category": "Navigation"
             },
             "methods": [
                 {
-                    "key": "OnSearchingForPath",
+                    "base": "OnSearchingForPath",
                     "details": {
-                        "name": "OnSearchingForPath"
+                        "name": "On Searching For Path"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "RequestId",
+                                "name": "Request Id",
                                 "tooltip": "Navigation request Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnTraversalStarted",
+                    "base": "OnTraversalStarted",
                     "details": {
-                        "name": "OnTraversalStarted"
+                        "name": "On Traversal Started"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "RequestId",
+                                "name": "Request Id",
                                 "tooltip": "Navigation request Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnTraversalPathUpdate",
+                    "base": "OnTraversalPathUpdate",
                     "details": {
-                        "name": "OnTraversalPathUpdate"
+                        "name": "On Traversal Path Update"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "RequestId",
+                                "name": "Request Id",
                                 "tooltip": "Navigation request Id"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "NextPathPosition",
+                                "name": "Next Path Position",
                                 "tooltip": "Next path position"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "InflectionPosition",
+                                "name": "Inflection Position",
                                 "tooltip": "Next inflection position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnTraversalInProgress",
+                    "base": "OnTraversalInProgress",
                     "details": {
-                        "name": "OnTraversalInProgress"
+                        "name": "On Traversal In Progress"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "RequestId",
+                                "name": "Request Id",
                                 "tooltip": "Navigation request Id"
                             }
                         },
@@ -91,30 +91,30 @@
                     ]
                 },
                 {
-                    "key": "OnTraversalComplete",
+                    "base": "OnTraversalComplete",
                     "details": {
-                        "name": "OnTraversalComplete"
+                        "name": "On Traversal Complete"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "RequestId",
+                                "name": "Request Id",
                                 "tooltip": "Navigation request Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnTraversalCancelled",
+                    "base": "OnTraversalCancelled",
                     "details": {
-                        "name": "OnTraversalCancelled"
+                        "name": "On Traversal Cancelled"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "RequestId",
+                                "name": "Request Id",
                                 "tooltip": "Navigation request Id"
                             }
                         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names
new file mode 100644
index 0000000000..ddb3349d59
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names
@@ -0,0 +1,57 @@
+{
+    "entries": [
+        {
+            "base": "NetworkTestPlayerComponentBusHandler",
+            "context": "EBusHandler",
+            "variant": "",
+            "details": {
+                "name": "Network Test Player",
+                "category": "Automated Testing"
+            },
+            "methods": [
+                {
+                    "base": "CreateInput",
+                    "details": {
+                        "name": "Create Input"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Delta Time"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ProcessInput",
+                    "details": {
+                        "name": "Process Input"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+                            "details": {
+                                "name": "Network Test Player Component Network Input"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Delta Time"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names
index d1e76ba23a..d02dcfb1a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ProfilingCaptureNotificationBus",
+            "base": "ProfilingCaptureNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCaptureQueryTimestampFinished",
+                    "base": "OnCaptureQueryTimestampFinished",
                     "details": {
                         "name": "OnCaptureQueryTimestampFinished"
                     },
@@ -29,7 +29,7 @@
                     ]
                 },
                 {
-                    "key": "OnCaptureCpuFrameTimeFinished",
+                    "base": "OnCaptureCpuFrameTimeFinished",
                     "details": {
                         "name": "OnCaptureCpuFrameTimeFinished"
                     },
@@ -49,7 +49,7 @@
                     ]
                 },
                 {
-                    "key": "OnCaptureQueryPipelineStatisticsFinished",
+                    "base": "OnCaptureQueryPipelineStatisticsFinished",
                     "details": {
                         "name": "OnCaptureQueryPipelineStatisticsFinished"
                     },
@@ -69,7 +69,7 @@
                     ]
                 },
                 {
-                    "key": "OnCaptureBenchmarkMetadataFinished",
+                    "base": "OnCaptureBenchmarkMetadataFinished",
                     "details": {
                         "name": "OnCaptureBenchmarkMetadataFinished"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names
index 08af710bc3..3d501e7ad9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ScriptBuildingNotificationBus",
+            "base": "ScriptBuildingNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "OnUpdateManifest",
+                    "base": "OnUpdateManifest",
                     "details": {
                         "name": "OnUpdateManifest"
                     },
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "OnPrepareForExport",
+                    "base": "OnPrepareForExport",
                     "details": {
                         "name": "OnPrepareForExport"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names
index 2de5b0e2f1..146d5b4401 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SequenceComponentNotificationBus",
+            "base": "SequenceComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,89 +10,96 @@
             },
             "methods": [
                 {
-                    "key": "OnStart",
+                    "base": "OnStart",
                     "details": {
-                        "name": "On Start"
+                        "name": "On Start",
+                        "tooltip": "Called when Sequence starts"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Start Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnStop",
+                    "base": "OnStop",
                     "details": {
-                        "name": "On Stop"
+                        "name": "On Stop",
+                        "tooltip": "Called when Sequence stops"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Stop Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnPause",
+                    "base": "OnPause",
                     "details": {
-                        "name": "On Pause"
+                        "name": "On Pause",
+                        "tooltip": "Called when Sequence pauses"
                     }
                 },
                 {
-                    "key": "OnResume",
+                    "base": "OnResume",
                     "details": {
-                        "name": "On Resume"
+                        "name": "On Resume",
+                        "tooltip": "Called when Sequence resumes"
                     }
                 },
                 {
-                    "key": "OnAbort",
+                    "base": "OnAbort",
                     "details": {
-                        "name": "On Abort"
+                        "name": "On Abort",
+                        "tooltip": "Called when Sequence is aborted"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Abort Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnUpdate",
+                    "base": "OnUpdate",
                     "details": {
-                        "name": "On Update"
+                        "name": "On Update",
+                        "tooltip": "Called when Sequence is updated. That is, when the current play time changes, or the playback speed changes"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Update Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnTrackEventTriggered",
+                    "base": "OnTrackEventTriggered",
                     "details": {
-                        "name": "On Track Event Triggered"
+                        "name": "On Track Event Triggered",
+                        "tooltip": "Called when Sequence Event is triggered"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Event Name"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Event Value"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names
index 8041830dff..5a3a4ae797 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ShapeComponentNotificationsBus",
+            "base": "ShapeComponentNotificationsBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnShapeChanged",
+                    "base": "OnShapeChanged",
                     "details": {
                         "name": "On Shape Changed"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names
index 2fe77025c7..3c198f9de5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SimpleStateComponentNotificationBus",
+            "base": "SimpleStateComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnStateChanged",
+                    "base": "OnStateChanged",
                     "details": {
                         "name": "On State Changed",
                         "tooltip": "Notifies that the state has changed from state oldName to state newName"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names
index 39c8a095af..31f0b8a34f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SpawnerComponentNotificationBus",
+            "base": "SpawnerComponentNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,90 +10,84 @@
             },
             "methods": [
                 {
-                    "key": "OnSpawnBegin",
+                    "base": "OnSpawnBegin",
                     "details": {
-                        "name": "On Spawn Begin",
-                        "tooltip": "Notifies when the spawn starts"
+                        "name": "On Spawn Begin"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "Slice",
-                                "tooltip": "Slice instance from the spawn event"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnSpawnEnd",
+                    "base": "OnSpawnEnd",
                     "details": {
-                        "name": "On Spawn End",
-                        "tooltip": "Notifies when the spawn completes"
+                        "name": "On Spawn End"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "Slice",
-                                "tooltip": "Slice instance from the spawn event"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnEntitySpawned",
+                    "base": "OnEntitySpawned",
                     "details": {
-                        "name": "On Entity Spawned",
-                        "tooltip": "Notify that an entity has spawned, will be called once for each entity spawned in a slice"
+                        "name": "On Entity Spawned"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "Slice",
-                                "tooltip": "Slice instance from the spawn event"
+                                "name": "Slice Instantiation Ticket"
                             }
                         },
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "Entity",
-                                "tooltip": "EntityID of the spawned entity, for each spawned entity"
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnSpawnedSliceDestroyed",
+                    "base": "OnSpawnedSliceDestroyed",
                     "details": {
-                        "name": "OnSpawnedSliceDestroyed"
+                        "name": "On Spawned Slice Destroyed"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OnEntitiesSpawned",
+                    "base": "OnEntitiesSpawned",
                     "details": {
-                        "name": "OnEntitiesSpawned"
+                        "name": "On Entities Spawned"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket"
+                                "name": "Slice Instantiation Ticket"
                             }
                         },
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Entities"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names
index a2e75129cf..93469fc2e1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SubmarineEvents",
+            "base": "SubmarineEvents",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "SetSpeed",
+                    "base": "SetSpeed",
                     "details": {
                         "name": "SetSpeed"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names
index 1fc8a7cdab..9067ed5694 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TagComponentNotificationsBus",
+            "base": "TagComponentNotificationsBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnTagAdded",
+                    "base": "OnTagAdded",
                     "details": {
                         "name": "On Tag Added",
                         "tooltip": "Executes when a tag is added to the source entity"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnTagRemoved",
+                    "base": "OnTagRemoved",
                     "details": {
                         "name": "On Tag Removed",
                         "tooltip": "Executes when a tag is removed from the source entity"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names
index e5b8179b69..e1a74900be 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TagGlobalNotificationBus",
+            "base": "TagGlobalNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnEntityTagAdded",
+                    "base": "OnEntityTagAdded",
                     "details": {
                         "name": "On Entity Tag Added",
                         "tooltip": "Executes when the specified source tag is added to any entity"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnEntityTagRemoved",
+                    "base": "OnEntityTagRemoved",
                     "details": {
                         "name": "On Entity Tag Removed",
                         "tooltip": "Executes when the specified source tag is removed from any entity"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names
index 5144e771d3..690529859a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TickBus",
+            "base": "TickBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnTick",
+                    "base": "OnTick",
                     "details": {
                         "name": "On Tick",
                         "tooltip": "Signals that the application has issued a tick"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "GetTickOrder",
+                    "base": "GetTickOrder",
                     "details": {
                         "name": "Get Tick Order",
                         "tooltip": "Specifies the order in which a handler receives tick events relative to other handlers"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names
index 9572139c16..7829467814 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ToolsApplicationNotificationBus",
+            "base": "ToolsApplicationNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "EntityRegistered",
+                    "base": "EntityRegistered",
                     "details": {
                         "name": "EntityRegistered"
                     },
@@ -24,7 +24,7 @@
                     ]
                 },
                 {
-                    "key": "EntityDeregistered",
+                    "base": "EntityDeregistered",
                     "details": {
                         "name": "EntityDeregistered"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names
index 0d01423428..3f5bb30372 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TraceMessageBus",
+            "base": "TraceMessageBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "OnPreAssert",
+                    "base": "OnPreAssert",
                     "details": {
                         "name": "OnPreAssert"
                     },
@@ -49,7 +49,7 @@
                     ]
                 },
                 {
-                    "key": "OnPreError",
+                    "base": "OnPreError",
                     "details": {
                         "name": "OnPreError"
                     },
@@ -95,7 +95,7 @@
                     ]
                 },
                 {
-                    "key": "OnPreWarning",
+                    "base": "OnPreWarning",
                     "details": {
                         "name": "OnPreWarning"
                     },
@@ -141,7 +141,7 @@
                     ]
                 },
                 {
-                    "key": "OnAssert",
+                    "base": "OnAssert",
                     "details": {
                         "name": "OnAssert"
                     },
@@ -163,7 +163,7 @@
                     ]
                 },
                 {
-                    "key": "OnError",
+                    "base": "OnError",
                     "details": {
                         "name": "OnError"
                     },
@@ -191,7 +191,7 @@
                     ]
                 },
                 {
-                    "key": "OnWarning",
+                    "base": "OnWarning",
                     "details": {
                         "name": "OnWarning"
                     },
@@ -219,7 +219,7 @@
                     ]
                 },
                 {
-                    "key": "OnException",
+                    "base": "OnException",
                     "details": {
                         "name": "OnException"
                     },
@@ -241,7 +241,7 @@
                     ]
                 },
                 {
-                    "key": "OnPrintf",
+                    "base": "OnPrintf",
                     "details": {
                         "name": "OnPrintf"
                     },
@@ -269,7 +269,7 @@
                     ]
                 },
                 {
-                    "key": "OnOutput",
+                    "base": "OnOutput",
                     "details": {
                         "name": "OnOutput"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names
index 88090b8a30..aefaab4035 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TransformNotificationBus",
+            "base": "TransformNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnTransformChanged",
+                    "base": "OnTransformChanged",
                     "details": {
                         "name": "On Transform Changed",
                         "tooltip": "Signals that the local or world transform of the entity changed"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "OnParentChanged",
+                    "base": "OnParentChanged",
                     "details": {
                         "name": "On Parent Changed",
                         "tooltip": "Signals that the parent of the entity changed"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "OnChildAdded",
+                    "base": "OnChildAdded",
                     "details": {
                         "name": "On Child Added",
                         "tooltip": "Signals that a child was added to the entity"
@@ -72,7 +72,7 @@
                     ]
                 },
                 {
-                    "key": "OnChildRemoved",
+                    "base": "OnChildRemoved",
                     "details": {
                         "name": "On Child Removed",
                         "tooltip": "Signals that a child was removed from the entity"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names
index 726763e12e..a78fcf4dc4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "TriggerNotificationBus",
+            "base": "TriggerNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnTriggerEnter",
+                    "base": "OnTriggerEnter",
                     "details": {
                         "name": "On Trigger Enter",
                         "tooltip": "Triggered when another collider enters this trigger"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnTriggerExit",
+                    "base": "OnTriggerExit",
                     "details": {
                         "name": "On Trigger Exit",
                         "tooltip": "Triggered when another collider exits this trigger"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names
index cb4411af2f..06a9ed1f38 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiAnimationNotificationBus",
+            "base": "UiAnimationNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnUiAnimationEvent",
+                    "base": "OnUiAnimationEvent",
                     "details": {
                         "name": "On Animation Event",
                         "tooltip": "Executes when an animation event occurs"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "OnUiTrackEvent",
+                    "base": "OnUiTrackEvent",
                     "details": {
                         "name": "OnUiTrackEvent"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names
index 3e4f19f235..7e36a2ba20 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiButtonNotificationBus",
+            "base": "UiButtonNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnButtonClick",
+                    "base": "OnButtonClick",
                     "details": {
                         "name": "On Button Click",
                         "tooltip": "Executes when the button has been clicked"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names
index de65b7363a..15e2b87526 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiCanvasAssetRefNotificationBus",
+            "base": "UiCanvasAssetRefNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCanvasLoadedIntoEntity",
+                    "base": "OnCanvasLoadedIntoEntity",
                     "details": {
                         "name": "On Canvas Loaded Into Entity",
                         "tooltip": "Executes when the canvas asset reference loads a canvas"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names
index 597f57c4f2..86d7ff6b69 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiCanvasInputNotificationBus",
+            "base": "UiCanvasInputNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCanvasPrimaryPressed",
+                    "base": "OnCanvasPrimaryPressed",
                     "details": {
                         "name": "On Canvas Primary Pressed",
                         "tooltip": "Executes on a positional input press"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasPrimaryReleased",
+                    "base": "OnCanvasPrimaryReleased",
                     "details": {
                         "name": "On Canvas Primary Released",
                         "tooltip": "Executes on a positional input release"
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasMultiTouchPressed",
+                    "base": "OnCanvasMultiTouchPressed",
                     "details": {
                         "name": "On Canvas Multi-touch Pressed",
                         "tooltip": "Executes on a positional input press"
@@ -65,7 +65,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasMultiTouchReleased",
+                    "base": "OnCanvasMultiTouchReleased",
                     "details": {
                         "name": "On Canvas Multi-touch Released",
                         "tooltip": "Executes on a positional input release"
@@ -88,7 +88,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasHoverStart",
+                    "base": "OnCanvasHoverStart",
                     "details": {
                         "name": "On Canvas Hover Start",
                         "tooltip": "Executes when an element starts being hovered"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasHoverEnd",
+                    "base": "OnCanvasHoverEnd",
                     "details": {
                         "name": "On Canvas Hover End",
                         "tooltip": "Executes when an element ends being hovered"
@@ -120,7 +120,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasEnterPressed",
+                    "base": "OnCanvasEnterPressed",
                     "details": {
                         "name": "On Canvas Enter Pressed",
                         "tooltip": "Executes when the “enter” key is pressed"
@@ -136,7 +136,7 @@
                     ]
                 },
                 {
-                    "key": "OnCanvasEnterReleased",
+                    "base": "OnCanvasEnterReleased",
                     "details": {
                         "name": "On Canvas Enter Released",
                         "tooltip": "Executes when the enter key is released"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names
index 662890e4d3..e919f654c7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiCanvasNotificationBus",
+            "base": "UiCanvasNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnAction",
+                    "base": "OnAction",
                     "details": {
                         "name": "On Action",
                         "tooltip": "Executes when the canvas sends an action"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names
index 79b4773d25..9677c9241a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiCanvasRefNotificationBus",
+            "base": "UiCanvasRefNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCanvasRefChanged",
+                    "base": "OnCanvasRefChanged",
                     "details": {
                         "name": "On Canvas Ref Changed",
                         "tooltip": "Executes when the canvas referenced by a UiCanvasAssetRefComponent has changed. This can happen when \"Load Canvas\", \"Unload Canvas\", or \"Set Canvas Ref Entity\" is called"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names
index f7c17fcac3..d64769915e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiCheckboxNotificationBus",
+            "base": "UiCheckboxNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnCheckboxStateChange",
+                    "base": "OnCheckboxStateChange",
                     "details": {
                         "name": "On Checkbox State Change",
                         "tooltip": "Executes when the checkbox state has changed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names
index e4460fb79c..6fa083ccf6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiDraggableNotificationBus",
+            "base": "UiDraggableNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnDragStart",
+                    "base": "OnDragStart",
                     "details": {
                         "name": "On Drag Start",
                         "tooltip": "Executes when dragging is detected on the draggable component. For mouse or touch input, this occurs when movement has been detected after the press or touch"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnDrag",
+                    "base": "OnDrag",
                     "details": {
                         "name": "On Drag",
                         "tooltip": "Executes each time the drag position changes during dragging. \"On Drag\" events happen only between \"On Drag Start\" and \"On Drag End\" events"
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "OnDragEnd",
+                    "base": "OnDragEnd",
                     "details": {
                         "name": "On Drag End",
                         "tooltip": "Executes at the end of dragging when the release input event occurs. The \"On Drag End\" notification is sent before the \"On Drop\" drop target notification"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names
index efd1277d08..1cc9259db4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiDropTargetNotificationBus",
+            "base": "UiDropTargetNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnDropHoverStart",
+                    "base": "OnDropHoverStart",
                     "details": {
                         "name": "On Drop Hover Start",
                         "tooltip": "Executes when the focus starts to be on the drop target during dragging"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnDropHoverEnd",
+                    "base": "OnDropHoverEnd",
                     "details": {
                         "name": "On Drop Hover End",
                         "tooltip": "Executes when the focus stops being on the drop target during dragging"
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "OnDrop",
+                    "base": "OnDrop",
                     "details": {
                         "name": "On Drop",
                         "tooltip": "Executes when a draggable element is dropped on the drop target. Implement the game logic of what should happen on drag and drop here"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names
index 2bf6ab7674..be7c62fbb6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiDropdownNotificationBus",
+            "base": "UiDropdownNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,21 +10,21 @@
             },
             "methods": [
                 {
-                    "key": "OnDropdownExpanded",
+                    "base": "OnDropdownExpanded",
                     "details": {
                         "name": "On Dropdown Expanded",
                         "tooltip": "Executes when the dropdown is expanded"
                     }
                 },
                 {
-                    "key": "OnDropdownCollapsed",
+                    "base": "OnDropdownCollapsed",
                     "details": {
                         "name": "On Dropdown Collapsed",
                         "tooltip": "Executes when the dropdown is collapsed"
                     }
                 },
                 {
-                    "key": "OnDropdownValueChanged",
+                    "base": "OnDropdownValueChanged",
                     "details": {
                         "name": "On Dropdown Value Changed",
                         "tooltip": "Executes when an option is selected"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names
index ae0dfa4c70..f285f552a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiDropdownOptionNotificationBus",
+            "base": "UiDropdownOptionNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnDropdownOptionSelected",
+                    "base": "OnDropdownOptionSelected",
                     "details": {
                         "name": "On Dropdown Option Selected",
                         "tooltip": "Executes when the dropdown option was selected"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names
index 2f3c04119f..19407e35ea 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiDynamicScrollBoxDataBus",
+            "base": "UiDynamicScrollBoxDataBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -11,7 +11,7 @@
             },
             "methods": [
                 {
-                    "key": "GetNumElements",
+                    "base": "GetNumElements",
                     "details": {
                         "name": "Get Number Of Elements",
                         "tooltip": "Gets the number of elements in the list. Called when the list is being constructed (in the component's InGamePostActivate or when RefreshContent is being called explicitly). Used with lists that are not divided into sections"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "GetElementWidth",
+                    "base": "GetElementWidth",
                     "details": {
                         "name": "Get Element Width",
                         "tooltip": "Gets the width of an element at the specified index. Called when an element’s size is needed by a horizontal list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are not divided into sections"
@@ -51,7 +51,7 @@
                     ]
                 },
                 {
-                    "key": "GetElementHeight",
+                    "base": "GetElementHeight",
                     "details": {
                         "name": "Get Element Height",
                         "tooltip": "Gets the height of an element at the specified index. Called when an element’s size is needed by a vertical list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are not divided into sections"
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumSections",
+                    "base": "GetNumSections",
                     "details": {
                         "name": "Get Number Of Sections",
                         "tooltip": "Gets the number of sections in the list. Called when the list is being constructed (in the component's InGamePostActivate or when RefreshContent is being called explicitly). Used with lists that are divided into section"
@@ -91,7 +91,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumElementsInSection",
+                    "base": "GetNumElementsInSection",
                     "details": {
                         "name": "Get Num Elements in Section",
                         "tooltip": "Gets the number of elements in the specified section. Called when the list is being constructed (in the component's InGamePostActivate or when RefreshContent is being called explicitly). Used with lists that are divided into sections"
@@ -116,7 +116,7 @@
                     ]
                 },
                 {
-                    "key": "GetElementInSectionWidth",
+                    "base": "GetElementInSectionWidth",
                     "details": {
                         "name": "Get Element In Section Width",
                         "tooltip": "Gets the width of an element at the specified section and element index. Called when an element’s size is needed by a horizontal list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections"
@@ -148,7 +148,7 @@
                     ]
                 },
                 {
-                    "key": "GetElementInSectionHeight",
+                    "base": "GetElementInSectionHeight",
                     "details": {
                         "name": "Get Element In Section Height",
                         "tooltip": "Gets the height of an element at the specified section and element index. Called when an element’s size is needed by a vertical list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections"
@@ -180,7 +180,7 @@
                     ]
                 },
                 {
-                    "key": "GetSectionHeaderWidth",
+                    "base": "GetSectionHeaderWidth",
                     "details": {
                         "name": "Get Section Header Width",
                         "tooltip": "Gets the width of a header at the specified section. Called when a header’s size is needed by a horizontal list of variable header sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections"
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "GetSectionHeaderHeight",
+                    "base": "GetSectionHeaderHeight",
                     "details": {
                         "name": "Get Section Header Height",
                         "tooltip": "Gets the height of a header at the specified section. Called when a header's size is needed by a vertical list of variable header sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names
index 5c0f5a4c26..3978c48472 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiDynamicScrollBoxElementNotificationBus",
+            "base": "UiDynamicScrollBoxElementNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -11,7 +11,7 @@
             },
             "methods": [
                 {
-                    "key": "OnElementBecomingVisible",
+                    "base": "OnElementBecomingVisible",
                     "details": {
                         "name": "On Element Becoming Visible",
                         "tooltip": "Executes when a child of the scroll box is about to become visible. Use this event to populate the child with data for display"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "OnPrepareElementForSizeCalculation",
+                    "base": "OnPrepareElementForSizeCalculation",
                     "details": {
                         "name": "On Prepare Element For Size Calculation",
                         "tooltip": "Executes when elements have variable sizes and are set to auto calculate. Used with lists that are not divided into sections"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "OnElementInSectionBecomingVisible",
+                    "base": "OnElementInSectionBecomingVisible",
                     "details": {
                         "name": "On Element In Section Becoming Visible",
                         "tooltip": "Executes when an element in a section is about to become visible. Used to populate the element with data for display. Used with lists that are divided into sections"
@@ -87,7 +87,7 @@
                     ]
                 },
                 {
-                    "key": "OnPrepareElementInSectionForSizeCalculation",
+                    "base": "OnPrepareElementInSectionForSizeCalculation",
                     "details": {
                         "name": "On Prepare Element In Section For Size Calculation",
                         "tooltip": "Executes when elements in sections have variable sizes and are set to auto calculate. Used with lists that are divided into sections"
@@ -117,7 +117,7 @@
                     ]
                 },
                 {
-                    "key": "OnSectionHeaderBecomingVisible",
+                    "base": "OnSectionHeaderBecomingVisible",
                     "details": {
                         "name": "On Section Header Becoming Visible",
                         "tooltip": "Executes when a header is about to become visible. Used to populate the header with data for display. Used with lists that are divided into sections"
@@ -140,7 +140,7 @@
                     ]
                 },
                 {
-                    "key": "OnPrepareSectionHeaderForSizeCalculation",
+                    "base": "OnPrepareSectionHeaderForSizeCalculation",
                     "details": {
                         "name": "On Prepare Section Header For Size Calculation",
                         "tooltip": "Executes when headers have variable sizes and are set to auto calculate. Used with lists that are divided into sections"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names
index b400fcc52b..b6ad05a4e5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiFaderNotificationBus",
+            "base": "UiFaderNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,21 +10,21 @@
             },
             "methods": [
                 {
-                    "key": "OnFadeComplete",
+                    "base": "OnFadeComplete",
                     "details": {
                         "name": "On Fade Complete",
                         "tooltip": "Executes when the fade is done"
                     }
                 },
                 {
-                    "key": "OnFadeInterrupted",
+                    "base": "OnFadeInterrupted",
                     "details": {
                         "name": "On Fade Interrupted",
                         "tooltip": "Executes when the fade has been interrupted"
                     }
                 },
                 {
-                    "key": "OnFaderDestroyed",
+                    "base": "OnFaderDestroyed",
                     "details": {
                         "name": "On Fader Destroyed",
                         "tooltip": "Executes when the fader component has been destroyed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names
index 674ccb7ff5..8446eb9b12 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiFlipbookAnimationNotificationsBus",
+            "base": "UiFlipbookAnimationNotificationsBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,21 +10,21 @@
             },
             "methods": [
                 {
-                    "key": "OnAnimationStarted",
+                    "base": "OnAnimationStarted",
                     "details": {
                         "name": "On Animation Started",
                         "tooltip": "Executes when the flipbook animation has begun playing"
                     }
                 },
                 {
-                    "key": "OnAnimationStopped",
+                    "base": "OnAnimationStopped",
                     "details": {
                         "name": "On Animation Stopped",
                         "tooltip": "Executes when the flipbook animation has stopped playing"
                     }
                 },
                 {
-                    "key": "OnLoopSequenceCompleted",
+                    "base": "OnLoopSequenceCompleted",
                     "details": {
                         "name": "On Loop Sequence Completed",
                         "tooltip": "Executes when the flipbook animation has completed one loop iteration. This triggers only when the \"Loop Type\" of the flipbook animation is configured to anything other than \"None\".\n\nFor \"Linear\" loops, this triggers when \"End Frame\" is displayed.\n\nFor \"Ping Pong\" loops, this triggers when either \"Start Frame\" or \"End Frame\" is displayed (depending on the current loop direction of the loop)"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names
index 7231f093d9..074d8dd7b9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiInitializationBus",
+            "base": "UiInitializationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "InGamePostActivate",
+                    "base": "InGamePostActivate",
                     "details": {
                         "name": "In-game Post-activate",
                         "tooltip": "Executes after all loaded UI elements have been activated and their parent and canvas references fixed-up"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names
index 07aec6b83a..635630c1b0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiInteractableNotificationBus",
+            "base": "UiInteractableNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,35 +10,35 @@
             },
             "methods": [
                 {
-                    "key": "OnHoverStart",
+                    "base": "OnHoverStart",
                     "details": {
                         "name": "On Hover Start",
                         "tooltip": "Executes when the interactive element starts being hovered"
                     }
                 },
                 {
-                    "key": "OnHoverEnd",
+                    "base": "OnHoverEnd",
                     "details": {
                         "name": "On Hover End",
                         "tooltip": "Executes when the interactive element ends being hovered"
                     }
                 },
                 {
-                    "key": "OnPressed",
+                    "base": "OnPressed",
                     "details": {
                         "name": "On Pressed",
                         "tooltip": "Executes when the interactive element has been pressed"
                     }
                 },
                 {
-                    "key": "OnReleased",
+                    "base": "OnReleased",
                     "details": {
                         "name": "On Released",
                         "tooltip": "Executes when the interactive element has been released"
                     }
                 },
                 {
-                    "key": "OnReceivedHoverByNavigatingFromDescendant",
+                    "base": "OnReceivedHoverByNavigatingFromDescendant",
                     "details": {
                         "name": "On Received Hover By Navigating From Descendant",
                         "tooltip": "Executes when the interactive element receives the hover by being navigated to from a descendant"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names
index 435af88d0a..6d3b96553c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiMarkupButtonNotificationsBus",
+            "base": "UiMarkupButtonNotificationsBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnHoverStart",
+                    "base": "OnHoverStart",
                     "details": {
                         "name": "On Hover Start",
                         "tooltip": "Executes when the button has become hovered"
@@ -40,7 +40,7 @@
                     ]
                 },
                 {
-                    "key": "OnHoverEnd",
+                    "base": "OnHoverEnd",
                     "details": {
                         "name": "On Hover End",
                         "tooltip": "Executes when the button is no longer hovered"
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "key": "OnPressed",
+                    "base": "OnPressed",
                     "details": {
                         "name": "On Pressed",
                         "tooltip": "Executes when the button receives a press event"
@@ -100,7 +100,7 @@
                     ]
                 },
                 {
-                    "key": "OnReleased",
+                    "base": "OnReleased",
                     "details": {
                         "name": "On Released",
                         "tooltip": "Executes when the button receives a release event"
@@ -130,7 +130,7 @@
                     ]
                 },
                 {
-                    "key": "OnClick",
+                    "base": "OnClick",
                     "details": {
                         "name": "On Click",
                         "tooltip": "Executes when the button is clicked (a release on the button following a press on the button)"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names
index bf3f1b1bc1..7104cc3079 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names
@@ -1,26 +1,25 @@
 {
     "entries": [
         {
-            "key": "UiRadioButtonGroupNotificationBus",
+            "base": "UiRadioButtonGroupNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "UI Radio Button Group",
+                "name": "Ui Radio Button Group",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "OnRadioButtonGroupStateChange",
+                    "base": "OnRadioButtonGroupStateChange",
                     "details": {
-                        "name": "On Radio Button Group State Change",
-                        "tooltip": "Executes when the radio button group state has changed"
+                        "name": "On Radio Button Group State Change"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "Radio Button EntityID",
-                                "tooltip": "The radio button that is checked"
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names
index 4c15af7a33..df18c13d58 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names
@@ -1,26 +1,24 @@
 {
     "entries": [
         {
-            "key": "UiRadioButtonNotificationBus",
+            "base": "UiRadioButtonNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "UI Radio Button",
+                "name": "Ui Radio Button",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "OnRadioButtonStateChange",
+                    "base": "OnRadioButtonStateChange",
                     "details": {
-                        "name": "On RadioButton State Change",
-                        "tooltip": "Executes when the radio button state has changed"
+                        "name": "On Radio Button State Change"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Checked",
-                                "tooltip": "Indicates whether the radio button is checked"
+                                "name": "Checked"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names
index acad307dbb..9e8a042255 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiScrollBoxNotificationBus",
+            "base": "UiScrollBoxNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnScrollOffsetChanging",
+                    "base": "OnScrollOffsetChanging",
                     "details": {
                         "name": "On Scroll Offset Changing",
                         "tooltip": "Executes when the scroll offset is changing"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnScrollOffsetChanged",
+                    "base": "OnScrollOffsetChanged",
                     "details": {
                         "name": "On Scroll Offset Changed",
                         "tooltip": "Executes when the scroll offset has changed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names
index 5de1e45ad6..7c4092175c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiScrollableNotificationBus",
+            "base": "UiScrollableNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnScrollableValueChanging",
+                    "base": "OnScrollableValueChanging",
                     "details": {
                         "name": "On Scrollable Value Changing",
                         "tooltip": "Executes when the scroll value is changing"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnScrollableValueChanged",
+                    "base": "OnScrollableValueChanged",
                     "details": {
                         "name": "On Scrollable Value Changed",
                         "tooltip": "Executes when the scroll value has changed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names
index a12b67ac57..fc5e701451 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiScrollerNotificationBus",
+            "base": "UiScrollerNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnScrollerValueChanging",
+                    "base": "OnScrollerValueChanging",
                     "details": {
                         "name": "On Scroller Value Changing",
                         "tooltip": "Executes when the scroller value is changing"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnScrollerValueChanged",
+                    "base": "OnScrollerValueChanged",
                     "details": {
                         "name": "On Scroller Value Changed",
                         "tooltip": "Executes when the scroller value has changed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names
index 76c9fde12a..770ca8d183 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiSliderNotificationBus",
+            "base": "UiSliderNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnSliderValueChanging",
+                    "base": "OnSliderValueChanging",
                     "details": {
                         "name": "On Slider Value Changing",
                         "tooltip": "Executes when the slider value is changing"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnSliderValueChanged",
+                    "base": "OnSliderValueChanged",
                     "details": {
                         "name": "On Slider Value Changed",
                         "tooltip": "Executes when the slider value has finished changing"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names
index 9c3bb637ec..e78828f936 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiSpawnerNotificationBus",
+            "base": "UiSpawnerNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnSpawnBegin",
+                    "base": "OnSpawnBegin",
                     "details": {
                         "name": "On Spawn Begin",
                         "tooltip": "Executes when the slice has been spawned, but entities have not yet been activated. \"On Entity Spawned\" events are about to be dispatched"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnEntitySpawned",
+                    "base": "OnEntitySpawned",
                     "details": {
                         "name": "On Entity Spawned",
                         "tooltip": "Executes when an entity has been created during a spawn. Called once for each entity created while spawning a slice"
@@ -49,7 +49,7 @@
                     ]
                 },
                 {
-                    "key": "OnEntitiesSpawned",
+                    "base": "OnEntitiesSpawned",
                     "details": {
                         "name": "On Entities Spawned",
                         "tooltip": "Executes when all entities have been created during a spawn.\n\nCalled only once for each spawn request. Called after the \"On Entity Spawned\" calls and before the \"On Spawn End\" call"
@@ -72,7 +72,7 @@
                     ]
                 },
                 {
-                    "key": "OnTopLevelEntitiesSpawned",
+                    "base": "OnTopLevelEntitiesSpawned",
                     "details": {
                         "name": "On Top Level Entities Spawned",
                         "tooltip": "Executes when all top-level entities have been created during the spawn.\n\nTop-level entities are entities that do not have any parent within the slice. Typically, there is only one top-level entity for each slice.\n\nCalled only once for each spawn request. Called after the \"On Entity Spawned\" calls and before the \"On Spawn End\" call"
@@ -95,7 +95,7 @@
                     ]
                 },
                 {
-                    "key": "OnSpawnEnd",
+                    "base": "OnSpawnEnd",
                     "details": {
                         "name": "On Spawn End",
                         "tooltip": "Executes when a slice has been spawned. Called once for each spawn request. All \"On Entity Spawned\" events have been dispatched"
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "OnSpawnFailed",
+                    "base": "OnSpawnFailed",
                     "details": {
                         "name": "On Spawn Failed",
                         "tooltip": "Executes when a spawn request has failed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names
index 4bc897df5d..b5ad552ef1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "UiTextInputNotificationBus",
+            "base": "UiTextInputNotificationBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "OnTextInputChange",
+                    "base": "OnTextInputChange",
                     "details": {
                         "name": "On Text Input Change",
                         "tooltip": "Executes when a character is added, removed, or changed"
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "key": "OnTextInputEndEdit",
+                    "base": "OnTextInputEndEdit",
                     "details": {
                         "name": "On Text Input End Edit",
                         "tooltip": "Executes when edit of text is completed"
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "OnTextInputEnter",
+                    "base": "OnTextInputEnter",
                     "details": {
                         "name": "On Text Input Enter",
                         "tooltip": "Executes when \"Enter\" is pressed on the keyboard"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names
index c470e02dfb..3ef35b24b7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names
@@ -1,18 +1,19 @@
 {
     "entries": [
         {
-            "key": "VariableNotification",
+            "base": "VariableNotification",
             "context": "EBusHandler",
             "variant": "",
             "details": {
-                "name": "VariableNotification",
+                "name": "Variable Notification",
+                "category": "Variables",
                 "tooltip": "Notifications from the Variables in the current Script Canvas graph"
             },
             "methods": [
                 {
-                    "key": "OnVariableValueChanged",
+                    "base": "OnVariableValueChanged",
                     "details": {
-                        "name": "OnVariableValueChanged"
+                        "name": "On Variable Value Changed"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names
index b77d3caf75..45bbf4cbc9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ViewPaneCallbackBus",
+            "base": "ViewPaneCallbackBus",
             "context": "EBusHandler",
             "variant": "",
             "details": {
@@ -9,7 +9,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateViewPaneWidget",
+                    "base": "CreateViewPaneWidget",
                     "details": {
                         "name": "CreateViewPaneWidget"
                     },
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names
new file mode 100644
index 0000000000..3b01bcc40b
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names
@@ -0,0 +1,109 @@
+{
+    "entries": [
+        {
+            "base": "AWSCognitoAuthorizationRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "AWS Cognito Authorization",
+                "category": "AWS Client Auth"
+            },
+            "methods": [
+                {
+                    "base": "Reset",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Reset"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Reset is invoked"
+                    },
+                    "details": {
+                        "name": "Reset"
+                    }
+                },
+                {
+                    "base": "GetIdentityId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke GetIdentityId"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after GetIdentityId is invoked"
+                    },
+                    "details": {
+                        "name": "Get Identity Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Identity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HasPersistedLogins",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke HasPersistedLogins"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after HasPersistedLogins is invoked"
+                    },
+                    "details": {
+                        "name": "Has Persisted Logins"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Has Persisted Logins"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Initialize",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Initialize"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Initialize is invoked"
+                    },
+                    "details": {
+                        "name": "Initialize"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Initialized"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "RequestAWSCredentialsAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke RequestAWSCredentialsAsync"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after RequestAWSCredentialsAsync is invoked"
+                    },
+                    "details": {
+                        "name": "Request AWS Credentials Async"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names
new file mode 100644
index 0000000000..1c1cab22fd
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names
@@ -0,0 +1,224 @@
+{
+    "entries": [
+        {
+            "base": "AWSCognitoUserManagementRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "AWS Cognito User Management",
+                "category": "AWS Client Auth"
+            },
+            "methods": [
+                {
+                    "base": "EnableMFAAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Enable MFA Async"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Enable MFA Async is invoked"
+                    },
+                    "details": {
+                        "name": "Enable MFA Async"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Access token",
+                                "tooltip": "The MFA access token"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ConfirmSignUpAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Confirm Sign Up Async"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Confirm Sign Up Async is invoked"
+                    },
+                    "details": {
+                        "name": "Confirm Sign Up Async"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Username",
+                                "tooltip": "The client's username"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Confirmation code",
+                                "tooltip": "The client's confirmation code"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PhoneSignUpAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Phone Sign Up Async"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Phone Sign Up Async is invoked"
+                    },
+                    "details": {
+                        "name": "Phone Sign Up Async"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Username",
+                                "tooltip": "The client's username"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Password",
+                                "tooltip": "The client's password"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Phone number",
+                                "tooltip": "The phone number used to sign up"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "EmailSignUpAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Email Sign Up Async"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Email Sign Up Async is invoked"
+                    },
+                    "details": {
+                        "name": "Email Sign Up Async"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Username",
+                                "tooltip": "The client's username"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Password",
+                                "tooltip": "The client's password"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Email",
+                                "tooltip": "The email address used to sign up"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ConfirmForgotPasswordAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Confirm Forgot Password Async"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Confirm Forgot Password Async is invoked"
+                    },
+                    "details": {
+                        "name": "Confirm Forgot Password Async"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Username",
+                                "tooltip": "The client's username"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Confirmation code",
+                                "tooltip": "The client's confirmation code"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "New password",
+                                "tooltip": "The new password for the client"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Initialize",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Initialize"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Initialize is invoked"
+                    },
+                    "details": {
+                        "name": "Initialize"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Initialized"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ForgotPasswordAsync",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Forgot Password Async"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Forgot Password Async is invoked"
+                    },
+                    "details": {
+                        "name": "Forgot Password Async"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Username",
+                                "tooltip": "The client's username"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names
new file mode 100644
index 0000000000..3e32cecee8
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names
@@ -0,0 +1,81 @@
+{
+    "entries": [
+        {
+            "base": "AWSGameLiftRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Requests",
+                "category": "AWS Game Lift"
+            },
+            "methods": [
+                {
+                    "base": "ConfigureGameLiftClient",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Configure Game Lift Client"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Configure Game Lift Client is invoked"
+                    },
+                    "details": {
+                        "name": "Configure Game Lift Client"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Result"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "CreatePlayerId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Create Player Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Create Player Id is invoked"
+                    },
+                    "details": {
+                        "name": "Create Player Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Include Brackets"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Include Dashes"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Player Id"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names
new file mode 100644
index 0000000000..99df5e2d5e
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names
@@ -0,0 +1,81 @@
+{
+    "entries": [
+        {
+            "base": "AWSMetricsRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Metrics",
+                "category": "AWS Metrics"
+            },
+            "methods": [
+                {
+                    "base": "SubmitMetrics",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke SubmitMetrics"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after SubmitMetrics is invoked"
+                    },
+                    "details": {
+                        "name": "Submit Metrics"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{1C1ABE6D-94D2-5CFD-A502-8813300FEC8D}",
+                            "details": {
+                                "name": "Metrics Attributes list",
+                                "tooltip": "The list of metrics attributes to submit."
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Event priority",
+                                "tooltip": "Priority of the event. Defaults to 0, which is highest priority."
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Event source override",
+                                "tooltip": "Event source used to override the default, 'AWSMetricGem'."
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Buffer metrics",
+                                "tooltip": "Whether to buffer metrics and send them in a batch."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Success"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "FlushMetrics",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke FlushMetrics"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after FlushMetrics is invoked"
+                    },
+                    "details": {
+                        "name": "Flush Metrics"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names
new file mode 100644
index 0000000000..4bda3ef0ff
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names
@@ -0,0 +1,206 @@
+{
+    "entries": [
+        {
+            "base": "AWSResourceMappingRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "AWS Resource Mapping",
+                "category": "AWS Core"
+            },
+            "methods": [
+                {
+                    "base": "GetResourceNameId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Resource Name Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Resource Name Id is invoked"
+                    },
+                    "details": {
+                        "name": "Get Resource Name Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Resource Key Name",
+                                "tooltip": "Resource mapping key name is used to identify individual resource attributes."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Name / Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetResourceRegion",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Resource Region"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Resource Region is invoked"
+                    },
+                    "details": {
+                        "name": "Get Resource Region"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Resource Key Name",
+                                "tooltip": "Resource mapping key name is used to identify individual resource attributes."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDefaultRegion",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Default Region"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Default Region is invoked"
+                    },
+                    "details": {
+                        "name": "Get Default Region"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Region"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDefaultAccountId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Default Account Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Default Account Id is invoked"
+                    },
+                    "details": {
+                        "name": "Get Default Account Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Default Account Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetResourceAccountId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Resource Account Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Resource Account Id is invoked"
+                    },
+                    "details": {
+                        "name": "Get Resource Account Id"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Resource Key Name",
+                                "tooltip": "Resource mapping key name is used to identify individual resource attributes."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Resource Account Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetResourceType",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Resource Type"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Resource Type is invoked"
+                    },
+                    "details": {
+                        "name": "Get Resource Type"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Resource Key Name",
+                                "tooltip": "Resource mapping key name is used to identify individual resource attributes."
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Resource Type"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ReloadConfigFile",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Reload Config File"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Reload Config File is invoked"
+                    },
+                    "details": {
+                        "name": "Reload Config File"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Reloading Config FileName",
+                                "tooltip": "Whether reload resource mapping config file name from AWS core configuration settings registry file."
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names
index bf113ea4be..d40cfe2045 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "ActorComponentRequestBus",
+            "base": "ActorComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ActorComponentRequestBus",
+                "name": "Actor",
                 "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetRenderCharacter",
+                    "base": "GetRenderCharacter",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRenderCharacter"
+                        "tooltip": "When signaled, this will invoke Get Render Character"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRenderCharacter is invoked"
+                        "tooltip": "Signaled after Get Render Character is invoked"
                     },
                     "details": {
-                        "name": "GetRenderCharacter"
+                        "name": "Get Render Character"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DetachFromEntity",
+                    "base": "DetachFromEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Detach From Entity"
@@ -46,29 +46,29 @@
                     }
                 },
                 {
-                    "key": "GetRenderActorVisible",
+                    "base": "GetRenderActorVisible",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRenderActorVisible"
+                        "tooltip": "When signaled, this will invoke Get Render Actor Visible"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRenderActorVisible is invoked"
+                        "tooltip": "Signaled after Get Render Actor Visible is invoked"
                     },
                     "details": {
-                        "name": "GetRenderActorVisible"
+                        "name": "Get Render Actor Visible"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Visible"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AttachToEntity",
+                    "base": "AttachToEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Attach To Entity"
@@ -78,7 +78,8 @@
                         "tooltip": "Signaled after Attach To Entity is invoked"
                     },
                     "details": {
-                        "name": "Attach To Entity"
+                        "name": "Attach To Entity",
+                        "category": "Actor Animation"
                     },
                     "params": [
                         {
@@ -91,57 +92,59 @@
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Attachment Type",
+                                "tooltip": "0: Actor, 1: Skin"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetRenderCharacter",
+                    "base": "SetRenderCharacter",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRenderCharacter"
+                        "tooltip": "When signaled, this will invoke Set Render Character"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRenderCharacter is invoked"
+                        "tooltip": "Signaled after Set Render Character is invoked"
                     },
                     "details": {
-                        "name": "SetRenderCharacter"
+                        "name": "Set Render Character"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetJointTransform",
+                    "base": "GetJointTransform",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetJointTransform"
+                        "tooltip": "When signaled, this will invoke Get Joint Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetJointTransform is invoked"
+                        "tooltip": "Signaled after Get Joint Transform is invoked"
                     },
                     "details": {
-                        "name": "GetJointTransform"
+                        "name": "Get Joint Transform"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Joint Index"
                             }
                         },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Space",
+                                "tooltip": "0: Local, 1: Model, 2: World"
                             }
                         }
                     ],
@@ -155,45 +158,23 @@
                     ]
                 },
                 {
-                    "key": "DebugDrawRoot",
+                    "base": "GetJointIndexByName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Debug Draw Root"
+                        "tooltip": "When signaled, this will invoke Get Joint Index By Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Debug Draw Root is invoked"
+                        "tooltip": "Signaled after Get Joint Index By Name is invoked"
                     },
                     "details": {
-                        "name": "Debug Draw Root"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
-                            "details": {
-                                "name": "bool"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetJointIndexByName",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetJointIndexByName"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetJointIndexByName is invoked"
-                    },
-                    "details": {
-                        "name": "GetJointIndexByName"
+                        "name": "Get Joint Index By Name"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -201,7 +182,7 @@
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Joint Index"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names
index 41b1962768..25180e8ae7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names
@@ -1,79 +1,83 @@
 {
     "entries": [
         {
-            "key": "AnimAudioComponentRequestBus",
+            "base": "AnimAudioComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AnimAudioComponentRequestBus"
+                "name": "Audio",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "AddTriggerEvent",
+                    "base": "AddTriggerEvent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke AddTriggerEvent"
+                        "tooltip": "When signaled, this will invoke Add Trigger Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after AddTriggerEvent is invoked"
+                        "tooltip": "Signaled after Add Trigger Event is invoked"
                     },
                     "details": {
-                        "name": "AddTriggerEvent"
+                        "name": "Add Trigger Event",
+                        "tooltip": "Adds audio support to when an animation event is fired"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Event Name"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Trigger Name"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Joint Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearTriggerEvents",
+                    "base": "ClearTriggerEvents",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearTriggerEvents"
+                        "tooltip": "When signaled, this will invoke Clear Trigger Events"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearTriggerEvents is invoked"
+                        "tooltip": "Signaled after Clear Trigger Events is invoked"
                     },
                     "details": {
-                        "name": "ClearTriggerEvents"
+                        "name": "Clear Trigger Events",
+                        "tooltip": "Clears all audio support for animation events"
                     }
                 },
                 {
-                    "key": "RemoveTriggerEvent",
+                    "base": "RemoveTriggerEvent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RemoveTriggerEvent"
+                        "tooltip": "When signaled, this will invoke Remove Trigger Event"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RemoveTriggerEvent is invoked"
+                        "tooltip": "Signaled after Remove Trigger Event is invoked"
                     },
                     "details": {
-                        "name": "RemoveTriggerEvent"
+                        "name": "Remove Trigger Event",
+                        "tooltip": "Removes audio support from an anim event"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Event Name"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names
index 59c14412b9..865335410e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names
@@ -1,59 +1,60 @@
 {
     "entries": [
         {
-            "key": "AnimGraphComponentNetworkRequestBus",
+            "base": "AnimGraphComponentNetworkRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AnimGraphComponentNetworkRequestBus"
+                "name": "Anim Graph",
+                "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetActiveStates",
+                    "base": "GetActiveStates",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetActiveStates"
+                        "tooltip": "When signaled, this will invoke Get Active States"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetActiveStates is invoked"
+                        "tooltip": "Signaled after Get Active States is invoked"
                     },
                     "details": {
-                        "name": "GetActiveStates"
+                        "name": "Get Active States"
                     },
                     "results": [
                         {
                             "typeid": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Active States"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateSnapshot",
+                    "base": "CreateSnapshot",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateSnapshot"
+                        "tooltip": "When signaled, this will invoke Create Snapshot"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateSnapshot is invoked"
+                        "tooltip": "Signaled after Create Snapshot is invoked"
                     },
                     "details": {
-                        "name": "CreateSnapshot"
+                        "name": "Create Snapshot"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Authoritative"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetActiveStates",
+                    "base": "SetActiveStates",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetActiveStates"
@@ -63,57 +64,57 @@
                         "tooltip": "Signaled after SetActiveStates is invoked"
                     },
                     "details": {
-                        "name": "SetActiveStates"
+                        "name": "Set Active States"
                     },
                     "params": [
                         {
                             "typeid": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Active States"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsAssetReady",
+                    "base": "IsAssetReady",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsAssetReady"
+                        "tooltip": "When signaled, this will invoke Is Asset Ready"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsAssetReady is invoked"
+                        "tooltip": "Signaled after Is Asset Ready is invoked"
                     },
                     "details": {
-                        "name": "IsAssetReady"
+                        "name": "Is Asset Ready"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Asset Ready"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "HasSnapshot",
+                    "base": "HasSnapshot",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke HasSnapshot"
+                        "tooltip": "When signaled, this will invoke Has Snapshot"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after HasSnapshot is invoked"
+                        "tooltip": "Signaled after Has Snapshot is invoked"
                     },
                     "details": {
-                        "name": "HasSnapshot"
+                        "name": "Has Snapshot"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Has Snapshot"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names
index d6b9adb914..976c253f89 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names
@@ -1,54 +1,54 @@
 {
     "entries": [
         {
-            "key": "AnimGraphComponentRequestBus",
+            "base": "AnimGraphComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AnimGraphComponentRequestBus",
+                "name": "Anim Graph",
                 "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetVisualizeEnabled",
+                    "base": "GetVisualizeEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetVisualizeEnabled"
+                        "tooltip": "When signaled, this will invoke Get Visualize Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetVisualizeEnabled is invoked"
+                        "tooltip": "Signaled after Get Visualize Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetVisualizeEnabled"
+                        "name": "Get Visualize Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNamedParameterRotation",
+                    "base": "SetNamedParameterRotation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterRotation"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterRotation is invoked"
+                        "tooltip": "Signaled after Set Named Parameter Rotation is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterRotation"
+                        "name": "Set Named Parameter Rotation"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         },
                         {
@@ -60,51 +60,51 @@
                     ]
                 },
                 {
-                    "key": "SetParameterString",
+                    "base": "SetParameterString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterString"
+                        "tooltip": "When signaled, this will invoke Set Parameter String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterString is invoked"
+                        "tooltip": "Signaled after Set Parameter String is invoked"
                     },
                     "details": {
-                        "name": "SetParameterString"
+                        "name": "Set Parameter String"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNamedParameterString",
+                    "base": "GetNamedParameterString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterString"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterString is invoked"
+                        "tooltip": "Signaled after Get Named Parameter String is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterString"
+                        "name": "Get Named Parameter String"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Parameter Name"
                             }
                         }
                     ],
@@ -112,29 +112,29 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNamedParameterVector2",
+                    "base": "GetNamedParameterVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterVector2"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter Vector2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterVector2 is invoked"
+                        "tooltip": "Signaled after Get Named Parameter Vector2 is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterVector2"
+                        "name": "Get Named Parameter Vector2"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Parameter Name"
                             }
                         }
                     ],
@@ -142,29 +142,29 @@
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterFloat",
+                    "base": "GetParameterFloat",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterFloat"
+                        "tooltip": "When signaled, this will invoke Get Parameter Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterFloat is invoked"
+                        "tooltip": "Signaled after Get Parameter Float is invoked"
                     },
                     "details": {
-                        "name": "GetParameterFloat"
+                        "name": "Get Parameter Float"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -172,29 +172,29 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParameterRotation",
+                    "base": "SetParameterRotation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterRotation"
+                        "tooltip": "When signaled, this will invoke Set Parameter Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterRotation is invoked"
+                        "tooltip": "Signaled after Set Parameter Rotation is invoked"
                     },
                     "details": {
-                        "name": "SetParameterRotation"
+                        "name": "Set Parameter Rotation"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Parameter Name"
                             }
                         },
                         {
@@ -206,23 +206,23 @@
                     ]
                 },
                 {
-                    "key": "GetNamedParameterFloat",
+                    "base": "GetNamedParameterFloat",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterFloat"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterFloat is invoked"
+                        "tooltip": "Signaled after Get Named Parameter Float is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterFloat"
+                        "name": "Get Named Parameter Float"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Parameter Name"
                             }
                         }
                     ],
@@ -230,57 +230,57 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParameterBool",
+                    "base": "SetParameterBool",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterBool"
+                        "tooltip": "When signaled, this will invoke Set Parameter Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterBool is invoked"
+                        "tooltip": "Signaled after Set Parameter Bool is invoked"
                     },
                     "details": {
-                        "name": "SetParameterBool"
+                        "name": "Set Parameter Bool"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "FindParameterName",
+                    "base": "FindParameterName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindParameterName"
+                        "tooltip": "When signaled, this will invoke Find Parameter Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindParameterName is invoked"
+                        "tooltip": "Signaled after Find Parameter Name is invoked"
                     },
                     "details": {
-                        "name": "FindParameterName"
+                        "name": "Find Parameter Name"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -288,29 +288,29 @@
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNamedParameterBool",
+                    "base": "GetNamedParameterBool",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterBool"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterBool is invoked"
+                        "tooltip": "Signaled after Get Named Parameter Bool is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterBool"
+                        "name": "Get Named Parameter Bool"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -318,57 +318,57 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParameterFloat",
+                    "base": "SetParameterFloat",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterFloat"
+                        "tooltip": "When signaled, this will invoke Set Parameter Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterFloat is invoked"
+                        "tooltip": "Signaled after Set Parameter Float is invoked"
                     },
                     "details": {
-                        "name": "SetParameterFloat"
+                        "name": "Set Parameter Float"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterVector2",
+                    "base": "GetParameterVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterVector2"
+                        "tooltip": "When signaled, this will invoke Get Parameter Vector2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterVector2 is invoked"
+                        "tooltip": "Signaled after Get Parameter Vector2 is invoked"
                     },
                     "details": {
-                        "name": "GetParameterVector2"
+                        "name": "Get Parameter Vector2"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -376,29 +376,29 @@
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterBool",
+                    "base": "GetParameterBool",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterBool"
+                        "tooltip": "When signaled, this will invoke Get Parameter Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterBool is invoked"
+                        "tooltip": "Signaled after Get Parameter Bool is invoked"
                     },
                     "details": {
-                        "name": "GetParameterBool"
+                        "name": "Get Parameter Bool"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -406,57 +406,57 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNamedParameterVector3",
+                    "base": "SetNamedParameterVector3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterVector3"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter Vector3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterVector3 is invoked"
+                        "tooltip": "Signaled after Set Named Parameter Vector3 is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterVector3"
+                        "name": "Set Named Parameter Vector3"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "FindParameterIndex",
+                    "base": "FindParameterIndex",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindParameterIndex"
+                        "tooltip": "When signaled, this will invoke Find Parameter Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindParameterIndex is invoked"
+                        "tooltip": "Signaled after Find Parameter Index is invoked"
                     },
                     "details": {
-                        "name": "FindParameterIndex"
+                        "name": "Find Parameter Index"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -464,85 +464,85 @@
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNamedParameterString",
+                    "base": "SetNamedParameterString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterString"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterString is invoked"
+                        "tooltip": "Signaled after Set Named Parameter String is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterString"
+                        "name": "Set Named Parameter String"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParameterVector3",
+                    "base": "SetParameterVector3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterVector3"
+                        "tooltip": "When signaled, this will invoke Set Parameter Vector3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterVector3 is invoked"
+                        "tooltip": "Signaled after Set Parameter Vector3 is invoked"
                     },
                     "details": {
-                        "name": "SetParameterVector3"
+                        "name": "Set Parameter Vector3"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterVector3",
+                    "base": "GetParameterVector3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterVector3"
+                        "tooltip": "When signaled, this will invoke Get Parameter Vector3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterVector3 is invoked"
+                        "tooltip": "Signaled after Get Parameter Vector3 is invoked"
                     },
                     "details": {
-                        "name": "GetParameterVector3"
+                        "name": "Get Parameter Vector3"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -550,80 +550,80 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SyncAnimGraph",
+                    "base": "SyncAnimGraph",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SyncAnimGraph"
+                        "tooltip": "When signaled, this will invoke Sync Anim Graph"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SyncAnimGraph is invoked"
+                        "tooltip": "Signaled after Sync Anim Graph is invoked"
                     },
                     "details": {
-                        "name": "SyncAnimGraph"
+                        "name": "Sync Anim Graph"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParameterRotationEuler",
+                    "base": "SetParameterRotationEuler",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterRotationEuler"
+                        "tooltip": "When signaled, this will invoke Set Parameter Rotation Euler"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterRotationEuler is invoked"
+                        "tooltip": "Signaled after Set Parameter Rotation Euler is invoked"
                     },
                     "details": {
-                        "name": "SetParameterRotationEuler"
+                        "name": "Set Parameter Rotation Euler"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterRotationEuler",
+                    "base": "GetParameterRotationEuler",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterRotationEuler"
+                        "tooltip": "When signaled, this will invoke Get Parameter Rotation Euler"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterRotationEuler is invoked"
+                        "tooltip": "Signaled after Get Parameter Rotation Euler is invoked"
                     },
                     "details": {
-                        "name": "GetParameterRotationEuler"
+                        "name": "Get Parameter Rotation Euler"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -631,29 +631,29 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterRotation",
+                    "base": "GetParameterRotation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterRotation"
+                        "tooltip": "When signaled, this will invoke Get Parameter Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterRotation is invoked"
+                        "tooltip": "Signaled after Get Parameter Rotation is invoked"
                     },
                     "details": {
-                        "name": "GetParameterRotation"
+                        "name": "Get Parameter Rotation"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Parameter Name"
                             }
                         }
                     ],
@@ -667,23 +667,23 @@
                     ]
                 },
                 {
-                    "key": "GetNamedParameterRotationEuler",
+                    "base": "GetNamedParameterRotationEuler",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterRotationEuler"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter Rotation Euler"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterRotationEuler is invoked"
+                        "tooltip": "Signaled after Get Named Parameter Rotation Euler is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterRotationEuler"
+                        "name": "Get Named Parameter Rotation Euler"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -691,108 +691,108 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DesyncAnimGraph",
+                    "base": "DesyncAnimGraph",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DesyncAnimGraph"
+                        "tooltip": "When signaled, this will invoke Desync Anim Graph"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DesyncAnimGraph is invoked"
+                        "tooltip": "Signaled after Desync Anim Graph is invoked"
                     },
                     "details": {
-                        "name": "DesyncAnimGraph"
+                        "name": "Desync Anim Graph"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNamedParameterRotationEuler",
+                    "base": "SetNamedParameterRotationEuler",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterRotationEuler"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter Rotation Euler"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterRotationEuler is invoked"
+                        "tooltip": "Signaled after Set Named Parameter Rotation Euler is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterRotationEuler"
+                        "name": "Set Named Parameter Rotation Euler"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Parameter Name"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParameterVector2",
+                    "base": "SetParameterVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetParameterVector2"
+                        "tooltip": "When signaled, this will invoke Set Parameter Vector2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetParameterVector2 is invoked"
+                        "tooltip": "Signaled after Set Parameter Vector2 is invoked"
                     },
                     "details": {
-                        "name": "SetParameterVector2"
+                        "name": "Set Parameter Vector2"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNamedParameterRotation",
+                    "base": "GetNamedParameterRotation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterRotation"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterRotation is invoked"
+                        "tooltip": "Signaled after Get Named Parameter Rotation is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterRotation"
+                        "name": "Get Named Parameter Rotation"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -806,129 +806,129 @@
                     ]
                 },
                 {
-                    "key": "SetNamedParameterBool",
+                    "base": "SetNamedParameterBool",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterBool"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterBool is invoked"
+                        "tooltip": "Signaled after Set Named Parameter Bool is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterBool"
+                        "name": "Set Named Parameter Bool"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetVisualizeEnabled",
+                    "base": "SetVisualizeEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetVisualizeEnabled"
+                        "tooltip": "When signaled, this will invoke Set Visualize Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetVisualizeEnabled is invoked"
+                        "tooltip": "Signaled after Set Visualize Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetVisualizeEnabled"
+                        "name": "Set Visualize Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNamedParameterFloat",
+                    "base": "SetNamedParameterFloat",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterFloat"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterFloat is invoked"
+                        "tooltip": "Signaled after Set Named Parameter Float is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterFloat"
+                        "name": "Set Named Parameter Float"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNamedParameterVector2",
+                    "base": "SetNamedParameterVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNamedParameterVector2"
+                        "tooltip": "When signaled, this will invoke Set Named Parameter Vector2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNamedParameterVector2 is invoked"
+                        "tooltip": "Signaled after Set Named Parameter Vector2 is invoked"
                     },
                     "details": {
-                        "name": "SetNamedParameterVector2"
+                        "name": "Set Named Parameter Vector2"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNamedParameterVector3",
+                    "base": "GetNamedParameterVector3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNamedParameterVector3"
+                        "tooltip": "When signaled, this will invoke Get Named Parameter Vector3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNamedParameterVector3 is invoked"
+                        "tooltip": "Signaled after Get Named Parameter Vector3 is invoked"
                     },
                     "details": {
-                        "name": "GetNamedParameterVector3"
+                        "name": "Get Named Parameter Vector3"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
@@ -936,29 +936,29 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetParameterString",
+                    "base": "GetParameterString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetParameterString"
+                        "tooltip": "When signaled, this will invoke Get Parameter String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetParameterString is invoked"
+                        "tooltip": "Signaled after Get Parameter String is invoked"
                     },
                     "details": {
-                        "name": "GetParameterString"
+                        "name": "Get Parameter String"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Parameter Index"
                             }
                         }
                     ],
@@ -966,7 +966,7 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Value"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names
index 9c9ef0b882..293c391360 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "ArcBallControllerRequestBus",
+            "base": "ArcBallControllerRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "GetPan",
+                    "base": "GetPan",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPan"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "GetCenter",
+                    "base": "GetCenter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetCenter"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "SetZoomingSensitivity",
+                    "base": "SetZoomingSensitivity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetZoomingSensitivity"
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "GetPitch",
+                    "base": "GetPitch",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPitch"
@@ -102,7 +102,7 @@
                     ]
                 },
                 {
-                    "key": "SetPanningSensitivity",
+                    "base": "SetPanningSensitivity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetPanningSensitivity"
@@ -125,7 +125,7 @@
                     ]
                 },
                 {
-                    "key": "GetZoomingSensitivity",
+                    "base": "GetZoomingSensitivity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetZoomingSensitivity"
@@ -148,7 +148,7 @@
                     ]
                 },
                 {
-                    "key": "SetHeading",
+                    "base": "SetHeading",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetHeading"
@@ -171,7 +171,7 @@
                     ]
                 },
                 {
-                    "key": "GetMaxDistance",
+                    "base": "GetMaxDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetMaxDistance"
@@ -194,7 +194,7 @@
                     ]
                 },
                 {
-                    "key": "SetDistance",
+                    "base": "SetDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetDistance"
@@ -217,7 +217,7 @@
                     ]
                 },
                 {
-                    "key": "SetMinDistance",
+                    "base": "SetMinDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetMinDistance"
@@ -240,7 +240,7 @@
                     ]
                 },
                 {
-                    "key": "SetMaxDistance",
+                    "base": "SetMaxDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetMaxDistance"
@@ -263,7 +263,7 @@
                     ]
                 },
                 {
-                    "key": "GetMinDistance",
+                    "base": "GetMinDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetMinDistance"
@@ -286,7 +286,7 @@
                     ]
                 },
                 {
-                    "key": "GetHeading",
+                    "base": "GetHeading",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetHeading"
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "key": "GetPanningSensitivity",
+                    "base": "GetPanningSensitivity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPanningSensitivity"
@@ -332,7 +332,7 @@
                     ]
                 },
                 {
-                    "key": "SetCenter",
+                    "base": "SetCenter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetCenter"
@@ -355,7 +355,7 @@
                     ]
                 },
                 {
-                    "key": "SetPan",
+                    "base": "SetPan",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetPan"
@@ -378,7 +378,7 @@
                     ]
                 },
                 {
-                    "key": "SetPitch",
+                    "base": "SetPitch",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetPitch"
@@ -401,7 +401,7 @@
                     ]
                 },
                 {
-                    "key": "GetDistance",
+                    "base": "GetDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetDistance"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names
index fe409184f5..d57b9b6ffe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names
@@ -1,135 +1,142 @@
 {
     "entries": [
         {
-            "key": "AreaLightRequestBus",
+            "base": "AreaLightRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AreaLightRequestBus"
+                "name": "Area Light",
+                "category": "Lights"
             },
             "methods": [
                 {
-                    "key": "SetFilteringSampleCount",
+                    "base": "SetFilteringSampleCount",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFilteringSampleCount"
+                        "tooltip": "When signaled, this will invoke Set Filtering Sample Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFilteringSampleCount is invoked"
+                        "tooltip": "Signaled after Set Filtering Sample Count is invoked"
                     },
                     "details": {
-                        "name": "SetFilteringSampleCount"
+                        "name": "Set Filtering Sample Count",
+                        "tooltip": "Sets the sample count for filtering of the shadow boundary. Maximum 64"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Sample Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetIntensity",
+                    "base": "SetIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetIntensity"
+                        "tooltip": "When signaled, this will invoke Set Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetIntensity is invoked"
+                        "tooltip": "Signaled after Set Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetIntensity"
+                        "name": "Set Intensity",
+                        "tooltip": "Sets an area light's intensity and intensity mode. This value is indepedent from its color"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Intensity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEsmExponent",
+                    "base": "SetEsmExponent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEsmExponent"
+                        "tooltip": "When signaled, this will invoke Set Esm Exponent"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEsmExponent is invoked"
+                        "tooltip": "Signaled after Set Esm Exponent is invoked"
                     },
                     "details": {
-                        "name": "SetEsmExponent"
+                        "name": "Set Esm Exponent",
+                        "tooltip": "Sets the Esm exponent. Higher values produce a steeper falloff between light and shadow"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Exponent"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOuterShutterAngle",
+                    "base": "GetOuterShutterAngle",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOuterShutterAngle"
+                        "tooltip": "When signaled, this will invoke Get Outer Shutter Angle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOuterShutterAngle is invoked"
+                        "tooltip": "Signaled after Get Outer Shutter Angle is invoked"
                     },
                     "details": {
-                        "name": "GetOuterShutterAngle"
+                        "name": "Get Outer Shutter Angle",
+                        "tooltip": "Returns the outer angle of the shutters in degrees"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angle (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetInnerShutterAngle",
+                    "base": "GetInnerShutterAngle",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetInnerShutterAngle"
+                        "tooltip": "When signaled, this will invoke Get Inner Shutter Angle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetInnerShutterAngle is invoked"
+                        "tooltip": "Signaled after Get Inner Shutter Angle is invoked"
                     },
                     "details": {
-                        "name": "GetInnerShutterAngle"
+                        "name": "Get Inner Shutter Angle",
+                        "tooltip": "Returns the outer angle of the shutters in degrees"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angles (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetColor",
+                    "base": "SetColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColor"
+                        "tooltip": "When signaled, this will invoke Set Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColor is invoked"
+                        "tooltip": "Signaled after Set Color is invoked"
                     },
                     "details": {
-                        "name": "SetColor"
+                        "name": "Set Color",
+                        "tooltip": "Sets an area light's color. This value is indepedent from its intensity"
                     },
                     "params": [
                         {
@@ -141,479 +148,501 @@
                     ]
                 },
                 {
-                    "key": "SetShadowBias",
+                    "base": "SetShadowBias",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowBias"
+                        "tooltip": "When signaled, this will invoke Set Shadow Bias"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowBias is invoked"
+                        "tooltip": "Signaled after Set Shadow Bias is invoked"
                     },
                     "details": {
-                        "name": "SetShadowBias"
+                        "name": "Set Shadow Bias"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Bias"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowFilterMethod",
+                    "base": "SetShadowFilterMethod",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowFilterMethod"
+                        "tooltip": "When signaled, this will invoke Set Shadow Filter Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowFilterMethod is invoked"
+                        "tooltip": "Signaled after Set Shadow Filter Method is invoked"
                     },
                     "details": {
-                        "name": "SetShadowFilterMethod"
+                        "name": "Set Shadow Filter Method",
+                        "tooltip": "Sets the filter method of shadows, 0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Shadow Filter Method",
+                                "tooltip": "0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEsmExponent",
+                    "base": "GetEsmExponent",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEsmExponent"
+                        "tooltip": "When signaled, this will invoke Get Esm Exponent"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEsmExponent is invoked"
+                        "tooltip": "Signaled after Get Esm Exponent is invoked"
                     },
                     "details": {
-                        "name": "GetEsmExponent"
+                        "name": "Get Esm Exponent",
+                        "tooltip": "Gets the Esm exponent. Higher values produce a steeper falloff between light and shadow"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Exponent"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetInnerShutterAngle",
+                    "base": "SetInnerShutterAngle",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetInnerShutterAngle"
+                        "tooltip": "When signaled, this will invoke Set Inner Shutter Angle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetInnerShutterAngle is invoked"
+                        "tooltip": "Signaled after Set Inner Shutter Angle is invoked"
                     },
                     "details": {
-                        "name": "SetInnerShutterAngle"
+                        "name": "Set Inner Shutter Angle",
+                        "tooltip": "Sets the inner angle of the shutters in degrees"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angle (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnableShadow",
+                    "base": "SetEnableShadow",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableShadow"
+                        "tooltip": "When signaled, this will invoke Set Enable Shadow"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableShadow is invoked"
+                        "tooltip": "Signaled after Set Enable Shadow is invoked"
                     },
                     "details": {
-                        "name": "SetEnableShadow"
+                        "name": "Set Enable Shadow",
+                        "tooltip": "Sets if shadows should be enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetUseFastApproximation",
+                    "base": "SetUseFastApproximation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetUseFastApproximation"
+                        "tooltip": "When signaled, this will invoke Set Use Fast Approximation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetUseFastApproximation is invoked"
+                        "tooltip": "Signaled after Set Use Fast Approximation is invoked"
                     },
                     "details": {
-                        "name": "SetUseFastApproximation"
+                        "name": "Set Use Fast Approximation",
+                        "tooltip": "Sets whether the light should use the default high quality linearly transformed cosine lights (false) or a faster approximation (true)"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Use Fast Approximation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUseFastApproximation",
+                    "base": "GetUseFastApproximation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetUseFastApproximation"
+                        "tooltip": "When signaled, this will invoke Get Use Fast Approximation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetUseFastApproximation is invoked"
+                        "tooltip": "Signaled after Get Use Fast Approximation is invoked"
                     },
                     "details": {
-                        "name": "GetUseFastApproximation"
+                        "name": "Get Use Fast Approximation",
+                        "tooltip" : "Gets whether the light is using the default high quality linearly transformed cosine lights (false) or a faster approximation (true)"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Uses Fast Approximation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFilteringSampleCount",
+                    "base": "GetFilteringSampleCount",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFilteringSampleCount"
+                        "tooltip": "When signaled, this will invoke Get Filtering Sample Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFilteringSampleCount is invoked"
+                        "tooltip": "Signaled after Get Filtering Sample Count is invoked"
                     },
                     "details": {
-                        "name": "GetFilteringSampleCount"
+                        "name": "Get Filtering Sample Count",
+                        "tooltip": "Gets the sample count for filtering of the shadow boundary"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Sample Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnableShadow",
+                    "base": "GetEnableShadow",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableShadow"
+                        "tooltip": "When signaled, this will invoke Get Enable Shadow"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableShadow is invoked"
+                        "tooltip": "Signaled after Get Enable Shadow is invoked"
                     },
                     "details": {
-                        "name": "GetEnableShadow"
+                        "name": "Get Enable Shadow",
+                        "tooltip": "Returns true if shadows are enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetShadowFilterMethod",
+                    "base": "GetShadowFilterMethod",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowFilterMethod"
+                        "tooltip": "When signaled, this will invoke Get Shadow Filter Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowFilterMethod is invoked"
+                        "tooltip": "Signaled after Get Shadow Filter Method is invoked"
                     },
                     "details": {
-                        "name": "GetShadowFilterMethod"
+                        "name": "Get Shadow Filter Method",
+                        "tooltip": "Gets the filter method of shadows, 0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Filter Method",
+                                "tooltip": "0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetIntensityMode",
+                    "base": "GetIntensityMode",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetIntensityMode"
+                        "tooltip": "When signaled, this will invoke Get Intensity Mode"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetIntensityMode is invoked"
+                        "tooltip": "Signaled after Get Intensity Mode is invoked"
                     },
                     "details": {
-                        "name": "GetIntensityMode"
+                        "name": "Get Intensity Mode",
+                        "tooltip": "Gets an area light's photometric type\n0: Lumen (Total amount of luminous power emitted. Since a unit sphere is 4 pi steradians, 1 candela emitting uniformly in all directions is 4 pi lumens)\n1: Candela (Base unit of luminous intensity; luminous power per unit solid angle)\n2: Lux (One lux is one lumen per square meter. The same lux emitting from larger areas emits more lumens than smaller areas)\n3: Nit (Nits are candela per square meter. It can be calculated as Lux / Pi)\n4: Ev100Luminance (Exposure value for luminance - Similar to nits, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)\n5: Ev100Illuminance (Exposure value for illuminance - Similar to lux, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)"
                     },
                     "results": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Intensity Mode",
+                                "tooltip": "0: Lumen (Total amount of luminous power emitted. Since a unit sphere is 4 pi steradians, 1 candela emitting uniformly in all directions is 4 pi lumens)\n1: Candela (Base unit of luminous intensity; luminous power per unit solid angle)\n2: Lux (One lux is one lumen per square meter. The same lux emitting from larger areas emits more lumens than smaller areas)\n3: Nit (Nits are candela per square meter. It can be calculated as Lux / Pi)\n4: Ev100Luminance (Exposure value for luminance - Similar to nits, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)\n5: Ev100Illuminance (Exposure value for illuminance - Similar to lux, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetShadowBias",
+                    "base": "GetShadowBias",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowBias"
+                        "tooltip": "When signaled, this will invoke Get Shadow Bias"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowBias is invoked"
+                        "tooltip": "Signaled after Get Shadow Bias is invoked"
                     },
                     "details": {
-                        "name": "GetShadowBias"
+                        "name": "Get Shadow Bias",
+                        "tooltip": "Returns the shadow bias"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Bias"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAttenuationRadiusMode",
+                    "base": "SetAttenuationRadiusMode",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAttenuationRadiusMode"
+                        "tooltip": "When signaled, this will invoke Set Attenuation Radius Mode"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAttenuationRadiusMode is invoked"
+                        "tooltip": "Signaled after Set Attenuation Radius Mode is invoked"
                     },
                     "details": {
-                        "name": "SetAttenuationRadiusMode"
+                        "name": "Set Attenuation Radius Mode",
+                        "tooltip": "0: Automatic, the radius will immediately be recalculated based on the intensity\n1: Explicit, the radius value will be unchanged from its previous value"
+
                     },
                     "params": [
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "unsigned char"
+                                "name": "Mode",
+                                "tooltip": "0: Automatic, the radius will immediately be recalculated based on the intensity\n1: Explicit, the radius value will be unchanged from its previous value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEmitsLightBothDirections",
+                    "base": "SetEmitsLightBothDirections",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEmitsLightBothDirections"
+                        "tooltip": "When signaled, this will invoke Set Emits Light Both Directions"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEmitsLightBothDirections is invoked"
+                        "tooltip": "Signaled after Set Emits Light Both Directions is invoked"
                     },
                     "details": {
-                        "name": "SetEmitsLightBothDirections"
+                        "name": "Set Emits Light Both Directions"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnableShutters",
+                    "base": "SetEnableShutters",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableShutters"
+                        "tooltip": "When signaled, this will invoke Set Enable Shutters"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableShutters is invoked"
+                        "tooltip": "Signaled after Set Enable Shutters is invoked"
                     },
                     "details": {
-                        "name": "SetEnableShutters"
+                        "name": "Set Enable Shutters"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetShadowmapMaxSize",
+                    "base": "GetShadowmapMaxSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowmapMaxSize"
+                        "tooltip": "When signaled, this will invoke Get Shadowmap Max Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowmapMaxSize is invoked"
+                        "tooltip": "Signaled after Get Shadowmap Max Size is invoked"
                     },
                     "details": {
-                        "name": "GetShadowmapMaxSize"
+                        "name": "Get Shadowmap Max Size",
+                        "tooltip": "Returns the maximum width and height of shadowmap"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Max Size"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEmitsLightBothDirections",
+                    "base": "GetEmitsLightBothDirections",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEmitsLightBothDirections"
+                        "tooltip": "When signaled, this will invoke Get Emits Light Both Directions"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEmitsLightBothDirections is invoked"
+                        "tooltip": "Signaled after Get Emits Light Both Directions is invoked"
                     },
                     "details": {
-                        "name": "GetEmitsLightBothDirections"
+                        "name": "Get Emits Light Both Directions"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOuterShutterAngle",
+                    "base": "SetOuterShutterAngle",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOuterShutterAngle"
+                        "tooltip": "When signaled, this will invoke Set Outer Shutter Angle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOuterShutterAngle is invoked"
+                        "tooltip": "Signaled after Set Outer Shutter Angle is invoked"
                     },
                     "details": {
-                        "name": "SetOuterShutterAngle"
+                        "name": "Set Outer Shutter Angle",
+                        "tooltip": "Sets the outer angle of the shutters in degrees"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angle (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAttenuationRadius",
+                    "base": "SetAttenuationRadius",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAttenuationRadius"
+                        "tooltip": "When signaled, this will invoke Set Attenuation Radius"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAttenuationRadius is invoked"
+                        "tooltip": "Signaled after Set Attenuation Radius is invoked"
                     },
                     "details": {
-                        "name": "SetAttenuationRadius"
+                        "name": "Set Attenuation Radius",
+                        "tooltip": "Set the distance and which an area light will no longer affect lighting. Setting this forces the Radius Calculation to Explicit mode"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Radius"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAttenuationRadius",
+                    "base": "GetAttenuationRadius",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAttenuationRadius"
+                        "tooltip": "When signaled, this will invoke Get Attenuation Radius"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAttenuationRadius is invoked"
+                        "tooltip": "Signaled after Get Attenuation Radius is invoked"
                     },
                     "details": {
-                        "name": "GetAttenuationRadius"
+                        "name": "Get Attenuation Radius",
+                        "tooltip" : "Gets the distance at which the area light will no longer affect lighting"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Radius"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnableShutters",
+                    "base": "GetEnableShutters",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableShutters"
+                        "tooltip": "When signaled, this will invoke Get Enable Shutters"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableShutters is invoked"
+                        "tooltip": "Signaled after Get Enable Shutters is invoked"
                     },
                     "details": {
-                        "name": "GetEnableShutters"
+                        "name": "Get Enable Shutters",
+                        "tooltip": "Returns true if shutters are enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColor"
+                        "tooltip": "When signaled, this will invoke Get Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColor is invoked"
+                        "tooltip": "Signaled after Get Color is invoked"
                     },
                     "details": {
-                        "name": "GetColor"
+                        "name": "Get Color"
                     },
                     "results": [
                         {
@@ -625,67 +654,70 @@
                     ]
                 },
                 {
-                    "key": "ConvertToIntensityMode",
+                    "base": "ConvertToIntensityMode",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ConvertToIntensityMode"
+                        "tooltip": "When signaled, this will invoke Convert To Intensity Mode"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ConvertToIntensityMode is invoked"
+                        "tooltip": "Signaled after Convert To Intensity Mode is invoked"
                     },
                     "details": {
-                        "name": "ConvertToIntensityMode"
+                        "name": "Convert To Intensity Mode",
+                        "tooltip": "Sets the photometric unit to the one provided and converts the intensity to the photometric unit so actual light intensity remains constant"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Mode",
+                                "tooltip": "0: Lumen (Total amount of luminous power emitted. Since a unit sphere is 4 pi steradians, 1 candela emitting uniformly in all directions is 4 pi lumens)\n1: Candela (Base unit of luminous intensity; luminous power per unit solid angle)\n2: Lux (One lux is one lumen per square meter. The same lux emitting from larger areas emits more lumens than smaller areas)\n3: Nit (Nits are candela per square meter. It can be calculated as Lux / Pi)\n4: Ev100Luminance (Exposure value for luminance - Similar to nits, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)\n5: Ev100Illuminance (Exposure value for illuminance - Similar to lux, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowmapMaxSize",
+                    "base": "SetShadowmapMaxSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowmapMaxSize"
+                        "tooltip": "When signaled, this will invoke Set Shadowmap Max Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowmapMaxSize is invoked"
+                        "tooltip": "Signaled after Set Shadowmap Max Size is invoked"
                     },
                     "details": {
-                        "name": "SetShadowmapMaxSize"
+                        "name": "Set Shadowmap Max Size"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Max Size"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetIntensity",
+                    "base": "GetIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetIntensity"
+                        "tooltip": "When signaled, this will invoke Get Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetIntensity is invoked"
+                        "tooltip": "Signaled after Get Intensity is invoked"
                     },
                     "details": {
-                        "name": "GetIntensity"
+                        "name": "Get Intensity",
+                        "tooltip": "Gets an area light's intensity. This value is indepedent from its color"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Intensity"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names
new file mode 100644
index 0000000000..57f718450a
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names
@@ -0,0 +1,74 @@
+{
+    "entries": [
+        {
+            "base": "AreaSystemRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "category": "Area System"
+            },
+            "methods": [
+                {
+                    "base": "GetInstanceCountInAabb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Instance Count In AABB"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after GetInstance Count In AABB is invoked"
+                    },
+                    "details": {
+                        "name": "Get Instance Count In AABB"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "Instance Count"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetInstancesInAabb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Instances In AABB"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Instances In AABB is invoked"
+                    },
+                    "details": {
+                        "name": "Get Instances In AABB"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{F323EFB3-042D-51E9-ABE8-0B55D587CC8E}",
+                            "details": {
+                                "name": "Instances"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names
index c6af4aa7fb..6195542299 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "AssetCollectionAsyncLoaderTestBus",
+            "base": "AssetCollectionAsyncLoaderTestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AssetCollectionAsyncLoaderTestBus"
+                "name": "Asset Collection Async Loader Test"
             },
             "methods": [
                 {
-                    "key": "GetPendingAssetsList",
+                    "base": "GetPendingAssetsList",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPendingAssetsList"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetCountOfPendingAssets",
+                    "base": "GetCountOfPendingAssets",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetCountOfPendingAssets"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "ValidateAssetWasLoaded",
+                    "base": "ValidateAssetWasLoaded",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ValidateAssetWasLoaded"
@@ -83,7 +83,7 @@
                     ]
                 },
                 {
-                    "key": "CancelLoadingAssets",
+                    "base": "CancelLoadingAssets",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CancelLoadingAssets"
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "key": "StartLoadingAssetsFromAssetList",
+                    "base": "StartLoadingAssetsFromAssetList",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke StartLoadingAssetsFromAssetList"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "StartLoadingAssetsFromJsonFile",
+                    "base": "StartLoadingAssetsFromJsonFile",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke StartLoadingAssetsFromJsonFile"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names
index 958a9e4dba..d3a7087a65 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "AssetEditorRequestBus",
+            "base": "AssetEditorRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AssetEditorRequestBus"
+                "name": "Asset Editor"
             },
             "methods": [
                 {
-                    "key": "CreateNewGraph",
+                    "base": "CreateNewGraph",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreateNewGraph"
@@ -32,7 +32,7 @@
                     ]
                 },
                 {
-                    "key": "ContainsGraph",
+                    "base": "ContainsGraph",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ContainsGraph"
@@ -63,7 +63,7 @@
                     ]
                 },
                 {
-                    "key": "CloseGraph",
+                    "base": "CloseGraph",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CloseGraph"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names
index d3439b0a67..13e66d2420 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names
@@ -1,53 +1,54 @@
 {
     "entries": [
         {
-            "key": "AtomToolsDocumentRequestBus",
+            "base": "AtomToolsDocumentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AtomToolsDocumentRequestBus"
+                "name": "Document",
+                "category": "Atom Tools"
             },
             "methods": [
                 {
-                    "key": "CanRedo",
+                    "base": "CanRedo",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CanRedo"
+                        "tooltip": "When signaled, this will invoke Can Redo"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CanRedo is invoked"
+                        "tooltip": "Signaled after Can Redo is invoked"
                     },
                     "details": {
-                        "name": "CanRedo"
+                        "name": "Can Redo"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Can Redo"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SaveAsChild",
+                    "base": "SaveAsChild",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveAsChild"
+                        "tooltip": "When signaled, this will invoke Save As Child"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveAsChild is invoked"
+                        "tooltip": "Signaled after Save As Child is invoked"
                     },
                     "details": {
-                        "name": "SaveAsChild"
+                        "name": "Save As Child"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Save Path"
                             }
                         }
                     ],
@@ -55,13 +56,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Reopen",
+                    "base": "Reopen",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Reopen"
@@ -77,13 +78,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Save",
+                    "base": "Save",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Save"
@@ -99,35 +100,35 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsOpen",
+                    "base": "IsOpen",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsOpen"
+                        "tooltip": "When signaled, this will invoke Is Open"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsOpen is invoked"
+                        "tooltip": "Signaled after Is Open is invoked"
                     },
                     "details": {
-                        "name": "IsOpen"
+                        "name": "Is Open"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Open"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Undo",
+                    "base": "Undo",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Undo"
@@ -143,13 +144,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Open",
+                    "base": "Open",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Open"
@@ -165,7 +166,7 @@
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Load Path"
                             }
                         }
                     ],
@@ -173,79 +174,79 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CanUndo",
+                    "base": "CanUndo",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CanUndo"
+                        "tooltip": "When signaled, this will invoke Can Undo"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CanUndo is invoked"
+                        "tooltip": "Signaled after Can Undo is invoked"
                     },
                     "details": {
-                        "name": "CanUndo"
+                        "name": "Can Undo"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Can Undo"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyValue",
+                    "base": "SetPropertyValue",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyValue"
+                        "tooltip": "When signaled, this will invoke Set Property Value"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyValue is invoked"
+                        "tooltip": "Signaled after Set Property Value is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyValue"
+                        "name": "Set Property Value"
                     },
                     "params": [
                         {
                             "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
                             "details": {
-                                "name": "Name"
+                                "name": "Property Full Name"
                             }
                         },
                         {
                             "typeid": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}",
                             "details": {
-                                "name": "any"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SaveAsCopy",
+                    "base": "SaveAsCopy",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveAsCopy"
+                        "tooltip": "When signaled, this will invoke Save As Copy"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveAsCopy is invoked"
+                        "tooltip": "Signaled after Save As Copy is invoked"
                     },
                     "details": {
-                        "name": "SaveAsCopy"
+                        "name": "Save As Copy"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Save Path"
                             }
                         }
                     ],
@@ -253,51 +254,51 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "BeginEdit",
+                    "base": "BeginEdit",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke BeginEdit"
+                        "tooltip": "When signaled, this will invoke Begin Edit"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after BeginEdit is invoked"
+                        "tooltip": "Signaled after Begin Edit is invoked"
                     },
                     "details": {
-                        "name": "BeginEdit"
+                        "name": "Begin Edit"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Begin"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPropertyValue",
+                    "base": "GetPropertyValue",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyValue"
+                        "tooltip": "When signaled, this will invoke Get Property Value"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyValue is invoked"
+                        "tooltip": "Signaled after Get Property Value is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyValue"
+                        "name": "Get Property Value"
                     },
                     "params": [
                         {
                             "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
                             "details": {
-                                "name": "Name"
+                                "name": "Property Full Name"
                             }
                         }
                     ],
@@ -305,13 +306,13 @@
                         {
                             "typeid": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}",
                             "details": {
-                                "name": "any"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Close",
+                    "base": "Close",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Close"
@@ -327,13 +328,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsModified",
+                    "base": "IsModified",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsModified"
@@ -343,107 +344,107 @@
                         "tooltip": "Signaled after IsModified is invoked"
                     },
                     "details": {
-                        "name": "IsModified"
+                        "name": "Is Modified"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Modified"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "EndEdit",
+                    "base": "EndEdit",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke EndEdit"
+                        "tooltip": "When signaled, this will invoke End Edit"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after EndEdit is invoked"
+                        "tooltip": "Signaled after End Edit is invoked"
                     },
                     "details": {
-                        "name": "EndEdit"
+                        "name": "End Edit"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "End Edit"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAbsolutePath",
+                    "base": "GetAbsolutePath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAbsolutePath"
+                        "tooltip": "When signaled, this will invoke Get Absolute Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAbsolutePath is invoked"
+                        "tooltip": "Signaled after Get Absolute Path is invoked"
                     },
                     "details": {
-                        "name": "GetAbsolutePath"
+                        "name": "Get Absolute Path"
                     },
                     "results": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Path"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetRelativePath",
+                    "base": "GetRelativePath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRelativePath"
+                        "tooltip": "When signaled, this will invoke Get Relative Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRelativePath is invoked"
+                        "tooltip": "Signaled after Get Relative Path is invoked"
                     },
                     "details": {
-                        "name": "GetRelativePath"
+                        "name": "Get Relative Path"
                     },
                     "results": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Path"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsSavable",
+                    "base": "IsSavable",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsSavable"
+                        "tooltip": "When signaled, this will invoke Is Savable"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsSavable is invoked"
+                        "tooltip": "Signaled after Is Savable is invoked"
                     },
                     "details": {
-                        "name": "IsSavable"
+                        "name": "Is Savable"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Savable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Redo",
+                    "base": "Redo",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Redo"
@@ -459,7 +460,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names
index d22bf3bc7c..020f951c51 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names
@@ -1,31 +1,32 @@
 {
     "entries": [
         {
-            "key": "AtomToolsDocumentSystemRequestBus",
+            "base": "AtomToolsDocumentSystemRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AtomToolsDocumentSystemRequestBus"
+                "name": "Document",
+                "category": "Atom Tools"
             },
             "methods": [
                 {
-                    "key": "SaveDocument",
+                    "base": "SaveDocument",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveDocument"
+                        "tooltip": "When signaled, this will invoke Save Document"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveDocument is invoked"
+                        "tooltip": "Signaled after Save Document is invoked"
                     },
                     "details": {
-                        "name": "SaveDocument"
+                        "name": "Save Document"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ],
@@ -33,35 +34,35 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SaveDocumentAsChild",
+                    "base": "SaveDocumentAsChild",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveDocumentAsChild"
+                        "tooltip": "When signaled, this will invoke Save Document As Child"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveDocumentAsChild is invoked"
+                        "tooltip": "Signaled after Save Document As Child is invoked"
                     },
                     "details": {
-                        "name": "SaveDocumentAsChild"
+                        "name": "Save Document As Child"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Target Path"
                             }
                         }
                     ],
@@ -69,29 +70,29 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "OpenDocument",
+                    "base": "OpenDocument",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke OpenDocument"
+                        "tooltip": "When signaled, this will invoke Open Document"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after OpenDocument is invoked"
+                        "tooltip": "Signaled after Open Document is invoked"
                     },
                     "details": {
-                        "name": "OpenDocument"
+                        "name": "Open Document"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Source Path"
                             }
                         }
                     ],
@@ -99,35 +100,35 @@
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateDocumentFromFile",
+                    "base": "CreateDocumentFromFile",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateDocumentFromFile"
+                        "tooltip": "When signaled, this will invoke Create Document From File"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateDocumentFromFile is invoked"
+                        "tooltip": "Signaled after Create Document From File is invoked"
                     },
                     "details": {
-                        "name": "CreateDocumentFromFile"
+                        "name": "Create Document From File"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Source Path"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Target Path"
                             }
                         }
                     ],
@@ -135,29 +136,29 @@
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CloseDocument",
+                    "base": "CloseDocument",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CloseDocument"
+                        "tooltip": "When signaled, this will invoke Close Document"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CloseDocument is invoked"
+                        "tooltip": "Signaled after Close Document is invoked"
                     },
                     "details": {
-                        "name": "CloseDocument"
+                        "name": "Close Document"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ],
@@ -165,51 +166,51 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CloseAllDocuments",
+                    "base": "CloseAllDocuments",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CloseAllDocuments"
+                        "tooltip": "When signaled, this will invoke Close All Documents"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CloseAllDocuments is invoked"
+                        "tooltip": "Signaled after Close All Documents is invoked"
                     },
                     "details": {
-                        "name": "CloseAllDocuments"
+                        "name": "Close All Documents"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CloseAllDocumentsExcept",
+                    "base": "CloseAllDocumentsExcept",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CloseAllDocumentsExcept"
+                        "tooltip": "When signaled, this will invoke Close All Documents Except"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CloseAllDocumentsExcept is invoked"
+                        "tooltip": "Signaled after Close All Documents Except is invoked"
                     },
                     "details": {
-                        "name": "CloseAllDocumentsExcept"
+                        "name": "Close All Documents Except"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ],
@@ -217,51 +218,51 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateDocument",
+                    "base": "CreateDocument",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateDocument"
+                        "tooltip": "When signaled, this will invoke Create Document"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateDocument is invoked"
+                        "tooltip": "Signaled after Create Document is invoked"
                     },
                     "details": {
-                        "name": "CreateDocument"
+                        "name": "Create Document"
                     },
                     "results": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DestroyDocument",
+                    "base": "DestroyDocument",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DestroyDocument"
+                        "tooltip": "When signaled, this will invoke Destroy Document"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DestroyDocument is invoked"
+                        "tooltip": "Signaled after Destroy Document is invoked"
                     },
                     "details": {
-                        "name": "DestroyDocument"
+                        "name": "Destroy Document"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         }
                     ],
@@ -269,35 +270,35 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SaveDocumentAsCopy",
+                    "base": "SaveDocumentAsCopy",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveDocumentAsCopy"
+                        "tooltip": "When signaled, this will invoke Save Document As Copy"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveDocumentAsCopy is invoked"
+                        "tooltip": "Signaled after Save Document As Copy is invoked"
                     },
                     "details": {
-                        "name": "SaveDocumentAsCopy"
+                        "name": "Save Document As Copy"
                     },
                     "params": [
                         {
                             "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
                             "details": {
-                                "name": "AZ::Uuid"
+                                "name": "Document Id"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Target Path"
                             }
                         }
                     ],
@@ -305,29 +306,29 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SaveAllDocuments",
+                    "base": "SaveAllDocuments",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveAllDocuments"
+                        "tooltip": "When signaled, this will invoke Save All Documents"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveAllDocuments is invoked"
+                        "tooltip": "Signaled after Save All Documents is invoked"
                     },
                     "details": {
-                        "name": "SaveAllDocuments"
+                        "name": "Save All Documents"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names
index 87f3925316..bbb141f329 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names
@@ -1,39 +1,40 @@
 {
     "entries": [
         {
-            "key": "AtomToolsMainWindowFactoryRequestBus",
+            "base": "AtomToolsMainWindowFactoryRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AtomToolsMainWindowFactoryRequestBus"
+                "name": "Main Window Factory",
+                "category": "Atom Tools"
             },
             "methods": [
                 {
-                    "key": "CreateMainWindow",
+                    "base": "CreateMainWindow",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateMainWindow"
+                        "tooltip": "When signaled, this will invoke Create Main Window"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateMainWindow is invoked"
+                        "tooltip": "Signaled after Create Main Window is invoked"
                     },
                     "details": {
-                        "name": "CreateMainWindow"
+                        "name": "Create Main Window"
                     }
                 },
                 {
-                    "key": "DestroyMainWindow",
+                    "base": "DestroyMainWindow",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DestroyMainWindow"
+                        "tooltip": "When signaled, this will invoke Destroy Main Window"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DestroyMainWindow is invoked"
+                        "tooltip": "Signaled after Destroy Main Window is invoked"
                     },
                     "details": {
-                        "name": "DestroyMainWindow"
+                        "name": "Destroy Main Window"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names
index cb21434ad0..741afa30af 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names
@@ -1,123 +1,124 @@
 {
     "entries": [
         {
-            "key": "AtomToolsMainWindowRequestBus",
+            "base": "AtomToolsMainWindowRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AtomToolsMainWindowRequestBus"
+                "name": "Main Window",
+                "category": "Atom Tools"
             },
             "methods": [
                 {
-                    "key": "UnlockViewportRenderTargetSize",
+                    "base": "UnlockViewportRenderTargetSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke UnlockViewportRenderTargetSize"
+                        "tooltip": "When signaled, this will invoke Unlock Viewport Render Target Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after UnlockViewportRenderTargetSize is invoked"
+                        "tooltip": "Signaled after Unlock Viewport Render Target Size is invoked"
                     },
                     "details": {
-                        "name": "UnlockViewportRenderTargetSize"
+                        "name": "Unlock Viewport Render Target Size"
                     }
                 },
                 {
-                    "key": "GetDockWidgetNames",
+                    "base": "GetDockWidgetNames",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDockWidgetNames"
+                        "tooltip": "When signaled, this will invoke Get Dock Widget Names"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDockWidgetNames is invoked"
+                        "tooltip": "Signaled after Get Dock Widget Names is invoked"
                     },
                     "details": {
-                        "name": "GetDockWidgetNames"
+                        "name": "Get Dock Widget Names"
                     },
                     "results": [
                         {
                             "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Widget Names"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ResizeViewportRenderTarget",
+                    "base": "ResizeViewportRenderTarget",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ResizeViewportRenderTarget"
+                        "tooltip": "When signaled, this will invoke Resize Viewport Render Target"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ResizeViewportRenderTarget is invoked"
+                        "tooltip": "Signaled after Resize Viewport Render Target is invoked"
                     },
                     "details": {
-                        "name": "ResizeViewportRenderTarget"
+                        "name": "Resize Viewport Render Target"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Width"
                             }
                         },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetDockWidgetVisible",
+                    "base": "SetDockWidgetVisible",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetDockWidgetVisible"
+                        "tooltip": "When signaled, this will invoke Set Dock Widget Visible"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetDockWidgetVisible is invoked"
+                        "tooltip": "Signaled after Set Dock Widget Visible is invoked"
                     },
                     "details": {
-                        "name": "SetDockWidgetVisible"
+                        "name": "Set Dock Widget Visible"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Widget Name"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Visible"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsDockWidgetVisible",
+                    "base": "IsDockWidgetVisible",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsDockWidgetVisible"
+                        "tooltip": "When signaled, this will invoke Is Dock Widget Visible"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsDockWidgetVisible is invoked"
+                        "tooltip": "Signaled after Is Dock Widget Visible is invoked"
                     },
                     "details": {
-                        "name": "IsDockWidgetVisible"
+                        "name": "Is Dock Widget Visible"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Widget Name"
                             }
                         }
                     ],
@@ -125,51 +126,51 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Visible"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "LockViewportRenderTargetSize",
+                    "base": "LockViewportRenderTargetSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke LockViewportRenderTargetSize"
+                        "tooltip": "When signaled, this will invoke Lock Viewport Render Target Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after LockViewportRenderTargetSize is invoked"
+                        "tooltip": "Signaled after Lock Viewport Render Target Size is invoked"
                     },
                     "details": {
-                        "name": "LockViewportRenderTargetSize"
+                        "name": "Lock Viewport Render Target Size"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Width"
                             }
                         },
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ActivateWindow",
+                    "base": "ActivateWindow",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ActivateWindow"
+                        "tooltip": "When signaled, this will invoke Activate Window"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ActivateWindow is invoked"
+                        "tooltip": "Signaled after Activate Window is invoked"
                     },
                     "details": {
-                        "name": "ActivateWindow"
+                        "name": "Activate Window"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names
index a6e09acaa9..5e097988a6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "AttachmentComponentRequestBus",
+            "base": "AttachmentComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AttachmentComponentRequestBus",
+                "name": "Attachment",
                 "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "Attach",
+                    "base": "Attach",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Attach"
@@ -20,35 +20,32 @@
                         "tooltip": "Signaled after Attach is invoked"
                     },
                     "details": {
-                        "name": "Attach",
-                        "tooltip": "Attaches the entity"
+                        "name": "Attach"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "Target",
-                                "tooltip": "ID of entity to attach to"
+                                "name": "Target Entity Id",
+                                "tooltip": "The Entity to attach"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "Bone",
-                                "tooltip": "Name of bone on entity to attach to. If bone is not found, then attach to target entity's transform origin"
+                                "name": "Target Bone Name"
                             }
                         },
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Offset",
-                                "tooltip": "Attachment's offset from target"
+                                "name": "Offset Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Detach",
+                    "base": "Detach",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Detach"
@@ -58,30 +55,27 @@
                         "tooltip": "Signaled after Detach is invoked"
                     },
                     "details": {
-                        "name": "Detach",
-                        "tooltip": "Detaches the entity"
+                        "name": "Detach"
                     }
                 },
                 {
-                    "key": "SetAttachmentOffset",
+                    "base": "SetAttachmentOffset",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Offset"
+                        "tooltip": "When signaled, this will invoke SetAttachmentOffset"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Offset is invoked"
+                        "tooltip": "Signaled after SetAttachmentOffset is invoked"
                     },
                     "details": {
-                        "name": "Set Offset",
-                        "tooltip": "Sets the offset of the attachment"
+                        "name": "Set Attachment Offset"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Offset",
-                                "tooltip": "Attachment's offset from target"
+                                "name": "Offset Transform"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names
index add38bf6f7..6d5ba9f6a2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "AudioEnvironmentComponentRequestBus",
+            "base": "AudioEnvironmentComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioEnvironmentComponentRequestBus",
+                "name": "Audio Environment",
                 "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "SetAmount",
+                    "base": "SetAmount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Amount"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetEnvironmentAmount",
+                    "base": "SetEnvironmentAmount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Environment Amount"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names
index 5f9e7ca38e..4f1afdb06d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "AudioListenerComponentRequestBus",
+            "base": "AudioListenerComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioListenerComponentRequestBus",
+                "name": "Audio Listener",
                 "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "SetRotationEntity",
+                    "base": "SetRotationEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Rotation Entity"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetPositionEntity",
+                    "base": "SetPositionEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Position Entity"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetFullTransformEntity",
+                    "base": "SetFullTransformEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Full Transform Entity"
@@ -82,23 +82,23 @@
                     ]
                 },
                 {
-                    "key": "SetListenerEnabled",
+                    "base": "SetListenerEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetListenerEnabled"
+                        "tooltip": "When signaled, this will invoke Set Listener Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetListenerEnabled is invoked"
+                        "tooltip": "Signaled after Set Listener Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetListenerEnabled"
+                        "name": "Set Listener Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names
index 566ae34d76..f2ce00d72e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "AudioPreloadComponentRequestBus",
+            "base": "AudioPreloadComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioPreloadComponentRequestBus",
+                "name": "Audio Preload",
                 "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "IsLoaded",
+                    "base": "IsLoaded",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Loaded"
@@ -40,7 +40,7 @@
                     ]
                 },
                 {
-                    "key": "Unload",
+                    "base": "Unload",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Unload"
@@ -54,7 +54,7 @@
                     }
                 },
                 {
-                    "key": "UnloadPreload",
+                    "base": "UnloadPreload",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Unload Preload"
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "key": "Load",
+                    "base": "Load",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Load"
@@ -90,7 +90,7 @@
                     }
                 },
                 {
-                    "key": "LoadPreload",
+                    "base": "LoadPreload",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Load Preload"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names
index 4afb7ae293..2053611961 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "AudioRtpcComponentRequestBus",
+            "base": "AudioRtpcComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioRtpcComponentRequestBus",
+                "name": "Audio RTPC",
                 "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "SetValue",
+                    "base": "SetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetRtpcValue",
+                    "base": "SetRtpcValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set RTPC Value"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names
index be6b1fd236..87d263ac96 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "AudioSwitchComponentRequestBus",
+            "base": "AudioSwitchComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioSwitchComponentRequestBus",
+                "name": "Audio Switch",
                 "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "SetState",
+                    "base": "SetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetSwitchState",
+                    "base": "SetSwitchState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Switch State"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names
index f3c0416644..526eada299 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names
@@ -1,15 +1,16 @@
 {
     "entries": [
         {
-            "key": "AudioSystemComponentRequestBus",
+            "base": "AudioSystemComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioSystemComponentRequestBus"
+                "name": "Audio System",
+                "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "LevelUnloadAudio",
+                    "base": "LevelUnloadAudio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke LevelUnloadAudio"
@@ -19,11 +20,11 @@
                         "tooltip": "Signaled after LevelUnloadAudio is invoked"
                     },
                     "details": {
-                        "name": "LevelUnloadAudio"
+                        "name": "Level Unload Audio"
                     }
                 },
                 {
-                    "key": "LevelLoadAudio",
+                    "base": "LevelLoadAudio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke LevelLoadAudio"
@@ -33,104 +34,104 @@
                         "tooltip": "Signaled after LevelLoadAudio is invoked"
                     },
                     "details": {
-                        "name": "LevelLoadAudio"
+                        "name": "Level Load Audio"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Level Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GlobalKillAudioTrigger",
+                    "base": "GlobalKillAudioTrigger",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalKillAudioTrigger"
+                        "tooltip": "When signaled, this will invoke Global Kill Audio Trigger"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalKillAudioTrigger is invoked"
+                        "tooltip": "Signaled after Global Kill Audio Trigger is invoked"
                     },
                     "details": {
-                        "name": "GlobalKillAudioTrigger"
+                        "name": "Global Kill Audio Trigger"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Trigger Name"
                             }
                         },
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Callback Owner",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GlobalSetAudioRtpc",
+                    "base": "GlobalSetAudioRtpc",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalSetAudioRtpc"
+                        "tooltip": "When signaled, this will invoke Global Set Audio RTPC"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalSetAudioRtpc is invoked"
+                        "tooltip": "Signaled after Global Set Audio RTPC is invoked"
                     },
                     "details": {
-                        "name": "GlobalSetAudioRtpc"
+                        "name": "Global Set Audio RTPC"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "RTPC Name"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GlobalSetAudioSwitchState",
+                    "base": "GlobalSetAudioSwitchState",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalSetAudioSwitchState"
+                        "tooltip": "When signaled, this will invoke Global Set Audio Switch State"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalSetAudioSwitchState is invoked"
+                        "tooltip": "Signaled after Global Set Audio Switch State is invoked"
                     },
                     "details": {
-                        "name": "GlobalSetAudioSwitchState"
+                        "name": "Global Set Audio Switch State"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Switch Name"
                             }
                         },
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "State Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GlobalRefreshAudio",
+                    "base": "GlobalRefreshAudio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GlobalRefreshAudio"
@@ -140,100 +141,100 @@
                         "tooltip": "Signaled after GlobalRefreshAudio is invoked"
                     },
                     "details": {
-                        "name": "GlobalRefreshAudio"
+                        "name": "Global Refresh Audio"
                     },
                     "params": [
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Level Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GlobalMuteAudio",
+                    "base": "GlobalMuteAudio",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalMuteAudio"
+                        "tooltip": "When signaled, this will invoke Global Mute Audio"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalMuteAudio is invoked"
+                        "tooltip": "Signaled after Global Mute Audio is invoked"
                     },
                     "details": {
-                        "name": "GlobalMuteAudio"
+                        "name": "Global Mute Audio"
                     }
                 },
                 {
-                    "key": "GlobalExecuteAudioTrigger",
+                    "base": "GlobalExecuteAudioTrigger",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalExecuteAudioTrigger"
+                        "tooltip": "When signaled, this will invoke Global Execute Audio Trigger"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalExecuteAudioTrigger is invoked"
+                        "tooltip": "Signaled after Global Execute Audio Trigger is invoked"
                     },
                     "details": {
-                        "name": "GlobalExecuteAudioTrigger"
+                        "name": "Global Execute Audio Trigger"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Trigger Name"
                             }
                         },
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Callback Owner",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GlobalStopAllSounds",
+                    "base": "GlobalStopAllSounds",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalStopAllSounds"
+                        "tooltip": "When signaled, this will invoke Global Stop All Sounds"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalStopAllSounds is invoked"
+                        "tooltip": "Signaled after Global Stop All Sounds is invoked"
                     },
                     "details": {
-                        "name": "GlobalStopAllSounds"
+                        "name": "Global Stop All Sounds"
                     }
                 },
                 {
-                    "key": "GlobalUnmuteAudio",
+                    "base": "GlobalUnmuteAudio",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalUnmuteAudio"
+                        "tooltip": "When signaled, this will invoke Global Unmute Audio"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalUnmuteAudio is invoked"
+                        "tooltip": "Signaled after Global Unmute Audio is invoked"
                     },
                     "details": {
-                        "name": "GlobalUnmuteAudio"
+                        "name": "Global Unmute Audio"
                     }
                 },
                 {
-                    "key": "GlobalResetAudioRtpcs",
+                    "base": "GlobalResetAudioRtpcs",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GlobalResetAudioRtpcs"
+                        "tooltip": "When signaled, this will invoke Global Reset Audio RTPCs"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GlobalResetAudioRtpcs is invoked"
+                        "tooltip": "Signaled after Global Reset Audio RTPCs is invoked"
                     },
                     "details": {
-                        "name": "GlobalResetAudioRtpcs"
+                        "name": "Global Reset Audio RTPCs"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names
index 0e657fba96..3f584ca463 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names
@@ -1,38 +1,39 @@
 {
     "entries": [
         {
-            "key": "AudioTriggerComponentRequestBus",
+            "base": "AudioTriggerComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AudioTriggerComponentRequestBus",
+                "name": "Audio Trigger",
                 "category": "Audio"
             },
             "methods": [
                 {
-                    "key": "SetObstructionType",
+                    "base": "SetObstructionType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetObstructionType"
+                        "tooltip": "When signaled, this will invoke Set Obstruction Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetObstructionType is invoked"
+                        "tooltip": "Signaled after Set Obstruction Type is invoked"
                     },
                     "details": {
-                        "name": "SetObstructionType"
+                        "name": "Set Obstruction Type"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Obstruction Type",
+                                "tooltip": "0: Ignore, 1: Single Ray, 2: Multi Ray"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "KillAllTriggers",
+                    "base": "KillAllTriggers",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Kill All Triggers"
@@ -47,7 +48,7 @@
                     }
                 },
                 {
-                    "key": "ExecuteTrigger",
+                    "base": "ExecuteTrigger",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Execute Trigger"
@@ -71,7 +72,7 @@
                     ]
                 },
                 {
-                    "key": "SetMovesWithEntity",
+                    "base": "SetMovesWithEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Moves With Entity"
@@ -95,7 +96,7 @@
                     ]
                 },
                 {
-                    "key": "Stop",
+                    "base": "Stop",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Stop"
@@ -110,7 +111,7 @@
                     }
                 },
                 {
-                    "key": "Play",
+                    "base": "Play",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Play"
@@ -125,7 +126,7 @@
                     }
                 },
                 {
-                    "key": "KillTrigger",
+                    "base": "KillTrigger",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Kill Trigger"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names
index d0b0baf76f..c0db453e2e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names
@@ -1,15 +1,16 @@
 {
     "entries": [
         {
-            "key": "AuthenticationProviderRequestBus",
+            "base": "AuthenticationProviderRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "AuthenticationProviderRequestBus"
+                "name": "AWS Authentication Provider",
+                "category": "AWS Client Auth"
             },
             "methods": [
                 {
-                    "key": "SignOut",
+                    "base": "SignOut",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SignOut"
@@ -19,13 +20,14 @@
                         "tooltip": "Signaled after SignOut is invoked"
                     },
                     "details": {
-                        "name": "SignOut"
+                        "name": "Sign Out"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ],
@@ -33,107 +35,114 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Signed Out",
+                                "tooltip": "True: Successfully sign out"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DeviceCodeGrantConfirmSignInAsync",
+                    "base": "DeviceCodeGrantConfirmSignInAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DeviceCodeGrantConfirmSignInAsync"
+                        "tooltip": "When signaled, this will invoke Device Code Grant Confirm Sign In Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DeviceCodeGrantConfirmSignInAsync is invoked"
+                        "tooltip": "Signaled after Device Code Grant Confirm Sign In Async is invoked"
                     },
                     "details": {
-                        "name": "DeviceCodeGrantConfirmSignInAsync"
+                        "name": "Device Code Grant Confirm Sign In Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DeviceCodeGrantSignInAsync",
+                    "base": "DeviceCodeGrantSignInAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DeviceCodeGrantSignInAsync"
+                        "tooltip": "When signaled, this will invoke Device Code Grant Sign In Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DeviceCodeGrantSignInAsync is invoked"
+                        "tooltip": "Signaled after Device Code Grant Sign In Async is invoked"
                     },
                     "details": {
-                        "name": "DeviceCodeGrantSignInAsync"
+                        "name": "Device Code Grant Sign In Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "PasswordGrantMultiFactorSignInAsync",
+                    "base": "PasswordGrantMultiFactorSignInAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke PasswordGrantMultiFactorSignInAsync"
+                        "tooltip": "When signaled, this will invoke Password Grant Multi Factor Sign In Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after PasswordGrantMultiFactorSignInAsync is invoked"
+                        "tooltip": "Signaled after Password Grant Multi Factor Sign In Async is invoked"
                     },
                     "details": {
-                        "name": "PasswordGrantMultiFactorSignInAsync"
+                        "name": "Password Grant Multi Factor Sign In Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Username",
+                                "tooltip": "The client's username"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Password",
+                                "tooltip": "The client's password"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAuthenticationTokens",
+                    "base": "GetAuthenticationTokens",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAuthenticationTokens"
+                        "tooltip": "When signaled, this will invoke Get Authentication Tokens"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAuthenticationTokens is invoked"
+                        "tooltip": "Signaled after Get Authentication Tokens is invoked"
                     },
                     "details": {
-                        "name": "GetAuthenticationTokens"
+                        "name": "Get Authentication Tokens"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ],
@@ -147,45 +156,47 @@
                     ]
                 },
                 {
-                    "key": "GetTokensWithRefreshAsync",
+                    "base": "GetTokensWithRefreshAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTokensWithRefreshAsync"
+                        "tooltip": "When signaled, this will invoke Get Tokens With Refresh Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTokensWithRefreshAsync is invoked"
+                        "tooltip": "Signaled after Get Tokens With Refresh Async is invoked"
                     },
                     "details": {
-                        "name": "GetTokensWithRefreshAsync"
+                        "name": "Get Tokens With Refresh Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsSignedIn",
+                    "base": "IsSignedIn",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsSignedIn"
+                        "tooltip": "When signaled, this will invoke Is Signed In"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsSignedIn is invoked"
+                        "tooltip": "Signaled after Is Signed In is invoked"
                     },
                     "details": {
-                        "name": "IsSignedIn"
+                        "name": "Is Signed In"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ],
@@ -193,69 +204,73 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Signed In"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "PasswordGrantSingleFactorSignInAsync",
+                    "base": "PasswordGrantSingleFactorSignInAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke PasswordGrantSingleFactorSignInAsync"
+                        "tooltip": "When signaled, this will invoke Password GrantSingle Factor Sign In Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after PasswordGrantSingleFactorSignInAsync is invoked"
+                        "tooltip": "Signaled after Password GrantSingle Factor Sign In Async is invoked"
                     },
                     "details": {
-                        "name": "PasswordGrantSingleFactorSignInAsync"
+                        "name": "Password GrantSingle Factor Sign In Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Username",
+                                "tooltip": "The client's username"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Password",
+                                "tooltip": "The client's password"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RefreshTokensAsync",
+                    "base": "RefreshTokensAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RefreshTokensAsync"
+                        "tooltip": "When signaled, this will invoke Refresh Tokens Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RefreshTokensAsync is invoked"
+                        "tooltip": "Signaled after Refresh Tokens Async is invoked"
                     },
                     "details": {
-                        "name": "RefreshTokensAsync"
+                        "name": "Refresh Tokens Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Initialize",
+                    "base": "Initialize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Initialize"
@@ -271,7 +286,7 @@
                         {
                             "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Provider Names"
                             }
                         }
                     ],
@@ -279,41 +294,44 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Initialized"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "PasswordGrantMultiFactorConfirmSignInAsync",
+                    "base": "PasswordGrantMultiFactorConfirmSignInAsync",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke PasswordGrantMultiFactorConfirmSignInAsync"
+                        "tooltip": "When signaled, this will invoke Password Grant Multi Factor Confirm Sign In Async"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after PasswordGrantMultiFactorConfirmSignInAsync is invoked"
+                        "tooltip": "Signaled after Password Grant Multi Factor Confirm Sign In Async is invoked"
                     },
                     "details": {
-                        "name": "PasswordGrantMultiFactorConfirmSignInAsync"
+                        "name": "Password Grant Multi Factor Confirm Sign In Async"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Provider name",
+                                "tooltip": "The identity provider name"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Username",
+                                "tooltip": "The client's username"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Confirmation code",
+                                "tooltip": "The client's confirmation code"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names
new file mode 100644
index 0000000000..3c71a6e04c
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names
@@ -0,0 +1,36 @@
+{
+    "entries": [
+        {
+            "base": "BlastFamilyComponentRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Blast Family"
+            },
+            "methods": [
+                {
+                    "base": "Get Actors Data",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Actors Data"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Actors Data is invoked"
+                    },
+                    "details": {
+                        "name": "Get Actors Data"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{9B2C5410-EFDC-5A61-8B89-0F515B41AB24}",
+                            "details": {
+                                "name": "Actors Data"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names
new file mode 100644
index 0000000000..9dec40475a
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names
@@ -0,0 +1,315 @@
+{
+    "entries": [
+        {
+            "base": "BlastFamilyDamageRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Blast Family Damage"
+            },
+            "methods": [
+                {
+                    "base": "Get Family Id",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Family Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Family Id is invoked"
+                    },
+                    "details": {
+                        "name": "Get Family Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Destroy actor",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Destroy actor"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Destroy actor is invoked"
+                    },
+                    "details": {
+                        "name": "Destroy Actor"
+                    }
+                },
+                {
+                    "base": "Triangle Damage",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Triangle Damage"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Triangle Damage is invoked"
+                    },
+                    "details": {
+                        "name": "Triangle Damage"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position 0",
+                                "tooltip": "Vertex of the triangle."
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position 1",
+                                "tooltip": "Vertex of the triangle."
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position 2",
+                                "tooltip": "Vertex of the triangle."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damage",
+                                "tooltip": "How much damage to deal."
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Impact Spread Damage",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Impact Spread Damage"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Impact Spread Damage is invoked"
+                    },
+                    "details": {
+                        "name": "Impact Spread Damage"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position",
+                                "tooltip": "The global position of the damage's hit."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Min Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [0, minRadius] with full damage"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Max Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [minRadius, maxRadius] with linearly decreasing damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damage",
+                                "tooltip": "How much damage to deal."
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Stress Damage",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Stress Damage"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Stress Damage is invoked"
+                    },
+                    "details": {
+                        "name": "Stress Damage"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position",
+                                "tooltip": "The global position of the damage's hit."
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Force",
+                                "tooltip": "The force applied at the position."
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Shear Damage",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Shear Damage"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Shear Damage is invoked"
+                    },
+                    "details": {
+                        "name": "Shear Damage"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position",
+                                "tooltip": "The global position of the damage's hit."
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Normal",
+                                "tooltip": "The normal of the damage's hit."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Min Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [0, minRadius] with full damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Max Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [minRadius, maxRadius] with linearly decreasing damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damage",
+                                "tooltip": "How much damage to deal."
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Capsule Damage",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Capsule Damage"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Capsule Damage is invoked"
+                    },
+                    "details": {
+                        "name": "Capsule Damage"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position 0",
+                                "tooltip": "The global position of one of the capsule's ends."
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position 1",
+                                "tooltip": "The global position of another of the capsule's ends."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Min Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [0, minRadius] with full damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Max Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [minRadius, maxRadius] with linearly decreasing damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damage",
+                                "tooltip": "How much damage to deal."
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Radial Damage",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Radial Damage"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Radial Damage is invoked"
+                    },
+                    "details": {
+                        "name": "Radial Damage"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position",
+                                "tooltip": "The global position of the damage's hit."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Min Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [0, minRadius] with full damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Max Radius",
+                                "tooltip": "Damages all chunks/bonds that are in the range [minRadius, maxRadius] with linearly decreasing damage."
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damage",
+                                "tooltip": "How much damage to deal."
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names
index 0ae96265bc..4e7b53693e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names
@@ -1,1417 +1,1418 @@
 {
     "entries": [
         {
-            "key": "BloomRequestBus",
+            "base": "BloomRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "BloomRequestBus"
+                "name": "Bloom",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetTintStage0Override",
+                    "base": "GetTintStage0Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage0Override"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 0 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage0Override is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 0 Override is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage0Override"
+                        "name": "Get Tint Stage 0 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage0Override",
+                    "base": "SetTintStage0Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage0Override"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 0 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage0Override is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 0 Override is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage0Override"
+                        "name": "Set Tint Stage 0 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage1",
+                    "base": "SetTintStage1",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage1"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 1"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage1 is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 1 is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage1"
+                        "name": "Set Tint Stage 1"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage0",
+                    "base": "SetTintStage0",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage0"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 0"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage0 is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 0 is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage0"
+                        "name": "Set Tint Stage 0"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage3Override",
+                    "base": "GetKernelSizeStage3Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage3Override"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 3 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage3Override is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 3 Override is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage3Override"
+                        "name": "Get Kernel Size Stage 3 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage3Override",
+                    "base": "GetTintStage3Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage3Override"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 3 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage3Override is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 3 Override is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage3Override"
+                        "name": "Get Tint Stage 3 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeScaleOverride",
+                    "base": "SetKernelSizeScaleOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeScaleOverride"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Scale Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeScaleOverride is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Scale Override is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeScaleOverride"
+                        "name": "Set Kernel Size Scale Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage2",
+                    "base": "SetKernelSizeStage2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage2"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage2 is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 2 is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage2"
+                        "name": "Set Kernel Size Stage 2"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage4",
+                    "base": "GetKernelSizeStage4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage4"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage4 is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 4 is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage4"
+                        "name": "Get Kernel Size Stage 4"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage0",
+                    "base": "GetTintStage0",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage0"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 0"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage0 is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 0 is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage0"
+                        "name": "Get Tint Stage 0"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage4Override",
+                    "base": "SetTintStage4Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage4Override"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 4 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage4Override is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 4 Override is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage4Override"
+                        "name": "Set Tint Stage 4 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeScale",
+                    "base": "GetKernelSizeScale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeScale"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeScale is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Scale is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeScale"
+                        "name": "Get Kernel Size Scale"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage2",
+                    "base": "GetKernelSizeStage2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage2"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage2 is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 2 is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage2"
+                        "name": "Get Kernel Size Stage 2"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage1Override",
+                    "base": "SetTintStage1Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage1Override"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 1 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage1Override is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 1 Override is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage1Override"
+                        "name": "Set Tint Stage 1 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage3",
+                    "base": "SetTintStage3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage3"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage3 is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 3 is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage3"
+                        "name": "Set Tint Stage 3"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnabledOverride",
+                    "base": "GetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Get Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Get Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnabledOverride"
+                        "name": "Get Enabled Override"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage3Override",
+                    "base": "SetTintStage3Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage3Override"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 3 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage3Override is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 3 Override is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage3Override"
+                        "name": "Set Tint Stage 3 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnabledOverride",
+                    "base": "SetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Set Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Set Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnabledOverride"
+                        "name": "Set Enabled Override"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage0",
+                    "base": "SetKernelSizeStage0",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage0"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 0"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage0 is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 0 is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage0"
+                        "name": "Set Kernel Size Stage 0"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage0Override",
+                    "base": "GetKernelSizeStage0Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage0Override"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 0 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage0Override is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 0 Override is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage0Override"
+                        "name": "Get Kernel Size Stage 0 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage4Override",
+                    "base": "SetKernelSizeStage4Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage4Override"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 4 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage4Override is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 4 Override is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage4Override"
+                        "name": "Set Kernel Size Stage 4 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage2",
+                    "base": "GetTintStage2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage2"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage2 is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 2 is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage2"
+                        "name": "Get Tint Stage 2"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage4Override",
+                    "base": "GetTintStage4Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage4Override"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 4 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage4Override is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 4 Override is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage4Override"
+                        "name": "Get Tint Stage 4 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage0Override",
+                    "base": "SetKernelSizeStage0Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage0Override"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 0 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage0Override is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 0 Override is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage0Override"
+                        "name": "Set Kernel Size Stage 0 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage4Override",
+                    "base": "GetKernelSizeStage4Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage4Override"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 4 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage4Override is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 4 Override is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage4Override"
+                        "name": "Get Kernel Size Stage 4 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage2Override",
+                    "base": "GetTintStage2Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage2Override"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 2 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage2Override is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 2 Override is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage2Override"
+                        "name": "Get Tint Stage 2 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage3",
+                    "base": "GetTintStage3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage3"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage3 is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 3 is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage3"
+                        "name": "Get Tint Stage 3"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeScale",
+                    "base": "SetKernelSizeScale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeScale"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeScale is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Scale is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeScale"
+                        "name": "Set Kernel Size Scale"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetIntensity",
+                    "base": "GetIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetIntensity"
+                        "tooltip": "When signaled, this will invoke Get Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetIntensity is invoked"
+                        "tooltip": "Signaled after Get Intensity is invoked"
                     },
                     "details": {
-                        "name": "GetIntensity"
+                        "name": "Get Intensity"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBicubicEnabledOverride",
+                    "base": "GetBicubicEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBicubicEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Get Bicubic Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBicubicEnabledOverride is invoked"
+                        "tooltip": "Signaled after Get Bicubic Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "GetBicubicEnabledOverride"
+                        "name": "Get Bicubic Enabled Override"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage4",
+                    "base": "SetKernelSizeStage4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage4"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage4 is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 4 is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage4"
+                        "name": "Set Kernel Size Stage 4"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBicubicEnabled",
+                    "base": "SetBicubicEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBicubicEnabled"
+                        "tooltip": "When signaled, this will invoke Set Bicubic Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBicubicEnabled is invoked"
+                        "tooltip": "Signaled after Set Bicubic Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetBicubicEnabled"
+                        "name": "Set Bicubic Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage1Override",
+                    "base": "GetKernelSizeStage1Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage1Override"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 1 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage1Override is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 1 Override is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage1Override"
+                        "name": "Get Kernel Size Stage 1 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetThresholdOverride",
+                    "base": "GetThresholdOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetThresholdOverride"
+                        "tooltip": "When signaled, this will invoke Get Threshold Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetThresholdOverride is invoked"
+                        "tooltip": "Signaled after Get Threshold Override is invoked"
                     },
                     "details": {
-                        "name": "GetThresholdOverride"
+                        "name": "Get Threshold Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetIntensity",
+                    "base": "SetIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetIntensity"
+                        "tooltip": "When signaled, this will invoke Set Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetIntensity is invoked"
+                        "tooltip": "Signaled after Set Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetIntensity"
+                        "name": "Set Intensity"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBicubicEnabledOverride",
+                    "base": "SetBicubicEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBicubicEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Set Bicubic Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBicubicEnabledOverride is invoked"
+                        "tooltip": "Signaled after Set Bicubic Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "SetBicubicEnabledOverride"
+                        "name": "Set Bicubic Enabled Override"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage1",
+                    "base": "GetKernelSizeStage1",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage1"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 1"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage1 is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 1 is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage1"
+                        "name": "Get Kernel Size Stage 1"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage2Override",
+                    "base": "GetKernelSizeStage2Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage2Override"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 2 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage2Override is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 2 Override is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage2Override"
+                        "name": "Get Kernel Size Stage 2 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage4",
+                    "base": "SetTintStage4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage4"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage4 is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 4 is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage4"
+                        "name": "Set Tint Stage 4"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage1",
+                    "base": "SetKernelSizeStage1",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage1"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 1"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage1 is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 1 is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage1"
+                        "name": "Set Kernel Size Stage 1"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetThresholdOverride",
+                    "base": "SetThresholdOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetThresholdOverride"
+                        "tooltip": "When signaled, this will invoke Set Threshold Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetThresholdOverride is invoked"
+                        "tooltip": "Signaled after Set Threshold Override is invoked"
                     },
                     "details": {
-                        "name": "SetThresholdOverride"
+                        "name": "Set Threshold Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage1",
+                    "base": "GetTintStage1",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage1"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 1"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage1 is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 1 is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage1"
+                        "name": "Get Tint Stage 1"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKnee",
+                    "base": "GetKnee",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKnee"
+                        "tooltip": "When signaled, this will invoke Get Knee"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKnee is invoked"
+                        "tooltip": "Signaled after Get Knee is invoked"
                     },
                     "details": {
-                        "name": "GetKnee"
+                        "name": "Get Knee"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetThreshold",
+                    "base": "SetThreshold",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetThreshold"
+                        "tooltip": "When signaled, this will invoke Set Threshold"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetThreshold is invoked"
+                        "tooltip": "Signaled after Set Threshold is invoked"
                     },
                     "details": {
-                        "name": "SetThreshold"
+                        "name": "Set Threshold"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetIntensityOverride",
+                    "base": "SetIntensityOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetIntensityOverride"
+                        "tooltip": "When signaled, this will invoke Set Intensity Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetIntensityOverride is invoked"
+                        "tooltip": "Signaled after Set Intensity Override is invoked"
                     },
                     "details": {
-                        "name": "SetIntensityOverride"
+                        "name": "Set Intensity Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabled"
+                        "tooltip": "When signaled, this will invoke Get Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabled is invoked"
+                        "tooltip": "Signaled after Get Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetEnabled"
+                        "name": "Get Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage1Override",
+                    "base": "SetKernelSizeStage1Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage1Override"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 1 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage1Override is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 1 Override is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage1Override"
+                        "name": "Set Kernel Size Stage 1 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage0",
+                    "base": "GetKernelSizeStage0",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage0"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 0"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage0 is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 0 is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage0"
+                        "name": "Get Kernel Size Stage 0"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage2Override",
+                    "base": "SetTintStage2Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage2Override"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 2 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage2Override is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 2 Override is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage2Override"
+                        "name": "Set Tint Stage 2 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage4",
+                    "base": "GetTintStage4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage4"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage4 is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 4 is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage4"
+                        "name": "Get Tint Stage 4"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeScaleOverride",
+                    "base": "GetKernelSizeScaleOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeScaleOverride"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Scale Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeScaleOverride is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Scale Override is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeScaleOverride"
+                        "name": "Get Kernel Size Scale Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage2Override",
+                    "base": "SetKernelSizeStage2Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage2Override"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 2 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage2Override is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 2 Override is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage2Override"
+                        "name": "Set Kernel Size Stage 2 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKernelSizeStage3",
+                    "base": "GetKernelSizeStage3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKernelSizeStage3"
+                        "tooltip": "When signaled, this will invoke Get Kernel Size Stage 3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKernelSizeStage3 is invoked"
+                        "tooltip": "Signaled after Get Kernel Size Stage 3 is invoked"
                     },
                     "details": {
-                        "name": "GetKernelSizeStage3"
+                        "name": "Get Kernel Size Stage 3"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTintStage1Override",
+                    "base": "GetTintStage1Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTintStage1Override"
+                        "tooltip": "When signaled, this will invoke Get Tint Stage 1 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTintStage1Override is invoked"
+                        "tooltip": "Signaled after Get Tint Stage 1 Override is invoked"
                     },
                     "details": {
-                        "name": "GetTintStage1Override"
+                        "name": "Get Tint Stage 1 Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTintStage2",
+                    "base": "SetTintStage2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTintStage2"
+                        "tooltip": "When signaled, this will invoke Set Tint Stage 2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTintStage2 is invoked"
+                        "tooltip": "Signaled after Set Tint Stage 2 is invoked"
                     },
                     "details": {
-                        "name": "SetTintStage2"
+                        "name": "Set Tint Stage 2"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetKneeOverride",
+                    "base": "GetKneeOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetKneeOverride"
+                        "tooltip": "When signaled, this will invoke Get Knee Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetKneeOverride is invoked"
+                        "tooltip": "Signaled after Get Knee Override is invoked"
                     },
                     "details": {
-                        "name": "GetKneeOverride"
+                        "name": "Get Knee Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKnee",
+                    "base": "SetKnee",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKnee"
+                        "tooltip": "When signaled, this will invoke Set Knee"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKnee is invoked"
+                        "tooltip": "Signaled after Set Knee is invoked"
                     },
                     "details": {
-                        "name": "SetKnee"
+                        "name": "Set Knee"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetIntensityOverride",
+                    "base": "GetIntensityOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetIntensityOverride"
+                        "tooltip": "When signaled, this will invoke Get Intensity Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetIntensityOverride is invoked"
+                        "tooltip": "Signaled after Get Intensity Override is invoked"
                     },
                     "details": {
-                        "name": "GetIntensityOverride"
+                        "name": "Get Intensity Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetThreshold",
+                    "base": "GetThreshold",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetThreshold"
+                        "tooltip": "When signaled, this will invoke Get Threshold"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetThreshold is invoked"
+                        "tooltip": "Signaled after Get Threshold is invoked"
                     },
                     "details": {
-                        "name": "GetThreshold"
+                        "name": "Get Threshold"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage3",
+                    "base": "SetKernelSizeStage3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage3"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage3 is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 3 is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage3"
+                        "name": "Set Kernel Size Stage 3"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKernelSizeStage3Override",
+                    "base": "SetKernelSizeStage3Override",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKernelSizeStage3Override"
+                        "tooltip": "When signaled, this will invoke Set Kernel Size Stage 3 Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKernelSizeStage3Override is invoked"
+                        "tooltip": "Signaled after Set Kernel Size Stage 3 Override is invoked"
                     },
                     "details": {
-                        "name": "SetKernelSizeStage3Override"
+                        "name": "Set Kernel Size Stage 3 Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetKneeOverride",
+                    "base": "SetKneeOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetKneeOverride"
+                        "tooltip": "When signaled, this will invoke Set Knee Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetKneeOverride is invoked"
+                        "tooltip": "Signaled after Set Knee Override is invoked"
                     },
                     "details": {
-                        "name": "SetKneeOverride"
+                        "name": "Set Knee Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Value"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBicubicEnabled",
+                    "base": "GetBicubicEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBicubicEnabled"
+                        "tooltip": "When signaled, this will invoke Get Bicubic Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBicubicEnabled is invoked"
+                        "tooltip": "Signaled after Get Bicubic Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetBicubicEnabled"
+                        "name": "Get Bicubic Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names
index a778eb6039..a9b4bea946 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names
@@ -1,53 +1,54 @@
 {
     "entries": [
         {
-            "key": "BoundsRequestBus",
+            "base": "BoundsRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "BoundsRequestBus"
+                "name": "Bounds",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetWorldBounds",
+                    "base": "GetWorldBounds",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetWorldBounds"
+                        "tooltip": "When signaled, this will invoke Get World Bounds"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetWorldBounds is invoked"
+                        "tooltip": "Signaled after Get World Bounds is invoked"
                     },
                     "details": {
-                        "name": "GetWorldBounds"
+                        "name": "Get World Bounds"
                     },
                     "results": [
                         {
                             "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
                             "details": {
-                                "name": "Aabb"
+                                "name": "AABB"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalBounds",
+                    "base": "GetLocalBounds",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetLocalBounds"
+                        "tooltip": "When signaled, this will invoke Get Local Bounds"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetLocalBounds is invoked"
+                        "tooltip": "Signaled after Get Local Bounds is invoked"
                     },
                     "details": {
-                        "name": "GetLocalBounds"
+                        "name": "Get Local Bounds"
                     },
                     "results": [
                         {
                             "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
                             "details": {
-                                "name": "Aabb"
+                                "name": "AABB"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names
index 816dc5e4ec..fa5d79c19d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "BoxShapeComponentRequestsBus",
+            "base": "BoxShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "BoxShapeComponentRequestsBus",
+                "name": "Box Shape Component",
                 "category": "Shape"
             },
             "methods": [
                 {
-                    "key": "GetBoxConfiguration",
+                    "base": "GetBoxConfiguration",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Configuration"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetBoxDimensions",
+                    "base": "GetBoxDimensions",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Dimensions"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetBoxDimensions",
+                    "base": "SetBoxDimensions",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Dimensions"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names
index 500ae4d94c..6c0112bfc2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names
@@ -1,83 +1,82 @@
 {
     "entries": [
         {
-            "key": "CameraRequestBus",
+            "base": "CameraRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "CameraRequestBus",
+                "name": "Camera",
                 "category": "Camera"
             },
             "methods": [
                 {
-                    "key": "GetOrthographicHalfWidth",
+                    "base": "GetOrthographicHalfWidth",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOrthographicHalfWidth"
+                        "tooltip": "When signaled, this will invoke Get Orthographic Half Width"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOrthographicHalfWidth is invoked"
+                        "tooltip": "Signaled after Get Orthographic Half Width is invoked"
                     },
                     "details": {
-                        "name": "GetOrthographicHalfWidth"
+                        "name": "Get Orthographic Half Width"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Half Width"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFov",
+                    "base": "GetFov",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get FOV"
+                        "tooltip": "When signaled, this will invoke Get Field of View"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get FOV is invoked"
+                        "tooltip": "Signaled after Get Field of View is invoked"
                     },
                     "details": {
-                        "name": "Get FOV",
-                        "tooltip": "Returns the field of view of the camera"
+                        "name": "Get Field of View"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "FOV"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFovRadians",
+                    "base": "SetFovRadians",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFovRadians"
+                        "tooltip": "When signaled, this will invoke Set Field of View (Radians)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFovRadians is invoked"
+                        "tooltip": "Signaled after Set Field of View (Radians) is invoked"
                     },
                     "details": {
-                        "name": "SetFovRadians"
+                        "name": "Set Field of View (Radians)"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "FOV (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNearClipDistance",
+                    "base": "SetNearClipDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Near Clip Distance"
@@ -87,111 +86,107 @@
                         "tooltip": "Signaled after Set Near Clip Distance is invoked"
                     },
                     "details": {
-                        "name": "Set Near Clip Distance",
-                        "tooltip": "Sets the near clip distance of the camera"
+                        "name": "Set Near Clip Distance"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Distance",
-                                "tooltip": "Set the near clip distance of the camera"
+                                "name": "Near Clip Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsOrthographic",
+                    "base": "IsOrthographic",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsOrthographic"
+                        "tooltip": "When signaled, this will invoke Is Orthographic"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsOrthographic is invoked"
+                        "tooltip": "Signaled after Is Orthographic is invoked"
                     },
                     "details": {
-                        "name": "IsOrthographic"
+                        "name": "Is Orthographic"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Orthographic"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFovDegrees",
+                    "base": "SetFovDegrees",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFovDegrees"
+                        "tooltip": "When signaled, this will invoke Set Field of View (Degrees)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFovDegrees is invoked"
+                        "tooltip": "Signaled after Set Field of View (Degrees) is invoked"
                     },
                     "details": {
-                        "name": "SetFovDegrees"
+                        "name": "Set Field of View (Degrees)"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Field of View (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFovRadians",
+                    "base": "GetFovRadians",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFovRadians"
+                        "tooltip": "When signaled, this will invoke Get Field of View (Radians)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFovRadians is invoked"
+                        "tooltip": "Signaled after Get Field of View (Radians) is invoked"
                     },
                     "details": {
-                        "name": "GetFovRadians"
+                        "name": "Get Field of View (Radians)"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Field of View (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFov",
+                    "base": "SetFov",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set FOV"
+                        "tooltip": "When signaled, this will invoke Set Field of View"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set FOV is invoked"
+                        "tooltip": "Signaled after Set Field of View is invoked"
                     },
                     "details": {
-                        "name": "Set FOV",
-                        "tooltip": "Set the field of view of the camera"
+                        "name": "Set Field of View"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "FOV",
-                                "tooltip": "The field of view of the camera"
+                                "name": "Field of View"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MakeActiveView",
+                    "base": "MakeActiveView",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Make Active View"
@@ -201,12 +196,11 @@
                         "tooltip": "Signaled after Make Active View is invoked"
                     },
                     "details": {
-                        "name": "Make Active View",
-                        "tooltip": "Sets the camera on the specified entity to the active view"
+                        "name": "Make Active View"
                     }
                 },
                 {
-                    "key": "GetFarClipDistance",
+                    "base": "GetFarClipDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Far Clip Distance"
@@ -216,86 +210,85 @@
                         "tooltip": "Signaled after Get Far Clip Distance is invoked"
                     },
                     "details": {
-                        "name": "Get Far Clip Distance",
-                        "tooltip": "Returns the far clip distance of the camera"
+                        "name": "Get Far Clip Distance"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Far Clip Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFovDegrees",
+                    "base": "GetFovDegrees",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFovDegrees"
+                        "tooltip": "When signaled, this will invoke Get Field of View (Degrees)"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFovDegrees is invoked"
+                        "tooltip": "Signaled after Get Field of View (Degrees) is invoked"
                     },
                     "details": {
-                        "name": "GetFovDegrees"
+                        "name": "Get Field of View (Degrees)"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Field of View (Degrees)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOrthographic",
+                    "base": "SetOrthographic",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOrthographic"
+                        "tooltip": "When signaled, this will invoke Set Orthographic"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOrthographic is invoked"
+                        "tooltip": "Signaled after Set Orthographic is invoked"
                     },
                     "details": {
-                        "name": "SetOrthographic"
+                        "name": "Set Orthographic"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Orthographic"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOrthographicHalfWidth",
+                    "base": "SetOrthographicHalfWidth",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOrthographicHalfWidth"
+                        "tooltip": "When signaled, this will invoke Set Orthographic Half Width"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOrthographicHalfWidth is invoked"
+                        "tooltip": "Signaled after Set Orthographic Half Width is invoked"
                     },
                     "details": {
-                        "name": "SetOrthographicHalfWidth"
+                        "name": "Set Orthographic Half Width"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Half Width"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNearClipDistance",
+                    "base": "GetNearClipDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Near Clip Distance"
@@ -305,20 +298,19 @@
                         "tooltip": "Signaled after Get Near Clip Distance is invoked"
                     },
                     "details": {
-                        "name": "Get Near Clip Distance",
-                        "tooltip": "Returns the near clip distance of the camera"
+                        "name": "Get Near Clip Distance"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Near Clip Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFarClipDistance",
+                    "base": "SetFarClipDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Far Clip Distance"
@@ -328,37 +320,35 @@
                         "tooltip": "Signaled after Set Far Clip Distance is invoked"
                     },
                     "details": {
-                        "name": "Set Far Clip Distance",
-                        "tooltip": "Sets the far clip distance of the camera"
+                        "name": "Set Far Clip Distance"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Distance",
-                                "tooltip": "The far clip distance of the camera"
+                                "name": "Far Clip Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsActiveView",
+                    "base": "IsActiveView",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsActiveView"
+                        "tooltip": "When signaled, this will invoke Is Active View"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsActiveView is invoked"
+                        "tooltip": "Signaled after Is Active View is invoked"
                     },
                     "details": {
-                        "name": "IsActiveView"
+                        "name": "Is Active View"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Active View"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names
index 7aa3557801..c8f9638b52 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names
@@ -1,31 +1,31 @@
 {
     "entries": [
         {
-            "key": "CameraSystemRequestBus",
+            "base": "CameraSystemRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "CameraSystemRequestBus"
+                "name": "Camera"
             },
             "methods": [
                 {
-                    "key": "GetActiveCamera",
+                    "base": "GetActiveCamera",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetActiveCamera"
+                        "tooltip": "When signaled, this will invoke Get Active Camera"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetActiveCamera is invoked"
+                        "tooltip": "Signaled after Get Active Camera is invoked"
                     },
                     "details": {
-                        "name": "GetActiveCamera"
+                        "name": "Get Active Camera"
                     },
                     "results": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names
index ac6a688b01..e6d8a64a2e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "CapsuleShapeComponentRequestsBus",
+            "base": "CapsuleShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "CapsuleShapeComponentRequestsBus",
+                "name": "Capsule Shape Component",
                 "category": "Shape"
             },
             "methods": [
                 {
-                    "key": "GetCapsuleConfiguration",
+                    "base": "GetCapsuleConfiguration",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Configuration"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetHeight",
+                    "base": "SetHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Height"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetRadius",
+                    "base": "SetRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Radius"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names
index b5b4dbfedd..e0226d0a6f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names
@@ -1,63 +1,60 @@
 {
     "entries": [
         {
-            "key": "CharacterControllerRequestBus",
+            "base": "CharacterControllerRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "CharacterControllerRequestBus",
+                "name": "Character",
                 "category": "PhysX"
             },
             "methods": [
                 {
-                    "key": "SetSlopeLimitDegrees",
+                    "base": "SetSlopeLimitDegrees",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Slope Limit (degrees)"
+                        "tooltip": "When signaled, this will invoke Set Slope Limit Degrees"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Slope Limit (degrees) is invoked"
+                        "tooltip": "Signaled after Set Slope Limit Degrees is invoked"
                     },
                     "details": {
-                        "name": "Set Slope Limit (degrees)",
-                        "tooltip": "Sets the maximum slope (in degrees) which the controller can ascend"
+                        "name": "Set Slope Limit Degrees"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Slope Limit (degrees)",
-                                "tooltip": "The new value for the maximum slope (in degrees) which the controller can ascend"
+                                "name": "Slope Limit"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSlopeLimitDegrees",
+                    "base": "GetSlopeLimitDegrees",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Slope Limit (degrees)"
+                        "tooltip": "When signaled, this will invoke Get Slope Limit Degrees"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Slope Limit (degrees) is invoked"
+                        "tooltip": "Signaled after Get Slope Limit Degrees is invoked"
                     },
                     "details": {
-                        "name": "Get Slope Limit (degrees)",
-                        "tooltip": "Gets the maximum slope (in degrees) which the controller can ascend"
+                        "name": "Get Slope Limit Degrees"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Slope Limit"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetMaximumSpeed",
+                    "base": "SetMaximumSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Maximum Speed"
@@ -67,21 +64,19 @@
                         "tooltip": "Signaled after Set Maximum Speed is invoked"
                     },
                     "details": {
-                        "name": "Set Maximum Speed",
-                        "tooltip": "Sets the maximum speed, above which the accumulated requested velocity will be clamped"
+                        "name": "Set Maximum Speed"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Maximum Speed",
-                                "tooltip": "The new value for the maximum speed, above which the accumulated requested velocity will be clamped"
+                                "name": "Maximum Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetUpDirection",
+                    "base": "GetUpDirection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Up Direction"
@@ -91,20 +86,19 @@
                         "tooltip": "Signaled after Get Up Direction is invoked"
                     },
                     "details": {
-                        "name": "Get Up Direction",
-                        "tooltip": "Gets the direction considered to be upwards when simulating the character"
+                        "name": "Get Up Direction"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Up"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AddVelocity",
+                    "base": "AddVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Add Velocity"
@@ -114,21 +108,19 @@
                         "tooltip": "Signaled after Add Velocity is invoked"
                     },
                     "details": {
-                        "name": "Add Velocity",
-                        "tooltip": "Requests a velocity for the controller, to be accumulated with other requests this tick and cumulatively applied before the next physics update"
+                        "name": "Add Velocity"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Velocity",
-                                "tooltip": "The desired velocity"
+                                "name": "Velocity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBasePosition",
+                    "base": "SetBasePosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Base Position"
@@ -138,21 +130,19 @@
                         "tooltip": "Signaled after Set Base Position is invoked"
                     },
                     "details": {
-                        "name": "Set Base Position",
-                        "tooltip": "Directly moves (teleports) the controller to a new base position"
+                        "name": "Set Base Position"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Base Position",
-                                "tooltip": "The new value for the controller's base position"
+                                "name": "Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCenterPosition",
+                    "base": "GetCenterPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Center Position"
@@ -162,20 +152,19 @@
                         "tooltip": "Signaled after Get Center Position is invoked"
                     },
                     "details": {
-                        "name": "Get Center Position",
-                        "tooltip": "Gets the position of the controller's center"
+                        "name": "Get Center Position"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetStepHeight",
+                    "base": "GetStepHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Step Height"
@@ -185,20 +174,19 @@
                         "tooltip": "Signaled after Get Step Height is invoked"
                     },
                     "details": {
-                        "name": "Get Step Height",
-                        "tooltip": "Gets the maximum height of steps which the controller can ascend"
+                        "name": "Get Step Height"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Step Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBasePosition",
+                    "base": "GetBasePosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Base Position"
@@ -208,20 +196,19 @@
                         "tooltip": "Signaled after Get Base Position is invoked"
                     },
                     "details": {
-                        "name": "Get Base Position",
-                        "tooltip": "Gets the position of the controller's base"
+                        "name": "Get Base Position"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetStepHeight",
+                    "base": "SetStepHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Step Height"
@@ -231,21 +218,19 @@
                         "tooltip": "Signaled after Set Step Height is invoked"
                     },
                     "details": {
-                        "name": "Set Step Height",
-                        "tooltip": "Sets the maximum height of steps which the controller can ascend"
+                        "name": "Set Step Height"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Step Height",
-                                "tooltip": "The new value for the maximum height of steps which the controller can ascend"
+                                "name": "Step Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMaximumSpeed",
+                    "base": "GetMaximumSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Maximum Speed"
@@ -255,20 +240,19 @@
                         "tooltip": "Signaled after Get Maximum Speed is invoked"
                     },
                     "details": {
-                        "name": "Get Maximum Speed",
-                        "tooltip": "Gets the maximum speed, above which the accumulated requested velocity will be clamped"
+                        "name": "Get Maximum Speed"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Maximum Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetVelocity",
+                    "base": "GetVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Velocity"
@@ -278,14 +262,13 @@
                         "tooltip": "Signaled after Get Velocity is invoked"
                     },
                     "details": {
-                        "name": "Get Velocity",
-                        "tooltip": "Gets the character's observed velocity from the last simulation update"
+                        "name": "Get Velocity"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Velocity"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names
new file mode 100644
index 0000000000..f3b01b7898
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names
@@ -0,0 +1,124 @@
+{
+    "entries": [
+        {
+            "base": "CharacterGameplayRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Character"
+            },
+            "methods": [
+                {
+                    "base": "GetFallingVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Falling Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Falling Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Get Falling Velocity"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Falling Velocity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetGravityMultiplier",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Gravity Multiplier"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Gravity Multiplier is invoked"
+                    },
+                    "details": {
+                        "name": "Get Gravity Multiplier"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Gravity Multiplier"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetGravityMultiplier",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Gravity Multiplier"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Gravity Multiplier is invoked"
+                    },
+                    "details": {
+                        "name": "Set Gravity Multiplier"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Gravity Multiplier"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsOnGround",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is On Ground"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is On Ground is invoked"
+                    },
+                    "details": {
+                        "name": "Is On Ground"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is On Ground"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetFallingVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Falling Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Falling Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Set Falling Velocity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Falling Velocity"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names
index ea74fb1d02..b4f903b1d2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names
@@ -1,16 +1,15 @@
 {
     "entries": [
         {
-            "key": "CollisionFilteringBus",
+            "base": "CollisionFilteringBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "CollisionFilteringBus",
-                "category": "PhysX"
+                "name": "Collision Filtering"
             },
             "methods": [
                 {
-                    "key": "ToggleCollisionLayer",
+                    "base": "ToggleCollisionLayer",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Toggle Collision Layer"
@@ -20,35 +19,31 @@
                         "tooltip": "Signaled after Toggle Collision Layer is invoked"
                     },
                     "details": {
-                        "name": "Toggle Collision Layer",
-                        "tooltip": "Toggles a collision layer on or off on a collision group."
+                        "name": "Toggle Collision Layer"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "Layer Name",
-                                "tooltip": "The name of the layer to toggle. The layer name must exist in the PhysX Configuration otherwise this node will have no effect."
+                                "name": "Layer Name"
                             }
                         },
                         {
                             "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
                             "details": {
-                                "name": "Collider Tag",
-                                "tooltip": "Use this to target a specific collider on the entity. If left blank, all colliders will be updated."
+                                "name": "Collider Tag"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "Enabled",
-                                "tooltip": "Toggles the layer on or off"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCollisionGroup",
+                    "base": "SetCollisionGroup",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Collision Group"
@@ -58,28 +53,25 @@
                         "tooltip": "Signaled after Set Collision Group is invoked"
                     },
                     "details": {
-                        "name": "Set Collision Group",
-                        "tooltip": "Sets the collision group on a collider"
+                        "name": "Set Collision Group"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "Group Name",
-                                "tooltip": "The name of the group to set. The group name must exist in the PhysX Configuration otherwise this node will have no effect."
+                                "name": "Group Name"
                             }
                         },
                         {
                             "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
                             "details": {
-                                "name": "Collider Tag",
-                                "tooltip": "Use this to target a specific collider on the entity. If left blank, all colliders will be updated."
+                                "name": "Collider Tag"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCollisionGroupName",
+                    "base": "GetCollisionGroupName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Collision Group Name"
@@ -89,20 +81,19 @@
                         "tooltip": "Signaled after Get Collision Group Name is invoked"
                     },
                     "details": {
-                        "name": "Get Collision Group Name",
-                        "tooltip": "Gets the collision group on an entity. Note: multiple colliders on an entity are not supported."
+                        "name": "Get Collision Group Name"
                     },
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCollisionLayerName",
+                    "base": "GetCollisionLayerName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Collision Layer Name"
@@ -112,20 +103,19 @@
                         "tooltip": "Signaled after Get Collision Layer Name is invoked"
                     },
                     "details": {
-                        "name": "Get Collision Layer Name",
-                        "tooltip": "Gets the collision layer on an entity. Note: multiple colliders on an entity are not supported."
+                        "name": "Get Collision Layer Name"
                     },
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCollisionLayer",
+                    "base": "SetCollisionLayer",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Collision Layer"
@@ -135,22 +125,19 @@
                         "tooltip": "Signaled after Set Collision Layer is invoked"
                     },
                     "details": {
-                        "name": "Set Collision Layer",
-                        "tooltip": "Sets the collision layer on a collider"
+                        "name": "Set Collision Layer"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "Layer Name",
-                                "tooltip": "The name of the layer to set. The layer name must exist in the PhysX Configuration otherwise this node will have no effect."
+                                "name": "Layer Name"
                             }
                         },
                         {
                             "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
                             "details": {
-                                "name": "Collider Tag",
-                                "tooltip": "Use this to target a specific collider on the entity. If left blank, all colliders will be updated."
+                                "name": "Collider Tag"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names
index 5b5b2c9bb1..21682964e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names
@@ -1,31 +1,32 @@
 {
     "entries": [
         {
-            "key": "ComponentApplicationBus",
+            "base": "ComponentApplicationBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ComponentApplicationBus"
+                "name": "Application",
+                "category": "Components"
             },
             "methods": [
                 {
-                    "key": "GetEntityName",
+                    "base": "GetEntityName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEntityName"
+                        "tooltip": "When signaled, this will invoke Get Entity Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEntityName is invoked"
+                        "tooltip": "Signaled after Get Entity Name is invoked"
                     },
                     "details": {
-                        "name": "GetEntityName"
+                        "name": "Get Entity Name"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -40,30 +41,30 @@
                     ]
                 },
                 {
-                    "key": "SetEntityName",
+                    "base": "SetEntityName",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEntityName"
+                        "tooltip": "When signaled, this will invoke Set Entity Name"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEntityName is invoked"
+                        "tooltip": "Signaled after Set Entity Name is invoked"
                     },
                     "details": {
-                        "name": "SetEntityName"
+                        "name": "Set Entity Name"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                             "details": {
-                                "name": ""
+                                "name": "Name"
                             }
                         }
                     ],
@@ -71,7 +72,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Succesful"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names
index c2cbe27fbb..e8297fc8d0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ComponentModeSystemRequestBus",
+            "base": "ComponentModeSystemRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ComponentModeSystemRequestBus"
+                "name": "Component Mode System"
             },
             "methods": [
                 {
-                    "key": "EnterComponentMode",
+                    "base": "EnterComponentMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EnterComponentMode"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "EndComponentMode",
+                    "base": "EndComponentMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EndComponentMode"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names
index d956496c3e..2f2c1a69f7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "ConsoleRequestBus",
+            "base": "ConsoleRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ConsoleRequestBus",
+                "name": "Console",
                 "category": "Utilities"
             },
             "methods": [
                 {
-                    "key": "ExecuteConsoleCommand",
+                    "base": "ExecuteConsoleCommand",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Execute Console Command"
@@ -26,7 +26,7 @@
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Command"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names
index 6d445cc293..fb39e2431c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ConstantGradientRequestBus",
+            "base": "ConstantGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ConstantGradientRequestBus"
+                "name": "Constant Gradient"
             },
             "methods": [
                 {
-                    "key": "GetConstantValue",
+                    "base": "GetConstantValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetConstantValue"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetConstantValue",
+                    "base": "SetConstantValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetConstantValue"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names
index a4bd93758f..f576047ecb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "CylinderShapeComponentRequestsBus",
+            "base": "CylinderShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "CylinderShapeComponentRequestsBus",
+                "name": "Cylinder Shape Component",
                 "category": "Shape"
             },
             "methods": [
                 {
-                    "key": "GetCylinderConfiguration",
+                    "base": "GetCylinderConfiguration",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Configuration"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetHeight",
+                    "base": "SetHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Height"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetRadius",
+                    "base": "SetRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Radius"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names
new file mode 100644
index 0000000000..78c04e0aea
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names
@@ -0,0 +1,606 @@
+{
+    "entries": [
+        {
+            "base": "DebugDrawRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Debug Draw"
+            },
+            "methods": [
+                {
+                    "base": "DrawTextOnEntity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Text On Entity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Text On Entity is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Text On Entity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Text"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawRayEntityToDirection",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Ray Entity To Direction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Ray Entity To Direction is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Ray Entity To Direction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawObb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Oriented Bounding Box"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Oriented Bounding Box is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Oriented Bounding Box"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{004ABD25-CF14-4EB3-BD41-022C247C07FA}",
+                            "details": {
+                                "name": "OBB"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawObbOnEntity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Oriented Bounding Box on Entity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Oriented Bounding Box on Entity is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Oriented Bounding Box on Entity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{004ABD25-CF14-4EB3-BD41-022C247C07FA}",
+                            "details": {
+                                "name": "OBB"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawRayLocationToDirection",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Ray Location To Direction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Ray Location To Direction is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Ray Location To Direction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawSphereOnEntity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Sphere On Entity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Sphere On Entity is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Sphere On Entity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawAabbOnEntity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Axis Aligned Bounding Box On Entity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Axis Aligned Bounding Box On Entity is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Axis Aligned Bounding Box On Entity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawLineEntityToEntity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Line Entity To Entity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Line Entity To Entity is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Line Entity To Entity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "From Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "To Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawTextAtLocation",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Text At Location"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Text At Location is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Text At Location"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Text"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawTextOnScreen",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Text On Screen"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Text On Screen is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Text On Screen"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "Text"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawAabb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Axis Aligned Bounding Box"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Axis Aligned Bounding Box is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Axis Aligned Bounding Box"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawLineLocationToLocation",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Line Location To Location"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Line Location To Location is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Line Location To Location"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawLineEntityToLocation",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Line Entity To Location"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Line Entity To Location is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Line Entity To Location"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawRayEntityToEntity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Ray Entity To Entity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Ray Entity To Entity is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Ray Entity To Entity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "From Entity Id",
+                                "tooltip": "Entity to draw the ray from"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "To Entity Id",
+                                "tooltip": "Entity to draw the ray to"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DrawSphereAtLocation",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Draw Sphere At Location"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Draw Sphere At Location is invoked"
+                    },
+                    "details": {
+                        "name": "Draw Sphere At Location"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        },
+                        {
+                            "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+                            "details": {
+                                "name": "Color"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Duration"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names
index 2d69295887..7be614892d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names
@@ -1,185 +1,186 @@
 {
     "entries": [
         {
-            "key": "DecalRequestBus",
+            "base": "DecalRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "DecalRequestBus"
+                "name": "Decal",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetMaterial",
+                    "base": "GetMaterial",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaterial"
+                        "tooltip": "When signaled, this will invoke Get Material"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaterial is invoked"
+                        "tooltip": "Signaled after Get Material is invoked"
                     },
                     "details": {
-                        "name": "GetMaterial"
+                        "name": "Get Material"
                     },
                     "results": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSortKey",
+                    "base": "GetSortKey",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSortKey"
+                        "tooltip": "When signaled, this will invoke Get Sort Key"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSortKey is invoked"
+                        "tooltip": "Signaled after Get Sort Key is invoked"
                     },
                     "details": {
-                        "name": "GetSortKey"
+                        "name": "Get Sort Key"
                     },
                     "results": [
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "unsigned char"
+                                "name": "Sort Key"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetSortKey",
+                    "base": "SetSortKey",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSortKey"
+                        "tooltip": "When signaled, this will invoke Set Sort Key"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSortKey is invoked"
+                        "tooltip": "Signaled after Set Sort Key is invoked"
                     },
                     "details": {
-                        "name": "SetSortKey"
+                        "name": "Set Sort Key"
                     },
                     "params": [
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "unsigned char"
+                                "name": "Sort Key"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetMaterial",
+                    "base": "SetMaterial",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetMaterial"
+                        "tooltip": "When signaled, this will invoke Set Material"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetMaterial is invoked"
+                        "tooltip": "Signaled after Set Material is invoked"
                     },
                     "details": {
-                        "name": "SetMaterial"
+                        "name": "Set Material"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAttenuationAngle",
+                    "base": "SetAttenuationAngle",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAttenuationAngle"
+                        "tooltip": "When signaled, this will invoke Set Attenuation Angle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAttenuationAngle is invoked"
+                        "tooltip": "Signaled after Set Attenuation Angle is invoked"
                     },
                     "details": {
-                        "name": "SetAttenuationAngle"
+                        "name": "Set Attenuation Angle"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Attenuation Angle"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOpacity",
+                    "base": "GetOpacity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOpacity"
+                        "tooltip": "When signaled, this will invoke Get Opacity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOpacity is invoked"
+                        "tooltip": "Signaled after Get Opacity is invoked"
                     },
                     "details": {
-                        "name": "GetOpacity"
+                        "name": "Get Opacity"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Opacity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOpacity",
+                    "base": "SetOpacity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOpacity"
+                        "tooltip": "When signaled, this will invoke Set Opacity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOpacity is invoked"
+                        "tooltip": "Signaled after Set Opacity is invoked"
                     },
                     "details": {
-                        "name": "SetOpacity"
+                        "name": "Set Opacity"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Opacity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAttenuationAngle",
+                    "base": "GetAttenuationAngle",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAttenuationAngle"
+                        "tooltip": "When signaled, this will invoke Get Attenuation Angle"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAttenuationAngle is invoked"
+                        "tooltip": "Signaled after Get Attenuation Angle is invoked"
                     },
                     "details": {
-                        "name": "GetAttenuationAngle"
+                        "name": "Get Attenuation Angle"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Attenuation Angle"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names
index ff796ed9d8..a3ba8eda5d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names
@@ -1,493 +1,494 @@
 {
     "entries": [
         {
-            "key": "DeferredFogRequestsBus",
+            "base": "DeferredFogRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "DeferredFogRequestsBus"
+                "name": "Deferred Fog",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetNoiseTexture",
+                    "base": "SetNoiseTexture",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNoiseTexture"
+                        "tooltip": "When signaled, this will invoke Set Noise Texture"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNoiseTexture is invoked"
+                        "tooltip": "Signaled after Set Noise Texture is invoked"
                     },
                     "details": {
-                        "name": "SetNoiseTexture"
+                        "name": "Set Noise Texture"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Path"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNoiseTexCoordScale",
+                    "base": "SetNoiseTexCoordScale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNoiseTexCoordScale"
+                        "tooltip": "When signaled, this will invoke Set Noise Tex Coord Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNoiseTexCoordScale is invoked"
+                        "tooltip": "Signaled after Set Noise Tex Coord Scale is invoked"
                     },
                     "details": {
-                        "name": "SetNoiseTexCoordScale"
+                        "name": "Set Noise Tex Coord Scale"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNoiseTexCoord2Scale",
+                    "base": "SetNoiseTexCoord2Scale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNoiseTexCoord2Scale"
+                        "tooltip": "When signaled, this will invoke Set Noise Tex Coord 2 Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNoiseTexCoord2Scale is invoked"
+                        "tooltip": "Signaled after Set Noise Tex Coord 2 Scale is invoked"
                     },
                     "details": {
-                        "name": "SetNoiseTexCoord2Scale"
+                        "name": "Set Noise Tex Coord 2 Scale"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord 2 Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFogMaxHeight",
+                    "base": "GetFogMaxHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFogMaxHeight"
+                        "tooltip": "When signaled, this will invoke Get Fog Max Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFogMaxHeight is invoked"
+                        "tooltip": "Signaled after Get Fog Max Height is invoked"
                     },
                     "details": {
-                        "name": "GetFogMaxHeight"
+                        "name": "Get Fog Max Height"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Max Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNoiseTexCoordScale",
+                    "base": "GetNoiseTexCoordScale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNoiseTexCoordScale"
+                        "tooltip": "When signaled, this will invoke Get Noise Tex Coord Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNoiseTexCoordScale is invoked"
+                        "tooltip": "Signaled after Get Noise Tex Coord Scale is invoked"
                     },
                     "details": {
-                        "name": "GetNoiseTexCoordScale"
+                        "name": "Get Noise Tex Coord Scale"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNoiseTexCoordVelocity",
+                    "base": "GetNoiseTexCoordVelocity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNoiseTexCoordVelocity"
+                        "tooltip": "When signaled, this will invoke Get Noise Tex Coord Velocity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNoiseTexCoordVelocity is invoked"
+                        "tooltip": "Signaled after Get Noise Tex Coord Velocity is invoked"
                     },
                     "details": {
-                        "name": "GetNoiseTexCoordVelocity"
+                        "name": "Get Noise Tex Coord Velocity"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord Velocity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFogEndDistance",
+                    "base": "SetFogEndDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFogEndDistance"
+                        "tooltip": "When signaled, this will invoke Set Fog End Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFogEndDistance is invoked"
+                        "tooltip": "Signaled after Set Fog End Distance is invoked"
                     },
                     "details": {
-                        "name": "SetFogEndDistance"
+                        "name": "Set Fog End Distance"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fod End Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFogEndDistance",
+                    "base": "GetFogEndDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFogEndDistance"
+                        "tooltip": "When signaled, this will invoke Get Fog End Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFogEndDistance is invoked"
+                        "tooltip": "Signaled after Get Fog End Distance is invoked"
                     },
                     "details": {
-                        "name": "GetFogEndDistance"
+                        "name": "Get Fog End Distance"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fog End Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNoiseTexCoord2Scale",
+                    "base": "GetNoiseTexCoord2Scale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNoiseTexCoord2Scale"
+                        "tooltip": "When signaled, this will invoke Get Noise Tex Coord 2 Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNoiseTexCoord2Scale is invoked"
+                        "tooltip": "Signaled after Get Noise Tex Coord 2 Scale is invoked"
                     },
                     "details": {
-                        "name": "GetNoiseTexCoord2Scale"
+                        "name": "Get Noise Tex Coord 2 Scale"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord 2 Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNoiseTexCoord2Velocity",
+                    "base": "SetNoiseTexCoord2Velocity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNoiseTexCoord2Velocity"
+                        "tooltip": "When signaled, this will invoke Set Noise Tex Coord 2 Velocity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNoiseTexCoord2Velocity is invoked"
+                        "tooltip": "Signaled after Set Noise Tex Coord 2 Velocity is invoked"
                     },
                     "details": {
-                        "name": "SetNoiseTexCoord2Velocity"
+                        "name": "Set Noise Tex Coord 2 Velocity"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord 2 Velocity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFogStartDistance",
+                    "base": "GetFogStartDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFogStartDistance"
+                        "tooltip": "When signaled, this will invoke Get Fog Start Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFogStartDistance is invoked"
+                        "tooltip": "Signaled after Get Fog Start Distance is invoked"
                     },
                     "details": {
-                        "name": "GetFogStartDistance"
+                        "name": "Get Fog Start Distance"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fog Start Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFogMaxHeight",
+                    "base": "SetFogMaxHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFogMaxHeight"
+                        "tooltip": "When signaled, this will invoke Set Fog Max Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFogMaxHeight is invoked"
+                        "tooltip": "Signaled after Set Fog Max Height is invoked"
                     },
                     "details": {
-                        "name": "SetFogMaxHeight"
+                        "name": "Set Fog Max Height"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fog Max Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetNoiseTexCoordVelocity",
+                    "base": "SetNoiseTexCoordVelocity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetNoiseTexCoordVelocity"
+                        "tooltip": "When signaled, this will invoke Set Noise Tex Coord Velocity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetNoiseTexCoordVelocity is invoked"
+                        "tooltip": "Signaled after Set Noise Tex Coord Velocity is invoked"
                     },
                     "details": {
-                        "name": "SetNoiseTexCoordVelocity"
+                        "name": "Set Noise Tex Coord Velocity"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord Velocity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNoiseTexCoord2Velocity",
+                    "base": "GetNoiseTexCoord2Velocity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNoiseTexCoord2Velocity"
+                        "tooltip": "When signaled, this will invoke Get Noise Tex Coord 2 Velocity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNoiseTexCoord2Velocity is invoked"
+                        "tooltip": "Signaled after Get Noise Tex Coord 2 Velocity is invoked"
                     },
                     "details": {
-                        "name": "GetNoiseTexCoord2Velocity"
+                        "name": "Get Noise Tex Coord 2 Velocity"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Tex Coord 2 Velocity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFogStartDistance",
+                    "base": "SetFogStartDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFogStartDistance"
+                        "tooltip": "When signaled, this will invoke Set Fog Start Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFogStartDistance is invoked"
+                        "tooltip": "Signaled after Set Fog Start Distance is invoked"
                     },
                     "details": {
-                        "name": "SetFogStartDistance"
+                        "name": "Set Fog Start Distance"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fog Start Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFogMinHeight",
+                    "base": "GetFogMinHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFogMinHeight"
+                        "tooltip": "When signaled, this will invoke Get Fog Min Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFogMinHeight is invoked"
+                        "tooltip": "Signaled after Get Fog Min Height is invoked"
                     },
                     "details": {
-                        "name": "GetFogMinHeight"
+                        "name": "Get Fog Min Height"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fog Min Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFogColor",
+                    "base": "GetFogColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFogColor"
+                        "tooltip": "When signaled, this will invoke Get Fog Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFogColor is invoked"
+                        "tooltip": "Signaled after Get Fog Color is invoked"
                     },
                     "details": {
-                        "name": "GetFogColor"
+                        "name": "Get Fog Color"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Fog Color"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOctavesBlendFactor",
+                    "base": "SetOctavesBlendFactor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOctavesBlendFactor"
+                        "tooltip": "When signaled, this will invoke Set Octaves Blend Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOctavesBlendFactor is invoked"
+                        "tooltip": "Signaled after Set Octaves Blend Factor is invoked"
                     },
                     "details": {
-                        "name": "SetOctavesBlendFactor"
+                        "name": "Set Octaves Blend Factor"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Octaves Blend Factor"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetOctavesBlendFactor",
+                    "base": "GetOctavesBlendFactor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOctavesBlendFactor"
+                        "tooltip": "When signaled, this will invoke Get Octaves Blend Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOctavesBlendFactor is invoked"
+                        "tooltip": "Signaled after Get Octaves Blend Factor is invoked"
                     },
                     "details": {
-                        "name": "GetOctavesBlendFactor"
+                        "name": "Get Octaves Blend Factor"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Octaves Blend Factor"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFogColor",
+                    "base": "SetFogColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFogColor"
+                        "tooltip": "When signaled, this will invoke Set Fog Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFogColor is invoked"
+                        "tooltip": "Signaled after Set Fog Color is invoked"
                     },
                     "details": {
-                        "name": "SetFogColor"
+                        "name": "Set Fog Color"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Fog Color"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFogMinHeight",
+                    "base": "SetFogMinHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFogMinHeight"
+                        "tooltip": "When signaled, this will invoke Set Fog Min Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFogMinHeight is invoked"
+                        "tooltip": "Signaled after Set Fog Min Height is invoked"
                     },
                     "details": {
-                        "name": "SetFogMinHeight"
+                        "name": "Set Fog Min Height"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Fog Min Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetNoiseTexture",
+                    "base": "GetNoiseTexture",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNoiseTexture"
+                        "tooltip": "When signaled, this will invoke Get Noise Texture"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNoiseTexture is invoked"
+                        "tooltip": "Signaled after Get Noise Texture is invoked"
                     },
                     "details": {
-                        "name": "GetNoiseTexture"
+                        "name": "Get Noise Texture"
                     },
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Path"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names
index 1fbc15e794..781ef189cc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names
@@ -1,532 +1,533 @@
 {
     "entries": [
         {
-            "key": "DepthOfFieldRequestBus",
+            "base": "DepthOfFieldRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "DepthOfFieldRequestBus"
+                "name": "Depth Of Field",
+                "category": "Post Process"
             },
             "methods": [
                 {
-                    "key": "GetEnableDebugColoringOverride",
+                    "base": "GetEnableDebugColoringOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableDebugColoringOverride"
+                        "tooltip": "When signaled, this will invoke Get Enable Debug Coloring Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableDebugColoringOverride is invoked"
+                        "tooltip": "Signaled after Get Enable Debug Coloring Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnableDebugColoringOverride"
+                        "name": "Get Enable Debug Coloring Override"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusSpeedOverride",
+                    "base": "GetAutoFocusSpeedOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusSpeedOverride"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Speed Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusSpeedOverride is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Speed Override is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusSpeedOverride"
+                        "name": "Get Auto Focus Speed Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusSensitivity",
+                    "base": "SetAutoFocusSensitivity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusSensitivity"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Sensitivity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusSensitivity is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Sensitivity is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusSensitivity"
+                        "name": "Set Auto Focus Sensitivity"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Sensitivity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusDelayOverride",
+                    "base": "SetAutoFocusDelayOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusDelayOverride"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Delay Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusDelayOverride is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Delay Override is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusDelayOverride"
+                        "name": "Set Auto Focus Delay Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Delay"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusScreenPosition",
+                    "base": "GetAutoFocusScreenPosition",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusScreenPosition"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Screen Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusScreenPosition is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Screen Position is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusScreenPosition"
+                        "name": "Get Auto Focus Screen Position"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Auto Focus Screen"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnableDebugColoring",
+                    "base": "GetEnableDebugColoring",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableDebugColoring"
+                        "tooltip": "When signaled, this will invoke Get Enable Debug Coloring"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableDebugColoring is invoked"
+                        "tooltip": "Signaled after Get Enable Debug Coloring is invoked"
                     },
                     "details": {
-                        "name": "GetEnableDebugColoring"
+                        "name": "Get Enable Debug Coloring"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFocusDistance",
+                    "base": "SetFocusDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFocusDistance"
+                        "tooltip": "When signaled, this will invoke Set Focus Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFocusDistance is invoked"
+                        "tooltip": "Signaled after Set Focus Distance is invoked"
                     },
                     "details": {
-                        "name": "SetFocusDistance"
+                        "name": "Set Focus Distance"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Focus Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetQualityLevel",
+                    "base": "SetQualityLevel",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetQualityLevel"
+                        "tooltip": "When signaled, this will invoke Set Quality Level"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetQualityLevel is invoked"
+                        "tooltip": "Signaled after Set Quality Level is invoked"
                     },
                     "details": {
-                        "name": "SetQualityLevel"
+                        "name": "Set Quality Level"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Quality Level"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCameraEntityId",
+                    "base": "SetCameraEntityId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCameraEntityId"
+                        "tooltip": "When signaled, this will invoke Set Camera Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCameraEntityId is invoked"
+                        "tooltip": "Signaled after Set Camera Entity Id is invoked"
                     },
                     "details": {
-                        "name": "SetCameraEntityId"
+                        "name": "Set Camera Entity Id"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusDelay",
+                    "base": "SetAutoFocusDelay",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusDelay"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Delay"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusDelay is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Delay is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusDelay"
+                        "name": "Set Auto Focus Delay"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Delay"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusDelay",
+                    "base": "GetAutoFocusDelay",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusDelay"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Delay"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusDelay is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Delay is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusDelay"
+                        "name": "Get Auto Focus Delay"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Delay"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusScreenPosition",
+                    "base": "SetAutoFocusScreenPosition",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusScreenPosition"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Screen Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusScreenPosition is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Screen Position is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusScreenPosition"
+                        "name": "Set Auto Focus Screen Position"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Auto Focus Screen Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFNumber",
+                    "base": "GetFNumber",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFNumber"
+                        "tooltip": "When signaled, this will invoke GetF Number"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFNumber is invoked"
+                        "tooltip": "Signaled after GetF Number is invoked"
                     },
                     "details": {
-                        "name": "GetFNumber"
+                        "name": "Get F Number"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "F Number"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetApertureFOverride",
+                    "base": "SetApertureFOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetApertureFOverride"
+                        "tooltip": "When signaled, this will invoke Set ApertureF Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetApertureFOverride is invoked"
+                        "tooltip": "Signaled after Set ApertureF Override is invoked"
                     },
                     "details": {
-                        "name": "SetApertureFOverride"
+                        "name": "Set Aperture F Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Aperture F"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusScreenPositionOverride",
+                    "base": "SetAutoFocusScreenPositionOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusScreenPositionOverride"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Screen Position Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusScreenPositionOverride is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Screen Position Override is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusScreenPositionOverride"
+                        "name": "Set Auto Focus Screen Position Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Screen Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetQualityLevelOverride",
+                    "base": "GetQualityLevelOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQualityLevelOverride"
+                        "tooltip": "When signaled, this will invoke Get Quality Level Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQualityLevelOverride is invoked"
+                        "tooltip": "Signaled after Get Quality Level Override is invoked"
                     },
                     "details": {
-                        "name": "GetQualityLevelOverride"
+                        "name": "Get Quality Level Override"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Quality Level"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusSpeedOverride",
+                    "base": "SetAutoFocusSpeedOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusSpeedOverride"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Speed Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusSpeedOverride is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Speed Override is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusSpeedOverride"
+                        "name": "Set Auto Focus Speed Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnableAutoFocusOverride",
+                    "base": "GetEnableAutoFocusOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableAutoFocusOverride"
+                        "tooltip": "When signaled, this will invoke Get Enable Auto Focus Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableAutoFocusOverride is invoked"
+                        "tooltip": "Signaled after Get Enable Auto Focus Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnableAutoFocusOverride"
+                        "name": "Get Enable Auto Focus Override"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnableDebugColoring",
+                    "base": "SetEnableDebugColoring",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableDebugColoring"
+                        "tooltip": "When signaled, this will invoke Set Enable Debug Coloring"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableDebugColoring is invoked"
+                        "tooltip": "Signaled after Set Enable Debug Coloring is invoked"
                     },
                     "details": {
-                        "name": "SetEnableDebugColoring"
+                        "name": "Set Enable Debug Coloring"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFocusDistanceOverride",
+                    "base": "SetFocusDistanceOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFocusDistanceOverride"
+                        "tooltip": "When signaled, this will invoke Set Focus Distance Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFocusDistanceOverride is invoked"
+                        "tooltip": "Signaled after Set Focus Distance Override is invoked"
                     },
                     "details": {
-                        "name": "SetFocusDistanceOverride"
+                        "name": "Set Focus Distance Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Focus Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnableAutoFocus",
+                    "base": "GetEnableAutoFocus",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableAutoFocus"
+                        "tooltip": "When signaled, this will invoke Get Enable Auto Focus"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableAutoFocus is invoked"
+                        "tooltip": "Signaled after Get Enable Auto Focus is invoked"
                     },
                     "details": {
-                        "name": "GetEnableAutoFocus"
+                        "name": "Get Enable Auto Focus"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetApertureF",
+                    "base": "SetApertureF",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetApertureF"
+                        "tooltip": "When signaled, this will invoke Set ApertureF"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetApertureF is invoked"
+                        "tooltip": "Signaled after Set ApertureF is invoked"
                     },
                     "details": {
-                        "name": "SetApertureF"
+                        "name": "Set Aperture F"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Aperture F"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCameraEntityIdOverride",
+                    "base": "SetCameraEntityIdOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCameraEntityIdOverride"
+                        "tooltip": "When signaled, this will invoke Set Camera Entity Id Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCameraEntityIdOverride is invoked"
+                        "tooltip": "Signaled after Set Camera Entity Id Override is invoked"
                     },
                     "details": {
-                        "name": "SetCameraEntityIdOverride"
+                        "name": "Set Camera Entity Id Override"
                     },
                     "params": [
                         {
@@ -538,458 +539,458 @@
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabled"
+                        "tooltip": "When signaled, this will invoke Get Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabled is invoked"
+                        "tooltip": "Signaled after Get Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetEnabled"
+                        "name": "Get Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFocusDistance",
+                    "base": "GetFocusDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFocusDistance"
+                        "tooltip": "When signaled, this will invoke Get Focus Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFocusDistance is invoked"
+                        "tooltip": "Signaled after Get Focus Distance is invoked"
                     },
                     "details": {
-                        "name": "GetFocusDistance"
+                        "name": "Get Focus Distance"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Focus Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEnabledOverride",
+                    "base": "GetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Get Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Get Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnabledOverride"
+                        "name": "Get Enabled Override"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCameraEntityId",
+                    "base": "GetCameraEntityId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCameraEntityId"
+                        "tooltip": "When signaled, this will invoke Get Camera Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCameraEntityId is invoked"
+                        "tooltip": "Signaled after Get Camera Entity Id is invoked"
                     },
                     "details": {
-                        "name": "GetCameraEntityId"
+                        "name": "Get Camera Entity Id"
                     },
                     "results": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusScreenPositionOverride",
+                    "base": "GetAutoFocusScreenPositionOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusScreenPositionOverride"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Screen Position Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusScreenPositionOverride is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Screen Position Override is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusScreenPositionOverride"
+                        "name": "Get Auto Focus Screen Position Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Screen Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusSpeed",
+                    "base": "GetAutoFocusSpeed",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusSpeed"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Speed"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusSpeed is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Speed is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusSpeed"
+                        "name": "Get Auto Focus Speed"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnabledOverride",
+                    "base": "SetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Set Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Set Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnabledOverride"
+                        "name": "Set Enabled Override"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusSensitivity",
+                    "base": "GetAutoFocusSensitivity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusSensitivity"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Sensitivity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusSensitivity is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Sensitivity is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusSensitivity"
+                        "name": "Get Auto Focus Sensitivity"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Sensitivity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusDelayOverride",
+                    "base": "GetAutoFocusDelayOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusDelayOverride"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Delay Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusDelayOverride is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Delay Override is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusDelayOverride"
+                        "name": "Get Auto Focus Delay Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Delay"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetApertureF",
+                    "base": "GetApertureF",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetApertureF"
+                        "tooltip": "When signaled, this will invoke Get ApertureF"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetApertureF is invoked"
+                        "tooltip": "Signaled after Get ApertureF is invoked"
                     },
                     "details": {
-                        "name": "GetApertureF"
+                        "name": "Get Aperture F"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Aperture F"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetApertureFOverride",
+                    "base": "GetApertureFOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetApertureFOverride"
+                        "tooltip": "When signaled, this will invoke Get ApertureF Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetApertureFOverride is invoked"
+                        "tooltip": "Signaled after Get ApertureF Override is invoked"
                     },
                     "details": {
-                        "name": "GetApertureFOverride"
+                        "name": "Get Aperture F Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Aperture F"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusSensitivityOverride",
+                    "base": "SetAutoFocusSensitivityOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusSensitivityOverride"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Sensitivity Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusSensitivityOverride is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Sensitivity Override is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusSensitivityOverride"
+                        "name": "Set Auto Focus Sensitivity Override"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Sensitivity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetQualityLevelOverride",
+                    "base": "SetQualityLevelOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetQualityLevelOverride"
+                        "tooltip": "When signaled, this will invoke Set Quality Level Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetQualityLevelOverride is invoked"
+                        "tooltip": "Signaled after Set Quality Level Override is invoked"
                     },
                     "details": {
-                        "name": "SetQualityLevelOverride"
+                        "name": "Set Quality Level Override"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Quality Level"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFocusDistanceOverride",
+                    "base": "GetFocusDistanceOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFocusDistanceOverride"
+                        "tooltip": "When signaled, this will invoke Get Focus Distance Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFocusDistanceOverride is invoked"
+                        "tooltip": "Signaled after Get Focus Distance Override is invoked"
                     },
                     "details": {
-                        "name": "GetFocusDistanceOverride"
+                        "name": "Get Focus Distance Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Focus Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAutoFocusSpeed",
+                    "base": "SetAutoFocusSpeed",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAutoFocusSpeed"
+                        "tooltip": "When signaled, this will invoke Set Auto Focus Speed"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAutoFocusSpeed is invoked"
+                        "tooltip": "Signaled after Set Auto Focus Speed is invoked"
                     },
                     "details": {
-                        "name": "SetAutoFocusSpeed"
+                        "name": "Set Auto Focus Speed"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnableAutoFocusOverride",
+                    "base": "SetEnableAutoFocusOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableAutoFocusOverride"
+                        "tooltip": "When signaled, this will invoke Set Enable Auto Focus Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableAutoFocusOverride is invoked"
+                        "tooltip": "Signaled after Set Enable Auto Focus Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnableAutoFocusOverride"
+                        "name": "Set Enable Auto Focus Override"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetQualityLevel",
+                    "base": "GetQualityLevel",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQualityLevel"
+                        "tooltip": "When signaled, this will invoke Get Quality Level"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQualityLevel is invoked"
+                        "tooltip": "Signaled after Get Quality Level is invoked"
                     },
                     "details": {
-                        "name": "GetQualityLevel"
+                        "name": "Get Quality Level"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Quality Level"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAutoFocusSensitivityOverride",
+                    "base": "GetAutoFocusSensitivityOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAutoFocusSensitivityOverride"
+                        "tooltip": "When signaled, this will invoke Get Auto Focus Sensitivity Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAutoFocusSensitivityOverride is invoked"
+                        "tooltip": "Signaled after Get Auto Focus Sensitivity Override is invoked"
                     },
                     "details": {
-                        "name": "GetAutoFocusSensitivityOverride"
+                        "name": "Get Auto Focus Sensitivity Override"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Auto Focus Sensitivity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetEnableDebugColoringOverride",
+                    "base": "SetEnableDebugColoringOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableDebugColoringOverride"
+                        "tooltip": "When signaled, this will invoke Set Enable Debug Coloring Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableDebugColoringOverride is invoked"
+                        "tooltip": "Signaled after Set Enable Debug Coloring Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnableDebugColoringOverride"
+                        "name": "Set Enable Debug Coloring Override"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFNumber",
+                    "base": "SetFNumber",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFNumber"
+                        "tooltip": "When signaled, this will invoke SetF Number"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFNumber is invoked"
+                        "tooltip": "Signaled after SetF Number is invoked"
                     },
                     "details": {
-                        "name": "SetFNumber"
+                        "name": "Set F Number"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "F Number"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCameraEntityIdOverride",
+                    "base": "GetCameraEntityIdOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCameraEntityIdOverride"
+                        "tooltip": "When signaled, this will invoke Get Camera Entity Id Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCameraEntityIdOverride is invoked"
+                        "tooltip": "Signaled after Get Camera Entity Id Override is invoked"
                     },
                     "details": {
-                        "name": "GetCameraEntityIdOverride"
+                        "name": "Get Camera Entity Id Override"
                     },
                     "results": [
                         {
@@ -1001,23 +1002,23 @@
                     ]
                 },
                 {
-                    "key": "SetEnableAutoFocus",
+                    "base": "SetEnableAutoFocus",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableAutoFocus"
+                        "tooltip": "When signaled, this will invoke Set Enable Auto Focus"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableAutoFocus is invoked"
+                        "tooltip": "Signaled after Set Enable Auto Focus is invoked"
                     },
                     "details": {
-                        "name": "SetEnableAutoFocus"
+                        "name": "Set Enable Auto Focus"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names
index 40b3627894..bed5f6de73 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names
@@ -1,423 +1,446 @@
 {
     "entries": [
         {
-            "key": "DirectionalLightRequestBus",
+            "base": "DirectionalLightRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "DirectionalLightRequestBus"
+                "name": "Directional Light",
+                "category": "Lights"
             },
             "methods": [
                 {
-                    "key": "GetShadowBias",
+                    "base": "GetNormalShadowBias",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowBias"
+                        "tooltip": "When signaled, this will invoke Get Normal Shadow Bias"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowBias is invoked"
+                        "tooltip": "Signaled after Get Normal Shadow Bias is invoked"
                     },
                     "details": {
-                        "name": "GetShadowBias"
+                        "name": "Get Normal Shadow Bias"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Normal Shadow Bias"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAngularDiameter",
+                    "base": "GetShadowBias",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAngularDiameter"
+                        "tooltip": "When signaled, this will invoke Get Shadow Bias"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAngularDiameter is invoked"
+                        "tooltip": "Signaled after Get Shadow Bias is invoked"
                     },
                     "details": {
-                        "name": "SetAngularDiameter"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetShadowFarClipDistance",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowFarClipDistance"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetShadowFarClipDistance is invoked"
-                    },
-                    "details": {
-                        "name": "GetShadowFarClipDistance"
+                        "name": "Get Shadow Bias"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Shadow Bias"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowBias",
+                    "base": "SetAngularDiameter",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowBias"
+                        "tooltip": "When signaled, this will invoke Set Angular Diameter"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowBias is invoked"
+                        "tooltip": "Signaled after Set Angular Diameter is invoked"
                     },
                     "details": {
-                        "name": "SetShadowBias"
+                        "name": "Set Angular Diameter"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angular Diameter"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetIntensity",
+                    "base": "GetShadowFarClipDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetIntensity"
+                        "tooltip": "When signaled, this will invoke Get Shadow Far Clip Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetIntensity is invoked"
+                        "tooltip": "Signaled after Get Shadow Far Clip Distance is invoked"
                     },
                     "details": {
-                        "name": "SetIntensity"
+                        "name": "Get Shadow Far Clip Distance"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Shadow Far Clip Distance"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetShadowBias",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Shadow Bias"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Shadow Bias is invoked"
+                    },
+                    "details": {
+                        "name": "Set Shadow Bias"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Shadow Bias"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetSplitRatio",
+                    "base": "SetIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSplitRatio"
+                        "tooltip": "When signaled, this will invoke Set Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSplitRatio is invoked"
+                        "tooltip": "Signaled after Set Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetSplitRatio"
+                        "name": "Set Intensity"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Intensity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetFilteringSampleCount",
+                    "base": "SetSplitRatio",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFilteringSampleCount"
+                        "tooltip": "When signaled, this will invoke Set Split Ratio"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetFilteringSampleCount is invoked"
+                        "tooltip": "Signaled after Set Split Ratio is invoked"
                     },
                     "details": {
-                        "name": "GetFilteringSampleCount"
+                        "name": "Set Split Ratio"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Split Ratio"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetFilteringSampleCount",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Filtering Sample Count"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Filtering Sample Count is invoked"
+                    },
+                    "details": {
+                        "name": "Get Filtering Sample Count"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Filtering Sample Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetShadowFilterMethod",
+                    "base": "GetShadowFilterMethod",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowFilterMethod"
+                        "tooltip": "When signaled, this will invoke Get Shadow Filter Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowFilterMethod is invoked"
+                        "tooltip": "Signaled after Get Shadow Filter Method is invoked"
                     },
                     "details": {
-                        "name": "GetShadowFilterMethod"
+                        "name": "Get Shadow Filter Method"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Shadow Filter Method"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCameraEntityId",
+                    "base": "GetCameraEntityId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCameraEntityId"
+                        "tooltip": "When signaled, this will invoke Get Camera Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCameraEntityId is invoked"
+                        "tooltip": "Signaled after Get Camera Entity Id is invoked"
                     },
                     "details": {
-                        "name": "GetCameraEntityId"
+                        "name": "Get Camera Entity Id"
                     },
                     "results": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Camera Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetDebugColoringEnabled",
+                    "base": "SetDebugColoringEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetDebugColoringEnabled"
+                        "tooltip": "When signaled, this will invoke Set Debug Coloring Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetDebugColoringEnabled is invoked"
+                        "tooltip": "Signaled after Set Debug Coloring Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetDebugColoringEnabled"
+                        "name": "Set Debug Coloring Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetDebugColoringEnabled",
+                    "base": "GetDebugColoringEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDebugColoringEnabled"
+                        "tooltip": "When signaled, this will invoke Get Debug Coloring Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDebugColoringEnabled is invoked"
+                        "tooltip": "Signaled after Get Debug Coloring Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetDebugColoringEnabled"
+                        "name": "Get Debug Coloring Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetViewFrustumCorrectionEnabled",
+                    "base": "GetViewFrustumCorrectionEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetViewFrustumCorrectionEnabled"
+                        "tooltip": "When signaled, this will invoke Get View Frustum Correction Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetViewFrustumCorrectionEnabled is invoked"
+                        "tooltip": "Signaled after Get View Frustum Correction Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetViewFrustumCorrectionEnabled"
+                        "name": "Get View Frustum Correction Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetViewFrustumCorrectionEnabled",
+                    "base": "SetViewFrustumCorrectionEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetViewFrustumCorrectionEnabled"
+                        "tooltip": "When signaled, this will invoke Set View Frustum Correction Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetViewFrustumCorrectionEnabled is invoked"
+                        "tooltip": "Signaled after Set View Frustum Correction Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetViewFrustumCorrectionEnabled"
+                        "name": "Set View Frustum Correction Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetGroundHeight",
+                    "base": "SetGroundHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetGroundHeight"
+                        "tooltip": "When signaled, this will invoke Set Ground Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetGroundHeight is invoked"
+                        "tooltip": "Signaled after Set Ground Height is invoked"
                     },
                     "details": {
-                        "name": "SetGroundHeight"
+                        "name": "Set Ground Height"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Ground Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetShadowReceiverPlaneBiasEnabled",
+                    "base": "GetShadowReceiverPlaneBiasEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowReceiverPlaneBiasEnabled"
+                        "tooltip": "When signaled, this will invoke Get Shadow Receiver Plane Bias Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowReceiverPlaneBiasEnabled is invoked"
+                        "tooltip": "Signaled after Get Shadow Receiver Plane Bias Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetShadowReceiverPlaneBiasEnabled"
+                        "name": "Get Shadow Receiver Plane Bias Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Shadow Receiver Plane Bias"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowmapSize",
+                    "base": "SetShadowmapSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowmapSize"
+                        "tooltip": "When signaled, this will invoke Set Shadowmap Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowmapSize is invoked"
+                        "tooltip": "Signaled after Set Shadowmap Size is invoked"
                     },
                     "details": {
-                        "name": "SetShadowmapSize"
+                        "name": "Set Shadowmap Size"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Shadowmap Size"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowFarClipDistance",
+                    "base": "SetShadowFarClipDistance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowFarClipDistance"
+                        "tooltip": "When signaled, this will invoke Set Shadow Far Clip Distance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowFarClipDistance is invoked"
+                        "tooltip": "Signaled after Set Shadow Far Clip Distance is invoked"
                     },
                     "details": {
-                        "name": "SetShadowFarClipDistance"
+                        "name": "Set Shadow Far Clip Distance"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Shadow Far Clip Distance"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCameraEntityId",
+                    "base": "SetCameraEntityId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCameraEntityId"
+                        "tooltip": "When signaled, this will invoke Set Camera Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCameraEntityId is invoked"
+                        "tooltip": "Signaled after Set Camera Entity Id is invoked"
                     },
                     "details": {
-                        "name": "SetCameraEntityId"
+                        "name": "Set Camera Entity Id"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Camera Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColor"
+                        "tooltip": "When signaled, this will invoke Get Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColor is invoked"
+                        "tooltip": "Signaled after Get Color is invoked"
                     },
                     "details": {
-                        "name": "GetColor"
+                        "name": "Get Color"
                     },
                     "results": [
                         {
@@ -429,325 +452,347 @@
                     ]
                 },
                 {
-                    "key": "SetSplitAutomatic",
+                    "base": "SetSplitAutomatic",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSplitAutomatic"
+                        "tooltip": "When signaled, this will invoke Set Split Automatic"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSplitAutomatic is invoked"
+                        "tooltip": "Signaled after Set Split Automatic is invoked"
                     },
                     "details": {
-                        "name": "SetSplitAutomatic"
+                        "name": "Set Split Automatic"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Split Automatic"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCascadeFarDepth",
+                    "base": "SetCascadeFarDepth",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCascadeFarDepth"
+                        "tooltip": "When signaled, this will invoke Set Cascade Far Depth"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCascadeFarDepth is invoked"
+                        "tooltip": "Signaled after Set Cascade Far Depth is invoked"
                     },
                     "details": {
-                        "name": "SetCascadeFarDepth"
+                        "name": "Set Cascade Far Depth"
                     },
                     "params": [
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4"
+                                "name": "Cascade Far Depth"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSplitAutomatic",
+                    "base": "GetSplitAutomatic",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSplitAutomatic"
+                        "tooltip": "When signaled, this will invoke Get Split Automatic"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSplitAutomatic is invoked"
+                        "tooltip": "Signaled after Get Split Automatic is invoked"
                     },
                     "details": {
-                        "name": "GetSplitAutomatic"
+                        "name": "Get Split Automatic"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Split Automatic"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetGroundHeight",
+                    "base": "GetGroundHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetGroundHeight"
+                        "tooltip": "When signaled, this will invoke Get Ground Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetGroundHeight is invoked"
+                        "tooltip": "Signaled after Get Ground Height is invoked"
                     },
                     "details": {
-                        "name": "GetGroundHeight"
+                        "name": "Get Ground Height"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Ground Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCascadeCount",
+                    "base": "SetCascadeCount",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCascadeCount"
+                        "tooltip": "When signaled, this will invoke Set Cascade Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCascadeCount is invoked"
+                        "tooltip": "Signaled after Set Cascade Count is invoked"
                     },
                     "details": {
-                        "name": "SetCascadeCount"
+                        "name": "Set Cascade Count"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Cascade Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFilteringSampleCount",
+                    "base": "SetFilteringSampleCount",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFilteringSampleCount"
+                        "tooltip": "When signaled, this will invoke Set Filtering Sample Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFilteringSampleCount is invoked"
+                        "tooltip": "Signaled after Set Filtering Sample Count is invoked"
                     },
                     "details": {
-                        "name": "SetFilteringSampleCount"
+                        "name": "Set Filtering Sample Count"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Filtering Sample Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCascadeCount",
+                    "base": "GetCascadeCount",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCascadeCount"
+                        "tooltip": "When signaled, this will invoke Get Cascade Count"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCascadeCount is invoked"
+                        "tooltip": "Signaled after Get Cascade Count is invoked"
                     },
                     "details": {
-                        "name": "GetCascadeCount"
+                        "name": "Get Cascade Count"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Cascade Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetIntensity",
+                    "base": "GetIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetIntensity"
+                        "tooltip": "When signaled, this will invoke Get Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetIntensity is invoked"
+                        "tooltip": "Signaled after Get Intensity is invoked"
                     },
                     "details": {
-                        "name": "GetIntensity"
+                        "name": "Get Intensity"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Intensity"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetShadowmapSize",
+                    "base": "SetNormalShadowBias",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShadowmapSize"
+                        "tooltip": "When signaled, this will invoke Set Normal Shadow Bias"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShadowmapSize is invoked"
+                        "tooltip": "Signaled after Set Normal Shadow Bias is invoked"
                     },
                     "details": {
-                        "name": "GetShadowmapSize"
+                        "name": "Set Normal Shadow Bias"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Normal Shadow Bias"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetShadowmapSize",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Shadowmap Size"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Shadowmap Size is invoked"
+                    },
+                    "details": {
+                        "name": "Get Shadowmap Size"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Shadowmap Size"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAngularDiameter",
+                    "base": "GetAngularDiameter",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAngularDiameter"
+                        "tooltip": "When signaled, this will invoke Get Angular Diameter"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAngularDiameter is invoked"
+                        "tooltip": "Signaled after Get Angular Diameter is invoked"
                     },
                     "details": {
-                        "name": "GetAngularDiameter"
+                        "name": "Get Angular Diameter"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Angular Diameter"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowFilterMethod",
+                    "base": "SetShadowFilterMethod",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowFilterMethod"
+                        "tooltip": "When signaled, this will invoke Set Shadow Filter Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowFilterMethod is invoked"
+                        "tooltip": "Signaled after Set Shadow Filter Method is invoked"
                     },
                     "details": {
-                        "name": "SetShadowFilterMethod"
+                        "name": "Set Shadow Filter Method"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Shadow Filter Method"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetShadowReceiverPlaneBiasEnabled",
+                    "base": "SetShadowReceiverPlaneBiasEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShadowReceiverPlaneBiasEnabled"
+                        "tooltip": "When signaled, this will invoke Set Shadow Receiver Plane Bias Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShadowReceiverPlaneBiasEnabled is invoked"
+                        "tooltip": "Signaled after Set Shadow Receiver Plane Bias Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetShadowReceiverPlaneBiasEnabled"
+                        "name": "Set Shadow Receiver Plane Bias Enabled"
                     },
                     "params": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSplitRatio",
+                    "base": "GetSplitRatio",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSplitRatio"
+                        "tooltip": "When signaled, this will invoke Get Split Ratio"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSplitRatio is invoked"
+                        "tooltip": "Signaled after Get Split Ratio is invoked"
                     },
                     "details": {
-                        "name": "GetSplitRatio"
+                        "name": "Get Split Ratio"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Split Ratio"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCascadeFarDepth",
+                    "base": "GetCascadeFarDepth",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCascadeFarDepth"
+                        "tooltip": "When signaled, this will invoke Get Cascade Far Depth"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCascadeFarDepth is invoked"
+                        "tooltip": "Signaled after Get Cascade Far Depth is invoked"
                     },
                     "details": {
-                        "name": "GetCascadeFarDepth"
+                        "name": "Get Cascade Far Depth"
                     },
                     "results": [
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4"
+                                "name": "Cascade Far Depth"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetColor",
+                    "base": "SetColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColor"
+                        "tooltip": "When signaled, this will invoke Set Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColor is invoked"
+                        "tooltip": "Signaled after Set Color is invoked"
                     },
                     "details": {
-                        "name": "SetColor"
+                        "name": "Set Color"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names
index ad7012b470..05dd1a0e62 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "DiskShapeComponentRequestsBus",
+            "base": "DiskShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "DiskShapeComponentRequestsBus"
+                "name": "Disk Shape Component",
+                "category": "Rendering/Shapes"
             },
             "methods": [
                 {
-                    "key": "GetDiskConfiguration",
+                    "base": "GetDiskConfiguration",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDiskConfiguration"
+                        "tooltip": "When signaled, this will invoke Get Disk Configuration"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDiskConfiguration is invoked"
+                        "tooltip": "Signaled after Get Disk Configuration is invoked"
                     },
                     "details": {
-                        "name": "GetDiskConfiguration"
+                        "name": "Get Disk Configuration"
                     },
                     "results": [
                         {
@@ -32,17 +33,17 @@
                     ]
                 },
                 {
-                    "key": "SetRadius",
+                    "base": "SetRadius",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRadius"
+                        "tooltip": "When signaled, this will invoke Set Radius"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRadius is invoked"
+                        "tooltip": "Signaled after Set Radius is invoked"
                     },
                     "details": {
-                        "name": "SetRadius"
+                        "name": "Set Radius"
                     },
                     "params": [
                         {
@@ -54,17 +55,17 @@
                     ]
                 },
                 {
-                    "key": "GetRadius",
+                    "base": "GetRadius",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRadius"
+                        "tooltip": "When signaled, this will invoke Get Radius"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRadius is invoked"
+                        "tooltip": "Signaled after Get Radius is invoked"
                     },
                     "details": {
-                        "name": "GetRadius"
+                        "name": "Get Radius"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names
index 87a65a50e9..8179539db3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "DitherGradientRequestBus",
+            "base": "DitherGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "DitherGradientRequestBus"
+                "name": "Dither Gradient"
             },
             "methods": [
                 {
-                    "key": "GetPatternType",
+                    "base": "GetPatternType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPatternType"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetPatternType",
+                    "base": "SetPatternType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetPatternType"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "SetPatternOffset",
+                    "base": "SetPatternOffset",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetPatternOffset"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "GetPatternOffset",
+                    "base": "GetPatternOffset",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPatternOffset"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "GetPointsPerUnit",
+                    "base": "GetPointsPerUnit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPointsPerUnit"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "SetPointsPerUnit",
+                    "base": "SetPointsPerUnit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetPointsPerUnit"
@@ -141,7 +141,7 @@
                     ]
                 },
                 {
-                    "key": "SetUseSystemPointsPerUnit",
+                    "base": "SetUseSystemPointsPerUnit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetUseSystemPointsPerUnit"
@@ -163,7 +163,7 @@
                     ]
                 },
                 {
-                    "key": "GetUseSystemPointsPerUnit",
+                    "base": "GetUseSystemPointsPerUnit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetUseSystemPointsPerUnit"
@@ -185,7 +185,7 @@
                     ]
                 },
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names
index b028b96baa..000d01dd63 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names
@@ -1,106 +1,107 @@
 {
     "entries": [
         {
-            "key": "EditorCameraRequestBus",
+            "base": "EditorCameraRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorCameraRequestBus"
+                "name": "Editor Camera",
+                "category": "Editor"
             },
             "methods": [
                 {
-                    "key": "SetViewFromEntityPerspective",
+                    "base": "SetViewFromEntityPerspective",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetViewFromEntityPerspective"
+                        "tooltip": "When signaled, this will invoke Set View From Entity Perspective"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetViewFromEntityPerspective is invoked"
+                        "tooltip": "Signaled after Set View From Entity Perspective is invoked"
                     },
                     "details": {
-                        "name": "SetViewFromEntityPerspective"
+                        "name": "Set View From Entity Perspective"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetViewAndMovementLockFromEntityPerspective",
+                    "base": "SetViewAndMovementLockFromEntityPerspective",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetViewAndMovementLockFromEntityPerspective"
+                        "tooltip": "When signaled, this will invoke Set View And Movement Lock From Entity Perspective"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetViewAndMovementLockFromEntityPerspective is invoked"
+                        "tooltip": "Signaled after Set View And Movement Lock From Entity Perspective is invoked"
                     },
                     "details": {
-                        "name": "SetViewAndMovementLockFromEntityPerspective"
+                        "name": "Set View And Movement Lock From Entity Perspective"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Lock Camera Movement"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCurrentViewEntityId",
+                    "base": "GetCurrentViewEntityId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCurrentViewEntityId"
+                        "tooltip": "When signaled, this will invoke Get Current View Entity Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCurrentViewEntityId is invoked"
+                        "tooltip": "Signaled after Get Current View Entity Id is invoked"
                     },
                     "details": {
-                        "name": "GetCurrentViewEntityId"
+                        "name": "Get Current View Entity Id"
                     },
                     "results": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetActiveCameraPosition",
+                    "base": "GetActiveCameraPosition",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetActiveCameraPosition"
+                        "tooltip": "When signaled, this will invoke Get Active Camera Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetActiveCameraPosition is invoked"
+                        "tooltip": "Signaled after Get Active Camera Position is invoked"
                     },
                     "details": {
-                        "name": "GetActiveCameraPosition"
+                        "name": "Get Active Camera Position"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position"
                             }
                         }
                     ],
@@ -108,7 +109,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Success"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names
index e24bf3f6d2..8fa5f016fe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorCameraViewRequestBus",
+            "base": "EditorCameraViewRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorCameraViewRequestBus"
+                "name": "Editor Camera View"
             },
             "methods": [
                 {
-                    "key": "ToggleCameraAsActiveView",
+                    "base": "ToggleCameraAsActiveView",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ToggleCameraAsActiveView"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names
index 590311828a..cfe5aa0540 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorEntityAPIBus",
+            "base": "EditorEntityAPIBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorEntityAPIBus"
+                "name": "Editor Entity API"
             },
             "methods": [
                 {
-                    "key": "SetVisibilityState",
+                    "base": "SetVisibilityState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetVisibilityState"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetLockState",
+                    "base": "SetLockState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetLockState"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "SetStartStatus",
+                    "base": "SetStartStatus",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetStartStatus"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetName",
+                    "base": "SetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetName"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "SetParent",
+                    "base": "SetParent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetParent"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names
index 6071cd821c..6411ef233e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorEntityContextRequestBus",
+            "base": "EditorEntityContextRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorEntityContextRequestBus"
+                "name": "Editor Entity Context"
             },
             "methods": [
                 {
-                    "key": "GetEditorEntityContextId",
+                    "base": "GetEditorEntityContextId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetEditorEntityContextId"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names
index 955cee31e7..b817a475c0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorEntityInfoRequestBus",
+            "base": "EditorEntityInfoRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorEntityInfoRequestBus"
+                "name": "Editor Entity Info"
             },
             "methods": [
                 {
-                    "key": "GetName",
+                    "base": "GetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetName"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "IsVisible",
+                    "base": "IsVisible",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsVisible"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildIndex",
+                    "base": "GetChildIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetChildIndex"
@@ -84,7 +84,7 @@
                     ]
                 },
                 {
-                    "key": "GetStartStatus",
+                    "base": "GetStartStatus",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetStartStatus"
@@ -106,7 +106,7 @@
                     ]
                 },
                 {
-                    "key": "GetChild",
+                    "base": "GetChild",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetChild"
@@ -137,7 +137,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildCount",
+                    "base": "GetChildCount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetChildCount"
@@ -159,7 +159,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildren",
+                    "base": "GetChildren",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetChildren"
@@ -181,7 +181,7 @@
                     ]
                 },
                 {
-                    "key": "IsLocked",
+                    "base": "IsLocked",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsLocked"
@@ -203,7 +203,7 @@
                     ]
                 },
                 {
-                    "key": "GetParent",
+                    "base": "GetParent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetParent"
@@ -226,7 +226,7 @@
                     ]
                 },
                 {
-                    "key": "IsHidden",
+                    "base": "IsHidden",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsHidden"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names
index 820632b705..a65a960fa4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorLayerComponentRequestBus",
+            "base": "EditorLayerComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorLayerComponentRequestBus"
+                "name": "Editor Layer Component"
             },
             "methods": [
                 {
-                    "key": "SetVisibility",
+                    "base": "SetVisibility",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetVisibility"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetLayerColor",
+                    "base": "SetLayerColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetLayerColor"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetColorPropertyValue",
+                    "base": "GetColorPropertyValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetColorPropertyValue"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names
index 6f7bf51a14..18f70bbc55 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorLayerTrackViewRequestBus",
+            "base": "EditorLayerTrackViewRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorLayerTrackViewRequestBus"
+                "name": "Editor Layer TrackView"
             },
             "methods": [
                 {
-                    "key": "NewSequence",
+                    "base": "NewSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke NewSequence"
@@ -37,7 +37,7 @@
                     ]
                 },
                 {
-                    "key": "SetRecording",
+                    "base": "SetRecording",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetRecording"
@@ -59,7 +59,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumSequences",
+                    "base": "GetNumSequences",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumSequences"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetSequenceName",
+                    "base": "GetSequenceName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetSequenceName"
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "GetSequenceTimeRange",
+                    "base": "GetSequenceTimeRange",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetSequenceTimeRange"
@@ -141,7 +141,7 @@
                     ]
                 },
                 {
-                    "key": "PlaySequence",
+                    "base": "PlaySequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke PlaySequence"
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "key": "GetNodeName",
+                    "base": "GetNodeName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNodeName"
@@ -191,7 +191,7 @@
                     ]
                 },
                 {
-                    "key": "SetSequenceTimeRange",
+                    "base": "SetSequenceTimeRange",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetSequenceTimeRange"
@@ -225,7 +225,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteSequence",
+                    "base": "DeleteSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteSequence"
@@ -247,7 +247,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeyValue",
+                    "base": "GetKeyValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetKeyValue"
@@ -301,7 +301,7 @@
                     ]
                 },
                 {
-                    "key": "StopSequence",
+                    "base": "StopSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke StopSequence"
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "key": "AddSelectedEntities",
+                    "base": "AddSelectedEntities",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddSelectedEntities"
@@ -329,7 +329,7 @@
                     }
                 },
                 {
-                    "key": "GetNumTrackKeys",
+                    "base": "GetNumTrackKeys",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumTrackKeys"
@@ -377,7 +377,7 @@
                     ]
                 },
                 {
-                    "key": "AddLayerNode",
+                    "base": "AddLayerNode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddLayerNode"
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "key": "DeleteNode",
+                    "base": "DeleteNode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteNode"
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "key": "GetInterpolatedValue",
+                    "base": "GetInterpolatedValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetInterpolatedValue"
@@ -473,7 +473,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumNodes",
+                    "base": "GetNumNodes",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumNodes"
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "key": "AddNode",
+                    "base": "AddNode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddNode"
@@ -531,7 +531,7 @@
                     ]
                 },
                 {
-                    "key": "AddTrack",
+                    "base": "AddTrack",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddTrack"
@@ -565,7 +565,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteTrack",
+                    "base": "DeleteTrack",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteTrack"
@@ -605,7 +605,7 @@
                     ]
                 },
                 {
-                    "key": "SetCurrentSequence",
+                    "base": "SetCurrentSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetCurrentSequence"
@@ -627,7 +627,7 @@
                     ]
                 },
                 {
-                    "key": "SetTime",
+                    "base": "SetTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetTime"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names
index 78a087ae6b..ba03233971 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "EditorReflectionProbeBus",
+            "base": "EditorReflectionProbeBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorReflectionProbeBus"
+                "name": "Editor Reflection Probe",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "BakeReflectionProbe",
+                    "base": "BakeReflectionProbe",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke BakeReflectionProbe"
+                        "tooltip": "When signaled, this will invoke Bake Reflection Probe"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after BakeReflectionProbe is invoked"
+                        "tooltip": "Signaled after Bake Reflection Probe is invoked"
                     },
                     "details": {
-                        "name": "BakeReflectionProbe"
+                        "name": "Bake Reflection Probe"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names
index 658dcf6369..a2dae6e173 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorRequestBus",
+            "base": "EditorRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorRequestBus"
+                "name": "Editor"
             },
             "methods": [
                 {
-                    "key": "RegisterCustomViewPane",
+                    "base": "RegisterCustomViewPane",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RegisterCustomViewPane"
@@ -43,7 +43,7 @@
                     ]
                 },
                 {
-                    "key": "UnregisterViewPane",
+                    "base": "UnregisterViewPane",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke UnregisterViewPane"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names
index 1734915b62..bcb75ef940 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "EditorToolsApplicationRequestBus",
+            "base": "EditorToolsApplicationRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorToolsApplicationRequestBus"
+                "name": "Editor Tools Application"
             },
             "methods": [
                 {
-                    "key": "Exit",
+                    "base": "Exit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Exit"
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "key": "GetCurrentLevelName",
+                    "base": "GetCurrentLevelName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetCurrentLevelName"
@@ -45,7 +45,7 @@
                     ]
                 },
                 {
-                    "key": "GetGameFolder",
+                    "base": "GetGameFolder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGameFolder"
@@ -67,7 +67,7 @@
                     ]
                 },
                 {
-                    "key": "CreateLevelNoPrompt",
+                    "base": "CreateLevelNoPrompt",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreateLevelNoPrompt"
@@ -109,7 +109,7 @@
                     ]
                 },
                 {
-                    "key": "OpenLevelNoPrompt",
+                    "base": "OpenLevelNoPrompt",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke OpenLevelNoPrompt"
@@ -139,7 +139,7 @@
                     ]
                 },
                 {
-                    "key": "GetCurrentLevelPath",
+                    "base": "GetCurrentLevelPath",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetCurrentLevelPath"
@@ -161,7 +161,7 @@
                     ]
                 },
                 {
-                    "key": "ExitNoPrompt",
+                    "base": "ExitNoPrompt",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ExitNoPrompt"
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "key": "OpenLevel",
+                    "base": "OpenLevel",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke OpenLevel"
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "CreateLevel",
+                    "base": "CreateLevel",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreateLevel"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names
index 178c30bb43..bd7e0157b9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names
@@ -1,47 +1,48 @@
 {
     "entries": [
         {
-            "key": "EditorTransformComponentSelectionRequestBus",
+            "base": "EditorTransformComponentSelectionRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "EditorTransformComponentSelectionRequestBus"
+                "name": "Editor Transform Component Selection",
+                "category": "Editor"
             },
             "methods": [
                 {
-                    "key": "CopyTranslationToSelectedEntitiesGroup",
+                    "base": "CopyTranslationToSelectedEntitiesGroup",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CopyTranslationToSelectedEntitiesGroup"
+                        "tooltip": "When signaled, this will invoke Copy Translation To Selected Entities Group"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CopyTranslationToSelectedEntitiesGroup is invoked"
+                        "tooltip": "Signaled after Copy Translation To Selected Entities Group is invoked"
                     },
                     "details": {
-                        "name": "CopyTranslationToSelectedEntitiesGroup"
+                        "name": "Copy Translation To Selected Entities Group"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CopyOrientationToSelectedEntitiesIndividual",
+                    "base": "CopyOrientationToSelectedEntitiesIndividual",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CopyOrientationToSelectedEntitiesIndividual"
+                        "tooltip": "When signaled, this will invoke Copy Orientation To Selected Entities Individual"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CopyOrientationToSelectedEntitiesIndividual is invoked"
+                        "tooltip": "Signaled after Copy Orientation To Selected Entities Individual is invoked"
                     },
                     "details": {
-                        "name": "CopyOrientationToSelectedEntitiesIndividual"
+                        "name": "Copy Orientation To Selected Entities Individual"
                     },
                     "params": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "CopyOrientationToSelectedEntitiesGroup",
+                    "base": "CopyOrientationToSelectedEntitiesGroup",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CopyOrientationToSelectedEntitiesGroup"
+                        "tooltip": "When signaled, this will invoke Copy Orientation To Selected Entities Group"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CopyOrientationToSelectedEntitiesGroup is invoked"
+                        "tooltip": "Signaled after Copy Orientation To Selected Entities Group is invoked"
                     },
                     "details": {
-                        "name": "CopyOrientationToSelectedEntitiesGroup"
+                        "name": "Copy Orientation To Selected Entities Group"
                     },
                     "params": [
                         {
@@ -75,39 +76,39 @@
                     ]
                 },
                 {
-                    "key": "CopyTranslationToSelectedEntitiesIndividual",
+                    "base": "CopyTranslationToSelectedEntitiesIndividual",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CopyTranslationToSelectedEntitiesIndividual"
+                        "tooltip": "When signaled, this will invoke Copy Translation To Selected Entities Individual"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CopyTranslationToSelectedEntitiesIndividual is invoked"
+                        "tooltip": "Signaled after Copy Translation To Selected Entities Individual is invoked"
                     },
                     "details": {
-                        "name": "CopyTranslationToSelectedEntitiesIndividual"
+                        "name": "Copy Translation To Selected Entities Individual"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CopyScaleToSelectedEntitiesIndividualLocal",
+                    "base": "CopyScaleToSelectedEntitiesIndividualLocal",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CopyScaleToSelectedEntitiesIndividualLocal"
+                        "tooltip": "When signaled, this will invoke Copy Scale To Selected Entities Individual Local"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CopyScaleToSelectedEntitiesIndividualLocal is invoked"
+                        "tooltip": "Signaled after Copy Scale To Selected Entities Individual Local is invoked"
                     },
                     "details": {
-                        "name": "CopyScaleToSelectedEntitiesIndividualLocal"
+                        "name": "Copy Scale To Selected Entities Individual Local"
                     },
                     "params": [
                         {
@@ -119,39 +120,39 @@
                     ]
                 },
                 {
-                    "key": "OverrideManipulatorTranslation",
+                    "base": "OverrideManipulatorTranslation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke OverrideManipulatorTranslation"
+                        "tooltip": "When signaled, this will invoke Override Manipulator Translation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after OverrideManipulatorTranslation is invoked"
+                        "tooltip": "Signaled after Override Manipulator Translation is invoked"
                     },
                     "details": {
-                        "name": "OverrideManipulatorTranslation"
+                        "name": "Override Manipulator Translation"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RefreshManipulators",
+                    "base": "RefreshManipulators",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RefreshManipulators"
+                        "tooltip": "When signaled, this will invoke Refresh Manipulators"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RefreshManipulators is invoked"
+                        "tooltip": "Signaled after Refresh Manipulators is invoked"
                     },
                     "details": {
-                        "name": "RefreshManipulators"
+                        "name": "Refresh Manipulators"
                     },
                     "params": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "OverrideManipulatorOrientation",
+                    "base": "OverrideManipulatorOrientation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke OverrideManipulatorOrientation"
+                        "tooltip": "When signaled, this will invoke Override Manipulator Orientation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after OverrideManipulatorOrientation is invoked"
+                        "tooltip": "Signaled after Override Manipulator Orientation is invoked"
                     },
                     "details": {
-                        "name": "OverrideManipulatorOrientation"
+                        "name": "Override Manipulator Orientation"
                     },
                     "params": [
                         {
@@ -185,17 +186,17 @@
                     ]
                 },
                 {
-                    "key": "GetTransformMode",
+                    "base": "GetTransformMode",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTransformMode"
+                        "tooltip": "When signaled, this will invoke Get Transform Mode"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTransformMode is invoked"
+                        "tooltip": "Signaled after Get Transform Mode is invoked"
                     },
                     "details": {
-                        "name": "GetTransformMode"
+                        "name": "Get Transform Mode"
                     },
                     "results": [
                         {
@@ -207,17 +208,17 @@
                     ]
                 },
                 {
-                    "key": "CopyScaleToSelectedEntitiesIndividualWorld",
+                    "base": "CopyScaleToSelectedEntitiesIndividualWorld",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CopyScaleToSelectedEntitiesIndividualWorld"
+                        "tooltip": "When signaled, this will invoke Copy Scale To Selected Entities Individual World"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CopyScaleToSelectedEntitiesIndividualWorld is invoked"
+                        "tooltip": "Signaled after Copy Scale To Selected Entities Individual World is invoked"
                     },
                     "details": {
-                        "name": "CopyScaleToSelectedEntitiesIndividualWorld"
+                        "name": "Copy Scale To Selected Entities Individual World"
                     },
                     "params": [
                         {
@@ -229,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "SetTransformMode",
+                    "base": "SetTransformMode",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTransformMode"
+                        "tooltip": "When signaled, this will invoke Set Transform Mode"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTransformMode is invoked"
+                        "tooltip": "Signaled after Set Transform Mode is invoked"
                     },
                     "details": {
-                        "name": "SetTransformMode"
+                        "name": "Set Transform Mode"
                     },
                     "params": [
                         {
@@ -251,31 +252,31 @@
                     ]
                 },
                 {
-                    "key": "ResetTranslationForSelectedEntitiesLocal",
+                    "base": "ResetTranslationForSelectedEntitiesLocal",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ResetTranslationForSelectedEntitiesLocal"
+                        "tooltip": "When signaled, this will invoke Reset Translation For Selected Entities Local"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ResetTranslationForSelectedEntitiesLocal is invoked"
+                        "tooltip": "Signaled after Reset Translation For Selected Entities Local is invoked"
                     },
                     "details": {
-                        "name": "ResetTranslationForSelectedEntitiesLocal"
+                        "name": "Reset Translation For Selected Entities Local"
                     }
                 },
                 {
-                    "key": "ResetOrientationForSelectedEntitiesLocal",
+                    "base": "ResetOrientationForSelectedEntitiesLocal",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ResetOrientationForSelectedEntitiesLocal"
+                        "tooltip": "When signaled, this will invoke Reset Orientation For Selected Entities Local"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ResetOrientationForSelectedEntitiesLocal is invoked"
+                        "tooltip": "Signaled after Reset Orientation For Selected Entities Local is invoked"
                     },
                     "details": {
-                        "name": "ResetOrientationForSelectedEntitiesLocal"
+                        "name": "Reset Orientation For Selected Entities Local"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names
index 89ecca21dc..7ff05531a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "ExposureControlRequestBus",
+            "base": "ExposureControlRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ExposureControlRequestBus"
+                "name": "Exposure Control",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetEyeAdaptationSpeedDownOverride",
+                    "base": "SetEyeAdaptationSpeedDownOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedDownOverride"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Down Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationSpeedDownOverride is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Speed Down Override is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationSpeedDownOverride"
+                        "name": "Set Eye Adaptation Speed Down Override"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabled"
+                        "tooltip": "When signaled, this will invoke Get Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabled is invoked"
+                        "tooltip": "Signaled after Get Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetEnabled"
+                        "name": "Get Enabled"
                     },
                     "results": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabledOverride",
+                    "base": "SetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Set Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Set Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnabledOverride"
+                        "name": "Set Enabled Override"
                     },
                     "params": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "SetManualCompensation",
+                    "base": "SetManualCompensation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetManualCompensation"
+                        "tooltip": "When signaled, this will invoke Set Manual Compensation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetManualCompensation is invoked"
+                        "tooltip": "Signaled after Set Manual Compensation is invoked"
                     },
                     "details": {
-                        "name": "SetManualCompensation"
+                        "name": "Set Manual Compensation"
                     },
                     "params": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationSpeedDown",
+                    "base": "SetEyeAdaptationSpeedDown",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedDown"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Down"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationSpeedDown is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Speed Down is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationSpeedDown"
+                        "name": "Set Eye Adaptation Speed Down"
                     },
                     "params": [
                         {
@@ -119,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "GetExposureControlTypeOverride",
+                    "base": "GetExposureControlTypeOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetExposureControlTypeOverride"
+                        "tooltip": "When signaled, this will invoke Get Exposure Control Type Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetExposureControlTypeOverride is invoked"
+                        "tooltip": "Signaled after Get Exposure Control Type Override is invoked"
                     },
                     "details": {
-                        "name": "GetExposureControlTypeOverride"
+                        "name": "Get Exposure Control Type Override"
                     },
                     "results": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "GetHeatmapEnabled",
+                    "base": "GetHeatmapEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetHeatmapEnabled"
+                        "tooltip": "When signaled, this will invoke Get Heatmap Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetHeatmapEnabled is invoked"
+                        "tooltip": "Signaled after Get Heatmap Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetHeatmapEnabled"
+                        "name": "Get Heatmap Enabled"
                     },
                     "results": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationSpeedUpOverride",
+                    "base": "SetEyeAdaptationSpeedUpOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedUpOverride"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Up Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationSpeedUpOverride is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Speed Up Override is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationSpeedUpOverride"
+                        "name": "Set Eye Adaptation Speed Up Override"
                     },
                     "params": [
                         {
@@ -185,17 +186,17 @@
                     ]
                 },
                 {
-                    "key": "SetExposureControlType",
+                    "base": "SetExposureControlType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetExposureControlType"
+                        "tooltip": "When signaled, this will invoke Set Exposure Control Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetExposureControlType is invoked"
+                        "tooltip": "Signaled after Set Exposure Control Type is invoked"
                     },
                     "details": {
-                        "name": "SetExposureControlType"
+                        "name": "Set Exposure Control Type"
                     },
                     "params": [
                         {
@@ -207,17 +208,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
@@ -229,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "GetExposureControlType",
+                    "base": "GetExposureControlType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetExposureControlType"
+                        "tooltip": "When signaled, this will invoke Get Exposure Control Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetExposureControlType is invoked"
+                        "tooltip": "Signaled after Get Exposure Control Type is invoked"
                     },
                     "details": {
-                        "name": "GetExposureControlType"
+                        "name": "Get Exposure Control Type"
                     },
                     "results": [
                         {
@@ -251,17 +252,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationExposureMax",
+                    "base": "SetEyeAdaptationExposureMax",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMax"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Max"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationExposureMax is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Exposure Max is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationExposureMax"
+                        "name": "Set Eye Adaptation Exposure Max"
                     },
                     "params": [
                         {
@@ -273,17 +274,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationSpeedDownOverride",
+                    "base": "GetEyeAdaptationSpeedDownOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedDownOverride"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Down Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationSpeedDownOverride is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Speed Down Override is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationSpeedDownOverride"
+                        "name": "Get Eye Adaptation Speed Down Override"
                     },
                     "results": [
                         {
@@ -295,17 +296,17 @@
                     ]
                 },
                 {
-                    "key": "GetManualCompensationOverride",
+                    "base": "GetManualCompensationOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetManualCompensationOverride"
+                        "tooltip": "When signaled, this will invoke Get Manual Compensation Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetManualCompensationOverride is invoked"
+                        "tooltip": "Signaled after Get Manual Compensation Override is invoked"
                     },
                     "details": {
-                        "name": "GetManualCompensationOverride"
+                        "name": "Get Manual Compensation Override"
                     },
                     "results": [
                         {
@@ -317,17 +318,17 @@
                     ]
                 },
                 {
-                    "key": "GetHeatmapEnabledOverride",
+                    "base": "GetHeatmapEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetHeatmapEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Get Heatmap Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetHeatmapEnabledOverride is invoked"
+                        "tooltip": "Signaled after Get Heatmap Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "GetHeatmapEnabledOverride"
+                        "name": "Get Heatmap Enabled Override"
                     },
                     "results": [
                         {
@@ -339,17 +340,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationSpeedUp",
+                    "base": "SetEyeAdaptationSpeedUp",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedUp"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Up"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationSpeedUp is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Speed Up is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationSpeedUp"
+                        "name": "Set Eye Adaptation Speed Up"
                     },
                     "params": [
                         {
@@ -361,17 +362,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationSpeedUpOverride",
+                    "base": "GetEyeAdaptationSpeedUpOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedUpOverride"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Up Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationSpeedUpOverride is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Speed Up Override is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationSpeedUpOverride"
+                        "name": "Get Eye Adaptation Speed Up Override"
                     },
                     "results": [
                         {
@@ -383,17 +384,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationExposureMinOverride",
+                    "base": "GetEyeAdaptationExposureMinOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMinOverride"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Min Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationExposureMinOverride is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Exposure Min Override is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationExposureMinOverride"
+                        "name": "Get Eye Adaptation Exposure Min Override"
                     },
                     "results": [
                         {
@@ -405,17 +406,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationExposureMaxOverride",
+                    "base": "GetEyeAdaptationExposureMaxOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMaxOverride"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Max Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationExposureMaxOverride is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Exposure Max Override is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationExposureMaxOverride"
+                        "name": "Get Eye Adaptation Exposure Max Override"
                     },
                     "results": [
                         {
@@ -427,17 +428,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnabledOverride",
+                    "base": "GetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Get Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Get Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnabledOverride"
+                        "name": "Get Enabled Override"
                     },
                     "results": [
                         {
@@ -449,17 +450,17 @@
                     ]
                 },
                 {
-                    "key": "SetExposureControlTypeOverride",
+                    "base": "SetExposureControlTypeOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetExposureControlTypeOverride"
+                        "tooltip": "When signaled, this will invoke Set Exposure Control Type Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetExposureControlTypeOverride is invoked"
+                        "tooltip": "Signaled after Set Exposure Control Type Override is invoked"
                     },
                     "details": {
-                        "name": "SetExposureControlTypeOverride"
+                        "name": "Set Exposure Control Type Override"
                     },
                     "params": [
                         {
@@ -471,17 +472,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationExposureMin",
+                    "base": "GetEyeAdaptationExposureMin",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMin"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Min"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationExposureMin is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Exposure Min is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationExposureMin"
+                        "name": "Get Eye Adaptation Exposure Min"
                     },
                     "results": [
                         {
@@ -493,17 +494,17 @@
                     ]
                 },
                 {
-                    "key": "GetManualCompensation",
+                    "base": "GetManualCompensation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetManualCompensation"
+                        "tooltip": "When signaled, this will invoke Get Manual Compensation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetManualCompensation is invoked"
+                        "tooltip": "Signaled after Get Manual Compensation is invoked"
                     },
                     "details": {
-                        "name": "GetManualCompensation"
+                        "name": "Get Manual Compensation"
                     },
                     "results": [
                         {
@@ -515,17 +516,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationExposureMinOverride",
+                    "base": "SetEyeAdaptationExposureMinOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMinOverride"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Min Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationExposureMinOverride is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Exposure Min Override is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationExposureMinOverride"
+                        "name": "Set Eye Adaptation Exposure Min Override"
                     },
                     "params": [
                         {
@@ -537,17 +538,17 @@
                     ]
                 },
                 {
-                    "key": "SetManualCompensationOverride",
+                    "base": "SetManualCompensationOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetManualCompensationOverride"
+                        "tooltip": "When signaled, this will invoke Set Manual Compensation Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetManualCompensationOverride is invoked"
+                        "tooltip": "Signaled after Set Manual Compensation Override is invoked"
                     },
                     "details": {
-                        "name": "SetManualCompensationOverride"
+                        "name": "Set Manual Compensation Override"
                     },
                     "params": [
                         {
@@ -559,17 +560,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationSpeedDown",
+                    "base": "GetEyeAdaptationSpeedDown",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedDown"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Down"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationSpeedDown is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Speed Down is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationSpeedDown"
+                        "name": "Get Eye Adaptation Speed Down"
                     },
                     "results": [
                         {
@@ -581,17 +582,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationSpeedUp",
+                    "base": "GetEyeAdaptationSpeedUp",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedUp"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Up"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationSpeedUp is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Speed Up is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationSpeedUp"
+                        "name": "Get Eye Adaptation Speed Up"
                     },
                     "results": [
                         {
@@ -603,17 +604,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationExposureMin",
+                    "base": "SetEyeAdaptationExposureMin",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMin"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Min"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationExposureMin is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Exposure Min is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationExposureMin"
+                        "name": "Set Eye Adaptation Exposure Min"
                     },
                     "params": [
                         {
@@ -625,17 +626,17 @@
                     ]
                 },
                 {
-                    "key": "SetHeatmapEnabled",
+                    "base": "SetHeatmapEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetHeatmapEnabled"
+                        "tooltip": "When signaled, this will invoke Set Heatmap Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetHeatmapEnabled is invoked"
+                        "tooltip": "Signaled after Set Heatmap Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetHeatmapEnabled"
+                        "name": "Set Heatmap Enabled"
                     },
                     "params": [
                         {
@@ -647,17 +648,17 @@
                     ]
                 },
                 {
-                    "key": "SetEyeAdaptationExposureMaxOverride",
+                    "base": "SetEyeAdaptationExposureMaxOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMaxOverride"
+                        "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Max Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEyeAdaptationExposureMaxOverride is invoked"
+                        "tooltip": "Signaled after Set Eye Adaptation Exposure Max Override is invoked"
                     },
                     "details": {
-                        "name": "SetEyeAdaptationExposureMaxOverride"
+                        "name": "Set Eye Adaptation Exposure Max Override"
                     },
                     "params": [
                         {
@@ -669,17 +670,17 @@
                     ]
                 },
                 {
-                    "key": "GetEyeAdaptationExposureMax",
+                    "base": "GetEyeAdaptationExposureMax",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMax"
+                        "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Max"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEyeAdaptationExposureMax is invoked"
+                        "tooltip": "Signaled after Get Eye Adaptation Exposure Max is invoked"
                     },
                     "details": {
-                        "name": "GetEyeAdaptationExposureMax"
+                        "name": "Get Eye Adaptation Exposure Max"
                     },
                     "results": [
                         {
@@ -691,17 +692,17 @@
                     ]
                 },
                 {
-                    "key": "SetHeatmapEnabledOverride",
+                    "base": "SetHeatmapEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetHeatmapEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Set Heatmap Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetHeatmapEnabledOverride is invoked"
+                        "tooltip": "Signaled after Set Heatmap Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "SetHeatmapEnabledOverride"
+                        "name": "Set Heatmap Enabled Override"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names
index 4c6b403587..d8bba2a01f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "FlyCameraInputBus",
+            "base": "FlyCameraInputBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "FlyCameraInputBus",
+                "name": "Fly Camera",
                 "category": "Camera"
             },
             "methods": [
                 {
-                    "key": "SetIsEnabled",
+                    "base": "SetIsEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Enabled"
@@ -26,29 +26,29 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetIsEnabled",
+                    "base": "GetIsEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Is Enabled"
+                        "tooltip": "When signaled, this will invoke Get Is Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Is Enabled is invoked"
+                        "tooltip": "Signaled after Get Is Enabled is invoked"
                     },
                     "details": {
-                        "name": "Is Enabled"
+                        "name": "Get Is Enabled"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Enabled"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names
new file mode 100644
index 0000000000..a54c222351
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names
@@ -0,0 +1,58 @@
+{
+    "entries": [
+        {
+            "base": "ForceLinearDampingRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Force Linear Damping"
+            },
+            "methods": [
+                {
+                    "base": "SetDamping",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Damping"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Damping is invoked"
+                    },
+                    "details": {
+                        "name": "Set Damping"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damping"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDamping",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Damping"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Damping is invoked"
+                    },
+                    "details": {
+                        "name": "Get Damping"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damping"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names
new file mode 100644
index 0000000000..bc3416daca
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names
@@ -0,0 +1,102 @@
+{
+    "entries": [
+        {
+            "base": "ForceLocalSpaceRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Force Local Space"
+            },
+            "methods": [
+                {
+                    "base": "SetDirection",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Direction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after SetDirection is invoked"
+                    },
+                    "details": {
+                        "name": "Set Direction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDirection",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Direction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Direction is invoked"
+                    },
+                    "details": {
+                        "name": "Get Direction"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetMagnitude",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Magnitude"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Magnitude is invoked"
+                    },
+                    "details": {
+                        "name": "Set Magnitude"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Magnitude"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMagnitude",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Magnitude"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Magnitude is invoked"
+                    },
+                    "details": {
+                        "name": "Get Magnitude"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Magnitude"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names
new file mode 100644
index 0000000000..0c0f959f66
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names
@@ -0,0 +1,58 @@
+{
+    "entries": [
+        {
+            "base": "ForcePointRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Force Point"
+            },
+            "methods": [
+                {
+                    "base": "SetMagnitude",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Magnitude"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Magnitude is invoked"
+                    },
+                    "details": {
+                        "name": "Set Magnitude"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Magnitude"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMagnitude",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Magnitude"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Magnitude is invoked"
+                    },
+                    "details": {
+                        "name": "Get Magnitude"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Magnitude"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names
new file mode 100644
index 0000000000..a5540e1f3a
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names
@@ -0,0 +1,58 @@
+{
+    "entries": [
+        {
+            "base": "ForceSimpleDragRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Force Simple Drag"
+            },
+            "methods": [
+                {
+                    "base": "SetDensity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Density"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Density is invoked"
+                    },
+                    "details": {
+                        "name": "Set Density"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Density"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDensity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Density"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Density is invoked"
+                    },
+                    "details": {
+                        "name": "Get Density"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Density"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names
new file mode 100644
index 0000000000..9cf29c9653
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names
@@ -0,0 +1,190 @@
+{
+    "entries": [
+        {
+            "base": "ForceSplineFollowRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Force Spline Follow"
+            },
+            "methods": [
+                {
+                    "base": "GetLookAhead",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Look Ahead"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Look Ahead is invoked"
+                    },
+                    "details": {
+                        "name": "Get Look Ahead"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Look Ahead"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetLookAhead",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Look Ahead"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Look Ahead is invoked"
+                    },
+                    "details": {
+                        "name": "Set Look Ahead"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Look Ahead"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetTargetSpeed",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Target Speed"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Target Speed is invoked"
+                    },
+                    "details": {
+                        "name": "Set Target Speed"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Target Speed"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetFrequency",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Frequency"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Frequency is invoked"
+                    },
+                    "details": {
+                        "name": "Get Frequency"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Frequency"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDampingRatio",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Damping Ratio"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Damping Ratio is invoked"
+                    },
+                    "details": {
+                        "name": "Get Damping Ratio"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damping Ratio"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetFrequency",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Frequency"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Frequency is invoked"
+                    },
+                    "details": {
+                        "name": "Set Frequency"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Frequency"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetTargetSpeed",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Target Speed"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Target Speed is invoked"
+                    },
+                    "details": {
+                        "name": "Get Target Speed"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Target Speed"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetDampingRatio",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Damping Ratio"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Damping Ratio is invoked"
+                    },
+                    "details": {
+                        "name": "Set Damping Ratio"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Damping Ratio"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names
new file mode 100644
index 0000000000..bb7f2efc9b
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names
@@ -0,0 +1,102 @@
+{
+    "entries": [
+        {
+            "base": "ForceWorldSpaceRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Force World Space"
+            },
+            "methods": [
+                {
+                    "base": "SetDirection",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Direction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Direction is invoked"
+                    },
+                    "details": {
+                        "name": "Set Direction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetDirection",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Direction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Direction is invoked"
+                    },
+                    "details": {
+                        "name": "Get Direction"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Direction"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetMagnitude",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Magnitude"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Magnitude is invoked"
+                    },
+                    "details": {
+                        "name": "Set Magnitude"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Magnitude"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMagnitude",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Magnitude"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Magnitude is invoked"
+                    },
+                    "details": {
+                        "name": "Get Magnitude"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Magnitude"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names
index 6d7bcf4b37..e62d9335ab 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureRequestBus",
+            "base": "FrameCaptureRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "FrameCaptureRequestBus"
+                "name": "Frame Capture"
             },
             "methods": [
                 {
-                    "key": "CaptureScreenshot",
+                    "base": "CaptureScreenshot",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CaptureScreenshot"
@@ -39,7 +39,7 @@
                     ]
                 },
                 {
-                    "key": "CaptureScreenshotWithPreview",
+                    "base": "CaptureScreenshotWithPreview",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CaptureScreenshotWithPreview"
@@ -69,7 +69,7 @@
                     ]
                 },
                 {
-                    "key": "CapturePassAttachment",
+                    "base": "CapturePassAttachment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CapturePassAttachment"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names
index 4a93df4eb1..fcb99ddf16 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "GameEntityContextRequestBus",
+            "base": "GameEntityContextRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GameEntityContextRequestBus",
-                "category": "Entity"
+                "name": "Game Entity Context",
+                "category": "Game Entity"
             },
             "methods": [
                 {
-                    "key": "DeactivateGameEntity",
+                    "base": "DeactivateGameEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Deactivate Game Entity"
@@ -26,14 +26,14 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetEntityName",
+                    "base": "GetEntityName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Entity Name"
@@ -49,7 +49,7 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
@@ -58,13 +58,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ActivateGameEntity",
+                    "base": "ActivateGameEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Activate Game Entity"
@@ -80,14 +80,14 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DestroyGameEntityAndDescendants",
+                    "base": "DestroyGameEntityAndDescendants",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Destroy Game Entity And Descendants"
@@ -103,14 +103,14 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DestroyGameEntity",
+                    "base": "DestroyGameEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Destroy Game Entity"
@@ -126,30 +126,30 @@
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "CreateGameEntity",
+                    "base": "CreateGameEntity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreateGameEntity"
+                        "tooltip": "When signaled, this will invoke Create Game Entity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreateGameEntity is invoked"
+                        "tooltip": "Signaled after Create Game Entity is invoked"
                     },
                     "details": {
-                        "name": "CreateGameEntity"
+                        "name": "Create Game Entity"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "Name"
                             }
                         }
                     ],
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names
index 166b973286..35aa9d5795 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "GradientRequestBus",
+            "base": "GradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GradientRequestBus"
+                "name": "Gradient",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetValue"
+                        "tooltip": "When signaled, this will invoke Get Value"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetValue is invoked"
+                        "tooltip": "Signaled after Get Value is invoked"
                     },
                     "details": {
-                        "name": "GetValue"
+                        "name": "Get Value"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names
index 122331320f..da7eee15d3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "GradientSurfaceDataRequestBus",
+            "base": "GradientSurfaceDataRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GradientSurfaceDataRequestBus"
+                "name": "Gradient Surface Data"
             },
             "methods": [
                 {
-                    "key": "GetThresholdMax",
+                    "base": "GetThresholdMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetThresholdMax"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetThresholdMax",
+                    "base": "SetThresholdMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetThresholdMax"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumTags"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveTag"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "GetThresholdMin",
+                    "base": "GetThresholdMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetThresholdMin"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "SetShapeConstraintEntityId",
+                    "base": "SetShapeConstraintEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetShapeConstraintEntityId"
@@ -142,7 +142,7 @@
                     ]
                 },
                 {
-                    "key": "SetThresholdMin",
+                    "base": "SetThresholdMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetThresholdMin"
@@ -164,7 +164,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTag"
@@ -194,7 +194,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddTag"
@@ -216,7 +216,7 @@
                     ]
                 },
                 {
-                    "key": "GetShapeConstraintEntityId",
+                    "base": "GetShapeConstraintEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetShapeConstraintEntityId"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names
index c814d47ba7..39d89b89cf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "GradientTransformModifierRequestBus",
+            "base": "GradientTransformModifierRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GradientTransformModifierRequestBus"
+                "name": "Gradient TransformModifier"
             },
             "methods": [
                 {
-                    "key": "SetOverrideTranslate",
+                    "base": "SetOverrideTranslate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOverrideTranslate"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetRotate",
+                    "base": "GetRotate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetRotate"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetBounds",
+                    "base": "GetBounds",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetBounds"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetTransformType",
+                    "base": "SetTransformType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetTransformType"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "GetOverrideTranslate",
+                    "base": "GetOverrideTranslate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOverrideTranslate"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "GetOverrideBounds",
+                    "base": "GetOverrideBounds",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOverrideBounds"
@@ -141,7 +141,7 @@
                     ]
                 },
                 {
-                    "key": "SetRotate",
+                    "base": "SetRotate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetRotate"
@@ -163,7 +163,7 @@
                     ]
                 },
                 {
-                    "key": "SetOverrideScale",
+                    "base": "SetOverrideScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOverrideScale"
@@ -185,7 +185,7 @@
                     ]
                 },
                 {
-                    "key": "GetScale",
+                    "base": "GetScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetScale"
@@ -207,7 +207,7 @@
                     ]
                 },
                 {
-                    "key": "SetScale",
+                    "base": "SetScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetScale"
@@ -229,7 +229,7 @@
                     ]
                 },
                 {
-                    "key": "GetIs3D",
+                    "base": "GetIs3D",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetIs3D"
@@ -251,7 +251,7 @@
                     ]
                 },
                 {
-                    "key": "SetShapeReference",
+                    "base": "SetShapeReference",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetShapeReference"
@@ -274,7 +274,7 @@
                     ]
                 },
                 {
-                    "key": "SetBounds",
+                    "base": "SetBounds",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetBounds"
@@ -296,7 +296,7 @@
                     ]
                 },
                 {
-                    "key": "SetFrequencyZoom",
+                    "base": "SetFrequencyZoom",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFrequencyZoom"
@@ -318,7 +318,7 @@
                     ]
                 },
                 {
-                    "key": "SetWrappingType",
+                    "base": "SetWrappingType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetWrappingType"
@@ -340,7 +340,7 @@
                     ]
                 },
                 {
-                    "key": "GetShapeReference",
+                    "base": "GetShapeReference",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetShapeReference"
@@ -363,7 +363,7 @@
                     ]
                 },
                 {
-                    "key": "SetOverrideBounds",
+                    "base": "SetOverrideBounds",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOverrideBounds"
@@ -385,7 +385,7 @@
                     ]
                 },
                 {
-                    "key": "GetTransformType",
+                    "base": "GetTransformType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTransformType"
@@ -407,7 +407,7 @@
                     ]
                 },
                 {
-                    "key": "GetOverrideScale",
+                    "base": "GetOverrideScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOverrideScale"
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "key": "SetIs3D",
+                    "base": "SetIs3D",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetIs3D"
@@ -451,7 +451,7 @@
                     ]
                 },
                 {
-                    "key": "SetAllowReference",
+                    "base": "SetAllowReference",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAllowReference"
@@ -473,7 +473,7 @@
                     ]
                 },
                 {
-                    "key": "SetTranslate",
+                    "base": "SetTranslate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetTranslate"
@@ -495,7 +495,7 @@
                     ]
                 },
                 {
-                    "key": "SetOverrideRotate",
+                    "base": "SetOverrideRotate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOverrideRotate"
@@ -517,7 +517,7 @@
                     ]
                 },
                 {
-                    "key": "GetAllowReference",
+                    "base": "GetAllowReference",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAllowReference"
@@ -539,7 +539,7 @@
                     ]
                 },
                 {
-                    "key": "GetTranslate",
+                    "base": "GetTranslate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTranslate"
@@ -561,7 +561,7 @@
                     ]
                 },
                 {
-                    "key": "GetOverrideRotate",
+                    "base": "GetOverrideRotate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOverrideRotate"
@@ -583,7 +583,7 @@
                     ]
                 },
                 {
-                    "key": "GetFrequencyZoom",
+                    "base": "GetFrequencyZoom",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFrequencyZoom"
@@ -605,7 +605,7 @@
                     ]
                 },
                 {
-                    "key": "GetWrappingType",
+                    "base": "GetWrappingType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetWrappingType"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names
index 8622a204c2..88c29db6dc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "GraphControllerRequestBus",
+            "base": "GraphControllerRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GraphControllerRequestBus"
+                "name": "Graph Controller"
             },
             "methods": [
                 {
-                    "key": "RemoveConnection",
+                    "base": "RemoveConnection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveConnection"
@@ -39,7 +39,7 @@
                     ]
                 },
                 {
-                    "key": "AddConnection",
+                    "base": "AddConnection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddConnection"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "WrapNode",
+                    "base": "WrapNode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke WrapNode"
@@ -103,7 +103,7 @@
                     ]
                 },
                 {
-                    "key": "AddConnectionBySlotId",
+                    "base": "AddConnectionBySlotId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddConnectionBySlotId"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "AddNode",
+                    "base": "AddNode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddNode"
@@ -188,7 +188,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveNode",
+                    "base": "RemoveNode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveNode"
@@ -218,7 +218,7 @@
                     ]
                 },
                 {
-                    "key": "ExtendSlot",
+                    "base": "ExtendSlot",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ExtendSlot"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names
index 13ba4a2b7c..36ece545e5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "GraphManagerRequestBus",
+            "base": "GraphManagerRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GraphManagerRequestBus"
+                "name": "Graph Manager"
             },
             "methods": [
                 {
-                    "key": "GetGraph",
+                    "base": "GetGraph",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGraph"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names
index d30ad4cbc3..7e810b515b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "GridComponentRequestBus",
+            "base": "GridComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "GridComponentRequestBus"
+                "name": "Grid Component",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetSecondaryColor",
+                    "base": "SetSecondaryColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSecondaryColor"
+                        "tooltip": "When signaled, this will invoke Set Secondary Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSecondaryColor is invoked"
+                        "tooltip": "Signaled after Set Secondary Color is invoked"
                     },
                     "details": {
-                        "name": "SetSecondaryColor"
+                        "name": "Set Secondary Color"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetPrimarySpacing",
+                    "base": "GetPrimarySpacing",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPrimarySpacing"
+                        "tooltip": "When signaled, this will invoke Get Primary Spacing"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPrimarySpacing is invoked"
+                        "tooltip": "Signaled after Get Primary Spacing is invoked"
                     },
                     "details": {
-                        "name": "GetPrimarySpacing"
+                        "name": "Get Primary Spacing"
                     },
                     "results": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "GetSecondaryColor",
+                    "base": "GetSecondaryColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSecondaryColor"
+                        "tooltip": "When signaled, this will invoke Get Secondary Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSecondaryColor is invoked"
+                        "tooltip": "Signaled after Get Secondary Color is invoked"
                     },
                     "details": {
-                        "name": "GetSecondaryColor"
+                        "name": "Get Secondary Color"
                     },
                     "results": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "SetAxisColor",
+                    "base": "SetAxisColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAxisColor"
+                        "tooltip": "When signaled, this will invoke Set Axis Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAxisColor is invoked"
+                        "tooltip": "Signaled after Set Axis Color is invoked"
                     },
                     "details": {
-                        "name": "SetAxisColor"
+                        "name": "Set Axis Color"
                     },
                     "params": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "SetPrimaryColor",
+                    "base": "SetPrimaryColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPrimaryColor"
+                        "tooltip": "When signaled, this will invoke Set Primary Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPrimaryColor is invoked"
+                        "tooltip": "Signaled after Set Primary Color is invoked"
                     },
                     "details": {
-                        "name": "SetPrimaryColor"
+                        "name": "Set Primary Color"
                     },
                     "params": [
                         {
@@ -119,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "GetAxisColor",
+                    "base": "GetAxisColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAxisColor"
+                        "tooltip": "When signaled, this will invoke Get Axis Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAxisColor is invoked"
+                        "tooltip": "Signaled after Get Axis Color is invoked"
                     },
                     "details": {
-                        "name": "GetAxisColor"
+                        "name": "Get Axis Color"
                     },
                     "results": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "SetPrimarySpacing",
+                    "base": "SetPrimarySpacing",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPrimarySpacing"
+                        "tooltip": "When signaled, this will invoke Set Primary Spacing"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPrimarySpacing is invoked"
+                        "tooltip": "Signaled after Set Primary Spacing is invoked"
                     },
                     "details": {
-                        "name": "SetPrimarySpacing"
+                        "name": "Set Primary Spacing"
                     },
                     "params": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "GetSecondarySpacing",
+                    "base": "GetSecondarySpacing",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSecondarySpacing"
+                        "tooltip": "When signaled, this will invoke Get Secondary Spacing"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSecondarySpacing is invoked"
+                        "tooltip": "Signaled after Get Secondary Spacing is invoked"
                     },
                     "details": {
-                        "name": "GetSecondarySpacing"
+                        "name": "Get Secondary Spacing"
                     },
                     "results": [
                         {
@@ -185,17 +186,17 @@
                     ]
                 },
                 {
-                    "key": "SetSecondarySpacing",
+                    "base": "SetSecondarySpacing",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSecondarySpacing"
+                        "tooltip": "When signaled, this will invoke Set Secondary Spacing"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSecondarySpacing is invoked"
+                        "tooltip": "Signaled after Set Secondary Spacing is invoked"
                     },
                     "details": {
-                        "name": "SetSecondarySpacing"
+                        "name": "Set Secondary Spacing"
                     },
                     "params": [
                         {
@@ -207,17 +208,17 @@
                     ]
                 },
                 {
-                    "key": "SetSize",
+                    "base": "SetSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSize"
+                        "tooltip": "When signaled, this will invoke Set Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSize is invoked"
+                        "tooltip": "Signaled after Set Size is invoked"
                     },
                     "details": {
-                        "name": "SetSize"
+                        "name": "Set Size"
                     },
                     "params": [
                         {
@@ -229,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSize"
+                        "tooltip": "When signaled, this will invoke Get Size"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSize is invoked"
+                        "tooltip": "Signaled after Get Size is invoked"
                     },
                     "details": {
-                        "name": "GetSize"
+                        "name": "Get Size"
                     },
                     "results": [
                         {
@@ -251,17 +252,17 @@
                     ]
                 },
                 {
-                    "key": "GetPrimaryColor",
+                    "base": "GetPrimaryColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPrimaryColor"
+                        "tooltip": "When signaled, this will invoke Get Primary Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPrimaryColor is invoked"
+                        "tooltip": "Signaled after Get Primary Color is invoked"
                     },
                     "details": {
-                        "name": "GetPrimaryColor"
+                        "name": "Get Primary Color"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names
index 906dd005cc..febfae7fc5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names
@@ -1,91 +1,48 @@
 {
     "entries": [
         {
-            "key": "HDRColorGradingRequestBus",
+            "base": "HDRColorGradingRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "HDRColorGradingRequestBus"
+                "name": "HDR Color Grading",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetCustomMinExposure",
+                    "base": "SetSmhHighlightsColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCustomMinExposure"
+                        "tooltip": "When signaled, this will invoke Set Smh Highlights Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCustomMinExposure is invoked"
+                        "tooltip": "Signaled after Set Smh Highlights Color is invoked"
                     },
                     "details": {
-                        "name": "SetCustomMinExposure"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetFinalAdjustmentWeight",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetFinalAdjustmentWeight"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetFinalAdjustmentWeight is invoked"
-                    },
-                    "details": {
-                        "name": "GetFinalAdjustmentWeight"
-                    },
-                    "results": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "SetSmhHighlightsColor",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhHighlightsColor"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after SetSmhHighlightsColor is invoked"
-                    },
-                    "details": {
-                        "name": "SetSmhHighlightsColor"
+                        "name": "Set Smh Highlights Color"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLutResolution",
+                    "base": "SetLutResolution",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLutResolution"
+                        "tooltip": "When signaled, this will invoke Set Lut Resolution"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLutResolution is invoked"
+                        "tooltip": "Signaled after Set Lut Resolution is invoked"
                     },
                     "details": {
-                        "name": "SetLutResolution"
+                        "name": "Set Lut Resolution"
                     },
                     "params": [
                         {
@@ -97,39 +54,39 @@
                     ]
                 },
                 {
-                    "key": "GetSmhMidtonesColor",
+                    "base": "GetSmhMidtonesColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhMidtonesColor"
+                        "tooltip": "When signaled, this will invoke Get Smh Midtones Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhMidtonesColor is invoked"
+                        "tooltip": "Signaled after Get Smh Midtones Color is invoked"
                     },
                     "details": {
-                        "name": "GetSmhMidtonesColor"
+                        "name": "Get Smh Midtones Color"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSmhHighlightsEnd",
+                    "base": "GetSmhHighlightsEnd",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhHighlightsEnd"
+                        "tooltip": "When signaled, this will invoke Get Smh Highlights End"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhHighlightsEnd is invoked"
+                        "tooltip": "Signaled after Get Smh Highlights End is invoked"
                     },
                     "details": {
-                        "name": "GetSmhHighlightsEnd"
+                        "name": "Get Smh Highlights End"
                     },
                     "results": [
                         {
@@ -141,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "GetCustomMinExposure",
+                    "base": "GetCustomMinExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCustomMinExposure"
+                        "tooltip": "When signaled, this will invoke Get Custom Min Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCustomMinExposure is invoked"
+                        "tooltip": "Signaled after Get Custom Min Exposure is invoked"
                     },
                     "details": {
-                        "name": "GetCustomMinExposure"
+                        "name": "Get Custom Min Exposure"
                     },
                     "results": [
                         {
@@ -163,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "SetSmhHighlightsEnd",
+                    "base": "SetSmhHighlightsEnd",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhHighlightsEnd"
+                        "tooltip": "When signaled, this will invoke Set Smh Highlights End"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSmhHighlightsEnd is invoked"
+                        "tooltip": "Signaled after Set Smh Highlights End is invoked"
                     },
                     "details": {
-                        "name": "SetSmhHighlightsEnd"
+                        "name": "Set Smh Highlights End"
                     },
                     "params": [
                         {
@@ -185,39 +142,39 @@
                     ]
                 },
                 {
-                    "key": "GetChannelMixingGreen",
+                    "base": "GetChannelMixingGreen",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetChannelMixingGreen"
+                        "tooltip": "When signaled, this will invoke Get Channel Mixing Green"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetChannelMixingGreen is invoked"
+                        "tooltip": "Signaled after Get Channel Mixing Green is invoked"
                     },
                     "details": {
-                        "name": "GetChannelMixingGreen"
+                        "name": "Get Channel Mixing Green"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetSmhShadowsEnd",
+                    "base": "SetSmhShadowsEnd",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhShadowsEnd"
+                        "tooltip": "When signaled, this will invoke Set Smh Shadows End"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSmhShadowsEnd is invoked"
+                        "tooltip": "Signaled after Set Smh Shadows End is invoked"
                     },
                     "details": {
-                        "name": "SetSmhShadowsEnd"
+                        "name": "Set Smh Shadows End"
                     },
                     "params": [
                         {
@@ -229,17 +186,17 @@
                     ]
                 },
                 {
-                    "key": "SetSmhWeight",
+                    "base": "SetSmhWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhWeight"
+                        "tooltip": "When signaled, this will invoke Set Smh Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSmhWeight is invoked"
+                        "tooltip": "Signaled after Set Smh Weight is invoked"
                     },
                     "details": {
-                        "name": "SetSmhWeight"
+                        "name": "Set Smh Weight"
                     },
                     "params": [
                         {
@@ -251,17 +208,17 @@
                     ]
                 },
                 {
-                    "key": "SetShaperPresetType",
+                    "base": "SetShaperPresetType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShaperPresetType"
+                        "tooltip": "When signaled, this will invoke Set Shaper Preset Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShaperPresetType is invoked"
+                        "tooltip": "Signaled after Set Shaper Preset Type is invoked"
                     },
                     "details": {
-                        "name": "SetShaperPresetType"
+                        "name": "Set Shaper Preset Type"
                     },
                     "params": [
                         {
@@ -273,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "GetShaperPresetType",
+                    "base": "GetShaperPresetType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShaperPresetType"
+                        "tooltip": "When signaled, this will invoke Get Shaper Preset Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShaperPresetType is invoked"
+                        "tooltip": "Signaled after Get Shaper Preset Type is invoked"
                     },
                     "details": {
-                        "name": "GetShaperPresetType"
+                        "name": "Get Shaper Preset Type"
                     },
                     "results": [
                         {
@@ -295,17 +252,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
@@ -317,39 +274,39 @@
                     ]
                 },
                 {
-                    "key": "GetSmhShadowsColor",
+                    "base": "GetSmhShadowsColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhShadowsColor"
+                        "tooltip": "When signaled, this will invoke Get Smh Shadows Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhShadowsColor is invoked"
+                        "tooltip": "Signaled after Get Smh Shadows Color is invoked"
                     },
                     "details": {
-                        "name": "GetSmhShadowsColor"
+                        "name": "Get Smh Shadows Color"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColorGradingPreSaturation",
+                    "base": "GetColorGradingPreSaturation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingPreSaturation"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Pre Saturation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingPreSaturation is invoked"
+                        "tooltip": "Signaled after Get Color Grading Pre Saturation is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingPreSaturation"
+                        "name": "Get Color Grading Pre Saturation"
                     },
                     "results": [
                         {
@@ -361,39 +318,39 @@
                     ]
                 },
                 {
-                    "key": "GetSplitToneHighlightsColor",
+                    "base": "GetSplitToneHighlightsColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSplitToneHighlightsColor"
+                        "tooltip": "When signaled, this will invoke Get Split Tone Highlights Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSplitToneHighlightsColor is invoked"
+                        "tooltip": "Signaled after Get Split Tone Highlights Color is invoked"
                     },
                     "details": {
-                        "name": "GetSplitToneHighlightsColor"
+                        "name": "Get Split Tone Highlights Color"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColorGradingHueShift",
+                    "base": "GetColorGradingHueShift",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingHueShift"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Hue Shift"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingHueShift is invoked"
+                        "tooltip": "Signaled after Get Color Grading Hue Shift is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingHueShift"
+                        "name": "Get Color Grading Hue Shift"
                     },
                     "results": [
                         {
@@ -405,17 +362,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingExposure",
+                    "base": "SetColorGradingExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingExposure"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingExposure is invoked"
+                        "tooltip": "Signaled after Set Color Grading Exposure is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingExposure"
+                        "name": "Set Color Grading Exposure"
                     },
                     "params": [
                         {
@@ -427,39 +384,39 @@
                     ]
                 },
                 {
-                    "key": "GetColorFilterSwatch",
+                    "base": "GetColorFilterSwatch",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorFilterSwatch"
+                        "tooltip": "When signaled, this will invoke Get Color Filter Swatch"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorFilterSwatch is invoked"
+                        "tooltip": "Signaled after Get Color Filter Swatch is invoked"
                     },
                     "details": {
-                        "name": "GetColorFilterSwatch"
+                        "name": "Get Color Filter Swatch"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWhiteBalanceTint",
+                    "base": "GetWhiteBalanceTint",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetWhiteBalanceTint"
+                        "tooltip": "When signaled, this will invoke Get White Balance Tint"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetWhiteBalanceTint is invoked"
+                        "tooltip": "Signaled after Get White Balance Tint is invoked"
                     },
                     "details": {
-                        "name": "GetWhiteBalanceTint"
+                        "name": "Get White Balance Tint"
                     },
                     "results": [
                         {
@@ -471,17 +428,17 @@
                     ]
                 },
                 {
-                    "key": "GetColorGradingExposure",
+                    "base": "GetColorGradingExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingExposure"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingExposure is invoked"
+                        "tooltip": "Signaled after Get Color Grading Exposure is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingExposure"
+                        "name": "Get Color Grading Exposure"
                     },
                     "results": [
                         {
@@ -493,17 +450,17 @@
                     ]
                 },
                 {
-                    "key": "GetSmhWeight",
+                    "base": "GetSmhWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhWeight"
+                        "tooltip": "When signaled, this will invoke Get Smh Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhWeight is invoked"
+                        "tooltip": "Signaled after Get Smh Weight is invoked"
                     },
                     "details": {
-                        "name": "GetSmhWeight"
+                        "name": "Get Smh Weight"
                     },
                     "results": [
                         {
@@ -515,61 +472,61 @@
                     ]
                 },
                 {
-                    "key": "SetSmhMidtonesColor",
+                    "base": "SetSmhMidtonesColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhMidtonesColor"
+                        "tooltip": "When signaled, this will invoke Set Smh Midtones Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSmhMidtonesColor is invoked"
+                        "tooltip": "Signaled after Set Smh Midtones Color is invoked"
                     },
                     "details": {
-                        "name": "SetSmhMidtonesColor"
+                        "name": "Set Smh Midtones Color"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetChannelMixingBlue",
+                    "base": "SetChannelMixingBlue",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetChannelMixingBlue"
+                        "tooltip": "When signaled, this will invoke Set Channel Mixing Blue"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetChannelMixingBlue is invoked"
+                        "tooltip": "Signaled after Set Channel Mixing Blue is invoked"
                     },
                     "details": {
-                        "name": "SetChannelMixingBlue"
+                        "name": "Set Channel Mixing Blue"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetGenerateLut",
+                    "base": "GetGenerateLut",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetGenerateLut"
+                        "tooltip": "When signaled, this will invoke Get Generate Lut"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetGenerateLut is invoked"
+                        "tooltip": "Signaled after Get Generate Lut is invoked"
                     },
                     "details": {
-                        "name": "GetGenerateLut"
+                        "name": "Get Generate Lut"
                     },
                     "results": [
                         {
@@ -581,17 +538,17 @@
                     ]
                 },
                 {
-                    "key": "SetSplitToneBalance",
+                    "base": "SetSplitToneBalance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSplitToneBalance"
+                        "tooltip": "When signaled, this will invoke Set Split Tone Balance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSplitToneBalance is invoked"
+                        "tooltip": "Signaled after Set Split Tone Balance is invoked"
                     },
                     "details": {
-                        "name": "SetSplitToneBalance"
+                        "name": "Set Split Tone Balance"
                     },
                     "params": [
                         {
@@ -603,17 +560,17 @@
                     ]
                 },
                 {
-                    "key": "GetLutResolution",
+                    "base": "GetLutResolution",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetLutResolution"
+                        "tooltip": "When signaled, this will invoke Get Lut Resolution"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetLutResolution is invoked"
+                        "tooltip": "Signaled after Get Lut Resolution is invoked"
                     },
                     "details": {
-                        "name": "GetLutResolution"
+                        "name": "Get Lut Resolution"
                     },
                     "results": [
                         {
@@ -625,39 +582,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingContrast",
+                    "base": "GetWhiteBalanceLuminancePreservation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingContrast"
+                        "tooltip": "When signaled, this will invoke Get White Balance Luminance Preservation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingContrast is invoked"
+                        "tooltip": "Signaled after Get White Balance Luminance Preservation is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingContrast"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetWhiteBalanceKelvin",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetWhiteBalanceKelvin"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetWhiteBalanceKelvin is invoked"
-                    },
-                    "details": {
-                        "name": "GetWhiteBalanceKelvin"
+                        "name": "Get White Balance Luminance Preservation"
                     },
                     "results": [
                         {
@@ -669,39 +604,39 @@
                     ]
                 },
                 {
-                    "key": "SetSplitToneHighlightsColor",
+                    "base": "SetCustomMinExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSplitToneHighlightsColor"
+                        "tooltip": "When signaled, this will invoke Set Custom Min Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSplitToneHighlightsColor is invoked"
+                        "tooltip": "Signaled after Set Custom Min Exposure is invoked"
                     },
                     "details": {
-                        "name": "SetSplitToneHighlightsColor"
+                        "name": "Set Custom Min Exposure"
                     },
                     "params": [
                         {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSmhShadowsEnd",
+                    "base": "GetFinalAdjustmentWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhShadowsEnd"
+                        "tooltip": "When signaled, this will invoke Get Final Adjustment Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhShadowsEnd is invoked"
+                        "tooltip": "Signaled after Get Final Adjustment Weight is invoked"
                     },
                     "details": {
-                        "name": "GetSmhShadowsEnd"
+                        "name": "Get Final Adjustment Weight"
                     },
                     "results": [
                         {
@@ -713,17 +648,17 @@
                     ]
                 },
                 {
-                    "key": "SetSmhHighlightsStart",
+                    "base": "SetColorGradingContrast",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhHighlightsStart"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Contrast"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSmhHighlightsStart is invoked"
+                        "tooltip": "Signaled after Set Color Grading Contrast is invoked"
                     },
                     "details": {
-                        "name": "SetSmhHighlightsStart"
+                        "name": "Set Color Grading Contrast"
                     },
                     "params": [
                         {
@@ -735,39 +670,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorFilterSwatch",
+                    "base": "GetWhiteBalanceKelvin",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorFilterSwatch"
+                        "tooltip": "When signaled, this will invoke Get White Balance Kelvin"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorFilterSwatch is invoked"
+                        "tooltip": "Signaled after Get White Balance Kelvin is invoked"
                     },
                     "details": {
-                        "name": "SetColorFilterSwatch"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetColorGradingFilterIntensity",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingFilterIntensity"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingFilterIntensity is invoked"
-                    },
-                    "details": {
-                        "name": "GetColorGradingFilterIntensity"
+                        "name": "Get White Balance Kelvin"
                     },
                     "results": [
                         {
@@ -779,83 +692,39 @@
                     ]
                 },
                 {
-                    "key": "SetWhiteBalanceWeight",
+                    "base": "SetSplitToneHighlightsColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetWhiteBalanceWeight"
+                        "tooltip": "When signaled, this will invoke Set Split Tone Highlights Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetWhiteBalanceWeight is invoked"
+                        "tooltip": "Signaled after Set Split Tone Highlights Color is invoked"
                     },
                     "details": {
-                        "name": "SetWhiteBalanceWeight"
+                        "name": "Set Split Tone Highlights Color"
                     },
                     "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "SetSmhShadowsStart",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhShadowsStart"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after SetSmhShadowsStart is invoked"
-                    },
-                    "details": {
-                        "name": "SetSmhShadowsStart"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetChannelMixingRed",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetChannelMixingRed"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetChannelMixingRed is invoked"
-                    },
-                    "details": {
-                        "name": "GetChannelMixingRed"
-                    },
-                    "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetColorGradingFilterMultiply",
+                    "base": "GetSmhShadowsEnd",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingFilterMultiply"
+                        "tooltip": "When signaled, this will invoke Get Smh Shadows End"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingFilterMultiply is invoked"
+                        "tooltip": "Signaled after Get Smh Shadows End is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingFilterMultiply"
+                        "name": "Get Smh Shadows End"
                     },
                     "results": [
                         {
@@ -867,17 +736,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingFilterMultiply",
+                    "base": "SetSmhHighlightsStart",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingFilterMultiply"
+                        "tooltip": "When signaled, this will invoke Set Smh Highlights Start"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingFilterMultiply is invoked"
+                        "tooltip": "Signaled after Set Smh Highlights Start is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingFilterMultiply"
+                        "name": "Set Smh Highlights Start"
                     },
                     "params": [
                         {
@@ -889,83 +758,39 @@
                     ]
                 },
                 {
-                    "key": "SetSplitToneShadowsColor",
+                    "base": "SetColorFilterSwatch",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSplitToneShadowsColor"
+                        "tooltip": "When signaled, this will invoke Set Color Filter Swatch"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSplitToneShadowsColor is invoked"
+                        "tooltip": "Signaled after Set Color Filter Swatch is invoked"
                     },
                     "details": {
-                        "name": "SetSplitToneShadowsColor"
+                        "name": "Set Color Filter Swatch"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetSplitToneWeight",
+                    "base": "GetColorGradingFilterIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSplitToneWeight"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Filter Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSplitToneWeight is invoked"
+                        "tooltip": "Signaled after Get Color Grading Filter Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetSplitToneWeight"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetSplitToneShadowsColor",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSplitToneShadowsColor"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetSplitToneShadowsColor is invoked"
-                    },
-                    "details": {
-                        "name": "GetSplitToneShadowsColor"
-                    },
-                    "results": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetSmhHighlightsStart",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhHighlightsStart"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetSmhHighlightsStart is invoked"
-                    },
-                    "details": {
-                        "name": "GetSmhHighlightsStart"
+                        "name": "Get Color Grading Filter Intensity"
                     },
                     "results": [
                         {
@@ -977,61 +802,17 @@
                     ]
                 },
                 {
-                    "key": "SetChannelMixingRed",
+                    "base": "SetWhiteBalanceWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetChannelMixingRed"
+                        "tooltip": "When signaled, this will invoke Set White Balance Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetChannelMixingRed is invoked"
+                        "tooltip": "Signaled after Set White Balance Weight is invoked"
                     },
                     "details": {
-                        "name": "SetChannelMixingRed"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "SetChannelMixingGreen",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke SetChannelMixingGreen"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after SetChannelMixingGreen is invoked"
-                    },
-                    "details": {
-                        "name": "SetChannelMixingGreen"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "SetColorGradingFilterIntensity",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingFilterIntensity"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingFilterIntensity is invoked"
-                    },
-                    "details": {
-                        "name": "SetColorGradingFilterIntensity"
+                        "name": "Set White Balance Weight"
                     },
                     "params": [
                         {
@@ -1043,17 +824,259 @@
                     ]
                 },
                 {
-                    "key": "SetGenerateLut",
+                    "base": "SetSmhShadowsStart",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetGenerateLut"
+                        "tooltip": "When signaled, this will invoke Set Smh Shadows Start"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetGenerateLut is invoked"
+                        "tooltip": "Signaled after Set Smh Shadows Start is invoked"
                     },
                     "details": {
-                        "name": "SetGenerateLut"
+                        "name": "Set Smh Shadows Start"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetChannelMixingRed",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Channel Mixing Red"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Channel Mixing Red is invoked"
+                    },
+                    "details": {
+                        "name": "Get Channel Mixing Red"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetColorGradingFilterMultiply",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Color Grading Filter Multiply"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Color Grading Filter Multiply is invoked"
+                    },
+                    "details": {
+                        "name": "Get Color Grading Filter Multiply"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetColorGradingFilterMultiply",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Color Grading Filter Multiply"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Color Grading Filter Multiply is invoked"
+                    },
+                    "details": {
+                        "name": "Set Color Grading Filter Multiply"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSplitToneWeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Split Tone Weight"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Split Tone Weight is invoked"
+                    },
+                    "details": {
+                        "name": "Set Split Tone Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSplitToneShadowsColor",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Split Tone Shadows Color"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Split Tone Shadows Color is invoked"
+                    },
+                    "details": {
+                        "name": "Set Split Tone Shadows Color"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSplitToneShadowsColor",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Split Tone Shadows Color"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Split Tone Shadows Color is invoked"
+                    },
+                    "details": {
+                        "name": "Get Split Tone Shadows Color"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSmhHighlightsStart",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Smh Highlights Start"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Smh Highlights Start is invoked"
+                    },
+                    "details": {
+                        "name": "Get Smh Highlights Start"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetChannelMixingRed",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Channel Mixing Red"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Channel Mixing Red is invoked"
+                    },
+                    "details": {
+                        "name": "Set Channel Mixing Red"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetChannelMixingGreen",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Channel Mixing Green"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Channel Mixing Green is invoked"
+                    },
+                    "details": {
+                        "name": "Set Channel Mixing Green"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Vector 3"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetColorGradingFilterIntensity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Color Grading Filter Intensity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Color Grading Filter Intensity is invoked"
+                    },
+                    "details": {
+                        "name": "Set Color Grading Filter Intensity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetGenerateLut",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Generate Lut"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Generate Lut is invoked"
+                    },
+                    "details": {
+                        "name": "Set Generate Lut"
                     },
                     "params": [
                         {
@@ -1065,17 +1088,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorAdjustmentWeight",
+                    "base": "SetColorAdjustmentWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorAdjustmentWeight"
+                        "tooltip": "When signaled, this will invoke Set Color Adjustment Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorAdjustmentWeight is invoked"
+                        "tooltip": "Signaled after Set Color Adjustment Weight is invoked"
                     },
                     "details": {
-                        "name": "SetColorAdjustmentWeight"
+                        "name": "Set Color Adjustment Weight"
                     },
                     "params": [
                         {
@@ -1087,17 +1110,17 @@
                     ]
                 },
                 {
-                    "key": "GetSmhShadowsStart",
+                    "base": "GetSmhShadowsStart",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhShadowsStart"
+                        "tooltip": "When signaled, this will invoke Get Smh Shadows Start"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhShadowsStart is invoked"
+                        "tooltip": "Signaled after Get Smh Shadows Start is invoked"
                     },
                     "details": {
-                        "name": "GetSmhShadowsStart"
+                        "name": "Get Smh Shadows Start"
                     },
                     "results": [
                         {
@@ -1109,39 +1132,39 @@
                     ]
                 },
                 {
-                    "key": "SetSmhShadowsColor",
+                    "base": "SetSmhShadowsColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSmhShadowsColor"
+                        "tooltip": "When signaled, this will invoke Set Smh Shadows Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSmhShadowsColor is invoked"
+                        "tooltip": "Signaled after Set Smh Shadows Color is invoked"
                     },
                     "details": {
-                        "name": "SetSmhShadowsColor"
+                        "name": "Set Smh Shadows Color"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetFinalAdjustmentWeight",
+                    "base": "SetFinalAdjustmentWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetFinalAdjustmentWeight"
+                        "tooltip": "When signaled, this will invoke Set Final Adjustment Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetFinalAdjustmentWeight is invoked"
+                        "tooltip": "Signaled after Set Final Adjustment Weight is invoked"
                     },
                     "details": {
-                        "name": "SetFinalAdjustmentWeight"
+                        "name": "Set Final Adjustment Weight"
                     },
                     "params": [
                         {
@@ -1153,17 +1176,17 @@
                     ]
                 },
                 {
-                    "key": "GetColorGradingPostSaturation",
+                    "base": "GetColorGradingPostSaturation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingPostSaturation"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Post Saturation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingPostSaturation is invoked"
+                        "tooltip": "Signaled after Get Color Grading Post Saturation is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingPostSaturation"
+                        "name": "Get Color Grading Post Saturation"
                     },
                     "results": [
                         {
@@ -1175,17 +1198,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingPreSaturation",
+                    "base": "SetColorGradingPreSaturation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingPreSaturation"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Pre Saturation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingPreSaturation is invoked"
+                        "tooltip": "Signaled after Set Color Grading Pre Saturation is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingPreSaturation"
+                        "name": "Set Color Grading Pre Saturation"
                     },
                     "params": [
                         {
@@ -1197,17 +1220,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingHueShift",
+                    "base": "SetColorGradingHueShift",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingHueShift"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Hue Shift"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingHueShift is invoked"
+                        "tooltip": "Signaled after Set Color Grading Hue Shift is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingHueShift"
+                        "name": "Set Color Grading Hue Shift"
                     },
                     "params": [
                         {
@@ -1219,17 +1242,17 @@
                     ]
                 },
                 {
-                    "key": "GetSplitToneBalance",
+                    "base": "GetSplitToneWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSplitToneBalance"
+                        "tooltip": "When signaled, this will invoke Get Split Tone Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSplitToneBalance is invoked"
+                        "tooltip": "Signaled after Get Split Tone Weight is invoked"
                     },
                     "details": {
-                        "name": "GetSplitToneBalance"
+                        "name": "Get Split Tone Weight"
                     },
                     "results": [
                         {
@@ -1241,17 +1264,61 @@
                     ]
                 },
                 {
-                    "key": "GetColorAdjustmentWeight",
+                    "base": "SetColorGradingPostSaturation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorAdjustmentWeight"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Post Saturation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorAdjustmentWeight is invoked"
+                        "tooltip": "Signaled after Set Color Grading Post Saturation is invoked"
                     },
                     "details": {
-                        "name": "GetColorAdjustmentWeight"
+                        "name": "Set Color Grading Post Saturation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetWhiteBalanceLuminancePreservation",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set White Balance Luminance Preservation"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set White Balance Luminance Preservation is invoked"
+                    },
+                    "details": {
+                        "name": "Set White Balance Luminance Preservation"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetColorAdjustmentWeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Color Adjustment Weight"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Color Adjustment Weight is invoked"
+                    },
+                    "details": {
+                        "name": "Get Color Adjustment Weight"
                     },
                     "results": [
                         {
@@ -1263,61 +1330,61 @@
                     ]
                 },
                 {
-                    "key": "GetSmhHighlightsColor",
+                    "base": "GetSplitToneBalance",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSmhHighlightsColor"
+                        "tooltip": "When signaled, this will invoke Get Split Tone Balance"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSmhHighlightsColor is invoked"
+                        "tooltip": "Signaled after Get Split Tone Balance is invoked"
                     },
                     "details": {
-                        "name": "GetSmhHighlightsColor"
+                        "name": "Get Split Tone Balance"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSmhHighlightsColor",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Smh Highlights Color"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Smh Highlights Color is invoked"
+                    },
+                    "details": {
+                        "name": "Get Smh Highlights Color"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSplitToneWeight",
+                    "base": "SetWhiteBalanceKelvin",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSplitToneWeight"
+                        "tooltip": "When signaled, this will invoke Set White Balance Kelvin"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSplitToneWeight is invoked"
+                        "tooltip": "Signaled after Set White Balance Kelvin is invoked"
                     },
                     "details": {
-                        "name": "GetSplitToneWeight"
-                    },
-                    "results": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "SetColorGradingPostSaturation",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingPostSaturation"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingPostSaturation is invoked"
-                    },
-                    "details": {
-                        "name": "SetColorGradingPostSaturation"
+                        "name": "Set White Balance Kelvin"
                     },
                     "params": [
                         {
@@ -1329,39 +1396,17 @@
                     ]
                 },
                 {
-                    "key": "SetWhiteBalanceKelvin",
+                    "base": "GetWhiteBalanceWeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetWhiteBalanceKelvin"
+                        "tooltip": "When signaled, this will invoke Get White Balance Weight"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetWhiteBalanceKelvin is invoked"
+                        "tooltip": "Signaled after Get White Balance Weight is invoked"
                     },
                     "details": {
-                        "name": "SetWhiteBalanceKelvin"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetWhiteBalanceWeight",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetWhiteBalanceWeight"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetWhiteBalanceWeight is invoked"
-                    },
-                    "details": {
-                        "name": "GetWhiteBalanceWeight"
+                        "name": "Get White Balance Weight"
                     },
                     "results": [
                         {
@@ -1373,17 +1418,17 @@
                     ]
                 },
                 {
-                    "key": "GetColorGradingContrast",
+                    "base": "GetColorGradingContrast",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingContrast"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Contrast"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingContrast is invoked"
+                        "tooltip": "Signaled after Get Color Grading Contrast is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingContrast"
+                        "name": "Get Color Grading Contrast"
                     },
                     "results": [
                         {
@@ -1395,17 +1440,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabled"
+                        "tooltip": "When signaled, this will invoke Get Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabled is invoked"
+                        "tooltip": "Signaled after Get Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetEnabled"
+                        "name": "Get Enabled"
                     },
                     "results": [
                         {
@@ -1417,17 +1462,17 @@
                     ]
                 },
                 {
-                    "key": "GetCustomMaxExposure",
+                    "base": "GetCustomMaxExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCustomMaxExposure"
+                        "tooltip": "When signaled, this will invoke Get Custom Max Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCustomMaxExposure is invoked"
+                        "tooltip": "Signaled after Get Custom Max Exposure is invoked"
                     },
                     "details": {
-                        "name": "GetCustomMaxExposure"
+                        "name": "Get Custom Max Exposure"
                     },
                     "results": [
                         {
@@ -1439,17 +1484,17 @@
                     ]
                 },
                 {
-                    "key": "SetWhiteBalanceTint",
+                    "base": "SetWhiteBalanceTint",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetWhiteBalanceTint"
+                        "tooltip": "When signaled, this will invoke Set White Balance Tint"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetWhiteBalanceTint is invoked"
+                        "tooltip": "Signaled after Set White Balance Tint is invoked"
                     },
                     "details": {
-                        "name": "SetWhiteBalanceTint"
+                        "name": "Set White Balance Tint"
                     },
                     "params": [
                         {
@@ -1461,39 +1506,39 @@
                     ]
                 },
                 {
-                    "key": "GetChannelMixingBlue",
+                    "base": "GetChannelMixingBlue",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetChannelMixingBlue"
+                        "tooltip": "When signaled, this will invoke Get Channel Mixing Blue"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetChannelMixingBlue is invoked"
+                        "tooltip": "Signaled after Get Channel Mixing Blue is invoked"
                     },
                     "details": {
-                        "name": "GetChannelMixingBlue"
+                        "name": "Get Channel Mixing Blue"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCustomMaxExposure",
+                    "base": "SetCustomMaxExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCustomMaxExposure"
+                        "tooltip": "When signaled, this will invoke Set Custom Max Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCustomMaxExposure is invoked"
+                        "tooltip": "Signaled after Set Custom Max Exposure is invoked"
                     },
                     "details": {
-                        "name": "SetCustomMaxExposure"
+                        "name": "Set Custom Max Exposure"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names
index c28a18dfc4..588785965f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names
@@ -1,15 +1,16 @@
 {
     "entries": [
         {
-            "key": "HDRiSkyboxRequestBus",
+            "base": "HDRiSkyboxRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "HDRiSkyboxRequestBus"
+                "name": "HDRi Skybox",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetExposure",
+                    "base": "SetExposure",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetExposure"
@@ -31,7 +32,7 @@
                     ]
                 },
                 {
-                    "key": "GetExposure",
+                    "base": "GetExposure",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetExposure"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names
new file mode 100644
index 0000000000..a27119f0b6
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names
@@ -0,0 +1,234 @@
+{
+    "entries": [
+        {
+            "base": "HeightfieldProviderRequestsBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Heightfield Provider"
+            },
+            "methods": [
+                {
+                    "base": "GetHeightfieldMinHeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield Min Height"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield Min Height is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield Min Height"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Heightfield Min Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeights",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heights"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heights is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heights"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{6106BF95-5ACD-5071-8D0E-4F846C2138AD}",
+                            "details": {
+                                "name": "Heights"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightfieldMaxHeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield Max Height"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield Max Height is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield Max Height"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Heightfield Max Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightfieldGridColumns",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield Grid Columns"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield Grid Columns is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield Grid Columns"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Heightfield Grid Columns"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaterialList",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Material List"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Material List is invoked"
+                    },
+                    "details": {
+                        "name": "Get Material List"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{82111EAD-9C65-57F0-BA72-46D6D931B434}",
+                            "details": {
+                                "name": "Material List"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightfieldTransform",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield Transform"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield Transform is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield Transform"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+                            "details": {
+                                "name": "Heightfield Transform"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightfieldGridRows",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield Grid Rows"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield Grid Rows is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield Grid Rows"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Heightfield Grid Rows"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightfieldGridSpacing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield Grid Spacing"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield Grid Spacing is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield Grid Spacing"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
+                            "details": {
+                                "name": "Heightfield Grid Spacing"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightfieldAabb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heightfield AABB"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heightfield AABB is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heightfield AABB"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeightsAndMaterials",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Heights And Materials"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Heights And Materials is invoked"
+                    },
+                    "details": {
+                        "name": "Get Heights And Materials"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{887288A6-8B56-55A7-BD10-3E4B19CBFD6C}",
+                            "details": {
+                                "name": "Heights And Materials"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names
index 090c4abb00..f01c273236 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names
@@ -1,185 +1,186 @@
 {
     "entries": [
         {
-            "key": "ImageBasedLightComponentRequestBus",
+            "base": "ImageBasedLightComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ImageBasedLightComponentRequestBus"
+                "name": "Image Based Light Component",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetDiffuseImageAssetId",
+                    "base": "GetDiffuseImageAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDiffuseImageAssetId"
+                        "tooltip": "When signaled, this will invoke Get Diffuse Image Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDiffuseImageAssetId is invoked"
+                        "tooltip": "Signaled after Get Diffuse Image Asset Id is invoked"
                     },
                     "details": {
-                        "name": "GetDiffuseImageAssetId"
+                        "name": "Get Diffuse Image Asset Id"
                     },
                     "results": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetDiffuseImageAssetPath",
+                    "base": "SetDiffuseImageAssetPath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetDiffuseImageAssetPath"
+                        "tooltip": "When signaled, this will invoke Set Diffuse Image Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetDiffuseImageAssetPath is invoked"
+                        "tooltip": "Signaled after Set Diffuse Image Asset Path is invoked"
                     },
                     "details": {
-                        "name": "SetDiffuseImageAssetPath"
+                        "name": "Set Diffuse Image Asset Path"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetDiffuseImageAssetId",
+                    "base": "SetDiffuseImageAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetDiffuseImageAssetId"
+                        "tooltip": "When signaled, this will invoke Set Diffuse Image Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetDiffuseImageAssetId is invoked"
+                        "tooltip": "Signaled after Set Diffuse Image Asset Id is invoked"
                     },
                     "details": {
-                        "name": "SetDiffuseImageAssetId"
+                        "name": "Set Diffuse Image Asset Id"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSpecularImageAssetId",
+                    "base": "GetSpecularImageAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSpecularImageAssetId"
+                        "tooltip": "When signaled, this will invoke Get Specular Image Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSpecularImageAssetId is invoked"
+                        "tooltip": "Signaled after Get Specular Image Asset Id is invoked"
                     },
                     "details": {
-                        "name": "GetSpecularImageAssetId"
+                        "name": "Get Specular Image Asset Id"
                     },
                     "results": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetSpecularImageAssetPath",
+                    "base": "SetSpecularImageAssetPath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSpecularImageAssetPath"
+                        "tooltip": "When signaled, this will invoke Set Specular Image Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSpecularImageAssetPath is invoked"
+                        "tooltip": "Signaled after Set Specular Image Asset Path is invoked"
                     },
                     "details": {
-                        "name": "SetSpecularImageAssetPath"
+                        "name": "Set Specular Image Asset Path"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetSpecularImageAssetPath",
+                    "base": "GetSpecularImageAssetPath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSpecularImageAssetPath"
+                        "tooltip": "When signaled, this will invoke Get Specular Image Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSpecularImageAssetPath is invoked"
+                        "tooltip": "Signaled after Get Specular Image Asset Path is invoked"
                     },
                     "details": {
-                        "name": "GetSpecularImageAssetPath"
+                        "name": "Get Specular Image Asset Path"
                     },
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetDiffuseImageAssetPath",
+                    "base": "GetDiffuseImageAssetPath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDiffuseImageAssetPath"
+                        "tooltip": "When signaled, this will invoke Get Diffuse Image Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDiffuseImageAssetPath is invoked"
+                        "tooltip": "Signaled after Get Diffuse Image Asset Path is invoked"
                     },
                     "details": {
-                        "name": "GetDiffuseImageAssetPath"
+                        "name": "Get Diffuse Image Asset Path"
                     },
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetSpecularImageAssetId",
+                    "base": "SetSpecularImageAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSpecularImageAssetId"
+                        "tooltip": "When signaled, this will invoke Set Specular Image Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSpecularImageAssetId is invoked"
+                        "tooltip": "Signaled after Set Specular Image Asset Id is invoked"
                     },
                     "details": {
-                        "name": "SetSpecularImageAssetId"
+                        "name": "Set Specular Image Asset Id"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names
index f4f826d7b6..390c21325d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ImageGradientRequestBus",
+            "base": "ImageGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ImageGradientRequestBus"
+                "name": "Image Gradient"
             },
             "methods": [
                 {
-                    "key": "SetTilingX",
+                    "base": "SetTilingX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetTilingX"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetTilingX",
+                    "base": "GetTilingX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTilingX"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "SetImageAssetPath",
+                    "base": "SetImageAssetPath",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetImageAssetPath"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetTilingY",
+                    "base": "SetTilingY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetTilingY"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "GetImageAssetPath",
+                    "base": "GetImageAssetPath",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetImageAssetPath"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "GetTilingY",
+                    "base": "GetTilingY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTilingY"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names
new file mode 100644
index 0000000000..d444d11b65
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names
@@ -0,0 +1,178 @@
+{
+    "entries": [
+        {
+            "base": "InAppPurchasesRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "In App Purchases"
+            },
+            "methods": [
+                {
+                    "base": "FinishTransaction",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Finish Transaction"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Finish Transaction is invoked"
+                    },
+                    "details": {
+                        "name": "Finish Transaction"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "QueryPurchasedProducts",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Query Purchased Products"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Query Purchased Products is invoked"
+                    },
+                    "details": {
+                        "name": "Query Purchased Products"
+                    }
+                },
+                {
+                    "base": "PurchaseProductWithDeveloperPayload",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Purchase Product With Developer Payload"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Purchase Product With Developer Payload is invoked"
+                    },
+                    "details": {
+                        "name": "Purchase Product With Developer Payload"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "QueryProductInfoFromJson",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Query Product Info From Json"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Query Product Info From Json is invoked"
+                    },
+                    "details": {
+                        "name": "Query Product Info From Json"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PurchaseProduct",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Purchase Product"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Purchase Product is invoked"
+                    },
+                    "details": {
+                        "name": "Purchase Product"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "QueryProductInfo",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Query Product Info"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Query Product Info is invoked"
+                    },
+                    "details": {
+                        "name": "Query Product Info"
+                    }
+                },
+                {
+                    "base": "ConsumePurchase",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Consume Purchase"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Consume Purchase is invoked"
+                    },
+                    "details": {
+                        "name": "Consume Purchase"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Initialize",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Initialize"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Initialize is invoked"
+                    },
+                    "details": {
+                        "name": "Initialize"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names
new file mode 100644
index 0000000000..2ecfd9ccab
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names
@@ -0,0 +1,534 @@
+{
+    "entries": [
+        {
+            "base": "InAppPurchasesResponseAccessorBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "In App Purchases Response Accessor"
+            },
+            "methods": [
+                {
+                    "base": "RestoredOrderId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Restored Order Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Restored Order Id is invoked"
+                    },
+                    "details": {
+                        "name": "Restored Order Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ProductDescription",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Product Description"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Product Description is invoked"
+                    },
+                    "details": {
+                        "name": "Product Description"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PurchaseToken",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Purchase Token"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Purchase Token is invoked"
+                    },
+                    "details": {
+                        "name": "Purchase Token"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ResetIndices",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Reset Indices"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Reset Indices is invoked"
+                    },
+                    "details": {
+                        "name": "Reset Indices"
+                    }
+                },
+                {
+                    "base": "ProductTitle",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Product Title"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Product Title is invoked"
+                    },
+                    "details": {
+                        "name": "Product Title"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ProductPrice",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Product Price"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Product Price is invoked"
+                    },
+                    "details": {
+                        "name": "Product Price"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsAutoRenewing",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Auto Renewing"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Auto Renewing is invoked"
+                    },
+                    "details": {
+                        "name": "Is Auto Renewing"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ProductId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Product Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Product Id is invoked"
+                    },
+                    "details": {
+                        "name": "Product Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ProductPriceMicro",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Product Price Micro"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Product Price Micro is invoked"
+                    },
+                    "details": {
+                        "name": "Product Price Micro"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PurchasedProductId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Purchased Product Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Purchased Product Id is invoked"
+                    },
+                    "details": {
+                        "name": "Purchased Product Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PurchaseTime",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Purchase Time"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Purchase Time is invoked"
+                    },
+                    "details": {
+                        "name": "Purchase Time"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SubscriptionExpirationTime",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Subscription Expiration Time"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Subscription Expiration Time is invoked"
+                    },
+                    "details": {
+                        "name": "Subscription Expiration Time"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "RestoredPurchaseTime",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Restored Purchase Time"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Restored Purchase Time is invoked"
+                    },
+                    "details": {
+                        "name": "Restored Purchase Time"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PreviousPurchasedProduct",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Previous Purchased Product"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Previous Purchased Product is invoked"
+                    },
+                    "details": {
+                        "name": "Previous Purchased Product"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DeveloperPayload",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Developer Payload"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Developer Payload is invoked"
+                    },
+                    "details": {
+                        "name": "Developer Payload"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PackageName",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Package Name"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Package Name is invoked"
+                    },
+                    "details": {
+                        "name": "Package Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PreviousProduct",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Previous Product"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Previous Product is invoked"
+                    },
+                    "details": {
+                        "name": "Previous Product"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "NextPurchasedProduct",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Next Purchased Product"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Next Purchased Product is invoked"
+                    },
+                    "details": {
+                        "name": "Next Purchased Product"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ProductCurrencyCode",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Product Currency Code"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Product Currency Code is invoked"
+                    },
+                    "details": {
+                        "name": "Product Currency Code"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "HasDownloads",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Has Downloads"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Has Downloads is invoked"
+                    },
+                    "details": {
+                        "name": "Has Downloads"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "NextProduct",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Next Product"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Next Product is invoked"
+                    },
+                    "details": {
+                        "name": "Next Product"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "OrderId",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Order Id"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Order Id is invoked"
+                    },
+                    "details": {
+                        "name": "Order Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "PurchaseSignature",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Purchase Signature"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Purchase Signature is invoked"
+                    },
+                    "details": {
+                        "name": "Purchase Signature"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsProductOwned",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Product Owned"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Product Owned is invoked"
+                    },
+                    "details": {
+                        "name": "Is Product Owned"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names
index 883bed230d..a30ad8ba30 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "InputSystemRequestBus",
+            "base": "InputSystemRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "InputSystemRequestBus"
+                "name": "Input System",
+                "category": "Input"
             },
             "methods": [
                 {
-                    "key": "RecreateEnabledInputDevices",
+                    "base": "RecreateEnabledInputDevices",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RecreateEnabledInputDevices"
+                        "tooltip": "When signaled, this will invoke Recreate Enabled Input Devices"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RecreateEnabledInputDevices is invoked"
+                        "tooltip": "Signaled after Recreate Enabled Input Devices is invoked"
                     },
                     "details": {
-                        "name": "RecreateEnabledInputDevices"
+                        "name": "Recreate Enabled Input Devices"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names
index 4fc68d7cd8..ad15c077a2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "InvertGradientRequestBus",
+            "base": "InvertGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "InvertGradientRequestBus"
+                "name": "Invert Gradient"
             },
             "methods": [
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names
index b261321830..24d7087be4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "LevelsGradientRequestBus",
+            "base": "LevelsGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "LevelsGradientRequestBus"
+                "name": "Levels Gradient"
             },
             "methods": [
                 {
-                    "key": "GetOutputMax",
+                    "base": "GetOutputMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOutputMax"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetInputMax",
+                    "base": "SetInputMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetInputMax"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "SetOutputMax",
+                    "base": "SetOutputMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOutputMax"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetInputMid",
+                    "base": "SetInputMid",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetInputMid"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "SetOutputMin",
+                    "base": "SetOutputMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOutputMin"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
@@ -141,7 +141,7 @@
                     ]
                 },
                 {
-                    "key": "SetInputMin",
+                    "base": "SetInputMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetInputMin"
@@ -163,7 +163,7 @@
                     ]
                 },
                 {
-                    "key": "GetInputMid",
+                    "base": "GetInputMid",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetInputMid"
@@ -185,7 +185,7 @@
                     ]
                 },
                 {
-                    "key": "GetInputMax",
+                    "base": "GetInputMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetInputMax"
@@ -207,7 +207,7 @@
                     ]
                 },
                 {
-                    "key": "GetOutputMin",
+                    "base": "GetOutputMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOutputMin"
@@ -229,7 +229,7 @@
                     ]
                 },
                 {
-                    "key": "GetInputMin",
+                    "base": "GetInputMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetInputMin"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names
index f45199ea84..699b0195ca 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names
@@ -1,76 +1,82 @@
 {
     "entries": [
         {
-            "key": "LookAt",
+            "base": "LookAt",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "LookAt"
+                "name": "Look At",
+                "category": "Gameplay"
             },
             "methods": [
                 {
-                    "key": "SetTarget",
+                    "base": "SetTarget",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTarget"
+                        "tooltip": "When signaled, this will invoke Set Target"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTarget is invoked"
+                        "tooltip": "Signaled after Set Target is invoked"
                     },
                     "details": {
-                        "name": "SetTarget"
+                        "name": "Set Target",
+                        "tooltip": "Set the entity to look at"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
-                                "tooltip": "Entity Unique Id"
+                                "name": "Target",
+                                "tooltip": "The entity to look at"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetTargetPosition",
+                    "base": "SetTargetPosition",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTargetPosition"
+                        "tooltip": "When signaled, this will invoke Set Target Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTargetPosition is invoked"
+                        "tooltip": "Signaled after Set Target Position is invoked"
                     },
                     "details": {
-                        "name": "SetTargetPosition"
+                        "name": "Set Target Position",
+                        "tooltip": "Sets the target position to look at."
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position",
+                                "tooltip": "The position to look at"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAxis",
+                    "base": "SetAxis",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAxis"
+                        "tooltip": "When signaled, this will invoke Set Axis"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAxis is invoked"
+                        "tooltip": "Signaled after Set Axis is invoked"
                     },
                     "details": {
-                        "name": "SetAxis"
+                        "name": "Set Axis",
+                        "tooltip": "Specify the forward axis to use as reference for the look at"
                     },
                     "params": [
                         {
                             "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
                             "details": {
-                                "name": "unsigned char"
+                                "name": "Axis",
+                                "tooltip": "The forward axis to use as reference"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names
index 7e38e83e06..736915ef9c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "LookModificationRequestBus",
+            "base": "LookModificationRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "LookModificationRequestBus"
+                "name": "Look Modification",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetColorGradingLutOverride",
+                    "base": "SetColorGradingLutOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingLutOverride"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Lut Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingLutOverride is invoked"
+                        "tooltip": "Signaled after Set Color Grading Lut Override is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingLutOverride"
+                        "name": "Set Color Grading Lut Override"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "SetCustomMaxExposure",
+                    "base": "SetCustomMaxExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCustomMaxExposure"
+                        "tooltip": "When signaled, this will invoke Set Custom Max Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCustomMaxExposure is invoked"
+                        "tooltip": "Signaled after Set Custom Max Exposure is invoked"
                     },
                     "details": {
-                        "name": "SetCustomMaxExposure"
+                        "name": "Set Custom Max Exposure"
                     },
                     "params": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "SetCustomMinExposure",
+                    "base": "SetCustomMinExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCustomMinExposure"
+                        "tooltip": "When signaled, this will invoke Set Custom Min Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCustomMinExposure is invoked"
+                        "tooltip": "Signaled after Set Custom Min Exposure is invoked"
                     },
                     "details": {
-                        "name": "SetCustomMinExposure"
+                        "name": "Set Custom Min Exposure"
                     },
                     "params": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "GetCustomMinExposure",
+                    "base": "GetCustomMinExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCustomMinExposure"
+                        "tooltip": "When signaled, this will invoke Get Custom Min Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCustomMinExposure is invoked"
+                        "tooltip": "Signaled after Get Custom Min Exposure is invoked"
                     },
                     "details": {
-                        "name": "GetCustomMinExposure"
+                        "name": "Get Custom Min Exposure"
                     },
                     "results": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "GetColorGradingLut",
+                    "base": "GetColorGradingLut",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingLut"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Lut"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingLut is invoked"
+                        "tooltip": "Signaled after Get Color Grading Lut is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingLut"
+                        "name": "Get Color Grading Lut"
                     },
                     "results": [
                         {
@@ -119,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "GetColorGradingLutIntensity",
+                    "base": "GetColorGradingLutIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingLutIntensity"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Lut Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingLutIntensity is invoked"
+                        "tooltip": "Signaled after Get Color Grading Lut Intensity is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingLutIntensity"
+                        "name": "Get Color Grading Lut Intensity"
                     },
                     "results": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "GetColorGradingLutOverride",
+                    "base": "GetColorGradingLutOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColorGradingLutOverride"
+                        "tooltip": "When signaled, this will invoke Get Color Grading Lut Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColorGradingLutOverride is invoked"
+                        "tooltip": "Signaled after Get Color Grading Lut Override is invoked"
                     },
                     "details": {
-                        "name": "GetColorGradingLutOverride"
+                        "name": "Get Color Grading Lut Override"
                     },
                     "results": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingLut",
+                    "base": "SetColorGradingLut",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingLut"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Lut"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingLut is invoked"
+                        "tooltip": "Signaled after Set Color Grading Lut is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingLut"
+                        "name": "Set Color Grading Lut"
                     },
                     "params": [
                         {
@@ -185,17 +186,17 @@
                     ]
                 },
                 {
-                    "key": "SetColorGradingLutIntensity",
+                    "base": "SetColorGradingLutIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColorGradingLutIntensity"
+                        "tooltip": "When signaled, this will invoke Set Color Grading Lut Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColorGradingLutIntensity is invoked"
+                        "tooltip": "Signaled after Set Color Grading Lut Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetColorGradingLutIntensity"
+                        "name": "Set Color Grading Lut Intensity"
                     },
                     "params": [
                         {
@@ -207,17 +208,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
@@ -229,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabled"
+                        "tooltip": "When signaled, this will invoke Get Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabled is invoked"
+                        "tooltip": "Signaled after Get Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetEnabled"
+                        "name": "Get Enabled"
                     },
                     "results": [
                         {
@@ -251,17 +252,17 @@
                     ]
                 },
                 {
-                    "key": "SetShaperPresetType",
+                    "base": "SetShaperPresetType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetShaperPresetType"
+                        "tooltip": "When signaled, this will invoke Set Shaper Preset Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetShaperPresetType is invoked"
+                        "tooltip": "Signaled after Set Shaper Preset Type is invoked"
                     },
                     "details": {
-                        "name": "SetShaperPresetType"
+                        "name": "Set Shaper Preset Type"
                     },
                     "params": [
                         {
@@ -273,17 +274,17 @@
                     ]
                 },
                 {
-                    "key": "GetShaperPresetType",
+                    "base": "GetShaperPresetType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetShaperPresetType"
+                        "tooltip": "When signaled, this will invoke Get Shaper Preset Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetShaperPresetType is invoked"
+                        "tooltip": "Signaled after Get Shaper Preset Type is invoked"
                     },
                     "details": {
-                        "name": "GetShaperPresetType"
+                        "name": "Get Shaper Preset Type"
                     },
                     "results": [
                         {
@@ -295,17 +296,17 @@
                     ]
                 },
                 {
-                    "key": "GetCustomMaxExposure",
+                    "base": "GetCustomMaxExposure",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCustomMaxExposure"
+                        "tooltip": "When signaled, this will invoke Get Custom Max Exposure"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCustomMaxExposure is invoked"
+                        "tooltip": "Signaled after Get Custom Max Exposure is invoked"
                     },
                     "details": {
-                        "name": "GetCustomMaxExposure"
+                        "name": "Get Custom Max Exposure"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names
index 6e8aff1df5..3287656724 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "LyShineExamplesCppExampleBus",
+            "base": "LyShineExamplesCppExampleBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "LyShineExamplesCppExampleBus",
-                "category": "UI/LyShine Examples"
+                "name": "UI Examples",
+                "category": "UI"
             },
             "methods": [
                 {
-                    "key": "CreateCanvas",
+                    "base": "CreateCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Create Canvas"
@@ -20,12 +20,11 @@
                         "tooltip": "Signaled after Create Canvas is invoked"
                     },
                     "details": {
-                        "name": "Create Canvas",
-                        "tooltip": "Creates a canvas using C++"
+                        "name": "Create Canvas"
                     }
                 },
                 {
-                    "key": "DestroyCanvas",
+                    "base": "DestroyCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Destroy Canvas"
@@ -35,8 +34,7 @@
                         "tooltip": "Signaled after Destroy Canvas is invoked"
                     },
                     "details": {
-                        "name": "Destroy Canvas",
-                        "tooltip": "Destroys a canvas using C++"
+                        "name": "Destroy Canvas"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names
index d5a66328b5..fa2ade0412 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names
@@ -1,31 +1,32 @@
 {
     "entries": [
         {
-            "key": "MaterialComponentRequestBus",
+            "base": "MaterialComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "MaterialComponentRequestBus"
+                "name": "Material",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetPropertyOverrides",
+                    "base": "GetPropertyOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrides"
+                        "tooltip": "When signaled, this will invoke Get Property Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrides is invoked"
+                        "tooltip": "Signaled after Get Property Overrides is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrides"
+                        "name": "Get Property Overrides"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         }
                     ],
@@ -33,113 +34,113 @@
                         {
                             "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                             "details": {
-                                "name": "AZStd::unordered_map"
+                                "name": "AZ Std::unordered_map"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrides",
+                    "base": "SetPropertyOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrides"
+                        "tooltip": "When signaled, this will invoke Set Property Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrides is invoked"
+                        "tooltip": "Signaled after Set Property Overrides is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrides"
+                        "name": "Set Property Overrides"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                             "details": {
-                                "name": "AZStd::unordered_map"
+                                "name": "AZ Std::unordered_map"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearPropertyOverride",
+                    "base": "ClearPropertyOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearPropertyOverride"
+                        "tooltip": "When signaled, this will invoke Clear Property Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearPropertyOverride is invoked"
+                        "tooltip": "Signaled after Clear Property Override is invoked"
                     },
                     "details": {
-                        "name": "ClearPropertyOverride"
+                        "name": "Clear Property Override"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearPropertyOverrides",
+                    "base": "ClearPropertyOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearPropertyOverrides"
+                        "tooltip": "When signaled, this will invoke Clear Property Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearPropertyOverrides is invoked"
+                        "tooltip": "Signaled after Clear Property Overrides is invoked"
                     },
                     "details": {
-                        "name": "ClearPropertyOverrides"
+                        "name": "Clear Property Overrides"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideVector4",
+                    "base": "GetPropertyOverrideVector4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideVector4"
+                        "tooltip": "When signaled, this will invoke Get Property Override Vector 4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideVector4 is invoked"
+                        "tooltip": "Signaled after Get Property Override Vector 4 is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideVector4"
+                        "name": "Get Property Override Vector 4"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -147,71 +148,35 @@
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4"
+                                "name": "Vector 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideImageInstance",
+                    "base": "GetPropertyOverrideUInt32",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideImageInstance"
+                        "tooltip": "When signaled, this will invoke Get Property OverrideU Int 32"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideImageInstance is invoked"
+                        "tooltip": "Signaled after Get Property OverrideU Int 32 is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideImageInstance"
+                        "name": "Get Property OverrideU Int 32"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
-                            }
-                        }
-                    ],
-                    "results": [
-                        {
-                            "typeid": "{C0311D23-97F1-556C-B6A4-ECD726543686}",
-                            "details": {
-                                "name": "AZStd::intrusive_ptr"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetPropertyOverrideUInt32",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideUInt32"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideUInt32 is invoked"
-                    },
-                    "details": {
-                        "name": "GetPropertyOverrideUInt32"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -225,29 +190,29 @@
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideBool",
+                    "base": "GetPropertyOverrideBool",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideBool"
+                        "tooltip": "When signaled, this will invoke Get Property Override Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideBool is invoked"
+                        "tooltip": "Signaled after Get Property Override Bool is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideBool"
+                        "name": "Get Property Override Bool"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -261,163 +226,141 @@
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideImageAsset",
+                    "base": "SetPropertyOverrideEnum",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideImageAsset"
+                        "tooltip": "When signaled, this will invoke Set Property Override Enum"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideImageAsset is invoked"
+                        "tooltip": "Signaled after Set Property Override Enum is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideImageAsset"
+                        "name": "Set Property Override Enum"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
-                        }
-                    ],
-                    "results": [
+                        },
                         {
-                            "typeid": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "Asset"
+                                "name": "unsigned int"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideVector2",
+                    "base": "SetPropertyOverrideVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideVector2"
+                        "tooltip": "When signaled, this will invoke Set Property Override Vector 2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideVector2 is invoked"
+                        "tooltip": "Signaled after Set Property Override Vector 2 is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideVector2"
+                        "name": "Set Property Override Vector 2"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearAllPropertyOverrides",
+                    "base": "GetPropertyOverrideImage",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearAllPropertyOverrides"
+                        "tooltip": "When signaled, this will invoke Get Property Override Image"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearAllPropertyOverrides is invoked"
+                        "tooltip": "Signaled after Get Property Override Image is invoked"
                     },
                     "details": {
-                        "name": "ClearAllPropertyOverrides"
-                    }
-                },
-                {
-                    "key": "ClearMaterialOverride",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearMaterialOverride"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after ClearMaterialOverride is invoked"
-                    },
-                    "details": {
-                        "name": "ClearMaterialOverride"
+                        "name": "Get Property Override Image"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "SetPropertyOverrideImageInstance",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideImageInstance"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideImageInstance is invoked"
-                    },
-                    "details": {
-                        "name": "SetPropertyOverrideImageInstance"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
-                        },
+                        }
+                    ],
+                    "results": [
                         {
-                            "typeid": "{C0311D23-97F1-556C-B6A4-ECD726543686}",
+                            "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AZStd::intrusive_ptr"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMaterialSlotLabel",
+                    "base": "ClearAllPropertyOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaterialSlotLabel"
+                        "tooltip": "When signaled, this will invoke Clear All Property Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaterialSlotLabel is invoked"
+                        "tooltip": "Signaled after Clear All Property Overrides is invoked"
                     },
                     "details": {
-                        "name": "GetMaterialSlotLabel"
+                        "name": "Clear All Property Overrides"
+                    }
+                },
+                {
+                    "base": "GetMaterialSlotLabel",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Material Slot Label"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Material Slot Label is invoked"
+                    },
+                    "details": {
+                        "name": "Get Material Slot Label"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         }
                     ],
@@ -425,83 +368,83 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideVector3",
+                    "base": "SetPropertyOverrideVector3",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideVector3"
+                        "tooltip": "When signaled, this will invoke Set Property Override Vector 3"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideVector3 is invoked"
+                        "tooltip": "Signaled after Set Property Override Vector 3 is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideVector3"
+                        "name": "Set Property Override Vector 3"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearInvalidMaterialOverrides",
+                    "base": "ClearInvalidMaterialOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearInvalidMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Clear Invalid Material Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearInvalidMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Clear Invalid Material Overrides is invoked"
                     },
                     "details": {
-                        "name": "ClearInvalidMaterialOverrides"
+                        "name": "Clear Invalid Material Overrides"
                     }
                 },
                 {
-                    "key": "SetPropertyOverrideBool",
+                    "base": "SetPropertyOverrideBool",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideBool"
+                        "tooltip": "When signaled, this will invoke Set Property Override Bool"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideBool is invoked"
+                        "tooltip": "Signaled after Set Property Override Bool is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideBool"
+                        "name": "Set Property Override Bool"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
@@ -513,143 +456,143 @@
                     ]
                 },
                 {
-                    "key": "RepairInvalidMaterialOverrides",
+                    "base": "RepairInvalidMaterialOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RepairInvalidMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Repair Invalid Material Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RepairInvalidMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Repair Invalid Material Overrides is invoked"
                     },
                     "details": {
-                        "name": "RepairInvalidMaterialOverrides"
+                        "name": "Repair Invalid Material Overrides"
                     }
                 },
                 {
-                    "key": "SetPropertyOverrideString",
+                    "base": "SetPropertyOverrideString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideString"
+                        "tooltip": "When signaled, this will invoke Set Property Override String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideString is invoked"
+                        "tooltip": "Signaled after Set Property Override String is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideString"
+                        "name": "Set Property Override String"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetDefaultMaterialOverride",
+                    "base": "SetDefaultMaterialOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetDefaultMaterialOverride"
+                        "tooltip": "When signaled, this will invoke Set Default Material Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetDefaultMaterialOverride is invoked"
+                        "tooltip": "Signaled after Set Default Material Override is invoked"
                     },
                     "details": {
-                        "name": "SetDefaultMaterialOverride"
+                        "name": "Set Default Material Override"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetDefaultMaterialOverride",
+                    "base": "GetDefaultMaterialOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDefaultMaterialOverride"
+                        "tooltip": "When signaled, this will invoke Get Default Material Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDefaultMaterialOverride is invoked"
+                        "tooltip": "Signaled after Get Default Material Override is invoked"
                     },
                     "details": {
-                        "name": "GetDefaultMaterialOverride"
+                        "name": "Get Default Material Override"
                     },
                     "results": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetMaterialOverrides",
+                    "base": "SetMaterialOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Set Material Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Set Material Overrides is invoked"
                     },
                     "details": {
-                        "name": "SetMaterialOverrides"
+                        "name": "Set Material Overrides"
                     },
                     "params": [
                         {
                             "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                             "details": {
-                                "name": "AZStd::unordered_map"
+                                "name": "AZ Std::unordered_map"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideString",
+                    "base": "GetPropertyOverrideString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideString"
+                        "tooltip": "When signaled, this will invoke Get Property Override String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideString is invoked"
+                        "tooltip": "Signaled after Get Property Override String is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideString"
+                        "name": "Get Property Override String"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -657,51 +600,51 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMaterialOverrides",
+                    "base": "GetMaterialOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Get Material Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Get Material Overrides is invoked"
                     },
                     "details": {
-                        "name": "GetMaterialOverrides"
+                        "name": "Get Material Overrides"
                     },
                     "results": [
                         {
                             "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                             "details": {
-                                "name": "AZStd::unordered_map"
+                                "name": "AZ Std::unordered_map"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMaterialOverride",
+                    "base": "GetMaterialOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaterialOverride"
+                        "tooltip": "When signaled, this will invoke Get Material Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaterialOverride is invoked"
+                        "tooltip": "Signaled after Get Material Override is invoked"
                     },
                     "details": {
-                        "name": "GetMaterialOverride"
+                        "name": "Get Material Override"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         }
                     ],
@@ -709,69 +652,69 @@
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideVector4",
+                    "base": "SetPropertyOverrideVector4",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideVector4"
+                        "tooltip": "When signaled, this will invoke Set Property Override Vector 4"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideVector4 is invoked"
+                        "tooltip": "Signaled after Set Property Override Vector 4 is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideVector4"
+                        "name": "Set Property Override Vector 4"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
                             "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
                             "details": {
-                                "name": "Vector4"
+                                "name": "Vector 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideUInt32",
+                    "base": "SetPropertyOverrideUInt32",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideUInt32"
+                        "tooltip": "When signaled, this will invoke Set Property OverrideU Int 32"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideUInt32 is invoked"
+                        "tooltip": "Signaled after Set Property OverrideU Int 32 is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideUInt32"
+                        "name": "Set Property OverrideU Int 32"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
@@ -783,29 +726,29 @@
                     ]
                 },
                 {
-                    "key": "FindMaterialAssignmentId",
+                    "base": "FindMaterialAssignmentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindMaterialAssignmentId"
+                        "tooltip": "When signaled, this will invoke Find Material Assignment Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindMaterialAssignmentId is invoked"
+                        "tooltip": "Signaled after Find Material Assignment Id is invoked"
                     },
                     "details": {
-                        "name": "FindMaterialAssignmentId"
+                        "name": "Find Material Assignment Id"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "AZ::u 64"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -813,69 +756,35 @@
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideImageAsset",
+                    "base": "GetPropertyOverrideInt32",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideImageAsset"
+                        "tooltip": "When signaled, this will invoke Get Property Override Int 32"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideImageAsset is invoked"
+                        "tooltip": "Signaled after Get Property Override Int 32 is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideImageAsset"
+                        "name": "Get Property Override Int 32"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
-                            }
-                        },
-                        {
-                            "typeid": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
-                            "details": {
-                                "name": "Asset"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetPropertyOverrideInt32",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideInt32"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideInt32 is invoked"
-                    },
-                    "details": {
-                        "name": "GetPropertyOverrideInt32"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
-                            "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
-                            }
-                        },
-                        {
-                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
-                            "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -889,29 +798,65 @@
                     ]
                 },
                 {
-                    "key": "SetPropertyOverride",
+                    "base": "GetPropertyOverrideEnum",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverride"
+                        "tooltip": "When signaled, this will invoke Get Property Override Enum"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverride is invoked"
+                        "tooltip": "Signaled after Get Property Override Enum is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverride"
+                        "name": "Get Property Override Enum"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetPropertyOverride",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Property Override"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Property Override is invoked"
+                    },
+                    "details": {
+                        "name": "Set Property Override"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "AZ:: Render:: Material Assignment Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
                             }
                         },
                         {
@@ -923,51 +868,51 @@
                     ]
                 },
                 {
-                    "key": "GetOriginalMaterialAssignments",
+                    "base": "GetOriginalMaterialAssignments",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOriginalMaterialAssignments"
+                        "tooltip": "When signaled, this will invoke Get Original Material Assignments"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOriginalMaterialAssignments is invoked"
+                        "tooltip": "Signaled after Get Original Material Assignments is invoked"
                     },
                     "details": {
-                        "name": "GetOriginalMaterialAssignments"
+                        "name": "Get Original Material Assignments"
                     },
                     "results": [
                         {
                             "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                             "details": {
-                                "name": "AZStd::unordered_map"
+                                "name": "AZ Std::unordered_map"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPropertyOverride",
+                    "base": "GetPropertyOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverride"
+                        "tooltip": "When signaled, this will invoke Get Property Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverride is invoked"
+                        "tooltip": "Signaled after Get Property Override is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverride"
+                        "name": "Get Property Override"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -981,37 +926,37 @@
                     ]
                 },
                 {
-                    "key": "ClearModelMaterialOverrides",
+                    "base": "ClearModelMaterialOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearModelMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Clear Model Material Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearModelMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Clear Model Material Overrides is invoked"
                     },
                     "details": {
-                        "name": "ClearModelMaterialOverrides"
+                        "name": "Clear Model Material Overrides"
                     }
                 },
                 {
-                    "key": "GetDefaultMaterialAssetId",
+                    "base": "GetDefaultMaterialAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetDefaultMaterialAssetId"
+                        "tooltip": "When signaled, this will invoke Get Default Material Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetDefaultMaterialAssetId is invoked"
+                        "tooltip": "Signaled after Get Default Material Asset Id is invoked"
                     },
                     "details": {
-                        "name": "GetDefaultMaterialAssetId"
+                        "name": "Get Default Material Asset Id"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         }
                     ],
@@ -1019,35 +964,35 @@
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideInt32",
+                    "base": "SetPropertyOverrideInt32",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideInt32"
+                        "tooltip": "When signaled, this will invoke Set Property Override Int 32"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideInt32 is invoked"
+                        "tooltip": "Signaled after Set Property Override Int 32 is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideInt32"
+                        "name": "Set Property Override Int 32"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
@@ -1059,29 +1004,63 @@
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideVector2",
+                    "base": "SetPropertyOverrideImage",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideVector2"
+                        "tooltip": "When signaled, this will invoke Set Property Override Image"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideVector2 is invoked"
+                        "tooltip": "Signaled after Set Property Override Image is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideVector2"
+                        "name": "Set Property Override Image"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
+                            }
+                        },
+                        {
+                            "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
+                            "details": {
+                                "name": "Asset Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetPropertyOverrideVector2",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Property Override Vector 2"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Property Override Vector 2 is invoked"
+                    },
+                    "details": {
+                        "name": "Get Property Override Vector 2"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "AZ:: Render:: Material Assignment Id"
+                            }
+                        },
+                        {
+                            "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+                            "details": {
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -1089,49 +1068,49 @@
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearAllMaterialOverrides",
+                    "base": "ClearAllMaterialOverrides",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearAllMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Clear All Material Overrides"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearAllMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Clear All Material Overrides is invoked"
                     },
                     "details": {
-                        "name": "ClearAllMaterialOverrides"
+                        "name": "Clear All Material Overrides"
                     }
                 },
                 {
-                    "key": "GetPropertyOverrideColor",
+                    "base": "GetPropertyOverrideColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideColor"
+                        "tooltip": "When signaled, this will invoke Get Property Override Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideColor is invoked"
+                        "tooltip": "Signaled after Get Property Override Color is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideColor"
+                        "name": "Get Property Override Color"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -1145,29 +1124,29 @@
                     ]
                 },
                 {
-                    "key": "SetPropertyOverrideFloat",
+                    "base": "SetPropertyOverrideFloat",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideFloat"
+                        "tooltip": "When signaled, this will invoke Set Property Override Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideFloat is invoked"
+                        "tooltip": "Signaled after Set Property Override Float is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideFloat"
+                        "name": "Set Property Override Float"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
@@ -1179,57 +1158,101 @@
                     ]
                 },
                 {
-                    "key": "ClearLodMaterialOverrides",
+                    "base": "ApplyAutomaticPropertyUpdates",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearLodMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Apply Automatic Property Updates"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearLodMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Apply Automatic Property Updates is invoked"
                     },
                     "details": {
-                        "name": "ClearLodMaterialOverrides"
-                    }
+                        "name": "Apply Automatic Property Updates"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
                 },
                 {
-                    "key": "ClearIncompatibleMaterialOverrides",
+                    "base": "ClearMaterialOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearIncompatibleMaterialOverrides"
+                        "tooltip": "When signaled, this will invoke Clear Material Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearIncompatibleMaterialOverrides is invoked"
+                        "tooltip": "Signaled after Clear Material Override is invoked"
                     },
                     "details": {
-                        "name": "ClearIncompatibleMaterialOverrides"
-                    }
-                },
-                {
-                    "key": "GetPropertyOverrideVector3",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideVector3"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideVector3 is invoked"
-                    },
-                    "details": {
-                        "name": "GetPropertyOverrideVector3"
+                        "name": "Clear Material Override"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ClearLodMaterialOverrides",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Clear Lod Material Overrides"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Clear Lod Material Overrides is invoked"
+                    },
+                    "details": {
+                        "name": "Clear Lod Material Overrides"
+                    }
+                },
+                {
+                    "base": "ClearIncompatibleMaterialOverrides",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Clear Incompatible Material Overrides"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Clear Incompatible Material Overrides is invoked"
+                    },
+                    "details": {
+                        "name": "Clear Incompatible Material Overrides"
+                    }
+                },
+                {
+                    "base": "GetPropertyOverrideVector3",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Property Override Vector 3"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Property Override Vector 3 is invoked"
+                    },
+                    "details": {
+                        "name": "Get Property Override Vector 3"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
@@ -1237,49 +1260,49 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Vector 3"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ClearDefaultMaterialOverride",
+                    "base": "ClearDefaultMaterialOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke ClearDefaultMaterialOverride"
+                        "tooltip": "When signaled, this will invoke Clear Default Material Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after ClearDefaultMaterialOverride is invoked"
+                        "tooltip": "Signaled after Clear Default Material Override is invoked"
                     },
                     "details": {
-                        "name": "ClearDefaultMaterialOverride"
+                        "name": "Clear Default Material Override"
                     }
                 },
                 {
-                    "key": "SetPropertyOverrideColor",
+                    "base": "SetPropertyOverrideColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPropertyOverrideColor"
+                        "tooltip": "When signaled, this will invoke Set Property Override Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPropertyOverrideColor is invoked"
+                        "tooltip": "Signaled after Set Property Override Color is invoked"
                     },
                     "details": {
-                        "name": "SetPropertyOverrideColor"
+                        "name": "Set Property Override Color"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         },
                         {
@@ -1291,57 +1314,57 @@
                     ]
                 },
                 {
-                    "key": "SetMaterialOverride",
+                    "base": "SetMaterialOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetMaterialOverride"
+                        "tooltip": "When signaled, this will invoke Set Material Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetMaterialOverride is invoked"
+                        "tooltip": "Signaled after Set Material Override is invoked"
                     },
                     "details": {
-                        "name": "SetMaterialOverride"
+                        "name": "Set Material Override"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPropertyOverrideFloat",
+                    "base": "GetPropertyOverrideFloat",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPropertyOverrideFloat"
+                        "tooltip": "When signaled, this will invoke Get Property Override Float"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPropertyOverrideFloat is invoked"
+                        "tooltip": "Signaled after Get Property Override Float is invoked"
                     },
                     "details": {
-                        "name": "GetPropertyOverrideFloat"
+                        "name": "Get Property Override Float"
                     },
                     "params": [
                         {
                             "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
                             "details": {
-                                "name": "AZ::Render::MaterialAssignmentId"
+                                "name": "AZ:: Render:: Material Assignment Id"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ],
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names
new file mode 100644
index 0000000000..93acae35d7
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names
@@ -0,0 +1,883 @@
+{
+    "entries": [
+        {
+            "base": "MetastreamRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Metastream"
+            },
+            "methods": [
+                {
+                    "base": "AddDoubleToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Double To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Double To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add Double To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "double"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddEntityIdToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Entity Id To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Entity Id To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add Entity Id To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddStringToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add String To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add String To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add String To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddStringToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add String To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add String To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add String To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddSigned64ToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Signed 64 To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Signed 64 To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Signed 64 To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}",
+                            "details": {
+                                "name": "AZ::s 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddUnsigned64ToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Unsigned 64 To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Unsigned 64 To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add Unsigned 64 To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddSigned64ToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Signed 64 To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Signed 64 To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Signed 64 To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}",
+                            "details": {
+                                "name": "AZ::s 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddUnsigned64ToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Unsigned 64 To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Unsigned 64 To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Unsigned 64 To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddStringToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add String To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add String To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add String To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddBoolToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Bool To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Bool To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Bool To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddDoubleToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Double To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Double To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Double To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "double"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddArrayToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Array To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Array To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Array To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddObjectToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Object To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Object To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Object To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddBoolToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Bool To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Bool To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add Bool To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddBoolToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Bool To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Bool To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Bool To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddEntityIdToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Entity Id To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Entity Id To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Entity Id To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "StopHTTPServer",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke StopHTTP Server"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after StopHTTP Server is invoked"
+                    },
+                    "details": {
+                        "name": "StopHTTP Server"
+                    }
+                },
+                {
+                    "base": "AddEntityIdToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Entity Id To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Entity Id To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Entity Id To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddArrayToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Array To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Array To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Array To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddObjectToCache",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Object To Cache"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Object To Cache is invoked"
+                    },
+                    "details": {
+                        "name": "Add Object To Cache"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddUnsigned64ToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Unsigned 64 To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Unsigned 64 To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Unsigned 64 To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "StartHTTPServer",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke StartHTTP Server"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after StartHTTP Server is invoked"
+                    },
+                    "details": {
+                        "name": "StartHTTP Server"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "bool"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddObjectToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Object To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Object To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add Object To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddSigned64ToArray",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Signed 64 To Array"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Signed 64 To Array is invoked"
+                    },
+                    "details": {
+                        "name": "Add Signed 64 To Array"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}",
+                            "details": {
+                                "name": "AZ::s 64"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "AddDoubleToObject",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Add Double To Object"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Add Double To Object is invoked"
+                    },
+                    "details": {
+                        "name": "Add Double To Object"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        },
+                        {
+                            "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+                            "details": {
+                                "name": "double"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names
index 3fd5976810..f20f3359af 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "MixedGradientRequestBus",
+            "base": "MixedGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "MixedGradientRequestBus"
+                "name": "Mixed Gradient"
             },
             "methods": [
                 {
-                    "key": "GetNumLayers",
+                    "base": "GetNumLayers",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumLayers"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "AddLayer",
+                    "base": "AddLayer",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddLayer"
@@ -45,7 +45,7 @@
                     }
                 },
                 {
-                    "key": "RemoveLayer",
+                    "base": "RemoveLayer",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveLayer"
@@ -67,7 +67,7 @@
                     ]
                 },
                 {
-                    "key": "GetLayer",
+                    "base": "GetLayer",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetLayer"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names
index 407a176d4c..d30deb459a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names	
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names	
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Multi-Position Audio Requests",
+            "base": "Multi-Position Audio Requests",
             "context": "EBusSender",
             "variant": "",
             "details": {
@@ -9,69 +9,70 @@
             },
             "methods": [
                 {
-                    "key": "AddEntity",
+                    "base": "Add Entity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke AddEntity"
+                        "tooltip": "When signaled, this will invoke Add Entity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after AddEntity is invoked"
+                        "tooltip": "Signaled after Add Entity is invoked"
                     },
                     "details": {
-                        "name": "AddEntity"
+                        "name": "Add Entity"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RemoveEntity",
+                    "base": "RemoveEntity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke RemoveEntity"
+                        "tooltip": "When signaled, this will invoke Remove Entity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after RemoveEntity is invoked"
+                        "tooltip": "Signaled after Remove Entity is invoked"
                     },
                     "details": {
-                        "name": "RemoveEntity"
+                        "name": "Remove Entity"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetBehaviorType",
+                    "base": "SetBehaviorType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBehaviorType"
+                        "tooltip": "When signaled, this will invoke Set Behavior Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBehaviorType is invoked"
+                        "tooltip": "Signaled after Set Behavior Type is invoked"
                     },
                     "details": {
-                        "name": "SetBehaviorType"
+                        "name": "Set Behavior Type"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Type",
+                                "tooltip": "0: Separate\n1: Blended"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names
index 0d13037335..d30f1a0cf6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names
@@ -1,59 +1,62 @@
 {
     "entries": [
         {
-            "key": "NavigationComponentRequestBus",
+            "base": "NavigationComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "NavigationComponentRequestBus"
+                "name": "Movement",
+                "category": "Navigation"
             },
             "methods": [
                 {
-                    "key": "SetAgentSpeed",
+                    "base": "SetAgentSpeed",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAgentSpeed"
+                        "tooltip": "When signaled, this will invoke Set Agent Speed"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAgentSpeed is invoked"
+                        "tooltip": "Signaled after Set Agent Speed is invoked"
                     },
                     "details": {
-                        "name": "SetAgentSpeed"
+                        "name": "Set Agent Speed"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Speed",
+                                "tooltip": "The agent speed in meters per second"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetAgentMovementMethod",
+                    "base": "SetAgentMovementMethod",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetAgentMovementMethod"
+                        "tooltip": "When signaled, this will invoke Set Agent Movement Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetAgentMovementMethod is invoked"
+                        "tooltip": "Signaled after Set Agent Movement Method is invoked"
                     },
                     "details": {
-                        "name": "SetAgentMovementMethod"
+                        "name": "Set Agent Movement Method"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Method",
+                                "tooltip": "0: Transform, 1: Physics, 2: Custom"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAgentSpeed",
+                    "base": "GetAgentSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAgentSpeed"
@@ -63,35 +66,36 @@
                         "tooltip": "Signaled after GetAgentSpeed is invoked"
                     },
                     "details": {
-                        "name": "GetAgentSpeed"
+                        "name": "Get Agent Speed"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "FindPathToPosition",
+                    "base": "FindPathToPosition",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindPathToPosition"
+                        "tooltip": "When signaled, this will invoke Find Path To Position"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindPathToPosition is invoked"
+                        "tooltip": "Signaled after Find Path To Position is invoked"
                     },
                     "details": {
-                        "name": "FindPathToPosition"
+                        "name": "Find Path To Position"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position",
+                                "tooltip": "The position to navigate to"
                             }
                         }
                     ],
@@ -99,13 +103,13 @@
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Request Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Stop",
+                    "base": "Stop",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Stop"
@@ -121,30 +125,31 @@
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Request Id",
+                                "tooltip": "The request Id of the navigation process to stop"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "FindPathToEntity",
+                    "base": "FindPathToEntity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke FindPathToEntity"
+                        "tooltip": "When signaled, this will invoke Find Path To Entity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after FindPathToEntity is invoked"
+                        "tooltip": "Signaled after Find Path To Entity is invoked"
                     },
                     "details": {
-                        "name": "FindPathToEntity"
+                        "name": "Find Path To Entity"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
-                                "tooltip": "Entity Unique Id"
+                                "name": "Entity Id",
+                                "tooltip": "The entity to follow"
                             }
                         }
                     ],
@@ -152,29 +157,30 @@
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "Request Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAgentMovementMethod",
+                    "base": "GetAgentMovementMethod",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAgentMovementMethod"
+                        "tooltip": "When signaled, this will invoke Get Agent Movement Method"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAgentMovementMethod is invoked"
+                        "tooltip": "Signaled after Get Agent Movement Method is invoked"
                     },
                     "details": {
-                        "name": "GetAgentMovementMethod"
+                        "name": "Get Agent Movement Method"
                     },
                     "results": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Method",
+                                "tooltip": "0: Transform, 1: Physics, 2: Custom"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names
new file mode 100644
index 0000000000..83f7c105c2
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names
@@ -0,0 +1,51 @@
+{
+    "entries": [
+        {
+            "base": "NetworkCharacterRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Network Character",
+                "category": "Multiplayer"
+            },
+            "methods": [
+                {
+                    "base": "TryMoveWithVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Try Move With Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Try Move With Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Try Move With Velocity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Velocity"
+                            }
+                        },
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Delta Time"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names
index 7387063040..ac540f94df 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names
@@ -1,16 +1,15 @@
 {
     "entries": [
         {
-            "key": "NonUniformScaleRequestBus",
+            "base": "NonUniformScaleRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "NonUniformScaleRequestBus",
-                "category": "Entity"
+                "name": "Non Uniform Scale"
             },
             "methods": [
                 {
-                    "key": "GetScale",
+                    "base": "GetScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Scale"
@@ -26,13 +25,13 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetScale",
+                    "base": "SetScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Scale"
@@ -48,7 +47,7 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Non-uniform Scale"
+                                "name": "Scale"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names
index a4cb505c02..d4d98c8d57 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "PerformanceStatisticsEBus",
+            "base": "PerformanceStatisticsEBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PerformanceStatisticsEBus"
+                "name": "Performance Statistics EBus"
             },
             "methods": [
                 {
-                    "key": "TrackPerFrameStop",
+                    "base": "TrackPerFrameStop",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke TrackPerFrameStop"
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "key": "TrackPerFrameStart",
+                    "base": "TrackPerFrameStart",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke TrackPerFrameStart"
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "key": "TrackAccumulatedStart",
+                    "base": "TrackAccumulatedStart",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke TrackAccumulatedStart"
@@ -59,7 +59,7 @@
                     ]
                 },
                 {
-                    "key": "TrackAccumulatedStop",
+                    "base": "TrackAccumulatedStop",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke TrackAccumulatedStop"
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "key": "ClearSnaphotStatistics",
+                    "base": "ClearSnaphotStatistics",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ClearSnaphotStatistics"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names
index 0d1e7a800e..ab568ed21d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "PerlinGradientRequestBus",
+            "base": "PerlinGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PerlinGradientRequestBus"
+                "name": "Perlin Gradient"
             },
             "methods": [
                 {
-                    "key": "SetOctaves",
+                    "base": "SetOctaves",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetOctaves"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetFrequency",
+                    "base": "GetFrequency",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFrequency"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetOctaves",
+                    "base": "GetOctaves",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetOctaves"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetFrequency",
+                    "base": "SetFrequency",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFrequency"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "SetAmplitude",
+                    "base": "SetAmplitude",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAmplitude"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "GetAmplitude",
+                    "base": "GetAmplitude",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAmplitude"
@@ -141,7 +141,7 @@
                     ]
                 },
                 {
-                    "key": "GetRandomSeed",
+                    "base": "GetRandomSeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetRandomSeed"
@@ -163,7 +163,7 @@
                     ]
                 },
                 {
-                    "key": "SetRandomSeed",
+                    "base": "SetRandomSeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetRandomSeed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names
new file mode 100644
index 0000000000..dfec47011a
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names
@@ -0,0 +1,212 @@
+{
+    "entries": [
+        {
+            "base": "PhysXCharacterControllerRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Character Controller"
+            },
+            "methods": [
+                {
+                    "base": "GetHalfForwardExtent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Half Forward Extent"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Half Forward Extent is invoked"
+                    },
+                    "details": {
+                        "name": "Get Half Forward Extent"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Half Forward Extent"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetRadius",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Radius"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Radius is invoked"
+                    },
+                    "details": {
+                        "name": "Get Radius"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetRadius",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Radius"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Radius is invoked"
+                    },
+                    "details": {
+                        "name": "Set Radius"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Radius"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetHalfForwardExtent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Half Forward Extent"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Half Forward Extent is invoked"
+                    },
+                    "details": {
+                        "name": "Set Half Forward Extent"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Half Forward Extent"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetHeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Height"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Height is invoked"
+                    },
+                    "details": {
+                        "name": "Set Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHalfSideExtent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Half Side Extent"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Half Side Extent is invoked"
+                    },
+                    "details": {
+                        "name": "Get Half Side Extent"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Half Side Extent"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Height"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Height is invoked"
+                    },
+                    "details": {
+                        "name": "Get Height"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "Resize",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Resize"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Resize is invoked"
+                    },
+                    "details": {
+                        "name": "Resize"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Size"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetHalfSideExtent",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Half Side Extent"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Half Side Extent is invoked"
+                    },
+                    "details": {
+                        "name": "Set Half Side Extent"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Half Side Extent"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names
index ccd14962a2..31500b0762 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "PhysicalSkyRequestBus",
+            "base": "PhysicalSkyRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PhysicalSkyRequestBus"
+                "name": "Physical Sky",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetSkyIntensity",
+                    "base": "SetSkyIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSkyIntensity"
+                        "tooltip": "When signaled, this will invoke Set Sky Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSkyIntensity is invoked"
+                        "tooltip": "Signaled after Set Sky Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetSkyIntensity"
+                        "name": "Set Sky Intensity"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "SetSunIntensity",
+                    "base": "SetSunIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSunIntensity"
+                        "tooltip": "When signaled, this will invoke Set Sun Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSunIntensity is invoked"
+                        "tooltip": "Signaled after Set Sun Intensity is invoked"
                     },
                     "details": {
-                        "name": "SetSunIntensity"
+                        "name": "Set Sun Intensity"
                     },
                     "params": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "GetSunIntensity",
+                    "base": "GetSunIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSunIntensity"
+                        "tooltip": "When signaled, this will invoke Get Sun Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSunIntensity is invoked"
+                        "tooltip": "Signaled after Get Sun Intensity is invoked"
                     },
                     "details": {
-                        "name": "GetSunIntensity"
+                        "name": "Get Sun Intensity"
                     },
                     "results": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "GetSunRadiusFactor",
+                    "base": "GetSunRadiusFactor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSunRadiusFactor"
+                        "tooltip": "When signaled, this will invoke Get Sun Radius Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSunRadiusFactor is invoked"
+                        "tooltip": "Signaled after Get Sun Radius Factor is invoked"
                     },
                     "details": {
-                        "name": "GetSunRadiusFactor"
+                        "name": "Get Sun Radius Factor"
                     },
                     "results": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "SetSunRadiusFactor",
+                    "base": "SetSunRadiusFactor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSunRadiusFactor"
+                        "tooltip": "When signaled, this will invoke Set Sun Radius Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSunRadiusFactor is invoked"
+                        "tooltip": "Signaled after Set Sun Radius Factor is invoked"
                     },
                     "details": {
-                        "name": "SetSunRadiusFactor"
+                        "name": "Set Sun Radius Factor"
                     },
                     "params": [
                         {
@@ -119,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "GetTurbidity",
+                    "base": "GetTurbidity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTurbidity"
+                        "tooltip": "When signaled, this will invoke Get Turbidity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTurbidity is invoked"
+                        "tooltip": "Signaled after Get Turbidity is invoked"
                     },
                     "details": {
-                        "name": "GetTurbidity"
+                        "name": "Get Turbidity"
                     },
                     "results": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "GetSkyIntensity",
+                    "base": "GetSkyIntensity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSkyIntensity"
+                        "tooltip": "When signaled, this will invoke Get Sky Intensity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSkyIntensity is invoked"
+                        "tooltip": "Signaled after Get Sky Intensity is invoked"
                     },
                     "details": {
-                        "name": "GetSkyIntensity"
+                        "name": "Get Sky Intensity"
                     },
                     "results": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "SetTurbidity",
+                    "base": "SetTurbidity",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTurbidity"
+                        "tooltip": "When signaled, this will invoke Set Turbidity"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTurbidity is invoked"
+                        "tooltip": "Signaled after Set Turbidity is invoked"
                     },
                     "details": {
-                        "name": "SetTurbidity"
+                        "name": "Set Turbidity"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names
index 732fe515ed..c8beed2423 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "PolygonPrismShapeComponentRequestBus",
+            "base": "PolygonPrismShapeComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PolygonPrismShapeComponentRequestBus"
+                "name": "Polygon Prism"
             },
             "methods": [
                 {
-                    "key": "ClearVertices",
+                    "base": "ClearVertices",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ClearVertices"
@@ -19,11 +19,11 @@
                         "tooltip": "Signaled after ClearVertices is invoked"
                     },
                     "details": {
-                        "name": "ClearVertices"
+                        "name": "Clear Vertices"
                     }
                 },
                 {
-                    "key": "InsertVertex",
+                    "base": "InsertVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke InsertVertex"
@@ -33,19 +33,19 @@
                         "tooltip": "Signaled after InsertVertex is invoked"
                     },
                     "details": {
-                        "name": "InsertVertex"
+                        "name": "Insert Vertex"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vertex"
                             }
                         }
                     ],
@@ -53,13 +53,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Inserted"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "UpdateVertex",
+                    "base": "UpdateVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke UpdateVertex"
@@ -69,19 +69,19 @@
                         "tooltip": "Signaled after UpdateVertex is invoked"
                     },
                     "details": {
-                        "name": "UpdateVertex"
+                        "name": "Update Vertex"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         },
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vertex"
                             }
                         }
                     ],
@@ -89,13 +89,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Updated"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AddVertex",
+                    "base": "AddVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddVertex"
@@ -105,19 +105,19 @@
                         "tooltip": "Signaled after AddVertex is invoked"
                     },
                     "details": {
-                        "name": "AddVertex"
+                        "name": "Add Vertex"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vertex"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPolygonPrism",
+                    "base": "GetPolygonPrism",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPolygonPrism"
@@ -127,19 +127,19 @@
                         "tooltip": "Signaled after GetPolygonPrism is invoked"
                     },
                     "details": {
-                        "name": "GetPolygonPrism"
+                        "name": "Get Polygon Prism"
                     },
                     "results": [
                         {
                             "typeid": "{2E879A16-9143-5862-A5B3-EDED931C60BC}",
                             "details": {
-                                "name": "AZStd::shared_ptr"
+                                "name": "Polygon Prism"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetHeight",
+                    "base": "SetHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetHeight"
@@ -149,19 +149,19 @@
                         "tooltip": "Signaled after SetHeight is invoked"
                     },
                     "details": {
-                        "name": "SetHeight"
+                        "name": "Set Height"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Height"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RemoveVertex",
+                    "base": "RemoveVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveVertex"
@@ -171,13 +171,13 @@
                         "tooltip": "Signaled after RemoveVertex is invoked"
                     },
                     "details": {
-                        "name": "RemoveVertex"
+                        "name": "Remove Vertex"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Index"
                             }
                         }
                     ],
@@ -185,7 +185,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Removed"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names
index c66a6e75db..d58a8a419c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "PostFxLayerRequestBus",
+            "base": "PostFxLayerRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PostFxLayerRequestBus"
+                "name": "Post Fx Layer",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetPriority",
+                    "base": "SetPriority",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetPriority"
+                        "tooltip": "When signaled, this will invoke Set Priority"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetPriority is invoked"
+                        "tooltip": "Signaled after Set Priority is invoked"
                     },
                     "details": {
-                        "name": "SetPriority"
+                        "name": "Set Priority"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetPriority",
+                    "base": "GetPriority",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPriority"
+                        "tooltip": "When signaled, this will invoke Get Priority"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPriority is invoked"
+                        "tooltip": "Signaled after Get Priority is invoked"
                     },
                     "details": {
-                        "name": "GetPriority"
+                        "name": "Get Priority"
                     },
                     "results": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "SetOverrideFactor",
+                    "base": "SetOverrideFactor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetOverrideFactor"
+                        "tooltip": "When signaled, this will invoke Set Override Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetOverrideFactor is invoked"
+                        "tooltip": "Signaled after Set Override Factor is invoked"
                     },
                     "details": {
-                        "name": "SetOverrideFactor"
+                        "name": "Set Override Factor"
                     },
                     "params": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "GetOverrideFactor",
+                    "base": "GetOverrideFactor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetOverrideFactor"
+                        "tooltip": "When signaled, this will invoke Get Override Factor"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetOverrideFactor is invoked"
+                        "tooltip": "Signaled after Get Override Factor is invoked"
                     },
                     "details": {
-                        "name": "GetOverrideFactor"
+                        "name": "Get Override Factor"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names
index 86d059cdb7..5bc37563f4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "PosterizeGradientRequestBus",
+            "base": "PosterizeGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PosterizeGradientRequestBus"
+                "name": "Posterize Gradient"
             },
             "methods": [
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetModeType",
+                    "base": "GetModeType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetModeType"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "SetModeType",
+                    "base": "SetModeType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetModeType"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetBands",
+                    "base": "SetBands",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetBands"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "GetBands",
+                    "base": "GetBands",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetBands"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names
index 791394e50a..c57b57f9fe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names
@@ -1,31 +1,31 @@
 {
     "entries": [
         {
-            "key": "PrefabLoaderScriptingBus",
+            "base": "PrefabLoaderScriptingBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PrefabLoaderScriptingBus"
+                "name": "Prefab Loader"
             },
             "methods": [
                 {
-                    "key": "SaveTemplateToString",
+                    "base": "SaveTemplateToString",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SaveTemplateToString"
+                        "tooltip": "When signaled, this will invoke Save Template To String"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SaveTemplateToString is invoked"
+                        "tooltip": "Signaled after Save Template To String is invoked"
                     },
                     "details": {
-                        "name": "SaveTemplateToString"
+                        "name": "Save Template To String"
                     },
                     "params": [
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Template Id"
                             }
                         }
                     ],
@@ -33,7 +33,7 @@
                         {
                             "typeid": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
                             "details": {
-                                "name": ""
+                                "name": "Success"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names
index d38129153c..8b0d5008aa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "PrefabPublicRequestBus",
+            "base": "PrefabPublicRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PrefabPublicRequestBus"
+                "name": "Prefab Public"
             },
             "methods": [
                 {
-                    "key": "CreatePrefabInMemory",
+                    "base": "CreatePrefabInMemory",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreatePrefabInMemory"
@@ -45,7 +45,7 @@
                     ]
                 },
                 {
-                    "key": "InstantiatePrefab",
+                    "base": "InstantiatePrefab",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke InstantiatePrefab"
@@ -88,7 +88,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteEntitiesAndAllDescendantsInInstance",
+                    "base": "DeleteEntitiesAndAllDescendantsInInstance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteEntitiesAndAllDescendantsInInstance"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names
index 8c48798a87..511c0523d1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names
@@ -1,37 +1,37 @@
 {
     "entries": [
         {
-            "key": "PrefabSystemScriptingBus",
+            "base": "PrefabSystemScriptingBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PrefabSystemScriptingBus"
+                "name": "Prefab System"
             },
             "methods": [
                 {
-                    "key": "CreatePrefab",
+                    "base": "CreatePrefab",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke CreatePrefab"
+                        "tooltip": "When signaled, this will invoke Create Prefab"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after CreatePrefab is invoked"
+                        "tooltip": "Signaled after Create Prefab is invoked"
                     },
                     "details": {
-                        "name": "CreatePrefab"
+                        "name": "Create Prefab"
                     },
                     "params": [
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Entity Ids"
                             }
                         },
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "File Path"
                             }
                         }
                     ],
@@ -39,7 +39,7 @@
                         {
                             "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
                             "details": {
-                                "name": "AZ::u64"
+                                "name": "Template Id"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names
index a837c5d68a..d4096662ad 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ProfilingCaptureRequestBus",
+            "base": "ProfilingCaptureRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ProfilingCaptureRequestBus"
+                "name": "Profiling Capture"
             },
             "methods": [
                 {
-                    "key": "CapturePassTimestamp",
+                    "base": "CapturePassTimestamp",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CapturePassTimestamp"
@@ -39,7 +39,7 @@
                     ]
                 },
                 {
-                    "key": "CaptureCpuFrameTime",
+                    "base": "CaptureCpuFrameTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CaptureCpuFrameTime"
@@ -69,7 +69,7 @@
                     ]
                 },
                 {
-                    "key": "CapturePassPipelineStatistics",
+                    "base": "CapturePassPipelineStatistics",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CapturePassPipelineStatistics"
@@ -99,7 +99,7 @@
                     ]
                 },
                 {
-                    "key": "CaptureBenchmarkMetadata",
+                    "base": "CaptureBenchmarkMetadata",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CaptureBenchmarkMetadata"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names
index 65a5b9d9b2..978b3e128f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "PythonEditorBus",
+            "base": "PythonEditorBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "PythonEditorBus"
+                "name": "Python Editor"
             },
             "methods": [
                 {
-                    "key": "ExecuteCommand",
+                    "base": "ExecuteCommand",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ExecuteCommand"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetCVar",
+                    "base": "GetCVar",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetCVar"
@@ -61,7 +61,7 @@
                     ]
                 },
                 {
-                    "key": "IsInSimulationMode",
+                    "base": "IsInSimulationMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsInSimulationMode"
@@ -83,7 +83,7 @@
                     ]
                 },
                 {
-                    "key": "SetAxisConstraint",
+                    "base": "SetAxisConstraint",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAxisConstraint"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "IsInGameMode",
+                    "base": "IsInGameMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsInGameMode"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetCVarFromFloat",
+                    "base": "SetCVarFromFloat",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetCVarFromFloat"
@@ -155,7 +155,7 @@
                     ]
                 },
                 {
-                    "key": "MessageBoxYesNo",
+                    "base": "MessageBoxYesNo",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MessageBoxYesNo"
@@ -185,7 +185,7 @@
                     ]
                 },
                 {
-                    "key": "Redo",
+                    "base": "Redo",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Redo"
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "key": "SetCVarFromInteger",
+                    "base": "SetCVarFromInteger",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetCVarFromInteger"
@@ -227,7 +227,7 @@
                     ]
                 },
                 {
-                    "key": "DrawLabel",
+                    "base": "DrawLabel",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DrawLabel"
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "key": "Undo",
+                    "base": "Undo",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Undo"
@@ -305,7 +305,7 @@
                     }
                 },
                 {
-                    "key": "Log",
+                    "base": "Log",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Log"
@@ -327,7 +327,7 @@
                     ]
                 },
                 {
-                    "key": "ComboBox",
+                    "base": "ComboBox",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ComboBox"
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "key": "ExitGameMode",
+                    "base": "ExitGameMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ExitGameMode"
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "key": "OpenFileBox",
+                    "base": "OpenFileBox",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke OpenFileBox"
@@ -405,7 +405,7 @@
                     ]
                 },
                 {
-                    "key": "MessageBoxOk",
+                    "base": "MessageBoxOk",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MessageBoxOk"
@@ -435,7 +435,7 @@
                     ]
                 },
                 {
-                    "key": "RunFile",
+                    "base": "RunFile",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RunFile"
@@ -457,7 +457,7 @@
                     ]
                 },
                 {
-                    "key": "EditBoxCheckDataType",
+                    "base": "EditBoxCheckDataType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EditBoxCheckDataType"
@@ -487,7 +487,7 @@
                     ]
                 },
                 {
-                    "key": "SetCVarFromString",
+                    "base": "SetCVarFromString",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetCVarFromString"
@@ -515,7 +515,7 @@
                     ]
                 },
                 {
-                    "key": "RunConsole",
+                    "base": "RunConsole",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RunConsole"
@@ -537,7 +537,7 @@
                     ]
                 },
                 {
-                    "key": "ExitSimulationMode",
+                    "base": "ExitSimulationMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ExitSimulationMode"
@@ -551,7 +551,7 @@
                     }
                 },
                 {
-                    "key": "SetCVar",
+                    "base": "SetCVar",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetCVar"
@@ -579,7 +579,7 @@
                     ]
                 },
                 {
-                    "key": "GetPakFromFile",
+                    "base": "GetPakFromFile",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetPakFromFile"
@@ -609,7 +609,7 @@
                     ]
                 },
                 {
-                    "key": "RunFileParameters",
+                    "base": "RunFileParameters",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RunFileParameters"
@@ -637,7 +637,7 @@
                     ]
                 },
                 {
-                    "key": "EnterSimulationMode",
+                    "base": "EnterSimulationMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EnterSimulationMode"
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "key": "GetAxisConstraint",
+                    "base": "GetAxisConstraint",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAxisConstraint"
@@ -673,7 +673,7 @@
                     ]
                 },
                 {
-                    "key": "EnterGameMode",
+                    "base": "EnterGameMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EnterGameMode"
@@ -687,7 +687,7 @@
                     }
                 },
                 {
-                    "key": "MessageBoxOkCancel",
+                    "base": "MessageBoxOkCancel",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MessageBoxOkCancel"
@@ -717,7 +717,7 @@
                     ]
                 },
                 {
-                    "key": "EditBox",
+                    "base": "EditBox",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EditBox"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names
index c6ed9646fc..2365e05ec1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "QuadShapeComponentRequestsBus",
+            "base": "QuadShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "QuadShapeComponentRequestsBus"
+                "name": "Quad Shape Component",
+                "category": "Rendering/Shapes"
             },
             "methods": [
                 {
-                    "key": "SetQuadHeight",
+                    "base": "SetQuadHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetQuadHeight"
+                        "tooltip": "When signaled, this will invoke Set Quad Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetQuadHeight is invoked"
+                        "tooltip": "Signaled after Set Quad Height is invoked"
                     },
                     "details": {
-                        "name": "SetQuadHeight"
+                        "name": "Set Quad Height"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetQuadWidth",
+                    "base": "GetQuadWidth",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQuadWidth"
+                        "tooltip": "When signaled, this will invoke Get Quad Width"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQuadWidth is invoked"
+                        "tooltip": "Signaled after Get Quad Width is invoked"
                     },
                     "details": {
-                        "name": "GetQuadWidth"
+                        "name": "Get Quad Width"
                     },
                     "results": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "GetQuadHeight",
+                    "base": "GetQuadHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQuadHeight"
+                        "tooltip": "When signaled, this will invoke Get Quad Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQuadHeight is invoked"
+                        "tooltip": "Signaled after Get Quad Height is invoked"
                     },
                     "details": {
-                        "name": "GetQuadHeight"
+                        "name": "Get Quad Height"
                     },
                     "results": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "GetQuadConfiguration",
+                    "base": "GetQuadConfiguration",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQuadConfiguration"
+                        "tooltip": "When signaled, this will invoke Get Quad Configuration"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQuadConfiguration is invoked"
+                        "tooltip": "Signaled after Get Quad Configuration is invoked"
                     },
                     "details": {
-                        "name": "GetQuadConfiguration"
+                        "name": "Get Quad Configuration"
                     },
                     "results": [
                         {
@@ -98,17 +99,17 @@
                     ]
                 },
                 {
-                    "key": "SetQuadWidth",
+                    "base": "SetQuadWidth",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetQuadWidth"
+                        "tooltip": "When signaled, this will invoke Set Quad Width"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetQuadWidth is invoked"
+                        "tooltip": "Signaled after Set Quad Width is invoked"
                     },
                     "details": {
-                        "name": "SetQuadWidth"
+                        "name": "Set Quad Width"
                     },
                     "params": [
                         {
@@ -120,17 +121,17 @@
                     ]
                 },
                 {
-                    "key": "GetQuadOrientation",
+                    "base": "GetQuadOrientation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQuadOrientation"
+                        "tooltip": "When signaled, this will invoke Get Quad Orientation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQuadOrientation is invoked"
+                        "tooltip": "Signaled after Get Quad Orientation is invoked"
                     },
                     "details": {
-                        "name": "GetQuadOrientation"
+                        "name": "Get Quad Orientation"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names
index 38a342f1b4..d2680911dc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "RandomGradientRequestBus",
+            "base": "RandomGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "RandomGradientRequestBus"
+                "name": "Random Gradient"
             },
             "methods": [
                 {
-                    "key": "GetRandomSeed",
+                    "base": "GetRandomSeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetRandomSeed"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetRandomSeed",
+                    "base": "SetRandomSeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetRandomSeed"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names
index 89849e3596..bef8a10b5f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "RandomTimedSpawnerRequestBus",
+            "base": "RandomTimedSpawnerRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "RandomTimedSpawnerRequestBus"
+                "name": "Random Timed Spawner",
+                "category": "Gameplay/Spawner"
             },
             "methods": [
                 {
-                    "key": "SetSpawnDelay",
+                    "base": "SetSpawnDelay",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSpawnDelay"
+                        "tooltip": "When signaled, this will invoke Set Spawn Delay"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSpawnDelay is invoked"
+                        "tooltip": "Signaled after Set Spawn Delay is invoked"
                     },
                     "details": {
-                        "name": "SetSpawnDelay"
+                        "name": "Set Spawn Delay"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetSpawnDelay",
+                    "base": "GetSpawnDelay",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSpawnDelay"
+                        "tooltip": "When signaled, this will invoke Get Spawn Delay"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSpawnDelay is invoked"
+                        "tooltip": "Signaled after Get Spawn Delay is invoked"
                     },
                     "details": {
-                        "name": "GetSpawnDelay"
+                        "name": "Get Spawn Delay"
                     },
                     "results": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "SetSpawnDelayVariation",
+                    "base": "SetSpawnDelayVariation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSpawnDelayVariation"
+                        "tooltip": "When signaled, this will invoke Set Spawn Delay Variation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSpawnDelayVariation is invoked"
+                        "tooltip": "Signaled after Set Spawn Delay Variation is invoked"
                     },
                     "details": {
-                        "name": "SetSpawnDelayVariation"
+                        "name": "Set Spawn Delay Variation"
                     },
                     "params": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "SetRandomDistribution",
+                    "base": "SetRandomDistribution",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetRandomDistribution"
+                        "tooltip": "When signaled, this will invoke Set Random Distribution"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetRandomDistribution is invoked"
+                        "tooltip": "Signaled after Set Random Distribution is invoked"
                     },
                     "details": {
-                        "name": "SetRandomDistribution"
+                        "name": "Set Random Distribution"
                     },
                     "params": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "IsEnabled",
+                    "base": "IsEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsEnabled"
+                        "tooltip": "When signaled, this will invoke Is Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsEnabled is invoked"
+                        "tooltip": "Signaled after Is Enabled is invoked"
                     },
                     "details": {
-                        "name": "IsEnabled"
+                        "name": "Is Enabled"
                     },
                     "results": [
                         {
@@ -119,7 +120,7 @@
                     ]
                 },
                 {
-                    "key": "Disable",
+                    "base": "Disable",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Disable"
@@ -133,7 +134,7 @@
                     }
                 },
                 {
-                    "key": "Toggle",
+                    "base": "Toggle",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Toggle"
@@ -147,17 +148,17 @@
                     }
                 },
                 {
-                    "key": "GetRandomDistribution",
+                    "base": "GetRandomDistribution",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetRandomDistribution"
+                        "tooltip": "When signaled, this will invoke Get Random Distribution"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetRandomDistribution is invoked"
+                        "tooltip": "Signaled after Get Random Distribution is invoked"
                     },
                     "details": {
-                        "name": "GetRandomDistribution"
+                        "name": "Get Random Distribution"
                     },
                     "results": [
                         {
@@ -169,7 +170,7 @@
                     ]
                 },
                 {
-                    "key": "Enable",
+                    "base": "Enable",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Enable"
@@ -183,17 +184,17 @@
                     }
                 },
                 {
-                    "key": "GetSpawnDelayVariation",
+                    "base": "GetSpawnDelayVariation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSpawnDelayVariation"
+                        "tooltip": "When signaled, this will invoke Get Spawn Delay Variation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSpawnDelayVariation is invoked"
+                        "tooltip": "Signaled after Get Spawn Delay Variation is invoked"
                     },
                     "details": {
-                        "name": "GetSpawnDelayVariation"
+                        "name": "Get Spawn Delay Variation"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names
index c4be7ca85b..83c07428fe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ReferenceGradientRequestBus",
+            "base": "ReferenceGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ReferenceGradientRequestBus"
+                "name": "Reference Gradient"
             },
             "methods": [
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names
index 7323de56d7..33337df200 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "RenderMeshComponentRequestBus",
+            "base": "RenderMeshComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "RenderMeshComponentRequestBus"
+                "name": "Render Mesh Component",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetLodOverride",
+                    "base": "GetLodOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetLodOverride"
+                        "tooltip": "When signaled, this will invoke Get Lod Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetLodOverride is invoked"
+                        "tooltip": "Signaled after Get Lod Override is invoked"
                     },
                     "details": {
-                        "name": "GetLodOverride"
+                        "name": "Get Lod Override"
                     },
                     "results": [
                         {
@@ -31,39 +32,39 @@
                     ]
                 },
                 {
-                    "key": "GetSortKey",
+                    "base": "GetSortKey",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSortKey"
+                        "tooltip": "When signaled, this will invoke Get Sort Key"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSortKey is invoked"
+                        "tooltip": "Signaled after Get Sort Key is invoked"
                     },
                     "details": {
-                        "name": "GetSortKey"
+                        "name": "Get Sort Key"
                     },
                     "results": [
                         {
                             "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}",
                             "details": {
-                                "name": "AZ::s64"
+                                "name": "AZ::s 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetQualityDecayRate",
+                    "base": "SetQualityDecayRate",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetQualityDecayRate"
+                        "tooltip": "When signaled, this will invoke Set Quality Decay Rate"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetQualityDecayRate is invoked"
+                        "tooltip": "Signaled after Set Quality Decay Rate is invoked"
                     },
                     "details": {
-                        "name": "SetQualityDecayRate"
+                        "name": "Set Quality Decay Rate"
                     },
                     "params": [
                         {
@@ -75,61 +76,61 @@
                     ]
                 },
                 {
-                    "key": "SetSortKey",
+                    "base": "SetSortKey",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSortKey"
+                        "tooltip": "When signaled, this will invoke Set Sort Key"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSortKey is invoked"
+                        "tooltip": "Signaled after Set Sort Key is invoked"
                     },
                     "details": {
-                        "name": "SetSortKey"
+                        "name": "Set Sort Key"
                     },
                     "params": [
                         {
                             "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}",
                             "details": {
-                                "name": "AZ::s64"
+                                "name": "AZ::s 64"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetModelAssetPath",
+                    "base": "GetModelAssetPath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetModelAssetPath"
+                        "tooltip": "When signaled, this will invoke Get Model Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetModelAssetPath is invoked"
+                        "tooltip": "Signaled after Get Model Asset Path is invoked"
                     },
                     "details": {
-                        "name": "GetModelAssetPath"
+                        "name": "Get Model Asset Path"
                     },
                     "results": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLodType",
+                    "base": "SetLodType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLodType"
+                        "tooltip": "When signaled, this will invoke Set Lod Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLodType is invoked"
+                        "tooltip": "Signaled after Set Lod Type is invoked"
                     },
                     "details": {
-                        "name": "SetLodType"
+                        "name": "Set Lod Type"
                     },
                     "params": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "SetLodOverride",
+                    "base": "SetLodOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLodOverride"
+                        "tooltip": "When signaled, this will invoke Set Lod Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLodOverride is invoked"
+                        "tooltip": "Signaled after Set Lod Override is invoked"
                     },
                     "details": {
-                        "name": "SetLodOverride"
+                        "name": "Set Lod Override"
                     },
                     "params": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "SetMinimumScreenCoverage",
+                    "base": "SetMinimumScreenCoverage",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetMinimumScreenCoverage"
+                        "tooltip": "When signaled, this will invoke Set Minimum Screen Coverage"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetMinimumScreenCoverage is invoked"
+                        "tooltip": "Signaled after Set Minimum Screen Coverage is invoked"
                     },
                     "details": {
-                        "name": "SetMinimumScreenCoverage"
+                        "name": "Set Minimum Screen Coverage"
                     },
                     "params": [
                         {
@@ -185,39 +186,39 @@
                     ]
                 },
                 {
-                    "key": "SetModelAssetId",
+                    "base": "SetModelAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetModelAssetId"
+                        "tooltip": "When signaled, this will invoke Set Model Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetModelAssetId is invoked"
+                        "tooltip": "Signaled after Set Model Asset Id is invoked"
                     },
                     "details": {
-                        "name": "SetModelAssetId"
+                        "name": "Set Model Asset Id"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLodType",
+                    "base": "GetLodType",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetLodType"
+                        "tooltip": "When signaled, this will invoke Get Lod Type"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetLodType is invoked"
+                        "tooltip": "Signaled after Get Lod Type is invoked"
                     },
                     "details": {
-                        "name": "GetLodType"
+                        "name": "Get Lod Type"
                     },
                     "results": [
                         {
@@ -229,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "GetMinimumScreenCoverage",
+                    "base": "GetMinimumScreenCoverage",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMinimumScreenCoverage"
+                        "tooltip": "When signaled, this will invoke Get Minimum Screen Coverage"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMinimumScreenCoverage is invoked"
+                        "tooltip": "Signaled after Get Minimum Screen Coverage is invoked"
                     },
                     "details": {
-                        "name": "GetMinimumScreenCoverage"
+                        "name": "Get Minimum Screen Coverage"
                     },
                     "results": [
                         {
@@ -251,61 +252,61 @@
                     ]
                 },
                 {
-                    "key": "GetModelAssetId",
+                    "base": "GetModelAssetId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetModelAssetId"
+                        "tooltip": "When signaled, this will invoke Get Model Asset Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetModelAssetId is invoked"
+                        "tooltip": "Signaled after Get Model Asset Id is invoked"
                     },
                     "details": {
-                        "name": "GetModelAssetId"
+                        "name": "Get Model Asset Id"
                     },
                     "results": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetModelAssetPath",
+                    "base": "SetModelAssetPath",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetModelAssetPath"
+                        "tooltip": "When signaled, this will invoke Set Model Asset Path"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetModelAssetPath is invoked"
+                        "tooltip": "Signaled after Set Model Asset Path is invoked"
                     },
                     "details": {
-                        "name": "SetModelAssetPath"
+                        "name": "Set Model Asset Path"
                     },
                     "params": [
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "AZ Std::string"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetQualityDecayRate",
+                    "base": "GetQualityDecayRate",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetQualityDecayRate"
+                        "tooltip": "When signaled, this will invoke Get Quality Decay Rate"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetQualityDecayRate is invoked"
+                        "tooltip": "Signaled after Get Quality Decay Rate is invoked"
                     },
                     "details": {
-                        "name": "GetQualityDecayRate"
+                        "name": "Get Quality Decay Rate"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names
new file mode 100644
index 0000000000..474e3f89e3
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names
@@ -0,0 +1,722 @@
+{
+    "entries": [
+        {
+            "base": "RigidBodyRequestBus",
+            "context": "EBusSender",
+            "variant": "",
+            "details": {
+                "name": "Rigid Body"
+            },
+            "methods": [
+                {
+                    "base": "SetLinearVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Linear Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Linear Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Set Linear Velocity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Linear Velocity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetKinematic",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Kinematic"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Kinematic is invoked"
+                    },
+                    "details": {
+                        "name": "Set Kinematic"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enabled"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetMass",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Mass"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Mass is invoked"
+                    },
+                    "details": {
+                        "name": "Set Mass"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Mass"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetGravityEnabled",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Gravity Enabled"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Gravity Enabled is invoked"
+                    },
+                    "details": {
+                        "name": "Set Gravity Enabled"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enabled"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAabb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get AABB"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get AABB is invoked"
+                    },
+                    "details": {
+                        "name": "Get AABB"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ForceAwake",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Force Awake"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Force Awake is invoked"
+                    },
+                    "details": {
+                        "name": "Force Awake"
+                    }
+                },
+                {
+                    "base": "SetAngularDamping",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Angular Damping"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Angular Damping is invoked"
+                    },
+                    "details": {
+                        "name": "Set Angular Damping"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Angular Damping"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ApplyAngularImpulse",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Apply Angular Impulse"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Apply Angular Impulse is invoked"
+                    },
+                    "details": {
+                        "name": "Apply Angular Impulse"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Angular Impulse"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "DisablePhysics",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Disable Physics"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Disable Physics is invoked"
+                    },
+                    "details": {
+                        "name": "Disable Physics"
+                    }
+                },
+                {
+                    "base": "SetSimulationEnabled",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Simulation Enabled"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Simulation Enabled is invoked"
+                    },
+                    "details": {
+                        "name": "Set Simulation Enabled"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enabled"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetLinearVelocityAtWorldPoint",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Linear Velocity At World Point"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Linear Velocity At World Point is invoked"
+                    },
+                    "details": {
+                        "name": "Get Linear Velocity At World Point"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Linear Velocity"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "World Point"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetAngularVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Angular Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Angular Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Set Angular Velocity"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Angular Velocity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetCenterOfMassOffset",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Center Of Mass Offset"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Center Of Mass Offset is invoked"
+                    },
+                    "details": {
+                        "name": "Set Center Of Mass Offset"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Offset"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsPhysicsEnabled",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Physics Enabled"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Physics Enabled is invoked"
+                    },
+                    "details": {
+                        "name": "Is Physics Enabled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Enabled"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSleepThreshold",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Sleep Threshold"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Sleep Threshold is invoked"
+                    },
+                    "details": {
+                        "name": "Get Sleep Threshold"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Sleep Threshold"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetKinematicTarget",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Kinematic Target"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Kinematic Target is invoked"
+                    },
+                    "details": {
+                        "name": "Set Kinematic Target"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+                            "details": {
+                                "name": "Kinematic Target"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "EnablePhysics",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Enable Physics"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Enable Physics is invoked"
+                    },
+                    "details": {
+                        "name": "Enable Physics"
+                    }
+                },
+                {
+                    "base": "GetLinearDamping",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Linear Damping"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Linear Damping is invoked"
+                    },
+                    "details": {
+                        "name": "Get Linear Damping"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Linear Damping"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ApplyLinearImpulseAtWorldPoint",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Apply Linear Impulse At World Point"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Apply Linear Impulse At World Point is invoked"
+                    },
+                    "details": {
+                        "name": "Apply Linear Impulse At World Point"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Linear Impulse"
+                            }
+                        },
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "World Point"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetCenterOfMassWorld",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Center Of Mass World"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Center Of Mass World is invoked"
+                    },
+                    "details": {
+                        "name": "Get Center Of Mass World"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Center of Mass (World)"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetCenterOfMassLocal",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Center Of Mass Local"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Center Of Mass Local is invoked"
+                    },
+                    "details": {
+                        "name": "Get Center Of Mass Local"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Center Of Mass (Local)"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetLinearDamping",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Linear Damping"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Linear Damping is invoked"
+                    },
+                    "details": {
+                        "name": "Set Linear Damping"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Linear Damping"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAngularDamping",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Angular Damping"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Angular Damping is invoked"
+                    },
+                    "details": {
+                        "name": "Get Angular Damping"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Angular Damping"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetLinearVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Linear Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Linear Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Get Linear Velocity"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Linear Velocity"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsAwake",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Awake"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Awake is invoked"
+                    },
+                    "details": {
+                        "name": "Is Awake"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Awake"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsGravityEnabled",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Gravity Enabled"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Gravity Enabled is invoked"
+                    },
+                    "details": {
+                        "name": "Is Gravity Enabled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Gravity Enabled"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetInverseMass",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Inverse Mass"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Inverse Mass is invoked"
+                    },
+                    "details": {
+                        "name": "Get Inverse Mass"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Inverse Mass"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "SetSleepThreshold",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Set Sleep Threshold"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Set Sleep Threshold is invoked"
+                    },
+                    "details": {
+                        "name": "Set Sleep Threshold"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Sleep Threshold"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ForceAsleep",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Force Asleep"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Force Asleep is invoked"
+                    },
+                    "details": {
+                        "name": "Force Asleep"
+                    }
+                },
+                {
+                    "base": "GetMass",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Mass"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Mass is invoked"
+                    },
+                    "details": {
+                        "name": "Get Mass"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "Mass"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "IsKinematic",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Is Kinematic"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Is Kinematic is invoked"
+                    },
+                    "details": {
+                        "name": "Is Kinematic"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Is Kinematic"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "ApplyLinearImpulse",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Apply Linear Impulse"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Apply Linear Impulse is invoked"
+                    },
+                    "details": {
+                        "name": "Apply Linear Impulse"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Linear Impulse"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetAngularVelocity",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Angular Velocity"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Angular Velocity is invoked"
+                    },
+                    "details": {
+                        "name": "Get Angular Velocity"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Angular Velocity"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names
index 346e1aa1f4..0e32488786 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SceneRequestBus",
+            "base": "SceneRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SceneRequestBus"
+                "name": "Scene"
             },
             "methods": [
                 {
-                    "key": "CutSelection",
+                    "base": "CutSelection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CutSelection"
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "key": "CopySelection",
+                    "base": "CopySelection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CopySelection"
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "key": "Paste",
+                    "base": "Paste",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Paste"
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "key": "DuplicateSelection",
+                    "base": "DuplicateSelection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DuplicateSelection"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names
index 975a3e146b..d7fc9033e4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names
@@ -1,38 +1,39 @@
 {
     "entries": [
         {
-            "key": "SequenceComponentRequestBus",
+            "base": "SequenceComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SequenceComponentRequestBus",
+                "name": "Sequence",
                 "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "GetPlaySpeed",
+                    "base": "GetPlaySpeed",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Play Speed"
+                        "tooltip": "When signaled, this will invoke GetPlaySpeed"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Play Speed is invoked"
+                        "tooltip": "Signaled after GetPlaySpeed is invoked"
                     },
                     "details": {
-                        "name": "Get Play Speed"
+                        "name": "Get Play Speed",
+                        "tooltip": "Returns the current play back speed as a multiplier (1.0 is normal speed, less is slower, more is faster)"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Play Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "JumpToTime",
+                    "base": "JumpToTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Jump To Time"
@@ -42,19 +43,20 @@
                         "tooltip": "Signaled after Jump To Time is invoked"
                     },
                     "details": {
-                        "name": "Jump To Time"
+                        "name": "Jump To Time",
+                        "tooltip": "Move the Playhead to the given time"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Resume",
+                    "base": "Resume",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Resume"
@@ -64,11 +66,12 @@
                         "tooltip": "Signaled after Resume is invoked"
                     },
                     "details": {
-                        "name": "Resume"
+                        "name": "Resume",
+                        "tooltip": "Resume the sequence. Resume essentially 'unpauses' a sequence. It must have been playing before the pause for playback to start again"
                     }
                 },
                 {
-                    "key": "JumpToEnd",
+                    "base": "JumpToEnd",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Jump To End"
@@ -78,11 +81,12 @@
                         "tooltip": "Signaled after Jump To End is invoked"
                     },
                     "details": {
-                        "name": "Jump To End"
+                        "name": "Jump To End",
+                        "tooltip": "Move the Playhead to the end of the sequence"
                     }
                 },
                 {
-                    "key": "GetCurrentPlayTime",
+                    "base": "GetCurrentPlayTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Current Play Time"
@@ -92,19 +96,20 @@
                         "tooltip": "Signaled after Get Current Play Time is invoked"
                     },
                     "details": {
-                        "name": "Get Current Play Time"
+                        "name": "Get Current Play Time",
+                        "tooltip": " Returns the current play time in seconds"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Play Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Pause",
+                    "base": "Pause",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Pause"
@@ -114,39 +119,41 @@
                         "tooltip": "Signaled after Pause is invoked"
                     },
                     "details": {
-                        "name": "Pause"
+                        "name": "Pause",
+                        "tooltip": "Pause the sequence. Sequence must be playing for pause to have an effect. Pausing leaves the play time at its current position"
                     }
                 },
                 {
-                    "key": "PlayBetweenTimes",
+                    "base": "PlayBetweenTimes",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Play Between Times"
+                        "tooltip": "When signaled, this will invoke PlayBetweenTimes"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Play Between Times is invoked"
+                        "tooltip": "Signaled after PlayBetweenTimes is invoked"
                     },
                     "details": {
-                        "name": "Play Between Times"
+                        "name": "PlayBetweenTimes",
+                        "tooltip": "Play sequence between the start to end times, outside of which the sequence behaves according to its 'Out of Range' time setting"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Start Time"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "End Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Stop",
+                    "base": "Stop",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Stop"
@@ -156,11 +163,12 @@
                         "tooltip": "Signaled after Stop is invoked"
                     },
                     "details": {
-                        "name": "Stop"
+                        "name": "Stop",
+                        "tooltip": "Pause the sequence. Sequence must be playing for pause to have an effect. Pausing leaves the play time at its current position"
                     }
                 },
                 {
-                    "key": "JumpToBeginning",
+                    "base": "JumpToBeginning",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Jump To Beginning"
@@ -170,11 +178,12 @@
                         "tooltip": "Signaled after Jump To Beginning is invoked"
                     },
                     "details": {
-                        "name": "Jump To Beginning"
+                        "name": "Jump To Beginning",
+                        "tooltip": "Move the Playhead to the beginning of the sequence"
                     }
                 },
                 {
-                    "key": "Play",
+                    "base": "Play",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Play"
@@ -184,27 +193,29 @@
                         "tooltip": "Signaled after Play is invoked"
                     },
                     "details": {
-                        "name": "Play"
+                        "name": "Play",
+                        "tooltip": "Play sequence from the start to end times set the sequence"
                     }
                 },
                 {
-                    "key": "SetPlaySpeed",
+                    "base": "SetPlaySpeed",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Play Speed"
+                        "tooltip": "When signaled, this will invoke SetPlaySpeed"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Play Speed is invoked"
+                        "tooltip": "Signaled after SetPlaySpeed is invoked"
                     },
                     "details": {
-                        "name": "Set Play Speed"
+                        "name": "SetPlaySpeed",
+                        "tooltip": "Set the play speed"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Play Speed"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names
index 9c42af794f..0071164355 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ShapeAreaFalloffGradientRequestBus",
+            "base": "ShapeAreaFalloffGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ShapeAreaFalloffGradientRequestBus"
+                "name": "Shape Area Falloff Gradient"
             },
             "methods": [
                 {
-                    "key": "SetFalloffType",
+                    "base": "SetFalloffType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFalloffType"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetFalloffWidth",
+                    "base": "SetFalloffWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFalloffWidth"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetFalloffType",
+                    "base": "GetFalloffType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFalloffType"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "GetFalloffWidth",
+                    "base": "GetFalloffWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFalloffWidth"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "SetShapeEntityId",
+                    "base": "SetShapeEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetShapeEntityId"
@@ -120,7 +120,7 @@
                     ]
                 },
                 {
-                    "key": "GetShapeEntityId",
+                    "base": "GetShapeEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetShapeEntityId"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names
index f58f8d8dce..f52f102e5f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "ShapeComponentRequestsBus",
+            "base": "ShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ShapeComponentRequestsBus",
+                "name": "Shape Component",
                 "category": "Shape"
             },
             "methods": [
                 {
-                    "key": "DistanceSquaredFromPoint",
+                    "base": "DistanceSquaredFromPoint",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Distance Squared From Point"
@@ -43,7 +43,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceFromPoint",
+                    "base": "DistanceFromPoint",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Distance From Point"
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "key": "IsPointInside",
+                    "base": "IsPointInside",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Point Inside"
@@ -109,7 +109,7 @@
                     ]
                 },
                 {
-                    "key": "GetEncompassingAabb",
+                    "base": "GetEncompassingAabb",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Encompassing Aabb"
@@ -132,7 +132,7 @@
                     ]
                 },
                 {
-                    "key": "GetShapeType",
+                    "base": "GetShapeType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Shape Type"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names
index a92d790054..fb09158ca4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names
@@ -1,60 +1,60 @@
 {
     "entries": [
         {
-            "key": "SimpleMotionComponentRequestBus",
+            "base": "SimpleMotionComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SimpleMotionComponentRequestBus",
+                "name": "Simple Motion",
                 "category": "Animation"
             },
             "methods": [
                 {
-                    "key": "BlendOutTime",
+                    "base": "BlendOutTime",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke BlendOutTime"
+                        "tooltip": "When signaled, this will invoke Blend Out Time"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after BlendOutTime is invoked"
+                        "tooltip": "Signaled after Blend Out Time is invoked"
                     },
                     "details": {
-                        "name": "BlendOutTime"
+                        "name": "Blend Out Time"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBlendInTime",
+                    "base": "GetBlendInTime",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlendInTime"
+                        "tooltip": "When signaled, this will invoke Get Blend In Time"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlendInTime is invoked"
+                        "tooltip": "Signaled after Get Blend In Time is invoked"
                     },
                     "details": {
-                        "name": "GetBlendInTime"
+                        "name": "Get Blend In Time"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "PlayMotion",
+                    "base": "PlayMotion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke PlayMotion"
@@ -64,11 +64,11 @@
                         "tooltip": "Signaled after PlayMotion is invoked"
                     },
                     "details": {
-                        "name": "PlayMotion"
+                        "name": "Play Motion"
                     }
                 },
                 {
-                    "key": "GetMotion",
+                    "base": "GetMotion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetMotion"
@@ -78,41 +78,41 @@
                         "tooltip": "Signaled after GetMotion is invoked"
                     },
                     "details": {
-                        "name": "GetMotion"
+                        "name": "Get Motion"
                     },
                     "results": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetBlendOutTime",
+                    "base": "GetBlendOutTime",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlendOutTime"
+                        "tooltip": "When signaled, this will invoke Get Blend Out Time"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlendOutTime is invoked"
+                        "tooltip": "Signaled after Get Blend Out Time is invoked"
                     },
                     "details": {
-                        "name": "GetBlendOutTime"
+                        "name": "Get Blend Out Time"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "ReverseMotion",
+                    "base": "ReverseMotion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Reverse Motion"
@@ -128,57 +128,57 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPlaySpeed",
+                    "base": "GetPlaySpeed",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPlaySpeed"
+                        "tooltip": "When signaled, this will invoke Get Play Speed"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPlaySpeed is invoked"
+                        "tooltip": "Signaled after Get Play Speed is invoked"
                     },
                     "details": {
-                        "name": "GetPlaySpeed"
+                        "name": "Get Play Speed"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPlayTime",
+                    "base": "GetPlayTime",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetPlayTime"
+                        "tooltip": "When signaled, this will invoke Get Play Time"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetPlayTime is invoked"
+                        "tooltip": "Signaled after Get Play Time is invoked"
                     },
                     "details": {
-                        "name": "GetPlayTime"
+                        "name": "Get Play Time"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RetargetMotion",
+                    "base": "RetargetMotion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Retarget Motion"
@@ -194,13 +194,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPlaySpeed",
+                    "base": "SetPlaySpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Play Speed"
@@ -216,13 +216,13 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Speed"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Motion",
+                    "base": "Motion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Motion"
@@ -238,79 +238,79 @@
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "BlendInTime",
+                    "base": "BlendInTime",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke BlendInTime"
+                        "tooltip": "When signaled, this will invoke Blend In Time"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after BlendInTime is invoked"
+                        "tooltip": "Signaled after Blend In Time is invoked"
                     },
                     "details": {
-                        "name": "BlendInTime"
+                        "name": "Blend In Time"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLoopMotion",
+                    "base": "GetLoopMotion",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetLoopMotion"
+                        "tooltip": "When signaled, this will invoke Get Loop Motion"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetLoopMotion is invoked"
+                        "tooltip": "Signaled after Get Loop Motion is invoked"
                     },
                     "details": {
-                        "name": "GetLoopMotion"
+                        "name": "Get Loop Motion"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Loop Motion"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "PlayTime",
+                    "base": "PlayTime",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke PlayTime"
+                        "tooltip": "When signaled, this will invoke Play Time"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after PlayTime is invoked"
+                        "tooltip": "Signaled after Play Time is invoked"
                     },
                     "details": {
-                        "name": "PlayTime"
+                        "name": "Play Time"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Time"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "LoopMotion",
+                    "base": "LoopMotion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Loop Motion"
@@ -326,13 +326,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MirrorMotion",
+                    "base": "MirrorMotion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Mirror Motion"
@@ -348,7 +348,7 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enable"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names
index c234b3503c..4dbabdfb97 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names
@@ -1,123 +1,116 @@
 {
     "entries": [
         {
-            "key": "SimpleStateComponentRequestBus",
+            "base": "SimpleStateComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SimpleStateComponentRequestBus",
+                "name": "Simple State",
                 "category": "Gameplay"
             },
             "methods": [
                 {
-                    "key": "GetNumStates",
+                    "base": "GetNumStates",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get State Count"
+                        "tooltip": "When signaled, this will invoke Get Num States"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get State Count is invoked"
+                        "tooltip": "Signaled after Get Num States is invoked"
                     },
                     "details": {
-                        "name": "Get State Count",
-                        "tooltip": "Returns the number of states"
+                        "name": "Get Num States"
                     },
                     "results": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "unsigned int"
+                                "name": "State Count"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetToLastState",
+                    "base": "SetToLastState",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set To Last"
+                        "tooltip": "When signaled, this will invoke Set To Last State"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set To Last is invoked"
+                        "tooltip": "Signaled after Set To Last State is invoked"
                     },
                     "details": {
-                        "name": "Set To Last",
-                        "tooltip": "Sets to the last state in the state list"
+                        "name": "Set To Last State"
                     }
                 },
                 {
-                    "key": "SetToPreviousState",
+                    "base": "SetToPreviousState",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set To Previous"
+                        "tooltip": "When signaled, this will invoke Set To Previous State"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set To Previous is invoked"
+                        "tooltip": "Signaled after Set To Previous State is invoked"
                     },
                     "details": {
-                        "name": "Set To Previous",
-                        "tooltip": "Sets to the previous state in the state list from the current state"
+                        "name": "Set To Previous State"
                     }
                 },
                 {
-                    "key": "SetToFirstState",
+                    "base": "SetToFirstState",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set To First"
+                        "tooltip": "When signaled, this will invoke Set To First State"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set To First is invoked"
+                        "tooltip": "Signaled after Set To First State is invoked"
                     },
                     "details": {
-                        "name": "Set To First",
-                        "tooltip": "Sets to the first state in the state list"
+                        "name": "Set To First State"
                     }
                 },
                 {
-                    "key": "SetToNextState",
+                    "base": "SetToNextState",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set To Next"
+                        "tooltip": "When signaled, this will invoke Set To Next State"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set To Next is invoked"
+                        "tooltip": "Signaled after Set To Next State is invoked"
                     },
                     "details": {
-                        "name": "Set To Next",
-                        "tooltip": "Sets to the next state in the state list from the current state"
+                        "name": "Set To Next State"
                     }
                 },
                 {
-                    "key": "SetStateByIndex",
+                    "base": "SetStateByIndex",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set State by Index"
+                        "tooltip": "When signaled, this will invoke Set State By Index"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set State by Index is invoked"
+                        "tooltip": "Signaled after Set State By Index is invoked"
                     },
                     "details": {
-                        "name": "Set State by Index",
-                        "tooltip": "Sets the state by index"
+                        "name": "Set State By Index"
                     },
                     "params": [
                         {
                             "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
                             "details": {
-                                "name": "Index",
-                                "tooltip": "State index"
+                                "name": "Index"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetState",
+                    "base": "SetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State"
@@ -127,21 +120,19 @@
                         "tooltip": "Signaled after Set State is invoked"
                     },
                     "details": {
-                        "name": "Set State",
-                        "tooltip": "Sets the state by name"
+                        "name": "Set State"
                     },
                     "params": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "Name",
-                                "tooltip": "State name"
+                                "name": "State Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCurrentState",
+                    "base": "GetCurrentState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Current State"
@@ -151,14 +142,13 @@
                         "tooltip": "Signaled after Get Current State is invoked"
                     },
                     "details": {
-                        "name": "Get Current State",
-                        "tooltip": "Gets the current state name"
+                        "name": "Get Current State"
                     },
                     "results": [
                         {
                             "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
                             "details": {
-                                "name": "char"
+                                "name": "State Name"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names
index 6b4bb30b91..e646bbef2f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names
@@ -1,16 +1,15 @@
 {
     "entries": [
         {
-            "key": "SimulatedBodyComponentRequestBus",
+            "base": "SimulatedBodyComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SimulatedBodyComponentRequestBus",
-                "category": "PhysX"
+                "name": "Simulated Body"
             },
             "methods": [
                 {
-                    "key": "GetAabb",
+                    "base": "GetAabb",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get AABB"
@@ -26,20 +25,20 @@
                         {
                             "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
                             "details": {
-                                "name": "Aabb"
+                                "name": "AABB"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsPhysicsEnabled",
+                    "base": "IsPhysicsEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Is Physics Enabled"
+                        "tooltip": "When signaled, this will invoke IsPhysicsEnabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Is Physics Enabled is invoked"
+                        "tooltip": "Signaled after IsPhysicsEnabled is invoked"
                     },
                     "details": {
                         "name": "Is Physics Enabled"
@@ -48,30 +47,29 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Enabled"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RayCast",
+                    "base": "RayCast",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Raycast (Single Body)"
+                        "tooltip": "When signaled, this will invoke RayCast"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Raycast (Single Body) is invoked"
+                        "tooltip": "Signaled after RayCast is invoked"
                     },
                     "details": {
-                        "name": "Raycast (Single Body)",
-                        "tooltip": "Perform a raycast against a single simulated body (not the whole scene)"
+                        "name": "Ray Cast"
                     },
                     "params": [
                         {
                             "typeid": "{53EAD088-A391-48F1-8370-2A1DBA31512F}",
                             "details": {
-                                "name": "Raycast Request",
+                                "name": "RayCast Request",
                                 "tooltip": "Parameters for raycast"
                             }
                         }
@@ -80,13 +78,13 @@
                         {
                             "typeid": "{7A7201B9-67B5-438B-B4EB-F3EEBB78C617}",
                             "details": {
-                                "name": "SceneQueryHit"
+                                "name": "Scene Query Hit"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DisablePhysics",
+                    "base": "DisablePhysics",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Disable Physics"
@@ -100,14 +98,14 @@
                     }
                 },
                 {
-                    "key": "EnablePhysics",
+                    "base": "EnablePhysics",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Enable Physics"
+                        "tooltip": "When signaled, this will invoke EnablePhysics"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Enable Physics is invoked"
+                        "tooltip": "Signaled after EnablePhysics is invoked"
                     },
                     "details": {
                         "name": "Enable Physics"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names
index 477f4fc85c..9a283e509f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "SkyBoxFogRequestBus",
+            "base": "SkyBoxFogRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SkyBoxFogRequestBus"
+                "name": "Sky Box Fog",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "GetBottomHeight",
+                    "base": "GetBottomHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBottomHeight"
+                        "tooltip": "When signaled, this will invoke Get Bottom Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBottomHeight is invoked"
+                        "tooltip": "Signaled after Get Bottom Height is invoked"
                     },
                     "details": {
-                        "name": "GetBottomHeight"
+                        "name": "Get Bottom Height"
                     },
                     "results": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetColor"
+                        "tooltip": "When signaled, this will invoke Get Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetColor is invoked"
+                        "tooltip": "Signaled after Get Color is invoked"
                     },
                     "details": {
-                        "name": "GetColor"
+                        "name": "Get Color"
                     },
                     "results": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "SetBottomHeight",
+                    "base": "SetBottomHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBottomHeight"
+                        "tooltip": "When signaled, this will invoke Set Bottom Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBottomHeight is invoked"
+                        "tooltip": "Signaled after Set Bottom Height is invoked"
                     },
                     "details": {
-                        "name": "SetBottomHeight"
+                        "name": "Set Bottom Height"
                     },
                     "params": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "SetColor",
+                    "base": "SetColor",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetColor"
+                        "tooltip": "When signaled, this will invoke Set Color"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetColor is invoked"
+                        "tooltip": "Signaled after Set Color is invoked"
                     },
                     "details": {
-                        "name": "SetColor"
+                        "name": "Set Color"
                     },
                     "params": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "GetTopHeight",
+                    "base": "GetTopHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTopHeight"
+                        "tooltip": "When signaled, this will invoke Get Top Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTopHeight is invoked"
+                        "tooltip": "Signaled after Get Top Height is invoked"
                     },
                     "details": {
-                        "name": "GetTopHeight"
+                        "name": "Get Top Height"
                     },
                     "results": [
                         {
@@ -119,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "IsEnabled",
+                    "base": "IsEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsEnabled"
+                        "tooltip": "When signaled, this will invoke Is Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsEnabled is invoked"
+                        "tooltip": "Signaled after Is Enabled is invoked"
                     },
                     "details": {
-                        "name": "IsEnabled"
+                        "name": "Is Enabled"
                     },
                     "results": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "SetTopHeight",
+                    "base": "SetTopHeight",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetTopHeight"
+                        "tooltip": "When signaled, this will invoke Set Top Height"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetTopHeight is invoked"
+                        "tooltip": "Signaled after Set Top Height is invoked"
                     },
                     "details": {
-                        "name": "SetTopHeight"
+                        "name": "Set Top Height"
                     },
                     "params": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names
index 1794a68d04..e8eca764e7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SliceRequestBus",
+            "base": "SliceRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SliceRequestBus"
+                "name": "Slice"
             },
             "methods": [
                 {
-                    "key": "CreateNewSlice",
+                    "base": "CreateNewSlice",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreateNewSlice"
@@ -46,7 +46,7 @@
                     ]
                 },
                 {
-                    "key": "InstantiateSliceFromAssetId",
+                    "base": "InstantiateSliceFromAssetId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke InstantiateSliceFromAssetId"
@@ -82,7 +82,7 @@
                     ]
                 },
                 {
-                    "key": "SetSliceDynamic",
+                    "base": "SetSliceDynamic",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetSliceDynamic"
@@ -110,7 +110,7 @@
                     ]
                 },
                 {
-                    "key": "ShowPushDialog",
+                    "base": "ShowPushDialog",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ShowPushDialog"
@@ -132,7 +132,7 @@
                     ]
                 },
                 {
-                    "key": "IsSliceDynamic",
+                    "base": "IsSliceDynamic",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsSliceDynamic"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names
index 2c51d78c35..27de9cad35 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SmoothStepGradientRequestBus",
+            "base": "SmoothStepGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SmoothStepGradientRequestBus"
+                "name": "Smooth Step Gradient"
             },
             "methods": [
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names
index 719b54ec45..7d4f344644 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SmoothStepRequestBus",
+            "base": "SmoothStepRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SmoothStepRequestBus"
+                "name": "Smooth Step"
             },
             "methods": [
                 {
-                    "key": "GetFallOffStrength",
+                    "base": "GetFallOffStrength",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFallOffStrength"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetFallOffStrength",
+                    "base": "SetFallOffStrength",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFallOffStrength"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetFallOffRange",
+                    "base": "GetFallOffRange",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFallOffRange"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetFallOffMidpoint",
+                    "base": "SetFallOffMidpoint",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFallOffMidpoint"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "SetFallOffRange",
+                    "base": "SetFallOffRange",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetFallOffRange"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "GetFallOffMidpoint",
+                    "base": "GetFallOffMidpoint",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetFallOffMidpoint"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names
index aa1b298bde..b9aeb3538a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names
@@ -1,134 +1,134 @@
 {
     "entries": [
         {
-            "key": "SpawnerComponentRequestBus",
+            "base": "SpawnerComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SpawnerComponentRequestBus",
+                "name": "Spawner",
                 "category": "Gameplay"
             },
             "methods": [
                 {
-                    "key": "SetDynamicSlice",
+                    "base": "SetDynamicSlice",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetDynamicSlice"
+                        "tooltip": "When signaled, this will invoke Set Dynamic Slice"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetDynamicSlice is invoked"
+                        "tooltip": "Signaled after Set Dynamic Slice is invoked"
                     },
                     "details": {
-                        "name": "SetDynamicSlice"
+                        "name": "Set Dynamic Slice"
                     },
                     "params": [
                         {
                             "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}",
                             "details": {
-                                "name": "AssetId"
+                                "name": "Asset Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCurrentlySpawnedSlices",
+                    "base": "GetCurrentlySpawnedSlices",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCurrentlySpawnedSlices"
+                        "tooltip": "When signaled, this will invoke Get Currently Spawned Slices"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCurrentlySpawnedSlices is invoked"
+                        "tooltip": "Signaled after Get Currently Spawned Slices is invoked"
                     },
                     "details": {
-                        "name": "GetCurrentlySpawnedSlices"
+                        "name": "Get Currently Spawned Slices"
                     },
                     "results": [
                         {
                             "typeid": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                             "details": {
-                                "name": ""
+                                "name": "Spawned Slices"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "HasAnyCurrentlySpawnedSlices",
+                    "base": "HasAnyCurrentlySpawnedSlices",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke HasAnyCurrentlySpawnedSlices"
+                        "tooltip": "When signaled, this will invoke Has Any Currently Spawned Slices"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after HasAnyCurrentlySpawnedSlices is invoked"
+                        "tooltip": "Signaled after Has Any Currently Spawned Slices is invoked"
                     },
                     "details": {
-                        "name": "HasAnyCurrentlySpawnedSlices"
+                        "name": "Has Any Currently Spawned Slices"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Result"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAllCurrentlySpawnedEntities",
+                    "base": "GetAllCurrentlySpawnedEntities",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetAllCurrentlySpawnedEntities"
+                        "tooltip": "When signaled, this will invoke Get All Currently Spawned Entities"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetAllCurrentlySpawnedEntities is invoked"
+                        "tooltip": "Signaled after Get All Currently Spawned Entities is invoked"
                     },
                     "details": {
-                        "name": "GetAllCurrentlySpawnedEntities"
+                        "name": "Get All Currently Spawned Entities"
                     },
                     "results": [
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Spawned Entities"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DestroyAllSpawnedSlices",
+                    "base": "DestroyAllSpawnedSlices",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DestroyAllSpawnedSlices"
+                        "tooltip": "When signaled, this will invoke Destroy All Spawned Slices"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DestroyAllSpawnedSlices is invoked"
+                        "tooltip": "Signaled after Destroy All Spawned Slices is invoked"
                     },
                     "details": {
-                        "name": "DestroyAllSpawnedSlices"
+                        "name": "Destroy All Spawned Slices"
                     }
                 },
                 {
-                    "key": "GetCurrentEntitiesFromSpawnedSlice",
+                    "base": "GetCurrentEntitiesFromSpawnedSlice",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCurrentEntitiesFromSpawnedSlice"
+                        "tooltip": "When signaled, this will invoke Get Current Entities From Spawned Slice"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCurrentEntitiesFromSpawnedSlice is invoked"
+                        "tooltip": "Signaled after Get Current Entities From Spawned Slice is invoked"
                     },
                     "details": {
-                        "name": "GetCurrentEntitiesFromSpawnedSlice"
+                        "name": "Get Current Entities From Spawned Slice"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ],
@@ -136,57 +136,57 @@
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Entities"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "DestroySpawnedSlice",
+                    "base": "DestroySpawnedSlice",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke DestroySpawnedSlice"
+                        "tooltip": "When signaled, this will invoke Destroy Spawned Slice"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after DestroySpawnedSlice is invoked"
+                        "tooltip": "Signaled after Destroy Spawned Slice is invoked"
                     },
                     "details": {
-                        "name": "DestroySpawnedSlice"
+                        "name": "Destroy Spawned Slice"
                     },
                     "params": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsReadyToSpawn",
+                    "base": "IsReadyToSpawn",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke IsReadyToSpawn"
+                        "tooltip": "When signaled, this will invoke Is Ready To Spawn"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after IsReadyToSpawn is invoked"
+                        "tooltip": "Signaled after Is Ready To Spawn is invoked"
                     },
                     "details": {
-                        "name": "IsReadyToSpawn"
+                        "name": "Is Ready To Spawn"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Ready"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SpawnRelative",
+                    "base": "SpawnRelative",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Spawn Relative"
@@ -196,15 +196,13 @@
                         "tooltip": "Signaled after Spawn Relative is invoked"
                     },
                     "details": {
-                        "name": "Spawn Relative",
-                        "tooltip": "Spawn the selected slice at the entity's location with the provided relative offset"
+                        "name": "Spawn Relative"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Offset",
-                                "tooltip": "The relative offset from the entity"
+                                "name": "Transform"
                             }
                         }
                     ],
@@ -212,14 +210,13 @@
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket",
-                                "tooltip": "The relative offset from the entity"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "Spawn",
+                    "base": "Spawn",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Spawn"
@@ -229,20 +226,19 @@
                         "tooltip": "Signaled after Spawn is invoked"
                     },
                     "details": {
-                        "name": "Spawn",
-                        "tooltip": "Spawns the designated slice at the entity's location"
+                        "name": "Spawn"
                     },
                     "results": [
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SpawnAbsolute",
+                    "base": "SpawnAbsolute",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Spawn Absolute"
@@ -252,15 +248,13 @@
                         "tooltip": "Signaled after Spawn Absolute is invoked"
                     },
                     "details": {
-                        "name": "Spawn Absolute",
-                        "tooltip": "Spawn the selected slice at an absolute position"
+                        "name": "Spawn Absolute"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Position",
-                                "tooltip": "The absolute position where the entity should spawn"
+                                "name": "Transform"
                             }
                         }
                     ],
@@ -268,8 +262,7 @@
                         {
                             "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
                             "details": {
-                                "name": "SliceInstantiationTicket",
-                                "tooltip": "The absolute position where the entity should spawn"
+                                "name": "Slice Instantiation Ticket"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names
index cc5521d074..c19e21564e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "SphereShapeComponentRequestsBus",
+            "base": "SphereShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SphereShapeComponentRequestsBus",
+                "name": "Sphere Shape Component",
                 "category": "Shape"
             },
             "methods": [
                 {
-                    "key": "GetSphereConfiguration",
+                    "base": "GetSphereConfiguration",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Configuration"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetRadius",
+                    "base": "SetRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Radius"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names
index 067ddc4c0b..ea1d84e847 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "SplineComponentRequestBus",
+            "base": "SplineComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SplineComponentRequestBus",
+                "name": "Spline Component",
                 "category": "Shape"
             },
             "methods": [
                 {
-                    "key": "ClearVertices",
+                    "base": "ClearVertices",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Clear Vertices"
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "key": "RemoveVertex",
+                    "base": "RemoveVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Remove Vertex"
@@ -54,7 +54,7 @@
                     ]
                 },
                 {
-                    "key": "UpdateVertex",
+                    "base": "UpdateVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Update Vertex"
@@ -90,7 +90,7 @@
                     ]
                 },
                 {
-                    "key": "AddVertex",
+                    "base": "AddVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Add Vertex"
@@ -112,7 +112,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpline",
+                    "base": "GetSpline",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Spline"
@@ -134,7 +134,7 @@
                     ]
                 },
                 {
-                    "key": "SetClosed",
+                    "base": "SetClosed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Closed"
@@ -156,7 +156,7 @@
                     ]
                 },
                 {
-                    "key": "InsertVertex",
+                    "base": "InsertVertex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Insert Vertex"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names
index a0d6ebdedd..9c3265fa01 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "SsaoRequestBus",
+            "base": "SsaoRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SsaoRequestBus"
+                "name": "SSAO",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetBlurDepthFalloffStrength",
+                    "base": "SetBlurDepthFalloffStrength",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBlurDepthFalloffStrength"
+                        "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Strength"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBlurDepthFalloffStrength is invoked"
+                        "tooltip": "Signaled after Set Blur Depth Falloff Strength is invoked"
                     },
                     "details": {
-                        "name": "SetBlurDepthFalloffStrength"
+                        "name": "Set Blur Depth Falloff Strength"
                     },
                     "params": [
                         {
@@ -31,17 +32,17 @@
                     ]
                 },
                 {
-                    "key": "SetBlurDepthFalloffThreshold",
+                    "base": "SetBlurDepthFalloffThreshold",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBlurDepthFalloffThreshold"
+                        "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Threshold"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBlurDepthFalloffThreshold is invoked"
+                        "tooltip": "Signaled after Set Blur Depth Falloff Threshold is invoked"
                     },
                     "details": {
-                        "name": "SetBlurDepthFalloffThreshold"
+                        "name": "Set Blur Depth Falloff Threshold"
                     },
                     "params": [
                         {
@@ -53,17 +54,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnableDownsampleOverride",
+                    "base": "SetEnableDownsampleOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableDownsampleOverride"
+                        "tooltip": "When signaled, this will invoke Set Enable Downsample Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableDownsampleOverride is invoked"
+                        "tooltip": "Signaled after Set Enable Downsample Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnableDownsampleOverride"
+                        "name": "Set Enable Downsample Override"
                     },
                     "params": [
                         {
@@ -75,17 +76,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnableBlurOverride",
+                    "base": "SetEnableBlurOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableBlurOverride"
+                        "tooltip": "When signaled, this will invoke Set Enable Blur Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableBlurOverride is invoked"
+                        "tooltip": "Signaled after Set Enable Blur Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnableBlurOverride"
+                        "name": "Set Enable Blur Override"
                     },
                     "params": [
                         {
@@ -97,17 +98,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnabledOverride",
+                    "base": "GetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Get Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Get Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnabledOverride"
+                        "name": "Get Enabled Override"
                     },
                     "results": [
                         {
@@ -119,17 +120,17 @@
                     ]
                 },
                 {
-                    "key": "GetSamplingRadius",
+                    "base": "GetSamplingRadius",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSamplingRadius"
+                        "tooltip": "When signaled, this will invoke Get Sampling Radius"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSamplingRadius is invoked"
+                        "tooltip": "Signaled after Get Sampling Radius is invoked"
                     },
                     "details": {
-                        "name": "GetSamplingRadius"
+                        "name": "Get Sampling Radius"
                     },
                     "results": [
                         {
@@ -141,17 +142,17 @@
                     ]
                 },
                 {
-                    "key": "SetBlurDepthFalloffStrengthOverride",
+                    "base": "SetBlurDepthFalloffStrengthOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBlurDepthFalloffStrengthOverride"
+                        "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Strength Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBlurDepthFalloffStrengthOverride is invoked"
+                        "tooltip": "Signaled after Set Blur Depth Falloff Strength Override is invoked"
                     },
                     "details": {
-                        "name": "SetBlurDepthFalloffStrengthOverride"
+                        "name": "Set Blur Depth Falloff Strength Override"
                     },
                     "params": [
                         {
@@ -163,17 +164,17 @@
                     ]
                 },
                 {
-                    "key": "GetBlurDepthFalloffThresholdOverride",
+                    "base": "GetBlurDepthFalloffThresholdOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlurDepthFalloffThresholdOverride"
+                        "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Threshold Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlurDepthFalloffThresholdOverride is invoked"
+                        "tooltip": "Signaled after Get Blur Depth Falloff Threshold Override is invoked"
                     },
                     "details": {
-                        "name": "GetBlurDepthFalloffThresholdOverride"
+                        "name": "Get Blur Depth Falloff Threshold Override"
                     },
                     "results": [
                         {
@@ -185,17 +186,17 @@
                     ]
                 },
                 {
-                    "key": "GetBlurDepthFalloffThreshold",
+                    "base": "GetBlurDepthFalloffThreshold",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlurDepthFalloffThreshold"
+                        "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Threshold"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlurDepthFalloffThreshold is invoked"
+                        "tooltip": "Signaled after Get Blur Depth Falloff Threshold is invoked"
                     },
                     "details": {
-                        "name": "GetBlurDepthFalloffThreshold"
+                        "name": "Get Blur Depth Falloff Threshold"
                     },
                     "results": [
                         {
@@ -207,17 +208,17 @@
                     ]
                 },
                 {
-                    "key": "GetSamplingRadiusOverride",
+                    "base": "GetSamplingRadiusOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetSamplingRadiusOverride"
+                        "tooltip": "When signaled, this will invoke Get Sampling Radius Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetSamplingRadiusOverride is invoked"
+                        "tooltip": "Signaled after Get Sampling Radius Override is invoked"
                     },
                     "details": {
-                        "name": "GetSamplingRadiusOverride"
+                        "name": "Get Sampling Radius Override"
                     },
                     "results": [
                         {
@@ -229,17 +230,17 @@
                     ]
                 },
                 {
-                    "key": "SetStrengthOverride",
+                    "base": "SetStrengthOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetStrengthOverride"
+                        "tooltip": "When signaled, this will invoke Set Strength Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetStrengthOverride is invoked"
+                        "tooltip": "Signaled after Set Strength Override is invoked"
                     },
                     "details": {
-                        "name": "SetStrengthOverride"
+                        "name": "Set Strength Override"
                     },
                     "params": [
                         {
@@ -251,17 +252,17 @@
                     ]
                 },
                 {
-                    "key": "GetStrength",
+                    "base": "GetStrength",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetStrength"
+                        "tooltip": "When signaled, this will invoke Get Strength"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetStrength is invoked"
+                        "tooltip": "Signaled after Get Strength is invoked"
                     },
                     "details": {
-                        "name": "GetStrength"
+                        "name": "Get Strength"
                     },
                     "results": [
                         {
@@ -273,17 +274,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnabled"
+                        "tooltip": "When signaled, this will invoke Get Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnabled is invoked"
+                        "tooltip": "Signaled after Get Enabled is invoked"
                     },
                     "details": {
-                        "name": "GetEnabled"
+                        "name": "Get Enabled"
                     },
                     "results": [
                         {
@@ -295,17 +296,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnableDownsample",
+                    "base": "GetEnableDownsample",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableDownsample"
+                        "tooltip": "When signaled, this will invoke Get Enable Downsample"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableDownsample is invoked"
+                        "tooltip": "Signaled after Get Enable Downsample is invoked"
                     },
                     "details": {
-                        "name": "GetEnableDownsample"
+                        "name": "Get Enable Downsample"
                     },
                     "results": [
                         {
@@ -317,17 +318,17 @@
                     ]
                 },
                 {
-                    "key": "GetBlurDepthFalloffStrength",
+                    "base": "GetBlurDepthFalloffStrength",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlurDepthFalloffStrength"
+                        "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Strength"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlurDepthFalloffStrength is invoked"
+                        "tooltip": "Signaled after Get Blur Depth Falloff Strength is invoked"
                     },
                     "details": {
-                        "name": "GetBlurDepthFalloffStrength"
+                        "name": "Get Blur Depth Falloff Strength"
                     },
                     "results": [
                         {
@@ -339,17 +340,17 @@
                     ]
                 },
                 {
-                    "key": "SetBlurConstFalloff",
+                    "base": "SetBlurConstFalloff",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBlurConstFalloff"
+                        "tooltip": "When signaled, this will invoke Set Blur Const Falloff"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBlurConstFalloff is invoked"
+                        "tooltip": "Signaled after Set Blur Const Falloff is invoked"
                     },
                     "details": {
-                        "name": "SetBlurConstFalloff"
+                        "name": "Set Blur Const Falloff"
                     },
                     "params": [
                         {
@@ -361,17 +362,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnableDownsampleOverride",
+                    "base": "GetEnableDownsampleOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableDownsampleOverride"
+                        "tooltip": "When signaled, this will invoke Get Enable Downsample Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableDownsampleOverride is invoked"
+                        "tooltip": "Signaled after Get Enable Downsample Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnableDownsampleOverride"
+                        "name": "Get Enable Downsample Override"
                     },
                     "results": [
                         {
@@ -383,17 +384,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnableBlurOverride",
+                    "base": "GetEnableBlurOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableBlurOverride"
+                        "tooltip": "When signaled, this will invoke Get Enable Blur Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableBlurOverride is invoked"
+                        "tooltip": "Signaled after Get Enable Blur Override is invoked"
                     },
                     "details": {
-                        "name": "GetEnableBlurOverride"
+                        "name": "Get Enable Blur Override"
                     },
                     "results": [
                         {
@@ -405,17 +406,17 @@
                     ]
                 },
                 {
-                    "key": "SetSamplingRadiusOverride",
+                    "base": "SetSamplingRadiusOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSamplingRadiusOverride"
+                        "tooltip": "When signaled, this will invoke Set Sampling Radius Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSamplingRadiusOverride is invoked"
+                        "tooltip": "Signaled after Set Sampling Radius Override is invoked"
                     },
                     "details": {
-                        "name": "SetSamplingRadiusOverride"
+                        "name": "Set Sampling Radius Override"
                     },
                     "params": [
                         {
@@ -427,17 +428,17 @@
                     ]
                 },
                 {
-                    "key": "SetSamplingRadius",
+                    "base": "SetSamplingRadius",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetSamplingRadius"
+                        "tooltip": "When signaled, this will invoke Set Sampling Radius"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetSamplingRadius is invoked"
+                        "tooltip": "Signaled after Set Sampling Radius is invoked"
                     },
                     "details": {
-                        "name": "SetSamplingRadius"
+                        "name": "Set Sampling Radius"
                     },
                     "params": [
                         {
@@ -449,17 +450,17 @@
                     ]
                 },
                 {
-                    "key": "SetStrength",
+                    "base": "SetStrength",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetStrength"
+                        "tooltip": "When signaled, this will invoke Set Strength"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetStrength is invoked"
+                        "tooltip": "Signaled after Set Strength is invoked"
                     },
                     "details": {
-                        "name": "SetStrength"
+                        "name": "Set Strength"
                     },
                     "params": [
                         {
@@ -471,17 +472,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabled"
+                        "tooltip": "When signaled, this will invoke Set Enabled"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabled is invoked"
+                        "tooltip": "Signaled after Set Enabled is invoked"
                     },
                     "details": {
-                        "name": "SetEnabled"
+                        "name": "Set Enabled"
                     },
                     "params": [
                         {
@@ -493,17 +494,17 @@
                     ]
                 },
                 {
-                    "key": "GetStrengthOverride",
+                    "base": "GetStrengthOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetStrengthOverride"
+                        "tooltip": "When signaled, this will invoke Get Strength Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetStrengthOverride is invoked"
+                        "tooltip": "Signaled after Get Strength Override is invoked"
                     },
                     "details": {
-                        "name": "GetStrengthOverride"
+                        "name": "Get Strength Override"
                     },
                     "results": [
                         {
@@ -515,17 +516,17 @@
                     ]
                 },
                 {
-                    "key": "GetEnableBlur",
+                    "base": "GetEnableBlur",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetEnableBlur"
+                        "tooltip": "When signaled, this will invoke Get Enable Blur"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetEnableBlur is invoked"
+                        "tooltip": "Signaled after Get Enable Blur is invoked"
                     },
                     "details": {
-                        "name": "GetEnableBlur"
+                        "name": "Get Enable Blur"
                     },
                     "results": [
                         {
@@ -537,17 +538,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnableDownsample",
+                    "base": "SetEnableDownsample",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableDownsample"
+                        "tooltip": "When signaled, this will invoke Set Enable Downsample"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableDownsample is invoked"
+                        "tooltip": "Signaled after Set Enable Downsample is invoked"
                     },
                     "details": {
-                        "name": "SetEnableDownsample"
+                        "name": "Set Enable Downsample"
                     },
                     "params": [
                         {
@@ -559,17 +560,17 @@
                     ]
                 },
                 {
-                    "key": "SetBlurDepthFalloffThresholdOverride",
+                    "base": "SetBlurDepthFalloffThresholdOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBlurDepthFalloffThresholdOverride"
+                        "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Threshold Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBlurDepthFalloffThresholdOverride is invoked"
+                        "tooltip": "Signaled after Set Blur Depth Falloff Threshold Override is invoked"
                     },
                     "details": {
-                        "name": "SetBlurDepthFalloffThresholdOverride"
+                        "name": "Set Blur Depth Falloff Threshold Override"
                     },
                     "params": [
                         {
@@ -581,17 +582,17 @@
                     ]
                 },
                 {
-                    "key": "SetBlurConstFalloffOverride",
+                    "base": "SetBlurConstFalloffOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetBlurConstFalloffOverride"
+                        "tooltip": "When signaled, this will invoke Set Blur Const Falloff Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetBlurConstFalloffOverride is invoked"
+                        "tooltip": "Signaled after Set Blur Const Falloff Override is invoked"
                     },
                     "details": {
-                        "name": "SetBlurConstFalloffOverride"
+                        "name": "Set Blur Const Falloff Override"
                     },
                     "params": [
                         {
@@ -603,17 +604,17 @@
                     ]
                 },
                 {
-                    "key": "GetBlurConstFalloff",
+                    "base": "GetBlurConstFalloff",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlurConstFalloff"
+                        "tooltip": "When signaled, this will invoke Get Blur Const Falloff"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlurConstFalloff is invoked"
+                        "tooltip": "Signaled after Get Blur Const Falloff is invoked"
                     },
                     "details": {
-                        "name": "GetBlurConstFalloff"
+                        "name": "Get Blur Const Falloff"
                     },
                     "results": [
                         {
@@ -625,17 +626,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnabledOverride",
+                    "base": "SetEnabledOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnabledOverride"
+                        "tooltip": "When signaled, this will invoke Set Enabled Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnabledOverride is invoked"
+                        "tooltip": "Signaled after Set Enabled Override is invoked"
                     },
                     "details": {
-                        "name": "SetEnabledOverride"
+                        "name": "Set Enabled Override"
                     },
                     "params": [
                         {
@@ -647,17 +648,17 @@
                     ]
                 },
                 {
-                    "key": "SetEnableBlur",
+                    "base": "SetEnableBlur",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetEnableBlur"
+                        "tooltip": "When signaled, this will invoke Set Enable Blur"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetEnableBlur is invoked"
+                        "tooltip": "Signaled after Set Enable Blur is invoked"
                     },
                     "details": {
-                        "name": "SetEnableBlur"
+                        "name": "Set Enable Blur"
                     },
                     "params": [
                         {
@@ -669,17 +670,17 @@
                     ]
                 },
                 {
-                    "key": "GetBlurConstFalloffOverride",
+                    "base": "GetBlurConstFalloffOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlurConstFalloffOverride"
+                        "tooltip": "When signaled, this will invoke Get Blur Const Falloff Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlurConstFalloffOverride is invoked"
+                        "tooltip": "Signaled after Get Blur Const Falloff Override is invoked"
                     },
                     "details": {
-                        "name": "GetBlurConstFalloffOverride"
+                        "name": "Get Blur Const Falloff Override"
                     },
                     "results": [
                         {
@@ -691,17 +692,17 @@
                     ]
                 },
                 {
-                    "key": "GetBlurDepthFalloffStrengthOverride",
+                    "base": "GetBlurDepthFalloffStrengthOverride",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetBlurDepthFalloffStrengthOverride"
+                        "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Strength Override"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetBlurDepthFalloffStrengthOverride is invoked"
+                        "tooltip": "Signaled after Get Blur Depth Falloff Strength Override is invoked"
                     },
                     "details": {
-                        "name": "GetBlurDepthFalloffStrengthOverride"
+                        "name": "Get Blur Depth Falloff Strength Override"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names
index a8ff8ab8fd..9ef0487372 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SurfaceAltitudeGradientRequestBus",
+            "base": "SurfaceAltitudeGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SurfaceAltitudeGradientRequestBus"
+                "name": "Surface Altitude Gradient"
             },
             "methods": [
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumTags"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveTag"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetAltitudeMax",
+                    "base": "GetAltitudeMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAltitudeMax"
@@ -75,7 +75,7 @@
                     ]
                 },
                 {
-                    "key": "SetAltitudeMin",
+                    "base": "SetAltitudeMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAltitudeMin"
@@ -97,7 +97,7 @@
                     ]
                 },
                 {
-                    "key": "GetAltitudeMin",
+                    "base": "GetAltitudeMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAltitudeMin"
@@ -119,7 +119,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTag"
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddTag"
@@ -171,7 +171,7 @@
                     ]
                 },
                 {
-                    "key": "SetShapeEntityId",
+                    "base": "SetShapeEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetShapeEntityId"
@@ -194,7 +194,7 @@
                     ]
                 },
                 {
-                    "key": "SetAltitudeMax",
+                    "base": "SetAltitudeMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAltitudeMax"
@@ -216,7 +216,7 @@
                     ]
                 },
                 {
-                    "key": "GetShapeEntityId",
+                    "base": "GetShapeEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetShapeEntityId"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names
index b71f80ddf9..5fa94d9dc8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SurfaceMaskGradientRequestBus",
+            "base": "SurfaceMaskGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SurfaceMaskGradientRequestBus"
+                "name": "Surface Mask Gradient"
             },
             "methods": [
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumTags"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTag"
@@ -61,7 +61,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveTag"
@@ -83,7 +83,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddTag"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names
index 9b0cd3802c..ac699f5fc5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "SurfaceSlopeGradientRequestBus",
+            "base": "SurfaceSlopeGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "SurfaceSlopeGradientRequestBus"
+                "name": "Surface Slope Gradient"
             },
             "methods": [
                 {
-                    "key": "SetRampType",
+                    "base": "SetRampType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetRampType"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "GetTag",
+                    "base": "GetTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTag"
@@ -61,7 +61,7 @@
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AddTag"
@@ -83,7 +83,7 @@
                     ]
                 },
                 {
-                    "key": "SetSlopeMax",
+                    "base": "SetSlopeMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetSlopeMax"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumTags",
+                    "base": "GetNumTags",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNumTags"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke RemoveTag"
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "key": "GetRampType",
+                    "base": "GetRampType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetRampType"
@@ -171,7 +171,7 @@
                     ]
                 },
                 {
-                    "key": "GetSlopeMax",
+                    "base": "GetSlopeMax",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetSlopeMax"
@@ -193,7 +193,7 @@
                     ]
                 },
                 {
-                    "key": "SetSlopeMin",
+                    "base": "SetSlopeMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetSlopeMin"
@@ -215,7 +215,7 @@
                     ]
                 },
                 {
-                    "key": "GetSlopeMin",
+                    "base": "GetSlopeMin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetSlopeMin"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names
index b0b63a23ed..f1d8a7bc31 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "TagComponentRequestBus",
+            "base": "TagComponentRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "TagComponentRequestBus",
-                "category": "Gameplay"
+                "name": "Requests",
+                "category": "Gameplay/Tag"
             },
             "methods": [
                 {
-                    "key": "HasTag",
+                    "base": "HasTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has Tag"
@@ -20,15 +20,13 @@
                         "tooltip": "Signaled after Has Tag is invoked"
                     },
                     "details": {
-                        "name": "Has Tag",
-                        "tooltip": "Returns true if an entity has a specified tag"
+                        "name": "Has Tag"
                     },
                     "params": [
                         {
                             "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
                             "details": {
-                                "name": "Tag",
-                                "tooltip": "The tag to check if the source entity has"
+                                "name": "Tag"
                             }
                         }
                     ],
@@ -36,14 +34,13 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool",
-                                "tooltip": "The tag to check if the source entity has"
+                                "name": "Has Tag"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "AddTag",
+                    "base": "AddTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Add Tag"
@@ -53,21 +50,19 @@
                         "tooltip": "Signaled after Add Tag is invoked"
                     },
                     "details": {
-                        "name": "Add Tag",
-                        "tooltip": "Adds a tag to an entity if it didn't already have it"
+                        "name": "Add Tag"
                     },
                     "params": [
                         {
                             "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
                             "details": {
-                                "name": "Tag",
-                                "tooltip": "The tag to add to the entity"
+                                "name": "Tag"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RemoveTag",
+                    "base": "RemoveTag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Remove Tag"
@@ -77,15 +72,13 @@
                         "tooltip": "Signaled after Remove Tag is invoked"
                     },
                     "details": {
-                        "name": "Remove Tag",
-                        "tooltip": "Removes a tag from an entity if it had it"
+                        "name": "Remove Tag"
                     },
                     "params": [
                         {
                             "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
                             "details": {
-                                "name": "Tag",
-                                "tooltip": "The tag to remove from the entity"
+                                "name": "Tag"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names
index fa31042580..8136a2c947 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "TagGlobalRequestBus",
+            "base": "TagGlobalRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "TagGlobalRequestBus",
-                "category": "Gameplay"
+                "name": "Requests",
+                "category": "Gameplay/Tag"
             },
             "methods": [
                 {
-                    "key": "RequestTaggedEntities",
+                    "base": "RequestTaggedEntities",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Request Tagged Entities"
@@ -20,14 +20,13 @@
                         "tooltip": "Signaled after Request Tagged Entities is invoked"
                     },
                     "details": {
-                        "name": "Request Tagged Entities",
-                        "tooltip": "Returns the first responding entity that has a specified Tag"
+                        "name": "Request Tagged Entities"
                     },
                     "results": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Entity Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names
index 96f3158c5b..50b0c9794b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names
@@ -1,155 +1,44 @@
 {
     "entries": [
         {
-            "key": "TerrainDataRequestBus",
+            "base": "TerrainDataRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "TerrainDataRequestBus"
+                "name": "Terrain Data"
             },
             "methods": [
                 {
-                    "key": "GetNormalFromFloats",
+                    "base": "GetIsHoleFromFloats",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNormalFromFloats"
+                        "tooltip": "When signaled, this will invoke Get Is Hole From Floats"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetNormalFromFloats is invoked"
+                        "tooltip": "Signaled after Get Is Hole From Floats is invoked"
                     },
                     "details": {
-                        "name": "GetNormalFromFloats"
+                        "name": "Get Is Hole From Floats"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "X"
                             }
                         },
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Y"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
-                            }
-                        },
-                        {
-                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
-                            "details": {
-                                "name": "bool"
-                            }
-                        }
-                    ],
-                    "results": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetNormal",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetNormal"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetNormal is invoked"
-                    },
-                    "details": {
-                        "name": "GetNormal"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        },
-                        {
-                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
-                            "details": {
-                                "name": "int"
-                            }
-                        },
-                        {
-                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
-                            "details": {
-                                "name": "bool"
-                            }
-                        }
-                    ],
-                    "results": [
-                        {
-                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
-                            "details": {
-                                "name": "Vector3"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetTerrainAabb",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTerrainAabb"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetTerrainAabb is invoked"
-                    },
-                    "details": {
-                        "name": "GetTerrainAabb"
-                    },
-                    "results": [
-                        {
-                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
-                            "details": {
-                                "name": "Aabb"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "key": "GetIsHoleFromFloats",
-                    "entry": {
-                        "name": "In",
-                        "tooltip": "When signaled, this will invoke GetIsHoleFromFloats"
-                    },
-                    "exit": {
-                        "name": "Out",
-                        "tooltip": "Signaled after GetIsHoleFromFloats is invoked"
-                    },
-                    "details": {
-                        "name": "GetIsHoleFromFloats"
-                    },
-                    "params": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        },
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
-                            }
-                        },
-                        {
-                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
-                            "details": {
-                                "name": "int"
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
                             }
                         }
                     ],
@@ -157,89 +46,124 @@
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Terrain Exists"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetHeightFromFloats",
+                    "base": "GetSurfaceWeightsFromVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetHeightFromFloats"
+                        "tooltip": "When signaled, this will invoke Get Surface Weights From Vector2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetHeightFromFloats is invoked"
+                        "tooltip": "Signaled after Get Surface Weights From Vector2 is invoked"
                     },
                     "details": {
-                        "name": "GetHeightFromFloats"
+                        "name": "Get Surface Weights From Vector2"
                     },
                     "params": [
                         {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "float"
+                                "name": "Position"
                             }
                         },
                         {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}",
                             "details": {
-                                "name": "float"
+                                "name": "Surface Weights"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
-                            }
-                        }
-                    ],
-                    "results": [
-                        {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
-                            "details": {
-                                "name": "float"
+                                "name": "Terrain Exists"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMaxSurfaceWeight",
+                    "base": "GetSurfaceWeights",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaxSurfaceWeight"
+                        "tooltip": "When signaled, this will invoke GetSurfaceWeights"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaxSurfaceWeight is invoked"
+                        "tooltip": "Signaled after GetSurfaceWeights is invoked"
                     },
                     "details": {
-                        "name": "GetMaxSurfaceWeight"
+                        "name": "GetSurfaceWeights"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}",
+                            "details": {
+                                "name": "Surface Weights"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Terrain Exists"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaxSurfaceWeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Max Surface Weight"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Max Surface Weight is invoked"
+                    },
+                    "details": {
+                        "name": "Get Max Surface Weight"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Terrain Exists"
                             }
                         }
                     ],
@@ -247,111 +171,213 @@
                         {
                             "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
                             "details": {
-                                "name": "SurfaceTagWeight"
+                                "name": "Surface Tag Weight"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetMaxSurfaceWeightFromFloats",
+                    "base": "GetSurfacePointFromVector2",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetMaxSurfaceWeightFromFloats"
+                        "tooltip": "When signaled, this will invoke Get Surface Point From Vector2"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetMaxSurfaceWeightFromFloats is invoked"
+                        "tooltip": "Signaled after Get Surface Point From Vector2 is invoked"
                     },
                     "details": {
-                        "name": "GetMaxSurfaceWeightFromFloats"
+                        "name": "Get Surface Point From Vector2"
                     },
                     "params": [
                         {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "float"
+                                "name": "Position"
                             }
                         },
                         {
-                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
                             "details": {
-                                "name": "float"
+                                "name": "Surface Point"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
-                            }
-                        }
-                    ],
-                    "results": [
-                        {
-                            "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
-                            "details": {
-                                "name": "SurfaceTagWeight"
+                                "name": "Terrain Exists"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetTerrainHeightQueryResolution",
+                    "base": "GetTerrainHeightQueryResolution",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetTerrainHeightQueryResolution"
+                        "tooltip": "When signaled, this will invoke Get Terrain Height Query Resolution"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetTerrainHeightQueryResolution is invoked"
+                        "tooltip": "Signaled after Get Terrain Height Query Resolution is invoked"
                     },
                     "details": {
-                        "name": "GetTerrainHeightQueryResolution"
+                        "name": "Get Terrain Height Query Resolution"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Position"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetHeight",
+                    "base": "GetNormal",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetHeight"
+                        "tooltip": "When signaled, this will invoke Get Normal"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetHeight is invoked"
+                        "tooltip": "Signaled after Get Normal is invoked"
                     },
                     "details": {
-                        "name": "GetHeight"
+                        "name": "Get Normal"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Position"
                             }
                         },
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "int"
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
                             }
                         },
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Terrain Exists"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Normal"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetMaxSurfaceWeightFromVector2",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Max Surface Weight From Vector2"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Max Surface Weight From Vector2 is invoked"
+                    },
+                    "details": {
+                        "name": "Get Max Surface Weight From Vector2"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Terrain Exists"
+                            }
+                        }
+                    ],
+                    "results": [
+                        {
+                            "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
+                            "details": {
+                                "name": "Surface Tag Weight"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetTerrainAabb",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Terrain AABB"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Terrain AABB is invoked"
+                    },
+                    "details": {
+                        "name": "Get Terrain AABB"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+                            "details": {
+                                "name": "AABB"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetHeight",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Height"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Height is invoked"
+                    },
+                    "details": {
+                        "name": "Get Height"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Terrain Exists"
                             }
                         }
                     ],
@@ -359,7 +385,48 @@
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Height"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "base": "GetSurfacePoint",
+                    "entry": {
+                        "name": "In",
+                        "tooltip": "When signaled, this will invoke Get Surface Point"
+                    },
+                    "exit": {
+                        "name": "Out",
+                        "tooltip": "Signaled after Get Surface Point is invoked"
+                    },
+                    "details": {
+                        "name": "Get Surface Point"
+                    },
+                    "params": [
+                        {
+                            "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+                            "details": {
+                                "name": "Position"
+                            }
+                        },
+                        {
+                            "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+                            "details": {
+                                "name": "Surface Point"
+                            }
+                        },
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Sample Filter",
+                                "tooltip": "0: Bilinear, 1: Clamp, 2: Exact"
+                            }
+                        },
+                        {
+                            "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+                            "details": {
+                                "name": "Terrain Exists"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names
index 0ad659c691..8ffeee9ab3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ThresholdGradientRequestBus",
+            "base": "ThresholdGradientRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ThresholdGradientRequestBus"
+                "name": "Threshold Gradient"
             },
             "methods": [
                 {
-                    "key": "GetThreshold",
+                    "base": "GetThreshold",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetThreshold"
@@ -31,7 +31,7 @@
                     ]
                 },
                 {
-                    "key": "SetThreshold",
+                    "base": "SetThreshold",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetThreshold"
@@ -53,7 +53,7 @@
                     ]
                 },
                 {
-                    "key": "GetGradientSampler",
+                    "base": "GetGradientSampler",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetGradientSampler"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names
index 869d2cfcfb..f3589b8d78 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "TickRequestBus",
+            "base": "TickRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "TickRequestBus",
+                "name": "Tick",
                 "category": "Timing"
             },
             "methods": [
                 {
-                    "key": "GetTickDeltaTime",
+                    "base": "GetTickDeltaTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Tick Delta Time"
@@ -20,8 +20,7 @@
                         "tooltip": "Signaled after Get Tick Delta Time is invoked"
                     },
                     "details": {
-                        "name": "Get Tick Delta Time",
-                        "tooltip": "Gets the latest time between ticks"
+                        "name": "Get Tick Delta Time"
                     },
                     "results": [
                         {
@@ -33,24 +32,23 @@
                     ]
                 },
                 {
-                    "key": "GetTimeAtCurrentTick",
+                    "base": "GetTimeAtCurrentTick",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Time at Current Tick"
+                        "tooltip": "When signaled, this will invoke Get Time At Current Tick"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Time at Current Tick is invoked"
+                        "tooltip": "Signaled after Get Time At Current Tick is invoked"
                     },
                     "details": {
-                        "name": "Get Time at Current Tick",
-                        "tooltip": "Gets the time in seconds since the epoch (January 1, 1970)"
+                        "name": "Get Time At Current Tick"
                     },
                     "results": [
                         {
                             "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}",
                             "details": {
-                                "name": "ScriptTimePoint"
+                                "name": "Script Time Point"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names
index 055931428e..a3c9841952 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "ToolsApplicationRequestBus",
+            "base": "ToolsApplicationRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ToolsApplicationRequestBus"
+                "name": "Tools Application"
             },
             "methods": [
                 {
-                    "key": "MarkEntitySelected",
+                    "base": "MarkEntitySelected",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MarkEntitySelected"
@@ -32,7 +32,7 @@
                     ]
                 },
                 {
-                    "key": "IsSelected",
+                    "base": "IsSelected",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsSelected"
@@ -63,7 +63,7 @@
                     ]
                 },
                 {
-                    "key": "GetSelectedEntitiesCount",
+                    "base": "GetSelectedEntitiesCount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetSelectedEntitiesCount"
@@ -85,7 +85,7 @@
                     ]
                 },
                 {
-                    "key": "GetSelectedEntities",
+                    "base": "GetSelectedEntities",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetSelectedEntities"
@@ -107,7 +107,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteEntitiesAndAllDescendants",
+                    "base": "DeleteEntitiesAndAllDescendants",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteEntitiesAndAllDescendants"
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "GetExistingEntity",
+                    "base": "GetExistingEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetExistingEntity"
@@ -160,7 +160,7 @@
                     ]
                 },
                 {
-                    "key": "SetSelectedEntities",
+                    "base": "SetSelectedEntities",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetSelectedEntities"
@@ -182,7 +182,7 @@
                     ]
                 },
                 {
-                    "key": "MarkEntitiesSelected",
+                    "base": "MarkEntitiesSelected",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MarkEntitiesSelected"
@@ -204,7 +204,7 @@
                     ]
                 },
                 {
-                    "key": "MarkEntityDeselected",
+                    "base": "MarkEntityDeselected",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MarkEntityDeselected"
@@ -227,7 +227,7 @@
                     ]
                 },
                 {
-                    "key": "GetCurrentLevelEntityId",
+                    "base": "GetCurrentLevelEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetCurrentLevelEntityId"
@@ -250,7 +250,7 @@
                     ]
                 },
                 {
-                    "key": "AreAnyEntitiesSelected",
+                    "base": "AreAnyEntitiesSelected",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke AreAnyEntitiesSelected"
@@ -272,7 +272,7 @@
                     ]
                 },
                 {
-                    "key": "CreateNewEntityAtPosition",
+                    "base": "CreateNewEntityAtPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreateNewEntityAtPosition"
@@ -310,7 +310,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteEntityAndAllDescendants",
+                    "base": "DeleteEntityAndAllDescendants",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteEntityAndAllDescendants"
@@ -333,7 +333,7 @@
                     ]
                 },
                 {
-                    "key": "CreateNewEntity",
+                    "base": "CreateNewEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke CreateNewEntity"
@@ -365,7 +365,7 @@
                     ]
                 },
                 {
-                    "key": "EntityExists",
+                    "base": "EntityExists",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke EntityExists"
@@ -396,7 +396,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteEntityById",
+                    "base": "DeleteEntityById",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteEntityById"
@@ -419,7 +419,7 @@
                     ]
                 },
                 {
-                    "key": "DeleteEntities",
+                    "base": "DeleteEntities",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke DeleteEntities"
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "key": "MarkEntitiesDeselected",
+                    "base": "MarkEntitiesDeselected",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke MarkEntitiesDeselected"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names
index 29c14f4961..2d8bc4ede4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "TransformBus",
+            "base": "TransformBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "TransformBus",
+                "name": "Transform",
                 "category": "Entity"
             },
             "methods": [
                 {
-                    "key": "SetLocalUniformScale",
+                    "base": "SetLocalUniformScale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetLocalUniformScale"
+                        "tooltip": "When signaled, this will invoke Set Local Uniform Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetLocalUniformScale is invoked"
+                        "tooltip": "Signaled after Set Local Uniform Scale is invoked"
                     },
                     "details": {
-                        "name": "SetLocalUniformScale"
+                        "name": "Set Local Uniform Scale"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Local Uniform Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalRotationQuaternion",
+                    "base": "SetLocalRotationQuaternion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Rotation Quaternion"
@@ -42,21 +42,19 @@
                         "tooltip": "Signaled after Set Local Rotation Quaternion is invoked"
                     },
                     "details": {
-                        "name": "Set Local Rotation Quaternion",
-                        "tooltip": "Sets the entity's rotation in local space using a quaternion"
+                        "name": "Set Local Rotation Quaternion"
                     },
                     "params": [
                         {
                             "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
                             "details": {
-                                "name": "Rotation",
-                                "tooltip": "The quaternion to rotate around"
+                                "name": "Quaternion"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalRotation",
+                    "base": "GetLocalRotation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Rotation"
@@ -66,20 +64,19 @@
                         "tooltip": "Signaled after Get Local Rotation is invoked"
                     },
                     "details": {
-                        "name": "Get Local Rotation",
-                        "tooltip": "Gets the entity's rotation in radians in local space"
+                        "name": "Get Local Rotation"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalTM",
+                    "base": "GetLocalTM",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Transform"
@@ -102,30 +99,29 @@
                     ]
                 },
                 {
-                    "key": "GetEntityAndAllDescendants",
+                    "base": "GetEntityAndAllDescendants",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Entity and Descendants"
+                        "tooltip": "When signaled, this will invoke Get Entity And All Descendants"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Entity and Descendants is invoked"
+                        "tooltip": "Signaled after Get Entity And All Descendants is invoked"
                     },
                     "details": {
-                        "name": "Get Entity and Descendants",
-                        "tooltip": "Returns the EntityID of the entity, the entity's children, the children's children, and so on"
+                        "name": "Get Entity And All Descendants"
                     },
                     "results": [
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Entity and Descendants"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalZ",
+                    "base": "SetLocalZ",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Z"
@@ -135,75 +131,69 @@
                         "tooltip": "Signaled after Set Local Z is invoked"
                     },
                     "details": {
-                        "name": "Set Local Z",
-                        "tooltip": "Gets the entity's Z coordinate in local space"
+                        "name": "Set Local Z"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Z Translation",
-                                "tooltip": "The entity's Z coordinate in local space"
+                                "name": "Z"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetAllDescendants",
+                    "base": "GetAllDescendants",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Descendants"
+                        "tooltip": "When signaled, this will invoke Get All Descendants"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Descendants is invoked"
+                        "tooltip": "Signaled after Get All Descendants is invoked"
                     },
                     "details": {
-                        "name": "Get Descendants",
-                        "tooltip": "Returns the entity's children, the children's children, and so on"
+                        "name": "Get All Descendants"
                     },
                     "results": [
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Descendants"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalAndWorld",
+                    "base": "GetLocalAndWorld",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Local and World"
+                        "tooltip": "When signaled, this will invoke Get Local And World"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Local and World is invoked"
+                        "tooltip": "Signaled after Get Local And World is invoked"
                     },
                     "details": {
-                        "name": "Get Local and World",
-                        "tooltip": "Retrieves the entity's local and world transforms"
+                        "name": "Get Local And World Transforms"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Local Transform",
-                                "tooltip": "A reference to a transform that represents the entity's position relative to its parent entity"
+                                "name": "Local"
                             }
                         },
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Global Transform",
-                                "tooltip": "A reference to a transform that represents the entity's position within the world"
+                                "name": "World"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RotateAroundLocalZ",
+                    "base": "RotateAroundLocalZ",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Rotate Around Local Z"
@@ -213,21 +203,19 @@
                         "tooltip": "Signaled after Rotate Around Local Z is invoked"
                     },
                     "details": {
-                        "name": "Rotate Around Local Z",
-                        "tooltip": "Rotates the entity around the Z axis in local space"
+                        "name": "Rotate Around Local Z"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Z Rotation",
-                                "tooltip": "The angle, in radians, to rotate the entity around the Z axis in local space"
+                                "name": "Angle (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWorldRotationQuaternion",
+                    "base": "GetWorldRotationQuaternion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World Rotation Quaternion"
@@ -237,8 +225,7 @@
                         "tooltip": "Signaled after Get World Rotation Quaternion is invoked"
                     },
                     "details": {
-                        "name": "Get World Rotation Quaternion",
-                        "tooltip": "Gets the entity's rotation in quaternion in world space"
+                        "name": "Get World Rotation Quaternion"
                     },
                     "results": [
                         {
@@ -250,7 +237,7 @@
                     ]
                 },
                 {
-                    "key": "RotateAroundLocalX",
+                    "base": "RotateAroundLocalX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Rotate Around Local X"
@@ -260,21 +247,19 @@
                         "tooltip": "Signaled after Rotate Around Local X is invoked"
                     },
                     "details": {
-                        "name": "Rotate Around Local X",
-                        "tooltip": "Rotates the entity around the X axis in local space"
+                        "name": "Rotate Around Local X"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "X Rotation",
-                                "tooltip": "The angle, in radians, to rotate the entity around the X axis in local space"
+                                "name": "Angle (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParent",
+                    "base": "SetParent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Parent"
@@ -284,21 +269,20 @@
                         "tooltip": "Signaled after Set Parent is invoked"
                     },
                     "details": {
-                        "name": "Set Parent",
-                        "tooltip": "Sets the entity's parent entity"
+                        "name": "Set Parent"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
                                 "name": "Parent",
-                                "tooltip": "The ID of the entity to set as the parent"
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalZ",
+                    "base": "GetLocalZ",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Z"
@@ -308,44 +292,41 @@
                         "tooltip": "Signaled after Get Local Z is invoked"
                     },
                     "details": {
-                        "name": "Get Local Z",
-                        "tooltip": "Gets the entity's Z coordinate in local space"
+                        "name": "Get Local Z"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Z"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalRotation",
+                    "base": "SetLocalRotation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Local Rotation is invoked"
+                        "tooltip": "Signaled after SetLocalRotation is invoked"
                     },
                     "details": {
-                        "name": "Set Local Rotation",
-                        "tooltip": "Sets the entity's rotation in local space using a composition of rotations around the three axes"
+                        "name": "Set Local Rotation"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Rotation",
-                                "tooltip": "A three-dimensional vector, containing Euler angles in radians, that specifies a rotation around each axis"
+                                "name": "Euler Angles (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalX",
+                    "base": "SetLocalX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local X"
@@ -355,21 +336,19 @@
                         "tooltip": "Signaled after Set Local X is invoked"
                     },
                     "details": {
-                        "name": "Set Local X",
-                        "tooltip": "Sets the entity's X coordinate in local space"
+                        "name": "Set Local X"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "X Translation",
-                                "tooltip": "A new value for the entity's X coordinate in local space"
+                                "name": "X"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalRotationQuaternion",
+                    "base": "GetLocalRotationQuaternion",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Rotation Quaternion"
@@ -379,8 +358,7 @@
                         "tooltip": "Signaled after Get Local Rotation Quaternion is invoked"
                     },
                     "details": {
-                        "name": "Get Local Rotation Quaternion",
-                        "tooltip": "Gets the quaternion representing the entity's rotation in local space"
+                        "name": "Get Local Rotation Quaternion"
                     },
                     "results": [
                         {
@@ -392,7 +370,7 @@
                     ]
                 },
                 {
-                    "key": "GetWorldX",
+                    "base": "GetWorldX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World X"
@@ -402,20 +380,19 @@
                         "tooltip": "Signaled after Get World X is invoked"
                     },
                     "details": {
-                        "name": "Get World X",
-                        "tooltip": "Gets the entity's X coordinate in world space"
+                        "name": "Get World X"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "X"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetWorldTranslation",
+                    "base": "SetWorldTranslation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set World Translation"
@@ -425,21 +402,19 @@
                         "tooltip": "Signaled after Set World Translation is invoked"
                     },
                     "details": {
-                        "name": "Set World Translation",
-                        "tooltip": "Sets the entity's world space translation, which represents how to move the entity to a new position within the world"
+                        "name": "Set World Translation"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Translation",
-                                "tooltip": "A three-dimensional translation vector"
+                                "name": "World Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MoveEntity",
+                    "base": "MoveEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Move Entity"
@@ -449,21 +424,19 @@
                         "tooltip": "Signaled after Move Entity is invoked"
                     },
                     "details": {
-                        "name": "Move Entity",
-                        "tooltip": "Moves the entity within world space"
+                        "name": "Move Entity"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Direction",
-                                "tooltip": "A three-dimensional vector that contains the offset to apply to the entity"
+                                "name": "Offset"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetChildren",
+                    "base": "GetChildren",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Children"
@@ -473,20 +446,19 @@
                         "tooltip": "Signaled after Get Children is invoked"
                     },
                     "details": {
-                        "name": "Get Children",
-                        "tooltip": "Returns the EntityIDs of the entity's immediate children"
+                        "name": "Get Children"
                     },
                     "results": [
                         {
                             "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                             "details": {
-                                "name": "AZStd::vector"
+                                "name": "Children"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetParentRelative",
+                    "base": "SetParentRelative",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Parent Relative"
@@ -496,21 +468,20 @@
                         "tooltip": "Signaled after Set Parent Relative is invoked"
                     },
                     "details": {
-                        "name": "Set Parent Relative",
-                        "tooltip": "Sets the entity's parent entity, moves the transform relative to the parent entity, and notifies all listeners"
+                        "name": "Set Parent Relative"
                     },
                     "params": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
                                 "name": "Parent",
-                                "tooltip": "The ID of the entity to set as the parent"
+                                "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetWorldTM",
+                    "base": "SetWorldTM",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set World Transform"
@@ -520,31 +491,29 @@
                         "tooltip": "Signaled after Set World Transform is invoked"
                     },
                     "details": {
-                        "name": "Set World Transform",
-                        "tooltip": "Sets the world transform and notifies all listeners"
+                        "name": "Set World Transform"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "A reference to a transform for positioning the entity within the world"
+                                "name": "Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetWorldRotationQuaternion",
+                    "base": "SetWorldRotationQuaternion",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetWorldRotationQuaternion"
+                        "tooltip": "When signaled, this will invoke Set World Rotation Quaternion"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetWorldRotationQuaternion is invoked"
+                        "tooltip": "Signaled after Set World Rotation Quaternion is invoked"
                     },
                     "details": {
-                        "name": "SetWorldRotationQuaternion"
+                        "name": "Set World Rotation Quaternion"
                     },
                     "params": [
                         {
@@ -556,7 +525,7 @@
                     ]
                 },
                 {
-                    "key": "SetWorldX",
+                    "base": "SetWorldX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set World X"
@@ -566,21 +535,19 @@
                         "tooltip": "Signaled after Set World X is invoked"
                     },
                     "details": {
-                        "name": "Set World X",
-                        "tooltip": "Sets the entity's X coordinate in world space"
+                        "name": "Set World X"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "X Translation",
-                                "tooltip": "A new value for the entity's X coordinate in world space"
+                                "name": "X"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWorldY",
+                    "base": "GetWorldY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World Y"
@@ -590,42 +557,41 @@
                         "tooltip": "Signaled after Get World Y is invoked"
                     },
                     "details": {
-                        "name": "Get World Y",
-                        "tooltip": "Gets the entity's Y coordinate in world space"
+                        "name": "Get World Y"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Y"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalUniformScale",
+                    "base": "GetLocalUniformScale",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetLocalUniformScale"
+                        "tooltip": "When signaled, this will invoke Get Local Uniform Scale"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetLocalUniformScale is invoked"
+                        "tooltip": "Signaled after Get Local Uniform Scale is invoked"
                     },
                     "details": {
-                        "name": "GetLocalUniformScale"
+                        "name": "Get Local Uniform Scale"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Uniform Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetWorldZ",
+                    "base": "SetWorldZ",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set World Z"
@@ -635,21 +601,19 @@
                         "tooltip": "Signaled after Set World Z is invoked"
                     },
                     "details": {
-                        "name": "Set World Z",
-                        "tooltip": "Sets the entity's Z coordinate in world space"
+                        "name": "Set World Z"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Z Translation",
-                                "tooltip": "A new value for the entity's Z coordinate in world space"
+                                "name": "Z"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalTM",
+                    "base": "SetLocalTM",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Transform"
@@ -659,21 +623,19 @@
                         "tooltip": "Signaled after Set Local Transform is invoked"
                     },
                     "details": {
-                        "name": "Set Local Transform",
-                        "tooltip": "Sets the entity's local transform and notifies all listeners"
+                        "name": "Set Local Transform"
                     },
                     "params": [
                         {
                             "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
                             "details": {
-                                "name": "Transform",
-                                "tooltip": "A reference to a transform for positioning the entity relative to its parent entity"
+                                "name": "Transform"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalTranslation",
+                    "base": "SetLocalTranslation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Translation"
@@ -683,21 +645,19 @@
                         "tooltip": "Signaled after Set Local Translation is invoked"
                     },
                     "details": {
-                        "name": "Set Local Translation",
-                        "tooltip": "Sets the entity's local space translation, which represents how to move the entity to a new position relative to its parent"
+                        "name": "Set Local Translation"
                     },
                     "params": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Translation",
-                                "tooltip": "A three-dimensional translation vector"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalScale",
+                    "base": "GetLocalScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Scale"
@@ -707,20 +667,19 @@
                         "tooltip": "Signaled after Get Local Scale is invoked"
                     },
                     "details": {
-                        "name": "Get Local Scale",
-                        "tooltip": "Gets the scale of the entity along each axis in local space"
+                        "name": "Get Local Scale"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Scale"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetWorldY",
+                    "base": "SetWorldY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set World Y"
@@ -730,21 +689,19 @@
                         "tooltip": "Signaled after Set World Y is invoked"
                     },
                     "details": {
-                        "name": "Set World Y",
-                        "tooltip": "Sets the entity's Y coordinate in world space"
+                        "name": "Set World Y"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Y Translation",
-                                "tooltip": "A new value for the entity's Y coordinate in world space"
+                                "name": "Y"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "RotateAroundLocalY",
+                    "base": "RotateAroundLocalY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Rotate Around Local Y"
@@ -754,21 +711,19 @@
                         "tooltip": "Signaled after Rotate Around Local Y is invoked"
                     },
                     "details": {
-                        "name": "Rotate Around Local Y",
-                        "tooltip": "Rotates the entity around the Y axis in local space"
+                        "name": "Rotate Around Local Y"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Y Rotation",
-                                "tooltip": "The angle, in radians, to rotate the entity around the Y axis in local space"
+                                "name": "Euler Angle (Radians)"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalTranslation",
+                    "base": "GetLocalTranslation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Translation"
@@ -778,20 +733,19 @@
                         "tooltip": "Signaled after Get Local Translation is invoked"
                     },
                     "details": {
-                        "name": "Get Local Translation",
-                        "tooltip": "Gets the entity's local space translation"
+                        "name": "Get Local Translation"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWorldRotation",
+                    "base": "GetWorldRotation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World Rotation"
@@ -801,20 +755,20 @@
                         "tooltip": "Signaled after Get World Rotation is invoked"
                     },
                     "details": {
-                        "name": "Get World Rotation",
-                        "tooltip": "Gets the entity's rotation in radians in world space"
+                        "name": "Get World Rotation"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Euler Angles (Radians)",
+                                "tooltip": "Euler angles (Pitch, Yaw, Roll), in radians"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWorldZ",
+                    "base": "GetWorldZ",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World Z"
@@ -824,20 +778,19 @@
                         "tooltip": "Signaled after Get World Z is invoked"
                     },
                     "details": {
-                        "name": "Get World Z",
-                        "tooltip": "Gets the entity's Z coordinate in world space"
+                        "name": "Get World Z"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Z"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalY",
+                    "base": "GetLocalY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Y"
@@ -847,20 +800,19 @@
                         "tooltip": "Signaled after Get Local Y is invoked"
                     },
                     "details": {
-                        "name": "Get Local Y",
-                        "tooltip": "Gets the entity's Y coordinate in local space"
+                        "name": "Get Local Y"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "Y"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWorldTranslation",
+                    "base": "GetWorldTranslation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World Translation"
@@ -870,20 +822,19 @@
                         "tooltip": "Signaled after Get World Translation is invoked"
                     },
                     "details": {
-                        "name": "Get World Translation",
-                        "tooltip": "Gets the entity's world space translation"
+                        "name": "Get World Translation"
                     },
                     "results": [
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Translation"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalY",
+                    "base": "SetLocalY",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Y"
@@ -893,21 +844,19 @@
                         "tooltip": "Signaled after Set Local Y is invoked"
                     },
                     "details": {
-                        "name": "Set Local Y",
-                        "tooltip": "Sets the entity's Y coordinate in local space"
+                        "name": "Set Local Y"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Y Position",
-                                "tooltip": "A new value for the entity's Y coordinate in local space"
+                                "name": "Y"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalX",
+                    "base": "GetLocalX",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local X"
@@ -917,20 +866,19 @@
                         "tooltip": "Signaled after Get Local X is invoked"
                     },
                     "details": {
-                        "name": "Get Local X",
-                        "tooltip": "Gets the entity's X coordinate in local space"
+                        "name": "Get Local X"
                     },
                     "results": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "float"
+                                "name": "X"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWorldTM",
+                    "base": "GetWorldTM",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get World Transform"
@@ -940,8 +888,7 @@
                         "tooltip": "Signaled after Get World Transform is invoked"
                     },
                     "details": {
-                        "name": "Get World Transform",
-                        "tooltip": "Returns the entity's world transform, including the parent transform"
+                        "name": "Get World Transform"
                     },
                     "results": [
                         {
@@ -953,48 +900,46 @@
                     ]
                 },
                 {
-                    "key": "GetParentId",
+                    "base": "GetParentId",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Parent ID"
+                        "tooltip": "When signaled, this will invoke Get Parent Id"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Parent ID is invoked"
+                        "tooltip": "Signaled after Get Parent Id is invoked"
                     },
                     "details": {
-                        "name": "Get Parent ID",
-                        "tooltip": "Returns the EntityID of the entity's parent"
+                        "name": "Get Parent Id"
                     },
                     "results": [
                         {
                             "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
                             "details": {
-                                "name": "EntityId",
+                                "name": "Parent Id",
                                 "tooltip": "Entity Unique Id"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "IsStaticTransform",
+                    "base": "IsStaticTransform",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Is Static"
+                        "tooltip": "When signaled, this will invoke Is Static Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Is Static is invoked"
+                        "tooltip": "Signaled after Is Static Transform is invoked"
                     },
                     "details": {
-                        "name": "Is Static",
-                        "tooltip": "Returns whether the transform is static"
+                        "name": "Is Static Transform"
                     },
                     "results": [
                         {
                             "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
                             "details": {
-                                "name": "bool"
+                                "name": "Is Static Transform"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names
index b038d91560..93c77fc3e2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names
@@ -1,15 +1,15 @@
 {
     "entries": [
         {
-            "key": "TubeShapeComponentRequestsBus",
+            "base": "TubeShapeComponentRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "TubeShapeComponentRequestsBus"
+                "name": "Tube Shape Component"
             },
             "methods": [
                 {
-                    "key": "GetVariableRadius",
+                    "base": "GetVariableRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetVariableRadius"
@@ -39,7 +39,7 @@
                     ]
                 },
                 {
-                    "key": "SetVariableRadius",
+                    "base": "SetVariableRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetVariableRadius"
@@ -67,7 +67,7 @@
                     ]
                 },
                 {
-                    "key": "SetRadius",
+                    "base": "SetRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetRadius"
@@ -89,7 +89,7 @@
                     ]
                 },
                 {
-                    "key": "GetRadius",
+                    "base": "GetRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetRadius"
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "GetTotalRadius",
+                    "base": "GetTotalRadius",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTotalRadius"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names
index 5618698361..07a619288a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiAnimationBus",
+            "base": "UiAnimationBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiAnimationBus",
+                "name": "UI Animation",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "ResetSequence",
+                    "base": "ResetSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Reset Sequence"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetSequencePlayingSpeed",
+                    "base": "GetSequencePlayingSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sequence Playing Speed"
@@ -67,7 +67,7 @@
                     ]
                 },
                 {
-                    "key": "GetSequencePlayingTime",
+                    "base": "GetSequencePlayingTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sequence Playing Time"
@@ -100,7 +100,7 @@
                     ]
                 },
                 {
-                    "key": "AbortSequence",
+                    "base": "AbortSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Abort Sequence"
@@ -124,7 +124,7 @@
                     ]
                 },
                 {
-                    "key": "IsSequencePlaying",
+                    "base": "IsSequencePlaying",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Sequence Playing"
@@ -157,7 +157,7 @@
                     ]
                 },
                 {
-                    "key": "GetSequenceLength",
+                    "base": "GetSequenceLength",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sequence Length"
@@ -190,7 +190,7 @@
                     ]
                 },
                 {
-                    "key": "StopSequence",
+                    "base": "StopSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Stop Sequence"
@@ -214,7 +214,7 @@
                     ]
                 },
                 {
-                    "key": "PlaySequenceRange",
+                    "base": "PlaySequenceRange",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke PlaySequenceRange"
@@ -248,7 +248,7 @@
                     ]
                 },
                 {
-                    "key": "PauseSequence",
+                    "base": "PauseSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Pause Sequence"
@@ -272,7 +272,7 @@
                     ]
                 },
                 {
-                    "key": "ResumeSequence",
+                    "base": "ResumeSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Resume Sequence"
@@ -296,7 +296,7 @@
                     ]
                 },
                 {
-                    "key": "StartSequence",
+                    "base": "StartSequence",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Start Sequence"
@@ -320,7 +320,7 @@
                     ]
                 },
                 {
-                    "key": "SetSequencePlayingSpeed",
+                    "base": "SetSequencePlayingSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sequence Playing Speed"
@@ -351,7 +351,7 @@
                     ]
                 },
                 {
-                    "key": "SetSequenceStopBehavior",
+                    "base": "SetSequenceStopBehavior",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sequence Stop Behavior"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names
index 93c278b55f..f5b4c62fd1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiButtonBus",
+            "base": "UiButtonBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiButtonBus",
+                "name": "UI Button",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetOnClickActionName",
+                    "base": "GetOnClickActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get On Click Action Name"
@@ -27,13 +27,13 @@
                         {
                             "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                             "details": {
-                                "name": "AZStd::string"
+                                "name": "Name"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetOnClickActionName",
+                    "base": "SetOnClickActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set On Click Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names
index 7e1cc1941a..1cb8e93a10 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCanvasAssetRefBus",
+            "base": "UiCanvasAssetRefBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCanvasAssetRefBus",
+                "name": "UI Canvas Asset Ref",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "LoadCanvas",
+                    "base": "LoadCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Load Canvas"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "UnloadCanvas",
+                    "base": "UnloadCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Unload Canvas"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names
index 5a039e9720..434023c071 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCanvasBus",
+            "base": "UiCanvasBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCanvasBus",
+                "name": "UI Canvas",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "ForceHoverInteractable",
+                    "base": "ForceHoverInteractable",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Force Hover Interactable"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetNavigationRepeatPeriod",
+                    "base": "GetNavigationRepeatPeriod",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNavigationRepeatPeriod"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "GetNavigationRepeatDelay",
+                    "base": "GetNavigationRepeatDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNavigationRepeatDelay"
@@ -78,7 +78,7 @@
                     ]
                 },
                 {
-                    "key": "GetHoverInteractable",
+                    "base": "GetHoverInteractable",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Hover Interactable"
@@ -102,7 +102,7 @@
                     ]
                 },
                 {
-                    "key": "SetNavigationThreshold",
+                    "base": "SetNavigationThreshold",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetNavigationThreshold"
@@ -124,7 +124,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsConsumingAllInputEvents",
+                    "base": "SetIsConsumingAllInputEvents",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Consuming All Input Events"
@@ -148,7 +148,7 @@
                     ]
                 },
                 {
-                    "key": "SetDrawOrder",
+                    "base": "SetDrawOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Draw Order"
@@ -172,7 +172,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsPositionalInputSupported",
+                    "base": "GetIsPositionalInputSupported",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Positional Input Supported"
@@ -195,7 +195,7 @@
                     ]
                 },
                 {
-                    "key": "RecomputeChangedLayouts",
+                    "base": "RecomputeChangedLayouts",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Recompute Changed Layouts"
@@ -210,7 +210,7 @@
                     }
                 },
                 {
-                    "key": "SetRenderTargetName",
+                    "base": "SetRenderTargetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Render Target Name"
@@ -234,7 +234,7 @@
                     ]
                 },
                 {
-                    "key": "GetTooltipDisplayElement",
+                    "base": "GetTooltipDisplayElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Tooltip Display Element"
@@ -258,7 +258,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsNavigationSupported",
+                    "base": "GetIsNavigationSupported",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Navigation Supported"
@@ -281,7 +281,7 @@
                     ]
                 },
                 {
-                    "key": "SetNavigationRepeatPeriod",
+                    "base": "SetNavigationRepeatPeriod",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetNavigationRepeatPeriod"
@@ -303,7 +303,7 @@
                     ]
                 },
                 {
-                    "key": "GetRenderTargetName",
+                    "base": "GetRenderTargetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Render Target Name"
@@ -326,7 +326,7 @@
                     ]
                 },
                 {
-                    "key": "FindElementByName",
+                    "base": "FindElementByName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Find Element By Name"
@@ -359,7 +359,7 @@
                     ]
                 },
                 {
-                    "key": "SetTooltipDisplayElement",
+                    "base": "SetTooltipDisplayElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Tooltip Display Element"
@@ -383,7 +383,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildElement",
+                    "base": "GetChildElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Child Element"
@@ -416,7 +416,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeepLoadedOnLevelUnload",
+                    "base": "GetKeepLoadedOnLevelUnload",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Keep Loaded On Level Unload"
@@ -439,7 +439,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsTextPixelAligned",
+                    "base": "GetIsTextPixelAligned",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Text Pixel Aligned"
@@ -462,7 +462,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsConsumingAllInputEvents",
+                    "base": "GetIsConsumingAllInputEvents",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Consuming All Input Events"
@@ -485,7 +485,7 @@
                     ]
                 },
                 {
-                    "key": "GetNavigationThreshold",
+                    "base": "GetNavigationThreshold",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetNavigationThreshold"
@@ -507,7 +507,7 @@
                     ]
                 },
                 {
-                    "key": "SetKeepLoadedOnLevelUnload",
+                    "base": "SetKeepLoadedOnLevelUnload",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Keep Loaded On Level Unload"
@@ -531,7 +531,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsMultiTouchSupported",
+                    "base": "SetIsMultiTouchSupported",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Multi-touch Supported"
@@ -555,7 +555,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsRenderToTexture",
+                    "base": "SetIsRenderToTexture",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Render To Texture"
@@ -579,7 +579,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildElements",
+                    "base": "GetChildElements",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Child Elements"
@@ -602,7 +602,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumChildElements",
+                    "base": "GetNumChildElements",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Number Of Child Elements"
@@ -625,7 +625,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsPixelAligned",
+                    "base": "GetIsPixelAligned",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Pixel Aligned"
@@ -648,7 +648,7 @@
                     ]
                 },
                 {
-                    "key": "GetEnabled",
+                    "base": "GetEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Enabled"
@@ -671,7 +671,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsNavigationSupported",
+                    "base": "SetIsNavigationSupported",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Navigation Supported"
@@ -695,7 +695,7 @@
                     ]
                 },
                 {
-                    "key": "GetDrawOrder",
+                    "base": "GetDrawOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Draw Order"
@@ -718,7 +718,7 @@
                     ]
                 },
                 {
-                    "key": "ForceEnterInputEventOnInteractable",
+                    "base": "ForceEnterInputEventOnInteractable",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke ForceEnterInputEventOnInteractable"
@@ -741,7 +741,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsMultiTouchSupported",
+                    "base": "GetIsMultiTouchSupported",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Multi-touch Supported"
@@ -764,7 +764,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsPixelAligned",
+                    "base": "SetIsPixelAligned",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Pixel Aligned"
@@ -788,7 +788,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsPositionalInputSupported",
+                    "base": "SetIsPositionalInputSupported",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Positional Input Supported"
@@ -812,7 +812,7 @@
                     ]
                 },
                 {
-                    "key": "CloneElement",
+                    "base": "CloneElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Clone Element"
@@ -859,7 +859,7 @@
                     ]
                 },
                 {
-                    "key": "SetNavigationRepeatDelay",
+                    "base": "SetNavigationRepeatDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetNavigationRepeatDelay"
@@ -881,7 +881,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsRenderToTexture",
+                    "base": "GetIsRenderToTexture",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Render To Texture"
@@ -904,7 +904,7 @@
                     ]
                 },
                 {
-                    "key": "SetEnabled",
+                    "base": "SetEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Enabled"
@@ -928,7 +928,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsTextPixelAligned",
+                    "base": "SetIsTextPixelAligned",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Text Pixel Aligned"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names
index fe30e0079a..ba03658aa7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCanvasManagerBus",
+            "base": "UiCanvasManagerBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCanvasManagerBus",
+                "name": "UI Canvas Manager",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "CreateCanvas",
+                    "base": "CreateCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Create Canvas"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "LoadCanvas",
+                    "base": "LoadCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Load Canvas"
@@ -67,7 +67,7 @@
                     ]
                 },
                 {
-                    "key": "UnloadCanvas",
+                    "base": "UnloadCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Unload Canvas"
@@ -91,7 +91,7 @@
                     ]
                 },
                 {
-                    "key": "FindLoadedCanvasByPathName",
+                    "base": "FindLoadedCanvasByPathName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Find Loaded Canvas By Pathname"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names
index 170be3be23..7c582146cc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCanvasProxyRefBus",
+            "base": "UiCanvasProxyRefBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCanvasProxyRefBus",
+                "name": "UI Canvas Proxy Ref",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetCanvasRefEntity",
+                    "base": "SetCanvasRefEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Canvas Ref Entity"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names
index c1c98b7f64..19b74b1ddb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCanvasRefBus",
+            "base": "UiCanvasRefBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCanvasRefBus",
+                "name": "UI Canvas Ref",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetCanvas",
+                    "base": "GetCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Canvas"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names
index ce0125bae0..0e0182b9c1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCheckboxBus",
+            "base": "UiCheckboxBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCheckboxBus",
+                "name": "UI Checkbox",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetChangedActionName",
+                    "base": "SetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Changed Action Name"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetChangedActionName",
+                    "base": "GetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Changed Action Name"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetCheckedEntity",
+                    "base": "SetCheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Checked Entity"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetUncheckedEntity",
+                    "base": "SetUncheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Unchecked Entity"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "SetTurnOnActionName",
+                    "base": "SetTurnOnActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Turn On Action Name"
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "GetTurnOffActionName",
+                    "base": "GetTurnOffActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Turn Off Action Name"
@@ -152,7 +152,7 @@
                     ]
                 },
                 {
-                    "key": "SetState",
+                    "base": "SetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State"
@@ -176,7 +176,7 @@
                     ]
                 },
                 {
-                    "key": "ToggleState",
+                    "base": "ToggleState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Toggle State"
@@ -199,7 +199,7 @@
                     ]
                 },
                 {
-                    "key": "GetState",
+                    "base": "GetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State"
@@ -222,7 +222,7 @@
                     ]
                 },
                 {
-                    "key": "GetCheckedEntity",
+                    "base": "GetCheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Checked Entity"
@@ -246,7 +246,7 @@
                     ]
                 },
                 {
-                    "key": "GetUncheckedEntity",
+                    "base": "GetUncheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Unchecked Entity"
@@ -270,7 +270,7 @@
                     ]
                 },
                 {
-                    "key": "GetTurnOnActionName",
+                    "base": "GetTurnOnActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Turn On Action Name"
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "key": "SetTurnOffActionName",
+                    "base": "SetTurnOffActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Turn Off Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names
index 6400213daa..96f80aff68 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiClickableTextBus",
+            "base": "UiClickableTextBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiClickableTextBus",
+                "name": "UI Clickable Text",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetClickableTextColor",
+                    "base": "SetClickableTextColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Clickable Text Color"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names
index 936ff3475e..6da1ec95a1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCursorBus",
+            "base": "UiCursorBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCursorBus",
+                "name": "UI Cursor",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetUiCursorPosition",
+                    "base": "GetUiCursorPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Position"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "IsUiCursorVisible",
+                    "base": "IsUiCursorVisible",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Visible"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "DecrementVisibleCounter",
+                    "base": "DecrementVisibleCounter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Decrement Visible Counter"
@@ -71,7 +71,7 @@
                     }
                 },
                 {
-                    "key": "IncrementVisibleCounter",
+                    "base": "IncrementVisibleCounter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Increment Visible Counter"
@@ -86,7 +86,7 @@
                     }
                 },
                 {
-                    "key": "SetUiCursor",
+                    "base": "SetUiCursor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Cursor"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names
index c92295875e..1f492b34ec 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiCustomImageBus",
+            "base": "UiCustomImageBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiCustomImageBus",
+                "name": "UI Custom Image",
                 "category": "UI/LyShine Examples"
             },
             "methods": [
                 {
-                    "key": "GetClamp",
+                    "base": "GetClamp",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Clamp"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetUVs",
+                    "base": "SetUVs",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set UVs"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetClamp",
+                    "base": "SetClamp",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Clamp"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpritePathname",
+                    "base": "SetSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Pathname"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpritePathname",
+                    "base": "GetSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Pathname"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "GetUVs",
+                    "base": "GetUVs",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get UVs"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "SetColor",
+                    "base": "SetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Color"
@@ -175,7 +175,7 @@
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Color"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names
index 15b47dfce5..d44fbcc422 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDraggableBus",
+            "base": "UiDraggableBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDraggableBus",
+                "name": "UI Draggable",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "ProxyDragEnd",
+                    "base": "ProxyDragEnd",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Proxy Drag End"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "RedoDrag",
+                    "base": "RedoDrag",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Redo Drag"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetAsProxy",
+                    "base": "SetAsProxy",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set As Proxy"
@@ -89,7 +89,7 @@
                     ]
                 },
                 {
-                    "key": "IsProxy",
+                    "base": "IsProxy",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Proxy"
@@ -112,7 +112,7 @@
                     ]
                 },
                 {
-                    "key": "SetDragState",
+                    "base": "SetDragState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Drag State"
@@ -136,7 +136,7 @@
                     ]
                 },
                 {
-                    "key": "GetCanDropOnAnyCanvas",
+                    "base": "GetCanDropOnAnyCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Can Drop On Any Canvas"
@@ -159,7 +159,7 @@
                     ]
                 },
                 {
-                    "key": "SetCanDropOnAnyCanvas",
+                    "base": "SetCanDropOnAnyCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Can Drop On Any Canvas"
@@ -183,7 +183,7 @@
                     ]
                 },
                 {
-                    "key": "GetDragState",
+                    "base": "GetDragState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Drag State"
@@ -206,7 +206,7 @@
                     ]
                 },
                 {
-                    "key": "GetOriginalFromProxy",
+                    "base": "GetOriginalFromProxy",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Original From Proxy"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names
index 58e4ab05b5..5601160a98 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDropTargetBus",
+            "base": "UiDropTargetBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDropTargetBus",
+                "name": "UI Drop Target",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetOnDropActionName",
+                    "base": "GetOnDropActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get On Drop Action Name"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetOnDropActionName",
+                    "base": "SetOnDropActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set On Drop Action Name"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetDropState",
+                    "base": "GetDropState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Drop State"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetDropState",
+                    "base": "SetDropState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Drop State"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names
index f390bdb7f4..ec68dc2a3e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDropdownBus",
+            "base": "UiDropdownBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDropdownBus",
+                "name": "UI Dropdown",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetOptionSelectedActionName",
+                    "base": "GetOptionSelectedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Option Selected Action Name"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "GetWaitTime",
+                    "base": "GetWaitTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Wait Time"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "SetCollapseOnOutsideClick",
+                    "base": "SetCollapseOnOutsideClick",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Collapse On Outside Click"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetExpandOnHover",
+                    "base": "SetExpandOnHover",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Expand On Hover"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "Expand",
+                    "base": "Expand",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Expand"
@@ -119,7 +119,7 @@
                     }
                 },
                 {
-                    "key": "Collapse",
+                    "base": "Collapse",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Collapse"
@@ -134,7 +134,7 @@
                     }
                 },
                 {
-                    "key": "SetCollapsedActionName",
+                    "base": "SetCollapsedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Collapsed Action Name"
@@ -158,7 +158,7 @@
                     ]
                 },
                 {
-                    "key": "GetExpandOnHover",
+                    "base": "GetExpandOnHover",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Expand On Hover"
@@ -181,7 +181,7 @@
                     ]
                 },
                 {
-                    "key": "SetWaitTime",
+                    "base": "SetWaitTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Wait Time"
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "GetCollapseOnOutsideClick",
+                    "base": "GetCollapseOnOutsideClick",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Collapse On Outside Click"
@@ -228,7 +228,7 @@
                     ]
                 },
                 {
-                    "key": "GetExpandedParentId",
+                    "base": "GetExpandedParentId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Expanded Parent"
@@ -252,7 +252,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextElement",
+                    "base": "GetTextElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Element"
@@ -276,7 +276,7 @@
                     ]
                 },
                 {
-                    "key": "GetIconElement",
+                    "base": "GetIconElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Icon Element"
@@ -300,7 +300,7 @@
                     ]
                 },
                 {
-                    "key": "SetIconElement",
+                    "base": "SetIconElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Icon Element"
@@ -324,7 +324,7 @@
                     ]
                 },
                 {
-                    "key": "SetExpandedActionName",
+                    "base": "SetExpandedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Expanded Action Name"
@@ -348,7 +348,7 @@
                     ]
                 },
                 {
-                    "key": "SetContent",
+                    "base": "SetContent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Content"
@@ -372,7 +372,7 @@
                     ]
                 },
                 {
-                    "key": "SetTextElement",
+                    "base": "SetTextElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text Element"
@@ -396,7 +396,7 @@
                     ]
                 },
                 {
-                    "key": "SetValue",
+                    "base": "SetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value"
@@ -420,7 +420,7 @@
                     ]
                 },
                 {
-                    "key": "GetContent",
+                    "base": "GetContent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Content"
@@ -444,7 +444,7 @@
                     ]
                 },
                 {
-                    "key": "GetExpandedActionName",
+                    "base": "GetExpandedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Expanded Action Name"
@@ -467,7 +467,7 @@
                     ]
                 },
                 {
-                    "key": "GetCollapsedActionName",
+                    "base": "GetCollapsedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Collapsed Action Name"
@@ -490,7 +490,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value"
@@ -514,7 +514,7 @@
                     ]
                 },
                 {
-                    "key": "SetExpandedParentId",
+                    "base": "SetExpandedParentId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Expanded Parent"
@@ -538,7 +538,7 @@
                     ]
                 },
                 {
-                    "key": "SetOptionSelectedActionName",
+                    "base": "SetOptionSelectedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Option Selected Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names
index 9ba0e74993..0491203755 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDropdownOptionBus",
+            "base": "UiDropdownOptionBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDropdownOptionBus",
+                "name": "UI Dropdown Option",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetTextElement",
+                    "base": "GetTextElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Element"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetIconElement",
+                    "base": "GetIconElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Icon Element"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetIconElement",
+                    "base": "SetIconElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Icon Element"
@@ -82,7 +82,7 @@
                     ]
                 },
                 {
-                    "key": "SetOwningDropdown",
+                    "base": "SetOwningDropdown",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Owning Dropdown"
@@ -106,7 +106,7 @@
                     ]
                 },
                 {
-                    "key": "SetTextElement",
+                    "base": "SetTextElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text Element"
@@ -130,7 +130,7 @@
                     ]
                 },
                 {
-                    "key": "GetOwningDropdown",
+                    "base": "GetOwningDropdown",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Owning Dropdown"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names
index f51a09ebb1..8bc978d30f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDynamicContentDatabaseBus",
+            "base": "UiDynamicContentDatabaseBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDynamicContentDatabaseBus",
+                "name": "UI Dynamic Content Database",
                 "category": "UI/LyShine Examples"
             },
             "methods": [
                 {
-                    "key": "Refresh",
+                    "base": "Refresh",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Refresh"
@@ -41,7 +41,7 @@
                     ]
                 },
                 {
-                    "key": "GetColorPrice",
+                    "base": "GetColorPrice",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Color Price"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetColorName",
+                    "base": "GetColorName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Color Name"
@@ -121,7 +121,7 @@
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Color"
@@ -161,7 +161,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumColors",
+                    "base": "GetNumColors",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Number Of Colors"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names
index edfc147085..3107acf0cc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDynamicLayoutBus",
+            "base": "UiDynamicLayoutBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDynamicLayoutBus",
+                "name": "UI Dynamic Layout",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetNumChildElements",
+                    "base": "SetNumChildElements",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Number Of Child Elements"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names
index f386c97dde..579c2c61dc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiDynamicScrollBoxBus",
+            "base": "UiDynamicScrollBoxBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiDynamicScrollBoxBus",
+                "name": "UI Dynamic Scroll Box",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetSectionsEnabled",
+                    "base": "SetSectionsEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sections Enabled"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetEstimatedVariableElementSize",
+                    "base": "GetEstimatedVariableElementSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Estimated Variable Element Size"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoCalculateVariableElementSize",
+                    "base": "SetAutoCalculateVariableElementSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Auto-calculate Variable Element Size"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetEstimatedVariableHeaderSize",
+                    "base": "GetEstimatedVariableHeaderSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Estimated Variable Header Size"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "SetEstimatedVariableHeaderSize",
+                    "base": "SetEstimatedVariableHeaderSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Estimated Variable Header Size"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "SetPrototypeElement",
+                    "base": "SetPrototypeElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Prototype Element"
@@ -152,7 +152,7 @@
                     ]
                 },
                 {
-                    "key": "SetElementsVaryInSize",
+                    "base": "SetElementsVaryInSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Elements Vary In Size"
@@ -176,7 +176,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveElementsFromFront",
+                    "base": "RemoveElementsFromFront",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Remove Elements From Front"
@@ -200,7 +200,7 @@
                     ]
                 },
                 {
-                    "key": "GetElementIndexOfChild",
+                    "base": "GetElementIndexOfChild",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Element Index Of Child"
@@ -233,7 +233,7 @@
                     ]
                 },
                 {
-                    "key": "GetElementsVaryInSize",
+                    "base": "GetElementsVaryInSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Elements Vary In Size"
@@ -256,7 +256,7 @@
                     ]
                 },
                 {
-                    "key": "GetHeadersSticky",
+                    "base": "GetHeadersSticky",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Headers Sticky"
@@ -279,7 +279,7 @@
                     ]
                 },
                 {
-                    "key": "GetAutoRefreshOnPostActivate",
+                    "base": "GetAutoRefreshOnPostActivate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Auto-refresh On Post-activate"
@@ -302,7 +302,7 @@
                     ]
                 },
                 {
-                    "key": "SetEstimatedVariableElementSize",
+                    "base": "SetEstimatedVariableElementSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Estimated Variable Element Size"
@@ -326,7 +326,7 @@
                     ]
                 },
                 {
-                    "key": "SetPrototypeHeader",
+                    "base": "SetPrototypeHeader",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Prototype Header"
@@ -350,7 +350,7 @@
                     ]
                 },
                 {
-                    "key": "GetSectionsEnabled",
+                    "base": "GetSectionsEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sections Enabled"
@@ -373,7 +373,7 @@
                     ]
                 },
                 {
-                    "key": "ScrollToEnd",
+                    "base": "ScrollToEnd",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Scroll To End"
@@ -388,7 +388,7 @@
                     }
                 },
                 {
-                    "key": "GetPrototypeElement",
+                    "base": "GetPrototypeElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Prototype Element"
@@ -412,7 +412,7 @@
                     ]
                 },
                 {
-                    "key": "SetHeadersVaryInSize",
+                    "base": "SetHeadersVaryInSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Headers Vary In Size"
@@ -436,7 +436,7 @@
                     ]
                 },
                 {
-                    "key": "AddElementsToEnd",
+                    "base": "AddElementsToEnd",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Add Elements To End"
@@ -467,7 +467,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildAtElementIndex",
+                    "base": "GetChildAtElementIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Child At Element Index"
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "key": "SetHeadersSticky",
+                    "base": "SetHeadersSticky",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Headers Sticky"
@@ -524,7 +524,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildAtSectionAndElementIndex",
+                    "base": "GetChildAtSectionAndElementIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Child At Section And Element Index"
@@ -564,7 +564,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoRefreshOnPostActivate",
+                    "base": "SetAutoRefreshOnPostActivate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Auto-refresh On Post-activate"
@@ -588,7 +588,7 @@
                     ]
                 },
                 {
-                    "key": "GetSectionIndexOfChild",
+                    "base": "GetSectionIndexOfChild",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Section Index Of Child"
@@ -621,7 +621,7 @@
                     ]
                 },
                 {
-                    "key": "RefreshContent",
+                    "base": "RefreshContent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Refresh Content"
@@ -636,7 +636,7 @@
                     }
                 },
                 {
-                    "key": "GetHeadersVaryInSize",
+                    "base": "GetHeadersVaryInSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Headers Vary In Size"
@@ -659,7 +659,7 @@
                     ]
                 },
                 {
-                    "key": "GetPrototypeHeader",
+                    "base": "GetPrototypeHeader",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Prototype Header"
@@ -683,7 +683,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoCalculateVariableHeaderSize",
+                    "base": "SetAutoCalculateVariableHeaderSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Auto-calculate Variable Header Size"
@@ -707,7 +707,7 @@
                     ]
                 },
                 {
-                    "key": "GetAutoCalculateVariableElementSize",
+                    "base": "GetAutoCalculateVariableElementSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Auto-calculate Variable Element Size"
@@ -730,7 +730,7 @@
                     ]
                 },
                 {
-                    "key": "GetAutoCalculateVariableHeaderSize",
+                    "base": "GetAutoCalculateVariableHeaderSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Auto-calculate Variable Header Size"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names
index 61645c6432..481223a96e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiElementBus",
+            "base": "UiElementBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiElementBus",
+                "name": "UI Element",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "FindChildByName",
+                    "base": "FindChildByName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Find Child By Name"
@@ -43,7 +43,7 @@
                     ]
                 },
                 {
-                    "key": "GetChild",
+                    "base": "GetChild",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Child"
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "key": "GetNumChildElements",
+                    "base": "GetNumChildElements",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Number Of Child Elements"
@@ -99,7 +99,7 @@
                     ]
                 },
                 {
-                    "key": "GetChildren",
+                    "base": "GetChildren",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Children"
@@ -122,7 +122,7 @@
                     ]
                 },
                 {
-                    "key": "DestroyElement",
+                    "base": "DestroyElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Destroy Element"
@@ -137,7 +137,7 @@
                     }
                 },
                 {
-                    "key": "IsAncestor",
+                    "base": "IsAncestor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Ancestor"
@@ -170,7 +170,7 @@
                     ]
                 },
                 {
-                    "key": "GetParent",
+                    "base": "GetParent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Parent"
@@ -194,7 +194,7 @@
                     ]
                 },
                 {
-                    "key": "FindDescendantByName",
+                    "base": "FindDescendantByName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Find Descendant By Name"
@@ -227,7 +227,7 @@
                     ]
                 },
                 {
-                    "key": "IsEnabled",
+                    "base": "IsEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Enabled"
@@ -250,7 +250,7 @@
                     ]
                 },
                 {
-                    "key": "GetCanvas",
+                    "base": "GetCanvas",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Canvas"
@@ -274,7 +274,7 @@
                     ]
                 },
                 {
-                    "key": "Reparent",
+                    "base": "Reparent",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Reparent"
@@ -305,7 +305,7 @@
                     ]
                 },
                 {
-                    "key": "GetName",
+                    "base": "GetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Name"
@@ -328,7 +328,7 @@
                     ]
                 },
                 {
-                    "key": "GetIndexOfChildByEntityId",
+                    "base": "GetIndexOfChildByEntityId",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Index Of Child By EntityID"
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsEnabled",
+                    "base": "SetIsEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Enabled"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names
index 32e99d34f7..154918a041 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiFaderBus",
+            "base": "UiFaderBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiFaderBus",
+                "name": "UI Fader",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetUseRenderToTexture",
+                    "base": "GetUseRenderToTexture",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Use Render To Texture"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "IsFading",
+                    "base": "IsFading",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Fading"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "Fade",
+                    "base": "Fade",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Fade"
@@ -87,7 +87,7 @@
                     ]
                 },
                 {
-                    "key": "SetFadeValue",
+                    "base": "SetFadeValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Fade Value"
@@ -111,7 +111,7 @@
                     ]
                 },
                 {
-                    "key": "GetFadeValue",
+                    "base": "GetFadeValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Fade Value"
@@ -134,7 +134,7 @@
                     ]
                 },
                 {
-                    "key": "SetUseRenderToTexture",
+                    "base": "SetUseRenderToTexture",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Use Render To Texture"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names
index 341fd798d4..c0f62a816b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiFlipbookAnimationBus",
+            "base": "UiFlipbookAnimationBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiFlipbookAnimationBus",
+                "name": "UI Flipbook Animation",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetLoopType",
+                    "base": "GetLoopType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Loop Type"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "GetReverseDelay",
+                    "base": "GetReverseDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Reverse Delay"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsAutoPlay",
+                    "base": "SetIsAutoPlay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Auto Play Enabled"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetCurrentFrame",
+                    "base": "SetCurrentFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Current Frame"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "GetLoopStartFrame",
+                    "base": "GetLoopStartFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Loop Start Frame"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetLoopType",
+                    "base": "SetLoopType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Loop Type"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "GetStartDelay",
+                    "base": "GetStartDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Start Delay"
@@ -174,7 +174,7 @@
                     ]
                 },
                 {
-                    "key": "SetStartDelay",
+                    "base": "SetStartDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Start Delay"
@@ -198,7 +198,7 @@
                     ]
                 },
                 {
-                    "key": "GetCurrentFrame",
+                    "base": "GetCurrentFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Current Frame"
@@ -221,7 +221,7 @@
                     ]
                 },
                 {
-                    "key": "GetFramerate",
+                    "base": "GetFramerate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Framerate"
@@ -244,7 +244,7 @@
                     ]
                 },
                 {
-                    "key": "SetLoopDelay",
+                    "base": "SetLoopDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Loop Delay"
@@ -268,7 +268,7 @@
                     ]
                 },
                 {
-                    "key": "GetStartFrame",
+                    "base": "GetStartFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Start Frame"
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "key": "SetFramerateUnit",
+                    "base": "SetFramerateUnit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Framerate Unit"
@@ -315,7 +315,7 @@
                     ]
                 },
                 {
-                    "key": "IsPlaying",
+                    "base": "IsPlaying",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Playing"
@@ -338,7 +338,7 @@
                     ]
                 },
                 {
-                    "key": "SetEndFrame",
+                    "base": "SetEndFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set End Frame"
@@ -362,7 +362,7 @@
                     ]
                 },
                 {
-                    "key": "SetLoopStartFrame",
+                    "base": "SetLoopStartFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Loop Start Frame"
@@ -386,7 +386,7 @@
                     ]
                 },
                 {
-                    "key": "SetReverseDelay",
+                    "base": "SetReverseDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Reverse Delay"
@@ -410,7 +410,7 @@
                     ]
                 },
                 {
-                    "key": "Stop",
+                    "base": "Stop",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Stop"
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "key": "SetFramerate",
+                    "base": "SetFramerate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Framerate"
@@ -449,7 +449,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsAutoPlay",
+                    "base": "GetIsAutoPlay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Auto Play Enabled"
@@ -472,7 +472,7 @@
                     ]
                 },
                 {
-                    "key": "Start",
+                    "base": "Start",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Start"
@@ -487,7 +487,7 @@
                     }
                 },
                 {
-                    "key": "SetStartFrame",
+                    "base": "SetStartFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Start Frame"
@@ -511,7 +511,7 @@
                     ]
                 },
                 {
-                    "key": "GetEndFrame",
+                    "base": "GetEndFrame",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get End Frame"
@@ -534,7 +534,7 @@
                     ]
                 },
                 {
-                    "key": "GetFramerateUnit",
+                    "base": "GetFramerateUnit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Framerate Unit"
@@ -557,7 +557,7 @@
                     ]
                 },
                 {
-                    "key": "GetLoopDelay",
+                    "base": "GetLoopDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Loop Delay"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names
index ed79b2aaad..fdaf5e3252 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiImageBus",
+            "base": "UiImageBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiImageBus",
+                "name": "UI Image",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Color"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetColor",
+                    "base": "SetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Color"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpriteType",
+                    "base": "SetSpriteType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Type"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetFillClockwise",
+                    "base": "GetFillClockwise",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Fill Clockwise"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "SetRenderTargetName",
+                    "base": "SetRenderTargetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Render Target Name"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpritePathnameIfExists",
+                    "base": "SetSpritePathnameIfExists",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Pathname If Exists"
@@ -161,7 +161,7 @@
                     ]
                 },
                 {
-                    "key": "SetEdgeFillOrigin",
+                    "base": "SetEdgeFillOrigin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Edge Fill Origin"
@@ -185,7 +185,7 @@
                     ]
                 },
                 {
-                    "key": "GetEdgeFillOrigin",
+                    "base": "GetEdgeFillOrigin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Edge Fill Origin"
@@ -208,7 +208,7 @@
                     ]
                 },
                 {
-                    "key": "SetFillClockwise",
+                    "base": "SetFillClockwise",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Fill Clockwise"
@@ -232,7 +232,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpritePathname",
+                    "base": "SetSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Pathname"
@@ -256,7 +256,7 @@
                     ]
                 },
                 {
-                    "key": "SetFillCenter",
+                    "base": "SetFillCenter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Fill Center"
@@ -280,7 +280,7 @@
                     ]
                 },
                 {
-                    "key": "SetAlpha",
+                    "base": "SetAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Alpha"
@@ -304,7 +304,7 @@
                     ]
                 },
                 {
-                    "key": "SetFillType",
+                    "base": "SetFillType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Fill Type"
@@ -328,7 +328,7 @@
                     ]
                 },
                 {
-                    "key": "SetFillAmount",
+                    "base": "SetFillAmount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Fill Amount"
@@ -352,7 +352,7 @@
                     ]
                 },
                 {
-                    "key": "GetRadialFillStartAngle",
+                    "base": "GetRadialFillStartAngle",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Radial Fill Start Angle"
@@ -375,7 +375,7 @@
                     ]
                 },
                 {
-                    "key": "GetRenderTargetName",
+                    "base": "GetRenderTargetName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Render Target Name"
@@ -398,7 +398,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsRenderTargetSRGB",
+                    "base": "SetIsRenderTargetSRGB",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Render Target sRGB"
@@ -422,7 +422,7 @@
                     ]
                 },
                 {
-                    "key": "GetAlpha",
+                    "base": "GetAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Alpha"
@@ -445,7 +445,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsRenderTargetSRGB",
+                    "base": "GetIsRenderTargetSRGB",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Is Render Target sRGB"
@@ -468,7 +468,7 @@
                     ]
                 },
                 {
-                    "key": "SetImageType",
+                    "base": "SetImageType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Image Type"
@@ -492,7 +492,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpritePathname",
+                    "base": "GetSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Pathname"
@@ -515,7 +515,7 @@
                     ]
                 },
                 {
-                    "key": "GetFillType",
+                    "base": "GetFillType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Fill Type"
@@ -538,7 +538,7 @@
                     ]
                 },
                 {
-                    "key": "SetCornerFillOrigin",
+                    "base": "SetCornerFillOrigin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Corner Fill Origin"
@@ -562,7 +562,7 @@
                     ]
                 },
                 {
-                    "key": "GetCornerFillOrigin",
+                    "base": "GetCornerFillOrigin",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Corner Fill Origin"
@@ -585,7 +585,7 @@
                     ]
                 },
                 {
-                    "key": "GetImageType",
+                    "base": "GetImageType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Image Type"
@@ -608,7 +608,7 @@
                     ]
                 },
                 {
-                    "key": "SetRadialFillStartAngle",
+                    "base": "SetRadialFillStartAngle",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Radial Fill Start Angle"
@@ -632,7 +632,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpriteType",
+                    "base": "GetSpriteType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Type"
@@ -655,7 +655,7 @@
                     ]
                 },
                 {
-                    "key": "GetFillAmount",
+                    "base": "GetFillAmount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Fill Amount"
@@ -678,7 +678,7 @@
                     ]
                 },
                 {
-                    "key": "GetFillCenter",
+                    "base": "GetFillCenter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Fill Center"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names
index 90f0a59580..ff048262e0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiImageSequenceBus",
+            "base": "UiImageSequenceBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiImageSequenceBus",
+                "name": "UI Image Sequence",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetImageType",
+                    "base": "GetImageType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Image Type"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetImageType",
+                    "base": "SetImageType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Image Type"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names
index 40f92ace00..7e8e1c11d8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiIndexableImageBus",
+            "base": "UiIndexableImageBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiIndexableImageBus",
+                "name": "UI Indexable Image",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetImageIndexAlias",
+                    "base": "GetImageIndexAlias",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Image Index Alias"
@@ -43,7 +43,7 @@
                     ]
                 },
                 {
-                    "key": "GetImageIndexCount",
+                    "base": "GetImageIndexCount",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Image Index Count"
@@ -66,7 +66,7 @@
                     ]
                 },
                 {
-                    "key": "SetImageIndex",
+                    "base": "SetImageIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Image Index"
@@ -90,7 +90,7 @@
                     ]
                 },
                 {
-                    "key": "SetImageIndexAlias",
+                    "base": "SetImageIndexAlias",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Image Index Alias"
@@ -121,7 +121,7 @@
                     ]
                 },
                 {
-                    "key": "GetImageIndexFromAlias",
+                    "base": "GetImageIndexFromAlias",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Image Index From Alias"
@@ -154,7 +154,7 @@
                     ]
                 },
                 {
-                    "key": "GetImageIndex",
+                    "base": "GetImageIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Image Index"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names
index b124f9ccd5..6d061bec5d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiInteractableActionsBus",
+            "base": "UiInteractableActionsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiInteractableActionsBus",
+                "name": "UI Interactable Actions",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetPressedActionName",
+                    "base": "SetPressedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Pressed Action Name"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetPressedActionName",
+                    "base": "GetPressedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Pressed Action Name"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetHoverEndActionName",
+                    "base": "GetHoverEndActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Hover End Action Name"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetHoverStartActionName",
+                    "base": "SetHoverStartActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Hover Start Action Name"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "GetHoverStartActionName",
+                    "base": "GetHoverStartActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Hover Start Action Name"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetHoverEndActionName",
+                    "base": "SetHoverEndActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Hover End Action Name"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "GetReleasedActionName",
+                    "base": "GetReleasedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Released Action Name"
@@ -174,7 +174,7 @@
                     ]
                 },
                 {
-                    "key": "SetReleasedActionName",
+                    "base": "SetReleasedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Released Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names
index b340e96673..f45fd09b4f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiInteractableBus",
+            "base": "UiInteractableBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiInteractableBus",
+                "name": "UI Interactable",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetIsAutoActivationEnabled",
+                    "base": "SetIsAutoActivationEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Auto Activation Enabled"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsAutoActivationEnabled",
+                    "base": "GetIsAutoActivationEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Auto Activation Enabled"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsHandlingMultiTouchEvents",
+                    "base": "SetIsHandlingMultiTouchEvents",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Handling Multi-touch Events"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "IsHandlingMultiTouchEvents",
+                    "base": "IsHandlingMultiTouchEvents",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Handling Multi-touch Events"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "IsHandlingEvents",
+                    "base": "IsHandlingEvents",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Handling Events"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsHandlingEvents",
+                    "base": "SetIsHandlingEvents",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Handling Events"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names
index b194ece0de..f6948637e9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiInteractableStatesBus",
+            "base": "UiInteractableStatesBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiInteractableStatesBus",
+                "name": "UI Interactable States",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetStateFont",
+                    "base": "SetStateFont",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State Font"
@@ -55,7 +55,7 @@
                     ]
                 },
                 {
-                    "key": "SetStateSpritePathname",
+                    "base": "SetStateSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State Sprite Pathname"
@@ -93,7 +93,7 @@
                     ]
                 },
                 {
-                    "key": "GetStateFontPathname",
+                    "base": "GetStateFontPathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State Font Pathname"
@@ -133,7 +133,7 @@
                     ]
                 },
                 {
-                    "key": "HasStateFont",
+                    "base": "HasStateFont",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has State Font"
@@ -173,7 +173,7 @@
                     ]
                 },
                 {
-                    "key": "SetStateAlpha",
+                    "base": "SetStateAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State Alpha"
@@ -211,7 +211,7 @@
                     ]
                 },
                 {
-                    "key": "GetStateAlpha",
+                    "base": "GetStateAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State Alpha"
@@ -251,7 +251,7 @@
                     ]
                 },
                 {
-                    "key": "GetStateFontEffectIndex",
+                    "base": "GetStateFontEffectIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State Font Effect Index"
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "key": "HasStateColor",
+                    "base": "HasStateColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has State Color"
@@ -331,7 +331,7 @@
                     ]
                 },
                 {
-                    "key": "GetStateSpritePathname",
+                    "base": "GetStateSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State Sprite Pathname"
@@ -371,7 +371,7 @@
                     ]
                 },
                 {
-                    "key": "HasStateSprite",
+                    "base": "HasStateSprite",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has State Sprite"
@@ -411,7 +411,7 @@
                     ]
                 },
                 {
-                    "key": "SetStateColor",
+                    "base": "SetStateColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State Color"
@@ -449,7 +449,7 @@
                     ]
                 },
                 {
-                    "key": "HasStateAlpha",
+                    "base": "HasStateAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has State Alpha"
@@ -489,7 +489,7 @@
                     ]
                 },
                 {
-                    "key": "GetStateColor",
+                    "base": "GetStateColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State Color"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names
index 022dbc0abe..fa1b209aa6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiLayoutBus",
+            "base": "UiLayoutBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiLayoutBus",
+                "name": "UI Layout",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetIgnoreDefaultLayoutCells",
+                    "base": "SetIgnoreDefaultLayoutCells",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Ignore Default Layout Cells"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetVerticalChildAlignment",
+                    "base": "SetVerticalChildAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Vertical Child Alignment"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetHorizontalChildAlignment",
+                    "base": "SetHorizontalChildAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Horizontal Child Alignment"
@@ -82,7 +82,7 @@
                     ]
                 },
                 {
-                    "key": "GetHorizontalChildAlignment",
+                    "base": "GetHorizontalChildAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Horizontal Child Alignment"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetVerticalChildAlignment",
+                    "base": "GetVerticalChildAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Vertical Child Alignment"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "GetIgnoreDefaultLayoutCells",
+                    "base": "GetIgnoreDefaultLayoutCells",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Ignore Default Layout Cells"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names
index 8f96afa8ff..1a8001adaf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiLayoutCellBus",
+            "base": "UiLayoutCellBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiLayoutCellBus",
+                "name": "UI Layout Cell",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetExtraHeightRatio",
+                    "base": "SetExtraHeightRatio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Extra Height Ratio"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetExtraWidthRatio",
+                    "base": "GetExtraWidthRatio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Extra Width Ratio"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetExtraWidthRatio",
+                    "base": "SetExtraWidthRatio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Extra Width Ratio"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetMaxWidth",
+                    "base": "SetMaxWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetMaxWidth"
@@ -103,7 +103,7 @@
                     ]
                 },
                 {
-                    "key": "SetMaxHeight",
+                    "base": "SetMaxHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetMaxHeight"
@@ -125,7 +125,7 @@
                     ]
                 },
                 {
-                    "key": "GetMaxWidth",
+                    "base": "GetMaxWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetMaxWidth"
@@ -147,7 +147,7 @@
                     ]
                 },
                 {
-                    "key": "GetMaxHeight",
+                    "base": "GetMaxHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetMaxHeight"
@@ -169,7 +169,7 @@
                     ]
                 },
                 {
-                    "key": "GetExtraHeightRatio",
+                    "base": "GetExtraHeightRatio",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Extra Height Ratio"
@@ -192,7 +192,7 @@
                     ]
                 },
                 {
-                    "key": "GetTargetHeight",
+                    "base": "GetTargetHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Target Height"
@@ -215,7 +215,7 @@
                     ]
                 },
                 {
-                    "key": "SetMinWidth",
+                    "base": "SetMinWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Min Width"
@@ -239,7 +239,7 @@
                     ]
                 },
                 {
-                    "key": "SetMinHeight",
+                    "base": "SetMinHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Min Height"
@@ -263,7 +263,7 @@
                     ]
                 },
                 {
-                    "key": "GetMinWidth",
+                    "base": "GetMinWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Min Width"
@@ -286,7 +286,7 @@
                     ]
                 },
                 {
-                    "key": "GetMinHeight",
+                    "base": "GetMinHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Min Height"
@@ -309,7 +309,7 @@
                     ]
                 },
                 {
-                    "key": "GetTargetWidth",
+                    "base": "GetTargetWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Target Width"
@@ -332,7 +332,7 @@
                     ]
                 },
                 {
-                    "key": "SetTargetWidth",
+                    "base": "SetTargetWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Target Width"
@@ -356,7 +356,7 @@
                     ]
                 },
                 {
-                    "key": "SetTargetHeight",
+                    "base": "SetTargetHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Target Height"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names
index a89fe4382b..d0f4e7d3e4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiLayoutColumnBus",
+            "base": "UiLayoutColumnBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiLayoutColumnBus",
+                "name": "UI Layout Column",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetSpacing",
+                    "base": "SetSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Spacing"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetOrder",
+                    "base": "GetOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Order"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetOrder",
+                    "base": "SetOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Order"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpacing",
+                    "base": "GetSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Spacing"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "GetPadding",
+                    "base": "GetPadding",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Padding"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetPadding",
+                    "base": "SetPadding",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Padding"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names
index 392ac7fbaf..672db1bd4e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiLayoutFitterBus",
+            "base": "UiLayoutFitterBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiLayoutFitterBus",
+                "name": "UI Layout Fitter",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetHorizontalFit",
+                    "base": "GetHorizontalFit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Horizontal Fit"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetHorizontalFit",
+                    "base": "SetHorizontalFit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Horizontal Fit"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetVerticalFit",
+                    "base": "GetVerticalFit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Vertical Fit"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetVerticalFit",
+                    "base": "SetVerticalFit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Vertical Fit"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names
index 40430d754f..9ee462316e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiLayoutGridBus",
+            "base": "UiLayoutGridBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiLayoutGridBus",
+                "name": "UI Layout Grid",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetStartingDirection",
+                    "base": "GetStartingDirection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Starting Direction"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetHorizontalOrder",
+                    "base": "SetHorizontalOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Horizontal Order"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetCellSize",
+                    "base": "SetCellSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Cell Size"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpacing",
+                    "base": "SetSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Spacing"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpacing",
+                    "base": "GetSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Spacing"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "GetCellSize",
+                    "base": "GetCellSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Cell Size"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "GetPadding",
+                    "base": "GetPadding",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Padding"
@@ -174,7 +174,7 @@
                     ]
                 },
                 {
-                    "key": "SetPadding",
+                    "base": "SetPadding",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Padding"
@@ -198,7 +198,7 @@
                     ]
                 },
                 {
-                    "key": "GetHorizontalOrder",
+                    "base": "GetHorizontalOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Horizontal Order"
@@ -221,7 +221,7 @@
                     ]
                 },
                 {
-                    "key": "GetVerticalOrder",
+                    "base": "GetVerticalOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Vertical Order"
@@ -244,7 +244,7 @@
                     ]
                 },
                 {
-                    "key": "SetVerticalOrder",
+                    "base": "SetVerticalOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Vertical Order"
@@ -268,7 +268,7 @@
                     ]
                 },
                 {
-                    "key": "SetStartingDirection",
+                    "base": "SetStartingDirection",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Starting Direction"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names
index c4c714a0cb..ba3e4fc81b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiLayoutRowBus",
+            "base": "UiLayoutRowBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiLayoutRowBus",
+                "name": "UI Layout Row",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetSpacing",
+                    "base": "SetSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Spacing"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetOrder",
+                    "base": "GetOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Order"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetOrder",
+                    "base": "SetOrder",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Order"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpacing",
+                    "base": "GetSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Spacing"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "GetPadding",
+                    "base": "GetPadding",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Padding"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetPadding",
+                    "base": "SetPadding",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Padding"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names
index ac687d97bf..a877e8a6bb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiMarkupButtonBus",
+            "base": "UiMarkupButtonBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiMarkupButtonBus",
+                "name": "UI Markup Button",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetLinkColor",
+                    "base": "GetLinkColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Link Color"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetLinkColor",
+                    "base": "SetLinkColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Link Color"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetLinkHoverColor",
+                    "base": "GetLinkHoverColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Link Hover Color"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetLinkHoverColor",
+                    "base": "SetLinkHoverColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Link Hover Color"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names
index 366f157871..dca599e33c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiMaskBus",
+            "base": "UiMaskBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiMaskBus",
+                "name": "UI Mask",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetDrawInFront",
+                    "base": "SetDrawInFront",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Draw In Front"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetUseRenderToTexture",
+                    "base": "GetUseRenderToTexture",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Use Render To Texture"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetDrawInFront",
+                    "base": "GetDrawInFront",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Draw In Front"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "GetDrawBehind",
+                    "base": "GetDrawBehind",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Draw Behind"
@@ -103,7 +103,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsInteractionMaskingEnabled",
+                    "base": "GetIsInteractionMaskingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Interaction Masking Enabled"
@@ -126,7 +126,7 @@
                     ]
                 },
                 {
-                    "key": "GetUseAlphaTest",
+                    "base": "GetUseAlphaTest",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Use Alpha Test"
@@ -149,7 +149,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsMaskingEnabled",
+                    "base": "SetIsMaskingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Masking Enabled"
@@ -173,7 +173,7 @@
                     ]
                 },
                 {
-                    "key": "SetUseRenderToTexture",
+                    "base": "SetUseRenderToTexture",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Use Render To Texture"
@@ -197,7 +197,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsMaskingEnabled",
+                    "base": "GetIsMaskingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Masking Enabled"
@@ -220,7 +220,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsInteractionMaskingEnabled",
+                    "base": "SetIsInteractionMaskingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Interaction Masking Enabled"
@@ -244,7 +244,7 @@
                     ]
                 },
                 {
-                    "key": "SetDrawBehind",
+                    "base": "SetDrawBehind",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Draw Behind"
@@ -268,7 +268,7 @@
                     ]
                 },
                 {
-                    "key": "SetUseAlphaTest",
+                    "base": "SetUseAlphaTest",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Use Alpha Test"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names
index 6fd6a83c3b..9dc985f263 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiNavigationBus",
+            "base": "UiNavigationBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiNavigationBus",
+                "name": "UI Navigation",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetOnRightEntity",
+                    "base": "GetOnRightEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get On Right Entity"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetOnLeftEntity",
+                    "base": "SetOnLeftEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set On Left Entity"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "GetOnLeftEntity",
+                    "base": "GetOnLeftEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get On Left Entity"
@@ -82,7 +82,7 @@
                     ]
                 },
                 {
-                    "key": "SetOnDownEntity",
+                    "base": "SetOnDownEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set On Down Entity"
@@ -106,7 +106,7 @@
                     ]
                 },
                 {
-                    "key": "GetOnUpEntity",
+                    "base": "GetOnUpEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get On Up Entity"
@@ -130,7 +130,7 @@
                     ]
                 },
                 {
-                    "key": "SetOnUpEntity",
+                    "base": "SetOnUpEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set On Up Entity"
@@ -154,7 +154,7 @@
                     ]
                 },
                 {
-                    "key": "SetOnRightEntity",
+                    "base": "SetOnRightEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set On Right Entity"
@@ -178,7 +178,7 @@
                     ]
                 },
                 {
-                    "key": "SetNavigationMode",
+                    "base": "SetNavigationMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Navigation Mode"
@@ -202,7 +202,7 @@
                     ]
                 },
                 {
-                    "key": "GetOnDownEntity",
+                    "base": "GetOnDownEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get On Down Entity"
@@ -226,7 +226,7 @@
                     ]
                 },
                 {
-                    "key": "GetNavigationMode",
+                    "base": "GetNavigationMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Navigation Mode"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names
index 4803b9fe8b..87d6e0ee6d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiParticleEmitterBus",
+            "base": "UiParticleEmitterBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiParticleEmitterBus",
+                "name": "UI Particle Emitter",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetParticleColorTintVariation",
+                    "base": "SetParticleColorTintVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Color Tint Variation"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpriteSheetFrameDelay",
+                    "base": "GetSpriteSheetFrameDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Sheet Frame Delay"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleAlpha",
+                    "base": "SetParticleAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Alpha"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsEmitting",
+                    "base": "GetIsEmitting",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Emitting"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleHeight",
+                    "base": "SetParticleHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Height"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpriteSheetCellIndex",
+                    "base": "GetSpriteSheetCellIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Sheet Cell Index"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsParticleInitialRotationFromInitialVelocity",
+                    "base": "GetIsParticleInitialRotationFromInitialVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Particle Initial Rotation From Initial Velocity"
@@ -174,7 +174,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleLifetime",
+                    "base": "GetParticleLifetime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Lifetime"
@@ -197,7 +197,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsRandomSeedFixed",
+                    "base": "GetIsRandomSeedFixed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Random Seed Fixed"
@@ -220,7 +220,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpritePathname",
+                    "base": "GetSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Pathname"
@@ -243,7 +243,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleLifetimeVariation",
+                    "base": "GetParticleLifetimeVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Lifetime Variation"
@@ -266,7 +266,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleColor",
+                    "base": "GetParticleColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Color"
@@ -289,7 +289,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleInitialRotationVariation",
+                    "base": "GetParticleInitialRotationVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Initial Rotation Variation"
@@ -312,7 +312,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleLifetimeVariation",
+                    "base": "SetParticleLifetimeVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Lifetime Variation"
@@ -336,7 +336,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsEmitOnEdge",
+                    "base": "GetIsEmitOnEdge",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Emit On Edge"
@@ -359,7 +359,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleRotationSpeedVariation",
+                    "base": "GetParticleRotationSpeedVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Rotation Speed Variation"
@@ -382,7 +382,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsEmitOnActivate",
+                    "base": "SetIsEmitOnActivate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Emit On Activate"
@@ -406,7 +406,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleRotationSpeed",
+                    "base": "GetParticleRotationSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Rotation Speed"
@@ -429,7 +429,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleRotationSpeed",
+                    "base": "SetParticleRotationSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Rotation Speed"
@@ -453,7 +453,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsParticlePositionRelativeToEmitter",
+                    "base": "GetIsParticlePositionRelativeToEmitter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Particle Position Relative To Emitter"
@@ -476,7 +476,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsParticleAspectRatioLocked",
+                    "base": "SetIsParticleAspectRatioLocked",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Particle Aspect Ratio Locked"
@@ -500,7 +500,7 @@
                     ]
                 },
                 {
-                    "key": "SetEmitAngleVariation",
+                    "base": "SetEmitAngleVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Emit Angle Variation"
@@ -524,7 +524,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleLifetime",
+                    "base": "SetParticleLifetime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Lifetime"
@@ -548,7 +548,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpriteSheetFrameDelay",
+                    "base": "SetSpriteSheetFrameDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Sheet Frame Delay"
@@ -572,7 +572,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsParticleInitialRotationFromInitialVelocity",
+                    "base": "SetIsParticleInitialRotationFromInitialVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Particle Initial Rotation From Initial Velocity"
@@ -596,7 +596,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleAccelerationMovementSpace",
+                    "base": "SetParticleAccelerationMovementSpace",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Acceleration Movement Space"
@@ -620,7 +620,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsSpriteSheetAnimated",
+                    "base": "SetIsSpriteSheetAnimated",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Sprite Sheet Animated"
@@ -644,7 +644,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsParticleCountLimited",
+                    "base": "SetIsParticleCountLimited",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Particle Count Limited"
@@ -668,7 +668,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleSize",
+                    "base": "GetParticleSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Size"
@@ -691,7 +691,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleAccelerationMovementSpace",
+                    "base": "GetParticleAccelerationMovementSpace",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Acceleration Movement Space"
@@ -714,7 +714,7 @@
                     ]
                 },
                 {
-                    "key": "SetEmitAngle",
+                    "base": "SetEmitAngle",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Emit Angle"
@@ -738,7 +738,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleEmitRate",
+                    "base": "SetParticleEmitRate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Emit Rate"
@@ -762,7 +762,7 @@
                     ]
                 },
                 {
-                    "key": "GetMaxParticles",
+                    "base": "GetMaxParticles",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Max Particles"
@@ -785,7 +785,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleColorBrightnessVariation",
+                    "base": "GetParticleColorBrightnessVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Color Brightness Variation"
@@ -808,7 +808,7 @@
                     ]
                 },
                 {
-                    "key": "SetMaxParticles",
+                    "base": "SetMaxParticles",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Max Particles"
@@ -832,7 +832,7 @@
                     ]
                 },
                 {
-                    "key": "GetInsideEmitDistance",
+                    "base": "GetInsideEmitDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Inside Emit Distance"
@@ -855,7 +855,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticlePivot",
+                    "base": "SetParticlePivot",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Pivot"
@@ -879,7 +879,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleInitialDirectionType",
+                    "base": "GetParticleInitialDirectionType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Initial Direction Type"
@@ -902,7 +902,7 @@
                     ]
                 },
                 {
-                    "key": "SetEmitterLifetime",
+                    "base": "SetEmitterLifetime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Emitter Lifetime"
@@ -926,7 +926,7 @@
                     ]
                 },
                 {
-                    "key": "GetSpriteSheetCellEndIndex",
+                    "base": "GetSpriteSheetCellEndIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Sprite Sheet Cell End Index"
@@ -949,7 +949,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsEmitOnEdge",
+                    "base": "SetIsEmitOnEdge",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Emit On Edge"
@@ -973,7 +973,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleColorTintVariation",
+                    "base": "GetParticleColorTintVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Color Tint Variation"
@@ -996,7 +996,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleInitialVelocity",
+                    "base": "SetParticleInitialVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Initial Velocity"
@@ -1020,7 +1020,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsParticleCountLimited",
+                    "base": "GetIsParticleCountLimited",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Particle Count Limited"
@@ -1043,7 +1043,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleWidthVariation",
+                    "base": "SetParticleWidthVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Width Variation"
@@ -1067,7 +1067,7 @@
                     ]
                 },
                 {
-                    "key": "GetOutsideEmitDistance",
+                    "base": "GetOutsideEmitDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Outside Emit Distance"
@@ -1090,7 +1090,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsParticleLifetimeInfinite",
+                    "base": "GetIsParticleLifetimeInfinite",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Particle Lifetime Infinite"
@@ -1113,7 +1113,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsParticleRotationFromVelocity",
+                    "base": "SetIsParticleRotationFromVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Particle Rotation From Velocity"
@@ -1137,7 +1137,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsSpriteSheetAnimated",
+                    "base": "GetIsSpriteSheetAnimated",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Sprite Sheet Animated"
@@ -1160,7 +1160,7 @@
                     ]
                 },
                 {
-                    "key": "SetInsideEmitDistance",
+                    "base": "SetInsideEmitDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Inside Emit Distance"
@@ -1184,7 +1184,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpritePathname",
+                    "base": "SetSpritePathname",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Pathname"
@@ -1208,7 +1208,7 @@
                     ]
                 },
                 {
-                    "key": "GetEmitterShape",
+                    "base": "GetEmitterShape",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Emitter Shape"
@@ -1231,7 +1231,7 @@
                     ]
                 },
                 {
-                    "key": "SetOutsideEmitDistance",
+                    "base": "SetOutsideEmitDistance",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Outside Emit Distance"
@@ -1255,7 +1255,7 @@
                     ]
                 },
                 {
-                    "key": "SetRandomSeed",
+                    "base": "SetRandomSeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Random Seed"
@@ -1279,7 +1279,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsParticleRotationFromVelocity",
+                    "base": "GetIsParticleRotationFromVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Particle Rotation From Velocity"
@@ -1302,7 +1302,7 @@
                     ]
                 },
                 {
-                    "key": "GetRandomSeed",
+                    "base": "GetRandomSeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Random Seed"
@@ -1325,7 +1325,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleEmitRate",
+                    "base": "GetParticleEmitRate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Emit Rate"
@@ -1348,7 +1348,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsSpriteSheetIndexRandom",
+                    "base": "GetIsSpriteSheetIndexRandom",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Sprite Sheet Index Random"
@@ -1371,7 +1371,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsEmitting",
+                    "base": "SetIsEmitting",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Emitting"
@@ -1395,7 +1395,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleWidth",
+                    "base": "GetParticleWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Width"
@@ -1418,7 +1418,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleInitialRotation",
+                    "base": "GetParticleInitialRotation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Initial Rotation"
@@ -1441,7 +1441,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsSpriteSheetAnimationLooped",
+                    "base": "SetIsSpriteSheetAnimationLooped",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Sprite Sheet Animation Looped"
@@ -1465,7 +1465,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleInitialRotationVariation",
+                    "base": "SetParticleInitialRotationVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Initial Rotation Variation"
@@ -1489,7 +1489,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsRandomSeedFixed",
+                    "base": "SetIsRandomSeedFixed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Random Seed Fixed"
@@ -1513,7 +1513,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsEmitterLifetimeInfinite",
+                    "base": "SetIsEmitterLifetimeInfinite",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Emitter Lifetime Infinite"
@@ -1537,7 +1537,7 @@
                     ]
                 },
                 {
-                    "key": "GetEmitAngle",
+                    "base": "GetEmitAngle",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Emit Angle"
@@ -1560,7 +1560,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsEmitterLifetimeInfinite",
+                    "base": "GetIsEmitterLifetimeInfinite",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Emitter Lifetime Infinite"
@@ -1583,7 +1583,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsHitParticleCountOnActivate",
+                    "base": "SetIsHitParticleCountOnActivate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Hit Particle Count On Activate"
@@ -1607,7 +1607,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleMovementCoordinateType",
+                    "base": "SetParticleMovementCoordinateType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Movement Coordinate Type"
@@ -1631,7 +1631,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpriteSheetCellEndIndex",
+                    "base": "SetSpriteSheetCellEndIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Sheet Cell End Index"
@@ -1655,7 +1655,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleColor",
+                    "base": "SetParticleColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Color"
@@ -1679,7 +1679,7 @@
                     ]
                 },
                 {
-                    "key": "SetSpriteSheetCellIndex",
+                    "base": "SetSpriteSheetCellIndex",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Sprite Sheet Cell Index"
@@ -1703,7 +1703,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsParticleLifetimeInfinite",
+                    "base": "SetIsParticleLifetimeInfinite",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Particle Lifetime Infinite"
@@ -1727,7 +1727,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleSpeed",
+                    "base": "SetParticleSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Speed"
@@ -1751,7 +1751,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsHitParticleCountOnActivate",
+                    "base": "GetIsHitParticleCountOnActivate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Hit Particle Count On Activate"
@@ -1774,7 +1774,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleAlpha",
+                    "base": "GetParticleAlpha",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Alpha"
@@ -1797,7 +1797,7 @@
                     ]
                 },
                 {
-                    "key": "GetEmitAngleVariation",
+                    "base": "GetEmitAngleVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Emit Angle Variation"
@@ -1820,7 +1820,7 @@
                     ]
                 },
                 {
-                    "key": "SetEmitterShape",
+                    "base": "SetEmitterShape",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Emitter Shape"
@@ -1844,7 +1844,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleSpeedVariation",
+                    "base": "GetParticleSpeedVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Speed Variation"
@@ -1867,7 +1867,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleAcceleration",
+                    "base": "SetParticleAcceleration",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Acceleration"
@@ -1891,7 +1891,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleSpeedVariation",
+                    "base": "SetParticleSpeedVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Speed Variation"
@@ -1915,7 +1915,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsParticleAspectRatioLocked",
+                    "base": "GetIsParticleAspectRatioLocked",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Particle Aspect Ratio Locked"
@@ -1938,7 +1938,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsSpriteSheetAnimationLooped",
+                    "base": "GetIsSpriteSheetAnimationLooped",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Sprite Sheet Animation Looped"
@@ -1961,7 +1961,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleAcceleration",
+                    "base": "GetParticleAcceleration",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Acceleration"
@@ -1984,7 +1984,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsSpriteSheetIndexRandom",
+                    "base": "SetIsSpriteSheetIndexRandom",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Sprite Sheet Index Random"
@@ -2008,7 +2008,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleMovementCoordinateType",
+                    "base": "GetParticleMovementCoordinateType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Movement Coordinate Type"
@@ -2031,7 +2031,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleInitialVelocity",
+                    "base": "GetParticleInitialVelocity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Initial Velocity"
@@ -2054,7 +2054,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleWidth",
+                    "base": "SetParticleWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Width"
@@ -2078,7 +2078,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleSize",
+                    "base": "SetParticleSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Size"
@@ -2102,7 +2102,7 @@
                     ]
                 },
                 {
-                    "key": "GetEmitterLifetime",
+                    "base": "GetEmitterLifetime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Emitter Lifetime"
@@ -2125,7 +2125,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleSpeed",
+                    "base": "GetParticleSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Speed"
@@ -2148,7 +2148,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleRotationSpeedVariation",
+                    "base": "SetParticleRotationSpeedVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Rotation Speed Variation"
@@ -2172,7 +2172,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleHeight",
+                    "base": "GetParticleHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Height"
@@ -2195,7 +2195,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleHeightVariation",
+                    "base": "SetParticleHeightVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Height Variation"
@@ -2219,7 +2219,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleInitialRotation",
+                    "base": "SetParticleInitialRotation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Initial Rotation"
@@ -2243,7 +2243,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticlePivot",
+                    "base": "GetParticlePivot",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Pivot"
@@ -2266,7 +2266,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleWidthVariation",
+                    "base": "GetParticleWidthVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Width Variation"
@@ -2289,7 +2289,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsEmitOnActivate",
+                    "base": "GetIsEmitOnActivate",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Emit On Activate"
@@ -2312,7 +2312,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsParticlePositionRelativeToEmitter",
+                    "base": "SetIsParticlePositionRelativeToEmitter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Particle Position Relative To Emitter"
@@ -2336,7 +2336,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleInitialDirectionType",
+                    "base": "SetParticleInitialDirectionType",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Initial Direction Type"
@@ -2360,7 +2360,7 @@
                     ]
                 },
                 {
-                    "key": "GetParticleHeightVariation",
+                    "base": "GetParticleHeightVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Particle Height Variation"
@@ -2383,7 +2383,7 @@
                     ]
                 },
                 {
-                    "key": "SetParticleColorBrightnessVariation",
+                    "base": "SetParticleColorBrightnessVariation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Particle Color Brightness Variation"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names
index 42e23202c6..891d2eb945 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiRadioButtonBus",
+            "base": "UiRadioButtonBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiRadioButtonBus",
+                "name": "UI Radio Button",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetChangedActionName",
+                    "base": "SetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Changed Action Name"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetChangedActionName",
+                    "base": "GetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Changed Action Name"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetCheckedEntity",
+                    "base": "SetCheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Checked Entity"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetUncheckedEntity",
+                    "base": "SetUncheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Unchecked Entity"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "SetTurnOnActionName",
+                    "base": "SetTurnOnActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Turn On Action Name"
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "GetTurnOffActionName",
+                    "base": "GetTurnOffActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Turn Off Action Name"
@@ -152,7 +152,7 @@
                     ]
                 },
                 {
-                    "key": "GetGroup",
+                    "base": "GetGroup",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Group"
@@ -176,7 +176,7 @@
                     ]
                 },
                 {
-                    "key": "GetState",
+                    "base": "GetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State"
@@ -199,7 +199,7 @@
                     ]
                 },
                 {
-                    "key": "GetCheckedEntity",
+                    "base": "GetCheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Checked Entity"
@@ -223,7 +223,7 @@
                     ]
                 },
                 {
-                    "key": "GetUncheckedEntity",
+                    "base": "GetUncheckedEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Unchecked Entity"
@@ -247,7 +247,7 @@
                     ]
                 },
                 {
-                    "key": "GetTurnOnActionName",
+                    "base": "GetTurnOnActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Turn On Action Name"
@@ -270,7 +270,7 @@
                     ]
                 },
                 {
-                    "key": "SetTurnOffActionName",
+                    "base": "SetTurnOffActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Turn Off Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names
index 2cde33edfb..0eec1b3599 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiRadioButtonGroupBus",
+            "base": "UiRadioButtonGroupBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiRadioButtonGroupBus",
+                "name": "UI Radio Button Group",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "AddRadioButton",
+                    "base": "AddRadioButton",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Add Radio Button"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "SetChangedActionName",
+                    "base": "SetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Changed Action Name"
@@ -58,7 +58,7 @@
                     ]
                 },
                 {
-                    "key": "SetAllowUncheck",
+                    "base": "SetAllowUncheck",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Allow Uncheck"
@@ -82,7 +82,7 @@
                     ]
                 },
                 {
-                    "key": "ContainsRadioButton",
+                    "base": "ContainsRadioButton",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Contains Radio Button"
@@ -115,7 +115,7 @@
                     ]
                 },
                 {
-                    "key": "GetChangedActionName",
+                    "base": "GetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Changed Action Name"
@@ -138,7 +138,7 @@
                     ]
                 },
                 {
-                    "key": "GetAllowUncheck",
+                    "base": "GetAllowUncheck",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Allow Uncheck"
@@ -161,7 +161,7 @@
                     ]
                 },
                 {
-                    "key": "RemoveRadioButton",
+                    "base": "RemoveRadioButton",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Remove Radio Button"
@@ -185,7 +185,7 @@
                     ]
                 },
                 {
-                    "key": "SetState",
+                    "base": "SetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set State"
@@ -216,7 +216,7 @@
                     ]
                 },
                 {
-                    "key": "GetState",
+                    "base": "GetState",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get State"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names
index 8ca81f9cca..26a03d0a85 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiScrollBarBus",
+            "base": "UiScrollBarBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiScrollBarBus",
+                "name": "UI Scroll Bar",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetAutoFadeSpeed",
+                    "base": "GetAutoFadeSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAutoFadeSpeed"
@@ -32,7 +32,7 @@
                     ]
                 },
                 {
-                    "key": "IsAutoFadeEnabled",
+                    "base": "IsAutoFadeEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke IsAutoFadeEnabled"
@@ -54,7 +54,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoFadeSpeed",
+                    "base": "SetAutoFadeSpeed",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAutoFadeSpeed"
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "key": "SetHandleEntity",
+                    "base": "SetHandleEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Handle Entity"
@@ -100,7 +100,7 @@
                     ]
                 },
                 {
-                    "key": "GetHandleEntity",
+                    "base": "GetHandleEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Handle Entity"
@@ -124,7 +124,7 @@
                     ]
                 },
                 {
-                    "key": "GetAutoFadeDelay",
+                    "base": "GetAutoFadeDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetAutoFadeDelay"
@@ -146,7 +146,7 @@
                     ]
                 },
                 {
-                    "key": "GetMinHandlePixelSize",
+                    "base": "GetMinHandlePixelSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Min Handle Pixel Size"
@@ -169,7 +169,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoFadeEnabled",
+                    "base": "SetAutoFadeEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAutoFadeEnabled"
@@ -191,7 +191,7 @@
                     ]
                 },
                 {
-                    "key": "SetHandleSize",
+                    "base": "SetHandleSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Handle Size"
@@ -215,7 +215,7 @@
                     ]
                 },
                 {
-                    "key": "SetMinHandlePixelSize",
+                    "base": "SetMinHandlePixelSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Min Handle Pixel Size"
@@ -239,7 +239,7 @@
                     ]
                 },
                 {
-                    "key": "GetHandleSize",
+                    "base": "GetHandleSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Handle Size"
@@ -262,7 +262,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoFadeDelay",
+                    "base": "SetAutoFadeDelay",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetAutoFadeDelay"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names
index 9198231a79..d8dee354dd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiScrollBoxBus",
+            "base": "UiScrollBoxBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiScrollBoxBus",
+                "name": "UI Scroll Box",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "FindClosestContentChildElement",
+                    "base": "FindClosestContentChildElement",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Find Closest Content Child Element"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetHorizontalScrollBarVisibility",
+                    "base": "GetHorizontalScrollBarVisibility",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Horizontal Scroll Bar Visibility"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetVerticalScrollBarEntity",
+                    "base": "GetVerticalScrollBarEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Vertical Scroll Bar Entity"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetHorizontalScrollBarVisibility",
+                    "base": "SetHorizontalScrollBarVisibility",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Horizontal Scroll Bar Visibility"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "SetScrollOffsetChangingActionName",
+                    "base": "SetScrollOffsetChangingActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Scroll Offset Changing Action Name"
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "GetScrollOffsetChangingActionName",
+                    "base": "GetScrollOffsetChangingActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Scroll Offset Changing Action Name"
@@ -152,7 +152,7 @@
                     ]
                 },
                 {
-                    "key": "GetHorizontalScrollBarEntity",
+                    "base": "GetHorizontalScrollBarEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Horizontal Scroll Bar Entity"
@@ -176,7 +176,7 @@
                     ]
                 },
                 {
-                    "key": "HasHorizontalContentToScroll",
+                    "base": "HasHorizontalContentToScroll",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has Horizontal Content To Scroll"
@@ -199,7 +199,7 @@
                     ]
                 },
                 {
-                    "key": "SetContentEntity",
+                    "base": "SetContentEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Content Entity"
@@ -223,7 +223,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsScrollingConstrained",
+                    "base": "GetIsScrollingConstrained",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Scrolling Constrained"
@@ -246,7 +246,7 @@
                     ]
                 },
                 {
-                    "key": "HasVerticalContentToScroll",
+                    "base": "HasVerticalContentToScroll",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Has Vertical Content To Scroll"
@@ -269,7 +269,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsVerticalScrollingEnabled",
+                    "base": "GetIsVerticalScrollingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Vertical Scrolling Enabled"
@@ -292,7 +292,7 @@
                     ]
                 },
                 {
-                    "key": "GetVerticalScrollBarVisibility",
+                    "base": "GetVerticalScrollBarVisibility",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Vertical Scroll Bar Visibility"
@@ -315,7 +315,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsHorizontalScrollingEnabled",
+                    "base": "SetIsHorizontalScrollingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Horizontal Scrolling Enabled"
@@ -339,7 +339,7 @@
                     ]
                 },
                 {
-                    "key": "GetNormalizedScrollValue",
+                    "base": "GetNormalizedScrollValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Normalized Scroll Value"
@@ -362,7 +362,7 @@
                     ]
                 },
                 {
-                    "key": "SetScrollOffset",
+                    "base": "SetScrollOffset",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Scroll Offset"
@@ -386,7 +386,7 @@
                     ]
                 },
                 {
-                    "key": "SetHorizontalScrollBarEntity",
+                    "base": "SetHorizontalScrollBarEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Horizontal Scroll Bar Entity"
@@ -410,7 +410,7 @@
                     ]
                 },
                 {
-                    "key": "GetScrollOffset",
+                    "base": "GetScrollOffset",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Scroll Offset"
@@ -433,7 +433,7 @@
                     ]
                 },
                 {
-                    "key": "GetScrollOffsetChangedActionName",
+                    "base": "GetScrollOffsetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Scroll Offset Changed Action Name"
@@ -456,7 +456,7 @@
                     ]
                 },
                 {
-                    "key": "SetVerticalScrollBarVisibility",
+                    "base": "SetVerticalScrollBarVisibility",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Vertical Scroll Bar Visibility"
@@ -480,7 +480,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsHorizontalScrollingEnabled",
+                    "base": "GetIsHorizontalScrollingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Horizontal Scrolling Enabled"
@@ -503,7 +503,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsScrollingConstrained",
+                    "base": "SetIsScrollingConstrained",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Scrolling Constrained"
@@ -527,7 +527,7 @@
                     ]
                 },
                 {
-                    "key": "SetSnapGrid",
+                    "base": "SetSnapGrid",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Snap Grid"
@@ -551,7 +551,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsVerticalScrollingEnabled",
+                    "base": "SetIsVerticalScrollingEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Vertical Scrolling Enabled"
@@ -575,7 +575,7 @@
                     ]
                 },
                 {
-                    "key": "GetSnapGrid",
+                    "base": "GetSnapGrid",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Snap Grid"
@@ -598,7 +598,7 @@
                     ]
                 },
                 {
-                    "key": "GetSnapMode",
+                    "base": "GetSnapMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Snap Mode"
@@ -621,7 +621,7 @@
                     ]
                 },
                 {
-                    "key": "SetScrollOffsetChangedActionName",
+                    "base": "SetScrollOffsetChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Scroll Offset Changed Action Name"
@@ -645,7 +645,7 @@
                     ]
                 },
                 {
-                    "key": "SetVerticalScrollBarEntity",
+                    "base": "SetVerticalScrollBarEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Vertical Scroll Bar Entity"
@@ -669,7 +669,7 @@
                     ]
                 },
                 {
-                    "key": "GetContentEntity",
+                    "base": "GetContentEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Content Entity"
@@ -693,7 +693,7 @@
                     ]
                 },
                 {
-                    "key": "SetSnapMode",
+                    "base": "SetSnapMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Snap Mode"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names
index c2b3fd4a76..da05529331 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiScrollerBus",
+            "base": "UiScrollerBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiScrollerBus",
+                "name": "UI Scroller Bus",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetValueChangedActionName",
+                    "base": "GetValueChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value Changed Action Name"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetOrientation",
+                    "base": "SetOrientation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Orientation"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetOrientation",
+                    "base": "GetOrientation",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Orientation"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "GetValueChangingActionName",
+                    "base": "GetValueChangingActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value Changing Action Name"
@@ -103,7 +103,7 @@
                     ]
                 },
                 {
-                    "key": "SetValueChangingActionName",
+                    "base": "SetValueChangingActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value Changing Action Name"
@@ -127,7 +127,7 @@
                     ]
                 },
                 {
-                    "key": "SetValue",
+                    "base": "SetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value"
@@ -174,7 +174,7 @@
                     ]
                 },
                 {
-                    "key": "SetValueChangedActionName",
+                    "base": "SetValueChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value Changed Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names
index 48e06905c7..0cecbe20f0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiSliderBus",
+            "base": "UiSliderBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiSliderBus",
+                "name": "UI Slider",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetValueChangingActionName",
+                    "base": "GetValueChangingActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value Changing Action Name"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetValueChangingActionName",
+                    "base": "SetValueChangingActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value Changing Action Name"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetManipulatorEntity",
+                    "base": "GetManipulatorEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Manipulator Entity"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "SetTrackEntity",
+                    "base": "SetTrackEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Track Entity"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetFillEntity",
+                    "base": "GetFillEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Fill Entity"
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "key": "SetFillEntity",
+                    "base": "SetFillEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Fill Entity"
@@ -153,7 +153,7 @@
                     ]
                 },
                 {
-                    "key": "SetManipulatorEntity",
+                    "base": "SetManipulatorEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Manipulator Entity"
@@ -177,7 +177,7 @@
                     ]
                 },
                 {
-                    "key": "GetValueChangedActionName",
+                    "base": "GetValueChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value Changed Action Name"
@@ -200,7 +200,7 @@
                     ]
                 },
                 {
-                    "key": "GetTrackEntity",
+                    "base": "GetTrackEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Track Entity"
@@ -224,7 +224,7 @@
                     ]
                 },
                 {
-                    "key": "GetMinValue",
+                    "base": "GetMinValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Min Value"
@@ -247,7 +247,7 @@
                     ]
                 },
                 {
-                    "key": "SetMinValue",
+                    "base": "SetMinValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Min Value"
@@ -271,7 +271,7 @@
                     ]
                 },
                 {
-                    "key": "SetStepValue",
+                    "base": "SetStepValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Step Value"
@@ -295,7 +295,7 @@
                     ]
                 },
                 {
-                    "key": "SetValue",
+                    "base": "SetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value"
@@ -319,7 +319,7 @@
                     ]
                 },
                 {
-                    "key": "SetMaxValue",
+                    "base": "SetMaxValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Max Value"
@@ -343,7 +343,7 @@
                     ]
                 },
                 {
-                    "key": "GetStepValue",
+                    "base": "GetStepValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Step Value"
@@ -366,7 +366,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Value"
@@ -389,7 +389,7 @@
                     ]
                 },
                 {
-                    "key": "GetMaxValue",
+                    "base": "GetMaxValue",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Max Value"
@@ -412,7 +412,7 @@
                     ]
                 },
                 {
-                    "key": "SetValueChangedActionName",
+                    "base": "SetValueChangedActionName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Value Changed Action Name"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names
index 013efee91d..707f8903ec 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiSpawnerBus",
+            "base": "UiSpawnerBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiSpawnerBus",
+                "name": "UI Spawner",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "Spawn",
+                    "base": "Spawn",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Spawn"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SpawnRelative",
+                    "base": "SpawnRelative",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Spawn Relative"
@@ -66,7 +66,7 @@
                     ]
                 },
                 {
-                    "key": "SpawnAbsolute",
+                    "base": "SpawnAbsolute",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Spawn Absolute"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names
index 1bc31f0a93..7b14419e16 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiTextBus",
+            "base": "UiTextBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiTextBus",
+                "name": "UI Text",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetTextHeight",
+                    "base": "GetTextHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Height"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "GetColor",
+                    "base": "GetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Color"
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "key": "GetLineSpacing",
+                    "base": "GetLineSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Line Spacing"
@@ -79,7 +79,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextWidth",
+                    "base": "GetTextWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Width"
@@ -102,7 +102,7 @@
                     ]
                 },
                 {
-                    "key": "SetWrapText",
+                    "base": "SetWrapText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Wrap Text"
@@ -126,7 +126,7 @@
                     ]
                 },
                 {
-                    "key": "GetFontEffectName",
+                    "base": "GetFontEffectName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Font Effect Name"
@@ -159,7 +159,7 @@
                     ]
                 },
                 {
-                    "key": "GetShrinkToFit",
+                    "base": "GetShrinkToFit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Shrink To Fit"
@@ -182,7 +182,7 @@
                     ]
                 },
                 {
-                    "key": "GetOverflowMode",
+                    "base": "GetOverflowMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Overflow Mode"
@@ -205,7 +205,7 @@
                     ]
                 },
                 {
-                    "key": "GetFontEffect",
+                    "base": "GetFontEffect",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Font Effect"
@@ -228,7 +228,7 @@
                     ]
                 },
                 {
-                    "key": "SetFontEffect",
+                    "base": "SetFontEffect",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Font Effect"
@@ -252,7 +252,7 @@
                     ]
                 },
                 {
-                    "key": "GetHorizontalTextAlignment",
+                    "base": "GetHorizontalTextAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Horizontal Text Alignment"
@@ -275,7 +275,7 @@
                     ]
                 },
                 {
-                    "key": "GetFont",
+                    "base": "GetFont",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Font"
@@ -298,7 +298,7 @@
                     ]
                 },
                 {
-                    "key": "SetVerticalTextAlignment",
+                    "base": "SetVerticalTextAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Vertical Text Alignment"
@@ -322,7 +322,7 @@
                     ]
                 },
                 {
-                    "key": "GetVerticalTextAlignment",
+                    "base": "GetVerticalTextAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Vertical Text Alignment"
@@ -345,7 +345,7 @@
                     ]
                 },
                 {
-                    "key": "SetOverflowMode",
+                    "base": "SetOverflowMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Overflow Mode"
@@ -369,7 +369,7 @@
                     ]
                 },
                 {
-                    "key": "SetColor",
+                    "base": "SetColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Color"
@@ -393,7 +393,7 @@
                     ]
                 },
                 {
-                    "key": "SetFontSize",
+                    "base": "SetFontSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Font Size"
@@ -417,7 +417,7 @@
                     ]
                 },
                 {
-                    "key": "SetCharacterSpacing",
+                    "base": "SetCharacterSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Character Spacing"
@@ -441,7 +441,7 @@
                     ]
                 },
                 {
-                    "key": "SetLineSpacing",
+                    "base": "SetLineSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Line Spacing"
@@ -465,7 +465,7 @@
                     ]
                 },
                 {
-                    "key": "GetCharacterSpacing",
+                    "base": "GetCharacterSpacing",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Character Spacing"
@@ -488,7 +488,7 @@
                     ]
                 },
                 {
-                    "key": "SetHorizontalTextAlignment",
+                    "base": "SetHorizontalTextAlignment",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Horizontal Text Alignment"
@@ -512,7 +512,7 @@
                     ]
                 },
                 {
-                    "key": "SetText",
+                    "base": "SetText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text"
@@ -536,7 +536,7 @@
                     ]
                 },
                 {
-                    "key": "SetFont",
+                    "base": "SetFont",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Font"
@@ -560,7 +560,7 @@
                     ]
                 },
                 {
-                    "key": "SetFontEffectByName",
+                    "base": "SetFontEffectByName",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Font Effect By Name"
@@ -584,7 +584,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsMarkupEnabled",
+                    "base": "SetIsMarkupEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Markup Enabled"
@@ -608,7 +608,7 @@
                     ]
                 },
                 {
-                    "key": "GetWrapText",
+                    "base": "GetWrapText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Wrap Text"
@@ -631,7 +631,7 @@
                     ]
                 },
                 {
-                    "key": "GetText",
+                    "base": "GetText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text"
@@ -654,7 +654,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextSize",
+                    "base": "GetTextSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTextSize"
@@ -676,7 +676,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsMarkupEnabled",
+                    "base": "GetIsMarkupEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Is Markup Enabled"
@@ -699,7 +699,7 @@
                     ]
                 },
                 {
-                    "key": "GetFontSize",
+                    "base": "GetFontSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Font Size"
@@ -722,7 +722,7 @@
                     ]
                 },
                 {
-                    "key": "SetShrinkToFit",
+                    "base": "SetShrinkToFit",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Shrink To Fit"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names
index b8a8cd69da..4ccb34553c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiTextInputBus",
+            "base": "UiTextInputBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiTextInputBus",
+                "name": "UI Text Input",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "SetChangeAction",
+                    "base": "SetChangeAction",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Change Action"
@@ -34,7 +34,7 @@
                     ]
                 },
                 {
-                    "key": "GetEndEditAction",
+                    "base": "GetEndEditAction",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get End Edit Action"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "SetEndEditAction",
+                    "base": "SetEndEditAction",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set End Edit Action"
@@ -81,7 +81,7 @@
                     ]
                 },
                 {
-                    "key": "GetPlaceHolderTextEntity",
+                    "base": "GetPlaceHolderTextEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Placeholder Text Entity"
@@ -105,7 +105,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsPasswordField",
+                    "base": "GetIsPasswordField",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Is Password Field"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "GetChangeAction",
+                    "base": "GetChangeAction",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Change Action"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "SetEnterAction",
+                    "base": "SetEnterAction",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Enter Action"
@@ -175,7 +175,7 @@
                     ]
                 },
                 {
-                    "key": "SetText",
+                    "base": "SetText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text"
@@ -199,7 +199,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsClipboardEnabled",
+                    "base": "SetIsClipboardEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetIsClipboardEnabled"
@@ -221,7 +221,7 @@
                     ]
                 },
                 {
-                    "key": "SetMaxStringLength",
+                    "base": "SetMaxStringLength",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Max String Length"
@@ -245,7 +245,7 @@
                     ]
                 },
                 {
-                    "key": "GetEnterAction",
+                    "base": "GetEnterAction",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Enter Action"
@@ -268,7 +268,7 @@
                     ]
                 },
                 {
-                    "key": "GetText",
+                    "base": "GetText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text"
@@ -291,7 +291,7 @@
                     ]
                 },
                 {
-                    "key": "GetCursorBlinkInterval",
+                    "base": "GetCursorBlinkInterval",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Cursor Blink Interval"
@@ -314,7 +314,7 @@
                     ]
                 },
                 {
-                    "key": "GetMaxStringLength",
+                    "base": "GetMaxStringLength",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Max String Length"
@@ -337,7 +337,7 @@
                     ]
                 },
                 {
-                    "key": "SetIsPasswordField",
+                    "base": "SetIsPasswordField",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Is Password Field"
@@ -361,7 +361,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextCursorColor",
+                    "base": "GetTextCursorColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Cursor Color"
@@ -384,7 +384,7 @@
                     ]
                 },
                 {
-                    "key": "SetTextEntity",
+                    "base": "SetTextEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text Entity"
@@ -408,7 +408,7 @@
                     ]
                 },
                 {
-                    "key": "SetTextSelectionColor",
+                    "base": "SetTextSelectionColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text Selection Color"
@@ -432,7 +432,7 @@
                     ]
                 },
                 {
-                    "key": "SetTextCursorColor",
+                    "base": "SetTextCursorColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text Cursor Color"
@@ -456,7 +456,7 @@
                     ]
                 },
                 {
-                    "key": "SetCursorBlinkInterval",
+                    "base": "SetCursorBlinkInterval",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Cursor Blink Interval"
@@ -480,7 +480,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextEntity",
+                    "base": "GetTextEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Entity"
@@ -504,7 +504,7 @@
                     ]
                 },
                 {
-                    "key": "SetPlaceHolderTextEntity",
+                    "base": "SetPlaceHolderTextEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Placeholder Text Entity"
@@ -528,7 +528,7 @@
                     ]
                 },
                 {
-                    "key": "GetReplacementCharacter",
+                    "base": "GetReplacementCharacter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Replacement Character"
@@ -551,7 +551,7 @@
                     ]
                 },
                 {
-                    "key": "GetIsClipboardEnabled",
+                    "base": "GetIsClipboardEnabled",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetIsClipboardEnabled"
@@ -573,7 +573,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextSelectionColor",
+                    "base": "GetTextSelectionColor",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Selection Color"
@@ -596,7 +596,7 @@
                     ]
                 },
                 {
-                    "key": "SetReplacementCharacter",
+                    "base": "SetReplacementCharacter",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Replacement Character"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names
index 65fa7736e2..596b456cd0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiTooltipBus",
+            "base": "UiTooltipBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiTooltipBus",
+                "name": "UI Tooltip",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetText",
+                    "base": "GetText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetText",
+                    "base": "SetText",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names
index ddf95a0888..33ec35863e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiTooltipDisplayBus",
+            "base": "UiTooltipDisplayBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiTooltipDisplayBus",
+                "name": "UI Tooltip Display",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetAutoSize",
+                    "base": "GetAutoSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Auto Size"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "GetTextEntity",
+                    "base": "GetTextEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Text Entity"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetDelayTime",
+                    "base": "GetDelayTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Delay Time"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetDelayTime",
+                    "base": "SetDelayTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Delay Time"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "SetDisplayTime",
+                    "base": "SetDisplayTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Display Time"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "SetOffset",
+                    "base": "SetOffset",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Offset"
@@ -152,7 +152,7 @@
                     ]
                 },
                 {
-                    "key": "GetOffset",
+                    "base": "GetOffset",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Offset"
@@ -175,7 +175,7 @@
                     ]
                 },
                 {
-                    "key": "GetAutoPositionMode",
+                    "base": "GetAutoPositionMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Auto Position Mode"
@@ -198,7 +198,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoPosition",
+                    "base": "SetAutoPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Auto Position"
@@ -222,7 +222,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoSize",
+                    "base": "SetAutoSize",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Auto Size"
@@ -246,7 +246,7 @@
                     ]
                 },
                 {
-                    "key": "GetAutoPosition",
+                    "base": "GetAutoPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Auto Position"
@@ -269,7 +269,7 @@
                     ]
                 },
                 {
-                    "key": "SetTextEntity",
+                    "base": "SetTextEntity",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Text Entity"
@@ -293,7 +293,7 @@
                     ]
                 },
                 {
-                    "key": "GetDisplayTime",
+                    "base": "GetDisplayTime",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Display Time"
@@ -316,7 +316,7 @@
                     ]
                 },
                 {
-                    "key": "GetTriggerMode",
+                    "base": "GetTriggerMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke GetTriggerMode"
@@ -338,7 +338,7 @@
                     ]
                 },
                 {
-                    "key": "SetTriggerMode",
+                    "base": "SetTriggerMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke SetTriggerMode"
@@ -360,7 +360,7 @@
                     ]
                 },
                 {
-                    "key": "SetAutoPositionMode",
+                    "base": "SetAutoPositionMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Auto Position Mode"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names
index 112788b514..c75e4dad79 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names
@@ -1,16 +1,16 @@
 {
     "entries": [
         {
-            "key": "UiTransform2dBus",
+            "base": "UiTransform2dBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiTransform2dBus",
+                "name": "UI Transform 2D",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetLocalHeight",
+                    "base": "GetLocalHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Height"
@@ -33,7 +33,7 @@
                     ]
                 },
                 {
-                    "key": "SetLocalHeight",
+                    "base": "SetLocalHeight",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Height"
@@ -57,7 +57,7 @@
                     ]
                 },
                 {
-                    "key": "GetLocalWidth",
+                    "base": "GetLocalWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Width"
@@ -80,7 +80,7 @@
                     ]
                 },
                 {
-                    "key": "SetPivotAndAdjustOffsets",
+                    "base": "SetPivotAndAdjustOffsets",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Pivot And Adjust Offsets"
@@ -104,7 +104,7 @@
                     ]
                 },
                 {
-                    "key": "SetLocalWidth",
+                    "base": "SetLocalWidth",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Width"
@@ -128,7 +128,7 @@
                     ]
                 },
                 {
-                    "key": "GetOffsets",
+                    "base": "GetOffsets",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Offsets"
@@ -151,7 +151,7 @@
                     ]
                 },
                 {
-                    "key": "SetAnchors",
+                    "base": "SetAnchors",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Anchors"
@@ -189,7 +189,7 @@
                     ]
                 },
                 {
-                    "key": "GetAnchors",
+                    "base": "GetAnchors",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Anchors"
@@ -212,7 +212,7 @@
                     ]
                 },
                 {
-                    "key": "SetOffsets",
+                    "base": "SetOffsets",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Offsets"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names
index 6628f2c84c..d432305852 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names
@@ -1,27 +1,26 @@
 {
     "entries": [
         {
-            "key": "UiTransformBus",
+            "base": "UiTransformBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "UiTransformBus",
+                "name": "UI Transform",
                 "category": "UI"
             },
             "methods": [
                 {
-                    "key": "GetPivotY",
+                    "base": "GetPivotY",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Pivot Y"
+                        "tooltip": "When signaled, this will invoke Get PivotY"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Pivot Y is invoked"
+                        "tooltip": "Signaled after Get PivotY is invoked"
                     },
                     "details": {
-                        "name": "Get Pivot Y",
-                        "tooltip": "Gets the Y value of the pivot point"
+                        "name": "Get PivotY"
                     },
                     "results": [
                         {
@@ -33,18 +32,17 @@
                     ]
                 },
                 {
-                    "key": "GetScaleX",
+                    "base": "GetScaleX",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Scale X"
+                        "tooltip": "When signaled, this will invoke Get ScaleX"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Scale X is invoked"
+                        "tooltip": "Signaled after Get ScaleX is invoked"
                     },
                     "details": {
-                        "name": "Get Scale X",
-                        "tooltip": "Gets the X value of the scale"
+                        "name": "Get ScaleX"
                     },
                     "results": [
                         {
@@ -56,7 +54,7 @@
                     ]
                 },
                 {
-                    "key": "GetScale",
+                    "base": "GetScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Scale"
@@ -66,92 +64,85 @@
                         "tooltip": "Signaled after Get Scale is invoked"
                     },
                     "details": {
-                        "name": "Get Scale",
-                        "tooltip": "Gets the scale"
+                        "name": "Get Scale"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalPositionX",
+                    "base": "SetLocalPositionX",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Local Position X"
+                        "tooltip": "When signaled, this will invoke Set Local PositionX"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Local Position X is invoked"
+                        "tooltip": "Signaled after Set Local PositionX is invoked"
                     },
                     "details": {
-                        "name": "Set Local Position X",
-                        "tooltip": "Sets the X position of the element relative to the center of the element's anchors"
+                        "name": "Set Local PositionX"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "X Local Position",
-                                "tooltip": "The X position of the element relative to the center of the element's anchors"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetScaleX",
+                    "base": "SetScaleX",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Scale X"
+                        "tooltip": "When signaled, this will invoke Set ScaleX"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Scale X is invoked"
+                        "tooltip": "Signaled after Set ScaleX is invoked"
                     },
                     "details": {
-                        "name": "Set Scale X",
-                        "tooltip": "Sets the X value of the scale"
+                        "name": "Set ScaleX"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "X Scale",
-                                "tooltip": "The X value of the scale"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetZRotation",
+                    "base": "SetZRotation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Z Rotation"
+                        "tooltip": "When signaled, this will invoke SetZ Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Z Rotation is invoked"
+                        "tooltip": "Signaled after SetZ Rotation is invoked"
                     },
                     "details": {
-                        "name": "Set Z Rotation",
-                        "tooltip": "Sets the rotation about the z-axis"
+                        "name": "SetZ Rotation"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Z Rotation",
-                                "tooltip": "The rotation about the z-axis"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetScaleToDeviceMode",
+                    "base": "GetScaleToDeviceMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Scale To Device Mode"
@@ -161,8 +152,7 @@
                         "tooltip": "Signaled after Get Scale To Device Mode is invoked"
                     },
                     "details": {
-                        "name": "Get Scale To Device Mode",
-                        "tooltip": "Returns how the element and all its children are scaled to allow for the difference between the authored canvas size and the actual viewport size"
+                        "name": "Get Scale To Device Mode"
                     },
                     "results": [
                         {
@@ -174,7 +164,7 @@
                     ]
                 },
                 {
-                    "key": "SetPivot",
+                    "base": "SetPivot",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Pivot"
@@ -184,32 +174,29 @@
                         "tooltip": "Signaled after Set Pivot is invoked"
                     },
                     "details": {
-                        "name": "Set Pivot",
-                        "tooltip": "Sets the pivot point"
+                        "name": "Set Pivot"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Pivot",
-                                "tooltip": "The pivot point"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetScaleY",
+                    "base": "GetScaleY",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Scale Y"
+                        "tooltip": "When signaled, this will invoke Get ScaleY"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Scale Y is invoked"
+                        "tooltip": "Signaled after Get ScaleY is invoked"
                     },
                     "details": {
-                        "name": "Get Scale Y",
-                        "tooltip": "Gets the Y value of the scale"
+                        "name": "Get ScaleY"
                     },
                     "results": [
                         {
@@ -221,7 +208,7 @@
                     ]
                 },
                 {
-                    "key": "MoveLocalPositionBy",
+                    "base": "MoveLocalPositionBy",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Move Local Position By"
@@ -231,45 +218,41 @@
                         "tooltip": "Signaled after Move Local Position By is invoked"
                     },
                     "details": {
-                        "name": "Move Local Position By",
-                        "tooltip": "Moves the element relative to the center of the element's anchors"
+                        "name": "Move Local Position By"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Offset",
-                                "tooltip": "The amount to move the local position"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalPositionY",
+                    "base": "SetLocalPositionY",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Local Position Y"
+                        "tooltip": "When signaled, this will invoke Set Local PositionY"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Local Position Y is invoked"
+                        "tooltip": "Signaled after Set Local PositionY is invoked"
                     },
                     "details": {
-                        "name": "Set Local Position Y",
-                        "tooltip": "Sets the Y position of the element relative to the center of the element's anchors"
+                        "name": "Set Local PositionY"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Y Local Position",
-                                "tooltip": "The Y position of the element relative to the center of the element's anchors"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetViewportPosition",
+                    "base": "SetViewportPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Viewport Position"
@@ -279,21 +262,19 @@
                         "tooltip": "Signaled after Set Viewport Position is invoked"
                     },
                     "details": {
-                        "name": "Set Viewport Position",
-                        "tooltip": "Sets the position of the element in viewport space"
+                        "name": "Set Viewport Position"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Position",
-                                "tooltip": "The position of the element in viewport space"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetScaleToDeviceMode",
+                    "base": "SetScaleToDeviceMode",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Scale To Device Mode"
@@ -303,32 +284,29 @@
                         "tooltip": "Signaled after Set Scale To Device Mode is invoked"
                     },
                     "details": {
-                        "name": "Set Scale To Device Mode",
-                        "tooltip": "Sets how the element and all its children should be scaled to allow for the difference between the authored canvas size and the actual viewport size"
+                        "name": "Set Scale To Device Mode"
                     },
                     "params": [
                         {
                             "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
                             "details": {
-                                "name": "Scale to Device Mode",
-                                "tooltip": "Indicates how the element and all its children are scaled to allow for the difference between the authored canvas size and the actual viewport size (0=None, 1=Scale to fit (uniformly), 2=Scale to fill (uniformly), 3=Scale to fit X (uniformly), 4=Scale to fit Y (uniformly), 5=Stretch to fill (non-uniformly), 6=Stretch to fit X (non-uniformly), 7=Stretch to fit Y (non-uniformly))"
+                                "name": "int"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalPositionX",
+                    "base": "GetLocalPositionX",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Local Position X"
+                        "tooltip": "When signaled, this will invoke Get Local PositionX"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Local Position X is invoked"
+                        "tooltip": "Signaled after Get Local PositionX is invoked"
                     },
                     "details": {
-                        "name": "Get Local Position X",
-                        "tooltip": "Gets the X position of the element relative to the center of the element's anchors"
+                        "name": "Get Local PositionX"
                     },
                     "results": [
                         {
@@ -340,7 +318,7 @@
                     ]
                 },
                 {
-                    "key": "MoveCanvasPositionBy",
+                    "base": "MoveCanvasPositionBy",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Move Canvas Position By"
@@ -350,45 +328,41 @@
                         "tooltip": "Signaled after Move Canvas Position By is invoked"
                     },
                     "details": {
-                        "name": "Move Canvas Position By",
-                        "tooltip": "Moves the element in canvas space"
+                        "name": "Move Canvas Position By"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Offset",
-                                "tooltip": "The amount to move the canvas position"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPivotX",
+                    "base": "SetPivotX",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Pivot X"
+                        "tooltip": "When signaled, this will invoke Set PivotX"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Pivot X is invoked"
+                        "tooltip": "Signaled after Set PivotX is invoked"
                     },
                     "details": {
-                        "name": "Set Pivot X",
-                        "tooltip": "Sets the X value of the pivot point"
+                        "name": "Set PivotX"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "X Pivot",
-                                "tooltip": "The X value of the pivot point"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "MoveViewportPositionBy",
+                    "base": "MoveViewportPositionBy",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Move Viewport Position By"
@@ -398,45 +372,41 @@
                         "tooltip": "Signaled after Move Viewport Position By is invoked"
                     },
                     "details": {
-                        "name": "Move Viewport Position By",
-                        "tooltip": "Moves the element in viewport space"
+                        "name": "Move Viewport Position By"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Offset",
-                                "tooltip": "The amount to move the viewport position"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetPivotY",
+                    "base": "SetPivotY",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Pivot Y"
+                        "tooltip": "When signaled, this will invoke Set PivotY"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Pivot Y is invoked"
+                        "tooltip": "Signaled after Set PivotY is invoked"
                     },
                     "details": {
-                        "name": "Set Pivot Y",
-                        "tooltip": "Sets the Y value of the pivot point"
+                        "name": "Set PivotY"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Y Pivot",
-                                "tooltip": "The Y value of the pivot point"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetViewportPosition",
+                    "base": "GetViewportPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Viewport Position"
@@ -446,20 +416,19 @@
                         "tooltip": "Signaled after Get Viewport Position is invoked"
                     },
                     "details": {
-                        "name": "Get Viewport Position",
-                        "tooltip": "Gets the position of the element in viewport space"
+                        "name": "Get Viewport Position"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetScale",
+                    "base": "SetScale",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Scale"
@@ -469,21 +438,19 @@
                         "tooltip": "Signaled after Set Scale is invoked"
                     },
                     "details": {
-                        "name": "Set Scale",
-                        "tooltip": "Sets the scale"
+                        "name": "Set Scale"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Scale",
-                                "tooltip": "The scale"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetLocalPosition",
+                    "base": "SetLocalPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Local Position"
@@ -493,21 +460,19 @@
                         "tooltip": "Signaled after Set Local Position is invoked"
                     },
                     "details": {
-                        "name": "Set Local Position",
-                        "tooltip": "Sets the position of the element relative to the center of the element's anchors"
+                        "name": "Set Local Position"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Local Position",
-                                "tooltip": "The position of the element relative to the center of the element's anchors"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCanvasPosition",
+                    "base": "GetCanvasPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Canvas Position"
@@ -517,31 +482,29 @@
                         "tooltip": "Signaled after Get Canvas Position is invoked"
                     },
                     "details": {
-                        "name": "Get Canvas Position",
-                        "tooltip": "Gets the position of the element in canvas space"
+                        "name": "Get Canvas Position"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPivotX",
+                    "base": "GetPivotX",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Pivot X"
+                        "tooltip": "When signaled, this will invoke Get PivotX"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Pivot X is invoked"
+                        "tooltip": "Signaled after Get PivotX is invoked"
                     },
                     "details": {
-                        "name": "Get Pivot X",
-                        "tooltip": "Gets the X value of the pivot point"
+                        "name": "Get PivotX"
                     },
                     "results": [
                         {
@@ -553,18 +516,17 @@
                     ]
                 },
                 {
-                    "key": "GetZRotation",
+                    "base": "GetZRotation",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Z Rotation"
+                        "tooltip": "When signaled, this will invoke GetZ Rotation"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Z Rotation is invoked"
+                        "tooltip": "Signaled after GetZ Rotation is invoked"
                     },
                     "details": {
-                        "name": "Get Z Rotation",
-                        "tooltip": "Gets the rotation about the z-axis"
+                        "name": "GetZ Rotation"
                     },
                     "results": [
                         {
@@ -576,7 +538,7 @@
                     ]
                 },
                 {
-                    "key": "GetLocalPosition",
+                    "base": "GetLocalPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Local Position"
@@ -586,44 +548,41 @@
                         "tooltip": "Signaled after Get Local Position is invoked"
                     },
                     "details": {
-                        "name": "Get Local Position",
-                        "tooltip": "Gets the position of the element relative to the center of the element's anchors"
+                        "name": "Get Local Position"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetScaleY",
+                    "base": "SetScaleY",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Set Scale Y"
+                        "tooltip": "When signaled, this will invoke Set ScaleY"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Set Scale Y is invoked"
+                        "tooltip": "Signaled after Set ScaleY is invoked"
                     },
                     "details": {
-                        "name": "Set Scale Y",
-                        "tooltip": "Sets the Y value of the scale"
+                        "name": "Set ScaleY"
                     },
                     "params": [
                         {
                             "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
                             "details": {
-                                "name": "Y Scale",
-                                "tooltip": "The Y value of the scale"
+                                "name": "float"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetPivot",
+                    "base": "GetPivot",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Pivot"
@@ -633,20 +592,19 @@
                         "tooltip": "Signaled after Get Pivot is invoked"
                     },
                     "details": {
-                        "name": "Get Pivot",
-                        "tooltip": "Gets the pivot point"
+                        "name": "Get Pivot"
                     },
                     "results": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Vector2"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCanvasPosition",
+                    "base": "SetCanvasPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Set Canvas Position"
@@ -656,32 +614,29 @@
                         "tooltip": "Signaled after Set Canvas Position is invoked"
                     },
                     "details": {
-                        "name": "Set Canvas Position",
-                        "tooltip": "Sets the position of the element in canvas space"
+                        "name": "Set Canvas Position"
                     },
                     "params": [
                         {
                             "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
                             "details": {
-                                "name": "Position",
-                                "tooltip": "The position of the element in canvas space"
+                                "name": "Vector 2"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetLocalPositionY",
+                    "base": "GetLocalPositionY",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke Get Local Position Y"
+                        "tooltip": "When signaled, this will invoke Get Local PositionY"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after Get Local Position Y is invoked"
+                        "tooltip": "Signaled after Get Local PositionY is invoked"
                     },
                     "details": {
-                        "name": "Get Local Position Y",
-                        "tooltip": "Gets the Y position of the element relative to the center of the element's anchors"
+                        "name": "Get Local PositionY"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names
index 56ea2c0882..bd483d39de 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names
@@ -1,25 +1,26 @@
 {
     "entries": [
         {
-            "key": "ViewportRequestBus",
+            "base": "ViewportRequestBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "ViewportRequestBus"
+                "name": "Viewport",
+                "category": "Rendering"
             },
             "methods": [
                 {
-                    "key": "SetCameraTransform",
+                    "base": "SetCameraTransform",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCameraTransform"
+                        "tooltip": "When signaled, this will invoke Set Camera Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCameraTransform is invoked"
+                        "tooltip": "Signaled after Set Camera Transform is invoked"
                     },
                     "details": {
-                        "name": "SetCameraTransform"
+                        "name": "Set Camera Transform"
                     },
                     "params": [
                         {
@@ -31,105 +32,105 @@
                     ]
                 },
                 {
-                    "key": "GetCameraProjectionMatrix",
+                    "base": "GetCameraProjectionMatrix",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCameraProjectionMatrix"
+                        "tooltip": "When signaled, this will invoke Get Camera Projection Matrix"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCameraProjectionMatrix is invoked"
+                        "tooltip": "Signaled after Get Camera Projection Matrix is invoked"
                     },
                     "details": {
-                        "name": "GetCameraProjectionMatrix"
+                        "name": "Get Camera Projection Matrix"
                     },
                     "results": [
                         {
                             "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}",
                             "details": {
-                                "name": "Matrix4x4"
+                                "name": "Matrix 4x 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCameraViewMatrix",
+                    "base": "SetCameraViewMatrix",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCameraViewMatrix"
+                        "tooltip": "When signaled, this will invoke Set Camera View Matrix"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCameraViewMatrix is invoked"
+                        "tooltip": "Signaled after Set Camera View Matrix is invoked"
                     },
                     "details": {
-                        "name": "SetCameraViewMatrix"
+                        "name": "Set Camera View Matrix"
                     },
                     "params": [
                         {
                             "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}",
                             "details": {
-                                "name": "Matrix4x4"
+                                "name": "Matrix 4x 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCameraViewMatrix",
+                    "base": "GetCameraViewMatrix",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCameraViewMatrix"
+                        "tooltip": "When signaled, this will invoke Get Camera View Matrix"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCameraViewMatrix is invoked"
+                        "tooltip": "Signaled after Get Camera View Matrix is invoked"
                     },
                     "details": {
-                        "name": "GetCameraViewMatrix"
+                        "name": "Get Camera View Matrix"
                     },
                     "results": [
                         {
                             "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}",
                             "details": {
-                                "name": "Matrix4x4"
+                                "name": "Matrix 4x 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "SetCameraProjectionMatrix",
+                    "base": "SetCameraProjectionMatrix",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke SetCameraProjectionMatrix"
+                        "tooltip": "When signaled, this will invoke Set Camera Projection Matrix"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after SetCameraProjectionMatrix is invoked"
+                        "tooltip": "Signaled after Set Camera Projection Matrix is invoked"
                     },
                     "details": {
-                        "name": "SetCameraProjectionMatrix"
+                        "name": "Set Camera Projection Matrix"
                     },
                     "params": [
                         {
                             "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}",
                             "details": {
-                                "name": "Matrix4x4"
+                                "name": "Matrix 4x 4"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetCameraTransform",
+                    "base": "GetCameraTransform",
                     "entry": {
                         "name": "In",
-                        "tooltip": "When signaled, this will invoke GetCameraTransform"
+                        "tooltip": "When signaled, this will invoke Get Camera Transform"
                     },
                     "exit": {
                         "name": "Out",
-                        "tooltip": "Signaled after GetCameraTransform is invoked"
+                        "tooltip": "Signaled after Get Camera Transform is invoked"
                     },
                     "details": {
-                        "name": "GetCameraTransform"
+                        "name": "Get Camera Transform"
                     },
                     "results": [
                         {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names
index ed7d56a8bb..5913af7499 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names
@@ -1,16 +1,15 @@
 {
     "entries": [
         {
-            "key": "WindRequestsBus",
+            "base": "WindRequestsBus",
             "context": "EBusSender",
             "variant": "",
             "details": {
-                "name": "WindRequestsBus",
-                "category": "PhysX"
+                "name": "Wind"
             },
             "methods": [
                 {
-                    "key": "GetGlobalWind",
+                    "base": "GetGlobalWind",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Global Wind"
@@ -26,13 +25,13 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Global Wind Direction"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWindAtPosition",
+                    "base": "GetWindAtPosition",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Wind At Position"
@@ -56,13 +55,13 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Wind Direction"
                             }
                         }
                     ]
                 },
                 {
-                    "key": "GetWindInsideAabb",
+                    "base": "GetWindInsideAabb",
                     "entry": {
                         "name": "In",
                         "tooltip": "When signaled, this will invoke Get Wind Inside AABB"
@@ -86,7 +85,7 @@
                         {
                             "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
                             "details": {
-                                "name": "Vector3"
+                                "name": "Wind Direction"
                             }
                         }
                     ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names
index 6dc3d8f8d4..72b911f0cd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CreateBoxCastRequest",
+            "base": "CreateBoxCastRequest",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateBoxCastRequest",
+                    "base": "CreateBoxCastRequest",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names
index 35928f8446..984c7008ab 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CreateBoxOverlapRequest",
+            "base": "CreateBoxOverlapRequest",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateBoxOverlapRequest",
+                    "base": "CreateBoxOverlapRequest",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names
index ef8e84f3ea..8ae6f324e6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CreateCapsuleCastRequest",
+            "base": "CreateCapsuleCastRequest",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateCapsuleCastRequest",
+                    "base": "CreateCapsuleCastRequest",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names
index d78d1c9063..d9b5f8d555 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CreateCapsuleOverlapRequest",
+            "base": "CreateCapsuleOverlapRequest",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateCapsuleOverlapRequest",
+                    "base": "CreateCapsuleOverlapRequest",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names
index 884dbf070e..c8dbbf9509 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CreateSphereCastRequest",
+            "base": "CreateSphereCastRequest",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateSphereCastRequest",
+                    "base": "CreateSphereCastRequest",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names
index eaf91c144a..3656d75837 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "CreateSphereOverlapRequest",
+            "base": "CreateSphereOverlapRequest",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "CreateSphereOverlapRequest",
+                    "base": "CreateSphereOverlapRequest",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names
index d2b64d5071..ddaf1afb71 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "GetPhysicsSystem",
+            "base": "GetPhysicsSystem",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "GetPhysicsSystem",
+                    "base": "GetPhysicsSystem",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names
index 1301717ba3..c78a97bab8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SaveShaderVariantListSourceData",
+            "base": "SaveShaderVariantListSourceData",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "SaveShaderVariantListSourceData",
+                    "base": "SaveShaderVariantListSourceData",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names
index 373047e735..8d55c7c22c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "SettingsRegistry",
+            "base": "SettingsRegistry",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "SettingsRegistry",
+                    "base": "SettingsRegistry",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names
index d36c4cf37f..177cc5510a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "Terminate",
+            "base": "Terminate",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "Terminate",
+                    "base": "Terminate",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names
index bf4e5fcbe9..b6732eb7bf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "add_layer_node",
+            "base": "add_layer_node",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "add_layer_node",
+                    "base": "add_layer_node",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names
index 8f52238b58..0c7a598968 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "add_node",
+            "base": "add_node",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "add_node",
+                    "base": "add_node",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names
index 926e5adef6..fa67e69277 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "add_selected_entities",
+            "base": "add_selected_entities",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "add_selected_entities",
+                    "base": "add_selected_entities",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names
index c048cbf6fa..312eafd1d4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "add_track",
+            "base": "add_track",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "add_track",
+                    "base": "add_track",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names
index 398b3ec25a..8432caefe0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "attach_debugger",
+            "base": "attach_debugger",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "attach_debugger",
+                    "base": "attach_debugger",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names
index a09ec96fd9..ad2bbcd5f9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "bind_viewport",
+            "base": "bind_viewport",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "bind_viewport",
+                    "base": "bind_viewport",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names
index 8c8d8318c5..2105e431b1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "clear_selection",
+            "base": "clear_selection",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "clear_selection",
+                    "base": "clear_selection",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names
index 7fc51967b2..cc31fc5bce 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "close_pane",
+            "base": "close_pane",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "close_pane",
+                    "base": "close_pane",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names
index 7ce138a740..09d4a594f9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "combo_box",
+            "base": "combo_box",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "combo_box",
+                    "base": "combo_box",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names
index 9708005711..c45360fa27 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "crash",
+            "base": "crash",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "crash",
+                    "base": "crash",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names
index 4e75ca5197..f893c6e77d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "create_level",
+            "base": "create_level",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "create_level",
+                    "base": "create_level",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names
index 1935a970d1..82185c453f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "create_level_no_prompt",
+            "base": "create_level_no_prompt",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "create_level_no_prompt",
+                    "base": "create_level_no_prompt",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names
index 7c621e25e9..689a66a1c6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "delete_node",
+            "base": "delete_node",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "delete_node",
+                    "base": "delete_node",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names
index b134e71fec..13c8aae783 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "delete_object",
+            "base": "delete_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "delete_object",
+                    "base": "delete_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names
index 1da4b2cb26..bc09f6f0af 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "delete_selected",
+            "base": "delete_selected",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "delete_selected",
+                    "base": "delete_selected",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names
index bdc0052f2a..64ec10e0ac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "delete_sequence",
+            "base": "delete_sequence",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "delete_sequence",
+                    "base": "delete_sequence",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names
index 135c53ad30..ca1f49b29c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "delete_track",
+            "base": "delete_track",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "delete_track",
+                    "base": "delete_track",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names
index ae1d5befe5..cff6a5c812 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "draw_label",
+            "base": "draw_label",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "draw_label",
+                    "base": "draw_label",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names
index 5716162f4f..d7b1bf9d23 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "dump_exposed_classes",
+            "base": "dump_exposed_classes",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "dump_exposed_classes",
+                    "base": "dump_exposed_classes",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names
index 0a74f98f8d..59b1eea8db 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "edit_box",
+            "base": "edit_box",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "edit_box",
+                    "base": "edit_box",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names
index 52ff4b7b28..582787dc7b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "edit_box_check_data_type",
+            "base": "edit_box_check_data_type",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "edit_box_check_data_type",
+                    "base": "edit_box_check_data_type",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names
index 09e4f5c426..c32a111c5d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "enable_for_all",
+            "base": "enable_for_all",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "enable_for_all",
+                    "base": "enable_for_all",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names
index 52e02faa81..84e713519b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "enter_game_mode",
+            "base": "enter_game_mode",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "enter_game_mode",
+                    "base": "enter_game_mode",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names
index b5b97de500..67a399c5b2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "enter_simulation_mode",
+            "base": "enter_simulation_mode",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "enter_simulation_mode",
+                    "base": "enter_simulation_mode",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names
index 3558aa7cdb..7410e5a7b6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "execute_command",
+            "base": "execute_command",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "execute_command",
+                    "base": "execute_command",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names
index b494190ca9..335edab62c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "exit",
+            "base": "exit",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "exit",
+                    "base": "exit",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names
index 61ece2079d..e202395b15 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "exit_game_mode",
+            "base": "exit_game_mode",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "exit_game_mode",
+                    "base": "exit_game_mode",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names
index c869bb6d06..240fac0896 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "exit_no_prompt",
+            "base": "exit_no_prompt",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "exit_no_prompt",
+                    "base": "exit_no_prompt",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names
index e8b6419c7e..1fbf1ae15a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "exit_simulation_mode",
+            "base": "exit_simulation_mode",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "exit_simulation_mode",
+                    "base": "exit_simulation_mode",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names
index 8ada50e7a7..1201f008b6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "export_to_engine",
+            "base": "export_to_engine",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "export_to_engine",
+                    "base": "export_to_engine",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names
index c9ec658126..f4a6511cb0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "find_editor_entity",
+            "base": "find_editor_entity",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "find_editor_entity",
+                    "base": "find_editor_entity",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names
index bf1fe91241..49edae2728 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "find_game_entity",
+            "base": "find_game_entity",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "find_game_entity",
+                    "base": "find_game_entity",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names
index c413c4a4c1..86902f625d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "freeze_object",
+            "base": "freeze_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "freeze_object",
+                    "base": "freeze_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names
index 23d8096ac1..d8df792445 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_active_viewport",
+            "base": "get_active_viewport",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_active_viewport",
+                    "base": "get_active_viewport",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names
index b7686d1760..d39e48c0d9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_all_objects",
+            "base": "get_all_objects",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_all_objects",
+                    "base": "get_all_objects",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names
index d9073b1058..8b7e6c5217 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_axis_constraint",
+            "base": "get_axis_constraint",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_axis_constraint",
+                    "base": "get_axis_constraint",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names
index 4b0e8ac35b..c330306110 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_config_platform",
+            "base": "get_config_platform",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_config_platform",
+                    "base": "get_config_platform",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names
index 9dc53f4507..e20edd59c6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_config_spec",
+            "base": "get_config_spec",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_config_spec",
+                    "base": "get_config_spec",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names
index 365cba6b9e..8c8833b372 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_current_level_name",
+            "base": "get_current_level_name",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_current_level_name",
+                    "base": "get_current_level_name",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names
index 82b407a8fe..846b236e48 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_current_level_path",
+            "base": "get_current_level_path",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_current_level_path",
+                    "base": "get_current_level_path",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names
index a5e07d14d3..c5509b1cf9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_current_view_position",
+            "base": "get_current_view_position",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_current_view_position",
+                    "base": "get_current_view_position",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names
index 6be7bff047..f2de184318 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_current_view_rotation",
+            "base": "get_current_view_rotation",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_current_view_rotation",
+                    "base": "get_current_view_rotation",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names
index 22d8fa62b4..e3acfc818b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_cvar",
+            "base": "get_cvar",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_cvar",
+                    "base": "get_cvar",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names
index 9a1d048865..f52c2db932 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_file_alias",
+            "base": "get_file_alias",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_file_alias",
+                    "base": "get_file_alias",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names
index b2280925ff..67e6a1cebe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_game_folder",
+            "base": "get_game_folder",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_game_folder",
+                    "base": "get_game_folder",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names
index 3f5469407e..76229b6777 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_interpolated_value",
+            "base": "get_interpolated_value",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_interpolated_value",
+                    "base": "get_interpolated_value",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names
index 69a7dcd7a4..25ff2b7731 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_key_value",
+            "base": "get_key_value",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_key_value",
+                    "base": "get_key_value",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names
index 7759957362..613c0322cb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_misc_editor_settings",
+            "base": "get_misc_editor_settings",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_misc_editor_settings",
+                    "base": "get_misc_editor_settings",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names
index 6343079ee3..fd53f4eabb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_names_of_selected_objects",
+            "base": "get_names_of_selected_objects",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_names_of_selected_objects",
+                    "base": "get_names_of_selected_objects",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names
index abc8bc12b3..2ea9de8513 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_node_name",
+            "base": "get_node_name",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_node_name",
+                    "base": "get_node_name",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names
index fea8d6d51e..87a6db5f5a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_num_nodes",
+            "base": "get_num_nodes",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_num_nodes",
+                    "base": "get_num_nodes",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names
index cd260f6dc8..3761118834 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_num_selected",
+            "base": "get_num_selected",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_num_selected",
+                    "base": "get_num_selected",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names
index 7101578f9d..74ba982883 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_num_sequences",
+            "base": "get_num_sequences",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_num_sequences",
+                    "base": "get_num_sequences",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names
index 06963345ee..cbaf89bc8c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_num_track_keys",
+            "base": "get_num_track_keys",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_num_track_keys",
+                    "base": "get_num_track_keys",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names
index 828f298ed9..ec00c17b40 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_pak_from_file",
+            "base": "get_pak_from_file",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_pak_from_file",
+                    "base": "get_pak_from_file",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names
index d4d90062e7..52b66ebbb0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_pane_class_names",
+            "base": "get_pane_class_names",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_pane_class_names",
+                    "base": "get_pane_class_names",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names
index 9256be10cd..31de8b96dc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_position",
+            "base": "get_position",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_position",
+                    "base": "get_position",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names
index 9a0fc2c866..4d5c644b46 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_rotation",
+            "base": "get_rotation",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_rotation",
+                    "base": "get_rotation",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names
index bca8c0935a..c444d34332 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_scale",
+            "base": "get_scale",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_scale",
+                    "base": "get_scale",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names
index 8563f61cc9..e0835c4823 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_selection_aabb",
+            "base": "get_selection_aabb",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_selection_aabb",
+                    "base": "get_selection_aabb",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names
index 9bd01010e4..445ef2d2ac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_selection_center",
+            "base": "get_selection_center",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_selection_center",
+                    "base": "get_selection_center",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names
index 3dbe9bc854..83482c09d2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_sequence_name",
+            "base": "get_sequence_name",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_sequence_name",
+                    "base": "get_sequence_name",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names
index ae8a229a75..2231d6c807 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_sequence_time_range",
+            "base": "get_sequence_time_range",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_sequence_time_range",
+                    "base": "get_sequence_time_range",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names
index a149b94dd8..aa014dcab8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_view_pane_layout",
+            "base": "get_view_pane_layout",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_view_pane_layout",
+                    "base": "get_view_pane_layout",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names
index 7b616139ee..462816b556 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_viewport_count",
+            "base": "get_viewport_count",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_viewport_count",
+                    "base": "get_viewport_count",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names
index 23d2dae3d3..04ee539630 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_viewport_expansion_policy",
+            "base": "get_viewport_expansion_policy",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_viewport_expansion_policy",
+                    "base": "get_viewport_expansion_policy",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names
index 33cc93441d..254dce0763 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "get_viewport_size",
+            "base": "get_viewport_size",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "get_viewport_size",
+                    "base": "get_viewport_size",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names
index 8d5d77a78f..61bc6e2f23 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "hide_all_objects",
+            "base": "hide_all_objects",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "hide_all_objects",
+                    "base": "hide_all_objects",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names
index f30f0a4e37..4df0d7458b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "hide_object",
+            "base": "hide_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "hide_object",
+                    "base": "hide_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names
index 8ab9d80d37..751e63dad2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "idle_enable",
+            "base": "idle_enable",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "idle_enable",
+                    "base": "idle_enable",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names
index 35fccf8339..7a910121fb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "idle_is_enabled",
+            "base": "idle_is_enabled",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "idle_is_enabled",
+                    "base": "idle_is_enabled",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names
index 04574b306e..e90a794abb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "idle_wait",
+            "base": "idle_wait",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "idle_wait",
+                    "base": "idle_wait",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names
index bbbb2e2d6c..809ba3291a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "idle_wait_frames",
+            "base": "idle_wait_frames",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "idle_wait_frames",
+                    "base": "idle_wait_frames",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names
index 7945c6f747..bddddbf5f6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_helpers_shown",
+            "base": "is_helpers_shown",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_helpers_shown",
+                    "base": "is_helpers_shown",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names
index 82e2f26261..690c6a9e26 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_idle_enabled",
+            "base": "is_idle_enabled",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_idle_enabled",
+                    "base": "is_idle_enabled",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names
index c190c8f51a..62612ae3f0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_in_game_mode",
+            "base": "is_in_game_mode",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_in_game_mode",
+                    "base": "is_in_game_mode",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names
index 1cbf43acde..f4ae7b054a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_in_simulation_mode",
+            "base": "is_in_simulation_mode",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_in_simulation_mode",
+                    "base": "is_in_simulation_mode",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names
index 7f8463fe2e..77c9aa1f3b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_object_frozen",
+            "base": "is_object_frozen",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_object_frozen",
+                    "base": "is_object_frozen",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names
index 05439afc23..46d6757c9f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_object_hidden",
+            "base": "is_object_hidden",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_object_hidden",
+                    "base": "is_object_hidden",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names
index 1c5ccdbbb9..1912f6cd4a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "is_pane_visible",
+            "base": "is_pane_visible",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "is_pane_visible",
+                    "base": "is_pane_visible",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names
index 6441e1bcbf..faf537d82c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "launch_lua_editor",
+            "base": "launch_lua_editor",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "launch_lua_editor",
+                    "base": "launch_lua_editor",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names
index 7dd292c231..ea52f9730f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "load_all_plugins",
+            "base": "load_all_plugins",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "load_all_plugins",
+                    "base": "load_all_plugins",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names
index 45ac6166f3..77d1490486 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "log",
+            "base": "log",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "log",
+                    "base": "log",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names
index 934130445b..173dab3495 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "message_box",
+            "base": "message_box",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "message_box",
+                    "base": "message_box",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names
index 41baa649e6..d743366a40 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "message_box_ok",
+            "base": "message_box_ok",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "message_box_ok",
+                    "base": "message_box_ok",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names
index ddbdb555ce..4025735021 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "message_box_yes_no",
+            "base": "message_box_yes_no",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "message_box_yes_no",
+                    "base": "message_box_yes_no",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names
index 2a3f847e54..39736db34c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "new_sequence",
+            "base": "new_sequence",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "new_sequence",
+                    "base": "new_sequence",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names
index 5f4f3c1149..859d6ddeae 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "open_file_box",
+            "base": "open_file_box",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "open_file_box",
+                    "base": "open_file_box",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names
index 61e4630f84..2f3d6933bd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "open_level",
+            "base": "open_level",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "open_level",
+                    "base": "open_level",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names
index 10cbd7b1b9..51662f268d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "open_level_no_prompt",
+            "base": "open_level_no_prompt",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "open_level_no_prompt",
+                    "base": "open_level_no_prompt",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names
index 9f830cbee5..d438c7759f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "open_pane",
+            "base": "open_pane",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "open_pane",
+                    "base": "open_pane",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names
index 4d12503a1e..df1c6cb348 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "play_sequence",
+            "base": "play_sequence",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "play_sequence",
+                    "base": "play_sequence",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names
index 463692b784..0a16085a12 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "redo",
+            "base": "redo",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "redo",
+                    "base": "redo",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names
index f031946ef4..9d327766d3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "reload_current_level",
+            "base": "reload_current_level",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "reload_current_level",
+                    "base": "reload_current_level",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names
index 8ad522a4bb..4cd5fdb146 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "rename_object",
+            "base": "rename_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "rename_object",
+                    "base": "rename_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names
index 799a539c9b..586f480591 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "resize_viewport",
+            "base": "resize_viewport",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "resize_viewport",
+                    "base": "resize_viewport",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names
index be7fec1827..0454fdc37a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "run_console",
+            "base": "run_console",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "run_console",
+                    "base": "run_console",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names
index a3afd9cbe6..4724515921 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "run_file",
+            "base": "run_file",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "run_file",
+                    "base": "run_file",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names
index 97ddd6da4d..6417544230 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "run_file_parameters",
+            "base": "run_file_parameters",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "run_file_parameters",
+                    "base": "run_file_parameters",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names
index 4d857d6b8c..f96f70092a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "save_level",
+            "base": "save_level",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "save_level",
+                    "base": "save_level",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names
index 49d369b69d..c317cc8741 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "select_object",
+            "base": "select_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "select_object",
+                    "base": "select_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names
index f2ba054656..30582c5674 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "select_objects",
+            "base": "select_objects",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "select_objects",
+                    "base": "select_objects",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names
index 6e39f72c7a..dec588e357 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_active_viewport",
+            "base": "set_active_viewport",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_active_viewport",
+                    "base": "set_active_viewport",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names
index 976102bf40..df895c8aec 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_axis_constraint",
+            "base": "set_axis_constraint",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_axis_constraint",
+                    "base": "set_axis_constraint",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names
index 3b6db1b770..61f95d9a04 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_config_spec",
+            "base": "set_config_spec",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_config_spec",
+                    "base": "set_config_spec",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names
index 39d766270b..aa878daf01 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_current_sequence",
+            "base": "set_current_sequence",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_current_sequence",
+                    "base": "set_current_sequence",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names
index d3d6c11b6d..7639083302 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_current_view_position",
+            "base": "set_current_view_position",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_current_view_position",
+                    "base": "set_current_view_position",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names
index 528a8c067d..afffc8bc0f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_current_view_rotation",
+            "base": "set_current_view_rotation",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_current_view_rotation",
+                    "base": "set_current_view_rotation",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names
index 1bf5764d4d..181d11bef8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_cvar",
+            "base": "set_cvar",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_cvar",
+                    "base": "set_cvar",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names
index cc310cc8a9..c788a79edc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_cvar_float",
+            "base": "set_cvar_float",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_cvar_float",
+                    "base": "set_cvar_float",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names
index 032fe7cc99..f5ec182a8a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_cvar_integer",
+            "base": "set_cvar_integer",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_cvar_integer",
+                    "base": "set_cvar_integer",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names
index a5f7742511..f096f5528f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_cvar_string",
+            "base": "set_cvar_string",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_cvar_string",
+                    "base": "set_cvar_string",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names
index 3c1367794d..00adf7c80f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_misc_editor_settings",
+            "base": "set_misc_editor_settings",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_misc_editor_settings",
+                    "base": "set_misc_editor_settings",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names
index f37822b1df..fc9d588b4d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_position",
+            "base": "set_position",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_position",
+                    "base": "set_position",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names
index 602dab9b4e..80c0825e98 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_recording",
+            "base": "set_recording",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_recording",
+                    "base": "set_recording",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names
index 27678d2797..5ee0d43f1f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_result_to_failure",
+            "base": "set_result_to_failure",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_result_to_failure",
+                    "base": "set_result_to_failure",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names
index 8cd35d8c2c..1abb4b73f1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_result_to_success",
+            "base": "set_result_to_success",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_result_to_success",
+                    "base": "set_result_to_success",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names
index 796a6d4c20..c4024f2fc3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_rotation",
+            "base": "set_rotation",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_rotation",
+                    "base": "set_rotation",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names
index edbb104612..9f2072047c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_scale",
+            "base": "set_scale",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_scale",
+                    "base": "set_scale",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names
index aa0d3839c6..5d48f6e909 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_sequence_time_range",
+            "base": "set_sequence_time_range",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_sequence_time_range",
+                    "base": "set_sequence_time_range",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names
index 85ad69a1d7..7cec862361 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_time",
+            "base": "set_time",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_time",
+                    "base": "set_time",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names
index 622b51ca4b..bedaf68083 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_view_pane_layout",
+            "base": "set_view_pane_layout",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_view_pane_layout",
+                    "base": "set_view_pane_layout",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names
index 7e4ac4e305..cbcfd8722b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_viewport_expansion_policy",
+            "base": "set_viewport_expansion_policy",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_viewport_expansion_policy",
+                    "base": "set_viewport_expansion_policy",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names
index e5bc133444..473499e785 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "set_viewport_size",
+            "base": "set_viewport_size",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "set_viewport_size",
+                    "base": "set_viewport_size",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names
index df5e6182a2..284efd4cb1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "start_process_detached",
+            "base": "start_process_detached",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "start_process_detached",
+                    "base": "start_process_detached",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names
index 63f38ab444..8bd02f3962 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "stop_sequence",
+            "base": "stop_sequence",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "stop_sequence",
+                    "base": "stop_sequence",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names
index acd55d4b22..472f548239 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "test_output",
+            "base": "test_output",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "test_output",
+                    "base": "test_output",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names
index 0afcc9d471..f3d5f14365 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "toggle_helpers",
+            "base": "toggle_helpers",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "toggle_helpers",
+                    "base": "toggle_helpers",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names
index 3fb0afdbf4..9b222815c6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "undo",
+            "base": "undo",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "undo",
+                    "base": "undo",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names
index ad29537ab6..5b1d3c5d5c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "unfreeze_object",
+            "base": "unfreeze_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "unfreeze_object",
+                    "base": "unfreeze_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names
index 204e2a3fbc..c2526a981a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "unhide_all_objects",
+            "base": "unhide_all_objects",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "unhide_all_objects",
+                    "base": "unhide_all_objects",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names
index 22a74940a8..d15ceed4bb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "unhide_object",
+            "base": "unhide_object",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "unhide_object",
+                    "base": "unhide_object",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names
index f0052c8c3d..19b8dba917 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "unselect_objects",
+            "base": "unselect_objects",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "unselect_objects",
+                    "base": "unselect_objects",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names
index da63239c14..d31ccb6f5a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "update_viewport",
+            "base": "update_viewport",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "update_viewport",
+                    "base": "update_viewport",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names
index 1000a983b8..a8d361cd31 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "wait_for_debugger",
+            "base": "wait_for_debugger",
             "context": "Method",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "methods": [
                 {
-                    "key": "wait_for_debugger",
+                    "base": "wait_for_debugger",
                     "context": "Global",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names
index 1b93f04513..678897118c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names
@@ -1,7 +1,7 @@
 {
     "entries" : [
         {
-            "key": "EBusSenderBusId",
+            "base": "EBusSenderBusId",
             "context": "Globals",
             "details": {
                 "name": "Source",
@@ -9,7 +9,7 @@
             }
         },
         {
-            "key": "EBusHandlerBusId",
+            "base": "EBusHandlerBusId",
             "context": "Globals",
             "details": 
             {
@@ -18,7 +18,7 @@
             }
         },
         {
-            "key": "MissingFunction",
+            "base": "MissingFunction",
             "context": "Globals",
             "details": 
             {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names
index 0d072e6ea8..30d402f254 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{11DDEEC1-7111-4655-B47F-8F0372B1A1A9}",
+            "base": "{11DDEEC1-7111-4655-B47F-8F0372B1A1A9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,26 +12,26 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Container",
+                    "base": "DataOutput_Container",
                     "details": {
                         "name": "Container"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names
index b47f53879c..4e071c5e32 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{26DDC284-BD01-471E-BA8F-36C3A1ADA169}",
+            "base": "{26DDC284-BD01-471E-BA8F-36C3A1ADA169}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,25 +12,25 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Container",
+                    "base": "DataOutput_Container",
                     "details": {
                         "name": "Container"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names
index e383061fa8..601836b23d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{F1A891C9-81D4-4675-A57A-F11AB415F95F}",
+            "base": "{F1A891C9-81D4-4675-A57A-F11AB415F95F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,33 +12,33 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Container",
+                    "base": "DataOutput_Container",
                     "details": {
                         "name": "Container"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
                     }
                 },
                 {
-                    "key": "Output_Element Not Found",
+                    "base": "Output_Element Not Found",
                     "details": {
                         "name": "Element Not Found",
                         "tooltip": "Triggered if the specified element was not found"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names
index 5890324a1a..817bbf8e17 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names
@@ -1,45 +1,44 @@
 {
     "entries": [
         {
-            "key": "{31823035-A3FF-4B8D-A3A6-819519478B7C}",
+            "base": "{31823035-A3FF-4B8D-A3A6-819519478B7C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "For Each",
                 "category": "Containers",
-                "tooltip": "Node for iterating through a container",
-                "subtitle": "Containers"
+                "tooltip": "Node for iterating through a container"
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signaled upon node entry"
                     }
                 },
                 {
-                    "key": "Input_Break",
+                    "base": "Input_Break",
                     "details": {
                         "name": "Break",
                         "tooltip": "Stops the iteration when signaled"
                     }
                 },
                 {
-                    "key": "Output_Each",
+                    "base": "Output_Each",
                     "details": {
                         "name": "Each",
                         "tooltip": "Signalled after each element of the container"
                     }
                 },
                 {
-                    "key": "Output_Finished",
+                    "base": "Output_Finished",
                     "details": {
                         "name": "Finished",
                         "tooltip": "The container has been fully iterated over"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names
index 78e2fa80bb..fab464a029 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{6A4FE29F-3BAA-40D6-8BEE-CDE9CCBD7885}",
+            "base": "{6A4FE29F-3BAA-40D6-8BEE-CDE9CCBD7885}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,27 +12,27 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
                     }
                 },
                 {
-                    "key": "Output_Key Not Found",
+                    "base": "Output_Key Not Found",
                     "details": {
                         "name": "Key Not Found",
                         "tooltip": "Triggered if the specified key was not found"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names
index 0caeac4589..fa616642b4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B0E10176-5DFE-4D34-BEF8-7EB575929CE7}",
+            "base": "{B0E10176-5DFE-4D34-BEF8-7EB575929CE7}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,20 +12,20 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names
index cf9a85190a..2c13a87d7b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B7E79DC5-21DA-4001-8284-85707C71C29B}",
+            "base": "{B7E79DC5-21DA-4001-8284-85707C71C29B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,20 +12,20 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names
index 2f79842f7b..1f7dbdad03 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{981EA18E-F421-4B39-9FF7-27322F3E8B14}",
+            "base": "{981EA18E-F421-4B39-9FF7-27322F3E8B14}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,25 +12,25 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Size",
+                    "base": "DataOutput_Size",
                     "details": {
                         "name": "Size"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names
index 1aaf93f172..347510eeeb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{122B30C9-30A6-4CAF-B4E3-327A6C1A1E38}",
+            "base": "{122B30C9-30A6-4CAF-B4E3-327A6C1A1E38}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,26 +12,26 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Container",
+                    "base": "DataOutput_Container",
                     "details": {
                         "name": "Container"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names
index 80ea4073b0..a3254521e2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{670FCD62-BAA8-4812-9CF2-C3F2EC5F54F5}",
+            "base": "{670FCD62-BAA8-4812-9CF2-C3F2EC5F54F5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,39 +12,39 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Is Empty",
+                    "base": "DataOutput_Is Empty",
                     "details": {
                         "name": "Is Empty"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "The container is empty"
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "The container is not empty"
                     }
                 },
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names
index fad144c78d..af1e8efe7a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{38B808C5-152C-4643-A08C-463EBED55E19}",
+            "base": "{38B808C5-152C-4643-A08C-463EBED55E19}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,35 +11,35 @@
             },
             "slots": [
                 {
-                    "key": "Input_Connect",
+                    "base": "Input_Connect",
                     "details": {
                         "name": "Connect",
                         "tooltip": "Connect the AZ Event to this AZ Event Handler."
                     }
                 },
                 {
-                    "key": "Input_Disconnect",
+                    "base": "Input_Disconnect",
                     "details": {
                         "name": "Disconnect",
                         "tooltip": "Disconnect current AZ Event from this AZ Event Handler."
                     }
                 },
                 {
-                    "key": "Output_On Connected",
+                    "base": "Output_On Connected",
                     "details": {
                         "name": "On Connected",
                         "tooltip": "Signaled when a connection has taken place."
                     }
                 },
                 {
-                    "key": "Output_On Disconnected",
+                    "base": "Output_On Disconnected",
                     "details": {
                         "name": "On Disconnected",
                         "tooltip": "Signaled when this event handler is disconnected."
                     }
                 },
                 {
-                    "key": "Output_OnEvent",
+                    "base": "Output_OnEvent",
                     "details": {
                         "name": "OnEvent",
                         "tooltip": "Triggered when the AZ Event invokes Signal() function."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names
index f48256fc26..1a09bb23d9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{33E12915-EFCA-4AA7-A188-D694DAD58980}",
+            "base": "{33E12915-EFCA-4AA7-A188-D694DAD58980}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,35 +11,35 @@
             },
             "slots": [
                 {
-                    "key": "Input_Connect",
+                    "base": "Input_Connect",
                     "details": {
                         "name": "Connect",
                         "tooltip": "Connect this event handler to the specified entity."
                     }
                 },
                 {
-                    "key": "Input_Disconnect",
+                    "base": "Input_Disconnect",
                     "details": {
                         "name": "Disconnect",
                         "tooltip": "Disconnect this event handler."
                     }
                 },
                 {
-                    "key": "Output_OnConnected",
+                    "base": "Output_OnConnected",
                     "details": {
                         "name": "OnConnected",
                         "tooltip": "Signaled when a connection has taken place."
                     }
                 },
                 {
-                    "key": "Output_OnDisconnected",
+                    "base": "Output_OnDisconnected",
                     "details": {
                         "name": "OnDisconnected",
                         "tooltip": "Signaled when this event handler is disconnected."
                     }
                 },
                 {
-                    "key": "Output_OnFailure",
+                    "base": "Output_OnFailure",
                     "details": {
                         "name": "OnFailure",
                         "tooltip": "Signaled when it is not possible to connect this handler."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names
index ee37919f03..6d7518a9f2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}",
+            "base": "{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names
index 6a92f74240..da666253e6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{4EE28D9F-67FB-4E61-B777-5DC5B059710F}",
+            "base": "{4EE28D9F-67FB-4E61-B777-5DC5B059710F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,13 +12,13 @@
             },
             "slots": [
                 {
-                    "key": "Input_ ",
+                    "base": "Input_ ",
                     "details": {
                         "name": " "
                     }
                 },
                 {
-                    "key": "Output_ ",
+                    "base": "Output_ ",
                     "details": {
                         "name": " "
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names
index bcf7aa9fc1..a3caeb6440 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}",
+            "base": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names
index 75b1a6e9ff..8c778bf0b6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}",
+            "base": "{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names
index 1de4824300..58dd499c58 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}",
+            "base": "{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names
index a8bb3559df..ee0a92ccae 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{76CF9938-4A7E-4CDA-8DF3-77C10239D99C}",
+            "base": "{76CF9938-4A7E-4CDA-8DF3-77C10239D99C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,35 +11,35 @@
             },
             "slots": [
                 {
-                    "key": "Input_Connect",
+                    "base": "Input_Connect",
                     "details": {
                         "name": "Connect",
                         "tooltip": "Connect this event handler to the specified entity."
                     }
                 },
                 {
-                    "key": "Input_Disconnect",
+                    "base": "Input_Disconnect",
                     "details": {
                         "name": "Disconnect",
                         "tooltip": "Disconnect this event handler."
                     }
                 },
                 {
-                    "key": "Output_OnConnected",
+                    "base": "Output_OnConnected",
                     "details": {
                         "name": "OnConnected",
                         "tooltip": "Signaled when a connection has taken place."
                     }
                 },
                 {
-                    "key": "Output_OnDisconnected",
+                    "base": "Output_OnDisconnected",
                     "details": {
                         "name": "OnDisconnected",
                         "tooltip": "Signaled when this event handler is disconnected."
                     }
                 },
                 {
-                    "key": "Output_OnFailure",
+                    "base": "Output_OnFailure",
                     "details": {
                         "name": "OnFailure",
                         "tooltip": "Signaled when it is not possible to connect this handler."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names
index 6d1949f5de..d5faa52c52 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{64A97CC3-2BEA-4B47-809B-6C7DA34FD00F}",
+            "base": "{64A97CC3-2BEA-4B47-809B-6C7DA34FD00F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,14 +11,14 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Fires the specified ScriptEvent when signaled"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Trigged after the ScriptEvent has been signaled and returns"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names
index f3535c9627..e78805904d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{2AFC1F99-6216-58E1-9E06-7F0E50C64E53}",
+            "base": "{2AFC1F99-6216-58E1-9E06-7F0E50C64E53}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: A",
+                    "base": "DataInput_Matrix3x3: A",
                     "details": {
                         "name": "Matrix3x3: A"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: B",
+                    "base": "DataInput_Matrix3x3: B",
                     "details": {
                         "name": "Matrix3x3: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result: Matrix3x3",
                     "details": {
                         "name": "Result: Matrix3x3"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names
index 2ed99278ea..32e7e9b9ca 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{397FA4E6-72E7-51EB-A546-70415FCCE4B0}",
+            "base": "{397FA4E6-72E7-51EB-A546-70415FCCE4B0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Matrix3x3: Source",
                     "details": {
                         "name": "Matrix3x3: Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Divisor",
+                    "base": "DataInput_Number: Divisor",
                     "details": {
                         "name": "Number: Divisor"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result: Matrix3x3",
                     "details": {
                         "name": "Result: Matrix3x3"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names
index 047ddaf2cd..d0fbd8fefb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{57BA2085-2225-5E7E-B132-9CCD0AFC55EA}",
+            "base": "{57BA2085-2225-5E7E-B132-9CCD0AFC55EA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Numerator",
+                    "base": "DataInput_Vector3: Numerator",
                     "details": {
                         "name": "Vector3: Numerator"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Divisor",
+                    "base": "DataInput_Vector3: Divisor",
                     "details": {
                         "name": "Vector3: Divisor"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result: Vector3",
                     "details": {
                         "name": "Result: Vector3"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names
index c1bd57ec2d..1f534b7480 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{F269F2DB-F2D8-515D-BA5C-4C9E28A725E3}",
+            "base": "{F269F2DB-F2D8-515D-BA5C-4C9E28A725E3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,25 +12,25 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Quaternion: Source",
                     "details": {
                         "name": "Quaternion: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
                         "name": "Result: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names
index 3b78e5ec29..b5330e253a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8EE5053F-63BF-5E73-A88F-BD09C09DA9DB}",
+            "base": "{8EE5053F-63BF-5E73-A88F-BD09C09DA9DB}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: A",
+                    "base": "DataInput_Color: A",
                     "details": {
                         "name": "Color: A"
                     }
                 },
                 {
-                    "key": "DataInput_Color: B",
+                    "base": "DataInput_Color: B",
                     "details": {
                         "name": "Color: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result: Color",
                     "details": {
                         "name": "Result: Color"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names
index 5e5ebdf865..934d7deea7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{FDB0FF00-F185-5CCF-851A-BBD5116C43EC}",
+            "base": "{FDB0FF00-F185-5CCF-851A-BBD5116C43EC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: A",
+                    "base": "DataInput_Matrix3x3: A",
                     "details": {
                         "name": "Matrix3x3: A"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: B",
+                    "base": "DataInput_Matrix3x3: B",
                     "details": {
                         "name": "Matrix3x3: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result: Matrix3x3",
                     "details": {
                         "name": "Result: Matrix3x3"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names
index 0dd6bdd33e..fa8a381927 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{F2A25BFC-41AA-5F9F-ABDF-48B662349AD6}",
+            "base": "{F2A25BFC-41AA-5F9F-ABDF-48B662349AD6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: A",
+                    "base": "DataInput_Quaternion: A",
                     "details": {
                         "name": "Quaternion: A"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: B",
+                    "base": "DataInput_Quaternion: B",
                     "details": {
                         "name": "Quaternion: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result: Quaternion",
                     "details": {
                         "name": "Result: Quaternion"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names
index 9f62840b3e..946f79aa5e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{65B35991-D740-5DE6-815D-4FF5A24F08FD}",
+            "base": "{65B35991-D740-5DE6-815D-4FF5A24F08FD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: A",
+                    "base": "DataInput_Transform: A",
                     "details": {
                         "name": "Transform: A"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: B",
+                    "base": "DataInput_Transform: B",
                     "details": {
                         "name": "Transform: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result: Transform",
                     "details": {
                         "name": "Result: Transform"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names
index 9f9a08d3e4..70747caf68 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{111CD1EE-A5E8-583B-B339-FD48AFE7341C}",
+            "base": "{111CD1EE-A5E8-583B-B339-FD48AFE7341C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Vector4: Source",
                     "details": {
                         "name": "Vector4: Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Multiplier",
+                    "base": "DataInput_Vector4: Multiplier",
                     "details": {
                         "name": "Vector4: Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result: Vector4",
                     "details": {
                         "name": "Result: Vector4"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names
index c2fa0e5b4e..4f209d49d4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E2BE3BC4-5C86-5425-981D-E6A5EECC2C0C}",
+            "base": "{E2BE3BC4-5C86-5425-981D-E6A5EECC2C0C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,25 +12,25 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Source",
+                    "base": "DataInput_Color: Source",
                     "details": {
                         "name": "Color: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result: Color",
                     "details": {
                         "name": "Result: Color"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names
index 324007d226..ddd6536be0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{C94009EE-73ED-5CA2-B1AC-026EB08D1EF5}",
+            "base": "{C94009EE-73ED-5CA2-B1AC-026EB08D1EF5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_Vector3: A",
                     "details": {
                         "name": "Vector3: A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_Vector3: B",
                     "details": {
                         "name": "Vector3: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result: Vector3",
                     "details": {
                         "name": "Result: Vector3"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names
index 4e33483463..28d26f5b30 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{91B3D89A-4A4B-49FF-AD91-CAAC49E141A8}",
+            "base": "{91B3D89A-4A4B-49FF-AD91-CAAC49E141A8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names
index 156e80f7a8..de6117ff88 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{14C6CE68-906A-4D2F-89BA-153774CE8015}",
+            "base": "{14C6CE68-906A-4D2F-89BA-153774CE8015}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names
index 7830b046f7..582552020f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{1657EA13-3DAF-5E38-8964-D4480017C601}",
+            "base": "{1657EA13-3DAF-5E38-8964-D4480017C601}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetEntityForward",
+                "name": "Get Entity Forward",
                 "category": "Entity/Entity",
-                "tooltip": "returns the forward direction vector from the specified entity' world transform, scaled by a given value (O3DE uses Z up, right handed)",
-                "subtitle": "Entity"
+                "tooltip": "Returns the forward direction vector from the specified entity' world transform, scaled by a given value (O3DE uses Z up, right handed)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_EntityID: EntityId",
+                    "base": "DataInput_EntityId",
                     "details": {
-                        "name": "EntityID: EntityId"
+                        "name": "EntityId"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names
index 9e990f6214..1d8a2958e5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{6DE350DE-4FB9-5D7C-816A-48A3371613F3}",
+            "base": "{6DE350DE-4FB9-5D7C-816A-48A3371613F3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetEntityRight",
+                "name": "Get Entity Right",
                 "category": "Entity/Entity",
-                "tooltip": "returns the right direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)",
-                "subtitle": "Entity"
+                "tooltip": "Returns the right direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_EntityID: EntityId",
+                    "base": "DataInput_EntityId",
                     "details": {
-                        "name": "EntityID: EntityId"
+                        "name": "EntityId"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names
index b9e6261532..55e4e5c419 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{B091D01E-170D-5FCC-9525-89CED4CDAB27}",
+            "base": "{B091D01E-170D-5FCC-9525-89CED4CDAB27}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetEntityUp",
+                "name": "Get Entity Up",
                 "category": "Entity/Entity",
-                "tooltip": "returns the up direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)",
-                "subtitle": "Entity"
+                "tooltip": "Returns the up direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_EntityID: EntityId",
+                    "base": "DataInput_EntityId",
                     "details": {
-                        "name": "EntityID: EntityId"
+                        "name": "EntityId"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names
index 4ae41d7b6d..5969f5e851 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{E15BFD9C-5DD0-5BA9-8573-E3D38CC9ACD0}",
+            "base": "{E15BFD9C-5DD0-5BA9-8573-E3D38CC9ACD0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsActive",
+                "name": "Is Active",
                 "category": "Entity/Entity",
-                "tooltip": "returns true if entity with the provided Id is valid and active.",
-                "subtitle": "Entity"
+                "tooltip": "Returns true if entity with the provided Id is valid and active."
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_EntityID: Entity Id",
+                    "base": "DataInput_Entity Id",
                     "details": {
-                        "name": "EntityID: Entity Id"
+                        "name": "Entity Id"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names
index 67ca271f59..5f8783a4d6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{54817D10-8D9E-5801-A507-8A2CE16F94E4}",
+            "base": "{54817D10-8D9E-5801-A507-8A2CE16F94E4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsValid",
+                "name": "Is Valid",
                 "category": "Entity/Entity",
-                "tooltip": "returns true if Source is valid, else false",
-                "subtitle": "Entity"
+                "tooltip": "Returns true if Source is valid, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_EntityID: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "EntityID: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names
index f8048d0839..1c2d36859d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{BFC3DC19-979B-5277-8B42-00FCF0CCF52D}",
+            "base": "{BFC3DC19-979B-5277-8B42-00FCF0CCF52D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToString",
+                "name": "To String",
                 "category": "Entity/Entity",
-                "tooltip": "returns a string representation of Source",
-                "subtitle": "Entity"
+                "tooltip": "Returns a string representation of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_EntityID: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "EntityID: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: String",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: String"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names
index 3d8d866497..e11a54b639 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names
@@ -1,57 +1,57 @@
 {
     "entries": [
         {
-            "key": "{0A2EB488-5A6A-E166-BB62-23FF81499E33}",
+            "base": "{0A2EB488-5A6A-E166-BB62-23FF81499E33}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "InputHandler",
-                "category": "Input",
+                "name": "Input Handler",
+                "category": "Input/Input System",
                 "tooltip": "Handle processed input events found in input binding assets"
             },
             "slots": [
                 {
-                    "key": "Input_Connect Event",
+                    "base": "Input_Connect Event",
                     "details": {
                         "name": "Connect Event",
                         "tooltip": "Connect to input event name as defined in an input binding asset."
                     }
                 },
                 {
-                    "key": "DataInput_Event Name",
+                    "base": "DataInput_Event Name",
                     "details": {
                         "name": "Event Name"
                     }
                 },
                 {
-                    "key": "Output_On Connect Event",
+                    "base": "Output_On Connect Event",
                     "details": {
                         "name": "On Connect Event",
                         "tooltip": "Connect to input event name as defined in an input binding asset."
                     }
                 },
                 {
-                    "key": "Output_Pressed",
+                    "base": "Output_Pressed",
                     "details": {
                         "name": "Pressed",
                         "tooltip": "Signaled when the input event begins."
                     }
                 },
                 {
-                    "key": "DataOutput_value",
+                    "base": "DataOutput_value",
                     "details": {
                         "name": "value"
                     }
                 },
                 {
-                    "key": "Output_Held",
+                    "base": "Output_Held",
                     "details": {
                         "name": "Held",
                         "tooltip": "Signaled while the input event is active."
                     }
                 },
                 {
-                    "key": "Output_Released",
+                    "base": "Output_Released",
                     "details": {
                         "name": "Released",
                         "tooltip": "Signaled when the input event ends."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names
index 3d681d3e39..2d9711106c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{797C800D-8C96-4675-B5B5-2A321AC09433}",
+            "base": "{797C800D-8C96-4675-B5B5-2A321AC09433}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,7 +12,7 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names
index 82e6bc7617..d475d33102 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B6614CEC-4788-476C-A19A-BA0A8B490C73}",
+            "base": "{B6614CEC-4788-476C-A19A-BA0A8B490C73}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names
index be94cea028..12ad68d7e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{0B1577E0-339D-4573-93D1-6C311AD12A13}",
+            "base": "{0B1577E0-339D-4573-93D1-6C311AD12A13}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,20 +12,20 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names
index 82d430365d..21b990bd6e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{61E2CDC6-5CFA-47A2-8936-6A4332511E28}",
+            "base": "{61E2CDC6-5CFA-47A2-8936-6A4332511E28}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,63 +12,63 @@
             },
             "slots": [
                 {
-                    "key": "Input_In0",
+                    "base": "Input_In0",
                     "details": {
                         "name": "In0",
                         "tooltip": "Input 0"
                     }
                 },
                 {
-                    "key": "Input_In1",
+                    "base": "Input_In1",
                     "details": {
                         "name": "In1",
                         "tooltip": "Input 1"
                     }
                 },
                 {
-                    "key": "Input_In2",
+                    "base": "Input_In2",
                     "details": {
                         "name": "In2",
                         "tooltip": "Input 2"
                     }
                 },
                 {
-                    "key": "Input_In3",
+                    "base": "Input_In3",
                     "details": {
                         "name": "In3",
                         "tooltip": "Input 3"
                     }
                 },
                 {
-                    "key": "Input_In4",
+                    "base": "Input_In4",
                     "details": {
                         "name": "In4",
                         "tooltip": "Input 4"
                     }
                 },
                 {
-                    "key": "Input_In5",
+                    "base": "Input_In5",
                     "details": {
                         "name": "In5",
                         "tooltip": "Input 5"
                     }
                 },
                 {
-                    "key": "Input_In6",
+                    "base": "Input_In6",
                     "details": {
                         "name": "In6",
                         "tooltip": "Input 6"
                     }
                 },
                 {
-                    "key": "Input_In7",
+                    "base": "Input_In7",
                     "details": {
                         "name": "In7",
                         "tooltip": "Input 7"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled when the node is triggered."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names
index 24c7fefe80..a98ca0b451 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{4043C9B7-4ACC-42FE-9C46-EAD7BB718C99}",
+            "base": "{4043C9B7-4ACC-42FE-9C46-EAD7BB718C99}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names
index 4d57734566..d323290c96 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{6359C34F-3C34-4784-9FFD-18F1C8E3482D}",
+            "base": "{6359C34F-3C34-4784-9FFD-18F1C8E3482D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,13 +11,13 @@
             },
             "slots": [
                 {
-                    "key": "Input_Input 0",
+                    "base": "Input_Input 0",
                     "details": {
                         "name": "Input 0"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled when the node receives a signal from the selected index"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names
index 0f07c55f1b..9763a75d7c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{931A68D0-E3AD-44A7-A7BB-126A8F39C02F}",
+            "base": "{931A68D0-E3AD-44A7-A7BB-126A8F39C02F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,13 +12,13 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out 0",
+                    "base": "Output_Out 0",
                     "details": {
                         "name": "Out 0",
                         "tooltip": "Output 0"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names
index 16f28e96b8..0f7c401571 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{974258F5-EE1B-4AEE-B956-C7B303801847}",
+            "base": "{974258F5-EE1B-4AEE-B956-C7B303801847}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,13 +11,13 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out 0",
+                    "base": "Output_Out 0",
                     "details": {
                         "name": "Out 0",
                         "tooltip": "Output 0"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names
index 95fde7b078..34d7c6b746 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{F19CC10A-02FD-4E75-ADAA-9CFBD8A4E2F8}",
+            "base": "{F19CC10A-02FD-4E75-ADAA-9CFBD8A4E2F8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,27 +11,27 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Condition",
+                    "base": "DataInput_Condition",
                     "details": {
                         "name": "Condition"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the condition provided evaluates to true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the condition provided evaluates to false."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names
index 381a1c56f2..b36abc7903 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{760CE936-7059-42A3-A177-530A662E4ECF}",
+            "base": "{760CE936-7059-42A3-A177-530A662E4ECF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,33 +11,33 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
                 },
                 {
-                    "key": "DataOutput_Is Null",
+                    "base": "DataOutput_Is Null",
                     "details": {
                         "name": "Is Null"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the reference provided is null."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the reference provided is not null."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names
index c7e7a7ebd3..a0c6110b96 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{2FE432CB-9969-4273-BE04-DEF949C288F0}",
+            "base": "{2FE432CB-9969-4273-BE04-DEF949C288F0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,69 +11,69 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Index",
+                    "base": "DataInput_Index",
                     "details": {
                         "name": "Index"
                     }
                 },
                 {
-                    "key": "Input_In0",
+                    "base": "Input_In0",
                     "details": {
                         "name": "In0",
                         "tooltip": "Input 0"
                     }
                 },
                 {
-                    "key": "Input_In1",
+                    "base": "Input_In1",
                     "details": {
                         "name": "In1",
                         "tooltip": "Input 1"
                     }
                 },
                 {
-                    "key": "Input_In2",
+                    "base": "Input_In2",
                     "details": {
                         "name": "In2",
                         "tooltip": "Input 2"
                     }
                 },
                 {
-                    "key": "Input_In3",
+                    "base": "Input_In3",
                     "details": {
                         "name": "In3",
                         "tooltip": "Input 3"
                     }
                 },
                 {
-                    "key": "Input_In4",
+                    "base": "Input_In4",
                     "details": {
                         "name": "In4",
                         "tooltip": "Input 4"
                     }
                 },
                 {
-                    "key": "Input_In5",
+                    "base": "Input_In5",
                     "details": {
                         "name": "In5",
                         "tooltip": "Input 5"
                     }
                 },
                 {
-                    "key": "Input_In6",
+                    "base": "Input_In6",
                     "details": {
                         "name": "In6",
                         "tooltip": "Input 6"
                     }
                 },
                 {
-                    "key": "Input_In7",
+                    "base": "Input_In7",
                     "details": {
                         "name": "In7",
                         "tooltip": "Input 7"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled when the node receives a signal from the selected index"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names
index 79b7924e1f..37104685a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{EF6BA813-9AF9-45CF-A8A4-7F800D7B7CB0}",
+            "base": "{EF6BA813-9AF9-45CF-A8A4-7F800D7B7CB0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,33 +11,33 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names
index e841ecdb2d..f35f338941 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{0E37D3CA-2862-4667-BFDB-7393DD48241B}",
+            "base": "{0E37D3CA-2862-4667-BFDB-7393DD48241B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,28 +11,28 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Input_Reset",
+                    "base": "Input_Reset",
                     "details": {
                         "name": "Reset",
                         "tooltip": "Reset signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
                     }
                 },
                 {
-                    "key": "Output_On Reset",
+                    "base": "Output_On Reset",
                     "details": {
                         "name": "On Reset",
                         "tooltip": "Triggered when Reset"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names
index 334acb117e..492f4d2a44 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{363F9994-8D55-4117-BE94-EFF536BDAC17}",
+            "base": "{363F9994-8D55-4117-BE94-EFF536BDAC17}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names
index 10b97e3dab..c82ae5b04f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{BAFDA139-49A8-453B-A556-D4F4BA213B5C}",
+            "base": "{BAFDA139-49A8-453B-A556-D4F4BA213B5C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,13 +12,13 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out 0",
+                    "base": "Output_Out 0",
                     "details": {
                         "name": "Out 0",
                         "tooltip": "Output 0"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names
index 6fb5e1341f..75094119a8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{DFB13C5E-5FB3-4650-BD3A-E1AD79CD42AC}",
+            "base": "{DFB13C5E-5FB3-4650-BD3A-E1AD79CD42AC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,19 +12,19 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Weight 1",
+                    "base": "DataInput_Weight 1",
                     "details": {
                         "name": "Weight 1"
                     }
                 },
                 {
-                    "key": "Output_Out 1",
+                    "base": "Output_Out 1",
                     "details": {
                         "name": "Out 1"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names
index a97c4240c3..8856ddd2ac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{CB98B828-BF86-4623-BF73-396A68FA386A}",
+            "base": "{CB98B828-BF86-4623-BF73-396A68FA386A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,82 +11,82 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Index",
+                    "base": "DataInput_Index",
                     "details": {
                         "name": "Index"
                     }
                 },
                 {
-                    "key": "DataInput_Order",
+                    "base": "DataInput_Order",
                     "details": {
                         "name": "Order"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Input_Next",
+                    "base": "Input_Next",
                     "details": {
                         "name": "Next",
                         "tooltip": "When next is activated, it enables the next output"
                     }
                 },
                 {
-                    "key": "Output_Out0",
+                    "base": "Output_Out0",
                     "details": {
                         "name": "Out0",
                         "tooltip": "Output 0"
                     }
                 },
                 {
-                    "key": "Output_Out1",
+                    "base": "Output_Out1",
                     "details": {
                         "name": "Out1",
                         "tooltip": "Output 1"
                     }
                 },
                 {
-                    "key": "Output_Out2",
+                    "base": "Output_Out2",
                     "details": {
                         "name": "Out2",
                         "tooltip": "Output 2"
                     }
                 },
                 {
-                    "key": "Output_Out3",
+                    "base": "Output_Out3",
                     "details": {
                         "name": "Out3",
                         "tooltip": "Output 3"
                     }
                 },
                 {
-                    "key": "Output_Out4",
+                    "base": "Output_Out4",
                     "details": {
                         "name": "Out4",
                         "tooltip": "Output 4"
                     }
                 },
                 {
-                    "key": "Output_Out5",
+                    "base": "Output_Out5",
                     "details": {
                         "name": "Out5",
                         "tooltip": "Output 5"
                     }
                 },
                 {
-                    "key": "Output_Out6",
+                    "base": "Output_Out6",
                     "details": {
                         "name": "Out6",
                         "tooltip": "Output 6"
                     }
                 },
                 {
-                    "key": "Output_Out7",
+                    "base": "Output_Out7",
                     "details": {
                         "name": "Out7",
                         "tooltip": "Output 7"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names
index 20d7175aba..3791eb864e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E1B5F3F8-AFEE-42C9-A22C-CB93F8281CC4}",
+            "base": "{E1B5F3F8-AFEE-42C9-A22C-CB93F8281CC4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,19 +11,19 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Index",
+                    "base": "DataInput_Index",
                     "details": {
                         "name": "Index"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out 0",
+                    "base": "Output_Out 0",
                     "details": {
                         "name": "Out 0",
                         "tooltip": "Output 0"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names
index ccd9bfb6b3..a1bd16a211 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{C5BDF392-9669-4928-A0F5-F55B8A5B3BAC}",
+            "base": "{C5BDF392-9669-4928-A0F5-F55B8A5B3BAC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,26 +11,26 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Condition",
+                    "base": "DataInput_Condition",
                     "details": {
                         "name": "Condition"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signalled if the condition is false, or if the loop calls the break node"
                     }
                 },
                 {
-                    "key": "Output_Loop",
+                    "base": "Output_Loop",
                     "details": {
                         "name": "Loop",
                         "tooltip": "Signalled if the condition is true, and every time the last node of 'Loop' finishes"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names
index f6ef7768dd..81545f0ba2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{0C1257A0-DB57-5E29-9CA4-595B3AE8BA87}",
+            "base": "{0C1257A0-DB57-5E29-9CA4-595B3AE8BA87}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "AddAABB",
-                "category": "Math/AABB",
+                "name": "Add Axis Aligned Bounding Boxes",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB that is the (min(min(A), min(B)), max(max(A), max(B)))",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: A",
+                    "base": "DataInput_AABB: A",
                     "details": {
-                        "name": "AABB: A"
+                        "name": "First"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: B",
+                    "base": "DataInput_AABB: B",
                     "details": {
-                        "name": "AABB: B"
+                        "name": "Second"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names
index 3745892662..fd88952e19 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{2FEFADF8-0D3F-5796-BB6B-C7B8758A5751}",
+            "base": "{2FEFADF8-0D3F-5796-BB6B-C7B8758A5751}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "AddPoint",
-                "category": "Math/AABB",
+                "name": "Add Point",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB that is the (min(min(Source), Point), max(max(Source), Point))",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Point",
+                    "base": "DataInput_Vector3: Point",
                     "details": {
-                        "name": "Vector3: Point"
+                        "name": "Point"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names
index b7ced59374..874cd39c9f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{B1930C91-3527-593E-A382-DACC9E9C2245}",
+            "base": "{B1930C91-3527-593E-A382-DACC9E9C2245}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ApplyTransform",
-                "category": "Math/AABB",
+                "name": "Apply Transform",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB translated and possibly scaled by the Transform",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Transform",
+                    "base": "DataInput_Transform: Transform",
                     "details": {
-                        "name": "Transform: Transform"
+                        "name": "Transform"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names
index bc2c86049e..c9118de014 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{5B16FDCF-5FB0-5059-97E6-76AA11871337}",
+            "base": "{5B16FDCF-5FB0-5059-97E6-76AA11871337}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Center",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the center of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result: Vector3",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Center"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names
index 3d0c00daf6..2062682005 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{A03CA593-2B2E-5BEE-9A63-118D2F1E9DED}",
+            "base": "{A03CA593-2B2E-5BEE-9A63-118D2F1E9DED}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Clamp",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the largest version of Source that can fit entirely within Clamp",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Clamp",
+                    "base": "DataInput_AABB: Clamp",
                     "details": {
-                        "name": "AABB: Clamp"
+                        "name": "Clamp"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names
index 31ea6b1a2e..7c208bcdd6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{A0A7B5F1-F191-52A8-838A-DB39AADBA457}",
+            "base": "{A0A7B5F1-F191-52A8-838A-DB39AADBA457}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ContainsAABB",
-                "category": "Math/AABB",
+                "name": "Contains Axis Aligned Bounding Box",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns true if Source contains all of the bounds of Candidate, else false",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Candidate",
+                    "base": "DataInput_AABB: Candidate",
                     "details": {
-                        "name": "AABB: Candidate"
+                        "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Contains"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names
index ba30ab2874..c3d7c00e94 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{BD9731E7-78AD-5864-8617-25DE422C6CDE}",
+            "base": "{BD9731E7-78AD-5864-8617-25DE422C6CDE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ContainsVector3",
-                "category": "Math/AABB",
+                "name": "Contains Vector3",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns true if Source contains the Candidate, else false",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Candidate",
+                    "base": "DataInput_Vector3: Candidate",
                     "details": {
-                        "name": "Vector3: Candidate"
+                        "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Contains"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names
index 0f4e2878f8..7c8e0ebb3a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{6D65A9E0-733D-5277-B7CA-983E1468A40A}",
+            "base": "{6D65A9E0-733D-5277-B7CA-983E1468A40A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Distance",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the shortest distance from Point to Source, or zero of Point is contained in Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Point",
+                    "base": "DataInput_Vector3: Point",
                     "details": {
-                        "name": "Vector3: Point"
+                        "name": "Point"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Distance"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names
index 8b8a82259d..05390a20e5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{8B74AC3B-2089-5D55-BD66-3F57B3212D57}",
+            "base": "{8B74AC3B-2089-5D55-BD66-3F57B3212D57}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Expand",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Source expanded in each axis by the absolute value of each axis in Delta",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Delta",
+                    "base": "DataInput_Vector3: Delta",
                     "details": {
-                        "name": "Vector3: Delta"
+                        "name": "Delta"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names
index f00209439c..db3ddc567f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{C98626B6-E60F-525C-8763-4A906AD31903}",
+            "base": "{C98626B6-E60F-525C-8763-4A906AD31903}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Extents",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Vector3(Source.Width, Source.Height, Source.Depth)",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result: Vector3",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Extents"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names
index f5b5e7b633..d1c6a9ca27 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{3EF44A2E-F065-5F2A-906D-A139AEA6DF4E}",
+            "base": "{3EF44A2E-F065-5F2A-906D-A139AEA6DF4E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromCenterHalfExtents",
-                "category": "Math/AABB",
+                "name": "From Center Half Extents",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB with Min = Center - HalfExtents, Max = Center + HalfExtents",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Center",
+                    "base": "DataInput_Vector3: Center",
                     "details": {
-                        "name": "Vector3: Center"
+                        "name": "Center"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: HalfExtents",
+                    "base": "DataInput_Vector3: HalfExtents",
                     "details": {
-                        "name": "Vector3: HalfExtents"
+                        "name": "Half Extents"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names
index 8915366da3..06a369986d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{2AC22BD2-2150-58C2-8C0A-F9B83E2559F5}",
+            "base": "{2AC22BD2-2150-58C2-8C0A-F9B83E2559F5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromCenterRadius",
-                "category": "Math/AABB",
+                "name": "From Center Radius",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB with Min = Center - Vector3(radius, radius, radius), Max = Center + Vector3(radius, radius, radius)",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Center",
+                    "base": "DataInput_Vector3: Center",
                     "details": {
-                        "name": "Vector3: Center"
+                        "name": "Center"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Number: Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names
index 9ebcdc66d4..982b3b8342 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{8B033820-B205-560A-A735-8BBED0B02DDD}",
+            "base": "{8B033820-B205-560A-A735-8BBED0B02DDD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMinMax",
-                "category": "Math/AABB",
+                "name": "From Min Max",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB from Min and Max if Min <= Max, else returns FromPoint(max)",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Min",
+                    "base": "DataInput_Vector3: Min",
                     "details": {
-                        "name": "Vector3: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Max",
+                    "base": "DataInput_Vector3: Max",
                     "details": {
-                        "name": "Vector3: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names
index d339e65542..205f2373e4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{95A84A7D-9D3C-59AE-9463-1CC41D275239}",
+            "base": "{95A84A7D-9D3C-59AE-9463-1CC41D275239}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromOBB",
-                "category": "Math/AABB",
+                "name": "From Oriented Bounding Box",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB which contains Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_OBB: Source",
+                    "base": "DataInput_OBB: Source",
                     "details": {
-                        "name": "OBB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names
index 842e5261bc..7bd74f5e61 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{E578074B-7D9E-5339-A2CC-1A23B32E27B5}",
+            "base": "{E578074B-7D9E-5339-A2CC-1A23B32E27B5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromPoint",
-                "category": "Math/AABB",
+                "name": "From Point",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the AABB with min and max set to Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Vector3: Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names
index 5470d43f1b..0eb6d80940 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{6C71D076-0427-56B4-8A95-1DCB1835D1BF}",
+            "base": "{6C71D076-0427-56B4-8A95-1DCB1835D1BF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetMax",
-                "category": "Math/AABB",
+                "name": "Get Max",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Vector3 that is the max value on each axis of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result: Vector3",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Max"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names
index 2f76b75b7e..8bcf1804db 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{E699BC04-CAA6-5E1A-BBC0-797510227CBC}",
+            "base": "{E699BC04-CAA6-5E1A-BBC0-797510227CBC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetMin",
-                "category": "Math/AABB",
+                "name": "Get Min",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Vector3 that is the min value on each axis of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result: Vector3",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Min"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names
index e68a06a2a8..14a10d9b46 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{5B585330-B99A-5FDF-BA3C-CDA72468D4CA}",
+            "base": "{5B585330-B99A-5FDF-BA3C-CDA72468D4CA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
-                "category": "Math/AABB",
+                "name": "Is Finite",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns true if Source is finite, else false",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Is Finite"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names
index e39a66c148..9c6d0dc8ff 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{30BE564D-B68D-5D23-BDA1-625A7A8F9504}",
+            "base": "{30BE564D-B68D-5D23-BDA1-625A7A8F9504}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsValid",
-                "category": "Math/AABB",
+                "name": "Is Valid",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns ture if Source is valid, that is if Source.min <= Source.max, else false",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Is Valid"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names
index 690c973919..48c6bd2b60 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names
@@ -1,32 +1,32 @@
 {
     "entries": [
         {
-            "key": "{783E6976-E519-5BC0-BD33-049847564F5E}",
+            "base": "{783E6976-E519-5BC0-BD33-049847564F5E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "Null",
-                "category": "Math/AABB",
+                "name": "Invalid Axis Aligned Bounding Box",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns an invalid AABB (min > max), adding any point to it will make it valid",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
-                        "name": "Result: AABB"
+                        "name": "Invalid AABB"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names
index 8deb30747c..56b83a6eb8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names
@@ -1,42 +1,42 @@
 {
     "entries": [
         {
-            "key": "{CE4AF636-AB72-589D-92E9-A3C75A3F9C7F}",
+            "base": "{CE4AF636-AB72-589D-92E9-A3C75A3F9C7F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Overlaps",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns true if A overlaps B, else false",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: A",
+                    "base": "DataInput_AABB: A",
                     "details": {
                         "name": "AABB: A"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: B",
+                    "base": "DataInput_AABB: B",
                     "details": {
                         "name": "AABB: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
                         "name": "Result: Boolean"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names
index d4359828a1..b0e2985fbb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names
@@ -1,36 +1,36 @@
 {
     "entries": [
         {
-            "key": "{46EE9F31-DDE1-5482-9A03-A0D4A6BE429C}",
+            "base": "{46EE9F31-DDE1-5482-9A03-A0D4A6BE429C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SurfaceArea",
-                "category": "Math/AABB",
+                "name": "Surface Area",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the sum of the surface area of all six faces of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
                         "name": "Result: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names
index 1d9aaf3302..e77bde466f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names
@@ -1,42 +1,42 @@
 {
     "entries": [
         {
-            "key": "{214CCB41-01CA-578C-9D7F-1237202A885B}",
+            "base": "{214CCB41-01CA-578C-9D7F-1237202A885B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToSphere",
-                "category": "Math/AABB",
+                "name": "To Sphere",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the center and radius of smallest sphere that contains Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Center: Vector3",
+                    "base": "DataOutput_Center: Vector3",
                     "details": {
                         "name": "Center: Vector3"
                     }
                 },
                 {
-                    "key": "DataOutput_Radius: Number",
+                    "base": "DataOutput_Radius: Number",
                     "details": {
                         "name": "Radius: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names
index cc46679f58..0be4731085 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names
@@ -1,42 +1,42 @@
 {
     "entries": [
         {
-            "key": "{22DBE624-D16E-51E7-BFF5-6C136E8E4581}",
+            "base": "{22DBE624-D16E-51E7-BFF5-6C136E8E4581}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Translate",
-                "category": "Math/AABB",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Source with each point added with Translation",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Translation",
+                    "base": "DataInput_Vector3: Translation",
                     "details": {
                         "name": "Vector3: Translation"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: AABB",
+                    "base": "DataOutput_Result: AABB",
                     "details": {
                         "name": "Result: AABB"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names
index 43862b9608..f6051e7dc8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names
@@ -1,36 +1,36 @@
 {
     "entries": [
         {
-            "key": "{58B36FE7-19EB-5407-95BD-D16C62F04E0D}",
+            "base": "{58B36FE7-19EB-5407-95BD-D16C62F04E0D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "XExtent",
-                "category": "Math/AABB",
+                "name": "X Extent",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the X extent (max X - min X) of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
                         "name": "Result: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names
index c43dfbd23e..eab2924849 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names
@@ -1,36 +1,36 @@
 {
     "entries": [
         {
-            "key": "{631968DE-47B3-5214-B564-E14025135BAA}",
+            "base": "{631968DE-47B3-5214-B564-E14025135BAA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "YExtent",
-                "category": "Math/AABB",
+                "name": "Y Extent",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Y extent (max Y - min Y) of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
                         "name": "Result: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names
index 87a7fce696..4a107a844d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names
@@ -1,36 +1,36 @@
 {
     "entries": [
         {
-            "key": "{0CE6DD20-9E09-5CCE-A514-196958FD4871}",
+            "base": "{0CE6DD20-9E09-5CCE-A514-196958FD4871}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ZExtent",
-                "category": "Math/AABB",
+                "name": "Z Extent",
+                "category": "Math/Axis Aligned Bounding Box",
                 "tooltip": "returns the Z extent (max Z - min Z) of Source",
-                "subtitle": "AABB"
+                "subtitle": "Axis Aligned Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_AABB: Source",
                     "details": {
                         "name": "AABB: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
                         "name": "Result: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names
index 9433f13d04..a3eef6a2e7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{92A67932-241C-5BF4-8D4F-327F3E819F56}",
+            "base": "{92A67932-241C-5BF4-8D4F-327F3E819F56}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: A",
+                    "base": "DataInput_Color: A",
                     "details": {
                         "name": "Color: A"
                     }
                 },
                 {
-                    "key": "DataInput_Color: B",
+                    "base": "DataInput_Color: B",
                     "details": {
                         "name": "Color: B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result: Number",
                     "details": {
                         "name": "Result: Number"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names
index 8dd4a92831..7ddb05f4dd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{91E89FD2-F929-5491-BD2A-4B83D2455AAB}",
+            "base": "{91E89FD2-F929-5491-BD2A-4B83D2455AAB}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "Dot3",
+                "name": "Dot (RGB)",
                 "category": "Math/Color",
-                "tooltip": "returns the 3-element dot product of A and B, using only the R, G, B elements",
-                "subtitle": "Color"
+                "tooltip": "returns the 3-element dot product of A and B, using only the R, G, B elements"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Color: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Color: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Color: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names
index 7d9506b4bf..45e436bce6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names
@@ -1,56 +1,55 @@
 {
     "entries": [
         {
-            "key": "{84F9B63C-F6F5-58AD-8669-C25287CDC037}",
+            "base": "{84F9B63C-F6F5-58AD-8669-C25287CDC037}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromValues",
+                "name": "From Values",
                 "category": "Math/Color",
-                "tooltip": "returns a Color from the R, G, B, A inputs",
-                "subtitle": "Color"
+                "tooltip": "Returns a Color from the R, G, B, A inputs"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: R",
+                    "base": "DataInput_R",
                     "details": {
-                        "name": "Number: R"
+                        "name": "R"
                     }
                 },
                 {
-                    "key": "DataInput_Number: G",
+                    "base": "DataInput_G",
                     "details": {
-                        "name": "Number: G"
+                        "name": "G"
                     }
                 },
                 {
-                    "key": "DataInput_Number: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Number: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Number: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names
index 598c2e52e0..c709935b7c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{4EC849DB-B390-5C13-ADE9-A0CD8F06D63E}",
+            "base": "{4EC849DB-B390-5C13-ADE9-A0CD8F06D63E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromVector3",
+                "name": "From Vector3",
                 "category": "Math/Color",
-                "tooltip": "returns a Color with R, G, B set to X, Y, Z values of RGB, respectively. A is set to 1.0",
-                "subtitle": "Color"
+                "tooltip": "Returns a Color with R, G, B set to X, Y, Z values of RGB, respectively. A is set to 1.0"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: RGB",
+                    "base": "DataInput_RGB",
                     "details": {
-                        "name": "Vector3: RGB"
+                        "name": "RGB"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names
index 3cca83c246..61004481db 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{5829F3E6-1F1D-58C2-BD72-66D4DE866AB9}",
+            "base": "{5829F3E6-1F1D-58C2-BD72-66D4DE866AB9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromVector3AndNumber",
+                "name": "From Vector3 And Number",
                 "category": "Math/Color",
                 "tooltip": "returns a Color with R, G, B set to X, Y, Z values of RGB, respectively. A is set to A",
                 "subtitle": "Color"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: RGB",
+                    "base": "DataInput_Vector3: RGB",
                     "details": {
-                        "name": "Vector3: RGB"
+                        "name": "Red, Green, Blue"
                     }
                 },
                 {
-                    "key": "DataInput_Number: A",
+                    "base": "DataInput_Number: A",
                     "details": {
-                        "name": "Number: A"
+                        "name": "Alpha"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result: Color",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Color"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names
index 3ae97ec819..b02a810b0f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{721CF0C9-BE86-59B4-A5B6-AC936744CE5E}",
+            "base": "{721CF0C9-BE86-59B4-A5B6-AC936744CE5E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GammaToLinear",
+                "name": "Gamma To Linear",
                 "category": "Math/Color",
                 "tooltip": "returns Source converted from gamma corrected to linear space",
                 "subtitle": "Color"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Source",
+                    "base": "DataInput_Color: Source",
                     "details": {
-                        "name": "Color: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result: Color",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names
index ac5da11652..7f7038d383 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names
@@ -1,50 +1,50 @@
 {
     "entries": [
         {
-            "key": "{629BABFE-B9D2-5D29-BCC1-3E5CBDD7CAA4}",
+            "base": "{629BABFE-B9D2-5D29-BCC1-3E5CBDD7CAA4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Color",
-                "tooltip": "returns true if A is within Tolerance of B, else false",
+                "tooltip": "Returns true if A is within Tolerance of B, else false",
                 "subtitle": "Color"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: A",
+                    "base": "DataInput_Color: A",
                     "details": {
-                        "name": "Color: A"
+                        "name": "First"
                     }
                 },
                 {
-                    "key": "DataInput_Color: B",
+                    "base": "DataInput_Color: B",
                     "details": {
-                        "name": "Color: B"
+                        "name": "Second"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Number: Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Is Close"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names
index c865d2d71a..31b2a61f3d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{8A949DAB-0F0E-52FA-83EF-EA75B38076C8}",
+            "base": "{8A949DAB-0F0E-52FA-83EF-EA75B38076C8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsZero",
+                "name": "Is Zero",
                 "category": "Math/Color",
                 "tooltip": "returns true if Source is within Tolerance of zero",
                 "subtitle": "Color"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Source",
+                    "base": "DataInput_Color: Source",
                     "details": {
-                        "name": "Color: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Number: Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result: Boolean",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Is Zero"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names
index 3db2e744cb..ba7118a997 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{8F561D51-2991-5493-8CED-B2FBAF168E72}",
+            "base": "{8F561D51-2991-5493-8CED-B2FBAF168E72}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LinearToGamma",
+                "name": "Linear To Gamma",
                 "category": "Math/Color",
-                "tooltip": "returns Source converted from linear to gamma corrected space",
-                "subtitle": "Color"
+                "tooltip": "Returns Source converted from linear to gamma corrected space"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Color: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names
index 52e8116ee7..7f67402d65 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names
@@ -1,42 +1,42 @@
 {
     "entries": [
         {
-            "key": "{B779B815-EC1B-5075-A167-0F213445BB53}",
+            "base": "{B779B815-EC1B-5075-A167-0F213445BB53}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByNumber",
+                "name": "Multiply By Number",
                 "category": "Math/Color",
-                "tooltip": "returns Source with every elemented multiplied by Multiplier",
+                "tooltip": "Returns Source with every elemented multiplied by Multiplier",
                 "subtitle": "Color"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Source",
+                    "base": "DataInput_Color: Source",
                     "details": {
                         "name": "Color: Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Number: Multiplier",
                     "details": {
                         "name": "Number: Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result: Color",
                     "details": {
                         "name": "Result: Color"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names
index 99d7f96b84..7034549282 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E70E232F-9B2E-5802-9A58-422D47D88405}",
+            "base": "{E70E232F-9B2E-5802-9A58-422D47D88405}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,19 +12,19 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result: Color",
                     "details": {
                         "name": "Result: Color"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names
index fdf52ec08d..e3c8499aee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{02A3A3E6-9D80-432B-8AF5-F3AF24CF6959}",
+            "base": "{02A3A3E6-9D80-432B-8AF5-F3AF24CF6959}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names
index b2c3ca2d50..36f3163ae4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{218F5872-8D89-4FEA-9761-662625E29580}",
+            "base": "{218F5872-8D89-4FEA-9761-662625E29580}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names
index 5422a38082..68dc66c790 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8CA0C442-9139-4180-96EC-300FF888C35A}",
+            "base": "{8CA0C442-9139-4180-96EC-300FF888C35A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names
index 44db07b347..1247a766f5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{1B93426F-AAA2-4134-BE9A-C33B8F07F867}",
+            "base": "{1B93426F-AAA2-4134-BE9A-C33B8F07F867}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names
index 1c06e26cd6..f0e9e1602f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{73F6E302-A2E9-4BE6-A88F-98F81A24100D}",
+            "base": "{73F6E302-A2E9-4BE6-A88F-98F81A24100D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names
index e14af5ed2f..6be7dfcbf6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{C8D7A10F-A919-4467-96B1-F1852C282628}",
+            "base": "{C8D7A10F-A919-4467-96B1-F1852C282628}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,40 +11,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names
index 86db4d7212..a3682b3751 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{5C734A52-7CB1-5571-B6B2-F1C19A8CCE5A}",
+            "base": "{5C734A52-7CB1-5571-B6B2-F1C19A8CCE5A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromString",
-                "category": "Math/Crc32",
-                "tooltip": "returns a Crc32 from the string",
-                "subtitle": "Crc32"
+                "name": "From String",
+                "category": "Math/Tag",
+                "tooltip": "Returns a Tag from the string"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_String: Value",
+                    "base": "DataInput_Value",
                     "details": {
-                        "name": "String: Value"
+                        "name": "Text"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: CRC",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: CRC"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names
index 9ee3134454..3d2cd9186f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{2185A730-0CA3-5B97-8150-51D9F28EA9C8}",
+            "base": "{2185A730-0CA3-5B97-8150-51D9F28EA9C8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromColumns",
+                "name": "From Columns",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a rotation matrix based on angle around Z axis",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a rotation matrix based on angle around Z axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Column1",
+                    "base": "DataInput_Column1",
                     "details": {
-                        "name": "Vector3: Column1"
+                        "name": "Column 1"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Column2",
+                    "base": "DataInput_Column2",
                     "details": {
-                        "name": "Vector3: Column2"
+                        "name": "Column 2"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Column3",
+                    "base": "DataInput_Column3",
                     "details": {
-                        "name": "Vector3: Column3"
+                        "name": "Column 3"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names
index f1e2ea43e4..03cfbb8526 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{06538E6D-FE44-5A9C-8081-083D5D19D4FC}",
+            "base": "{06538E6D-FE44-5A9C-8081-083D5D19D4FC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromCrossProduct",
+                "name": "From Cross Product",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a skew-symmetric cross product matrix based on supplied vector",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a skew-symmetric cross product matrix based on supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names
index a519d2254c..9725855cf1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{F99F5D84-CDE6-5130-BAAC-7377F52D34FD}",
+            "base": "{F99F5D84-CDE6-5130-BAAC-7377F52D34FD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromDiagonal",
+                "name": "From Diagonal",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a diagonal matrix using the supplied vector",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a diagonal matrix using the supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names
index f29968d3b8..4f8d7ec9d9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{5E5DA784-9D18-595F-BB1E-FA3AC8BA7DD6}",
+            "base": "{5E5DA784-9D18-595F-BB1E-FA3AC8BA7DD6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMatrix4x4",
+                "name": "From Matrix4x4",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a matrix from the first 3 rows of a Matrix3x3",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a matrix from the first 3 rows of a Matrix3x3"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names
index 267865c111..64c63a37e2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{1D87EFAE-3FC2-5D8A-931D-7D56DB4E3123}",
+            "base": "{1D87EFAE-3FC2-5D8A-931D-7D56DB4E3123}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromQuaternion",
+                "name": "From Quaternion",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a rotation matrix using the supplied quaternion",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a rotation matrix using the supplied quaternion"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names
index 987d4360e1..23275a718e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{478D4CC5-BC42-574A-A81C-818FA9A3C635}",
+            "base": "{478D4CC5-BC42-574A-A81C-818FA9A3C635}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationXDegrees",
+                "name": "From Rotation X Degrees",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a rotation matrix representing a rotation in degrees around X-axis",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a rotation matrix representing a rotation in degrees around X-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names
index b1568b597b..e52288fade 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{A69D13B7-FBC3-5038-93CD-4FB822CFF8D4}",
+            "base": "{A69D13B7-FBC3-5038-93CD-4FB822CFF8D4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationYDegrees",
+                "name": "From Rotation Y Degrees",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a rotation matrix representing a rotation in degrees around Y-axis",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a rotation matrix representing a rotation in degrees around Y-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names
index a2afec9066..888a75aff2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{5E449312-5741-59EB-A778-7FB6C75DB90A}",
+            "base": "{5E449312-5741-59EB-A778-7FB6C75DB90A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationZDegrees",
+                "name": "From Rotation Z Degrees",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a rotation matrix representing a rotation in degrees around Z-axis",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a rotation matrix representing a rotation in degrees around Z-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names
index e082301192..3a3cdb722d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{B70E2447-DE12-5D81-80E4-06BEE5A0219E}",
+            "base": "{B70E2447-DE12-5D81-80E4-06BEE5A0219E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRows",
+                "name": "From Rows",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a matrix from three row",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a matrix from three row"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Row1",
+                    "base": "DataInput_Row1",
                     "details": {
-                        "name": "Vector3: Row1"
+                        "name": "Row 1"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Row2",
+                    "base": "DataInput_Row2",
                     "details": {
-                        "name": "Vector3: Row2"
+                        "name": "Row 2"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Row3",
+                    "base": "DataInput_Row3",
                     "details": {
-                        "name": "Vector3: Row3"
+                        "name": "Row 3"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names
index c6f3431b3b..3040759f1f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{A3F6A35C-068E-57D5-9761-69DC5AB0BD1B}",
+            "base": "{A3F6A35C-068E-57D5-9761-69DC5AB0BD1B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromScale",
+                "name": "From Scale",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a scale matrix using the supplied vector",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a scale matrix using the supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Vector3: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names
index b4884f75f7..11a310374e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{F54FFF79-75FF-5444-B941-DF216680BEA1}",
+            "base": "{F54FFF79-75FF-5444-B941-DF216680BEA1}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromTransform",
+                "name": "From Transform",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns a matrix using the supplied transform",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns a matrix using the supplied transform"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Transform",
+                    "base": "DataInput_Transform",
                     "details": {
-                        "name": "Transform: Transform"
+                        "name": "Transform"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names
index 46ec31ebb9..60a538ecd7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{50724E19-5472-5E35-9F88-F226ABB37D1A}",
+            "base": "{50724E19-5472-5E35-9F88-F226ABB37D1A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetColumn",
+                "name": "Get Column",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns vector from matrix corresponding to the Column index",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns vector from matrix corresponding to the Column index"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Column",
+                    "base": "DataInput_Column",
                     "details": {
-                        "name": "Number: Column"
+                        "name": "Column"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names
index 04c7ffa599..5cb723836e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{13EE83FC-EA87-5957-966F-EFD4E88A7698}",
+            "base": "{13EE83FC-EA87-5957-966F-EFD4E88A7698}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetColumns",
+                "name": "Get Columns",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns all columns from matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns all columns from matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Column1: Vector3",
+                    "base": "DataOutput_Column1",
                     "details": {
-                        "name": "Column1: Vector3"
+                        "name": "Column 1"
                     }
                 },
                 {
-                    "key": "DataOutput_Column2: Vector3",
+                    "base": "DataOutput_Column2",
                     "details": {
-                        "name": "Column2: Vector3"
+                        "name": "Column 2"
                     }
                 },
                 {
-                    "key": "DataOutput_Column3: Vector3",
+                    "base": "DataOutput_Column3",
                     "details": {
-                        "name": "Column3: Vector3"
+                        "name": "Column 3"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names
index 674cf87642..3516b89257 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{68B65AD0-B42F-5C85-B194-4FC6C31AD237}",
+            "base": "{68B65AD0-B42F-5C85-B194-4FC6C31AD237}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetDiagonal",
+                "name": "Get Diagonal",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns vector of matrix diagonal values",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns vector of matrix diagonal values"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names
index c6c09ba2c4..7d9f46c441 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{6FA2A21C-2189-55E4-B65E-2A961586F31E}",
+            "base": "{6FA2A21C-2189-55E4-B65E-2A961586F31E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetElement",
+                "name": "Get Element",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns scalar from matrix corresponding to the (Row,Column) pair",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns scalar from matrix corresponding to the (Row,Column) pair"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Row",
+                    "base": "DataInput_Row",
                     "details": {
-                        "name": "Number: Row"
+                        "name": "Row"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Column",
+                    "base": "DataInput_Column",
                     "details": {
-                        "name": "Number: Column"
+                        "name": "Column"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names
index 96e705bd14..f85577a201 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{89B55821-3E77-5410-B0EC-336A3D747308}",
+            "base": "{89B55821-3E77-5410-B0EC-336A3D747308}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetRow",
+                "name": "Get Row",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns vector from matrix corresponding to the Row index",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns vector from matrix corresponding to the Row index"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Row",
+                    "base": "DataInput_Row",
                     "details": {
-                        "name": "Number: Row"
+                        "name": "Row"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names
index 5f23c4b660..98834cbfe4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{8DE78AF8-44B4-58D8-AC3B-7B4ED77B75DF}",
+            "base": "{8DE78AF8-44B4-58D8-AC3B-7B4ED77B75DF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetRows",
+                "name": "Get Rows",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns all rows from matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns all rows from matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Row1: Vector3",
+                    "base": "DataOutput_Row1",
                     "details": {
-                        "name": "Row1: Vector3"
+                        "name": "Row 1"
                     }
                 },
                 {
-                    "key": "DataOutput_Row2: Vector3",
+                    "base": "DataOutput_Row2",
                     "details": {
-                        "name": "Row2: Vector3"
+                        "name": "Row 2"
                     }
                 },
                 {
-                    "key": "DataOutput_Row3: Vector3",
+                    "base": "DataOutput_Row3",
                     "details": {
-                        "name": "Row3: Vector3"
+                        "name": "Row 3"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names
index 4899a05c24..c128a22337 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{1F420C54-6920-511B-9025-D91E92ABF0C3}",
+            "base": "{1F420C54-6920-511B-9025-D91E92ABF0C3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Invert",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns inverse of Matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns inverse of Matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names
index ae0450c30e..03d72efaf8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{87F8C39D-47CC-5E63-B02A-675F2F1EE56E}",
+            "base": "{87F8C39D-47CC-5E63-B02A-675F2F1EE56E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns true if each element of both Matrix are equal within some tolerance",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns true if each element of both Matrix are equal within some tolerance"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Matrix3x3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Matrix3x3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names
index 4f37da4d8b..11cf183614 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{36E2943D-23B3-5CBA-A7EC-AA51288075AA}",
+            "base": "{36E2943D-23B3-5CBA-A7EC-AA51288075AA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns true if all numbers in matrix is finite",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns true if all numbers in matrix is finite"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names
index a49ae462cc..f0e0fba7e1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{1A78319F-7924-5114-8D85-C09C6F8D701D}",
+            "base": "{1A78319F-7924-5114-8D85-C09C6F8D701D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsOrthogonal",
+                "name": "Is Orthogonal",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns true if the matrix is orthogonal",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns true if the matrix is orthogonal"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names
index 4e96ab3cc1..79f5fee679 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{2B0CF330-B397-519C-867F-800AECBB84A8}",
+            "base": "{2B0CF330-B397-519C-867F-800AECBB84A8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByNumber",
+                "name": "Multiply By Number",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns matrix created from multiply the source matrix by Multiplier",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns matrix created from multiply the source matrix by Multiplier"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Number: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names
index 3da3867769..bd4f2c6ece 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{6FAEAA22-12D6-51E5-8600-F60103ECFF8C}",
+            "base": "{6FAEAA22-12D6-51E5-8600-F60103ECFF8C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByVector",
+                "name": "Multiply By Vector",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns vector created by right left multiplying matrix by supplied vector",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns vector created by right left multiplying matrix by supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Vector",
+                    "base": "DataInput_Vector",
                     "details": {
-                        "name": "Vector3: Vector"
+                        "name": "Vector"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names
index eeb65268d5..cb1a2ffc69 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{BFC5A535-734B-54E8-BDF1-B60120D831EC}",
+            "base": "{BFC5A535-734B-54E8-BDF1-B60120D831EC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Orthogonalize",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns an orthogonal matrix from the Source matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns an orthogonal matrix from the Source matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names
index ab49d83fa3..32dc94b070 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{FDE00D83-D0A6-5ACA-B48B-DD5E0415FF80}",
+            "base": "{FDE00D83-D0A6-5ACA-B48B-DD5E0415FF80}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToAdjugate",
+                "name": "To Adjugate",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns the transpose of Matrix of cofactors",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns the transpose of Matrix of cofactors"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names
index 3f8cff3116..eecd614044 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{D0C69C1C-1653-54A4-8A5A-1ECB3500D9C1}",
+            "base": "{D0C69C1C-1653-54A4-8A5A-1ECB3500D9C1}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToDeterminant",
+                "name": "To Determinant",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns determinant of Matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns determinant of Matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Determinant: Number",
+                    "base": "DataOutput_Determinant",
                     "details": {
-                        "name": "Determinant: Number"
+                        "name": "Determinant"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names
index 965ab601ae..27680a0107 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{8250935C-5B8D-5DF4-9E09-FDA2A445C099}",
+            "base": "{8250935C-5B8D-5DF4-9E09-FDA2A445C099}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToScale",
+                "name": "To Scale",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns scale part of the transformation matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns scale part of the transformation matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names
index c9af69dff5..495a34df7c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{F57314B3-AFD8-5BDB-A0F0-8EAF5C13CAC9}",
+            "base": "{F57314B3-AFD8-5BDB-A0F0-8EAF5C13CAC9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Transpose",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns transpose of Matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "returns transpose of Matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names
index 8dbd85f33a..036dd90b45 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names
@@ -1,32 +1,31 @@
 {
     "entries": [
         {
-            "key": "{66D46B8E-5722-57DB-8760-61AE1D69E6A3}",
+            "base": "{66D46B8E-5722-57DB-8760-61AE1D69E6A3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Zero",
                 "category": "Math/Matrix3x3",
-                "tooltip": "returns the zero matrix",
-                "subtitle": "Matrix3x3"
+                "tooltip": "Returns the zero matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix3x3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix3x3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names
index 313c923ecb..8ff9f22184 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B17F2D7F-22DF-512D-BF2A-98890D337661}",
+            "base": "{B17F2D7F-22DF-512D-BF2A-98890D337661}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,43 +12,43 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Column1",
+                    "base": "DataInput_Vector4: Column1",
                     "details": {
                         "name": "Vector4: Column1"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Column2",
+                    "base": "DataInput_Vector4: Column2",
                     "details": {
                         "name": "Vector4: Column2"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Column3",
+                    "base": "DataInput_Vector4: Column3",
                     "details": {
                         "name": "Vector4: Column3"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Column4",
+                    "base": "DataInput_Vector4: Column4",
                     "details": {
                         "name": "Vector4: Column4"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result: Matrix4x4",
                     "details": {
                         "name": "Result: Matrix4x4"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names
index 941bcf2ddc..60d8c29b6d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{4DD9115A-D1D0-53B3-8CC5-EA08EAA8BF13}",
+            "base": "{4DD9115A-D1D0-53B3-8CC5-EA08EAA8BF13}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromDiagonal",
+                "name": "From Diagonal",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a diagonal matrix using the supplied vector",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns a diagonal matrix using the supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names
index bd98877776..634489bc27 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{ACD49054-0267-55C7-80E9-1513CAD9182F}",
+            "base": "{ACD49054-0267-55C7-80E9-1513CAD9182F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMatrix3x3",
+                "name": "From Matrix3x3",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a matrix from the from the Matrix3x3",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns a matrix from the from the Matrix3x3"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names
index af2093be55..abdd77ac84 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B522091B-B802-5B9C-97CB-B208F58FC535}",
+            "base": "{B522091B-B802-5B9C-97CB-B208F58FC535}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,25 +12,25 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Quaternion: Source",
                     "details": {
                         "name": "Quaternion: Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result: Matrix4x4",
                     "details": {
                         "name": "Result: Matrix4x4"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names
index deaa71f7ca..a922fb957d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{18B8A477-A413-5477-ACA7-8A27C7C9A966}",
+            "base": "{18B8A477-A413-5477-ACA7-8A27C7C9A966}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromQuaternionAndTranslation",
+                "name": "From Quaternion And Translation",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a skew-symmetric cross product matrix based on supplied vector",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns a skew-symmetric cross product matrix based on supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Rotation",
+                    "base": "DataInput_Rotation",
                     "details": {
-                        "name": "Quaternion: Rotation"
+                        "name": "Rotation"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Translation",
+                    "base": "DataInput_Translation",
                     "details": {
-                        "name": "Vector3: Translation"
+                        "name": "Translation"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names
index 713eedda7b..092564c7c2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{A50EB8F8-1BF9-5E03-9CC3-628CF58A3996}",
+            "base": "{A50EB8F8-1BF9-5E03-9CC3-628CF58A3996}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationXDegrees",
+                "name": "From Rotation X Degrees",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a rotation matrix representing a rotation in degrees around X-axis",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns a rotation matrix representing a rotation in degrees around X-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names
index c0253b05d3..1b1796ed2f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{14332A8E-425B-5A31-A8D3-EDFD96DE4BA5}",
+            "base": "{14332A8E-425B-5A31-A8D3-EDFD96DE4BA5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationYDegrees",
+                "name": "From Rotation Y Degrees",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a rotation matrix representing a rotation in degrees around Y-axis",
+                "tooltip": "Returns a rotation matrix representing a rotation in degrees around Y-axis",
                 "subtitle": "Matrix4x4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Number: Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result: Matrix4x4",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Matrix4x4"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names
index 92757dc6b5..8b449f02a7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{99E6908F-AA83-571C-AC12-8DA12B112F79}",
+            "base": "{99E6908F-AA83-571C-AC12-8DA12B112F79}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationZDegrees",
+                "name": "From Rotation Z Degrees",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a rotation matrix representing a rotation in degrees around Z-axis",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns a rotation matrix representing a rotation in degrees around Z-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names
index 96a36cd04f..fba64d8d32 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names
@@ -1,56 +1,55 @@
 {
     "entries": [
         {
-            "key": "{B5272AB2-1312-5B55-A801-2A976B31665E}",
+            "base": "{B5272AB2-1312-5B55-A801-2A976B31665E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRows",
+                "name": "From Rows",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a matrix from three row",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns a matrix from three row"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Row1",
+                    "base": "DataInput_Row1",
                     "details": {
-                        "name": "Vector4: Row1"
+                        "name": "Row 1"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Row2",
+                    "base": "DataInput_Row2",
                     "details": {
-                        "name": "Vector4: Row2"
+                        "name": "Row 2"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Row3",
+                    "base": "DataInput_Row3",
                     "details": {
-                        "name": "Vector4: Row3"
+                        "name": "Row 3"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Row4",
+                    "base": "DataInput_Row4",
                     "details": {
-                        "name": "Vector4: Row4"
+                        "name": "Row 4"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names
index b99af3c94f..314a856dbe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{B49D6046-B959-53B1-88AD-E977038DB001}",
+            "base": "{B49D6046-B959-53B1-88AD-E977038DB001}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromScale",
+                "name": "From Scale",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a scale matrix using the supplied vector",
+                "tooltip": "Returns a scale matrix using the supplied vector",
                 "subtitle": "Matrix4x4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Scale",
+                    "base": "DataInput_Vector3: Scale",
                     "details": {
                         "name": "Vector3: Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result: Matrix4x4",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Matrix4x4"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names
index fe6b1540ed..a9e0062987 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{739E534B-CD9B-55DF-9757-89B0C379387F}",
+            "base": "{739E534B-CD9B-55DF-9757-89B0C379387F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromTransform",
+                "name": "From Transform",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a matrix using the supplied transform",
+                "tooltip": "Returns a matrix using the supplied transform",
                 "subtitle": "Matrix4x4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Transform",
+                    "base": "DataInput_Transform: Transform",
                     "details": {
-                        "name": "Transform: Transform"
+                        "name": "Transform"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result: Matrix4x4",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Matrix4x4"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names
index 57b7965e33..45af601aea 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names
@@ -1,38 +1,38 @@
 {
     "entries": [
         {
-            "key": "{35D8B012-2C19-5570-A606-4E644D01A9AD}",
+            "base": "{35D8B012-2C19-5570-A606-4E644D01A9AD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromTranslation",
+                "name": "From Translation",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns a skew-symmetric cross product matrix based on supplied vector",
+                "tooltip": "Returns a skew-symmetric cross product matrix based on supplied vector",
                 "subtitle": "Matrix4x4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Vector3: Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Translation"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result: Matrix4x4",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Matrix4x4"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names
index 4205030f09..fbf0e8d1c2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names
@@ -1,44 +1,44 @@
 {
     "entries": [
         {
-            "key": "{DE1D987E-8B96-5899-B663-CA4269A284DC}",
+            "base": "{DE1D987E-8B96-5899-B663-CA4269A284DC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetColumn",
+                "name": "Get Column",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns vector from matrix corresponding to the Column index",
+                "tooltip": "Returns vector from matrix corresponding to the Column index",
                 "subtitle": "Matrix4x4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Matrix4x4: Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Column",
+                    "base": "DataInput_Number: Column",
                     "details": {
-                        "name": "Number: Column"
+                        "name": "Column"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result: Vector4",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Column"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names
index 64e26175dc..d9f7201afc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names
@@ -1,56 +1,56 @@
 {
     "entries": [
         {
-            "key": "{A2A41479-B90B-5615-A72E-AAB3A6D0332E}",
+            "base": "{A2A41479-B90B-5615-A72E-AAB3A6D0332E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetColumns",
+                "name": "Get Columns",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns all columns from matrix",
+                "tooltip": "Returns all columns from matrix",
                 "subtitle": "Matrix4x4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Matrix4x4: Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Column1: Vector4",
+                    "base": "DataOutput_Column1: Vector4",
                     "details": {
-                        "name": "Column1: Vector4"
+                        "name": "Column 1"
                     }
                 },
                 {
-                    "key": "DataOutput_Column2: Vector4",
+                    "base": "DataOutput_Column2: Vector4",
                     "details": {
-                        "name": "Column2: Vector4"
+                        "name": "Column 2"
                     }
                 },
                 {
-                    "key": "DataOutput_Column3: Vector4",
+                    "base": "DataOutput_Column3: Vector4",
                     "details": {
-                        "name": "Column3: Vector4"
+                        "name": "Column 3"
                     }
                 },
                 {
-                    "key": "DataOutput_Column4: Vector4",
+                    "base": "DataOutput_Column4: Vector4",
                     "details": {
-                        "name": "Column4: Vector4"
+                        "name": "Column 4"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names
index d9bc2ad59e..e1b0efe63c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{7ECE6E97-31F9-5455-8560-BB6578CD1F3D}",
+            "base": "{7ECE6E97-31F9-5455-8560-BB6578CD1F3D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetDiagonal",
+                "name": "Get Diagonal",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns vector of matrix diagonal values",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns vector of matrix diagonal values"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names
index 8b7e270cef..c5409e7d8f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{2677AF1E-FAC3-5360-96E4-CC3054372340}",
+            "base": "{2677AF1E-FAC3-5360-96E4-CC3054372340}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetElement",
+                "name": "Get Element",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns scalar from matrix corresponding to the (Row,Column) pair",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns scalar from matrix corresponding to the (Row,Column) pair"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Row",
+                    "base": "DataInput_Row",
                     "details": {
-                        "name": "Number: Row"
+                        "name": "Row"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Column",
+                    "base": "DataInput_Column",
                     "details": {
-                        "name": "Number: Column"
+                        "name": "Column"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names
index 06c3338d46..09a624c5f3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{6A153DA6-666E-59ED-93B7-5EE7F19EFC02}",
+            "base": "{6A153DA6-666E-59ED-93B7-5EE7F19EFC02}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetRow",
+                "name": "Get Row",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns vector from matrix corresponding to the Row index",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns vector from matrix corresponding to the Row index"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Row",
+                    "base": "DataInput_Row",
                     "details": {
-                        "name": "Number: Row"
+                        "name": "Row"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names
index 6d8fbf97e7..c189d8f68a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names
@@ -1,56 +1,55 @@
 {
     "entries": [
         {
-            "key": "{3A69C35B-287E-5F0F-A372-713B77B0CBC6}",
+            "base": "{3A69C35B-287E-5F0F-A372-713B77B0CBC6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetRows",
+                "name": "Get Rows",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns all rows from matrix",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns all rows from matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Row1: Vector4",
+                    "base": "DataOutput_Row1",
                     "details": {
-                        "name": "Row1: Vector4"
+                        "name": "Row1"
                     }
                 },
                 {
-                    "key": "DataOutput_Row2: Vector4",
+                    "base": "DataOutput_Row2",
                     "details": {
-                        "name": "Row2: Vector4"
+                        "name": "Row2"
                     }
                 },
                 {
-                    "key": "DataOutput_Row3: Vector4",
+                    "base": "DataOutput_Row3",
                     "details": {
-                        "name": "Row3: Vector4"
+                        "name": "Row3"
                     }
                 },
                 {
-                    "key": "DataOutput_Row4: Vector4",
+                    "base": "DataOutput_Row4",
                     "details": {
-                        "name": "Row4: Vector4"
+                        "name": "Row4"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names
index 762e0a301e..b035564d83 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{B71EAC83-D0E9-5E1C-B694-6665896F49FE}",
+            "base": "{B71EAC83-D0E9-5E1C-B694-6665896F49FE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "GetTranslation",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns translation vector from the matrix",
-                "subtitle": "Matrix4x4"
+                "tooltip": "returns translation vector from the matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names
index 3e701b0d40..89adc7d466 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{4E82FDCE-50B3-5AFD-8E96-57E982B94D74}",
+            "base": "{4E82FDCE-50B3-5AFD-8E96-57E982B94D74}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Invert",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns inverse of Matrix",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns inverse of Matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names
index 25d1da45bd..9bf12495f9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{52504B30-D3B4-5C09-80D6-3CAF47DAEB1E}",
+            "base": "{52504B30-D3B4-5C09-80D6-3CAF47DAEB1E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns true if each element of both Matrix are equal within some tolerance",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns true if each element of both Matrix are equal within some tolerance"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Matrix4x4: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Matrix4x4: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names
index 8bd0e0dc37..9fea9efe33 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{90FFB3EE-DBFF-57C7-8D10-136810B762F2}",
+            "base": "{90FFB3EE-DBFF-57C7-8D10-136810B762F2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns true if all numbers in matrix is finite",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns true if all numbers in matrix is finite"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names
index 0343347e02..79bb32bbf3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{CE8BA72E-E595-5653-9229-D77A0CB1BAFA}",
+            "base": "{CE8BA72E-E595-5653-9229-D77A0CB1BAFA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByVector",
+                "name": "Multiply By Vector",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns vector created by right left multiplying matrix by supplied vector",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns vector created by right left multiplying matrix by supplied vector"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Vector",
+                    "base": "DataInput_Vector",
                     "details": {
-                        "name": "Vector4: Vector"
+                        "name": "Vector"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names
index 0d97222f28..eeae11fc39 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{2FB31ABF-7712-5C5F-BE1B-409D1D0AC120}",
+            "base": "{2FB31ABF-7712-5C5F-BE1B-409D1D0AC120}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToScale",
+                "name": "To Scale",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns scale part of the transformation matrix",
-                "subtitle": "Matrix4x4"
+                "tooltip": "Returns scale part of the transformation matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names
index 51a2bf229a..621a831e9a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{8A4A10DF-A019-57A6-BF9D-493BBCA6B5E2}",
+            "base": "{8A4A10DF-A019-57A6-BF9D-493BBCA6B5E2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Transpose",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns transpose of Matrix",
-                "subtitle": "Matrix4x4"
+                "tooltip": "returns transpose of Matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names
index a2dc799220..3a208bbab5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names
@@ -1,32 +1,31 @@
 {
     "entries": [
         {
-            "key": "{9BCEE0D6-B0A0-5944-AC25-7A8111798704}",
+            "base": "{9BCEE0D6-B0A0-5944-AC25-7A8111798704}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Zero",
                 "category": "Math/Matrix4x4",
-                "tooltip": "returns the zero matrix",
-                "subtitle": "Matrix4x4"
+                "tooltip": "returns the zero matrix"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Matrix4x4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Matrix4x4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names
index d178d0f04b..9e3a0728d6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{6C52B2D1-3526-4855-A217-5106D54F6B90}",
+            "base": "{6C52B2D1-3526-4855-A217-5106D54F6B90}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,33 +12,33 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the arithmetic operation is done."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names
index 7d1a6635e4..7f4e449aad 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{7379D5B4-787B-4C46-9394-288F16E5BF3A}",
+            "base": "{7379D5B4-787B-4C46-9394-288F16E5BF3A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,33 +12,33 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the arithmetic operation is done."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names
index 7c1f96ab53..57be0e3fb3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{1BC9A5A9-9BF3-4DA7-A8F7-911254AEB243}",
+            "base": "{1BC9A5A9-9BF3-4DA7-A8F7-911254AEB243}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,33 +12,33 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the arithmetic operation is done."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names
index 01b8a41cae..4fa1764fde 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{A10AD4C7-B633-4A75-8210-1353A87441E4}",
+            "base": "{A10AD4C7-B633-4A75-8210-1353A87441E4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,33 +12,33 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the arithmetic operation is done."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names
index 77735b2622..9280f009e8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{25B5779B-C1A0-5963-8F5F-1A7C59F675CD}",
+            "base": "{25B5779B-C1A0-5963-8F5F-1A7C59F675CD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromAabb",
-                "category": "Math/OBB",
-                "tooltip": "converts the Source to an OBB",
-                "subtitle": "OBB"
+                "name": "From Axis Aligned Bounding Box",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "Converts the Source to an Oriented Bounding Box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_AABB: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "AABB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: OBB",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: OBB"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names
index a683c20248..bc125f2c9d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{6F7A0335-C2D2-53A3-BF18-B3735DBFF8AA}",
+            "base": "{6F7A0335-C2D2-53A3-BF18-B3735DBFF8AA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromPositionRotationAndHalfLengths",
-                "category": "Math/OBB",
-                "tooltip": "returns an OBB from the position, rotation and half lengths",
-                "subtitle": "OBB"
+                "name": "From Position Rotation And Half Lengths",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "returns an Oriented Bounding Box from the position, rotation and half lengths"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Position",
+                    "base": "DataInput_Position",
                     "details": {
-                        "name": "Vector3: Position"
+                        "name": "Position"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Rotation",
+                    "base": "DataInput_Rotation",
                     "details": {
-                        "name": "Quaternion: Rotation"
+                        "name": "Rotation"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: HalfLengths",
+                    "base": "DataInput_HalfLengths",
                     "details": {
-                        "name": "Vector3: HalfLengths"
+                        "name": "Half Lengths"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: OBB",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: OBB"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names
index 7380a8011a..5c2860e739 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{924A1027-ECC4-574D-808A-E4A4EB128552}",
+            "base": "{924A1027-ECC4-574D-808A-E4A4EB128552}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetAxisX",
-                "category": "Math/OBB",
-                "tooltip": "returns the X-Axis of Source",
-                "subtitle": "OBB"
+                "name": "Get Axis X",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "Returns the X-Axis of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_OBB: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "OBB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names
index 174e8abbd8..d8d58baa9b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{20C14ACD-F093-5E7D-8EA8-AD89ACDA8438}",
+            "base": "{20C14ACD-F093-5E7D-8EA8-AD89ACDA8438}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetAxisY",
-                "category": "Math/OBB",
-                "tooltip": "returns the Y-Axis of Source",
-                "subtitle": "OBB"
+                "name": "Get Axis Y",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "Returns the Y-Axis of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_OBB: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "OBB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names
index b46dd378a6..3f10c5cb1b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{1A6BADCE-77F7-59F4-9F27-6C08B9D13374}",
+            "base": "{1A6BADCE-77F7-59F4-9F27-6C08B9D13374}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetAxisZ",
-                "category": "Math/OBB",
-                "tooltip": "returns the Z-Axis of Source",
-                "subtitle": "OBB"
+                "name": "Get Axis Z",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "Returns the Z-Axis of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_OBB: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "OBB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names
index acdc8235da..8165f22a9c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{44BAE83D-1C90-5026-BD0D-65406C837A27}",
+            "base": "{44BAE83D-1C90-5026-BD0D-65406C837A27}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetPosition",
-                "category": "Math/OBB",
-                "tooltip": "returns the position of Source",
-                "subtitle": "OBB"
+                "name": "Get Position",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "Returns the position of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_OBB: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "OBB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names
index 4aca32e4e7..6a60006d56 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{150329C4-45BF-5E9C-9358-41C648586F00}",
+            "base": "{150329C4-45BF-5E9C-9358-41C648586F00}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
-                "category": "Math/OBB",
-                "tooltip": "returns true if every element in Source is finite, is false",
-                "subtitle": "OBB"
+                "name": "Is Finite",
+                "category": "Math/Oriented Bounding Box",
+                "tooltip": "Returns true if every element in Source is finite, is false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_OBB: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "OBB: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names
index b6bd650223..5353e147be 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{7D49F3FC-A625-5166-9CF6-6F3757A56C14}",
+            "base": "{7D49F3FC-A625-5166-9CF6-6F3757A56C14}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "DistanceToPoint",
+                "name": "Distance To Point",
                 "category": "Math/Plane",
-                "tooltip": "returns the closest distance from Source to Point",
-                "subtitle": "Plane"
+                "tooltip": "Returns the closest distance from Source to Point"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Point",
+                    "base": "DataInput_Point",
                     "details": {
-                        "name": "Vector3: Point"
+                        "name": "Point"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names
index 85df33bab5..8fc08635fd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names
@@ -1,56 +1,55 @@
 {
     "entries": [
         {
-            "key": "{C281152D-1617-52B6-BB82-8146F881CCA5}",
+            "base": "{C281152D-1617-52B6-BB82-8146F881CCA5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromCoefficients",
+                "name": "From Coefficients",
                 "category": "Math/Plane",
-                "tooltip": "returns the plane that satisfies the equation Ax + By + Cz + D = 0",
-                "subtitle": "Plane"
+                "tooltip": "Returns the plane that satisfies the equation Ax + By + Cz + D = 0"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Number: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Number: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Number: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: C",
+                    "base": "DataInput_C",
                     "details": {
-                        "name": "Number: C"
+                        "name": "C"
                     }
                 },
                 {
-                    "key": "DataInput_Number: D",
+                    "base": "DataInput_D",
                     "details": {
-                        "name": "Number: D"
+                        "name": "D"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Plane",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Plane"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names
index f4c79b9c93..52e5389e0f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{85C2F69F-4E0D-5336-B1B1-29AE5A8339E2}",
+            "base": "{85C2F69F-4E0D-5336-B1B1-29AE5A8339E2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromNormalAndDistance",
+                "name": "From Normal And Distance",
                 "category": "Math/Plane",
-                "tooltip": "returns the plane with the specified Normal and Distance from the origin",
-                "subtitle": "Plane"
+                "tooltip": "Returns the plane with the specified Normal and Distance from the origin"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Normal",
+                    "base": "DataInput_Normal",
                     "details": {
-                        "name": "Vector3: Normal"
+                        "name": "Normal"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Distance",
+                    "base": "DataInput_Distance",
                     "details": {
-                        "name": "Number: Distance"
+                        "name": "Distance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Plane",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Plane"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names
index 6656072a9b..3c33889597 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{ED542A26-BBB3-5747-A40C-2CD08C369C54}",
+            "base": "{ED542A26-BBB3-5747-A40C-2CD08C369C54}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromNormalAndPoint",
+                "name": "From Normal And Point",
                 "category": "Math/Plane",
-                "tooltip": "returns the plane which includes the Point with the specified Normal",
-                "subtitle": "Plane"
+                "tooltip": "Returns the plane which includes the Point with the specified Normal"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Normal",
+                    "base": "DataInput_Normal",
                     "details": {
-                        "name": "Vector3: Normal"
+                        "name": "Normal"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Point",
+                    "base": "DataInput_Point",
                     "details": {
-                        "name": "Vector3: Point"
+                        "name": "Point"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Plane",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Plane"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names
index 54ce9345b3..5673a596f7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{5A3021D3-46AC-5751-B057-7B4E476417F3}",
+            "base": "{5A3021D3-46AC-5751-B057-7B4E476417F3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetDistance",
+                "name": "Get Distance",
                 "category": "Math/Plane",
-                "tooltip": "returns the Source's distance from the origin",
-                "subtitle": "Plane"
+                "tooltip": "Returns the Source's distance from the origin"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names
index 6e043d8c10..4db582ee90 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{76467598-DB87-59DD-8B65-B7636880EAB4}",
+            "base": "{76467598-DB87-59DD-8B65-B7636880EAB4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetNormal",
+                "name": "Get Normal",
                 "category": "Math/Plane",
-                "tooltip": "returns the surface normal of Source",
-                "subtitle": "Plane"
+                "tooltip": "Returns the surface normal of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names
index 0379e3c94d..36c6e35769 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names
@@ -1,56 +1,55 @@
 {
     "entries": [
         {
-            "key": "{9F5030EF-15D1-5AEC-988E-8BE2D9C6DD64}",
+            "base": "{9F5030EF-15D1-5AEC-988E-8BE2D9C6DD64}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetPlaneEquationCoefficients",
+                "name": "Get Plane Equation Coefficients",
                 "category": "Math/Plane",
-                "tooltip": "returns Source's coefficient's (A, B, C, D) in the equation Ax + By + Cz + D = 0",
-                "subtitle": "Plane"
+                "tooltip": "Returns Source's coefficient's (A, B, C, D) in the equation Ax + By + Cz + D = 0"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_A: Number",
+                    "base": "DataOutput_A",
                     "details": {
-                        "name": "A: Number"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataOutput_B: Number",
+                    "base": "DataOutput_B",
                     "details": {
-                        "name": "B: Number"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_C: Number",
+                    "base": "DataOutput_C",
                     "details": {
-                        "name": "C: Number"
+                        "name": "C"
                     }
                 },
                 {
-                    "key": "DataOutput_D: Number",
+                    "base": "DataOutput_D",
                     "details": {
-                        "name": "D: Number"
+                        "name": "D"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names
index f704433c45..6bf24dfac5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{AB336D86-5967-568C-9E2E-D678BAE4DFAC}",
+            "base": "{AB336D86-5967-568C-9E2E-D678BAE4DFAC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Plane",
-                "tooltip": "returns true if Source is finite, else false",
-                "subtitle": "Plane"
+                "tooltip": "Returns true if Source is finite, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names
index 38bf03f9e3..8ff3251e3b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{BE7F52C0-3FEA-5C78-BAB1-41A8BFEB38EC}",
+            "base": "{BE7F52C0-3FEA-5C78-BAB1-41A8BFEB38EC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Project",
                 "category": "Math/Plane",
-                "tooltip": "returns the projection of Point onto Source",
-                "subtitle": "Plane"
+                "tooltip": "Returns the projection of Point onto Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Point",
+                    "base": "DataInput_Point",
                     "details": {
-                        "name": "Vector3: Point"
+                        "name": "Point"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names
index 113ec5540a..d06be76f8c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{43FB92F5-CBC4-553E-982B-714EA2226D42}",
+            "base": "{43FB92F5-CBC4-553E-982B-714EA2226D42}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Transform",
                 "category": "Math/Plane",
-                "tooltip": "returns Source transformed by Transform",
-                "subtitle": "Plane"
+                "tooltip": "Returns Source transformed by Transform"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Plane: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Plane: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Transform",
+                    "base": "DataInput_Transform",
                     "details": {
-                        "name": "Transform: Transform"
+                        "name": "Transform"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Plane",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Plane"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names
index 20959c0355..13f58a276b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{1328993D-4413-5E46-9116-3AA5C25E97D2}",
+            "base": "{1328993D-4413-5E46-9116-3AA5C25E97D2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Conjugate",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the conjugate of the source, (-x, -y, -z, w)",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the conjugate of the source, (-x, -y, -z, w)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names
index e61f327c74..bdf1980570 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names
@@ -1,37 +1,36 @@
 {
     "entries": [
         {
-            "key": "{10B3E787-BC20-5317-9553-647D40D79DCD}",
+            "base": "{10B3E787-BC20-5317-9553-647D40D79DCD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ConvertTransformToRotation",
-                "category": "Math/Quaternion",
-                "subtitle": "Quaternion"
+                "name": "Convert Transform To Rotation",
+                "category": "Math/Quaternion"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Transform",
+                    "base": "DataInput_Transform",
                     "details": {
-                        "name": "Transform: Transform"
+                        "name": "Transform"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names
index 47fef5d4e1..3ea8425186 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{82FB60FB-2417-5BDC-ADF7-9C08DE88E793}",
+            "base": "{82FB60FB-2417-5BDC-ADF7-9C08DE88E793}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "CreateFromEulerAngles",
+                "name": "Create From Euler Angles",
                 "category": "Math/Quaternion",
-                "tooltip": "Returns a new Quaternion initialized with the specified Angles",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns a new Quaternion initialized with the specified Angles"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Pitch",
+                    "base": "DataInput_Pitch",
                     "details": {
-                        "name": "Number: Pitch"
+                        "name": "Pitch"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Roll",
+                    "base": "DataInput_Roll",
                     "details": {
-                        "name": "Number: Roll"
+                        "name": "Roll"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Yaw",
+                    "base": "DataInput_Yaw",
                     "details": {
-                        "name": "Number: Yaw"
+                        "name": "Yaw"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names
index edf359e399..dce76a8cc0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{46366DEB-4F16-54AF-A618-073E0E2C1DA4}",
+            "base": "{46366DEB-4F16-54AF-A618-073E0E2C1DA4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Dot",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the Dot product of A and B",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the Dot product of A and B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Quaternion: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Quaternion: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names
index e7d7e7d9ee..2007847335 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{6AEAAC03-A8D7-5C29-9F23-07FF59EE55D7}",
+            "base": "{6AEAAC03-A8D7-5C29-9F23-07FF59EE55D7}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromAxisAngleDegrees",
+                "name": "From Axis Angle (Degrees)",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the rotation created from Axis the angle Degrees",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the rotation created from Axis the angle Degrees"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Axis",
+                    "base": "DataInput_Axis",
                     "details": {
-                        "name": "Vector3: Axis"
+                        "name": "Axis"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names
index 3047464992..646714b48d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{59C4651F-A5E7-59FD-81FE-D7BD07B36346}",
+            "base": "{59C4651F-A5E7-59FD-81FE-D7BD07B36346}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMatrix3x3",
+                "name": "From Matrix3x3",
                 "category": "Math/Quaternion",
-                "tooltip": "returns a rotation created from the 3x3 matrix source",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns a rotation created from the 3x3 matrix source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names
index 0584ca0fc6..b6b38f7297 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{B2C7B9DD-C9DD-5971-AA76-95603BED9BD8}",
+            "base": "{B2C7B9DD-C9DD-5971-AA76-95603BED9BD8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMatrix4x4",
+                "name": "From Matrix4x4",
                 "category": "Math/Quaternion",
-                "tooltip": "returns a rotation created from the 4x4 matrix source",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns a rotation created from the 4x4 matrix source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix4x4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix4x4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names
index 29caf9ef30..9fb08ffa2b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{2F3E079E-23F9-5BC4-9B1A-DD2FAFBF921F}",
+            "base": "{2F3E079E-23F9-5BC4-9B1A-DD2FAFBF921F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromTransform",
+                "name": "From Transform",
                 "category": "Math/Quaternion",
-                "tooltip": "returns a rotation created from the rotation part of the transform source",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns a rotation created from the rotation part of the transform source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names
index 4c5c4bc914..ceeebae083 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{25150C46-3ECA-596A-8643-DB9B143D17C9}",
+            "base": "{25150C46-3ECA-596A-8643-DB9B143D17C9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "InvertFull",
+                "name": "Invert Full",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the inverse for any rotation, not just unit rotations",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the inverse for any rotation, not just unit rotations"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names
index 664d1d5902..302acb0e94 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{7CF70E06-039B-5DFB-BA6D-A94DBB010A91}",
+            "base": "{7CF70E06-039B-5DFB-BA6D-A94DBB010A91}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Quaternion",
-                "tooltip": "returns true if A and B are within Tolerance of each other",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns true if A and B are within Tolerance of each other"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Quaternion: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Quaternion: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names
index 3c6ed7b793..deda4ab105 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{0FF1A082-1200-57C4-8CE6-A17844BEBD1A}",
+            "base": "{0FF1A082-1200-57C4-8CE6-A17844BEBD1A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Quaternion",
-                "tooltip": "returns true if every element in Source is finite",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns true if every element in Source is finite"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names
index d4fd132017..b4cda49248 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{6D6D359A-BD00-5ADA-B634-C4F6B0949BFF}",
+            "base": "{6D6D359A-BD00-5ADA-B634-C4F6B0949BFF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsIdentity",
+                "name": "Is Identity",
                 "category": "Math/Quaternion",
-                "tooltip": "returns true if Source is within Tolerance of the Identity rotation",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns true if Source is within Tolerance of the Identity rotation"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names
index 6fd28166a3..99bde6bd2b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{F7805CC3-4A0A-58BD-968F-5D1CAA4D8215}",
+            "base": "{F7805CC3-4A0A-58BD-968F-5D1CAA4D8215}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsZero",
+                "name": "Is Zero",
                 "category": "Math/Quaternion",
-                "tooltip": "returns true if Source is within Tolerance of the Zero rotation",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns true if Source is within Tolerance of the Zero rotation"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names
index 536c549af9..591b61fb3a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{4CDE86F1-8ABD-5F13-8BFE-622728F845DC}",
+            "base": "{4CDE86F1-8ABD-5F13-8BFE-622728F845DC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthReciprocal",
+                "name": "Length Reciprocal",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the reciprocal length of Source",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the reciprocal length of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names
index 5279f1839e..1c50bdc5e6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{FC266E04-338B-57CE-A529-28056AB3AB43}",
+            "base": "{FC266E04-338B-57CE-A529-28056AB3AB43}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthSquared",
+                "name": "Length Squared",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the square of the length of Source",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the square of the length of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names
index ca24736058..11bb5d0816 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{A3B1E26D-BF69-5009-A3B4-868DBE3106A3}",
+            "base": "{A3B1E26D-BF69-5009-A3B4-868DBE3106A3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Lerp",
                 "category": "Math/Quaternion",
-                "tooltip": "returns a the linear interpolation between From and To by the amount T",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns a the linear interpolation between From and To by the amount T"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Quaternion: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Quaternion: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names
index 2c62ec63a3..d632a64250 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{36ECEF91-815A-5D40-B21F-0CAA4D6DAD53}",
+            "base": "{36ECEF91-815A-5D40-B21F-0CAA4D6DAD53}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByNumber",
+                "name": "Multiply By Number",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the Source with each element multiplied by Multiplier",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the Source with each element multiplied by Multiplier"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Number: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names
index f8749b2bc3..effceed57e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{0E9A2E40-9EEE-5D46-92BD-60E20F99E96E}",
+            "base": "{0E9A2E40-9EEE-5D46-92BD-60E20F99E96E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Negate",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the Source with each element negated",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the Source with each element negated"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names
index 525e1d087f..83adfd8e38 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{215978F2-1B5F-597D-BE5D-C01A1E77F2BF}",
+            "base": "{215978F2-1B5F-597D-BE5D-C01A1E77F2BF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Normalize",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the normalized version of Source",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the normalized version of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names
index 113408dc70..a18c86703c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{56C01595-FE08-54FC-9668-D203D59F506D}",
+            "base": "{56C01595-FE08-54FC-9668-D203D59F506D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotateVector3",
+                "name": "Rotate Vector3",
                 "category": "Math/Quaternion",
-                "tooltip": "Returns a new Vector3 that is the source vector3 rotated by the given Quaternion",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns a new Vector3 that is the source vector3 rotated by the given Quaternion"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Quaternion",
+                    "base": "DataInput_Quaternion",
                     "details": {
-                        "name": "Quaternion: Quaternion"
+                        "name": "Quaternion"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Vector",
+                    "base": "DataInput_Vector",
                     "details": {
-                        "name": "Vector3: Vector"
+                        "name": "Vector"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names
index 4abb365d80..ad554e2364 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{261E424C-4241-5777-8742-21945C69FD29}",
+            "base": "{261E424C-4241-5777-8742-21945C69FD29}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotationXDegrees",
+                "name": "Rotation X (Degrees)",
                 "category": "Math/Quaternion",
-                "tooltip": "creates a rotation of Degrees around the x-axis",
-                "subtitle": "Quaternion"
+                "tooltip": "Creates a rotation of Degrees around the x-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names
index 6e7ca8c4da..047af94ec0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{66AC039B-8D0D-5E4C-A4EA-20F767C4EAF5}",
+            "base": "{66AC039B-8D0D-5E4C-A4EA-20F767C4EAF5}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotationYDegrees",
+                "name": "Rotation Y (Degrees)",
                 "category": "Math/Quaternion",
-                "tooltip": "creates a rotation of Degrees around the y-axis",
-                "subtitle": "Quaternion"
+                "tooltip": "Creates a rotation of Degrees around the y-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names
index ec05a8b2fa..abd872aa1c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{1373DA97-B94D-5DBB-9F0C-175CAE46851A}",
+            "base": "{1373DA97-B94D-5DBB-9F0C-175CAE46851A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotationZDegrees",
+                "name": "Rotation Z (Degrees)",
                 "category": "Math/Quaternion",
-                "tooltip": "creates a rotation of Degrees around the z-axis",
-                "subtitle": "Quaternion"
+                "tooltip": "Creates a rotation of Degrees around the z-axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names
index 0e86f79092..7bed39e779 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{7809B038-3F50-533D-8AEF-35CDBDDFCA71}",
+            "base": "{7809B038-3F50-533D-8AEF-35CDBDDFCA71}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ShortestArc",
+                "name": "Shortest Arc",
                 "category": "Math/Quaternion",
-                "tooltip": "creates a rotation representing the shortest arc between From and To",
-                "subtitle": "Quaternion"
+                "tooltip": "Creates a rotation representing the shortest arc between From and To"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector3: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector3: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names
index c027414e99..f5a9f2333c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{92A204FE-A6E2-5EB7-B2A2-F782DBA8C1C3}",
+            "base": "{92A204FE-A6E2-5EB7-B2A2-F782DBA8C1C3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Slerp",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the spherical linear interpolation between From and To by the amount T, the result is NOT normalized",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the spherical linear interpolation between From and To by the amount T, the result is NOT normalized"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Quaternion: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Quaternion: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names
index 613ea8326e..2c0915cb83 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names
@@ -1,62 +1,61 @@
 {
     "entries": [
         {
-            "key": "{E7275C69-D728-5468-9402-C4FBA1ADDA97}",
+            "base": "{E7275C69-D728-5468-9402-C4FBA1ADDA97}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Squad",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the quadratic interpolation, that is: Squad(From, To, In, Out, T) = Slerp(Slerp(From, Out, T), Slerp(To, In, T), 2(1 - T)T)",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the quadratic interpolation, that is: Squad(From, To, In, Out, T) = Slerp(Slerp(From, Out, T), Slerp(To, In, T), 2(1 - T)T)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Quaternion: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Quaternion: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: In",
+                    "base": "DataInput_In",
                     "details": {
-                        "name": "Quaternion: In"
+                        "name": "In"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Out",
+                    "base": "DataInput_Out",
                     "details": {
-                        "name": "Quaternion: Out"
+                        "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names
index cc72bd8aa4..cdfeaaa8e7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{D3471394-97F1-5A37-82E0-F570B882F9C9}",
+            "base": "{D3471394-97F1-5A37-82E0-F570B882F9C9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToAngleDegrees",
+                "name": "To Angle (Degrees)",
                 "category": "Math/Quaternion",
-                "tooltip": "returns the angle of angle-axis pair that Source represents in degrees",
-                "subtitle": "Quaternion"
+                "tooltip": "Returns the angle of angle-axis pair that Source represents in degrees"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names
index e4d315b3d9..74c0f7e2e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{66072FDF-E318-5A40-B0C1-FD9EE0F59D7B}",
+            "base": "{66072FDF-E318-5A40-B0C1-FD9EE0F59D7B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomColor",
+                "name": "Random Color",
                 "category": "Math/Random",
-                "tooltip": "Returns a random color [Min, Max]",
-                "subtitle": "Random"
+                "tooltip": "Returns a random color [Min, Max]"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Color: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Color: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Color: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names
index f8e29b2fc9..3fa603ca9a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{E16EC7BB-A046-5CD7-B26C-0A75358A37F2}",
+            "base": "{E16EC7BB-A046-5CD7-B26C-0A75358A37F2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomGrayscale",
+                "name": "Random Grayscale",
                 "category": "Math/Random",
-                "tooltip": "Returns a random grayscale color between [Min, Max] intensities",
-                "subtitle": "Random"
+                "tooltip": "Returns a random grayscale color between [Min, Max] intensities"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Number: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Number: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Color",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Color"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names
index 4f147c7096..0e3131a398 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{48BF5246-995E-5EFD-B541-F468937D2423}",
+            "base": "{48BF5246-995E-5EFD-B541-F468937D2423}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomInteger",
+                "name": "Random Integer",
                 "category": "Math/Random",
-                "tooltip": "returns a random integer [Min, Max]",
-                "subtitle": "Random"
+                "tooltip": "Returns a random integer [Min, Max]"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Number: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Number: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names
index 8abeca1d6b..f2208525d2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{898C7B53-2829-58ED-A053-1641A2BC14E2}",
+            "base": "{898C7B53-2829-58ED-A053-1641A2BC14E2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomNumber",
+                "name": "Random Number",
                 "category": "Math/Random",
-                "tooltip": "returns a random real number [Min, Max]",
-                "subtitle": "Random"
+                "tooltip": "Returns a random real number [Min, Max]"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Number: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Number: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names
index c79e012d45..fb23ddf7c2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names
@@ -1,62 +1,61 @@
 {
     "entries": [
         {
-            "key": "{3A668745-A312-5849-A2D3-AEF533F2CE3D}",
+            "base": "{3A668745-A312-5849-A2D3-AEF533F2CE3D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInArc",
+                "name": "Random Point In Arc",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in the specified arc",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in the specified arc"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Origin",
+                    "base": "DataInput_Origin",
                     "details": {
-                        "name": "Vector3: Origin"
+                        "name": "Origin"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Direction",
+                    "base": "DataInput_Direction",
                     "details": {
-                        "name": "Vector3: Direction"
+                        "name": "Direction"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Normal",
+                    "base": "DataInput_Normal",
                     "details": {
-                        "name": "Vector3: Normal"
+                        "name": "Normal"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Angle",
+                    "base": "DataInput_Angle",
                     "details": {
-                        "name": "Number: Angle"
+                        "name": "Angle"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names
index 4be919b924..a5cd2fdeac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{8F7532AC-DABD-5EE6-8D84-A063032A82D4}",
+            "base": "{8F7532AC-DABD-5EE6-8D84-A063032A82D4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInBox",
+                "name": "Random Point In Box",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in a box",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in a box"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Dimensions",
+                    "base": "DataInput_Dimensions",
                     "details": {
-                        "name": "Vector3: Dimensions"
+                        "name": "Dimensions"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names
index cbdf74516f..e4dbeb4dd3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{90F4E470-10AB-5D78-9B20-100132F0BEA9}",
+            "base": "{90F4E470-10AB-5D78-9B20-100132F0BEA9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInCircle",
+                "name": "Random Point In Circle",
                 "category": "Math/Random",
-                "tooltip": "returns a random point inside the area of a circle",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point inside the area of a circle"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names
index fbec23d1e8..4c7270d0f4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{00464520-3FAA-5725-BE01-4F13A50E430F}",
+            "base": "{00464520-3FAA-5725-BE01-4F13A50E430F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInCone",
+                "name": "Random Point In Cone",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in a cone",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in a cone"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Angle",
+                    "base": "DataInput_Angle",
                     "details": {
-                        "name": "Number: Angle"
+                        "name": "Angle"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names
index 983c867fbe..92dcefe8c7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{DE205B79-32D5-5FA9-868A-442CE0388F7F}",
+            "base": "{DE205B79-32D5-5FA9-868A-442CE0388F7F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInCylinder",
+                "name": "Random Point In Cylinder",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in a cylinder",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in a cylinder"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Height",
+                    "base": "DataInput_Height",
                     "details": {
-                        "name": "Number: Height"
+                        "name": "Height"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names
index aa5a4c9bfb..21d3ca2f96 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{3234ADB9-4B1E-594B-8AF6-EC857CCA1241}",
+            "base": "{3234ADB9-4B1E-594B-8AF6-EC857CCA1241}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInEllipsoid",
+                "name": "Random Point In Ellipsoid",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in an ellipsoid",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in an ellipsoid"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Dimensions",
+                    "base": "DataInput_Dimensions",
                     "details": {
-                        "name": "Vector3: Dimensions"
+                        "name": "Dimensions"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names
index fa9d74c28f..60d4a9cbd8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{5C87299A-E9AF-591D-8E20-4A1B8F4A92CD}",
+            "base": "{5C87299A-E9AF-591D-8E20-4A1B8F4A92CD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInSphere",
+                "name": "Random Point In Sphere",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in a sphere",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in a sphere"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names
index fc57d51457..82d6f6e156 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{4CF31307-D138-5021-A5AE-F352C95DC212}",
+            "base": "{4CF31307-D138-5021-A5AE-F352C95DC212}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInSquare",
+                "name": "Random Point In Square",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in a square",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in a square"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Dimensions",
+                    "base": "DataInput_Dimensions",
                     "details": {
-                        "name": "Vector2: Dimensions"
+                        "name": "Dimensions"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names
index 32903d94b3..401c3afcb4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names
@@ -1,68 +1,67 @@
 {
     "entries": [
         {
-            "key": "{A2D614BC-1636-5F54-868A-BF5544910967}",
+            "base": "{A2D614BC-1636-5F54-868A-BF5544910967}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointInWedge",
+                "name": "Random Point In Wedge",
                 "category": "Math/Random",
-                "tooltip": "returns a random point in the specified wedge",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point in the specified wedge"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Origin",
+                    "base": "DataInput_Origin",
                     "details": {
-                        "name": "Vector3: Origin"
+                        "name": "Origin"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Direction",
+                    "base": "DataInput_Direction",
                     "details": {
-                        "name": "Vector3: Direction"
+                        "name": "Direction"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Normal",
+                    "base": "DataInput_Normal",
                     "details": {
-                        "name": "Vector3: Normal"
+                        "name": "Normal"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Height",
+                    "base": "DataInput_Height",
                     "details": {
-                        "name": "Number: Height"
+                        "name": "Height"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Angle",
+                    "base": "DataInput_Angle",
                     "details": {
-                        "name": "Number: Angle"
+                        "name": "Angle"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names
index a878a99abd..39433c405e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{D726B72F-9300-5D21-BE2C-8CB089BFDBA3}",
+            "base": "{D726B72F-9300-5D21-BE2C-8CB089BFDBA3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointOnCircle",
+                "name": "Random Point On Circle",
                 "category": "Math/Random",
-                "tooltip": "returns a random point on the circumference of a circle",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point on the circumference of a circle"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names
index fc35ee804a..6e54bb7d72 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{7DFA3F08-B554-550A-93F8-4D7CBAA775E9}",
+            "base": "{7DFA3F08-B554-550A-93F8-4D7CBAA775E9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomPointOnSphere",
+                "name": "Random Point On Sphere",
                 "category": "Math/Random",
-                "tooltip": "returns a random point on the surface of a sphere",
-                "subtitle": "Random"
+                "tooltip": "Returns a random point on the surface of a sphere"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Radius",
+                    "base": "DataInput_Radius",
                     "details": {
-                        "name": "Number: Radius"
+                        "name": "Radius"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names
index dbfed976d7..ccae17450c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{E9902EB1-82B9-5EF2-B7B6-51BAFECA0B91}",
+            "base": "{E9902EB1-82B9-5EF2-B7B6-51BAFECA0B91}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomQuaternion",
+                "name": "Random Quaternion",
                 "category": "Math/Random",
-                "tooltip": "returns a random quaternion",
-                "subtitle": "Random"
+                "tooltip": "Returns a random quaternion"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Number: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Number: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Quaternion",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Quaternion"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names
index 20e046cf1a..e1b9340392 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names
@@ -1,32 +1,31 @@
 {
     "entries": [
         {
-            "key": "{4DC88D65-16B5-525C-AA9A-5C19F2F9165C}",
+            "base": "{4DC88D65-16B5-525C-AA9A-5C19F2F9165C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomUnitVector2",
+                "name": "Random Unit Vector2",
                 "category": "Math/Random",
-                "tooltip": "returns a random Vector2 direction",
-                "subtitle": "Random"
+                "tooltip": "Returns a random Vector2 direction"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names
index 71137cce94..06990bde99 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names
@@ -1,32 +1,31 @@
 {
     "entries": [
         {
-            "key": "{D0A2F62C-EB98-51CC-A482-80F9623CE128}",
+            "base": "{D0A2F62C-EB98-51CC-A482-80F9623CE128}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomUnitVector3",
+                "name": "Random Unit Vector3",
                 "category": "Math/Random",
-                "tooltip": "returns a random Vector3 direction",
-                "subtitle": "Random"
+                "tooltip": "Returns a random Vector3 direction"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names
index 5fe7c74d9c..0128628cb4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{00E27150-6B42-5C54-B600-70051B106C82}",
+            "base": "{00E27150-6B42-5C54-B600-70051B106C82}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomVector2",
+                "name": "Random Vector2",
                 "category": "Math/Random",
-                "tooltip": "returns a random Vector2",
-                "subtitle": "Random"
+                "tooltip": "Returns a random Vector2"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Vector2: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Vector2: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names
index 29c2859b23..d77f6e96c6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{0A1CA315-EFAB-50DC-8C61-2C9763D25E31}",
+            "base": "{0A1CA315-EFAB-50DC-8C61-2C9763D25E31}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomVector3",
+                "name": "Random Vector3",
                 "category": "Math/Random",
-                "tooltip": "returns a random Vector3",
-                "subtitle": "Random"
+                "tooltip": "Returns a random Vector3"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Vector3: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Vector3: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names
index f6ec9b52c9..df7bd9384f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{1C8987BF-7EA0-58CF-A4CC-2A998C9ADA68}",
+            "base": "{1C8987BF-7EA0-58CF-A4CC-2A998C9ADA68}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RandomVector4",
+                "name": "Random Vector4",
                 "category": "Math/Random",
-                "tooltip": "returns a random Vector4",
-                "subtitle": "Random"
+                "tooltip": "Returns a random Vector4"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Vector4: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Vector4: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names
index db82a0ef2c..70826cd581 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{BC6D613C-CBE5-5B01-9207-16D0B158799D}",
+            "base": "{BC6D613C-CBE5-5B01-9207-16D0B158799D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMatrix3x3",
+                "name": "From Matrix3x3",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform with from 3x3 matrix and with the translation set to zero",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform with from 3x3 matrix and with the translation set to zero"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Matrix3x3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names
index a3e3c145bf..a64be79b93 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{D2321D1F-C3B8-516E-AFE2-3A536A89BCAB}",
+            "base": "{D2321D1F-C3B8-516E-AFE2-3A536A89BCAB}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromMatrix3x3AndTranslation",
+                "name": "From Matrix3x3 And Translation",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform from the 3x3 matrix and the translation",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform from the 3x3 matrix and the translation"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Matrix3x3: Matrix",
+                    "base": "DataInput_Matrix",
                     "details": {
-                        "name": "Matrix3x3: Matrix"
+                        "name": "Matrix"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Translation",
+                    "base": "DataInput_Translation",
                     "details": {
-                        "name": "Vector3: Translation"
+                        "name": "Translation"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names
index 3e0d34ddb7..db1f5d7706 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{B5BCF19E-2EF2-584E-B4B6-0FC7E9FEE99B}",
+            "base": "{B5BCF19E-2EF2-584E-B4B6-0FC7E9FEE99B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotation",
+                "name": "From Rotation",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform from the rotation and with the translation set to zero",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform from the rotation and with the translation set to zero"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Quaternion: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names
index 8c2711d55b..0a44bbe29f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{C2A304B1-9D48-5A2A-BCEE-69BCD72379E3}",
+            "base": "{C2A304B1-9D48-5A2A-BCEE-69BCD72379E3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromRotationAndTranslation",
+                "name": "From Rotation And Translation",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform from the rotation and the translation",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform from the rotation and the translation"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Quaternion: Rotation",
+                    "base": "DataInput_Rotation",
                     "details": {
-                        "name": "Quaternion: Rotation"
+                        "name": "Rotation"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Translation",
+                    "base": "DataInput_Translation",
                     "details": {
-                        "name": "Vector3: Translation"
+                        "name": "Translation"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names
index 713dcda37e..071ead3598 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{5DAB6076-4F49-5163-9E3C-CE3DF59E710C}",
+            "base": "{5DAB6076-4F49-5163-9E3C-CE3DF59E710C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromScale",
+                "name": "From Scale",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform which applies the specified uniform Scale, but no rotation or translation",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform which applies the specified uniform Scale, but no rotation or translation"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names
index 296c785033..391dfd9bee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{DFCF0A6F-9907-52B1-BBF3-632CB929C1B1}",
+            "base": "{DFCF0A6F-9907-52B1-BBF3-632CB929C1B1}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromTranslation",
+                "name": "From Translation",
                 "category": "Math/Transform",
-                "tooltip": "returns a translation matrix and the rotation set to zero",
-                "subtitle": "Transform"
+                "tooltip": "Returns a translation matrix and the rotation set to zero"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Translation",
+                    "base": "DataInput_Translation",
                     "details": {
-                        "name": "Vector3: Translation"
+                        "name": "Translation"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names
index 5945a1ae06..9356423bc4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{1D27BC5A-44D6-526E-B1EC-4B080B750ED1}",
+            "base": "{1D27BC5A-44D6-526E-B1EC-4B080B750ED1}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetForward",
+                "name": "Get Forward",
                 "category": "Math/Transform",
-                "tooltip": "returns the forward direction vector from the specified transform scaled by a given value (O3DE uses Z up, right handed)",
-                "subtitle": "Transform"
+                "tooltip": "Returns the forward direction vector from the specified transform scaled by a given value (O3DE uses Z up, right handed)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names
index 31b01e4787..8723a54349 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{78E62FB8-7CD0-5E4D-BA31-9E62867C4F6A}",
+            "base": "{78E62FB8-7CD0-5E4D-BA31-9E62867C4F6A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetRight",
+                "name": "Get Right",
                 "category": "Math/Transform",
-                "tooltip": "returns the right direction vector from the specified transform scaled by a given value (O3DE uses Z up, right handed)",
-                "subtitle": "Transform"
+                "tooltip": "Returns the right direction vector from the specified transform scaled by a given value (O3DE uses Z up, right handed)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names
index 671a641f6f..276db70fa1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{BA0C1841-5632-5329-BCD3-CDF12B1D8682}",
+            "base": "{BA0C1841-5632-5329-BCD3-CDF12B1D8682}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetTranslation",
+                "name": "Get Translation",
                 "category": "Math/Transform",
-                "tooltip": "returns the translation of Source",
-                "subtitle": "Transform"
+                "tooltip": "Returns the translation of Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names
index 2b6c1e7f5b..cf3dbd3e8c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{0351A1F0-7F51-58C2-9ED4-F617B897A523}",
+            "base": "{0351A1F0-7F51-58C2-9ED4-F617B897A523}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetUp",
+                "name": "Get Up",
                 "category": "Math/Transform",
-                "tooltip": "returns the up direction vector from the specified transform scaled by a given value (O3DE uses Z up, right handed)",
-                "subtitle": "Transform"
+                "tooltip": "Returns the up direction vector from the specified transform scaled by a given value (O3DE uses Z up, right handed)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names
index b0a4021edc..65af93c3d0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{D58A9E0D-5C09-56AB-8D8C-C9C501BA62A3}",
+            "base": "{D58A9E0D-5C09-56AB-8D8C-C9C501BA62A3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Transform",
-                "tooltip": "returns true if every row of A is within Tolerance of corresponding row in B, else false",
-                "subtitle": "Transform"
+                "tooltip": "Returns true if every row of A is within Tolerance of corresponding row in B, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Transform: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Transform: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names
index d37de79fb8..f98506dd62 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{BFF80CFD-5A54-5ADA-83FF-3849FD4E675D}",
+            "base": "{BFF80CFD-5A54-5ADA-83FF-3849FD4E675D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Transform",
-                "tooltip": "returns true if every row of source is finite, else false",
-                "subtitle": "Transform"
+                "tooltip": "Returns true if every row of source is finite, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names
index 0e711ac6fa..f4dd80a4a2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{D6B704EB-62A7-5CEB-B715-4CD402E1BAF9}",
+            "base": "{D6B704EB-62A7-5CEB-B715-4CD402E1BAF9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsOrthogonal",
+                "name": "Is Orthogonal",
                 "category": "Math/Transform",
-                "tooltip": "returns true if the upper 3x3 matrix of Source is within Tolerance of orthogonal, else false",
-                "subtitle": "Transform"
+                "tooltip": "Returns true if the upper 3x3 matrix of Source is within Tolerance of orthogonal, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names
index 691bd412cf..f8bcbc41a7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{493F14D7-FC42-5544-9BA1-400762EB6D41}",
+            "base": "{493F14D7-FC42-5544-9BA1-400762EB6D41}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByUniformScale",
+                "name": "Multiply By Uniform Scale",
                 "category": "Math/Transform",
-                "tooltip": "returns Source multiplied uniformly by Scale",
-                "subtitle": "Transform"
+                "tooltip": "Returns Source multiplied uniformly by Scale"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names
index 18fa67ce86..d51e766840 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{00EEE23E-7FAC-5DE4-A3B1-9AC4DBD40AE4}",
+            "base": "{00EEE23E-7FAC-5DE4-A3B1-9AC4DBD40AE4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByVector3",
+                "name": "Multiply By Vector3",
                 "category": "Math/Transform",
-                "tooltip": "returns Source post multiplied by Multiplier",
-                "subtitle": "Transform"
+                "tooltip": "Returns Source post multiplied by Multiplier"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Vector3: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names
index eb22b5daa9..2e11891d0f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{FB87C32E-BB06-5499-B210-4EE109C419DC}",
+            "base": "{FB87C32E-BB06-5499-B210-4EE109C419DC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByVector4",
+                "name": "Multiply By Vector4",
                 "category": "Math/Transform",
-                "tooltip": "returns Source post multiplied by Multiplier",
-                "subtitle": "Transform"
+                "tooltip": "Returns Source post multiplied by Multiplier"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Vector4: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names
index 928a8ed811..94598629b6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{0CF20F04-C784-546B-80FB-0A705BB3D25A}",
+            "base": "{0CF20F04-C784-546B-80FB-0A705BB3D25A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Orthogonalize",
                 "category": "Math/Transform",
-                "tooltip": "returns an orthogonal matrix if the Source is almost orthogonal",
-                "subtitle": "Transform"
+                "tooltip": "Returns an orthogonal matrix if the Source is almost orthogonal"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names
index 5db0abd4d8..353eb26615 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{93283EA1-ADED-53B8-B3BE-A7B933918286}",
+            "base": "{93283EA1-ADED-53B8-B3BE-A7B933918286}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotationXDegrees",
+                "name": "Rotation X (Degrees)",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform representing a rotation Degrees around the X-Axis",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform representing a rotation Degrees around the X-Axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names
index 4861a3d6b4..d5f5469593 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{380DB52D-3BEB-553C-B903-F5824AE1A0C6}",
+            "base": "{380DB52D-3BEB-553C-B903-F5824AE1A0C6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotationYDegrees",
+                "name": "Rotation Y (Degrees)",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform representing a rotation Degrees around the Y-Axis",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform representing a rotation Degrees around the Y-Axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names
index 78d4211f65..8431b15578 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{70D7DC40-B9AB-55F6-8E80-A9F8EA9BE964}",
+            "base": "{70D7DC40-B9AB-55F6-8E80-A9F8EA9BE964}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "RotationZDegrees",
+                "name": "Rotation Z (Degrees)",
                 "category": "Math/Transform",
-                "tooltip": "returns a transform representing a rotation Degrees around the Z-Axis",
-                "subtitle": "Transform"
+                "tooltip": "Returns a transform representing a rotation Degrees around the Z-Axis"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Degrees",
+                    "base": "DataInput_Degrees",
                     "details": {
-                        "name": "Number: Degrees"
+                        "name": "Degrees"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Transform",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Transform"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names
index 47f28fd9af..531f0b1b38 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{AC6712AA-0494-5879-B7F8-4B04352924DE}",
+            "base": "{AC6712AA-0494-5879-B7F8-4B04352924DE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToScale",
+                "name": "To Scale",
                 "category": "Math/Transform",
-                "tooltip": "returns the uniform scale of the Source",
-                "subtitle": "Transform"
+                "tooltip": "Returns the uniform scale of the Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Transform: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Transform: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names
index bd5e3a88f6..bd72341c6d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{97858B5F-57A8-5DE4-BA1D-ABE2504DE79D}",
+            "base": "{97858B5F-57A8-5DE4-BA1D-ABE2504DE79D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Absolute",
                 "category": "Math/Vector2",
-                "tooltip": "returns a vector with the absolute values of the elements of the source",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a vector with the absolute values of the elements of the source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names
index 76f0626c0c..7efe070c80 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{BAA9A44B-EC0E-536B-B64A-EA652596F40A}",
+            "base": "{BAA9A44B-EC0E-536B-B64A-EA652596F40A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Angle",
                 "category": "Math/Vector2",
-                "tooltip": "returns a unit length vector from an angle in radians",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a unit length vector from an angle in radians"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Angle",
+                    "base": "DataInput_Angle",
                     "details": {
-                        "name": "Number: Angle"
+                        "name": "Angle"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names
index 718f497f51..2a4f580d95 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{636D27FE-E3E3-5983-A364-9147CD42F2D2}",
+            "base": "{636D27FE-E3E3-5983-A364-9147CD42F2D2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Clamp",
                 "category": "Math/Vector2",
-                "tooltip": "returns vector clamped to [min, max] and equal to source if possible",
-                "subtitle": "Vector2"
+                "tooltip": "Returns vector clamped to [min, max] and equal to source if possible"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Vector2: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Vector2: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names
index f6499bc67c..58ef596560 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names
@@ -1,56 +1,49 @@
 {
     "entries": [
         {
-            "key": "{ECDE911F-56B4-5D91-86A6-32C4F9461305}",
+            "base": "{ECDE911F-56B4-5D91-86A6-32C4F9461305}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "DirectionTo",
+                "name": "Direction To",
                 "category": "Math/Vector2",
-                "tooltip": "Returns a direction vector between two points and the distance between them, by default the direction will be normalized, but it may be optionally scaled using the Scale parameter if different from 1.0",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a direction vector between two points and the distance between them, by default the direction will be normalized, but it may be optionally scaled using the Scale parameter if different from 1.0"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector2: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector2: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
-                    }
-                },
-                {
-                    "key": "DataOutput_Result: Number",
-                    "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names
index ac09369515..5d6b79ef69 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{38BE4B13-7B8C-5FCF-9313-74E6C9C3BE06}",
+            "base": "{38BE4B13-7B8C-5FCF-9313-74E6C9C3BE06}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Distance",
                 "category": "Math/Vector2",
-                "tooltip": "returns the distance from B to A, that is the magnitude of the vector (A - B)",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the distance from B to A, that is the magnitude of the vector (A - B)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names
index 88616d077a..cc12b409ee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{1CBF4712-4BB5-5FB9-BC5F-C34E0C076334}",
+            "base": "{1CBF4712-4BB5-5FB9-BC5F-C34E0C076334}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "DistanceSquared",
+                "name": "Distance Squared",
                 "category": "Math/Vector2",
-                "tooltip": "returns the distance squared from B to A, (generally faster than the actual distance if only needed for comparison)",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the distance squared from B to A, (generally faster than the actual distance if only needed for comparison)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names
index f0490c0224..19db3eb635 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{9F91A118-D85A-5357-ACE3-92A78AA2C4FC}",
+            "base": "{9F91A118-D85A-5357-ACE3-92A78AA2C4FC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Dot",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector dot product of A dot B",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector dot product of A dot B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names
index 7ada76f810..d68a9ffc30 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{10158AAB-73B0-5863-A7CA-11616E05CBE4}",
+            "base": "{10158AAB-73B0-5863-A7CA-11616E05CBE4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromValues",
+                "name": "From Values",
                 "category": "Math/Vector2",
-                "tooltip": "returns a vector from elements",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a vector from elements"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: X",
+                    "base": "DataInput_X",
                     "details": {
-                        "name": "Number: X"
+                        "name": "X"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Y",
+                    "base": "DataInput_Y",
                     "details": {
-                        "name": "Number: Y"
+                        "name": "Y"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names
index c85cfe67af..bcd119556c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{4843E512-0335-5411-A548-8AC8245B6845}",
+            "base": "{4843E512-0335-5411-A548-8AC8245B6845}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetElement",
+                "name": "Get Element",
                 "category": "Math/Vector2",
-                "tooltip": "returns the element corresponding to the index (0 -> x) (1 -> y)",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the element corresponding to the index (0 -> x) (1 -> y)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Index",
+                    "base": "DataInput_Index",
                     "details": {
-                        "name": "Number: Index"
+                        "name": "Index"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names
index 38b1f446c9..4146bc08de 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{82F6EBA6-BBF5-5063-84E6-8C4BCEF7E4A3}",
+            "base": "{82F6EBA6-BBF5-5063-84E6-8C4BCEF7E4A3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Vector2",
-                "tooltip": "returns true if the difference between A and B is less than tolerance, else false",
-                "subtitle": "Vector2"
+                "tooltip": "Returns true if the difference between A and B is less than tolerance, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names
index b56cbc74e1..9b45bb21b7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{3D6F65B5-020D-55EE-B807-C54D10DDC647}",
+            "base": "{3D6F65B5-020D-55EE-B807-C54D10DDC647}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Vector2",
-                "tooltip": "returns true if every element in the source is finite, else false",
-                "subtitle": "Vector2"
+                "tooltip": "Returns true if every element in the source is finite, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names
index 7a737fa8e1..151baa29b0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{AD815735-ED31-535E-BEEF-471259B271E3}",
+            "base": "{AD815735-ED31-535E-BEEF-471259B271E3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsNormalized",
+                "name": "Is Normalized",
                 "category": "Math/Vector2",
-                "tooltip": "returns true if the length of the source is within tolerance of 1.0, else false",
-                "subtitle": "Vector2"
+                "tooltip": "Returns true if the length of the source is within tolerance of 1.0, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names
index 07fc13fbc6..3f183cfe56 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{A8F6E886-BFCC-5546-8516-1564C1A56D18}",
+            "base": "{A8F6E886-BFCC-5546-8516-1564C1A56D18}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsZero",
+                "name": "Is Zero",
                 "category": "Math/Vector2",
-                "tooltip": "returns true if A is within tolerance of the zero vector, else false",
-                "subtitle": "Vector2"
+                "tooltip": "Returns true if A is within tolerance of the zero vector, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names
index c6f78e8083..cb76ac347b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{AD0A51F8-F87B-504E-84F0-8C60927D3798}",
+            "base": "{AD0A51F8-F87B-504E-84F0-8C60927D3798}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Length",
                 "category": "Math/Vector2",
-                "tooltip": "returns the magnitude of source",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the magnitude of source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names
index 2d70c7e4e4..112d82d5e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{EF19330A-6FF7-5B8C-B029-C429525A3223}",
+            "base": "{EF19330A-6FF7-5B8C-B029-C429525A3223}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthSquared",
+                "name": "Length Squared",
                 "category": "Math/Vector2",
-                "tooltip": "returns the magnitude squared of the source, generally faster than getting the exact length",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the magnitude squared of the source, generally faster than getting the exact length"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names
index 296c05bdf5..49711526b7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{978B5227-CE5B-501A-8EA8-54DE40DFF558}",
+            "base": "{978B5227-CE5B-501A-8EA8-54DE40DFF558}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Lerp",
                 "category": "Math/Vector2",
-                "tooltip": "returns the linear interpolation (From + ((To - From) * T)",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the linear interpolation (From + ((To - From) * T)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector2: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector2: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names
index 52b3489c28..d6ff44c21c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{5CA4EE87-53A9-514C-8278-F311F447B7B1}",
+            "base": "{5CA4EE87-53A9-514C-8278-F311F447B7B1}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Max",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector (max(A.x, B.x), max(A.y, B.y))",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector (max(A.x, B.x), max(A.y, B.y))"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names
index 33585a0662..5563f69c00 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{894F73E5-0447-5627-9B16-FDD649DA7A42}",
+            "base": "{894F73E5-0447-5627-9B16-FDD649DA7A42}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Min",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector (min(A.x, B.x), min(A.y, B.y))",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector (min(A.x, B.x), min(A.y, B.y))"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names
index 13a43e0593..f63137d25f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{4FA0D3F0-A95B-5DEB-B46D-E9D08C43D55E}",
+            "base": "{4FA0D3F0-A95B-5DEB-B46D-E9D08C43D55E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByNumber",
+                "name": "Multiply By Number",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector Source with each element multiplied by Multiplier",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector Source with each element multiplied by Multiplier"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Number: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names
index 79a5e7c6e2..1eb48cf3a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{E4C28D60-B4AA-555A-BE46-DB4D7196C532}",
+            "base": "{E4C28D60-B4AA-555A-BE46-DB4D7196C532}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Negate",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector Source with each element multiplied by -1",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector Source with each element multiplied by -1"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names
index 9b7ba9a72e..ae4ee365ef 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{E019ADBA-0793-5653-A4BD-446F41FED0BC}",
+            "base": "{E019ADBA-0793-5653-A4BD-446F41FED0BC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Normalize",
                 "category": "Math/Vector2",
-                "tooltip": "returns a unit length vector in the same direction as the source, or (1,0,0) if the source length is too small",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a unit length vector in the same direction as the source, or (1,0,0) if the source length is too small"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names
index fbf04133a8..e6bd531852 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{F4826124-F3C7-59B5-B92B-4CD00AADFED3}",
+            "base": "{F4826124-F3C7-59B5-B92B-4CD00AADFED3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Project",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector of A projected onto B, (Dot(A, B)/(Dot(B, B)) * B",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector of A projected onto B, (Dot(A, B)/(Dot(B, B)) * B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector2: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector2: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names
index 2d055c4d63..4a96a8154e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{6FA3AADA-3B14-5C7C-8F7C-75818C3AEC94}",
+            "base": "{6FA3AADA-3B14-5C7C-8F7C-75818C3AEC94}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetX",
+                "name": "Set X",
                 "category": "Math/Vector2",
-                "tooltip": "returns a the vector(X, Source.Y)",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a the vector(X, Source.Y)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: X",
+                    "base": "DataInput_X",
                     "details": {
-                        "name": "Number: X"
+                        "name": "X"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names
index 74e2a7197c..bdde07b53c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{2969A368-000E-5723-8821-1B97790917E7}",
+            "base": "{2969A368-000E-5723-8821-1B97790917E7}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetY",
+                "name": "Set Y",
                 "category": "Math/Vector2",
-                "tooltip": "returns a the vector(Source.X, Y)",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a the vector(Source.X, Y)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Y",
+                    "base": "DataInput_Y",
                     "details": {
-                        "name": "Number: Y"
+                        "name": "Y"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names
index 703f0e858b..26b5579174 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{6071D322-86AF-5900-B073-33E74146525B}",
+            "base": "{6071D322-86AF-5900-B073-33E74146525B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Slerp",
                 "category": "Math/Vector2",
-                "tooltip": "returns a vector that is the spherical linear interpolation T, between From and To",
-                "subtitle": "Vector2"
+                "tooltip": "Returns a vector that is the spherical linear interpolation T, between From and To"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector2: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector2: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names
index 2e4ae9369c..f78ec6a232 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{78889490-B826-5682-9464-117DB8083AF4}",
+            "base": "{78889490-B826-5682-9464-117DB8083AF4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToPerpendicular",
+                "name": "To Perpendicular",
                 "category": "Math/Vector2",
-                "tooltip": "returns the vector (-Source.y, Source.x), a 90 degree, positive rotation",
-                "subtitle": "Vector2"
+                "tooltip": "Returns the vector (-Source.y, Source.x), a 90 degree, positive rotation"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector2: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector2: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector2",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector2"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names
index 6253641670..a20c7413d7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{8C3D49FD-9913-5104-B67B-2DFC9223E08B}",
+            "base": "{8C3D49FD-9913-5104-B67B-2DFC9223E08B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Absolute",
                 "category": "Math/Vector3",
-                "tooltip": "returns a vector with the absolute values of the elements of the source",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a vector with the absolute values of the elements of the source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names
index 3d8de21436..8f08fb24c2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{07875A9A-81DF-59BA-95E8-3BB5D3E7CF0E}",
+            "base": "{07875A9A-81DF-59BA-95E8-3BB5D3E7CF0E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "BuildTangentBasis",
+                "name": "Build Tangent Basis",
                 "category": "Math/Vector3",
-                "tooltip": "returns a tangent basis from the normal",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a tangent basis from the normal"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Normal",
+                    "base": "DataInput_Normal",
                     "details": {
-                        "name": "Vector3: Normal"
+                        "name": "Normal"
                     }
                 },
                 {
-                    "key": "DataOutput_Tangent: Vector3",
+                    "base": "DataOutput_Tangent",
                     "details": {
-                        "name": "Tangent: Vector3"
+                        "name": "Tangent"
                     }
                 },
                 {
-                    "key": "DataOutput_Bitangent: Vector3",
+                    "base": "DataOutput_Bitangent",
                     "details": {
-                        "name": "Bitangent: Vector3"
+                        "name": "Bitangent"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names
index 6f1842a151..15109364fd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{F14339D1-DB1C-584F-A91E-2D10D29255DF}",
+            "base": "{F14339D1-DB1C-584F-A91E-2D10D29255DF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Clamp",
                 "category": "Math/Vector3",
-                "tooltip": "returns vector clamped to [min, max] and equal to source if possible",
-                "subtitle": "Vector3"
+                "tooltip": "Returns vector clamped to [min, max] and equal to source if possible"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Min",
+                    "base": "DataInput_Min",
                     "details": {
-                        "name": "Vector3: Min"
+                        "name": "Min"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Max",
+                    "base": "DataInput_Max",
                     "details": {
-                        "name": "Vector3: Max"
+                        "name": "Max"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names
index ed9184dd39..a23b88920e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{8645F3FA-D1BE-59A2-B183-19FEA198101D}",
+            "base": "{8645F3FA-D1BE-59A2-B183-19FEA198101D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Cross",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector cross product of A X B",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector cross product of A X B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names
index 3e1a50ff1b..5071b5d52c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names
@@ -1,56 +1,49 @@
 {
     "entries": [
         {
-            "key": "{CA0FE782-4D45-5CFD-94D4-88CC687429FB}",
+            "base": "{CA0FE782-4D45-5CFD-94D4-88CC687429FB}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "DirectionTo",
+                "name": "Direction To",
                 "category": "Math/Vector3",
-                "tooltip": "Returns a direction vector between two points and the distance between them, by default the direction will be normalized, but it may be optionally scaled using the Scale parameter if different from 1.0",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a direction vector between two points and the distance between them, by default the direction will be normalized, but it may be optionally scaled using the Scale parameter if different from 1.0"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector3: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector3: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
-                    }
-                },
-                {
-                    "key": "DataOutput_Result: Number",
-                    "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names
index 255663090c..3d38a8d9d1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{2326F5E9-022F-5754-9A65-8E4BBD712A5A}",
+            "base": "{2326F5E9-022F-5754-9A65-8E4BBD712A5A}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Distance",
                 "category": "Math/Vector3",
-                "tooltip": "returns the distance from B to A, that is the magnitude of the vector (A - B)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the distance from B to A, that is the magnitude of the vector (A - B)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names
index 12c52b7efe..56f45fbec4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{920C0CA6-3393-5AC7-805E-09D52E134ED4}",
+            "base": "{920C0CA6-3393-5AC7-805E-09D52E134ED4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "DistanceSquared",
+                "name": "Distance Squared",
                 "category": "Math/Vector3",
-                "tooltip": "returns the distance squared from B to A, (generally faster than the actual distance if only needed for comparison)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the distance squared from B to A, (generally faster than the actual distance if only needed for comparison)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names
index 7e811e9b0e..c86dac30a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{233F747E-7E53-5F9F-8355-EBF96FAAAEE4}",
+            "base": "{233F747E-7E53-5F9F-8355-EBF96FAAAEE4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Dot",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector dot product of A dot B",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector dot product of A dot B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names
index ed2092f2f6..10831f85ed 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{A3F601EF-4E3C-5852-ADE9-D3F8FA9D571D}",
+            "base": "{A3F601EF-4E3C-5852-ADE9-D3F8FA9D571D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromValues",
+                "name": "From Values",
                 "category": "Math/Vector3",
-                "tooltip": "returns a vector from elements",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a vector from elements"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: X",
+                    "base": "DataInput_X",
                     "details": {
-                        "name": "Number: X"
+                        "name": "X"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Y",
+                    "base": "DataInput_Y",
                     "details": {
-                        "name": "Number: Y"
+                        "name": "Y"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Z",
+                    "base": "DataInput_Z",
                     "details": {
-                        "name": "Number: Z"
+                        "name": "Z"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names
index 6b2375e69c..ae6ce083ac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{E009C313-15F5-5B1F-99F0-8C83555BA8E1}",
+            "base": "{E009C313-15F5-5B1F-99F0-8C83555BA8E1}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetElement",
+                "name": "Get Element",
                 "category": "Math/Vector3",
-                "tooltip": "returns the element corresponding to the index (0 -> x) (1 -> y) (2 -> z)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the element corresponding to the index (0 -> x) (1 -> y) (2 -> z)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Index",
+                    "base": "DataInput_Index",
                     "details": {
-                        "name": "Number: Index"
+                        "name": "Index"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names
index 728ff6f9f8..5e5c09923c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{4C54A897-39D7-5612-AAA6-B5CC25D65CE2}",
+            "base": "{4C54A897-39D7-5612-AAA6-B5CC25D65CE2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Vector3",
-                "tooltip": "returns true if the difference between A and B is less than tolerance, else false",
-                "subtitle": "Vector3"
+                "tooltip": "Returns true if the difference between A and B is less than tolerance, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names
index 2cd0e9b94a..e527e8bf35 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{7C09FF34-0608-57A9-8CEE-66DCA0485F08}",
+            "base": "{7C09FF34-0608-57A9-8CEE-66DCA0485F08}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Vector3",
-                "tooltip": "returns true if every element in the source is finite, else false",
-                "subtitle": "Vector3"
+                "tooltip": "Returns true if every element in the source is finite, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names
index 4847d3096e..e9f64e84fb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{7C895C3A-972B-5CF4-9F1D-62C2A9BBBEAD}",
+            "base": "{7C895C3A-972B-5CF4-9F1D-62C2A9BBBEAD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsNormalized",
+                "name": "Is Normalized",
                 "category": "Math/Vector3",
-                "tooltip": "returns true if the length of the source is within tolerance of 1.0, else false",
-                "subtitle": "Vector3"
+                "tooltip": "Returns true if the length of the source is within tolerance of 1.0, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names
index 245b7b2e32..c4adec6436 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{775DA8B7-881F-55AF-911B-9CD28DC5F9B0}",
+            "base": "{775DA8B7-881F-55AF-911B-9CD28DC5F9B0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsPerpendicular",
+                "name": "Is Perpendicular",
                 "category": "Math/Vector3",
-                "tooltip": "returns true if A is within tolerance of perpendicular with B, that is if Dot(A, B) < tolerance, else false",
-                "subtitle": "Vector3"
+                "tooltip": "Returns true if A is within tolerance of perpendicular with B, that is if Dot(A, B) < tolerance, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names
index f7adf9fb80..f65485eb78 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{282F32C7-5806-5C1A-BA31-E14E37913599}",
+            "base": "{282F32C7-5806-5C1A-BA31-E14E37913599}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsZero",
+                "name": "Is Zero",
                 "category": "Math/Vector3",
-                "tooltip": "returns true if A is within tolerance of the zero vector, else false",
-                "subtitle": "Vector3"
+                "tooltip": "Returns true if A is within tolerance of the zero vector, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names
index 2227256047..6861dab138 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{899CC124-10D8-5081-BD8E-00BD2B0DAD2B}",
+            "base": "{899CC124-10D8-5081-BD8E-00BD2B0DAD2B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Length",
                 "category": "Math/Vector3",
-                "tooltip": "returns the magnitude of source",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the magnitude of source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names
index dfeffe512a..12ded27f2e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{299657FE-6A44-52DA-919E-3F266EFC7535}",
+            "base": "{299657FE-6A44-52DA-919E-3F266EFC7535}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthReciprocal",
+                "name": "Length Reciprocal",
                 "category": "Math/Vector3",
-                "tooltip": "returns the 1 / magnitude of the source",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the 1 / magnitude of the source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names
index dd6c8162c1..9a97dbb263 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{12A6C1D4-5C8A-5FFB-B7BC-E5E983DA72CC}",
+            "base": "{12A6C1D4-5C8A-5FFB-B7BC-E5E983DA72CC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthSquared",
+                "name": "Length Squared",
                 "category": "Math/Vector3",
-                "tooltip": "returns the magnitude squared of the source, generally faster than getting the exact length",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the magnitude squared of the source, generally faster than getting the exact length"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names
index 9e28229b8c..c320ce31a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{722A4327-0D64-5ADF-BCDD-CDCF7EDDD16D}",
+            "base": "{722A4327-0D64-5ADF-BCDD-CDCF7EDDD16D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Lerp",
                 "category": "Math/Vector3",
-                "tooltip": "returns the linear interpolation (From + ((To - From) * T)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the linear interpolation (From + ((To - From) * T)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector3: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector3: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names
index 00e3e0ff01..d429e45202 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{C1E9BE9C-DD4E-5AD5-BFBD-23A012619BD3}",
+            "base": "{C1E9BE9C-DD4E-5AD5-BFBD-23A012619BD3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Max",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector (max(A.x, B.x), max(A.y, B.y), max(A.z, B.z))",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector (max(A.x, B.x), max(A.y, B.y), max(A.z, B.z))"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names
index a8fbd3eacf..eef2baf012 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{343EA674-C05F-5803-BB86-C6D26C3F6D89}",
+            "base": "{343EA674-C05F-5803-BB86-C6D26C3F6D89}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Min",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector (min(A.x, B.x), min(A.y, B.y), min(A.z, B.z))",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector (min(A.x, B.x), min(A.y, B.y), min(A.z, B.z))"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names
index ca55548138..9637449b22 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{B1CAAC2D-A568-5CB2-B580-5B239D013466}",
+            "base": "{B1CAAC2D-A568-5CB2-B580-5B239D013466}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByNumber",
+                "name": "Multiply By Number",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector Source with each element multiplied by Multipler",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector Source with each element multiplied by Multipler"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Number: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names
index 2924facb4f..b0fa0beae4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{A239FB13-643C-5D47-9580-A373491FECCA}",
+            "base": "{A239FB13-643C-5D47-9580-A373491FECCA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Negate",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector Source with each element multiplied by -1",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector Source with each element multiplied by -1"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names
index 26a7c65467..a0f535b4d4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{CF4EBDEE-B16A-5402-B44D-75FF06AD89AE}",
+            "base": "{CF4EBDEE-B16A-5402-B44D-75FF06AD89AE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Normalize",
                 "category": "Math/Vector3",
-                "tooltip": "returns a unit length vector in the same direction as the source, or (1,0,0) if the source length is too small",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a unit length vector in the same direction as the source, or (1,0,0) if the source length is too small"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names
index b161686bfb..ff18755ecb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{D24123BA-6C59-5F58-90E2-FCB085384BAA}",
+            "base": "{D24123BA-6C59-5F58-90E2-FCB085384BAA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Project",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector of A projected onto B, (Dot(A, B)/(Dot(B, B)) * B",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector of A projected onto B, (Dot(A, B)/(Dot(B, B)) * B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector3: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector3: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names
index 0bafc4373f..de65bf82ea 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{E90663EA-FFD1-5908-8530-3C21BD6A9A62}",
+            "base": "{E90663EA-FFD1-5908-8530-3C21BD6A9A62}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Reciprocal",
                 "category": "Math/Vector3",
-                "tooltip": "returns the vector (1/x, 1/y, 1/z) with elements from Source",
-                "subtitle": "Vector3"
+                "tooltip": "Returns the vector (1/x, 1/y, 1/z) with elements from Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names
index ee8c305f52..7db313ffca 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{A5945988-1E94-5560-B1EE-B513AD113E1C}",
+            "base": "{A5945988-1E94-5560-B1EE-B513AD113E1C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetX",
+                "name": "Set X",
                 "category": "Math/Vector3",
-                "tooltip": "returns a the vector(X, Source.Y, Source.Z)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a the vector(X, Source.Y, Source.Z)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: X",
+                    "base": "DataInput_X",
                     "details": {
-                        "name": "Number: X"
+                        "name": "X"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names
index b9c40fc2d0..db5299df5b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{08880FE1-8C3E-5380-A3FF-CA1AE16953FC}",
+            "base": "{08880FE1-8C3E-5380-A3FF-CA1AE16953FC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetY",
+                "name": "Set Y",
                 "category": "Math/Vector3",
-                "tooltip": "returns a the vector(Source.X, Y, Source.Z)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a the vector(Source.X, Y, Source.Z)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Y",
+                    "base": "DataInput_Y",
                     "details": {
-                        "name": "Number: Y"
+                        "name": "Y"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names
index 87913290bc..c8239d2d46 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{12C93A22-5B0B-55CC-90FC-7DB17C1C36DF}",
+            "base": "{12C93A22-5B0B-55CC-90FC-7DB17C1C36DF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetZ",
+                "name": "Set Z",
                 "category": "Math/Vector3",
-                "tooltip": "returns a the vector(Source.X, Source.Y, Z)",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a the vector(Source.X, Source.Y, Z)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector3: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Z",
+                    "base": "DataInput_Z",
                     "details": {
-                        "name": "Number: Z"
+                        "name": "Z"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names
index 9c219f2908..5052d03400 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{55EA4F53-2789-54B2-9CC7-4DB62B2CB270}",
+            "base": "{55EA4F53-2789-54B2-9CC7-4DB62B2CB270}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Slerp",
                 "category": "Math/Vector3",
-                "tooltip": "returns a vector that is the spherical linear interpolation T, between From and To",
-                "subtitle": "Vector3"
+                "tooltip": "Returns a vector that is the spherical linear interpolation T, between From and To"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector3: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector3: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: T",
+                    "base": "DataInput_T",
                     "details": {
-                        "name": "Number: T"
+                        "name": "T"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector3",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector3"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names
index 98d0326bda..c5ebee0f5a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{A5BAEA40-C676-5C16-AEA0-D01C78E5918E}",
+            "base": "{A5BAEA40-C676-5C16-AEA0-D01C78E5918E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Absolute",
                 "category": "Math/Vector4",
-                "tooltip": "returns a vector with the absolute values of the elements of the source",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a vector with the absolute values of the elements of the source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names
index 87729c3639..e8ab09461e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names
@@ -1,56 +1,49 @@
 {
     "entries": [
         {
-            "key": "{1FC1ABCB-220E-5CBF-AE38-14E7389D0AE4}",
+            "base": "{1FC1ABCB-220E-5CBF-AE38-14E7389D0AE4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "DirectionTo",
+                "name": "Direction To",
                 "category": "Math/Vector4",
-                "tooltip": "Returns a direction vector between two points and the distance between them, by default the direction will be normalized, but it may be optionally scaled using the Scale parameter if different from 1.0",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a direction vector between two points and the distance between them, by default the direction will be normalized, but it may be optionally scaled using the Scale parameter if different from 1.0"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: From",
+                    "base": "DataInput_From",
                     "details": {
-                        "name": "Vector4: From"
+                        "name": "From"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: To",
+                    "base": "DataInput_To",
                     "details": {
-                        "name": "Vector4: To"
+                        "name": "To"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Scale",
+                    "base": "DataInput_Scale",
                     "details": {
-                        "name": "Number: Scale"
+                        "name": "Scale"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
-                    }
-                },
-                {
-                    "key": "DataOutput_Result: Number",
-                    "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names
index 077a4327bb..d780f4379b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{59AF8BA5-11BA-5E5E-982C-2E7A8C6600D4}",
+            "base": "{59AF8BA5-11BA-5E5E-982C-2E7A8C6600D4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Dot",
                 "category": "Math/Vector4",
-                "tooltip": "returns the vector dot product of A dot B",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the vector dot product of A dot B"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector4: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector4: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names
index 5afa061714..1f362d71f9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names
@@ -1,56 +1,55 @@
 {
     "entries": [
         {
-            "key": "{DFDC391C-782D-58D9-BF81-C7B13A0F4CFC}",
+            "base": "{DFDC391C-782D-58D9-BF81-C7B13A0F4CFC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "FromValues",
+                "name": "From Values",
                 "category": "Math/Vector4",
-                "tooltip": "returns a vector from elements",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a vector from elements"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: X",
+                    "base": "DataInput_X",
                     "details": {
-                        "name": "Number: X"
+                        "name": "X"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Y",
+                    "base": "DataInput_Y",
                     "details": {
-                        "name": "Number: Y"
+                        "name": "Y"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Z",
+                    "base": "DataInput_Z",
                     "details": {
-                        "name": "Number: Z"
+                        "name": "Z"
                     }
                 },
                 {
-                    "key": "DataInput_Number: W",
+                    "base": "DataInput_W",
                     "details": {
-                        "name": "Number: W"
+                        "name": "W"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names
index 34e3294209..f09bda9acf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{1AC44E60-9560-58DD-A210-48A755155D6D}",
+            "base": "{1AC44E60-9560-58DD-A210-48A755155D6D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "GetElement",
+                "name": "Get Element",
                 "category": "Math/Vector4",
-                "tooltip": "returns the element corresponding to the index (0 -> x) (1 -> y) (2 -> z) (3 -> w)",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the element corresponding to the index (0 -> x) (1 -> y) (2 -> z) (3 -> w)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Index",
+                    "base": "DataInput_Index",
                     "details": {
-                        "name": "Number: Index"
+                        "name": "Index"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names
index a8f13b5e45..5881c02adb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names
@@ -1,50 +1,49 @@
 {
     "entries": [
         {
-            "key": "{DD9F50A6-AC60-59E1-8C63-C6C392DA8C15}",
+            "base": "{DD9F50A6-AC60-59E1-8C63-C6C392DA8C15}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsClose",
+                "name": "Is Close",
                 "category": "Math/Vector4",
-                "tooltip": "returns true if the difference between A and B is less than tolerance, else false",
-                "subtitle": "Vector4"
+                "tooltip": "Returns true if the difference between A and B is less than tolerance, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: A",
+                    "base": "DataInput_A",
                     "details": {
-                        "name": "Vector4: A"
+                        "name": "A"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: B",
+                    "base": "DataInput_B",
                     "details": {
-                        "name": "Vector4: B"
+                        "name": "B"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names
index 8f28660e4a..9e1c8e5ba0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{138EE359-9CA0-520B-873D-90C2183C96FE}",
+            "base": "{138EE359-9CA0-520B-873D-90C2183C96FE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsFinite",
+                "name": "Is Finite",
                 "category": "Math/Vector4",
-                "tooltip": "returns true if every element in the source is finite, else false",
-                "subtitle": "Vector4"
+                "tooltip": "Returns true if every element in the source is finite, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names
index e35435903c..92b367b6e2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{B2EE1FD3-D33D-5348-AC29-E2D08C1E3363}",
+            "base": "{B2EE1FD3-D33D-5348-AC29-E2D08C1E3363}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsNormalized",
+                "name": "Is Normalized",
                 "category": "Math/Vector4",
-                "tooltip": "returns true if the length of the source is within tolerance of 1.0, else false",
-                "subtitle": "Vector4"
+                "tooltip": "Returns true if the length of the source is within tolerance of 1.0, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names
index 6a932da5f7..6d2bacb0b2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{EBD3BEF3-0FA8-5508-8C9B-BDCA64A00E5E}",
+            "base": "{EBD3BEF3-0FA8-5508-8C9B-BDCA64A00E5E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "IsZero",
+                "name": "Is Zero",
                 "category": "Math/Vector4",
-                "tooltip": "returns true if A is within tolerance of the zero vector, else false",
-                "subtitle": "Vector4"
+                "tooltip": "Returns true if A is within tolerance of the zero vector, else false"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Tolerance",
+                    "base": "DataInput_Tolerance",
                     "details": {
-                        "name": "Number: Tolerance"
+                        "name": "Tolerance"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Boolean",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Boolean"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names
index 12a768cfb2..2aa5585b43 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{768CD3CA-09E3-51EB-AE59-8D34DC0D12A8}",
+            "base": "{768CD3CA-09E3-51EB-AE59-8D34DC0D12A8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Length",
                 "category": "Math/Vector4",
-                "tooltip": "returns the magnitude of source",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the magnitude of source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names
index ba2e25e9a5..4affd32f7c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{60E6D939-6105-53CB-865B-4F401A1B487B}",
+            "base": "{60E6D939-6105-53CB-865B-4F401A1B487B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthReciprocal",
+                "name": "Length Reciprocal",
                 "category": "Math/Vector4",
-                "tooltip": "returns the 1 / magnitude of the source",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the 1 / magnitude of the source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names
index a3115d3526..1abb6d4e9b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{4DFB1966-BDE3-55C3-A0B4-0D04926AB732}",
+            "base": "{4DFB1966-BDE3-55C3-A0B4-0D04926AB732}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "LengthSquared",
+                "name": "Length Squared",
                 "category": "Math/Vector4",
-                "tooltip": "returns the magnitude squared of the source, generally faster than getting the exact length",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the magnitude squared of the source, generally faster than getting the exact length"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names
index 873fedcd59..c9cd4b2513 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{317BA61D-AEEA-566E-A113-2384C5BDADD6}",
+            "base": "{317BA61D-AEEA-566E-A113-2384C5BDADD6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyByNumber",
+                "name": "Multiply By Number",
                 "category": "Math/Vector4",
-                "tooltip": "returns the vector Source with each element multiplied by Multipler",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the vector Source with each element multiplied by Multipler"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Number: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names
index 26acdf70f1..74da5c724d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{B8B0E83E-F1C3-5F0B-93A5-1756B79E1316}",
+            "base": "{B8B0E83E-F1C3-5F0B-93A5-1756B79E1316}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Negate",
                 "category": "Math/Vector4",
-                "tooltip": "returns the vector Source with each element multiplied by -1",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the vector Source with each element multiplied by -1"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names
index c0df4c0e86..9d51b0e78d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{9337FBC7-20D8-51C7-8D69-D9E53B739BD7}",
+            "base": "{9337FBC7-20D8-51C7-8D69-D9E53B739BD7}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Normalize",
                 "category": "Math/Vector4",
-                "tooltip": "returns a unit length vector in the same direction as the source, or (1,0,0,0) if the source length is too small",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a unit length vector in the same direction as the source, or (1,0,0,0) if the source length is too small"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names
index c720cb5ecb..f493b7bf20 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{A7AB6D14-CDAF-519D-B29F-2E1292257A4C}",
+            "base": "{A7AB6D14-CDAF-519D-B29F-2E1292257A4C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Reciprocal",
                 "category": "Math/Vector4",
-                "tooltip": "returns the vector (1/x, 1/y, 1/z, 1/w) with elements from Source",
-                "subtitle": "Vector4"
+                "tooltip": "Returns the vector (1/x, 1/y, 1/z, 1/w) with elements from Source"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names
index 5c645e28b6..c89ebd7840 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{48337108-38AA-5A58-BBFD-D15560A0B685}",
+            "base": "{48337108-38AA-5A58-BBFD-D15560A0B685}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetW",
+                "name": "Set W",
                 "category": "Math/Vector4",
-                "tooltip": "returns a the vector(Source.X, Source.Y, Source.Z, W)",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a the vector(Source.X, Source.Y, Source.Z, W)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: W",
+                    "base": "DataInput_W",
                     "details": {
-                        "name": "Number: W"
+                        "name": "W"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names
index 0a1af22876..b9b9e96845 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{E39B02FA-3231-57AC-8D2F-E9448E2CECD3}",
+            "base": "{E39B02FA-3231-57AC-8D2F-E9448E2CECD3}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetX",
+                "name": "Set X",
                 "category": "Math/Vector4",
-                "tooltip": "returns a the vector(X, Source.Y, Source.Z, Source.W)",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a the vector(X, Source.Y, Source.Z, Source.W)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: X",
+                    "base": "DataInput_X",
                     "details": {
-                        "name": "Number: X"
+                        "name": "X"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names
index f416090c07..f0f2b04cf8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{45D44536-DCE8-5CC1-9311-9BC79BBF333C}",
+            "base": "{45D44536-DCE8-5CC1-9311-9BC79BBF333C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetY",
+                "name": "Set Y",
                 "category": "Math/Vector4",
-                "tooltip": "returns a the vector(Source.X, Y, Source.Z, Source.W)",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a the vector(Source.X, Y, Source.Z, Source.W)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Y",
+                    "base": "DataInput_Y",
                     "details": {
-                        "name": "Number: Y"
+                        "name": "Y"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names
index f42628d158..3467d2ca52 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names
@@ -1,44 +1,43 @@
 {
     "entries": [
         {
-            "key": "{8CC2A1A7-FD41-5C7B-BC1A-BEF5BBF74D62}",
+            "base": "{8CC2A1A7-FD41-5C7B-BC1A-BEF5BBF74D62}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "SetZ",
+                "name": "Set Z",
                 "category": "Math/Vector4",
-                "tooltip": "returns a the vector(Source.X, Source.Y, Z, Source.W)",
-                "subtitle": "Vector4"
+                "tooltip": "Returns a the vector(Source.X, Source.Y, Z, Source.W)"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector4: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "Vector4: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Z",
+                    "base": "DataInput_Z",
                     "details": {
-                        "name": "Number: Z"
+                        "name": "Z"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Vector4",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Vector4"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names
index c48a0bdaf7..fb9b199a4d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{C1B42FEC-0545-4511-9FAC-11E0387FEDF0}",
+            "base": "{C1B42FEC-0545-4511-9FAC-11E0387FEDF0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names
index b5aa513ee4..40d1552274 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{DC17E19F-3829-410D-9A0B-AD60C6066DAA}",
+            "base": "{DC17E19F-3829-410D-9A0B-AD60C6066DAA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names
index 9b56075a42..45005dc5c4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8305B5C9-1B9F-4D5B-B3E7-66925F491E9D}",
+            "base": "{8305B5C9-1B9F-4D5B-B3E7-66925F491E9D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Divisor",
+                    "base": "DataInput_Divisor",
                     "details": {
                         "name": "Divisor"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names
index 172d57f5db..3f2a833f95 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{AEE15BEA-CD51-4C1A-B06D-C09FB9EAA005}",
+            "base": "{AEE15BEA-CD51-4C1A-B06D-C09FB9EAA005}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,25 +12,25 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Length",
+                    "base": "DataOutput_Length",
                     "details": {
                         "name": "Length"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names
index a63e64bfa4..53eaa8ebb6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{A4CFB2F2-4045-47ED-AE73-ED60C2072EE4}",
+            "base": "{A4CFB2F2-4045-47ED-AE73-ED60C2072EE4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,78 +11,78 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Starts the lerp action from the beginning."
                     }
                 },
                 {
-                    "key": "DataInput_Start",
+                    "base": "DataInput_Start",
                     "details": {
                         "name": "Start"
                     }
                 },
                 {
-                    "key": "DataInput_Stop",
+                    "base": "DataInput_Stop",
                     "details": {
                         "name": "Stop"
                     }
                 },
                 {
-                    "key": "DataInput_Speed",
+                    "base": "DataInput_Speed",
                     "details": {
                         "name": "Speed"
                     }
                 },
                 {
-                    "key": "DataInput_Maximum Duration",
+                    "base": "DataInput_Maximum Duration",
                     "details": {
                         "name": "Maximum Duration"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Executes immediately after the lerp action is started."
                     }
                 },
                 {
-                    "key": "Input_Cancel",
+                    "base": "Input_Cancel",
                     "details": {
                         "name": "Cancel",
                         "tooltip": "Stops the lerp action immediately."
                     }
                 },
                 {
-                    "key": "Output_Canceled",
+                    "base": "Output_Canceled",
                     "details": {
                         "name": "Canceled",
                         "tooltip": "Executes immediately after the operation is canceled."
                     }
                 },
                 {
-                    "key": "Output_Tick",
+                    "base": "Output_Tick",
                     "details": {
                         "name": "Tick",
                         "tooltip": "Signaled at each step of the lerp."
                     }
                 },
                 {
-                    "key": "DataOutput_Step",
+                    "base": "DataOutput_Step",
                     "details": {
                         "name": "Step"
                     }
                 },
                 {
-                    "key": "DataOutput_Percent",
+                    "base": "DataOutput_Percent",
                     "details": {
                         "name": "Percent"
                     }
                 },
                 {
-                    "key": "Output_Lerp Complete",
+                    "base": "Output_Lerp Complete",
                     "details": {
                         "name": "Lerp Complete",
                         "tooltip": "Signaled after the last Tick, when the lerp is complete"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names
index 552aa8a101..4928054d0e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{A5841DE8-CA11-4364-9C34-5ECE8B9623D7}",
+            "base": "{A5841DE8-CA11-4364-9C34-5ECE8B9623D7}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,20 +12,20 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names
index 19532b0a5a..f8af2d0c67 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names
@@ -1,49 +1,48 @@
 {
     "entries": [
         {
-            "key": "{9A2FDC22-90E1-5A32-9670-156BB7EE8149}",
+            "base": "{9A2FDC22-90E1-5A32-9670-156BB7EE8149}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "MultiplyAndAdd",
-                "category": "Math",
-                "subtitle": "Math"
+                "name": "Multiply And Add",
+                "category": "Math"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplicand",
+                    "base": "DataInput_Multiplicand",
                     "details": {
-                        "name": "Number: Multiplicand"
+                        "name": "Multiplicand"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Multiplier",
+                    "base": "DataInput_Multiplier",
                     "details": {
-                        "name": "Number: Multiplier"
+                        "name": "Multiplier"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Addend",
+                    "base": "DataInput_Addend",
                     "details": {
-                        "name": "Number: Addend"
+                        "name": "Addend"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: Number",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names
index ba52de3900..6293bab799 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E9BB45A1-AE96-47B0-B2BF-2927D420A28C}",
+            "base": "{E9BB45A1-AE96-47B0-B2BF-2927D420A28C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names
index c23f7dcb4b..534d469271 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names
@@ -1,38 +1,31 @@
 {
     "entries": [
         {
-            "key": "{8A57777C-AD84-5CF4-B411-03ABF982EF55}",
+            "base": "{8A57777C-AD84-5CF4-B411-03ABF982EF55}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "StringToNumber",
+                "name": "String To Number",
                 "category": "Math",
-                "tooltip": "Converts the given string to it's numeric representation if possible.",
-                "subtitle": "Math"
+                "tooltip": "Converts the given string to it's numeric representation if possible."
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_String: ",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "String: "
-                    }
-                },
-                {
-                    "key": "DataOutput_Result: Number",
-                    "details": {
-                        "name": "Result: Number"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names
index 67ed5cf859..423ec056ea 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{D0615D0A-027F-47F6-A02B-E35DAF22F431}",
+            "base": "{D0615D0A-027F-47F6-A02B-E35DAF22F431}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,31 +12,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names
index edcbe2783a..9b73829ea8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{9E334D28-CBB3-53AF-AFA1-8223F50312CE}",
+            "base": "{9E334D28-CBB3-53AF-AFA1-8223F50312CE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,49 +12,49 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Vector3: One",
+                    "base": "DataInput_Vector3: One",
                     "details": {
                         "name": "Vector3: One"
                     }
                 },
                 {
-                    "key": "DataInput_String: Two",
+                    "base": "DataInput_String: Two",
                     "details": {
                         "name": "String: Two"
                     }
                 },
                 {
-                    "key": "DataInput_Boolean: Three",
+                    "base": "DataInput_Boolean: Three",
                     "details": {
                         "name": "Boolean: Three"
                     }
                 },
                 {
-                    "key": "DataOutput_One: Vector3",
+                    "base": "DataOutput_One: Vector3",
                     "details": {
                         "name": "One: Vector3"
                     }
                 },
                 {
-                    "key": "DataOutput_Two: String",
+                    "base": "DataOutput_Two: String",
                     "details": {
                         "name": "Two: String"
                     }
                 },
                 {
-                    "key": "DataOutput_Three: Boolean",
+                    "base": "DataOutput_Three: Boolean",
                     "details": {
                         "name": "Three: Boolean"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names
index b789413cc4..a1153b6eac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names
@@ -1,49 +1,48 @@
 {
     "entries": [
         {
-            "key": "{CCF1F41F-39C2-C847-9D9E-0155C8B46E1C}",
+            "base": "{CCF1F41F-39C2-C847-9D9E-0155C8B46E1C}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Duration",
-                "category": "Nodeables",
-                "tooltip": "Triggers a signal every frame during the specified duration.",
-                "subtitle": "Nodeables"
+                "category": "Timing",
+                "tooltip": "Triggers a signal every frame during the specified duration."
             },
             "slots": [
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start"
                     }
                 },
                 {
-                    "key": "DataInput_Duration",
+                    "base": "DataInput_Duration",
                     "details": {
                         "name": "Duration"
                     }
                 },
                 {
-                    "key": "Output_On Start",
+                    "base": "Output_On Start",
                     "details": {
                         "name": "On Start"
                     }
                 },
                 {
-                    "key": "Output_OnTick",
+                    "base": "Output_OnTick",
                     "details": {
                         "name": "OnTick",
                         "tooltip": "Signaled every frame while the duration is active."
                     }
                 },
                 {
-                    "key": "DataOutput_Elapsed",
+                    "base": "DataOutput_Elapsed",
                     "details": {
                         "name": "Elapsed"
                     }
                 },
                 {
-                    "key": "Output_Done",
+                    "base": "Output_Done",
                     "details": {
                         "name": "Done",
                         "tooltip": "Signaled after waiting for the specified amount of times."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names
index af5cf38a81..21f18b994f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names
@@ -1,49 +1,48 @@
 {
     "entries": [
         {
-            "key": "{AB587027-2270-4CA6-242F-6069C6D9BBB6}",
+            "base": "{AB587027-2270-4CA6-242F-6069C6D9BBB6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
                 "name": "Repeater",
-                "category": "Nodeables",
-                "tooltip": "Repeats the output signal the given number of times using the specified delay to space the signals out.",
-                "subtitle": "Nodeables"
+                "category": "Timing",
+                "tooltip": "Repeats the output signal the given number of times using the specified delay to space the signals out."
             },
             "slots": [
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start"
                     }
                 },
                 {
-                    "key": "DataInput_Repetitions",
+                    "base": "DataInput_Repetitions",
                     "details": {
                         "name": "Repetitions"
                     }
                 },
                 {
-                    "key": "DataInput_Interval",
+                    "base": "DataInput_Interval",
                     "details": {
                         "name": "Interval"
                     }
                 },
                 {
-                    "key": "Output_On Start",
+                    "base": "Output_On Start",
                     "details": {
                         "name": "On Start"
                     }
                 },
                 {
-                    "key": "Output_Complete",
+                    "base": "Output_Complete",
                     "details": {
                         "name": "Complete",
                         "tooltip": "Signaled upon node exit"
                     }
                 },
                 {
-                    "key": "Output_Action",
+                    "base": "Output_Action",
                     "details": {
                         "name": "Action",
                         "tooltip": "Signaled every repetition"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names
index 821329bfd5..dd4c6412f3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names
@@ -1,36 +1,35 @@
 {
     "entries": [
         {
-            "key": "{D3629902-02E9-AE59-0424-F366D342B433}",
+            "base": "{D3629902-02E9-AE59-0424-F366D342B433}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "TimeDelay",
-                "category": "Nodeables",
-                "tooltip": "Delays all incoming execution for the specified number of ticks",
-                "subtitle": "Nodeables"
+                "name": "Time Delay",
+                "category": "Timing",
+                "tooltip": "Delays all incoming execution for the specified number of ticks"
             },
             "slots": [
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start"
                     }
                 },
                 {
-                    "key": "DataInput_Delay",
+                    "base": "DataInput_Delay",
                     "details": {
                         "name": "Delay"
                     }
                 },
                 {
-                    "key": "Output_On Start",
+                    "base": "Output_On Start",
                     "details": {
                         "name": "On Start"
                     }
                 },
                 {
-                    "key": "Output_Done",
+                    "base": "Output_Done",
                     "details": {
                         "name": "Done",
                         "tooltip": "Signaled after waiting for the specified amount of times."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names
index 3b14103cc8..8f3826e4f0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{4B68DF49-35DE-48CF-BCE3-F892CCF2639D}",
+            "base": "{4B68DF49-35DE-48CF-BCE3-F892CCF2639D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,31 +11,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names
index f01ee442be..20913eedaf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{FE0589B0-F835-4CD5-BBD3-86510CBB985B}",
+            "base": "{FE0589B0-F835-4CD5-BBD3-86510CBB985B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,31 +11,31 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names
index 523ca60c85..9b62348cdc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{30FED030-71ED-4498-AB2C-F5586DFA490E}",
+            "base": "{30FED030-71ED-4498-AB2C-F5586DFA490E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,14 +11,14 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Output signal"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names
new file mode 100644
index 0000000000..671fdd730e
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names
@@ -0,0 +1,100 @@
+{
+    "entries": [
+        {
+            "base": "{022255F7-DD50-5654-967E-6E00E8360F00}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Box Cast With Group",
+                "category": "PhysX/World",
+                "tooltip": "Box Cast"
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataInput_Pose",
+                    "details": {
+                        "name": "Pose"
+                    }
+                },
+                {
+                    "base": "DataInput_Direction",
+                    "details": {
+                        "name": "Direction"
+                    }
+                },
+                {
+                    "base": "DataInput_Dimensions",
+                    "details": {
+                        "name": "Dimensions"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Object Hit",
+                    "details": {
+                        "name": "Object Hit"
+                    }
+                },
+                {
+                    "base": "DataOutput_Position",
+                    "details": {
+                        "name": "Position"
+                    }
+                },
+                {
+                    "base": "DataOutput_Normal",
+                    "details": {
+                        "name": "Normal"
+                    }
+                },
+                {
+                    "base": "DataOutput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataOutput_EntityId",
+                    "details": {
+                        "name": "EntityId"
+                    }
+                },
+                {
+                    "base": "DataOutput_Surface",
+                    "details": {
+                        "name": "Surface"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names
new file mode 100644
index 0000000000..4dfca63478
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names
@@ -0,0 +1,106 @@
+{
+    "entries": [
+        {
+            "base": "{1467D2BE-D829-5A8A-976D-6D06FDCD3310}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Capsule Cast With Group",
+                "category": "PhysX/World",
+                "tooltip": "CapsuleCast"
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataInput_Pose",
+                    "details": {
+                        "name": "Pose"
+                    }
+                },
+                {
+                    "base": "DataInput_Direction",
+                    "details": {
+                        "name": "Direction"
+                    }
+                },
+                {
+                    "base": "DataInput_Height",
+                    "details": {
+                        "name": "Height"
+                    }
+                },
+                {
+                    "base": "DataInput_Radius",
+                    "details": {
+                        "name": "Radius"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Object Hit",
+                    "details": {
+                        "name": "Object Hit"
+                    }
+                },
+                {
+                    "base": "DataOutput_Position",
+                    "details": {
+                        "name": "Position"
+                    }
+                },
+                {
+                    "base": "DataOutput_Normal",
+                    "details": {
+                        "name": "Normal"
+                    }
+                },
+                {
+                    "base": "DataOutput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataOutput_EntityId",
+                    "details": {
+                        "name": "EntityId"
+                    }
+                },
+                {
+                    "base": "DataOutput_Surface",
+                    "details": {
+                        "name": "Surface"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names
new file mode 100644
index 0000000000..f49e3d2461
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names
@@ -0,0 +1,58 @@
+{
+    "entries": [
+        {
+            "base": "{B4F46A1B-7C2F-553F-BAE8-867066A365FA}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Overlap Box With Group",
+                "category": "PhysX/World",
+                "tooltip": "Returns the objects overlapping a box at a position"
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Pose",
+                    "details": {
+                        "name": "Pose"
+                    }
+                },
+                {
+                    "base": "DataInput_Dimensions",
+                    "details": {
+                        "name": "Dimensions"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Result",
+                    "details": {
+                        "name": "Result"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names
new file mode 100644
index 0000000000..291dc8ea75
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names
@@ -0,0 +1,64 @@
+{
+    "entries": [
+        {
+            "base": "{588E1C8F-D18E-5C00-AF13-C4FCD5A9519D}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Overlap Capsule With Group",
+                "category": "PhysX/World",
+                "tooltip": "Returns the objects overlapping a capsule at a position"
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Pose",
+                    "details": {
+                        "name": "Pose"
+                    }
+                },
+                {
+                    "base": "DataInput_Height",
+                    "details": {
+                        "name": "Height"
+                    }
+                },
+                {
+                    "base": "DataInput_Radius",
+                    "details": {
+                        "name": "Radius"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Result",
+                    "details": {
+                        "name": "Result"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names
new file mode 100644
index 0000000000..bd48cbf7ad
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names
@@ -0,0 +1,58 @@
+{
+    "entries": [
+        {
+            "base": "{4BEFF98E-4147-55AF-B105-29085951CBA9}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Overlap Sphere With Group",
+                "category": "PhysX/World",
+                "tooltip": "Returns the objects overlapping a sphere at a position"
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Position",
+                    "details": {
+                        "name": "Position"
+                    }
+                },
+                {
+                    "base": "DataInput_Radius",
+                    "details": {
+                        "name": "Radius"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Result",
+                    "details": {
+                        "name": "Result"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names
new file mode 100644
index 0000000000..a61a7a1579
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names
@@ -0,0 +1,94 @@
+{
+    "entries": [
+        {
+            "base": "{BD7F9C50-62EA-56C0-9B8B-D23E5D28300D}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Ray Cast Local Space With Group",
+                "category": "PhysX/World",
+                "tooltip": "Returns the first entity hit by a ray cast in local space from the source entity in the specified direction."
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Source",
+                    "details": {
+                        "name": "Source"
+                    }
+                },
+                {
+                    "base": "DataInput_Direction",
+                    "details": {
+                        "name": "Direction"
+                    }
+                },
+                {
+                    "base": "DataInput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Object hit",
+                    "details": {
+                        "name": "Object hit"
+                    }
+                },
+                {
+                    "base": "DataOutput_Position",
+                    "details": {
+                        "name": "Position"
+                    }
+                },
+                {
+                    "base": "DataOutput_Normal",
+                    "details": {
+                        "name": "Normal"
+                    }
+                },
+                {
+                    "base": "DataOutput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataOutput_EntityId",
+                    "details": {
+                        "name": "EntityId"
+                    }
+                },
+                {
+                    "base": "DataOutput_Surface",
+                    "details": {
+                        "name": "Surface"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names
new file mode 100644
index 0000000000..f2d2934035
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names
@@ -0,0 +1,64 @@
+{
+    "entries": [
+        {
+            "base": "{FB91B476-0015-508A-AC0B-18F8A860EB7A}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Ray Cast Multiple Local Space With Group",
+                "category": "PhysX/World",
+                "tooltip": "Returns all entities hit by a ray cast in local space from the source entity in the specified direction."
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Source",
+                    "details": {
+                        "name": "Source"
+                    }
+                },
+                {
+                    "base": "DataInput_Direction",
+                    "details": {
+                        "name": "Direction"
+                    }
+                },
+                {
+                    "base": "DataInput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Objects hit",
+                    "details": {
+                        "name": "Objects hit"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names
new file mode 100644
index 0000000000..8051204ab7
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names
@@ -0,0 +1,94 @@
+{
+    "entries": [
+        {
+            "base": "{33EE1562-D9B5-5DA2-BB9E-F1F75B927B9C}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Ray Cast World Space With Group",
+                "category": "PhysX/World",
+                "tooltip": "Returns the first entity hit by a ray cast in world space from the start position in the specified direction."
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Start",
+                    "details": {
+                        "name": "Start"
+                    }
+                },
+                {
+                    "base": "DataInput_Direction",
+                    "details": {
+                        "name": "Direction"
+                    }
+                },
+                {
+                    "base": "DataInput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Object hit",
+                    "details": {
+                        "name": "Object hit"
+                    }
+                },
+                {
+                    "base": "DataOutput_Position",
+                    "details": {
+                        "name": "Position"
+                    }
+                },
+                {
+                    "base": "DataOutput_Normal",
+                    "details": {
+                        "name": "Normal"
+                    }
+                },
+                {
+                    "base": "DataOutput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataOutput_EntityId",
+                    "details": {
+                        "name": "EntityId"
+                    }
+                },
+                {
+                    "base": "DataOutput_Surface",
+                    "details": {
+                        "name": "Surface"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names
new file mode 100644
index 0000000000..705fa25d66
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names
@@ -0,0 +1,100 @@
+{
+    "entries": [
+        {
+            "base": "{FF1EE92C-FD34-51E9-B128-00595ABB78E6}",
+            "context": "ScriptCanvas::Node",
+            "variant": "",
+            "details": {
+                "name": "Sphere Cast With Group",
+                "category": "PhysX/World",
+                "tooltip": "SphereCast"
+            },
+            "slots": [
+                {
+                    "base": "Input_In",
+                    "details": {
+                        "name": "In"
+                    }
+                },
+                {
+                    "base": "Output_Out",
+                    "details": {
+                        "name": "Out"
+                    }
+                },
+                {
+                    "base": "DataInput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataInput_Pose",
+                    "details": {
+                        "name": "Pose"
+                    }
+                },
+                {
+                    "base": "DataInput_Direction",
+                    "details": {
+                        "name": "Direction"
+                    }
+                },
+                {
+                    "base": "DataInput_Radius",
+                    "details": {
+                        "name": "Radius"
+                    }
+                },
+                {
+                    "base": "DataInput_Collision group",
+                    "details": {
+                        "name": "Collision group"
+                    }
+                },
+                {
+                    "base": "DataInput_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    }
+                },
+                {
+                    "base": "DataOutput_Object Hit",
+                    "details": {
+                        "name": "Object Hit"
+                    }
+                },
+                {
+                    "base": "DataOutput_Position",
+                    "details": {
+                        "name": "Position"
+                    }
+                },
+                {
+                    "base": "DataOutput_Normal",
+                    "details": {
+                        "name": "Normal"
+                    }
+                },
+                {
+                    "base": "DataOutput_Distance",
+                    "details": {
+                        "name": "Distance"
+                    }
+                },
+                {
+                    "base": "DataOutput_EntityId",
+                    "details": {
+                        "name": "EntityId"
+                    }
+                },
+                {
+                    "base": "DataOutput_Surface",
+                    "details": {
+                        "name": "Surface"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names
index d553da7dc0..3f099577f9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{2447798B-B970-FDBA-A2E2-B563513663F0}",
+            "base": "{2447798B-B970-FDBA-A2E2-B563513663F0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,43 +12,43 @@
             },
             "slots": [
                 {
-                    "key": "Input_Request Spawn",
+                    "base": "Input_Request Spawn",
                     "details": {
                         "name": "Request Spawn"
                     }
                 },
                 {
-                    "key": "DataInput_Translation",
+                    "base": "DataInput_Translation",
                     "details": {
                         "name": "Translation"
                     }
                 },
                 {
-                    "key": "DataInput_Rotation",
+                    "base": "DataInput_Rotation",
                     "details": {
                         "name": "Rotation"
                     }
                 },
                 {
-                    "key": "DataInput_Scale",
+                    "base": "DataInput_Scale",
                     "details": {
                         "name": "Scale"
                     }
                 },
                 {
-                    "key": "Output_Spawn Requested",
+                    "base": "Output_Spawn Requested",
                     "details": {
                         "name": "Spawn Requested"
                     }
                 },
                 {
-                    "key": "Output_On Spawn",
+                    "base": "Output_On Spawn",
                     "details": {
                         "name": "On Spawn"
                     }
                 },
                 {
-                    "key": "DataOutput_SpawnedEntitiesList",
+                    "base": "DataOutput_SpawnedEntitiesList",
                     "details": {
                         "name": "SpawnedEntitiesList"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names
index 90d3c24605..4576c21318 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B16259BA-9CF6-4143-B09B-5A0F3B4585E6}",
+            "base": "{B16259BA-9CF6-4143-B09B-5A0F3B4585E6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,26 +12,26 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_String",
+                    "base": "DataOutput_String",
                     "details": {
                         "name": "String"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names
index 75a5a11fd9..7cb1b668d4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8481E892-DE37-4CCF-86AA-E4770DE90643}",
+            "base": "{8481E892-DE37-4CCF-86AA-E4770DE90643}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,51 +12,51 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Pattern",
+                    "base": "DataInput_Pattern",
                     "details": {
                         "name": "Pattern"
                     }
                 },
                 {
-                    "key": "DataInput_Search From End",
+                    "base": "DataInput_Search From End",
                     "details": {
                         "name": "Search From End"
                     }
                 },
                 {
-                    "key": "DataInput_Case Sensitive",
+                    "base": "DataInput_Case Sensitive",
                     "details": {
                         "name": "Case Sensitive"
                     }
                 },
                 {
-                    "key": "DataOutput_Index",
+                    "base": "DataOutput_Index",
                     "details": {
                         "name": "Index"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "The string contains the provided pattern."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "The string did not contain the provided pattern."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names
index bdb2892e8b..35ba6f17b4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{6C1CECA6-C155-4ED5-96BC-1D4F11C7A0FE}",
+            "base": "{6C1CECA6-C155-4ED5-96BC-1D4F11C7A0FE}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,38 +12,38 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Pattern",
+                    "base": "DataInput_Pattern",
                     "details": {
                         "name": "Pattern"
                     }
                 },
                 {
-                    "key": "DataInput_Case Sensitive",
+                    "base": "DataInput_Case Sensitive",
                     "details": {
                         "name": "Case Sensitive"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True"
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names
index 148bd56ed1..fd379e063c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{121E5B89-5A8A-4477-A3B7-078B0F1B36FD}",
+            "base": "{121E5B89-5A8A-4477-A3B7-078B0F1B36FD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,32 +12,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_String Array",
+                    "base": "DataInput_String Array",
                     "details": {
                         "name": "String Array"
                     }
                 },
                 {
-                    "key": "DataInput_Separator",
+                    "base": "DataInput_Separator",
                     "details": {
                         "name": "Separator"
                     }
                 },
                 {
-                    "key": "DataOutput_String",
+                    "base": "DataOutput_String",
                     "details": {
                         "name": "String"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names
index 1fd973605f..2edaaa842e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{197D0BAA-FCAF-4922-872B-3A95BEA574B2}",
+            "base": "{197D0BAA-FCAF-4922-872B-3A95BEA574B2}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,44 +12,44 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Replace",
+                    "base": "DataInput_Replace",
                     "details": {
                         "name": "Replace"
                     }
                 },
                 {
-                    "key": "DataInput_With",
+                    "base": "DataInput_With",
                     "details": {
                         "name": "With"
                     }
                 },
                 {
-                    "key": "DataInput_Case Sensitive",
+                    "base": "DataInput_Case Sensitive",
                     "details": {
                         "name": "Case Sensitive"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names
index 95e24059a9..a16adf32b8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{327EFC0F-F71E-4028-BAF9-C4223B933FB6}",
+            "base": "{327EFC0F-F71E-4028-BAF9-C4223B933FB6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,32 +12,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Delimiters",
+                    "base": "DataInput_Delimiters",
                     "details": {
                         "name": "Delimiters"
                     }
                 },
                 {
-                    "key": "DataOutput_String Array",
+                    "base": "DataOutput_String Array",
                     "details": {
                         "name": "String Array"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names
index 998d5eef12..0538597e7a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{60EB479A-CF31-4734-B2E5-422828A54A46}",
+            "base": "{60EB479A-CF31-4734-B2E5-422828A54A46}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,38 +12,38 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
                 },
                 {
-                    "key": "DataInput_Pattern",
+                    "base": "DataInput_Pattern",
                     "details": {
                         "name": "Pattern"
                     }
                 },
                 {
-                    "key": "DataInput_Case Sensitive",
+                    "base": "DataInput_Case Sensitive",
                     "details": {
                         "name": "Case Sensitive"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True"
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names
index 219b98d938..ff14a4fe42 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{F57D790D-01D5-5241-865C-3348CCB3536B}",
+            "base": "{F57D790D-01D5-5241-865C-3348CCB3536B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,37 +12,37 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_String: Source",
+                    "base": "DataInput_String: Source",
                     "details": {
                         "name": "String: Source"
                     }
                 },
                 {
-                    "key": "DataInput_Number: From",
+                    "base": "DataInput_Number: From",
                     "details": {
                         "name": "Number: From"
                     }
                 },
                 {
-                    "key": "DataInput_Number: Length",
+                    "base": "DataInput_Number: Length",
                     "details": {
                         "name": "Number: Length"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: String",
+                    "base": "DataOutput_Result: String",
                     "details": {
                         "name": "Result: String"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names
index 363f234f19..1d761cd3cf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{B81632B7-AE9E-50D1-9F19-00F92F77B580}",
+            "base": "{B81632B7-AE9E-50D1-9F19-00F92F77B580}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToLower",
+                "name": "To Lower",
                 "category": "String",
-                "tooltip": "Makes all the characters in the string lower case",
-                "subtitle": "String"
+                "tooltip": "Makes all the characters in the string lower case"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_String: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "String: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: String",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: String"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names
index 3ee857bff1..bee39e0683 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names
@@ -1,38 +1,37 @@
 {
     "entries": [
         {
-            "key": "{3AB66179-2097-5C83-BA8F-B8BD1D75D1CA}",
+            "base": "{3AB66179-2097-5C83-BA8F-B8BD1D75D1CA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "ToUpper",
+                "name": "To Upper",
                 "category": "String",
-                "tooltip": "Makes all the characters in the string upper case",
-                "subtitle": "String"
+                "tooltip": "Makes all the characters in the string upper case"
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_String: Source",
+                    "base": "DataInput_Source",
                     "details": {
-                        "name": "String: Source"
+                        "name": "Source"
                     }
                 },
                 {
-                    "key": "DataOutput_Result: String",
+                    "base": "DataOutput_Result",
                     "details": {
-                        "name": "Result: String"
+                        "name": "Result"
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names
index b7e47558dd..4fd4b95308 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{FDD3D684-2C9A-0C05-D2A3-FD67685D8F26}",
+            "base": "{FDD3D684-2C9A-0C05-D2A3-FD67685D8F26}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,55 +12,55 @@
             },
             "slots": [
                 {
-                    "key": "Input_Get Internal Vector",
+                    "base": "Input_Get Internal Vector",
                     "details": {
                         "name": "Get Internal Vector"
                     }
                 },
                 {
-                    "key": "Output_On Get Internal Vector",
+                    "base": "Output_On Get Internal Vector",
                     "details": {
                         "name": "On Get Internal Vector"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_Branches On Input Type",
+                    "base": "Input_Branches On Input Type",
                     "details": {
                         "name": "Branches On Input Type"
                     }
                 },
                 {
-                    "key": "DataInput_Input Type",
+                    "base": "DataInput_Input Type",
                     "details": {
                         "name": "Input Type"
                     }
                 },
                 {
-                    "key": "Output_By Value",
+                    "base": "Output_By Value",
                     "details": {
                         "name": "By Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Value Input",
+                    "base": "DataOutput_Value Input",
                     "details": {
                         "name": "Value Input"
                     }
                 },
                 {
-                    "key": "Output_By Pointer",
+                    "base": "Output_By Pointer",
                     "details": {
                         "name": "By Pointer"
                     }
                 },
                 {
-                    "key": "DataOutput_Pointer Input",
+                    "base": "DataOutput_Pointer Input",
                     "details": {
                         "name": "Pointer Input"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names
index 602a337a7d..cb1b376ffa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{131C7ECE-D083-F7CD-09FC-EE0FCF80AB86}",
+            "base": "{131C7ECE-D083-F7CD-09FC-EE0FCF80AB86}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,61 +12,61 @@
             },
             "slots": [
                 {
-                    "key": "Output_One String",
+                    "base": "Output_One String",
                     "details": {
                         "name": "One String"
                     }
                 },
                 {
-                    "key": "DataOutput_string",
+                    "base": "DataOutput_string",
                     "details": {
                         "name": "string"
                     }
                 },
                 {
-                    "key": "Output_Two Strings",
+                    "base": "Output_Two Strings",
                     "details": {
                         "name": "Two Strings"
                     }
                 },
                 {
-                    "key": "DataOutput_string1",
+                    "base": "DataOutput_string1",
                     "details": {
                         "name": "string1"
                     }
                 },
                 {
-                    "key": "DataOutput_string2",
+                    "base": "DataOutput_string2",
                     "details": {
                         "name": "string2"
                     }
                 },
                 {
-                    "key": "Output_Three Strings",
+                    "base": "Output_Three Strings",
                     "details": {
                         "name": "Three Strings"
                     }
                 },
                 {
-                    "key": "DataOutput_string3",
+                    "base": "DataOutput_string3",
                     "details": {
                         "name": "string3"
                     }
                 },
                 {
-                    "key": "Output_Square",
+                    "base": "Output_Square",
                     "details": {
                         "name": "Square"
                     }
                 },
                 {
-                    "key": "Output_Pants",
+                    "base": "Output_Pants",
                     "details": {
                         "name": "Pants"
                     }
                 },
                 {
-                    "key": "Output_Hello",
+                    "base": "Output_Hello",
                     "details": {
                         "name": "Hello"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names
index c19d2a2ba5..2ea2b7c637 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{32B1B2DB-59E6-88D7-14A3-9C5366A39A81}",
+            "base": "{32B1B2DB-59E6-88D7-14A3-9C5366A39A81}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,67 +12,67 @@
             },
             "slots": [
                 {
-                    "key": "Input_Append Hello",
+                    "base": "Input_Append Hello",
                     "details": {
                         "name": "Append Hello"
                     }
                 },
                 {
-                    "key": "DataInput_str",
+                    "base": "DataInput_str",
                     "details": {
                         "name": "str"
                     }
                 },
                 {
-                    "key": "Output_On Append Hello",
+                    "base": "Output_On Append Hello",
                     "details": {
                         "name": "On Append Hello"
                     }
                 },
                 {
-                    "key": "DataOutput_Output",
+                    "base": "DataOutput_Output",
                     "details": {
                         "name": "Output"
                     }
                 },
                 {
-                    "key": "Input_Concatenate Two",
+                    "base": "Input_Concatenate Two",
                     "details": {
                         "name": "Concatenate Two"
                     }
                 },
                 {
-                    "key": "DataInput_a",
+                    "base": "DataInput_a",
                     "details": {
                         "name": "a"
                     }
                 },
                 {
-                    "key": "DataInput_b",
+                    "base": "DataInput_b",
                     "details": {
                         "name": "b"
                     }
                 },
                 {
-                    "key": "Output_On Concatenate Two",
+                    "base": "Output_On Concatenate Two",
                     "details": {
                         "name": "On Concatenate Two"
                     }
                 },
                 {
-                    "key": "Input_Concatenate Three",
+                    "base": "Input_Concatenate Three",
                     "details": {
                         "name": "Concatenate Three"
                     }
                 },
                 {
-                    "key": "DataInput_c",
+                    "base": "DataInput_c",
                     "details": {
                         "name": "c"
                     }
                 },
                 {
-                    "key": "Output_On Concatenate Three",
+                    "base": "Output_On Concatenate Three",
                     "details": {
                         "name": "On Concatenate Three"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names
index e34cc1ceb4..0497af8efc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{42CC5090-BE28-E017-8704-FD732475CECD}",
+            "base": "{42CC5090-BE28-E017-8704-FD732475CECD}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,55 +12,55 @@
             },
             "slots": [
                 {
-                    "key": "Input_Clear By Value",
+                    "base": "Input_Clear By Value",
                     "details": {
                         "name": "Clear By Value"
                     }
                 },
                 {
-                    "key": "DataInput_Value Input",
+                    "base": "DataInput_Value Input",
                     "details": {
                         "name": "Value Input"
                     }
                 },
                 {
-                    "key": "Output_On Clear By Value",
+                    "base": "Output_On Clear By Value",
                     "details": {
                         "name": "On Clear By Value"
                     }
                 },
                 {
-                    "key": "Input_Clear By Pointer",
+                    "base": "Input_Clear By Pointer",
                     "details": {
                         "name": "Clear By Pointer"
                     }
                 },
                 {
-                    "key": "DataInput_Pointer Input",
+                    "base": "DataInput_Pointer Input",
                     "details": {
                         "name": "Pointer Input"
                     }
                 },
                 {
-                    "key": "Output_On Clear By Pointer",
+                    "base": "Output_On Clear By Pointer",
                     "details": {
                         "name": "On Clear By Pointer"
                     }
                 },
                 {
-                    "key": "Input_Clear By Reference",
+                    "base": "Input_Clear By Reference",
                     "details": {
                         "name": "Clear By Reference"
                     }
                 },
                 {
-                    "key": "DataInput_Reference Input",
+                    "base": "DataInput_Reference Input",
                     "details": {
                         "name": "Reference Input"
                     }
                 },
                 {
-                    "key": "Output_On Clear By Reference",
+                    "base": "Output_On Clear By Reference",
                     "details": {
                         "name": "On Clear By Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names
index 0f9ac7a14d..8360f6b541 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{9F0A9171-A7E0-4973-5658-F7470E5DD51F}",
+            "base": "{9F0A9171-A7E0-4973-5658-F7470E5DD51F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,13 +12,13 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In"
                     }
                 },
                 {
-                    "key": "Output_On In",
+                    "base": "Output_On In",
                     "details": {
                         "name": "On In"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names
index ce9ce723a7..555fc92580 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{97C6661E-069C-877B-4FBC-AD14CCCBB43D}",
+            "base": "{97C6661E-069C-877B-4FBC-AD14CCCBB43D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,55 +12,55 @@
             },
             "slots": [
                 {
-                    "key": "Input_Return By Value",
+                    "base": "Input_Return By Value",
                     "details": {
                         "name": "Return By Value"
                     }
                 },
                 {
-                    "key": "Output_On Return By Value",
+                    "base": "Output_On Return By Value",
                     "details": {
                         "name": "On Return By Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Value",
+                    "base": "DataOutput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "Input_Return By Pointer",
+                    "base": "Input_Return By Pointer",
                     "details": {
                         "name": "Return By Pointer"
                     }
                 },
                 {
-                    "key": "Output_On Return By Pointer",
+                    "base": "Output_On Return By Pointer",
                     "details": {
                         "name": "On Return By Pointer"
                     }
                 },
                 {
-                    "key": "DataOutput_Pointer",
+                    "base": "DataOutput_Pointer",
                     "details": {
                         "name": "Pointer"
                     }
                 },
                 {
-                    "key": "Input_Return By Reference",
+                    "base": "Input_Return By Reference",
                     "details": {
                         "name": "Return By Reference"
                     }
                 },
                 {
-                    "key": "Output_On Return By Reference",
+                    "base": "Output_On Return By Reference",
                     "details": {
                         "name": "On Return By Reference"
                     }
                 },
                 {
-                    "key": "DataOutput_Reference",
+                    "base": "DataOutput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names
index 6dadfcd802..7d9f1d9d64 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{233C84A7-44DE-A948-D65C-46C11F1F7162}",
+            "base": "{233C84A7-44DE-A948-D65C-46C11F1F7162}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,92 +12,92 @@
             },
             "slots": [
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start",
                         "tooltip": "When signaled, execution is delayed at this node according to the specified properties."
                     }
                 },
                 {
-                    "key": "DataInput_Start: Time",
+                    "base": "DataInput_Start: Time",
                     "details": {
                         "name": "Start: Time"
                     }
                 },
                 {
-                    "key": "DataInput_Start: Loop",
+                    "base": "DataInput_Start: Loop",
                     "details": {
                         "name": "Start: Loop"
                     }
                 },
                 {
-                    "key": "DataInput_Start: Hold",
+                    "base": "DataInput_Start: Hold",
                     "details": {
                         "name": "Start: Hold"
                     }
                 },
                 {
-                    "key": "Output_On Start",
+                    "base": "Output_On Start",
                     "details": {
                         "name": "On Start",
                         "tooltip": "When signaled, execution is delayed at this node according to the specified properties."
                     }
                 },
                 {
-                    "key": "Input_Reset",
+                    "base": "Input_Reset",
                     "details": {
                         "name": "Reset",
                         "tooltip": "When signaled, execution is delayed at this node according to the specified properties."
                     }
                 },
                 {
-                    "key": "DataInput_Reset: Time",
+                    "base": "DataInput_Reset: Time",
                     "details": {
                         "name": "Reset: Time"
                     }
                 },
                 {
-                    "key": "DataInput_Reset: Loop",
+                    "base": "DataInput_Reset: Loop",
                     "details": {
                         "name": "Reset: Loop"
                     }
                 },
                 {
-                    "key": "DataInput_Reset: Hold",
+                    "base": "DataInput_Reset: Hold",
                     "details": {
                         "name": "Reset: Hold"
                     }
                 },
                 {
-                    "key": "Output_On Reset",
+                    "base": "Output_On Reset",
                     "details": {
                         "name": "On Reset",
                         "tooltip": "When signaled, execution is delayed at this node according to the specified properties."
                     }
                 },
                 {
-                    "key": "Input_Cancel",
+                    "base": "Input_Cancel",
                     "details": {
                         "name": "Cancel",
                         "tooltip": "Cancels the current delay."
                     }
                 },
                 {
-                    "key": "Output_On Cancel",
+                    "base": "Output_On Cancel",
                     "details": {
                         "name": "On Cancel",
                         "tooltip": "Cancels the current delay."
                     }
                 },
                 {
-                    "key": "Output_Done",
+                    "base": "Output_Done",
                     "details": {
                         "name": "Done",
                         "tooltip": "Signaled when the delay reaches zero."
                     }
                 },
                 {
-                    "key": "DataOutput_Elapsed",
+                    "base": "DataOutput_Elapsed",
                     "details": {
                         "name": "Elapsed"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names
index 33b72debaa..d3ef973ec7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{D93538FF-3553-4C65-AB81-9089C5270214}",
+            "base": "{D93538FF-3553-4C65-AB81-9089C5270214}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,33 +11,33 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Duration",
+                    "base": "DataInput_Duration",
                     "details": {
                         "name": "Duration"
                     }
                 },
                 {
-                    "key": "DataOutput_Elapsed",
+                    "base": "DataOutput_Elapsed",
                     "details": {
                         "name": "Elapsed"
                     }
                 },
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start",
                         "tooltip": "Starts the countdown"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled every frame while the duration is active."
                     }
                 },
                 {
-                    "key": "Output_Done",
+                    "base": "Output_Done",
                     "details": {
                         "name": "Done",
                         "tooltip": "Signaled once the duration is complete."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names
index 3b556a246a..c024e58c31 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names
@@ -1,38 +1,50 @@
 {
     "entries": [
         {
-            "key": "{BA107060-249D-4818-9CEC-7573718273FC}",
+            "base": "{E73DB180-A325-763B-A1FE-517B548AF66E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
-                "name": "HeartBeat",
+                "name": "Heart Beat",
                 "category": "Timing",
-                "tooltip": "While active, will signal the output at the given interval.",
-                "subtitle": "Timing"
+                "tooltip": "While active, will signal the output at the given interval."
             },
             "slots": [
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start"
                     }
                 },
                 {
-                    "key": "Input_Stop",
+                    "base": "DataInput_Interval",
+                    "details": {
+                        "name": "Interval"
+                    }
+                },
+                {
+                    "base": "Output_On Start",
+                    "details": {
+                        "name": "On Start"
+                    }
+                },
+                {
+                    "base": "Input_Stop",
                     "details": {
                         "name": "Stop"
                     }
                 },
                 {
-                    "key": "Output_Pulse",
+                    "base": "Output_On Stop",
                     "details": {
-                        "name": "Pulse"
+                        "name": "On Stop"
                     }
                 },
                 {
-                    "key": "DataInput_Interval",
+                    "base": "Output_Pulse",
                     "details": {
-                        "name": "Interval"
+                        "name": "Pulse",
+                        "tooltip": "Signaled at each specified interval."
                     }
                 }
             ]
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names
index 0664dfcccc..d5162caf05 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{F200B22A-5903-483A-BF63-5241BC03632B}",
+            "base": "{F200B22A-5903-483A-BF63-5241BC03632B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,7 +12,7 @@
             },
             "slots": [
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled when the entity that owns this graph is fully activated."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names
index 994c19dcb2..a682f2b7ec 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{399A2608-77E3-41F9-90FA-58A9B6E0E34D}",
+            "base": "{399A2608-77E3-41F9-90FA-58A9B6E0E34D}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,26 +11,26 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Ticks",
+                    "base": "DataInput_Ticks",
                     "details": {
                         "name": "Ticks"
                     }
                 },
                 {
-                    "key": "DataInput_Tick Order",
+                    "base": "DataInput_Tick Order",
                     "details": {
                         "name": "Tick Order"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "When signaled, execution is delayed at this node for the specified amount of frames."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after waiting for the specified amount of frames."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names
index 07e418a798..bfe267f227 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{364F5AC9-8351-44B6-A069-03367B21F7AA}",
+            "base": "{364F5AC9-8351-44B6-A069-03367B21F7AA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,21 +11,21 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "When signaled, execution is delayed at this node for the specified amount of times."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after waiting for the specified amount of times."
                     }
                 },
                 {
-                    "key": "DataInput_Delay",
+                    "base": "DataInput_Delay",
                     "details": {
                         "name": "Delay"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names
index 03846acfea..87b2c1cefa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{60CF8540-E51A-434D-A32C-461C41D68AF9}",
+            "base": "{60CF8540-E51A-434D-A32C-461C41D68AF9}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,33 +11,33 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Milliseconds",
+                    "base": "DataOutput_Milliseconds",
                     "details": {
                         "name": "Milliseconds"
                     }
                 },
                 {
-                    "key": "DataOutput_Seconds",
+                    "base": "DataOutput_Seconds",
                     "details": {
                         "name": "Seconds"
                     }
                 },
                 {
-                    "key": "Input_Start",
+                    "base": "Input_Start",
                     "details": {
                         "name": "Start",
                         "tooltip": "Starts the timer."
                     }
                 },
                 {
-                    "key": "Input_Stop",
+                    "base": "Input_Stop",
                     "details": {
                         "name": "Stop",
                         "tooltip": "Stops the timer."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled every frame while the timer is running."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names
index 5888ef600b..8412a5383d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B13F8DE1-E017-484D-9910-BABFB355D72E}",
+            "base": "{B13F8DE1-E017-484D-9910-BABFB355D72E}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,33 +10,33 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the arithmetic operation is done."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names
index 99250a91e7..e07670e988 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}",
+            "base": "{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names
index 1c510ed8f2..7df3ca9423 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}",
+            "base": "{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,27 +10,27 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names
index aa9f24a5a4..f59d822ffb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{82C50EAD-D3DD-45D2-BFCE-981D95771DC8}",
+            "base": "{82C50EAD-D3DD-45D2-BFCE-981D95771DC8}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,40 +10,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names
index 9e85f54642..f8404345b7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}",
+            "base": "{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,40 +10,40 @@
             },
             "slots": [
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
                     }
                 },
                 {
-                    "key": "DataInput_Value A",
+                    "base": "DataInput_Value A",
                     "details": {
                         "name": "Value A"
                     }
                 },
                 {
-                    "key": "DataInput_Value B",
+                    "base": "DataInput_Value B",
                     "details": {
                         "name": "Value B"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names
index a2c586b1d5..a2a6475525 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8225BE35-4C45-4A32-94D9-3DE114F6F5AF}",
+            "base": "{8225BE35-4C45-4A32-94D9-3DE114F6F5AF}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,14 +10,14 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "When signaled sends the property referenced by this node to a Data Output slot"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the referenced property has been pushed to the Data Output slot"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names
index db32104037..d884e287da 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{80351020-5778-491A-B6CA-C78364C19499}",
+            "base": "{80351020-5778-491A-B6CA-C78364C19499}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names
index dcedf6840c..fa7c4723e1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{C5C21008-F0B8-4FC8-843E-9C5C50B9DCDC}",
+            "base": "{C5C21008-F0B8-4FC8-843E-9C5C50B9DCDC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names
index 190dfb4c28..b4e5f12867 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{5EFD2942-AFF9-4137-939C-023AEAA72EB0}",
+            "base": "{5EFD2942-AFF9-4137-939C-023AEAA72EB0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,14 +10,14 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "When signaled sends the variable referenced by this node to a Data Output slot"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after the referenced variable has been pushed to the Data Output slot"
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names
index 28ca30346b..4933d2d9bc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{70FF2162-3D01-41F1-B009-7DC071A38471}",
+            "base": "{70FF2162-3D01-41F1-B009-7DC071A38471}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,33 +10,33 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "DataOutput_Result",
+                    "base": "DataOutput_Result",
                     "details": {
                         "name": "Result"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
                     }
                 },
                 {
-                    "key": "Output_True",
+                    "base": "Output_True",
                     "details": {
                         "name": "True",
                         "tooltip": "Signaled if the result of the operation is true."
                     }
                 },
                 {
-                    "key": "Output_False",
+                    "base": "Output_False",
                     "details": {
                         "name": "False",
                         "tooltip": "Signaled if the result of the operation is false."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names
index 3717b44595..b18fe07c1f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{B0BF8615-D718-4115-B3D8-CAB554BC6863}",
+            "base": "{B0BF8615-D718-4115-B3D8-CAB554BC6863}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -10,7 +10,7 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Signal to perform the evaluation when desired."
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names
index b1817d9acd..0b238ad007 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E1940FB4-83FE-4594-9AFF-375FF7603338}",
+            "base": "{E1940FB4-83FE-4594-9AFF-375FF7603338}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,20 +12,20 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "DataInput_Value",
+                    "base": "DataInput_Value",
                     "details": {
                         "name": "Value"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names
index 8f0eb7f3af..f1e851bd4d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{1C4971A7-DE76-4E8E-9381-F579A57B2A78}",
+            "base": "{1C4971A7-DE76-4E8E-9381-F579A57B2A78}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,20 +11,20 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names
index 0b3b7a1399..5ebb61abdb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{0D5B9544-C36B-490F-899A-E260D8351620}",
+            "base": "{0D5B9544-C36B-490F-899A-E260D8351620}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,20 +11,20 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names
index 3ad1d73949..c87e917ec6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E65449D2-45A9-402B-ADF7-4E4F27A99245}",
+            "base": "{E65449D2-45A9-402B-ADF7-4E4F27A99245}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,20 +11,20 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names
index 6a0e5938b7..82e29a3761 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{856DB72A-48CB-4142-A032-1253D3AB8BEC}",
+            "base": "{856DB72A-48CB-4142-A032-1253D3AB8BEC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,32 +11,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names
index f5f80e56ea..0ece11c5d3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{3838E12C-CEAB-4CED-9958-B6C0399FCD92}",
+            "base": "{3838E12C-CEAB-4CED-9958-B6C0399FCD92}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,26 +11,26 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names
index 73dabca9d7..b5e85fc361 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8DD464A5-C09D-4017-82B7-B1EA672BA9EA}",
+            "base": "{8DD464A5-C09D-4017-82B7-B1EA672BA9EA}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,32 +11,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names
index cf1068fdbe..3d82f05c18 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{8EB4E313-1479-4428-AE0C-75F233C5F5EB}",
+            "base": "{8EB4E313-1479-4428-AE0C-75F233C5F5EB}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,32 +11,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names
index 6d2ac88907..f3a875700a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{693FD406-8735-4DBB-B0A8-39E7DA467559}",
+            "base": "{693FD406-8735-4DBB-B0A8-39E7DA467559}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,32 +11,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names
index 8c9bb8df5f..1897bf12fe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{52D4803F-6273-4A4E-96CC-F2892CFE433B}",
+            "base": "{52D4803F-6273-4A4E-96CC-F2892CFE433B}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,32 +11,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names
index ef1b954761..cbe4045c11 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{66334794-0F98-4BFC-9DB0-8AB6A4052D09}",
+            "base": "{66334794-0F98-4BFC-9DB0-8AB6A4052D09}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,32 +11,32 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
                 },
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Reference",
+                    "base": "DataInput_Reference",
                     "details": {
                         "name": "Reference"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names
index 62c2dfb710..71bf43b22a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{88F9BE2D-F591-45AD-9682-FBB67C39C504}",
+            "base": "{88F9BE2D-F591-45AD-9682-FBB67C39C504}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,26 +11,26 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Candidate",
+                    "base": "DataInput_Candidate",
                     "details": {
                         "name": "Candidate"
                     }
                 },
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names
index 4a0b442e56..67c838c832 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{DC0BCFE9-3066-4232-AA68-AAFB206C917F}",
+            "base": "{DC0BCFE9-3066-4232-AA68-AAFB206C917F}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -11,20 +11,20 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Report",
+                    "base": "DataInput_Report",
                     "details": {
                         "name": "Report"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names
index 32ac04b759..4a46770857 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{BAD6C904-6078-49E8-B461-CA4410B785A4}",
+            "base": "{BAD6C904-6078-49E8-B461-CA4410B785A4}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,7 +12,7 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Delay",
+                    "base": "DataInput_Delay",
                     "details": {
                         "name": "Delay"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names
index 7f052d76d3..3ce4ed1f67 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{D4C9DA8E-838B-41C6-B870-C75294C323DC}",
+            "base": "{D4C9DA8E-838B-41C6-B870-C75294C323DC}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,21 +12,21 @@
             },
             "slots": [
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "When signaled assigns property values using the supplied source input"
                     }
                 },
                 {
-                    "key": "Output_Out",
+                    "base": "Output_Out",
                     "details": {
                         "name": "Out",
                         "tooltip": "Signaled after all property haves have been pushed to the output slots"
                     }
                 },
                 {
-                    "key": "DataInput_Source",
+                    "base": "DataInput_Source",
                     "details": {
                         "name": "Source"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names
index c2e45a57a2..e34c059680 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{0A38EDCA-0571-48F0-9199-F6168C1EAAF0}",
+            "base": "{0A38EDCA-0571-48F0-9199-F6168C1EAAF0}",
             "context": "ScriptCanvas::Node",
             "variant": "",
             "details": {
@@ -12,34 +12,34 @@
             },
             "slots": [
                 {
-                    "key": "DataInput_Repetitions",
+                    "base": "DataInput_Repetitions",
                     "details": {
                         "name": "Repetitions"
                     }
                 },
                 {
-                    "key": "Input_In",
+                    "base": "Input_In",
                     "details": {
                         "name": "In",
                         "tooltip": "Input signal"
                     }
                 },
                 {
-                    "key": "Output_Complete",
+                    "base": "Output_Complete",
                     "details": {
                         "name": "Complete",
                         "tooltip": "Signaled upon node exit"
                     }
                 },
                 {
-                    "key": "Output_Action",
+                    "base": "Output_Action",
                     "details": {
                         "name": "Action",
                         "tooltip": "The signal that will be repeated"
                     }
                 },
                 {
-                    "key": "DataInput_Interval",
+                    "base": "DataInput_Interval",
                     "details": {
                         "name": "Interval"
                     }
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names
deleted file mode 100644
index 3ec467cbfd..0000000000
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "entries": [
-        {
-            "key": "ALPHA",
-            "context": "Constant",
-            "variant": "",
-            "details": {
-                "name": "ALPHA::Getter",
-                "category": "Constants"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names
new file mode 100644
index 0000000000..f024e4e28b
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "AreaBlenderComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Area Blender Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetAreaBlenderComponentTypeId",
+                    "details": {
+                        "name": "Get Area Blender Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names
index 2585ca9071..c1a45e9088 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AreaLightComponentTypeId",
+            "base": "AreaLightComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AreaLightComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Area Light Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetAreaLightComponentTypeId",
+                    "details": {
+                        "name": "Get Area Light Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names
index a8099784d0..f3de6ac1c3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AudioObstructionType_Ignore",
+            "base": "AudioObstructionType_Ignore",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AudioObstructionType_Ignore::Getter",
-                "category": "Constants"
-            }
+                "name": " Ignore",
+                "category": "Constants/Audio Obstruction"
+            },
+            "methods": [
+                {
+                    "base": "GetAudioObstructionType_Ignore",
+                    "details": {
+                        "name": "Ignore"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names
index 4c0cdc5803..b9b6d4fc0a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AudioObstructionType_MultiRay",
+            "base": "AudioObstructionType_MultiRay",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AudioObstructionType_MultiRay::Getter",
-                "category": "Constants"
-            }
+                "name": "Multi Ray",
+                "category": "Constants/Audio Obstruction"
+            },
+            "methods": [
+                {
+                    "base": "GetAudioObstructionType_MultiRay",
+                    "details": {
+                        "name": "Multi Ray"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names
index bf61f3430f..b86d40f250 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AudioObstructionType_SingleRay",
+            "base": "AudioObstructionType_SingleRay",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AudioObstructionType_SingleRay::Getter",
-                "category": "Constants"
-            }
+                "name": "Single Ray",
+                "category": "Constants/Audio Obstruction"
+            },
+            "methods": [
+                {
+                    "base": "GetAudioObstructionType_SingleRay",
+                    "details": {
+                        "name": "Single Ray"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names
index 0522c4b2e8..f6d2c8a197 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AudioPreloadComponentLoadType_Auto",
+            "base": "AudioPreloadComponentLoadType_Auto",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AudioPreloadComponentLoadType_Auto::Getter",
-                "category": "Constants"
-            }
+                "name": "Load Type Auto",
+                "category": "Constants/Audio Preload"
+            },
+            "methods": [
+                {
+                    "base": "GetAudioPreloadComponentLoadType_Auto",
+                    "details": {
+                        "name": "Load Type Auto"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names
index e81b8fd73c..4d5feaad5b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AudioPreloadComponentLoadType_Manual",
+            "base": "AudioPreloadComponentLoadType_Manual",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AudioPreloadComponentLoadType_Manual::Getter",
-                "category": "Constants"
-            }
+                "name": "Load Type Manual",
+                "category": "Constants/Audio Preload"
+            },
+            "methods": [
+                {
+                    "base": "GetAudioPreloadComponentLoadType_Manual",
+                    "details": {
+                        "name": "Load Type Manual"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names
index 5437a6a5c9..abbb47ca89 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "AxisAlignedBoxShapeComponentTypeId",
+            "base": "AxisAlignedBoxShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "AxisAlignedBoxShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Axis Aligned Box Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetAxisAlignedBoxShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Axis Aligned Box Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names
deleted file mode 100644
index c1cd1a28bf..0000000000
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "entries": [
-        {
-            "key": "BRAVO",
-            "context": "Constant",
-            "variant": "",
-            "details": {
-                "name": "BRAVO::Getter",
-                "category": "Constants"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names
index 74f2fe9c14..fdde3cc1d1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaDest",
+            "base": "BlendFactor_AlphaDest",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaDest::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Dest",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_AlphaDest",
+                    "details": {
+                        "name": "Get Alpha Dest"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names
index ae1804aa64..c94109b0cd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaDestInverse",
+            "base": "BlendFactor_AlphaDestInverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaDestInverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Dest Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_AlphaDestInverse",
+                    "details": {
+                        "name": "Get Alpha Dest Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names
index 252dca2bcb..b8825ce046 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaSource",
+            "base": "BlendFactor_AlphaSource",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaSource::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Source",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "AlphaSource",
+                    "details": {
+                        "name": "Get Alpha Source"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names
index 8924ea6c15..cb229071a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaSource1",
+            "base": "BlendFactor_AlphaSource1",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaSource1::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Source 1",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_AlphaSource1",
+                    "details": {
+                        "name": "Get Alpha Source 1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names
index af6c0b6dd5..bf9b3144bf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaSource1Inverse",
+            "base": "BlendFactor_AlphaSource1Inverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaSource1Inverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Source 1 Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_AlphaSource1Inverse",
+                    "details": {
+                        "name": "Get Alpha Source 1 Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names
index f933c877a8..49eff72742 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaSourceInverse",
+            "base": "BlendFactor_AlphaSourceInverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaSourceInverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Source Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_AlphaSourceInverse",
+                    "details": {
+                        "name": "Get Alpha Source Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names
index a2a027ea6b..8a104eba15 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_AlphaSourceSaturate",
+            "base": "BlendFactor_AlphaSourceSaturate",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_AlphaSourceSaturate::Getter",
-                "category": "Constants"
-            }
+                "name": "Alpha Source Saturate",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_AlphaSourceSaturate",
+                    "details": {
+                        "name": "Get Alpha Source Saturate"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names
index 1f9c086e82..a17f1e2915 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_ColorDest",
+            "base": "BlendFactor_ColorDest",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_ColorDest::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Dest",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_ColorDest",
+                    "details": {
+                        "name": "Get Color Dest"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names
index 93fa5750ef..25553bed9e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_ColorDestInverse",
+            "base": "BlendFactor_ColorDestInverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_ColorDestInverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Dest Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_ColorDestInverse",
+                    "details": {
+                        "name": "Get Color Dest Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names
index 317b1f283b..c693053cb7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_ColorSource",
+            "base": "BlendFactor_ColorSource",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_ColorSource::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Source",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_ColorSource",
+                    "details": {
+                        "name": "Get Color Source"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names
index 0a9db7be52..62407ba8c9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_ColorSource1",
+            "base": "BlendFactor_ColorSource1",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_ColorSource1::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Source 1",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_ColorSource1",
+                    "details": {
+                        "name": "Get Color Source 1"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names
index 68e4f3e1ca..4e1178fd61 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_ColorSource1Inverse",
+            "base": "BlendFactor_ColorSource1Inverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_ColorSource1Inverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Source 1 Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_ColorSource1Inverse",
+                    "details": {
+                        "name": "Get Color Source 1 Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names
index cd84b391d8..e33a9389ee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_ColorSourceInverse",
+            "base": "BlendFactor_ColorSourceInverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_ColorSourceInverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Source Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_ColorSourceInverse",
+                    "details": {
+                        "name": "Get Color Source Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names
index 2b7648e44c..1e235c0054 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_Factor",
+            "base": "BlendFactor_Factor",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_Factor::Getter",
-                "category": "Constants"
-            }
+                "name": "Factor",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_Factor",
+                    "details": {
+                        "name": "Get Factor"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names
index f5a6d3ae3a..69eddb1fab 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_FactorInverse",
+            "base": "BlendFactor_FactorInverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_FactorInverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Factor Inverse",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_FactorInverse",
+                    "details": {
+                        "name": "Get Factor Inverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names
index c5b269624b..0751a6a29f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_Invalid",
+            "base": "BlendFactor_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_Invalid",
+                    "details": {
+                        "name": "Get Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names
index fee52d4844..3909d3cffe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_One",
+            "base": "BlendFactor_One",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_One::Getter",
-                "category": "Constants"
-            }
+                "name": "One",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_One",
+                    "details": {
+                        "name": "Get One"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names
index 35c7e8df15..638a238661 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendFactor_Zero",
+            "base": "BlendFactor_Zero",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendFactor_Zero::Getter",
-                "category": "Constants"
-            }
+                "name": "Zero",
+                "category": "Constants/Blend Factor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendFactor_Zero",
+                    "details": {
+                        "name": "Get Zero"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names
index e27d493605..ad4cf9dd21 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendOp_Add",
+            "base": "BlendOp_Add",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendOp_Add::Getter",
-                "category": "Constants"
-            }
+                "name": "Add",
+                "category": "Constants/Blend Operation"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendOp_Add",
+                    "details": {
+                        "name": "Get Add"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names
index 7d099cc394..1b19a6d22a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendOp_Invalid",
+            "base": "BlendOp_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendOp_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/Blend Operation"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendOp_Invalid",
+                    "details": {
+                        "name": "Get Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names
index 1970242769..2bd78c05f2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendOp_Maximum",
+            "base": "BlendOp_Maximum",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendOp_Maximum::Getter",
-                "category": "Constants"
-            }
+                "name": "Maximum",
+                "category": "Constants/Blend Operation"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendOp_Maximum",
+                    "details": {
+                        "name": "Get Maximum"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names
index 714568e008..f28d104183 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendOp_Minimum",
+            "base": "BlendOp_Minimum",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendOp_Minimum::Getter",
-                "category": "Constants"
-            }
+                "name": "Minimum",
+                "category": "Constants/Blend Operation"
+            },
+            "methods": [
+                {
+                    "base": "Minimum",
+                    "details": {
+                        "name": "Get Minimum"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names
index 6faf93dbf4..bab41f7aa3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendOp_Subtract",
+            "base": "BlendOp_Subtract",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendOp_Subtract::Getter",
-                "category": "Constants"
-            }
+                "name": "Subtract",
+                "category": "Constants/Blend Operation"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendOp_Subtract",
+                    "details": {
+                        "name": "Get Subtract"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names
index b8f98b7600..74d3c63499 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BlendOp_SubtractReverse",
+            "base": "BlendOp_SubtractReverse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BlendOp_SubtractReverse::Getter",
-                "category": "Constants"
-            }
+                "name": "Subtract Reverse",
+                "category": "Constants/Blend Operation"
+            },
+            "methods": [
+                {
+                    "base": "GetBlendOp_SubtractReverse",
+                    "details": {
+                        "name": "Get Subtract Reverse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names
new file mode 100644
index 0000000000..b2590a66f5
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "BlockerComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Blocker Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetBlockerComponentTypeId",
+                    "details": {
+                        "name": "Get Blocker Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names
index 0d8ba9a325..da75eeee0a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BloomComponentTypeId",
+            "base": "BloomComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BloomComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Bloom Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetBloomComponentTypeId",
+                    "details": {
+                        "name": "Get Bloom Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names
index 5f076bd6a5..47e43d6214 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "BoxShapeComponentTypeId",
+            "base": "BoxShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "BoxShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Box Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetBoxShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Box Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names
deleted file mode 100644
index 85f7c894f4..0000000000
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "entries": [
-        {
-            "key": "CHARLIE",
-            "context": "Constant",
-            "variant": "",
-            "details": {
-                "name": "CHARLIE::Getter",
-                "category": "Constants"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names
new file mode 100644
index 0000000000..3ec26e189b
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "CUBE",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Cube",
+                "category": "Constants/White Box"
+            },
+            "methods": [
+                {
+                    "base": "GetCUBE",
+                    "details": {
+                        "name": "Cube"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names
new file mode 100644
index 0000000000..b893ee0fef
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "CYLINDER",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Cylinder",
+                "category": "Constants/White Box"
+            },
+            "methods": [
+                {
+                    "base": "GetCYLINDER",
+                    "details": {
+                        "name": "Cylinder"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names
index a17f6781d4..cdb1bbc238 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "CapsuleShapeComponentTypeId",
+            "base": "CapsuleShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "CapsuleShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Capsule Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetCapsuleShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Capsule Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names
index 0ff818c566..6ff166295b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ConstantGradientComponentTypeId",
+            "base": "ConstantGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ConstantGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Constant Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetConstantGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Constant Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names
index 61d2c8369e..7f7caceb93 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "CullMode_Back",
+            "base": "CullMode_Back",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "CullMode_Back::Getter",
-                "category": "Constants"
-            }
+                "name": "Back",
+                "category": "Constants/Cull Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetCullMode_Back",
+                    "details": {
+                        "name": "Get Back"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names
index 7f5a35a7f2..b7f8af903b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "CullMode_Front",
+            "base": "CullMode_Front",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "CullMode_Front::Getter",
-                "category": "Constants"
-            }
+                "name": "Front",
+                "category": "Constants/Cull Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetCullMode_Front",
+                    "details": {
+                        "name": "Get Front"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names
index 4eb73b06ea..e5367958fa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "CullMode_Invalid",
+            "base": "CullMode_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "CullMode_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/Cull Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetCullMode_Invalid",
+                    "details": {
+                        "name": "Get Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names
index 182e9c7573..c563d43a64 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "CullMode_None",
+            "base": "CullMode_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "CullMode_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/Cull Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetCullMode_None",
+                    "details": {
+                        "name": "Get None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names
index 3dadc415fd..2934f89ed4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "CylinderShapeComponentTypeId",
+            "base": "CylinderShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "CylinderShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Cylinder Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetCylinderShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Cylinder Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names
index 2a6aaa134e..2187dfeb24 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DecalComponentTypeId",
+            "base": "DecalComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DecalComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Decal Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDecalComponentTypeId",
+                    "details": {
+                        "name": "Get Decal Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names
index c46ee43b8b..1ac1fdb105 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultLodOverride",
+            "base": "DefaultLodOverride",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultLodOverride::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Lod Override",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultLodOverride",
+                    "details": {
+                        "name": "Get Default Lod Override"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names
index 6e166c3480..f5884c2a8c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultLodType",
+            "base": "DefaultLodType",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultLodType::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Lod Type",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultLodType",
+                    "details": {
+                        "name": "Get Default Lod Type"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}",
+                            "details": {
+                                "name": "unsigned char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names
index f435b539a8..2086ad1c9b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultMaterialAssignment",
+            "base": "DefaultMaterialAssignment",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultMaterialAssignment::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Material Assignment",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultMaterialAssignment",
+                    "details": {
+                        "name": "Get Default Material Assignment"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}",
+                            "details": {
+                                "name": "AZ:: Render:: Material Assignment"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names
index b3188d9452..edf35bc3b1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultMaterialAssignmentId",
+            "base": "DefaultMaterialAssignmentId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultMaterialAssignmentId::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Material Assignment Id",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultMaterialAssignmentId",
+                    "details": {
+                        "name": "Get Default Material Assignment Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+                            "details": {
+                                "name": "AZ:: Render:: Material Assignment Id"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names
index 248cf3f7ae..50867c97e1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultMaterialAssignmentMap",
+            "base": "DefaultMaterialAssignmentMap",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultMaterialAssignmentMap::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Material Assignment Map",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultMaterialAssignmentMap",
+                    "details": {
+                        "name": "Get Default Material Assignment Map"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
+                            "details": {
+                                "name": "AZ Std::unordered_map"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names
index 142b97a590..e66d74e456 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultPhysicsSceneId",
+            "base": "DefaultPhysicsSceneId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultPhysicsSceneId::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Physics Scene Id",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultPhysicsSceneId",
+                    "details": {
+                        "name": "Get Default Physics Scene Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Crc 32"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names
index bb32deaea4..07a47cfae4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DefaultPhysicsSceneName",
+            "base": "DefaultPhysicsSceneName",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DefaultPhysicsSceneName::Getter",
-                "category": "Constants"
-            }
+                "name": "Default Physics Scene Name",
+                "category": "Constants/Defaults"
+            },
+            "methods": [
+                {
+                    "base": "GetDefaultPhysicsSceneName",
+                    "details": {
+                        "name": "Get Default Physics Scene Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names
index 4c4899f264..4ab65691fe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DeferredFogComponentTypeId",
+            "base": "DeferredFogComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DeferredFogComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Deferred Fog Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDeferredFogComponentTypeId",
+                    "details": {
+                        "name": "Get Deferred Fog Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names
index 2104b9642f..3d24f7dd7e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DepthOfFieldComponentTypeId",
+            "base": "DepthOfFieldComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DepthOfFieldComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Depth Of Field Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDepthOfFieldComponentTypeId",
+                    "details": {
+                        "name": "Get Depth Of Field Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names
index e169a19258..fda594cedf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DepthWriteMask_All",
+            "base": "DepthWriteMask_All",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DepthWriteMask_All::Getter",
-                "category": "Constants"
-            }
+                "name": "All",
+                "category": "Constants/Depth Write Mask"
+            },
+            "methods": [
+                {
+                    "base": "GetDepthWriteMask_All",
+                    "details": {
+                        "name": "All"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names
index 4789194d25..d28d0a68f1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DepthWriteMask_Invalid",
+            "base": "DepthWriteMask_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DepthWriteMask_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/Depth Write Mask"
+            },
+            "methods": [
+                {
+                    "base": "GetDepthWriteMask_Invalid",
+                    "details": {
+                        "name": "Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names
index 4268b4d8f8..e33a0af623 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DepthWriteMask_Zero",
+            "base": "DepthWriteMask_Zero",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DepthWriteMask_Zero::Getter",
-                "category": "Constants"
-            }
+                "name": "Zero",
+                "category": "Constants/Depth Write Mask"
+            },
+            "methods": [
+                {
+                    "base": "GetDepthWriteMask_Zero",
+                    "details": {
+                        "name": "Zero"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names
new file mode 100644
index 0000000000..4b66d5c7a2
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "DescriptorListCombinerComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Descriptor List Combiner Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDescriptorListCombinerComponentTypeId",
+                    "details": {
+                        "name": "Get Descriptor List Combiner Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names
new file mode 100644
index 0000000000..c190cc2a6d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "DescriptorListComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Descriptor List Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDescriptorListComponentTypeId",
+                    "details": {
+                        "name": "Get Descriptor List Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names
new file mode 100644
index 0000000000..806f846ca7
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "DescriptorWeightSelectorComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Descriptor Weight Selector Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDescriptorWeightSelectorComponentTypeId",
+                    "details": {
+                        "name": "Get Descriptor Weight Selector Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names
index 2e633a1192..123f3768a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DiffuseGlobalIlluminationComponentTypeId",
+            "base": "DiffuseGlobalIlluminationComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DiffuseGlobalIlluminationComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Diffuse Global Illumination Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDiffuseGlobalIlluminationComponentTypeId",
+                    "details": {
+                        "name": "Get Diffuse Global Illumination Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names
index c5b5f17bde..255fda6778 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DiffuseProbeGridComponentTypeId",
+            "base": "DiffuseProbeGridComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DiffuseProbeGridComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Diffuse Probe Grid Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDiffuseProbeGridComponentTypeId",
+                    "details": {
+                        "name": "Get Diffuse Probe Grid Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names
index 0ad98b326e..bc81a2d511 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DirectionalLightComponentTypeId",
+            "base": "DirectionalLightComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DirectionalLightComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Directional Light Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDirectionalLightComponentTypeId",
+                    "details": {
+                        "name": "Get Directional Light Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names
index cac82ca189..fee2376420 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DiskShapeComponentTypeId",
+            "base": "DiskShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DiskShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Disk Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDiskShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Disk Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names
index 9117f367ee..b284f80a68 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplayMapperComponentTypeId",
+            "base": "DisplayMapperComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplayMapperComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Display Mapper Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplayMapperComponentTypeId",
+                    "details": {
+                        "name": "Get Display Mapper Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names
index 488a8f7ec2..9f47789e24 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_HideHelpers",
+            "base": "DisplaySettings_HideHelpers",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_HideHelpers::Getter",
-                "category": "Constants"
-            }
+                "name": "Hide Helpers",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_HideHelpers",
+                    "details": {
+                        "name": "Get Hide Helpers"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names
index d532e8ff35..93fc163a67 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_HideLinks",
+            "base": "DisplaySettings_HideLinks",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_HideLinks::Getter",
-                "category": "Constants"
-            }
+                "name": "Hide Links",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_HideLinks",
+                    "details": {
+                        "name": "Get Hide Links"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names
index ade09a965c..45872cce0d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_HideTracks",
+            "base": "DisplaySettings_HideTracks",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_HideTracks::Getter",
-                "category": "Constants"
-            }
+                "name": "Hide Tracks",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_HideTracks",
+                    "details": {
+                        "name": "Get Hide Tracks"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names
index 0cece10c67..096407f338 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_NoCollision",
+            "base": "DisplaySettings_NoCollision",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_NoCollision::Getter",
-                "category": "Constants"
-            }
+                "name": "No Collision",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_NoCollision",
+                    "details": {
+                        "name": "Get No Collision"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names
index d855c9ce0e..b0d8562db6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_NoLabels",
+            "base": "DisplaySettings_NoLabels",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_NoLabels::Getter",
-                "category": "Constants"
-            }
+                "name": "No Labels",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_NoLabels",
+                    "details": {
+                        "name": "Get No Labels"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names
index 237968c10e..224f6d48f0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_Physics",
+            "base": "DisplaySettings_Physics",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_Physics::Getter",
-                "category": "Constants"
-            }
+                "name": "Physics",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_Physics",
+                    "details": {
+                        "name": "Get Physics"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names
index c6e4c44cb2..ae664ce8a6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_SerializableFlagsMask",
+            "base": "DisplaySettings_SerializableFlagsMask",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_SerializableFlagsMask::Getter",
-                "category": "Constants"
-            }
+                "name": "Serializable Flags Mask",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_SerializableFlagsMask",
+                    "details": {
+                        "name": "Get Serializable Flags Mask"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names
index 2c3f42a6c5..d6d9de0549 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DisplaySettings_ShowDimensionFigures",
+            "base": "DisplaySettings_ShowDimensionFigures",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DisplaySettings_ShowDimensionFigures::Getter",
-                "category": "Constants"
-            }
+                "name": "Show Dimension Figures",
+                "category": "Constants/Display Settings"
+            },
+            "methods": [
+                {
+                    "base": "GetDisplaySettings_ShowDimensionFigures",
+                    "details": {
+                        "name": "Get Show Dimension Figures"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names
new file mode 100644
index 0000000000..2e1801b3b0
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "DistanceBetweenFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Distance Between Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDistanceBetweenFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Distance Between Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names
new file mode 100644
index 0000000000..b5e1b96354
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "DistributionFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Distribution Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetDistributionFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Distribution Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names
index f4be6282d0..b43e059a52 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "DitherGradientComponentTypeId",
+            "base": "DitherGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "DitherGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Dither Gradient Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetDitherGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Dither Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names
index fd410df4f9..c219df25cf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorAreaLightComponentTypeId",
+            "base": "EditorAreaLightComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorAreaLightComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Area Light Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorAreaLightComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Area Light Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names
index 2d2f101be0..29cb903318 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorBloomComponentTypeId",
+            "base": "EditorBloomComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorBloomComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Bloom Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorBloomComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Bloom Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names
index a40f551364..30bb2a1c29 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDecalComponentTypeId",
+            "base": "EditorDecalComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDecalComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Decal Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDecalComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Decal Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names
index c0f17922f6..d8bdd04e6b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDeferredFogComponentTypeId",
+            "base": "EditorDeferredFogComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDeferredFogComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Deferred Fog Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDeferredFogComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Deferred Fog Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names
index fc16e176bd..df6073be7c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDepthOfFieldComponentTypeId",
+            "base": "EditorDepthOfFieldComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDepthOfFieldComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Depth Of Field Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDepthOfFieldComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Depth Of Field Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names
index ab9f4e04f0..3ce4b30d34 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDiffuseGlobalIlluminationComponentTypeId",
+            "base": "EditorDiffuseGlobalIlluminationComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDiffuseGlobalIlluminationComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Diffuse Global Illumination Component Type Id",
+                "category": "Constants/Editor/Component Type Id"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDiffuseGlobalIlluminationComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Diffuse Global Illumination Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names
index 24e649c4b0..2d76298124 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDiffuseProbeGridComponentTypeId",
+            "base": "EditorDiffuseProbeGridComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDiffuseProbeGridComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Diffuse Probe Grid Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDiffuseProbeGridComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Diffuse Probe Grid Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names
index 0caf18913a..697762e490 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDirectionalLightComponentTypeId",
+            "base": "EditorDirectionalLightComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDirectionalLightComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Directional Light Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDirectionalLightComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Directional Light Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names
index 6a449cb643..18c54519a9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorDisplayMapperComponentTypeId",
+            "base": "EditorDisplayMapperComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorDisplayMapperComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Display Mapper Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorDisplayMapperComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Display Mapper Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names
index f0214aec06..96f3adf90b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorEntityReferenceComponentTypeId",
+            "base": "EditorEntityReferenceComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorEntityReferenceComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Entity Reference Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorEntityReferenceComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Entity Reference Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names
index e4ca34fdb0..f9536eeddc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorEntityStartStatus_EditorOnly",
+            "base": "EditorEntityStartStatus_EditorOnly",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorEntityStartStatus_EditorOnly::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Entity Start Status_ Editor Only",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorEntityStartStatus_EditorOnly",
+                    "details": {
+                        "name": "Get Editor Entity Start Status_ Editor Only"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names
index 51e4369297..a6585f24ed 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorEntityStartStatus_StartActive",
+            "base": "EditorEntityStartStatus_StartActive",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorEntityStartStatus_StartActive::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Entity Start Status_ Start Active",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorEntityStartStatus_StartActive",
+                    "details": {
+                        "name": "Get Editor Entity Start Status_ Start Active"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names
index fa41555722..20ed53be3d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorEntityStartStatus_StartInactive",
+            "base": "EditorEntityStartStatus_StartInactive",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorEntityStartStatus_StartInactive::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Entity Start Status_ Start Inactive",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorEntityStartStatus_StartInactive",
+                    "details": {
+                        "name": "Get Editor Entity Start Status_ Start Inactive"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names
index 3b9c6f893f..d5722e7279 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorExposureControlComponentTypeId",
+            "base": "EditorExposureControlComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorExposureControlComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Exposure Control Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorExposureControlComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Exposure Control Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names
index dc20398559..12178cd421 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorGradientWeightModifierComponentTypeId",
+            "base": "EditorGradientWeightModifierComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorGradientWeightModifierComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Gradient Weight Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorGradientWeightModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Gradient Weight Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names
index 5f3dbe3e87..72969664a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorGridComponentTypeId",
+            "base": "EditorGridComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorGridComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Grid Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorGridComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Grid Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names
index d1e49132a9..52bd2fe5af 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorHDRiSkyboxComponentTypeId",
+            "base": "EditorHDRiSkyboxComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorHDRiSkyboxComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "EditorHD Ri Skybox Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorHDRiSkyboxComponentTypeId",
+                    "details": {
+                        "name": "Get EditorHD Ri Skybox Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names
new file mode 100644
index 0000000000..17df6d3de5
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "EditorHairComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Editor Hair Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorHairComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Hair Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names
index e6ddff36a2..a57151ad18 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorImageBasedLightComponentTypeId",
+            "base": "EditorImageBasedLightComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorImageBasedLightComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Image Based Light Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorImageBasedLightComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Image Based Light Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names
index 39bcdad1e5..6d2fdbd5f0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorLookModificationComponentTypeId",
+            "base": "EditorLookModificationComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorLookModificationComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Look Modification Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorLookModificationComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Look Modification Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names
index 35b3db3305..385edba4d8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorMaterialComponentTypeId",
+            "base": "EditorMaterialComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorMaterialComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Material Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorMaterialComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Material Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names
index 8ca2af81eb..59cdcabefa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorMeshComponentTypeId",
+            "base": "EditorMeshComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorMeshComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Mesh Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorMeshComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Mesh Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names
index ea5a58d742..bde0970c36 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorNonUniformScaleComponentTypeId",
+            "base": "EditorNonUniformScaleComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorNonUniformScaleComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Non Uniform Scale Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorNonUniformScaleComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Non Uniform Scale Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names
index 4c2b06be1a..bd40fae6ac 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorOcclusionCullingPlaneComponentTypeId",
+            "base": "EditorOcclusionCullingPlaneComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorOcclusionCullingPlaneComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Occlusion Culling Plane Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorOcclusionCullingPlaneComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Occlusion Culling Plane Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names
index a1ec685c88..f021e937f5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorPhysicalSkyComponentTypeId",
+            "base": "EditorPhysicalSkyComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorPhysicalSkyComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Physical Sky Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorPhysicalSkyComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Physical Sky Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names
index d98a729c34..3961b7492a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorPhysicsSceneId",
+            "base": "EditorPhysicsSceneId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorPhysicsSceneId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Physics Scene Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorPhysicsSceneId",
+                    "details": {
+                        "name": "Get Editor Physics Scene Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Crc 32"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names
index 0a209f241c..1c8884e7a3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorPhysicsSceneName",
+            "base": "EditorPhysicsSceneName",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorPhysicsSceneName::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Physics Scene Name",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorPhysicsSceneName",
+                    "details": {
+                        "name": "Get Editor Physics Scene Name"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
+                            "details": {
+                                "name": "char"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names
index d6372c4c94..45c05cc768 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorPostFxLayerComponentTypeId",
+            "base": "EditorPostFxLayerComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorPostFxLayerComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Post Fx Layer Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorPostFxLayerComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Post Fx Layer Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names
new file mode 100644
index 0000000000..c120f6de8e
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "EditorPrefabComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Editor Prefab Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorPrefabComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Prefab Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names
index e8d4299ea7..f7b519633f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorRadiusWeightModifierComponentTypeId",
+            "base": "EditorRadiusWeightModifierComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorRadiusWeightModifierComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Radius Weight Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorRadiusWeightModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Radius Weight Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names
index 2bbbb9d789..caf01ce791 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorReflectionProbeComponentTypeId",
+            "base": "EditorReflectionProbeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorReflectionProbeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Reflection Probe Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorReflectionProbeComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Reflection Probe Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names
index 3abeafda2a..965d0a0264 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorShapeWeightModifierComponentTypeId",
+            "base": "EditorShapeWeightModifierComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorShapeWeightModifierComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Shape Weight Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorShapeWeightModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Shape Weight Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names
index d1d030c18b..c041c1bf04 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorSsaoComponentTypeId",
+            "base": "EditorSsaoComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorSsaoComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Ssao Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorSsaoComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Ssao Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names
index ce90232aea..d3d17c73cc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EditorTransformComponentTypeId",
+            "base": "EditorTransformComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EditorTransformComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Editor Transform Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEditorTransformComponentTypeId",
+                    "details": {
+                        "name": "Get Editor Transform Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names
index d2e2fd6713..e5d76d415c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "EntityReferenceComponentTypeId",
+            "base": "EntityReferenceComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "EntityReferenceComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Entity Reference Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetEntityReferenceComponentTypeId",
+                    "details": {
+                        "name": "Get Entity Reference Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names
index e88dd26549..cea1b1bcee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ExposureControlComponentTypeId",
+            "base": "ExposureControlComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ExposureControlComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Exposure Control Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetExposureControlComponentTypeId",
+                    "details": {
+                        "name": "Get Exposure Control Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names
new file mode 100644
index 0000000000..3a1b1e3def
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "FastNoiseGradientComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Fast Noise Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetFastNoiseGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Fast Noise Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names
index 27cd936beb..aa856455f5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FillMode_Invalid",
+            "base": "FillMode_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FillMode_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/Fill Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetFillMode_Invalid",
+                    "details": {
+                        "name": "Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names
index e3f52f0784..1eecbacacf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FillMode_Solid",
+            "base": "FillMode_Solid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FillMode_Solid::Getter",
-                "category": "Constants"
-            }
+                "name": "Solid",
+                "category": "Constants/Fill Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetFillMode_Solid",
+                    "details": {
+                        "name": "Solid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names
index cdbe3521f7..382f55dca8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FillMode_Wireframe",
+            "base": "FillMode_Wireframe",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FillMode_Wireframe::Getter",
-                "category": "Constants"
-            }
+                "name": "Wireframe",
+                "category": "Constants/Fill Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetFillMode_Wireframe",
+                    "details": {
+                        "name": "Wireframe"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names
index 438ba833c5..b5dc4c02d7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FloatEpsilon",
+            "base": "FloatEpsilon",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FloatEpsilon::Getter",
-                "category": "Constants"
-            }
+                "name": "Float Epsilon",
+                "category": "Constants/Numeric"
+            },
+            "methods": [
+                {
+                    "base": "GetFloatEpsilon",
+                    "details": {
+                        "name": "Float Epsilon"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names
index f0e0e3e68e..81ab3e2c12 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureResult_FileWriteError",
+            "base": "FrameCaptureResult_FileWriteError",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FrameCaptureResult_FileWriteError::Getter",
-                "category": "Constants"
-            }
+                "name": "File Write Error",
+                "category": "Constants/Frame Capture Result"
+            },
+            "methods": [
+                {
+                    "base": "GetFrameCaptureResult_FileWriteError",
+                    "details": {
+                        "name": "File Write Error"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names
index 823225c397..168f94594e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureResult_InternalError",
+            "base": "FrameCaptureResult_InternalError",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FrameCaptureResult_InternalError::Getter",
-                "category": "Constants"
-            }
+                "name": "Internal Error",
+                "category": "Constants/Frame Capture Result"
+            },
+            "methods": [
+                {
+                    "base": "GetFrameCaptureResult_InternalError",
+                    "details": {
+                        "name": "Internal Error"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names
index 360800ac3e..983e8193e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureResult_InvalidArgument",
+            "base": "FrameCaptureResult_InvalidArgument",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FrameCaptureResult_InvalidArgument::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid Argument",
+                "category": "Constants/Frame Capture Result"
+            },
+            "methods": [
+                {
+                    "base": "GetFrameCaptureResult_InvalidArgument",
+                    "details": {
+                        "name": "Invalid Argument"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names
index a6ba18d32f..8ab7a2ff17 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureResult_None",
+            "base": "FrameCaptureResult_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FrameCaptureResult_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/Frame Capture Result"
+            },
+            "methods": [
+                {
+                    "base": "GetFrameCaptureResult_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names
index 789fd31acf..a7704a07a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureResult_Success",
+            "base": "FrameCaptureResult_Success",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FrameCaptureResult_Success::Getter",
-                "category": "Constants"
-            }
+                "name": "Success",
+                "category": "Constants/Frame Capture Result"
+            },
+            "methods": [
+                {
+                    "base": "GetFrameCaptureResult_Success",
+                    "details": {
+                        "name": "Success"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names
index 136406261d..f16d51f8a0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "FrameCaptureResult_UnsupportedFormat",
+            "base": "FrameCaptureResult_UnsupportedFormat",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "FrameCaptureResult_UnsupportedFormat::Getter",
-                "category": "Constants"
-            }
+                "name": "Unsupported Format",
+                "category": "Constants/Frame Capture Result"
+            },
+            "methods": [
+                {
+                    "base": "GetFrameCaptureResult_UnsupportedFormat",
+                    "details": {
+                        "name": "Unsupported Format"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names
index 90e43a4a20..977aa61049 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "GradientSurfaceDataComponentTypeId",
+            "base": "GradientSurfaceDataComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "GradientSurfaceDataComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Gradient Surface Data Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetGradientSurfaceDataComponentTypeId",
+                    "details": {
+                        "name": "Get Gradient Surface Data Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names
index 339c4d2904..ff20414bcf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "GradientTransformComponentTypeId",
+            "base": "GradientTransformComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "GradientTransformComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Gradient Transform Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetGradientTransformComponentTypeId",
+                    "details": {
+                        "name": "Get Gradient Transform Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names
index cee5ed45f5..f5f5bfbbc9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "GradientWeightModifierComponentTypeId",
+            "base": "GradientWeightModifierComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "GradientWeightModifierComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Gradient Weight Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetGradientWeightModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Gradient Weight Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names
index e6ca6375da..dbe919d573 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "GridComponentTypeId",
+            "base": "GridComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "GridComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Grid Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetGridComponentTypeId",
+                    "details": {
+                        "name": "Get Grid Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names
index ce30501f5a..d840a65997 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "HDRiSkyboxComponentTypeId",
+            "base": "HDRiSkyboxComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "HDRiSkyboxComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "HD Ri Skybox Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetHDRiSkyboxComponentTypeId",
+                    "details": {
+                        "name": "GetHD Ri Skybox Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names
new file mode 100644
index 0000000000..072a9214c8
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "HairComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Hair Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetHairComponentTypeId",
+                    "details": {
+                        "name": "Get Hair Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names
new file mode 100644
index 0000000000..50fd81277d
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ICOSAHEDRON",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Icosahedron",
+                "category": "Constants/White Box"
+            },
+            "methods": [
+                {
+                    "base": "GetICOSAHEDRON",
+                    "details": {
+                        "name": "Icosahedron"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names
index 7669ee6318..9216b7bfb0 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ImageBasedLightComponentTypeId",
+            "base": "ImageBasedLightComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ImageBasedLightComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Image Based Light Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetImageBasedLightComponentTypeId",
+                    "details": {
+                        "name": "Get Image Based Light Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names
index 6fa8464e57..7a19cff05d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ImageGradientComponentTypeId",
+            "base": "ImageGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ImageGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Image Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetImageGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Image Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names
index 5b2d673f0b..726f894d8d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "InvalidComponentId",
+            "base": "InvalidComponentId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "InvalidComponentId::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid Component Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetInvalidComponentId",
+                    "details": {
+                        "name": "Get Invalid Component Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names
index 9d3edcdbee..a278dccb34 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "InvalidParameterIndex",
+            "base": "InvalidParameterIndex",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "InvalidParameterIndex::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid Parameter Index",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetInvalidParameterIndex",
+                    "details": {
+                        "name": "Get Invalid Parameter Index"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names
index 30f928664c..34f0345f45 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "InvalidTemplateId",
+            "base": "InvalidTemplateId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "InvalidTemplateId::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid Template Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetInvalidTemplateId",
+                    "details": {
+                        "name": "Get Invalid Template Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
+                            "details": {
+                                "name": "AZ::u 64"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names
index 0c6d3253b5..e09f65f71f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "InvertGradientComponentTypeId",
+            "base": "InvertGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "InvertGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Invert Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetInvertGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Invert Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names
index 53e973e3a5..dda23f91e7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "JsonMergePatch",
+            "base": "JsonMergePatch",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "JsonMergePatch::Getter",
-                "category": "Constants"
-            }
+                "name": "Json Merge Patch",
+                "category": "Constants/Json"
+            },
+            "methods": [
+                {
+                    "base": "GetJsonMergePatch",
+                    "details": {
+                        "name": "Get Json Merge Patch"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names
index fec9372c25..c5288b5e5a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "JsonPatch",
+            "base": "JsonPatch",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "JsonPatch::Getter",
-                "category": "Constants"
-            }
+                "name": "Json Patch",
+                "category": "Constants/Json"
+            },
+            "methods": [
+                {
+                    "base": "GetJsonPatch",
+                    "details": {
+                        "name": "Get Json Patch"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names
new file mode 100644
index 0000000000..b9aabee87c
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "LANDSCAPE_CANVAS_EDITOR_ID",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Editor Id",
+                "category": "Constants/Landscape Canvas"
+            },
+            "methods": [
+                {
+                    "base": "GetLANDSCAPE_CANVAS_EDITOR_ID",
+                    "details": {
+                        "name": "Editor Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+                            "details": {
+                                "name": "Crc 32"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names
new file mode 100644
index 0000000000..af01c5f258
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "LevelSettingsComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Level Settings Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetLevelSettingsComponentTypeId",
+                    "details": {
+                        "name": "Get Level Settings Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names
index 294b87f61e..0f44a7eb3d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "LevelsGradientComponentTypeId",
+            "base": "LevelsGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "LevelsGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Levels Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetLevelsGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Levels Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names
index 2bbf9c2d54..8dac5f9651 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "LightAttenuationRadiusMode_Automatic",
+            "base": "LightAttenuationRadiusMode_Automatic",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "LightAttenuationRadiusMode_Automatic::Getter",
-                "category": "Constants"
-            }
+                "name": "Automatic",
+                "category": "Constants/Light Attenuation Radius Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetLightAttenuationRadiusMode_Automatic",
+                    "details": {
+                        "name": "Automatic"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names
index 7f24ff6286..d3f754b147 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "LightAttenuationRadiusMode_Explicit",
+            "base": "LightAttenuationRadiusMode_Explicit",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "LightAttenuationRadiusMode_Explicit::Getter",
-                "category": "Constants"
-            }
+                "name": "Explicit",
+                "category": "Constants/Light Attenuation Radius Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetLightAttenuationRadiusMode_Explicit",
+                    "details": {
+                        "name": "Explicit"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names
index cd9bf7661f..4455d529d9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "LookModificationComponentTypeId",
+            "base": "LookModificationComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "LookModificationComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Look Modification Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetLookModificationComponentTypeId",
+                    "details": {
+                        "name": "Get Look Modification Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names
index 0f13cdb0d6..30f9afc015 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MaterialComponentTypeId",
+            "base": "MaterialComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MaterialComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Material Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetMaterialComponentTypeId",
+                    "details": {
+                        "name": "Get Material Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names
index 22ced2479c..2f7eceec8e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MaterialPropertyGroupVisibility_Enabled",
+            "base": "MaterialPropertyGroupVisibility_Enabled",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MaterialPropertyGroupVisibility_Enabled::Getter",
-                "category": "Constants"
-            }
+                "name": "Enabled",
+                "category": "Constants/Material Property Group Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GetMaterialPropertyGroupVisibility_Enabled",
+                    "details": {
+                        "name": "Enabled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names
index 0b332ba6e4..398499a02e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MaterialPropertyGroupVisibility_Hidden",
+            "base": "MaterialPropertyGroupVisibility_Hidden",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MaterialPropertyGroupVisibility_Hidden::Getter",
-                "category": "Constants"
-            }
+                "name": "Hidden",
+                "category": "Constants/Material Property Group Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GetMaterialPropertyGroupVisibility_Hidden",
+                    "details": {
+                        "name": "Hidden"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names
index 7b22c9120c..41647e6229 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MaterialPropertyVisibility_Disabled",
+            "base": "MaterialPropertyVisibility_Disabled",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MaterialPropertyVisibility_Disabled::Getter",
-                "category": "Constants"
-            }
+                "name": "Disabled",
+                "category": "Constants/Material Property Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GetMaterialPropertyVisibility_Disabled",
+                    "details": {
+                        "name": "Disabled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names
index 7da9316556..0b8f55854a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MaterialPropertyVisibility_Enabled",
+            "base": "MaterialPropertyVisibility_Enabled",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MaterialPropertyVisibility_Enabled::Getter",
-                "category": "Constants"
-            }
+                "name": "Enabled",
+                "category": "Constants/Material Property Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GetMaterialPropertyVisibility_Enabled",
+                    "details": {
+                        "name": "Enabled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names
index 0d79119c32..f07a8c1a52 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MaterialPropertyVisibility_Hidden",
+            "base": "MaterialPropertyVisibility_Hidden",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MaterialPropertyVisibility_Hidden::Getter",
-                "category": "Constants"
-            }
+                "name": "Hidden",
+                "category": "Constants/Material Property Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GetMaterialPropertyVisibility_Hidden",
+                    "details": {
+                        "name": "Hidden"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names
new file mode 100644
index 0000000000..d20e624867
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "MeshBlockerComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Mesh Blocker Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetMeshBlockerComponentTypeId",
+                    "details": {
+                        "name": "Get Mesh Blocker Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names
index ba1709fcf2..0833a7bb15 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MeshComponentTypeId",
+            "base": "MeshComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MeshComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Mesh Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetMeshComponentTypeId",
+                    "details": {
+                        "name": "Get Mesh Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names
index f0364c7c45..3780e45102 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MixedGradientComponentTypeId",
+            "base": "MixedGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MixedGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Mixed Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetMixedGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Mixed Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names
index 7e95390e2e..3d14e91e22 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MultiPositionBehaviorType_Blended",
+            "base": "MultiPositionBehaviorType_Blended",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MultiPositionBehaviorType_Blended::Getter",
-                "category": "Constants"
-            }
+                "name": "Blended",
+                "category": "Constants/Multi Position Behavior Type"
+            },
+            "methods": [
+                {
+                    "base": "GetMultiPositionBehaviorType_Blended",
+                    "details": {
+                        "name": "Blended"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names
index 476c8b91ef..15577ca173 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "MultiPositionBehaviorType_Separate",
+            "base": "MultiPositionBehaviorType_Separate",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "MultiPositionBehaviorType_Separate::Getter",
-                "category": "Constants"
-            }
+                "name": "Separate",
+                "category": "Constants/Multi Position Behavior Type"
+            },
+            "methods": [
+                {
+                    "base": "GetMultiPositionBehaviorType_Separate",
+                    "details": {
+                        "name": "Separate"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names
index 471b5d63d3..685d61f8a7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "OcclusionCullingPlaneComponentTypeId",
+            "base": "OcclusionCullingPlaneComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "OcclusionCullingPlaneComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Occlusion Culling Plane Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetOcclusionCullingPlaneComponentTypeId",
+                    "details": {
+                        "name": "Get Occlusion Culling Plane Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names
index 0779352f77..d16cca8ebb 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PerlinGradientComponentTypeId",
+            "base": "PerlinGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PerlinGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Perlin Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetPerlinGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Perlin Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names
index 0923efc251..5312a86409 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Candela",
+            "base": "PhotometricUnit_Candela",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Candela::Getter",
-                "category": "Constants"
-            }
+                "name": "Candela",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Candela",
+                    "details": {
+                        "name": "Candela"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names
index 841af8eb4d..ffb2e3875f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Ev100_Illuminance",
+            "base": "PhotometricUnit_Ev100_Illuminance",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Ev100_Illuminance::Getter",
-                "category": "Constants"
-            }
+                "name": "Ev 100 Illuminance",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Ev100_Illuminance",
+                    "details": {
+                        "name": "Ev 100 Illuminance"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names
index b6df92e7d2..b0a0fe6a47 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Ev100_Luminance",
+            "base": "PhotometricUnit_Ev100_Luminance",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Ev100_Luminance::Getter",
-                "category": "Constants"
-            }
+                "name": "Ev 100 Luminance",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Ev100_Luminance",
+                    "details": {
+                        "name": "Ev 100 Luminance"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names
index 2d06fd13a3..9e67c249af 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Lumen",
+            "base": "PhotometricUnit_Lumen",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Lumen::Getter",
-                "category": "Constants"
-            }
+                "name": "Lumen",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Lumen",
+                    "details": {
+                        "name": "Lumen"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names
index b16b5a6b9e..a82a2cbc0a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Lux",
+            "base": "PhotometricUnit_Lux",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Lux::Getter",
-                "category": "Constants"
-            }
+                "name": "Lux",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Lux",
+                    "details": {
+                        "name": "Lux"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names
index 33af8d043e..3a66270b8a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Nit",
+            "base": "PhotometricUnit_Nit",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Nit::Getter",
-                "category": "Constants"
-            }
+                "name": "Nit",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Nit",
+                    "details": {
+                        "name": "Nit"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names
index d748e688e2..f07cfd2be4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhotometricUnit_Unknown",
+            "base": "PhotometricUnit_Unknown",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhotometricUnit_Unknown::Getter",
-                "category": "Constants"
-            }
+                "name": "Unknown",
+                "category": "Constants/Photometric Unit"
+            },
+            "methods": [
+                {
+                    "base": "GetPhotometricUnit_Unknown",
+                    "details": {
+                        "name": "Unknown"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names
index 05b71703e9..acd3e30945 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PhysicalSkyComponentTypeId",
+            "base": "PhysicalSkyComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PhysicalSkyComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Physical Sky Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetPhysicalSkyComponentTypeId",
+                    "details": {
+                        "name": "Get Physical Sky Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names
new file mode 100644
index 0000000000..3934036ae6
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "PositionModifierComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Position Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetPositionModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Position Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names
index b45a4432ef..a09eb0fe51 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PostFxLayerComponentTypeId",
+            "base": "PostFxLayerComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PostFxLayerComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Post Fx Layer Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetPostFxLayerComponentTypeId",
+                    "details": {
+                        "name": "Get Post Fx Layer Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names
index 1325364e24..28956d8520 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "PosterizeGradientComponentTypeId",
+            "base": "PosterizeGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "PosterizeGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Posterize Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetPosterizeGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Posterize Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names
new file mode 100644
index 0000000000..35dd35606c
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ProviderNameEnum_AWSCognitoIDP",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "AWS Cognito IDP",
+                "category": "Constants/Provider Name"
+            },
+            "methods": [
+                {
+                    "base": "GetProviderNameEnum_AWSCognitoIDP",
+                    "details": {
+                        "name": "AWS Cognito IDP"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names
new file mode 100644
index 0000000000..11b91a902c
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ProviderNameEnum_Google",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Google",
+                "category": "Constants/Provider Name"
+            },
+            "methods": [
+                {
+                    "base": "GetProviderNameEnum_Google",
+                    "details": {
+                        "name": "Google"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names
new file mode 100644
index 0000000000..9f63f5a2ad
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ProviderNameEnum_LoginWithAmazon",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Amazon",
+                "category": "Constants/Provider Name"
+            },
+            "methods": [
+                {
+                    "base": "GetProviderNameEnum_LoginWithAmazon",
+                    "details": {
+                        "name": "Amazon"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names
new file mode 100644
index 0000000000..5f7f21d88a
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ProviderNameEnum_None",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "None",
+                "category": "Constants/Provider Name"
+            },
+            "methods": [
+                {
+                    "base": "GetProviderNameEnum_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names
index 5d98a25b38..913f9c6a8e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "QuadShapeComponentTypeId",
+            "base": "QuadShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "QuadShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Quad Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetQuadShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Quad Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names
index 43cfe542c0..b47fe93984 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "RadiusWeightModifierComponentTypeId",
+            "base": "RadiusWeightModifierComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "RadiusWeightModifierComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Radius Weight Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetRadiusWeightModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Radius Weight Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names
index 58045dbdec..625f76bba8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "RandomGradientComponentTypeId",
+            "base": "RandomGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "RandomGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Random Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetRandomGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Random Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names
index 89e3a955d1..b96e97dfaa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ReferenceGradientComponentTypeId",
+            "base": "ReferenceGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ReferenceGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Reference Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetReferenceGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Reference Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names
new file mode 100644
index 0000000000..bbcfd7f88c
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ReferenceShapeComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Reference Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetReferenceShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Reference Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names
index 9d8cf61239..5b6d58c067 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ReflectionProbeComponentTypeId",
+            "base": "ReflectionProbeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ReflectionProbeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Reflection Probe Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetReflectionProbeComponentTypeId",
+                    "details": {
+                        "name": "Get Reflection Probe Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names
new file mode 100644
index 0000000000..18c7ac1f82
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "RotationModifierComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Rotation Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetRotationModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Rotation Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names
new file mode 100644
index 0000000000..4743d85db3
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "SPHERE",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Sphere",
+                "category": "Constants/White Box"
+            },
+            "methods": [
+                {
+                    "base": "GetSPHERE",
+                    "details": {
+                        "name": "Sphere"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names
new file mode 100644
index 0000000000..cee50e1569
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ScaleModifierComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Scale Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetScaleModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Scale Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names
index 3542ed76bb..9d16d36c6b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowFilterMethod_ESM",
+            "base": "ShadowFilterMethod_ESM",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowFilterMethod_ESM::Getter",
-                "category": "Constants"
-            }
+                "name": "ESM",
+                "category": "Constants/Shadowmap/Filter"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowFilterMethod_ESM",
+                    "details": {
+                        "name": "ESM"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names
index 57736a0912..75750dd2a2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowFilterMethod_ESM_PCF",
+            "base": "ShadowFilterMethod_ESM_PCF",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowFilterMethod_ESM_PCF::Getter",
-                "category": "Constants"
-            }
+                "name": "ESM_PCF",
+                "category": "Constants/Shadowmap/Filter"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowFilterMethod_ESM_PCF",
+                    "details": {
+                        "name": "ESM_PCF"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names
index 90a1da18fe..f604ed1147 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowFilterMethod_None",
+            "base": "ShadowFilterMethod_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowFilterMethod_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/Shadowmap/Filter"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowFilterMethod_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names
index 0600bfc8d2..7d63db3ad7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowFilterMethod_PCF",
+            "base": "ShadowFilterMethod_PCF",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowFilterMethod_PCF::Getter",
-                "category": "Constants"
-            }
+                "name": "PCF",
+                "category": "Constants/Shadowmap/Filter"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowFilterMethod_PCF",
+                    "details": {
+                        "name": "PCF"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names
index 0814f06cce..82fcb11aaf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowmapSize_1024",
+            "base": "ShadowmapSize_1024",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowmapSize_1024::Getter",
-                "category": "Constants"
-            }
+                "name": "1024",
+                "category": "Constants/Shadowmap/Size"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowmapSize_1024",
+                    "details": {
+                        "name": "1024"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names
index 4ed139c23a..545ecbe5f7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowmapSize_2045",
+            "base": "ShadowmapSize_2045",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowmapSize_2045::Getter",
-                "category": "Constants"
-            }
+                "name": "2045",
+                "category": "Constants/Shadowmap/Size"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowmapSize_2045",
+                    "details": {
+                        "name": "2045"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names
index 174dcbd1e7..26b11da3d9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowmapSize_256",
+            "base": "ShadowmapSize_256",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowmapSize_256::Getter",
-                "category": "Constants"
-            }
+                "name": "256",
+                "category": "Constants/Shadowmap/Size"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowmapSize_256",
+                    "details": {
+                        "name": "256"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names
index 476a558ad6..541b28b10d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowmapSize_512",
+            "base": "ShadowmapSize_512",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowmapSize_512::Getter",
-                "category": "Constants"
-            }
+                "name": "512",
+                "category": "Constants/Shadowmap/Size"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowmapSize_512",
+                    "details": {
+                        "name": "512"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names
index a1f9c51c8f..092d435e9d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShadowmapSize_None",
+            "base": "ShadowmapSize_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShadowmapSize_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/Shadowmap/Size"
+            },
+            "methods": [
+                {
+                    "base": "GetShadowmapSize_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
+                            "details": {
+                                "name": "unsigned int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names
index a1e9881e41..ca7dc09c50 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShapeAreaFalloffGradientComponentTypeId",
+            "base": "ShapeAreaFalloffGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeAreaFalloffGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Shape Area Falloff Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetShapeAreaFalloffGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Shape Area Falloff Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names
index 700decf418..310ae3155b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShapeChangeReasons_ShapeChanged",
+            "base": "ShapeChangeReasons_ShapeChanged",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeChangeReasons_ShapeChanged::Getter",
-                "category": "Constants"
-            }
+                "name": "Shape Change Reasons_ Shape Changed",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetShapeChangeReasons_ShapeChanged",
+                    "details": {
+                        "name": "Get Shape Change Reasons_ Shape Changed"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names
index 441ee1a3bc..864d389080 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShapeChangeReasons_TransformChanged",
+            "base": "ShapeChangeReasons_TransformChanged",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeChangeReasons_TransformChanged::Getter",
-                "category": "Constants"
-            }
+                "name": "Shape Change Reasons_ Transform Changed",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetShapeChangeReasons_TransformChanged",
+                    "details": {
+                        "name": "Get Shape Change Reasons_ Transform Changed"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names
new file mode 100644
index 0000000000..8c5ef12adf
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "ShapeIntersectionFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Shape Intersection Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetShapeIntersectionFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Shape Intersection Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names
index bc6c61b1bc..233bc2c76f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names
@@ -1,13 +1,30 @@
 {
     "entries": [
         {
-            "key": "ShapeType_Box",
+            "base": "ShapeType_Box",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeType_Box::Getter",
-                "category": "Constants"
-            }
+                "name": "Get Shape Type: Box",
+                "category": "Constants/Physics"
+            },
+            "methods": [
+                {
+                    "base": "ShapeType_Box",
+                    "details": {
+                        "name": "Get Shape Type: Box",
+                        "subtitle": "Shape Type"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Shape Type"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names
index 067b237e5c..a4e02a53da 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names
@@ -1,13 +1,30 @@
 {
     "entries": [
         {
-            "key": "ShapeType_Cylinder",
+            "base": "ShapeType_Cylinder",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeType_Cylinder::Getter",
-                "category": "Constants"
-            }
+                "name": "Get Shape Type: Cylinder",
+                "category": "Constants/Physics"
+            },
+            "methods": [
+                {
+                    "base": "ShapeType_Cylinder",
+                    "details": {
+                        "name": "Get Shape Type: Cylinder",
+                        "subtitle": "Shape Type"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Shape Type"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names
new file mode 100644
index 0000000000..8ede2d9b87
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names
@@ -0,0 +1,30 @@
+{
+    "entries": [
+        {
+            "base": "ShapeType_Heightfield",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Get Shape Type: Heightfield",
+                "category": "Constants/Physics"
+            },
+            "methods": [
+                {
+                    "base": "GetShapeType_Heightfield",
+                    "details": {
+                        "name": "Get Shape Type: Heightfield",
+                        "subtitle": "Shape Type"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Shape Type"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names
index 6c51497ea7..9ac02b4f53 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names
@@ -1,13 +1,30 @@
 {
     "entries": [
         {
-            "key": "ShapeType_PhysicsAsset",
+            "base": "ShapeType_PhysicsAsset",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeType_PhysicsAsset::Getter",
-                "category": "Constants"
-            }
+                "name": "Get Shape Type: Physics Asset",
+                "category": "Constants/Physics"
+            },
+            "methods": [
+                {
+                    "base": "ShapeType_PhysicsAsset",
+                    "details": {
+                        "name": "Get Shape Type: Physics Asset",
+                        "subtitle": "Shape Type"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Shape Type"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names
index 996220f852..f2441aacee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names
@@ -1,13 +1,30 @@
 {
     "entries": [
         {
-            "key": "ShapeType_Sphere",
+            "base": "ShapeType_Sphere",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeType_Sphere::Getter",
-                "category": "Constants"
-            }
+                "name": "Get Shape Type: Sphere",
+                "category": "Constants/Physics"
+            },
+            "methods": [
+                {
+                    "base": "ShapeType_Sphere",
+                    "details": {
+                        "name": "SGet Shape Type: Sphere",
+                        "subtitle": "Shape Type"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "Shape Type"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names
index 947f0d1a0d..bd0f817dfd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ShapeWeightModifierComponentTypeId",
+            "base": "ShapeWeightModifierComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ShapeWeightModifierComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Shape Weight Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetShapeWeightModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Shape Weight Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names
new file mode 100644
index 0000000000..219f05a14b
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "SlopeAlignmentModifierComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Slope Alignment Modifier Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSlopeAlignmentModifierComponentTypeId",
+                    "details": {
+                        "name": "Get Slope Alignment Modifier Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names
index 0e2ee25219..b9cf0e8631 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SmoothStepGradientComponentTypeId",
+            "base": "SmoothStepGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SmoothStepGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Smooth Step Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSmoothStepGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Smooth Step Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names
index 72a66d38e8..6cab8d6b00 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SpawnerComponentTypeId",
+            "base": "SpawnerComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SpawnerComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Spawner Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSpawnerComponentTypeId",
+                    "details": {
+                        "name": "Get Spawner Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names
index cedd42ef6a..52f9ed8c57 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SphereShapeComponentTypeId",
+            "base": "SphereShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SphereShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Sphere Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSphereShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Sphere Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names
index 525dbdcdd0..bce10c89ca 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SsaoComponentTypeId",
+            "base": "SsaoComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SsaoComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Ssao Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSsaoComponentTypeId",
+                    "details": {
+                        "name": "Get Ssao Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names
index da6699bfbe..83cd8924db 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Decrement",
+            "base": "StencilOp_Decrement",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Decrement::Getter",
-                "category": "Constants"
-            }
+                "name": "Decrement",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Decrement",
+                    "details": {
+                        "name": "Decrement"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names
index 46fce46fc3..8bbc398180 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_DecrementSaturate",
+            "base": "StencilOp_DecrementSaturate",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_DecrementSaturate::Getter",
-                "category": "Constants"
-            }
+                "name": "Decrement Saturate",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_DecrementSaturate",
+                    "details": {
+                        "name": "Decrement Saturate"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names
index 9d20ca70fb..7b034e8a45 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Increment",
+            "base": "StencilOp_Increment",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Increment::Getter",
-                "category": "Constants"
-            }
+                "name": "Increment",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Increment",
+                    "details": {
+                        "name": "Increment"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names
index 77bfc0a95e..110e816592 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_IncrementSaturate",
+            "base": "StencilOp_IncrementSaturate",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_IncrementSaturate::Getter",
-                "category": "Constants"
-            }
+                "name": "Increment Saturate",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_IncrementSaturate",
+                    "details": {
+                        "name": "Increment Saturate"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names
index 7f6e5fc38a..e92a5b3526 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Invalid",
+            "base": "StencilOp_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Invalid",
+                    "details": {
+                        "name": "Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names
index 021e089ac1..adfaf23d6a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Invert",
+            "base": "StencilOp_Invert",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Invert::Getter",
-                "category": "Constants"
-            }
+                "name": "Invert",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Invert",
+                    "details": {
+                        "name": "Invert"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names
index e4e4fc1956..be2d814bad 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Keep",
+            "base": "StencilOp_Keep",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Keep::Getter",
-                "category": "Constants"
-            }
+                "name": "Keep",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Keep",
+                    "details": {
+                        "name": "Keep"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names
index 331397d027..307677368f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Replace",
+            "base": "StencilOp_Replace",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Replace::Getter",
-                "category": "Constants"
-            }
+                "name": "Replace",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Replace",
+                    "details": {
+                        "name": "Replace"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names
index 9d17600aad..a4a62b177a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "StencilOp_Zero",
+            "base": "StencilOp_Zero",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "StencilOp_Zero::Getter",
-                "category": "Constants"
-            }
+                "name": "Zero",
+                "category": "Constants/Stencil Op"
+            },
+            "methods": [
+                {
+                    "base": "GetStencilOp_Zero",
+                    "details": {
+                        "name": "Zero"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names
new file mode 100644
index 0000000000..cb55df8149
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "SurfaceAltitudeFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Surface Altitude Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceAltitudeFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Altitude Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names
index 01d0ca9912..012f58f387 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SurfaceAltitudeGradientComponentTypeId",
+            "base": "SurfaceAltitudeGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SurfaceAltitudeGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Surface Altitude Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceAltitudeGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Altitude Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names
new file mode 100644
index 0000000000..54af468172
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "SurfaceMaskDepthFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Surface Mask Depth Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceMaskDepthFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Mask Depth Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names
new file mode 100644
index 0000000000..6c8b21cde1
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "SurfaceMaskFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Surface Mask Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceMaskFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Mask Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names
index d98abc6e80..d8784fe67e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SurfaceMaskGradientComponentTypeId",
+            "base": "SurfaceMaskGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SurfaceMaskGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Surface Mask Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceMaskGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Mask Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names
new file mode 100644
index 0000000000..d55caa7830
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "SurfaceSlopeFilterComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Surface Slope Filter Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceSlopeFilterComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Slope Filter Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names
index 29955c91f4..cf856cfbbf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SurfaceSlopeGradientComponentTypeId",
+            "base": "SurfaceSlopeGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SurfaceSlopeGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Surface Slope Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetSurfaceSlopeGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Surface Slope Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names
index b615174731..48ff4a80d5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_Android",
+            "base": "SystemConfigPlatform_Android",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_Android::Getter",
-                "category": "Constants"
-            }
+                "name": "Android",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_Android",
+                    "details": {
+                        "name": "Android"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names
index ebb0dc01bf..72b62a5d03 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_InvalidPlatform",
+            "base": "SystemConfigPlatform_InvalidPlatform",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_InvalidPlatform::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid Platform",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_InvalidPlatform",
+                    "details": {
+                        "name": "Invalid Platform"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names
index 2de01a41e9..f8c15e5505 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_Ios",
+            "base": "SystemConfigPlatform_Ios",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_Ios::Getter",
-                "category": "Constants"
-            }
+                "name": "Ios",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_Ios",
+                    "details": {
+                        "name": "Ios"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names
index 50dc9a573f..d30dd7446b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_Mac",
+            "base": "SystemConfigPlatform_Mac",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_Mac::Getter",
-                "category": "Constants"
-            }
+                "name": "Mac",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_Mac",
+                    "details": {
+                        "name": "Mac"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names
index 8005565fca..8d2bd15940 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_OsxMetal",
+            "base": "SystemConfigPlatform_OsxMetal",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_OsxMetal::Getter",
-                "category": "Constants"
-            }
+                "name": "Osx Metal",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_OsxMetal",
+                    "details": {
+                        "name": "Osx Metal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names
index a1b962ea90..1c0e05387d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_Pc",
+            "base": "SystemConfigPlatform_Pc",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_Pc::Getter",
-                "category": "Constants"
-            }
+                "name": "Pc",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_Pc",
+                    "details": {
+                        "name": "Pc"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names
index 46e8d46b17..84757fb237 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigPlatform_Provo",
+            "base": "SystemConfigPlatform_Provo",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigPlatform_Provo::Getter",
-                "category": "Constants"
-            }
+                "name": "Provo",
+                "category": "Constants/System Configuration"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigPlatform_Provo",
+                    "details": {
+                        "name": "Provo"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names
index 51484e63d5..6362ad592f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigSpec_Auto",
+            "base": "SystemConfigSpec_Auto",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigSpec_Auto::Getter",
-                "category": "Constants"
-            }
+                "name": "Auto",
+                "category": "Constants/System Spec"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigSpec_Auto",
+                    "details": {
+                        "name": "Auto"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names
index 80c2de7669..24ca308d2a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigSpec_High",
+            "base": "SystemConfigSpec_High",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigSpec_High::Getter",
-                "category": "Constants"
-            }
+                "name": "High",
+                "category": "Constants/System Spec"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigSpec_High",
+                    "details": {
+                        "name": "High"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names
index 5a4dee45d5..17250ade92 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigSpec_Low",
+            "base": "SystemConfigSpec_Low",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigSpec_Low::Getter",
-                "category": "Constants"
-            }
+                "name": "Low",
+                "category": "Constants/System Spec"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigSpec_Low",
+                    "details": {
+                        "name": "Low"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names
index 52485ed95b..dcdae1a975 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigSpec_Medium",
+            "base": "SystemConfigSpec_Medium",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigSpec_Medium::Getter",
-                "category": "Constants"
-            }
+                "name": "Medium",
+                "category": "Constants/System Spec"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigSpec_Medium",
+                    "details": {
+                        "name": "Medium"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names
index 9d71dadc2d..44c36f472c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "SystemConfigSpec_VeryHigh",
+            "base": "SystemConfigSpec_VeryHigh",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemConfigSpec_VeryHigh::Getter",
-                "category": "Constants"
-            }
+                "name": "Very High",
+                "category": "Constants/System Spec"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemConfigSpec_VeryHigh",
+                    "details": {
+                        "name": "Very High"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names
index 3a6a3c2c04..fecc69eb1c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names
@@ -1,13 +1,30 @@
 {
     "entries": [
         {
-            "key": "SystemEntityId",
+            "base": "SystemEntityId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "SystemEntityId::Getter",
-                "category": "Constants"
-            }
+                "name": "System Entity Id",
+                "category": "Constants/System"
+            },
+            "methods": [
+                {
+                    "base": "GetSystemEntityId",
+                    "details": {
+                        "name": "Get System Entity Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+                            "details": {
+                                "name": "Entity Id",
+                                "tooltip": "Entity Unique Id"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names
new file mode 100644
index 0000000000..8506904701
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "TETRAHEDRON",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Tetrahedron",
+                "category": "Constants/White Box"
+            },
+            "methods": [
+                {
+                    "base": "GetTETRAHEDRON",
+                    "details": {
+                        "name": "Tetrahedron"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names
index c40a8f1281..be9c791c63 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "ThresholdGradientComponentTypeId",
+            "base": "ThresholdGradientComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "ThresholdGradientComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Threshold Gradient Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetThresholdGradientComponentTypeId",
+                    "details": {
+                        "name": "Get Threshold Gradient Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names
index a140864cdc..b1039ce129 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformComponentTypeId",
+            "base": "TransformComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Transform Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformComponentTypeId",
+                    "details": {
+                        "name": "Get Transform Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names
index a573b13ba1..3a9f17cf87 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformMode_Rotation",
+            "base": "TransformMode_Rotation",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformMode_Rotation::Getter",
-                "category": "Constants"
-            }
+                "name": "Rotation",
+                "category": "Constants/Transform/Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformMode_Rotation",
+                    "details": {
+                        "name": "Rotation"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names
index d04c443780..45c665434a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformMode_Scale",
+            "base": "TransformMode_Scale",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformMode_Scale::Getter",
-                "category": "Constants"
-            }
+                "name": "Scale",
+                "category": "Constants/Transform/Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformMode_Scale",
+                    "details": {
+                        "name": "Scale"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names
index 05fb942bd8..fbcf88a7da 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformMode_Translation",
+            "base": "TransformMode_Translation",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformMode_Translation::Getter",
-                "category": "Constants"
-            }
+                "name": "Translation",
+                "category": "Constants/Transform/Mode"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformMode_Translation",
+                    "details": {
+                        "name": "Translation"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names
index a2aef08ec4..0c88ae1d0b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformPivot_Center",
+            "base": "TransformPivot_Center",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformPivot_Center::Getter",
-                "category": "Constants"
-            }
+                "name": "Center",
+                "category": "Constants/Transform/Pivot"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformPivot_Center",
+                    "details": {
+                        "name": "Center"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names
index 010e4a0eb2..340bc2dd33 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformPivot_Object",
+            "base": "TransformPivot_Object",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformPivot_Object::Getter",
-                "category": "Constants"
-            }
+                "name": "Object",
+                "category": "Constants/Transform/Pivot"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformPivot_Object",
+                    "details": {
+                        "name": "Object"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names
index 4161f154b3..0d024e0bbc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformRefreshType_All",
+            "base": "TransformRefreshType_All",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformRefreshType_All::Getter",
-                "category": "Constants"
-            }
+                "name": "All",
+                "category": "Constants/Transform/Refresh Type"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformRefreshType_All",
+                    "details": {
+                        "name": "All"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names
index 920fc60dfd..e80e1fc12d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformRefreshType_Orientation",
+            "base": "TransformRefreshType_Orientation",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformRefreshType_Orientation::Getter",
-                "category": "Constants"
-            }
+                "name": "Orientation",
+                "category": "Constants/Transform/Refresh Type"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformRefreshType_Orientation",
+                    "details": {
+                        "name": "Orientation"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names
index 80b256f896..a4ce9607e3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TransformRefreshType_Translation",
+            "base": "TransformRefreshType_Translation",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TransformRefreshType_Translation::Getter",
-                "category": "Constants"
-            }
+                "name": "Translation",
+                "category": "Constants/Transform/Refresh Type"
+            },
+            "methods": [
+                {
+                    "base": "GetTransformRefreshType_Translation",
+                    "details": {
+                        "name": "Translation"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names
index dad5748f53..d0c4f47888 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "TubeShapeComponentTypeId",
+            "base": "TubeShapeComponentTypeId",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "TubeShapeComponentTypeId::Getter",
-                "category": "Constants"
-            }
+                "name": "Tube Shape Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetTubeShapeComponentTypeId",
+                    "details": {
+                        "name": "Get Tube Shape Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names
index d9b6976e89..63d58ba29a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "UiLayoutCellUnspecifiedSize",
+            "base": "UiLayoutCellUnspecifiedSize",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "UiLayoutCellUnspecifiedSize::Getter",
-                "category": "Constants"
-            }
+                "name": "Cell Unspecified Size",
+                "category": "Constants/UI/Ui Layout"
+            },
+            "methods": [
+                {
+                    "base": "GetUiLayoutCellUnspecifiedSize",
+                    "details": {
+                        "name": "Layout Cell Unspecified Size"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}",
+                            "details": {
+                                "name": "float"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names
new file mode 100644
index 0000000000..5b9e9394bd
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "VegetationSpawnerComponentTypeId",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Vegetation Spawner Component Type Id",
+                "category": "Constants/Editor"
+            },
+            "methods": [
+                {
+                    "base": "GetVegetationSpawnerComponentTypeId",
+                    "details": {
+                        "name": "Get Vegetation Spawner Component Type Id"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+                            "details": {
+                                "name": "AZ:: Uuid"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names
index 89b6606748..4a5990bb0d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eSSB_GotoEndTime",
+            "base": "eSSB_GotoEndTime",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eSSB_GotoEndTime::Getter",
-                "category": "Constants"
-            }
+                "name": "Goto End Time",
+                "category": "Constants/UI/Animation/Sequence Stop Behavior"
+            },
+            "methods": [
+                {
+                    "base": "GeteSSB_GotoEndTime",
+                    "details": {
+                        "name": "Goto End Time"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names
index 69c4ae2f1f..d962801a59 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eSSB_GotoStartTime",
+            "base": "eSSB_GotoStartTime",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eSSB_GotoStartTime::Getter",
-                "category": "Constants"
-            }
+                "name": "Goto Start Time",
+                "category": "Constants/UI/Animation/Sequence Stop Behavior"
+            },
+            "methods": [
+                {
+                    "base": "GeteSSB_GotoStartTime",
+                    "details": {
+                        "name": "Goto Start Time"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names
index 55136e9f17..e78c9df425 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eSSB_LeaveTime",
+            "base": "eSSB_LeaveTime",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eSSB_LeaveTime::Getter",
-                "category": "Constants"
-            }
+                "name": "Leave Time",
+                "category": "Constants/UI/Animation/Sequence Stop Behavior"
+            },
+            "methods": [
+                {
+                    "base": "GeteSSB_LeaveTime",
+                    "details": {
+                        "name": "Leave Time"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names
index e2feeb0734..81d6b94038 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiAnimationEvent_Aborted",
+            "base": "eUiAnimationEvent_Aborted",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiAnimationEvent_Aborted::Getter",
-                "category": "Constants"
-            }
+                "name": "Aborted",
+                "category": "Constants/UI/Animation Event"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiAnimationEvent_Aborted",
+                    "details": {
+                        "name": "Aborted"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names
index 45c20aacf3..85684e5627 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiAnimationEvent_Started",
+            "base": "eUiAnimationEvent_Started",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiAnimationEvent_Started::Getter",
-                "category": "Constants"
-            }
+                "name": "Started",
+                "category": "Constants/UI/Animation Event"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiAnimationEvent_Started",
+                    "details": {
+                        "name": "Get Started"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names
index 20c8d48e42..9a8c843449 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiAnimationEvent_Stopped",
+            "base": "eUiAnimationEvent_Stopped",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiAnimationEvent_Stopped::Getter",
-                "category": "Constants"
-            }
+                "name": "Stopped",
+                "category": "Constants/UI/Animation Event"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiAnimationEvent_Stopped",
+                    "details": {
+                        "name": "Stopped"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names
index 69221891f7..8cce3444ad 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiAnimationEvent_Updated",
+            "base": "eUiAnimationEvent_Updated",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiAnimationEvent_Updated::Getter",
-                "category": "Constants"
-            }
+                "name": "Updated",
+                "category": "Constants/UI/Animation Event"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiAnimationEvent_Updated",
+                    "details": {
+                        "name": "Updated"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names
index 6062cced48..bfb9de3855 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDragState_Invalid",
+            "base": "eUiDragState_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDragState_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/UI/Drag State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDragState_Invalid",
+                    "details": {
+                        "name": "Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names
index c5c06e8057..b1d31d25de 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDragState_Normal",
+            "base": "eUiDragState_Normal",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDragState_Normal::Getter",
-                "category": "Constants"
-            }
+                "name": "Normal",
+                "category": "Constants/UI/Drag State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDragState_Normal",
+                    "details": {
+                        "name": "Normal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names
index d8ad67098a..f58ad69a9a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDragState_Valid",
+            "base": "eUiDragState_Valid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDragState_Valid::Getter",
-                "category": "Constants"
-            }
+                "name": "Valid",
+                "category": "Constants/UI/Drag State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDragState_Valid",
+                    "details": {
+                        "name": "Valid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names
index 7f0745b6f3..26f2d83294 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDropState_Invalid",
+            "base": "eUiDropState_Invalid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDropState_Invalid::Getter",
-                "category": "Constants"
-            }
+                "name": "Invalid",
+                "category": "Constants/UI/Drop State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDropState_Invalid",
+                    "details": {
+                        "name": "Invalid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names
index b7325d9c15..076dd2d7fe 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDropState_Normal",
+            "base": "eUiDropState_Normal",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDropState_Normal::Getter",
-                "category": "Constants"
-            }
+                "name": "Normal",
+                "category": "Constants/UI/Drop State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDropState_Normal",
+                    "details": {
+                        "name": "Normal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names
index 19551341da..3a8db2c23c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDropState_Valid",
+            "base": "eUiDropState_Valid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDropState_Valid::Getter",
-                "category": "Constants"
-            }
+                "name": "Valid",
+                "category": "Constants/UI/Drop State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDropState_Valid",
+                    "details": {
+                        "name": "Valid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names
index b3dbc87cac..e420f6ad42 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDynamicContentDBColorType_Free",
+            "base": "eUiDynamicContentDBColorType_Free",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDynamicContentDBColorType_Free::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Type Free",
+                "category": "Constants/UI/Dynamic ContentDB"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDynamicContentDBColorType_Free",
+                    "details": {
+                        "name": "Color Type Free"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names
index b58a8484ee..98f6c71f48 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiDynamicContentDBColorType_Paid",
+            "base": "eUiDynamicContentDBColorType_Paid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiDynamicContentDBColorType_Paid::Getter",
-                "category": "Constants"
-            }
+                "name": "Color Type Paid",
+                "category": "Constants/UI/Dynamic ContentDB"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiDynamicContentDBColorType_Paid",
+                    "details": {
+                        "name": "Color Type Paid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names
index 7bcdda54e2..4b9f83c1f8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiEmitShape_Circle",
+            "base": "eUiEmitShape_Circle",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiEmitShape_Circle::Getter",
-                "category": "Constants"
-            }
+                "name": "Circle",
+                "category": "Constants/UI/Emit Shape"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiEmitShape_Circle",
+                    "details": {
+                        "name": "Circle"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names
index 60ef452594..965d9445dd 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiEmitShape_Point",
+            "base": "eUiEmitShape_Point",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiEmitShape_Point::Getter",
-                "category": "Constants"
-            }
+                "name": "Point",
+                "category": "Constants/UI/Emit Shape"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiEmitShape_Point",
+                    "details": {
+                        "name": "Point"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names
index 25ec6925de..76c7c7d9f1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiEmitShape_Quad",
+            "base": "eUiEmitShape_Quad",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiEmitShape_Quad::Getter",
-                "category": "Constants"
-            }
+                "name": "Quad",
+                "category": "Constants/UI/Emit Shape"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiEmitShape_Quad",
+                    "details": {
+                        "name": "Quad"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names
index 11a00014b9..8911478f3c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillCornerOrigin_BottomLeft",
+            "base": "eUiFillCornerOrigin_BottomLeft",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillCornerOrigin_BottomLeft::Getter",
-                "category": "Constants"
-            }
+                "name": "Bottom Left",
+                "category": "Constants/UI/Fill Corner"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillCornerOrigin_BottomLeft",
+                    "details": {
+                        "name": "Bottom Left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names
index b1121d2e37..da3225dd0b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillCornerOrigin_BottomRight",
+            "base": "eUiFillCornerOrigin_BottomRight",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillCornerOrigin_BottomRight::Getter",
-                "category": "Constants"
-            }
+                "name": "Bottom Right",
+                "category": "Constants/UI/Fill Corner"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillCornerOrigin_BottomRight",
+                    "details": {
+                        "name": "Bottom Right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names
index 16e3c41732..63fa743485 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillCornerOrigin_TopLeft",
+            "base": "eUiFillCornerOrigin_TopLeft",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillCornerOrigin_TopLeft::Getter",
-                "category": "Constants"
-            }
+                "name": "Top Left",
+                "category": "Constants/UI/Fill Corner"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillCornerOrigin_TopLeft",
+                    "details": {
+                        "name": "Top Left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names
index a923c46942..7b1c1204d4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillCornerOrigin_TopRight",
+            "base": "eUiFillCornerOrigin_TopRight",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillCornerOrigin_TopRight::Getter",
-                "category": "Constants"
-            }
+                "name": "Top Right",
+                "category": "Constants/UI/Fill Corner"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillCornerOrigin_TopRight",
+                    "details": {
+                        "name": "Top Right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names
index 914282a199..430943dba2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillEdgeOrigin_Bottom",
+            "base": "eUiFillEdgeOrigin_Bottom",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillEdgeOrigin_Bottom::Getter",
-                "category": "Constants"
-            }
+                "name": "Bottom",
+                "category": "Constants/UI/Fill Edge"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillEdgeOrigin_Bottom",
+                    "details": {
+                        "name": "Bottom"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names
index a88450c7b4..f28601e4f4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillEdgeOrigin_Left",
+            "base": "eUiFillEdgeOrigin_Left",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillEdgeOrigin_Left::Getter",
-                "category": "Constants"
-            }
+                "name": "Left",
+                "category": "Constants/UI/Fill Edge"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillEdgeOrigin_Left",
+                    "details": {
+                        "name": "Left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names
index db5d528b2e..cd75d8a15f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillEdgeOrigin_Right",
+            "base": "eUiFillEdgeOrigin_Right",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillEdgeOrigin_Right::Getter",
-                "category": "Constants"
-            }
+                "name": "Right",
+                "category": "Constants/UI/Fill Edge"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillEdgeOrigin_Right",
+                    "details": {
+                        "name": "Right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names
index 6cb79b40d9..648f9cc379 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names
@@ -1,13 +1,30 @@
 {
     "entries": [
         {
-            "key": "eUiFillEdgeOrigin_Top",
+            "base": "eUiFillEdgeOrigin_Top",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillEdgeOrigin_Top::Getter",
-                "category": "Constants"
-            }
+                "name": "Top",
+                "category": "Constants/UI/Fill Edge",
+                "subtitle": "Fill Edge"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillEdgeOrigin_Top",
+                    "details": {
+                        "name": "Top"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names
index 6a1530c0b3..64cf4df11b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillType_Linear",
+            "base": "eUiFillType_Linear",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillType_Linear::Getter",
-                "category": "Constants"
-            }
+                "name": "Linear",
+                "category": "Constants/UI/Fill Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillType_Linear",
+                    "details": {
+                        "name": "Linear"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names
index 868d562df1..31746bdda5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillType_None",
+            "base": "eUiFillType_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillType_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/UI/Fill Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillType_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names
index ae01ffdcf6..3a92aafdd7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillType_Radial",
+            "base": "eUiFillType_Radial",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillType_Radial::Getter",
-                "category": "Constants"
-            }
+                "name": "Radial",
+                "category": "Constants/UI/Fill Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillType_Radial",
+                    "details": {
+                        "name": "Radial"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names
index 4dcecb752d..25ec95691c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillType_RadialCorner",
+            "base": "eUiFillType_RadialCorner",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillType_RadialCorner::Getter",
-                "category": "Constants"
-            }
+                "name": "Radial Corner",
+                "category": "Constants/UI/Fill Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillType_RadialCorner",
+                    "details": {
+                        "name": "Radial Corner"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names
index a8e9d490d2..99a7798bed 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFillType_RadialEdge",
+            "base": "eUiFillType_RadialEdge",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFillType_RadialEdge::Getter",
-                "category": "Constants"
-            }
+                "name": "Radial Edge",
+                "category": "Constants/UI/Fill Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFillType_RadialEdge",
+                    "details": {
+                        "name": "Radial Edge"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names
index 476f62879e..ffab126757 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFlipbookAnimationFramerateUnits_FPS",
+            "base": "eUiFlipbookAnimationFramerateUnits_FPS",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFlipbookAnimationFramerateUnits_FPS::Getter",
-                "category": "Constants"
-            }
+                "name": "Frames Per Second",
+                "category": "Constants/UI/Flipbook Animation"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFlipbookAnimationFramerateUnits_FPS",
+                    "details": {
+                        "name": "Frames Per Second"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names
index 2d567073a0..273d36c382 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFlipbookAnimationFramerateUnits_SecondsPerFrame",
+            "base": "eUiFlipbookAnimationFramerateUnits_SecondsPerFrame",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFlipbookAnimationFramerateUnits_SecondsPerFrame::Getter",
-                "category": "Constants"
-            }
+                "name": "Seconds Per Frame",
+                "category": "Constants/UI/Flipbook Animation"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFlipbookAnimationFramerateUnits_SecondsPerFrame",
+                    "details": {
+                        "name": "Seconds Per Frame"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names
index d794ec96f0..72dc9a0a98 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFlipbookAnimationLoopType_Linear",
+            "base": "eUiFlipbookAnimationLoopType_Linear",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFlipbookAnimationLoopType_Linear::Getter",
-                "category": "Constants"
-            }
+                "name": "Linear",
+                "category": "Constants/UI/Flipbook Animation/Loop Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFlipbookAnimationLoopType_Linear",
+                    "details": {
+                        "name": "Linear"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names
index 2cdbfea52c..c59df78329 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFlipbookAnimationLoopType_None",
+            "base": "eUiFlipbookAnimationLoopType_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFlipbookAnimationLoopType_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/UI/Flipbook Animation/Loop Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFlipbookAnimationLoopType_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names
index 9c9c1cd016..39d2672941 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiFlipbookAnimationLoopType_PingPong",
+            "base": "eUiFlipbookAnimationLoopType_PingPong",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiFlipbookAnimationLoopType_PingPong::Getter",
-                "category": "Constants"
-            }
+                "name": "Ping Pong",
+                "category": "Constants/UI/Flipbook Animation/Loop Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiFlipbookAnimationLoopType_PingPong",
+                    "details": {
+                        "name": "Ping Pong"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names
index faf4797114..0e724f97a5 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiHAlign_Center",
+            "base": "eUiHAlign_Center",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiHAlign_Center::Getter",
-                "category": "Constants"
-            }
+                "name": "Horizontal Align Center",
+                "category": "Constants/UI/Align"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiHAlign_Center",
+                    "details": {
+                        "name": "Horizontal Align: Center"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names
index 01cd8f3812..f5291df8a4 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiHAlign_Left",
+            "base": "eUiHAlign_Left",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiHAlign_Left::Getter",
-                "category": "Constants"
-            }
+                "name": "Horizontal Align Left",
+                "category": "Constants/UI/Align"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiHAlign_Left",
+                    "details": {
+                        "name": "Horizontal Align: Left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names
index 03ff7072ef..f198f249f6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiHAlign_Right",
+            "base": "eUiHAlign_Right",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiHAlign_Right::Getter",
-                "category": "Constants"
-            }
+                "name": "Horizontal Align Right",
+                "category": "Constants/UI/Align"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiHAlign_Right",
+                    "details": {
+                        "name": "Horizontal Align: Right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names
index f2a0494385..ffd3607db8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiHorizontalOrder_LeftToRight",
+            "base": "eUiHorizontalOrder_LeftToRight",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiHorizontalOrder_LeftToRight::Getter",
-                "category": "Constants"
-            }
+                "name": "Left To Right",
+                "category": "Constants/UI/Order/Horizontal"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiHorizontalOrder_LeftToRight",
+                    "details": {
+                        "name": "Left To Right"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names
index 133113e8ce..816220904a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiHorizontalOrder_RightToLeft",
+            "base": "eUiHorizontalOrder_RightToLeft",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiHorizontalOrder_RightToLeft::Getter",
-                "category": "Constants"
-            }
+                "name": "Right To Left",
+                "category": "Constants/UI/Order/Horizontal"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiHorizontalOrder_RightToLeft",
+                    "details": {
+                        "name": "Right To Left"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names
index f82d1d4eb0..303fb21025 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageSequenceImageType_Fixed",
+            "base": "eUiImageSequenceImageType_Fixed",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageSequenceImageType_Fixed::Getter",
-                "category": "Constants"
-            }
+                "name": "Image Type: Fixed",
+                "category": "Constants/UI/Image Sequence"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageSequenceImageType_Fixed",
+                    "details": {
+                        "name": "Image Type: Fixed"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names
index a4b48dc8ad..2aaca0318f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageSequenceImageType_Stretched",
+            "base": "eUiImageSequenceImageType_Stretched",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageSequenceImageType_Stretched::Getter",
-                "category": "Constants"
-            }
+                "name": "Image Type: Stretched",
+                "category": "Constants/UI/Image Sequence"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageSequenceImageType_Stretched",
+                    "details": {
+                        "name": "Image Type: Stretched"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names
index c59426f677..4213ec205a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageSequenceImageType_StretchedToFill",
+            "base": "eUiImageSequenceImageType_StretchedToFill",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageSequenceImageType_StretchedToFill::Getter",
-                "category": "Constants"
-            }
+                "name": "Image Type: Stretched To Fill",
+                "category": "Constants/UI/Image Sequence"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageSequenceImageType_StretchedToFill",
+                    "details": {
+                        "name": "Image Type: Stretched To Fill"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names
index 9ba3d30e62..acc64fa708 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageSequenceImageType_StretchedToFit",
+            "base": "eUiImageSequenceImageType_StretchedToFit",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageSequenceImageType_StretchedToFit::Getter",
-                "category": "Constants"
-            }
+                "name": "Image Type: Stretched To Fit",
+                "category": "Constants/UI/Image Sequence"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageSequenceImageType_StretchedToFit",
+                    "details": {
+                        "name": "Image Type: Stretched To Fit"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names
index 0a65819fc1..73d2ff7381 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageType_Fixed",
+            "base": "eUiImageType_Fixed",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageType_Fixed::Getter",
-                "category": "Constants"
-            }
+                "name": "Fixed",
+                "category": "Constants/UI/Image Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageType_Fixed",
+                    "details": {
+                        "name": "Fixed"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names
index f9f1bc3743..6f3158e08e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageType_Sliced",
+            "base": "eUiImageType_Sliced",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageType_Sliced::Getter",
-                "category": "Constants"
-            }
+                "name": "Sliced",
+                "category": "Constants/UI/Image Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageType_Sliced",
+                    "details": {
+                        "name": "Sliced"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names
index fc2312db15..65a02f354d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageType_Stretched",
+            "base": "eUiImageType_Stretched",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageType_Stretched::Getter",
-                "category": "Constants"
-            }
+                "name": "Stretched",
+                "category": "Constants/UI/Image Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageType_Stretched",
+                    "details": {
+                        "name": "Stretched"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names
index a30508aa7e..b61130487a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageType_StretchedToFill",
+            "base": "eUiImageType_StretchedToFill",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageType_StretchedToFill::Getter",
-                "category": "Constants"
-            }
+                "name": "Stretched To Fill",
+                "category": "Constants/UI/Image Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageType_StretchedToFill",
+                    "details": {
+                        "name": "Stretched To Fill"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names
index be3b007a7e..1223714053 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageType_StretchedToFit",
+            "base": "eUiImageType_StretchedToFit",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageType_StretchedToFit::Getter",
-                "category": "Constants"
-            }
+                "name": "Stretched To Fit",
+                "category": "Constants/UI/Image Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageType_StretchedToFit",
+                    "details": {
+                        "name": "Stretched To Fit"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names
index 0a6e5b0977..ea65a0911e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiImageType_Tiled",
+            "base": "eUiImageType_Tiled",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiImageType_Tiled::Getter",
-                "category": "Constants"
-            }
+                "name": "Tiled",
+                "category": "Constants/UI/Image Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiImageType_Tiled",
+                    "details": {
+                        "name": "Tiled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names
index 43ed9dfac2..014fa172d7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiInteractableState_Disabled",
+            "base": "eUiInteractableState_Disabled",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiInteractableState_Disabled::Getter",
-                "category": "Constants"
-            }
+                "name": "Disabled",
+                "category": "Constants/UI/Interactable State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiInteractableState_Disabled",
+                    "details": {
+                        "name": "Disabled"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names
index 7e005729fd..978dd826d6 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiInteractableState_Hover",
+            "base": "eUiInteractableState_Hover",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiInteractableState_Hover::Getter",
-                "category": "Constants"
-            }
+                "name": "Hover",
+                "category": "Constants/UI/Interactable State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiInteractableState_Hover",
+                    "details": {
+                        "name": "Hover"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names
index 51d7e81522..9ab36fba53 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiInteractableState_Normal",
+            "base": "eUiInteractableState_Normal",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiInteractableState_Normal::Getter",
-                "category": "Constants"
-            }
+                "name": "Normal",
+                "category": "Constants/UI/Interactable State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiInteractableState_Normal",
+                    "details": {
+                        "name": "Normal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names
index b578408cd2..295c75a89b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiInteractableState_Pressed",
+            "base": "eUiInteractableState_Pressed",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiInteractableState_Pressed::Getter",
-                "category": "Constants"
-            }
+                "name": "Pressed",
+                "category": "Constants/UI/Interactable State"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiInteractableState_Pressed",
+                    "details": {
+                        "name": "Pressed"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names
index d0c3ef3a79..c4a6d39865 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiLayoutGridStartingDirection_HorizontalOrder",
+            "base": "eUiLayoutGridStartingDirection_HorizontalOrder",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiLayoutGridStartingDirection_HorizontalOrder::Getter",
-                "category": "Constants"
-            }
+                "name": "Horizontal Order",
+                "category": "Constants/UI/Layout Grid Starting Direction"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiLayoutGridStartingDirection_HorizontalOrder",
+                    "details": {
+                        "name": "Horizontal Order"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names
index fd32fb89c9..33d50cf441 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiLayoutGridStartingDirection_VerticalOrder",
+            "base": "eUiLayoutGridStartingDirection_VerticalOrder",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiLayoutGridStartingDirection_VerticalOrder::Getter",
-                "category": "Constants"
-            }
+                "name": "Vertical Order",
+                "category": "Constants/UI/Layout Grid Starting Direction"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiLayoutGridStartingDirection_VerticalOrder",
+                    "details": {
+                        "name": "Vertical Order"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names
index 1743a1ebdb..e3c9a9ecd7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiNavigationMode_Automatic",
+            "base": "eUiNavigationMode_Automatic",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiNavigationMode_Automatic::Getter",
-                "category": "Constants"
-            }
+                "name": "Automatic",
+                "category": "Constants/UI/Navigation Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiNavigationMode_Automatic",
+                    "details": {
+                        "name": "Automatic"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names
index 8a3ee33916..6a1beeb293 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiNavigationMode_Custom",
+            "base": "eUiNavigationMode_Custom",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiNavigationMode_Custom::Getter",
-                "category": "Constants"
-            }
+                "name": "Custom",
+                "category": "Constants/UI/Navigation Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiNavigationMode_Custom",
+                    "details": {
+                        "name": "Custom"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names
index abc9248282..19e02a0412 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiNavigationMode_None",
+            "base": "eUiNavigationMode_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiNavigationMode_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/UI/Navigation Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiNavigationMode_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names
index 33a1db8e62..00e0aaece8 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiParticleCoordinateType_Cartesian",
+            "base": "eUiParticleCoordinateType_Cartesian",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiParticleCoordinateType_Cartesian::Getter",
-                "category": "Constants"
-            }
+                "name": "Cartesian",
+                "category": "Constants/UI/Particle Coordinate Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiParticleCoordinateType_Cartesian",
+                    "details": {
+                        "name": "Cartesian"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names
index 3ddbf1792c..c0014a0a48 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiParticleCoordinateType_Polar",
+            "base": "eUiParticleCoordinateType_Polar",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiParticleCoordinateType_Polar::Getter",
-                "category": "Constants"
-            }
+                "name": "Polar",
+                "category": "Constants/UI/Particle Coordinate Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiParticleCoordinateType_Polar",
+                    "details": {
+                        "name": "Polar"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names
index f9a8ae7ceb..000c00bcb2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiParticleInitialDirectionType_RelativeToEmitAngle",
+            "base": "eUiParticleInitialDirectionType_RelativeToEmitAngle",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiParticleInitialDirectionType_RelativeToEmitAngle::Getter",
-                "category": "Constants"
-            }
+                "name": "Relative To Emit Angle",
+                "category": "Constants/UI/Particle Initial Direction Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiParticleInitialDirectionType_RelativeToEmitAngle",
+                    "details": {
+                        "name": "Relative To Emit Angle"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names
index 6486a80003..2a3d5ce1a2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiParticleInitialDirectionType_RelativeToEmitterCenter",
+            "base": "eUiParticleInitialDirectionType_RelativeToEmitterCenter",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiParticleInitialDirectionType_RelativeToEmitterCenter::Getter",
-                "category": "Constants"
-            }
+                "name": "Relative To Emitter Center",
+                "category": "Constants/UI/Particle Initial Direction Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiParticleInitialDirectionType_RelativeToEmitterCenter",
+                    "details": {
+                        "name": "Relative To Emitter Center"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names
index 605ed1aba5..839a22e304 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_NonUniformScale",
+            "base": "eUiScaleToDeviceMode_NonUniformScale",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_NonUniformScale::Getter",
-                "category": "Constants"
-            }
+                "name": "Non Uniform Scale",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_NonUniformScale",
+                    "details": {
+                        "name": "Non Uniform Scale"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names
index 88c08b06ec..1739b984d2 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_None",
+            "base": "eUiScaleToDeviceMode_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names
index 5804e7aeaa..883068240f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_ScaleXOnly",
+            "base": "eUiScaleToDeviceMode_ScaleXOnly",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_ScaleXOnly::Getter",
-                "category": "Constants"
-            }
+                "name": "Scale X Only",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_ScaleXOnly",
+                    "details": {
+                        "name": "Scale X Only"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names
index e5ea4e5f5c..3589e6b7cf 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_ScaleYOnly",
+            "base": "eUiScaleToDeviceMode_ScaleYOnly",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_ScaleYOnly::Getter",
-                "category": "Constants"
-            }
+                "name": "Scale Y Only",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_ScaleYOnly",
+                    "details": {
+                        "name": "Scale Y Only"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names
index aa1f56984b..e6e0a8c72d 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_UniformScaleToFill",
+            "base": "eUiScaleToDeviceMode_UniformScaleToFill",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_UniformScaleToFill::Getter",
-                "category": "Constants"
-            }
+                "name": "Uniform Scale To Fill",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_UniformScaleToFill",
+                    "details": {
+                        "name": "Uniform Scale To Fill"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names
index 3b603fabc1..8f2e3c80ee 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_UniformScaleToFit",
+            "base": "eUiScaleToDeviceMode_UniformScaleToFit",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_UniformScaleToFit::Getter",
-                "category": "Constants"
-            }
+                "name": "Uniform Scale To Fit",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_UniformScaleToFit",
+                    "details": {
+                        "name": "Uniform Scale To Fit"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names
index ce90c47c88..dd07d3e4c3 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_UniformScaleToFitX",
+            "base": "eUiScaleToDeviceMode_UniformScaleToFitX",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_UniformScaleToFitX::Getter",
-                "category": "Constants"
-            }
+                "name": "Uniform Scale To Fit X",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_UniformScaleToFitX",
+                    "details": {
+                        "name": "Uniform Scale To Fit X"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names
index a0ba060b36..5519e48332 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScaleToDeviceMode_UniformScaleToFitY",
+            "base": "eUiScaleToDeviceMode_UniformScaleToFitY",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScaleToDeviceMode_UniformScaleToFitY::Getter",
-                "category": "Constants"
-            }
+                "name": "Uniform Scale To Fit Y",
+                "category": "Constants/UI/Scale To Device Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScaleToDeviceMode_UniformScaleToFitY",
+                    "details": {
+                        "name": "Uniform Scale To Fit Y"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names
index 61931775a9..8db8786d20 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollBoxScrollBarVisibility_AlwaysShow",
+            "base": "eUiScrollBoxScrollBarVisibility_AlwaysShow",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollBoxScrollBarVisibility_AlwaysShow::Getter",
-                "category": "Constants"
-            }
+                "name": "Always Show",
+                "category": "Constants/UI/Scroll Box Scroll Bar Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollBoxScrollBarVisibility_AlwaysShow",
+                    "details": {
+                        "name": "Always Show"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names
index 48de4a7899..df81d761aa 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollBoxScrollBarVisibility_AutoHide",
+            "base": "eUiScrollBoxScrollBarVisibility_AutoHide",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollBoxScrollBarVisibility_AutoHide::Getter",
-                "category": "Constants"
-            }
+                "name": "Auto Hide",
+                "category": "Constants/UI/Scroll Box Scroll Bar Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollBoxScrollBarVisibility_AutoHide",
+                    "details": {
+                        "name": "Auto Hide"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names
index 560df7e007..c65f31e223 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport",
+            "base": "eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport::Getter",
-                "category": "Constants"
-            }
+                "name": "Auto Hide And Resize Viewport",
+                "category": "Constants/UI/Scroll Box Scroll Bar Visibility"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport",
+                    "details": {
+                        "name": "Auto Hide And Resize Viewport"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names
index 0b540c47a4..2552d2d348 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollBoxSnapMode_Children",
+            "base": "eUiScrollBoxSnapMode_Children",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollBoxSnapMode_Children::Getter",
-                "category": "Constants"
-            }
+                "name": "Children",
+                "category": "Constants/UI/Scroll Box Snap Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollBoxSnapMode_Children",
+                    "details": {
+                        "name": "Children"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names
index 5696a2ac17..3369cb4df1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollBoxSnapMode_Grid",
+            "base": "eUiScrollBoxSnapMode_Grid",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollBoxSnapMode_Grid::Getter",
-                "category": "Constants"
-            }
+                "name": "Grid",
+                "category": "Constants/UI/Scroll Box Snap Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollBoxSnapMode_Grid",
+                    "details": {
+                        "name": "Grid"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names
index 107536dc88..e806ef8347 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollBoxSnapMode_None",
+            "base": "eUiScrollBoxSnapMode_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollBoxSnapMode_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/UI/Scroll Box Snap Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollBoxSnapMode_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names
index a9a7e4b62f..89b4e75151 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollerOrientation_Horizontal",
+            "base": "eUiScrollerOrientation_Horizontal",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollerOrientation_Horizontal::Getter",
-                "category": "Constants"
-            }
+                "name": "Horizontal",
+                "category": "Constants/UI/Scroller Orientation"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollerOrientation_Horizontal",
+                    "details": {
+                        "name": "Horizontal"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names
index fee533f819..7823992830 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiScrollerOrientation_Vertical",
+            "base": "eUiScrollerOrientation_Vertical",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiScrollerOrientation_Vertical::Getter",
-                "category": "Constants"
-            }
+                "name": "Vertical",
+                "category": "Constants/UI/Scroller Orientation"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiScrollerOrientation_Vertical",
+                    "details": {
+                        "name": "Vertical"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names
index f1b2b162d4..94056daa38 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiSpriteType_RenderTarget",
+            "base": "eUiSpriteType_RenderTarget",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiSpriteType_RenderTarget::Getter",
-                "category": "Constants"
-            }
+                "name": "Render Target",
+                "category": "Constants/UI/Sprite Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiSpriteType_RenderTarget",
+                    "details": {
+                        "name": "Render Target"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names
index 4fb031214f..c47a3c4192 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiSpriteType_SpriteAsset",
+            "base": "eUiSpriteType_SpriteAsset",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiSpriteType_SpriteAsset::Getter",
-                "category": "Constants"
-            }
+                "name": "Sprite Asset",
+                "category": "Constants/UI/Sprite Type"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiSpriteType_SpriteAsset",
+                    "details": {
+                        "name": "Sprite Asset"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names
index 4020030b26..9aa0a64317 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextOverflowMode_ClipText",
+            "base": "eUiTextOverflowMode_ClipText",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextOverflowMode_ClipText::Getter",
-                "category": "Constants"
-            }
+                "name": "Clip Text",
+                "category": "Constants/UI/Text Overflow Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextOverflowMode_ClipText",
+                    "details": {
+                        "name": "Clip Text"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names
index 340acecf48..b930c80c95 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextOverflowMode_Ellipsis",
+            "base": "eUiTextOverflowMode_Ellipsis",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextOverflowMode_Ellipsis::Getter",
-                "category": "Constants"
-            }
+                "name": "Ellipsis",
+                "category": "Constants/UI/Text Overflow Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextOverflowMode_Ellipsis",
+                    "details": {
+                        "name": "Ellipsis"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names
index 5de46b4a76..51271d943f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextOverflowMode_OverflowText",
+            "base": "eUiTextOverflowMode_OverflowText",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextOverflowMode_OverflowText::Getter",
-                "category": "Constants"
-            }
+                "name": "Overflow Text",
+                "category": "Constants/UI/Text Overflow Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextOverflowMode_OverflowText",
+                    "details": {
+                        "name": "Overflow Text"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names
index 5331e830f4..614c337c6b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextShrinkToFit_None",
+            "base": "eUiTextShrinkToFit_None",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextShrinkToFit_None::Getter",
-                "category": "Constants"
-            }
+                "name": "None",
+                "category": "Constants/UI/Text Shrink To Fit"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextShrinkToFit_None",
+                    "details": {
+                        "name": "None"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names
index 175534eafd..72c29c8b5a 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextShrinkToFit_Uniform",
+            "base": "eUiTextShrinkToFit_Uniform",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextShrinkToFit_Uniform::Getter",
-                "category": "Constants"
-            }
+                "name": "Uniform",
+                "category": "Constants/UI/Text Shrink To Fit"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextShrinkToFit_Uniform",
+                    "details": {
+                        "name": "Uniform"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names
index 95b5d2b424..67524f593f 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextShrinkToFit_WidthOnly",
+            "base": "eUiTextShrinkToFit_WidthOnly",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextShrinkToFit_WidthOnly::Getter",
-                "category": "Constants"
-            }
+                "name": "Width Only",
+                "category": "Constants/UI/Text Shrink To Fit"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextShrinkToFit_WidthOnly",
+                    "details": {
+                        "name": "Width Only"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names
index 04dc16a0ae..dfb70ab7ba 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextWrapTextSetting_NoWrap",
+            "base": "eUiTextWrapTextSetting_NoWrap",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextWrapTextSetting_NoWrap::Getter",
-                "category": "Constants"
-            }
+                "name": "No Wrap",
+                "category": "Constants/UI/Text Wrap"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextWrapTextSetting_NoWrap",
+                    "details": {
+                        "name": "No Wrap"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names
index 75fe851271..96c98744d1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTextWrapTextSetting_Wrap",
+            "base": "eUiTextWrapTextSetting_Wrap",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTextWrapTextSetting_Wrap::Getter",
-                "category": "Constants"
-            }
+                "name": "Wrap",
+                "category": "Constants/UI/Text Wrap"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTextWrapTextSetting_Wrap",
+                    "details": {
+                        "name": "Wrap"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names
index 473b16b42d..c0fb71abc1 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTooltipDisplayAutoPositionMode_OffsetFromElement",
+            "base": "eUiTooltipDisplayAutoPositionMode_OffsetFromElement",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTooltipDisplayAutoPositionMode_OffsetFromElement::Getter",
-                "category": "Constants"
-            }
+                "name": "Offset From Element",
+                "category": "Constants/UI/Tooltip Display Auto Position Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromElement",
+                    "details": {
+                        "name": "Offset From Element"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names
index 4876380d2b..5c12e0a60e 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTooltipDisplayAutoPositionMode_OffsetFromMouse",
+            "base": "eUiTooltipDisplayAutoPositionMode_OffsetFromMouse",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTooltipDisplayAutoPositionMode_OffsetFromMouse::Getter",
-                "category": "Constants"
-            }
+                "name": "Offset From Mouse",
+                "category": "Constants/UI/Tooltip Display Auto Position Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromMouse",
+                    "details": {
+                        "name": "Offset From Mouse"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names
index 607b9793a2..deb5b1696b 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTooltipDisplayTriggerMode_OnClick",
+            "base": "eUiTooltipDisplayTriggerMode_OnClick",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTooltipDisplayTriggerMode_OnClick::Getter",
-                "category": "Constants"
-            }
+                "name": "On Click",
+                "category": "Constants/UI/Tooltip Display Trigger Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTooltipDisplayTriggerMode_OnClick",
+                    "details": {
+                        "name": "On Click"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names
index 705be843d8..e118eeafbc 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTooltipDisplayTriggerMode_OnHover",
+            "base": "eUiTooltipDisplayTriggerMode_OnHover",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTooltipDisplayTriggerMode_OnHover::Getter",
-                "category": "Constants"
-            }
+                "name": "On Hover",
+                "category": "Constants/UI/Tooltip Display Trigger Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTooltipDisplayTriggerMode_OnHover",
+                    "details": {
+                        "name": "On Hover"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names
index 28eb9c5118..f570902180 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiTooltipDisplayTriggerMode_OnPress",
+            "base": "eUiTooltipDisplayTriggerMode_OnPress",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiTooltipDisplayTriggerMode_OnPress::Getter",
-                "category": "Constants"
-            }
+                "name": "On Press",
+                "category": "Constants/UI/Tooltip Display Trigger Mode"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiTooltipDisplayTriggerMode_OnPress",
+                    "details": {
+                        "name": "On Press"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names
index 46aa499d0b..b5c89b6b6c 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiVAlign_Bottom",
+            "base": "eUiVAlign_Bottom",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiVAlign_Bottom::Getter",
-                "category": "Constants"
-            }
+                "name": "Vertical Align Bottom",
+                "category": "Constants/UI/Align"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiVAlign_Bottom",
+                    "details": {
+                        "name": "Vertical Align: Bottom"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names
index 2f64297cf4..ecdb75bda9 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiVAlign_Center",
+            "base": "eUiVAlign_Center",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiVAlign_Center::Getter",
-                "category": "Constants"
-            }
+                "name": "Vertical Align Center",
+                "category": "Constants/UI/Align"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiVAlign_Center",
+                    "details": {
+                        "name": "Vertical Align: Center"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names
index d688313c21..f35d9ff698 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiVAlign_Top",
+            "base": "eUiVAlign_Top",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiVAlign_Top::Getter",
-                "category": "Constants"
-            }
+                "name": "Vertical Align Top",
+                "category": "Constants/UI/Align"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiVAlign_Top",
+                    "details": {
+                        "name": "Vertical Align: Top"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names
index a9f3b06c9a..06edfefaef 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiVerticalOrder_BottomToTop",
+            "base": "eUiVerticalOrder_BottomToTop",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiVerticalOrder_BottomToTop::Getter",
-                "category": "Constants"
-            }
+                "name": "Bottom To Top",
+                "category": "Constants/UI/Order/Vertical"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiVerticalOrder_BottomToTop",
+                    "details": {
+                        "name": "Bottom To Top"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names
index 67532f62eb..ff4d7ec7ec 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "eUiVerticalOrder_TopToBottom",
+            "base": "eUiVerticalOrder_TopToBottom",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "eUiVerticalOrder_TopToBottom::Getter",
-                "category": "Constants"
-            }
+                "name": "Top To Bottom",
+                "category": "Constants/UI/Order/Vertical"
+            },
+            "methods": [
+                {
+                    "base": "GeteUiVerticalOrder_TopToBottom",
+                    "details": {
+                        "name": "Top To Bottom"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}",
+                            "details": {
+                                "name": "int"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names
new file mode 100644
index 0000000000..679cd307c8
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names
@@ -0,0 +1,29 @@
+{
+    "entries": [
+        {
+            "base": "g_ProfilerSystem",
+            "context": "Constant",
+            "variant": "",
+            "details": {
+                "name": "Profiler System",
+                "category": "Constants/Profiler"
+            },
+            "methods": [
+                {
+                    "base": "Getg_ProfilerSystem",
+                    "details": {
+                        "name": "Profiler System"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{D671FB70-8B09-4C3A-96CD-06A339F3138E}",
+                            "details": {
+                                "name": "Profiler System Script Proxy"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names
index a713b4f4fa..5d7a8dfba7 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names
@@ -1,13 +1,29 @@
 {
     "entries": [
         {
-            "key": "g_SettingsRegistry",
+            "base": "g_SettingsRegistry",
             "context": "Constant",
             "variant": "",
             "details": {
-                "name": "g_SettingsRegistry::Getter",
-                "category": "Constants"
-            }
+                "name": "Settings Registry",
+                "category": "Constants/Settings"
+            },
+            "methods": [
+                {
+                    "base": "Getg_SettingsRegistry",
+                    "details": {
+                        "name": "Settings Registry"
+                    },
+                    "results": [
+                        {
+                            "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}",
+                            "details": {
+                                "name": "Settings Registry Script Proxy"
+                            }
+                        }
+                    ]
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names
new file mode 100644
index 0000000000..598d058767
--- /dev/null
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names
@@ -0,0 +1,1428 @@
+{
+    "entries": [
+        {
+            "base": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Uuid"
+            }
+        },
+        {
+            "base": "{831C1F11-5898-4FBF-B4CF-92B757A907A8}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "FastNoiseGradientConfig"
+            }
+        },
+        {
+            "base": "{1D00F234-8134-4A42-A357-ADAC865CF63A}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Mesh Blocker Config"
+            }
+        },
+        {
+            "base": "{40403A44-31FE-4D1D-941C-6593759CCCBD}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MixedGradientConfig"
+            }
+        },
+        {
+            "base": "{0B5D866D-C7F5-5B12-81A5-74521A8230D5}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<AZ::u64, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{4AADFD75-48A7-4F31-8F30-FE4505F09E35}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SphereShapeConfig"
+            }
+        },
+        {
+            "base": "{01F6E6C5-707E-42EC-91BB-F674B9F51A40}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "BlockerConfig"
+            }
+        },
+        {
+            "base": "{5574DD27-89D8-5A40-B7C4-FA04C68B8A0D}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned short, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{FE862126-C838-4999-9B7B-4AEEA5507A49}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "RaySplineQueryResult"
+            }
+        },
+        {
+            "base": "{ED57731E-2821-4AA6-9BD6-9203ED0B6AB0}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AreaBlenderConfig"
+            }
+        },
+        {
+            "base": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Vector4"
+            }
+        },
+        {
+            "base": "{A62E9C87-093C-4534-AB48-DEF8EC80C190}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DescriptorListCombinerConfig"
+            }
+        },
+        {
+            "base": "{73BA7B92-1061-4DDB-AA5B-A0D87303CBC8}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SlopeAlignmentModifierConfig"
+            }
+        },
+        {
+            "base": "{C0E1DF8C-D1BE-4AF4-8100-5D71788399BA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShaderVariantInfo"
+            }
+        },
+        {
+            "base": "{15A4332F-7C3F-4A58-AC35-50E1CE53FB9C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Matrix3x3"
+            }
+        },
+        {
+            "base": "{12A1776B-61F6-4E5F-356A-AD718A62051F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "NetworkTestPlayerComponentNetworkInput"
+            }
+        },
+        {
+            "base": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Matrix4x4"
+            }
+        },
+        {
+            "base": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AzFramework::SurfaceData::SurfacePoint"
+            }
+        },
+        {
+            "base": "{6483F481-0C18-4171-8B59-A44F2F28EAE5}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AWSMetrics_MetricsAttribute"
+            }
+        },
+        {
+            "base": "{708A5B3C-E377-40CE-9572-BEB64C849D40}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "VertexHandle"
+            }
+        },
+        {
+            "base": "{C81CC1CA-6841-5F6A-B1C7-E544590B481F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<int, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{E8C6654F-0000-5496-8A61-9DAE9CA30493}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<AZ::s8, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MeshVertexTangentData"
+            }
+        },
+        {
+            "base": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MeshVertexBitangentData"
+            }
+        },
+        {
+            "base": "{A7E568EC-5873-5C8A-A43E-A7228B613A21}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputBufferDescriptor>"
+            }
+        },
+        {
+            "base": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "CapsuleShapeConfig"
+            }
+        },
+        {
+            "base": "{004ABD25-CF14-4EB3-BD41-022C247C07FA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "OBB"
+            }
+        },
+        {
+            "base": "{4AFDFD7F-384A-41DF-900C-9B25A4AA8D1E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PosterizeGradientConfig"
+            }
+        },
+        {
+            "base": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ClientAuthAWSCredentials"
+            }
+        },
+        {
+            "base": "{F6B9150B-CC89-48A2-AB89-D18740CC6FA2}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "FaceVertHandles"
+            }
+        },
+        {
+            "base": "{4BC6D515-214A-4DCE-8FCB-A6389B66A1B9}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Entity Transform"
+            }
+        },
+        {
+            "base": "{F681BA9D-245C-4630-B20E-05DD752FAD57}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "UiOffsets"
+            }
+        },
+        {
+            "base": "{EBEDA5EC-29D3-4F23-ABCC-C7C4EE48FA36}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DisplaySettingsState"
+            }
+        },
+        {
+            "base": "{344066EB-7C3D-4E92-B53D-3C9EBD546488}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "EditorMaterialComponentSlot"
+            }
+        },
+        {
+            "base": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Name"
+            }
+        },
+        {
+            "base": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AuthenticationTokens"
+            }
+        },
+        {
+            "base": "{1BDB5DA4-A4A8-452B-BE6D-6BD451D4E7CD}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ImageGradientConfig"
+            }
+        },
+        {
+            "base": "{DCFE9FBF-39BF-5B3C-AD28-D61ADBAF1711}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, MaterialPropertyIndexType>"
+            }
+        },
+        {
+            "base": "{8FB7C786-D8A7-41C4-A703-020020EB4A4F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShapeAreaFalloffGradientConfig"
+            }
+        },
+        {
+            "base": "{D24130B9-89C4-4EAA-9A5D-3469B05C5065}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "GraphModelSlotId"
+            }
+        },
+        {
+            "base": "{7894072A-9050-4F0F-901B-34B1A0D29417}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Color"
+            }
+        },
+        {
+            "base": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MaterialData"
+            }
+        },
+        {
+            "base": "{FF8B1DED-C1A8-4322-86D2-C8432E4B0526}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "RotationModifierConfig"
+            }
+        },
+        {
+            "base": "{902F6253-A8FA-4350-B9F1-C176F3E2D305}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DescriptorListConfig"
+            }
+        },
+        {
+            "base": "{34516BA4-2B13-4A84-A46B-01E1980CA778}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "GradientSurfaceDataConfig"
+            }
+        },
+        {
+            "base": "{8AF3B382-F187-4323-9014-B380638767E3}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Multiplayer::NetComponentId"
+            }
+        },
+        {
+            "base": "{EBB1C475-FA03-4111-8C84-985377434B9B}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Multiplayer::RpcIndex"
+            }
+        },
+        {
+            "base": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "UVCoords"
+            }
+        },
+        {
+            "base": "{28529C97-543C-5690-9FA4-9781271E6661}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputBufferUnboundedArrayDescriptor>"
+            }
+        },
+        {
+            "base": "{B94085B7-C0D4-466A-A791-188A4559EC8D}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "OutputDeviceTransformType"
+            }
+        },
+        {
+            "base": "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Render::ShadowmapSize"
+            }
+        },
+        {
+            "base": "{9E71534D-34B3-4723-B180-2552513DDA3D}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AWSScriptBehaviorLambda"
+            }
+        },
+        {
+            "base": "{8CD110EE-95FA-4B26-B10E-95079BE4CB11}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DistanceBetweenFilterConfig"
+            }
+        },
+        {
+            "base": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AABB"
+            }
+        },
+        {
+            "base": "{C845E5EC-5580-4E12-A9B2-9AE7E5B7826F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "EntityComponentIdPair"
+            }
+        },
+        {
+            "base": "{E6DA080B-7ED1-4135-A78C-A6A5E495A43E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "CollisionGroup"
+            }
+        },
+        {
+            "base": "{F01C8BDD-6F24-4344-8945-521A8750B30B}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PolygonPrism"
+            }
+        },
+        {
+            "base": "{67C8C6ED-F32A-443E-A777-1CAE48B22CD7}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceTag"
+            }
+        },
+        {
+            "base": "{48A94382-72BE-457B-BB43-0E6C245824D2}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SearchFilter"
+            }
+        },
+        {
+            "base": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ScriptTimePoint"
+            }
+        },
+        {
+            "base": "{05E4C08B-3A1B-4390-8144-3767D8E56A81}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Multiplayer::NetEntityId"
+            }
+        },
+        {
+            "base": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "UiAnchors"
+            }
+        },
+        {
+            "base": "{691E0F23-37E9-434F-A1D1-E8DE5B4A3405}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceSlopeGradientConfig"
+            }
+        },
+        {
+            "base": "{4E74B13E-6B4E-59D1-90E1-5E5C7EEE40D6}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<short, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "CollisionEvent"
+            }
+        },
+        {
+            "base": "{02644F52-9483-47A8-9028-37671695C34E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "LightConfig"
+            }
+        },
+        {
+            "base": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "EntityId"
+            }
+        },
+        {
+            "base": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Matrix3x4"
+            }
+        },
+        {
+            "base": "{17477B86-B163-4574-8FB2-4916BC218B3D}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MeshVertexColorData"
+            }
+        },
+        {
+            "base": "{A504D6DA-2825-4A0E-A65E-3FC76FC8AFAC}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AreaDebugConfig"
+            }
+        },
+        {
+            "base": "{794F7DE4-188C-4031-8B00-C2BA0C351A1E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "LevelSettingsConfig"
+            }
+        },
+        {
+            "base": "{B88C9D87-8609-4EAB-82D6-92DFEF006629}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShapeIntersectionFilterConfig"
+            }
+        },
+        {
+            "base": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Vector2"
+            }
+        },
+        {
+            "base": "{5B085DA7-CDC9-47C7-B2DB-BA5DD5AA2FB5}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceMaskFilterConfig"
+            }
+        },
+        {
+            "base": "{847DD984-9DBF-4789-8E25-E0334402E8AD}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Plane"
+            }
+        },
+        {
+            "base": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "String"
+            }
+        },
+        {
+            "base": "{63984856-F883-4F8C-9049-5A8F26477B76}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "InstanceSystemConfig"
+            }
+        },
+        {
+            "base": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "GradientSampler"
+            }
+        },
+        {
+            "base": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MeshVertexUVData"
+            }
+        },
+        {
+            "base": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceTagWeight"
+            }
+        },
+        {
+            "base": "{3CB05FC9-6E0F-435E-B420-F027B6716804}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceAltitudeGradientConfig"
+            }
+        },
+        {
+            "base": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ExposureControlConfig"
+            }
+        },
+        {
+            "base": "{27B1FEC2-8C8A-47D7-A034-6609FA092B34}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShaderVariantId"
+            }
+        },
+        {
+            "base": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Entity"
+            }
+        },
+        {
+            "base": "{6B17F9C6-DB72-52CA-80ED-EFDFDF2DF9ED}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, IndirectCommandDescriptor>"
+            }
+        },
+        {
+            "base": "{F27E64FB-A7FF-47F2-80DB-7E1371B014DD}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PythonBuilderWorker"
+            }
+        },
+        {
+            "base": "{41CA80B1-9E0D-41FB-A235-9638D2A905A5}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Render::DisplayMapperOperationType"
+            }
+        },
+        {
+            "base": "{4FA91FA7-CF3C-51BF-8159-6496DC7D526C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<AZ::s64, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AcesParameterOverrides"
+            }
+        },
+        {
+            "base": "{5F0CD700-EC2B-468D-B708-F6EEA7782C46}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceMaskDepthFilterConfig"
+            }
+        },
+        {
+            "base": "{569E74F6-1268-4199-9653-A3B603FC9F4F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AWSScriptBehaviorDynamoDB"
+            }
+        },
+        {
+            "base": "{7E304208-5FDF-4384-BC28-E7CDD2A15BEC}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DistributionFilterConfig"
+            }
+        },
+        {
+            "base": "{7A0851A3-2CBD-4A03-85D5-1C40221E7F61}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "TriggerEvent"
+            }
+        },
+        {
+            "base": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MaterialAssignment"
+            }
+        },
+        {
+            "base": "{110C4B14-11A8-4E9D-8638-5051013A56AC}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Number"
+            }
+        },
+        {
+            "base": "{E35DCF28-1AC3-49E8-A0AB-2F6115348F45}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PositionSplineQueryResult"
+            }
+        },
+        {
+            "base": "{98A6B0CE-FAD0-4108-B019-6B01931E649F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "VegetationSpawnerConfig"
+            }
+        },
+        {
+            "base": "{1811456D-0C3D-58C8-ACE8-FD47F4E80E25}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Transform"
+            }
+        },
+        {
+            "base": "{6CEBAF3A-2A5C-4508-A351-9613E32CF63F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceSlopeFilterConfig"
+            }
+        },
+        {
+            "base": "{DA5C6354-AA81-504B-88BF-8EF5811ABA61}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderVariantId>"
+            }
+        },
+        {
+            "base": "{24EC2919-F198-4871-8404-F6DE8A16275E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DiskShapeConfig"
+            }
+        },
+        {
+            "base": "{B1106C14-D22B-482F-B33E-B6E154A53798}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AWSMetrics_AttributesSubmissionList"
+            }
+        },
+        {
+            "base": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "BlendShapeData"
+            }
+        },
+        {
+            "base": "{07B9E2F7-5408-49E9-904D-CC1A9C33230E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RPI::ShaderOptionDescriptor"
+            }
+        },
+        {
+            "base": "{9274AD17-3212-4651-9F3B-7DCCB080E467}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SceneManifest"
+            }
+        },
+        {
+            "base": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SmoothStep"
+            }
+        },
+        {
+            "base": "{F034FBA2-AC2F-4E66-8152-14DFB90D6283}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "BoxShapeConfig"
+            }
+        },
+        {
+            "base": "{950009BC-8991-4749-9D5C-08C62AF34E7B}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "FaceHandle"
+            }
+        },
+        {
+            "base": "{B0216514-46B5-4A57-9D9D-8D9EC94C3702}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ConstantGradientConfig"
+            }
+        },
+        {
+            "base": "{F4460210-024D-4B3B-A10A-04B669C34230}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Multiplayer::PropertyIndex"
+            }
+        },
+        {
+            "base": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "LightingPreset"
+            }
+        },
+        {
+            "base": "{9E0F0801-348B-4FF9-AF9B-858D59404968}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "InputEventNotificationId"
+            }
+        },
+        {
+            "base": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MotionEvent"
+            }
+        },
+        {
+            "base": "{73103120-3DD3-4873-BAB3-9713FA2804FB}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Quaternion"
+            }
+        },
+        {
+            "base": "{23C40FD4-A55F-4BD3-BE5B-DC5423F217C2}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "EmptyInstanceSpawner"
+            }
+        },
+        {
+            "base": "{3E49974D-2EE0-4AF9-92B9-229A22B515C3}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ReferenceShapeConfig"
+            }
+        },
+        {
+            "base": "{E59D0A4C-BA3D-4288-B409-A00B7D5566AA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceMaskGradientConfig"
+            }
+        },
+        {
+            "base": "{14CCBE43-52DD-4F56-92A8-2BB011A0F7A2}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AreaSystemConfig"
+            }
+        },
+        {
+            "base": "{E6D8372B-8419-4287-B478-1353709A972F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AssetInfo"
+            }
+        },
+        {
+            "base": "{5C8C0729-5D41-5299-80F1-395F79B02D70}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputImageDescriptor>"
+            }
+        },
+        {
+            "base": "{F8679938-6D3F-47CC-A078-3D6EC0011366}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShaderVariantListSourceData"
+            }
+        },
+        {
+            "base": "{8F519317-4E83-4CF0-BEC9-C5F3F3198F20}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DitherGradientConfig"
+            }
+        },
+        {
+            "base": "{1106FD53-8B3A-4F97-8051-E34AD70199A5}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "GradientTransformConfig"
+            }
+        },
+        {
+            "base": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "BlastActorData"
+            }
+        },
+        {
+            "base": "{E9E2D5B3-66F1-494D-91D2-1E83D36A1AC1}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ThresholdGradientConfig"
+            }
+        },
+        {
+            "base": "{64C7F381-3313-46E8-B23B-D7AA9A915F35}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShaderCollectionItem"
+            }
+        },
+        {
+            "base": "{A746CFD0-7288-42F4-837D-1CDE2EAA6923}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PerlinGradientConfig"
+            }
+        },
+        {
+            "base": "{3F860893-1F57-5615-92CA-389B49687A9C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputConstantDescriptor>"
+            }
+        },
+        {
+            "base": "{61599E53-2B6A-40AC-B5B8-FC1C3F87275E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AreaConfig"
+            }
+        },
+        {
+            "base": "{BBA5CC1E-B4CA-4792-89F7-93711E98FBD1}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DynamicSliceInstanceSpawner"
+            }
+        },
+        {
+            "base": "{4A70FD56-10A8-460E-B822-3EF03F1EF7A0}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "String"
+            }
+        },
+        {
+            "base": "{B980EF45-C893-56C2-9B54-44B8B14F3436}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned char, DefaultNamespaceType>"
+            }
+        },
+        {
+            "base": "{BB3C3018-66B1-4BAD-AD27-F385BA015C69}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceAltitudeFilterConfig"
+            }
+        },
+        {
+            "base": "{7F4E956C-7463-4236-B320-C992D36A9C6E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AWSScriptBehaviorS3"
+            }
+        },
+        {
+            "base": "{957264F7-A169-4D47-B94C-659B078026D4}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MixedGradientLayer"
+            }
+        },
+        {
+            "base": "{35BF3504-CEC9-4406-A275-C633A17FBEFB}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Multiplayer::ClientInputId"
+            }
+        },
+        {
+            "base": "{5B169E40-E02B-5012-A085-BE7E6CA55CEA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputStaticSamplerDescriptor>"
+            }
+        },
+        {
+            "base": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "UiPadding"
+            }
+        },
+        {
+            "base": "{121A6DAB-26C1-46B7-83AE-BE750FDABC04}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ReferenceGradientConfig"
+            }
+        },
+        {
+            "base": "{DF17F6F3-48C6-4B4A-BBD9-37DA03162864}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Multiplayer::HostFrameId"
+            }
+        },
+        {
+            "base": "{B7A0A88D-4FDF-487F-A0E6-5BE04C82862A}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PositionModifierConfig"
+            }
+        },
+        {
+            "base": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ModelPreset"
+            }
+        },
+        {
+            "base": "{3366C279-32AE-48F6-839B-7700AE117A54}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MaterialComponentConfig"
+            }
+        },
+        {
+            "base": "{C10E7B12-BCB6-5872-810D-D597F123DB61}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, RPI::ShaderOptionValueNamespace>"
+            }
+        },
+        {
+            "base": "{744CCE6C-9F69-4E2F-B950-DAB8514F870B}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Physics::MaterialId"
+            }
+        },
+        {
+            "base": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ComponentId"
+            }
+        },
+        {
+            "base": "{02F01CCC-CA6F-462F-BDEC-9A7EAC730D33}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "LevelsGradientConfig"
+            }
+        },
+        {
+            "base": "{571E9CC8-AE35-5EBA-9A82-4012B60E7581}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, RPI::ShaderOptionIndexNamespace>"
+            }
+        },
+        {
+            "base": "{9E576D4F-A74A-4326-9135-C07284D0A3B9}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AtomToolsDocumentSystemSettings"
+            }
+        },
+        {
+            "base": "{D350732E-4727-41C8-95E0-FBAF5F2AC074}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AnimationData"
+            }
+        },
+        {
+            "base": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Boolean"
+            }
+        },
+        {
+            "base": "{A5A5E7F7-FC36-4BD1-8A93-21362574B9DA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Descriptor"
+            }
+        },
+        {
+            "base": "{742F8581-B03E-42C2-A332-2A47C588BD1F}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "TypeExposition"
+            }
+        },
+        {
+            "base": "{8F19B652-17A5-5646-9001-120CE0D5BF02}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputSamplerDescriptor>"
+            }
+        },
+        {
+            "base": "{1CD41DA9-91CA-4A57-A169-B42FC25FC4C3}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ScaleModifierConfig"
+            }
+        },
+        {
+            "base": "{1DD3D37D-0855-44F9-94F8-76F0128491A1}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "InstanceData"
+            }
+        },
+        {
+            "base": "{D7439508-ED10-4395-9D48-1FC3D7815361}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Contact"
+            }
+        },
+        {
+            "base": "{382116B1-5843-42A3-915B-A3BFC3CFAB78}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "DescriptorWeightSelectorConfig"
+            }
+        },
+        {
+            "base": "{D9C0BF74-6FE8-536F-9432-C964B82700BE}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "AZ::RHI::Handle<unsigned int, ShaderInputImageUnboundedArrayDescriptor>"
+            }
+        },
+        {
+            "base": "{02766CCF-BDA7-46B6-9BB1-58A90C1AD6AA}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "BlendShapeAnimationData"
+            }
+        },
+        {
+            "base": "{2AB6096D-C7C0-4C5E-AA84-7CA804A9680C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceTagDistance"
+            }
+        },
+        {
+            "base": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MaterialAssignmentId"
+            }
+        },
+        {
+            "base": "{515CF4CF-4992-4139-BDE5-42A887432B45}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "CryRange"
+            }
+        },
+        {
+            "base": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Tag"
+            }
+        },
+        {
+            "base": "{A435F06D-A148-4B5F-897D-39996495B6F4}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "RandomGradientConfig"
+            }
+        },
+        {
+            "base": "{B7463F12-C981-4A0B-ACEF-4B26D431D797}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Unit Testing"
+            }
+        },
+        {
+            "base": "{53254779-82F1-441E-9116-81E1FACFECF4}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "CylinderShapeConfig"
+            }
+        },
+        {
+            "base": "{A53D2A38-FFE1-4828-B91E-4D5A8B712BB2}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SmoothStepGradientConfig"
+            }
+        },
+        {
+            "base": "{D435DDB9-C513-4A2E-B0AC-9933E9360857}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SurfaceDataColliderConfig"
+            }
+        },
+        {
+            "base": "{74BEEDB5-81CF-409F-B375-0D93D81EF2E3}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "PrefabInstanceSpawner"
+            }
+        },
+        {
+            "base": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "ShaderSemantic"
+            }
+        },
+        {
+            "base": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "LmbrCentral::QuadShapeConfig"
+            }
+        },
+        {
+            "base": "{1A4C0EF2-BF98-4EB3-B134-A6EF7B31B62E}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "InvertGradientConfig"
+            }
+        },
+        {
+            "base": "{A935EBBC-D167-4C59-927C-5D98C6337B9C}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "RuntimeData"
+            }
+        },
+        {
+            "base": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "Vector3"
+            }
+        },
+        {
+            "base": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "MeshData"
+            }
+        },
+        {
+            "base": "{E6E7C0C5-07C9-44BB-A38C-930431948667}",
+            "context": "BehaviorType",
+            "variant": "",
+            "details": {
+                "name": "SliceInstantiationTicket"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names
index bf62ef5e72..fcd616b9ed 100644
--- a/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names
+++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names
@@ -1,7 +1,7 @@
 {
     "entries": [
         {
-            "key": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
+            "base": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -11,7 +11,7 @@
             },
             "methods": [
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -42,7 +42,7 @@
                     ]
                 },
                 {
-                    "key": "Fill",
+                    "base": "Fill",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -71,7 +71,7 @@
                     ]
                 },
                 {
-                    "key": "Replace",
+                    "base": "Replace",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -114,7 +114,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -145,7 +145,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -176,7 +176,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -213,7 +213,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -242,7 +242,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -279,7 +279,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}",
                     "entry": {
                         "name": "In",
@@ -312,7 +312,7 @@
             ]
         },
         {
-            "key": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
+            "base": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -322,7 +322,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -359,7 +359,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -402,7 +402,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -431,7 +431,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -462,7 +462,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -493,7 +493,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -524,7 +524,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -555,7 +555,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -592,7 +592,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -629,7 +629,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -660,7 +660,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -697,7 +697,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -728,7 +728,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -759,7 +759,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}",
                     "entry": {
                         "name": "In",
@@ -790,7 +790,7 @@
             ]
         },
         {
-            "key": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
+            "base": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -800,7 +800,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -837,7 +837,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -880,7 +880,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -909,7 +909,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -940,7 +940,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -971,7 +971,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1002,7 +1002,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1033,7 +1033,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1070,7 +1070,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1107,7 +1107,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1138,7 +1138,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1175,7 +1175,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1206,7 +1206,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1237,7 +1237,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}",
                     "entry": {
                         "name": "In",
@@ -1268,7 +1268,7 @@
             ]
         },
         {
-            "key": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
+            "base": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -1278,7 +1278,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1315,7 +1315,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1358,7 +1358,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1387,7 +1387,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1418,7 +1418,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1449,7 +1449,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1480,7 +1480,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1511,7 +1511,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1548,7 +1548,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1585,7 +1585,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1616,7 +1616,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1653,7 +1653,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1684,7 +1684,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1715,7 +1715,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}",
                     "entry": {
                         "name": "In",
@@ -1746,7 +1746,7 @@
             ]
         },
         {
-            "key": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
+            "base": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -1756,7 +1756,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1793,7 +1793,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1836,7 +1836,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1865,7 +1865,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1896,7 +1896,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1927,7 +1927,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1958,7 +1958,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -1989,7 +1989,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2026,7 +2026,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2063,7 +2063,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2094,7 +2094,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2131,7 +2131,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2162,7 +2162,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2193,7 +2193,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}",
                     "entry": {
                         "name": "In",
@@ -2224,7 +2224,7 @@
             ]
         },
         {
-            "key": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
+            "base": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -2234,7 +2234,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2271,7 +2271,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2314,7 +2314,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2343,7 +2343,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2374,7 +2374,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2405,7 +2405,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2436,7 +2436,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2467,7 +2467,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2504,7 +2504,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2541,7 +2541,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2572,7 +2572,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2609,7 +2609,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2640,7 +2640,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2671,7 +2671,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}",
                     "entry": {
                         "name": "In",
@@ -2702,7 +2702,7 @@
             ]
         },
         {
-            "key": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
+            "base": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -2712,7 +2712,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2749,7 +2749,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2792,7 +2792,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2821,7 +2821,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2852,7 +2852,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2883,7 +2883,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2914,7 +2914,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2945,7 +2945,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -2982,7 +2982,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -3019,7 +3019,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -3050,7 +3050,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -3087,7 +3087,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -3118,7 +3118,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -3149,7 +3149,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}",
                     "entry": {
                         "name": "In",
@@ -3180,7 +3180,7 @@
             ]
         },
         {
-            "key": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
+            "base": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -3190,7 +3190,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3227,7 +3227,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3270,7 +3270,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3299,7 +3299,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3330,7 +3330,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3361,7 +3361,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3392,7 +3392,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3423,7 +3423,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3460,7 +3460,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3497,7 +3497,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3528,7 +3528,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3565,7 +3565,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3596,7 +3596,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3627,7 +3627,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}",
                     "entry": {
                         "name": "In",
@@ -3658,7 +3658,7 @@
             ]
         },
         {
-            "key": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
+            "base": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -3668,7 +3668,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3706,7 +3706,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3750,7 +3750,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3779,7 +3779,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3810,7 +3810,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3841,7 +3841,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3872,7 +3872,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3903,7 +3903,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3941,7 +3941,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -3979,7 +3979,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -4010,7 +4010,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -4048,7 +4048,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -4079,7 +4079,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -4110,7 +4110,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}",
                     "entry": {
                         "name": "In",
@@ -4141,7 +4141,7 @@
             ]
         },
         {
-            "key": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
+            "base": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -4151,7 +4151,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4189,7 +4189,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4233,7 +4233,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4262,7 +4262,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4293,7 +4293,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4324,7 +4324,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4355,7 +4355,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4386,7 +4386,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4424,7 +4424,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4462,7 +4462,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4493,7 +4493,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4531,7 +4531,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4562,7 +4562,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4593,7 +4593,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}",
                     "entry": {
                         "name": "In",
@@ -4624,7 +4624,7 @@
             ]
         },
         {
-            "key": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
+            "base": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -4634,7 +4634,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4672,7 +4672,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4716,7 +4716,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4745,7 +4745,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4776,7 +4776,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4807,7 +4807,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4838,7 +4838,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4869,7 +4869,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4907,7 +4907,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4945,7 +4945,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -4976,7 +4976,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -5014,7 +5014,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -5045,7 +5045,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -5076,7 +5076,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}",
                     "entry": {
                         "name": "In",
@@ -5107,7 +5107,7 @@
             ]
         },
         {
-            "key": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
+            "base": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -5117,7 +5117,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5155,7 +5155,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5199,7 +5199,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5228,7 +5228,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5259,7 +5259,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5290,7 +5290,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5321,7 +5321,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5352,7 +5352,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5390,7 +5390,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5428,7 +5428,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5459,7 +5459,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5497,7 +5497,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5528,7 +5528,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5559,7 +5559,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}",
                     "entry": {
                         "name": "In",
@@ -5590,7 +5590,7 @@
             ]
         },
         {
-            "key": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
+            "base": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -5600,7 +5600,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5637,7 +5637,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5680,7 +5680,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5709,7 +5709,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5740,7 +5740,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5771,7 +5771,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5802,7 +5802,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5833,7 +5833,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5870,7 +5870,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5907,7 +5907,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5938,7 +5938,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -5975,7 +5975,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -6006,7 +6006,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -6037,7 +6037,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}",
                     "entry": {
                         "name": "In",
@@ -6068,7 +6068,7 @@
             ]
         },
         {
-            "key": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
+            "base": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -6076,7 +6076,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6107,7 +6107,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6138,7 +6138,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6169,7 +6169,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6200,7 +6200,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6231,7 +6231,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6262,7 +6262,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6293,7 +6293,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}",
                     "entry": {
                         "name": "In",
@@ -6326,7 +6326,7 @@
             ]
         },
         {
-            "key": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
+            "base": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -6336,7 +6336,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6373,7 +6373,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6416,7 +6416,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6445,7 +6445,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6476,7 +6476,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6507,7 +6507,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6538,7 +6538,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6569,7 +6569,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6606,7 +6606,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6643,7 +6643,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6674,7 +6674,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6711,7 +6711,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6742,7 +6742,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6773,7 +6773,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}",
                     "entry": {
                         "name": "In",
@@ -6804,7 +6804,7 @@
             ]
         },
         {
-            "key": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}",
+            "base": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -6812,7 +6812,7 @@
             },
             "methods": [
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}",
                     "entry": {
                         "name": "In",
@@ -6835,7 +6835,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}",
                     "entry": {
                         "name": "In",
@@ -6858,7 +6858,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}",
                     "entry": {
                         "name": "In",
@@ -6891,7 +6891,7 @@
             ]
         },
         {
-            "key": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}",
+            "base": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -6899,7 +6899,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}",
                     "entry": {
                         "name": "In",
@@ -6931,7 +6931,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}",
                     "entry": {
                         "name": "In",
@@ -6962,7 +6962,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}",
                     "entry": {
                         "name": "In",
@@ -6987,7 +6987,7 @@
             ]
         },
         {
-            "key": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
+            "base": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -6997,7 +6997,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7034,7 +7034,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7077,7 +7077,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7106,7 +7106,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7137,7 +7137,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7168,7 +7168,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7199,7 +7199,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7230,7 +7230,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7267,7 +7267,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7304,7 +7304,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7335,7 +7335,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7372,7 +7372,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7403,7 +7403,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7434,7 +7434,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}",
                     "entry": {
                         "name": "In",
@@ -7465,7 +7465,7 @@
             ]
         },
         {
-            "key": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
+            "base": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -7475,7 +7475,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7513,7 +7513,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7557,7 +7557,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7586,7 +7586,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7617,7 +7617,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7648,7 +7648,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7679,7 +7679,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7710,7 +7710,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7748,7 +7748,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7786,7 +7786,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7817,7 +7817,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7855,7 +7855,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7886,7 +7886,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7917,7 +7917,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}",
                     "entry": {
                         "name": "In",
@@ -7948,7 +7948,7 @@
             ]
         },
         {
-            "key": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
+            "base": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -7958,7 +7958,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -7995,7 +7995,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8038,7 +8038,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8067,7 +8067,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8098,7 +8098,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8129,7 +8129,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8160,7 +8160,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8191,7 +8191,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8228,7 +8228,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8265,7 +8265,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8296,7 +8296,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8333,7 +8333,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8364,7 +8364,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8395,7 +8395,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}",
                     "entry": {
                         "name": "In",
@@ -8426,7 +8426,7 @@
             ]
         },
         {
-            "key": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
+            "base": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -8436,7 +8436,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8473,7 +8473,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8516,7 +8516,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8545,7 +8545,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8576,7 +8576,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8607,7 +8607,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8638,7 +8638,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8669,7 +8669,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8706,7 +8706,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8743,7 +8743,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8774,7 +8774,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8811,7 +8811,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8842,7 +8842,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8873,7 +8873,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}",
                     "entry": {
                         "name": "In",
@@ -8904,7 +8904,7 @@
             ]
         },
         {
-            "key": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
+            "base": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -8914,7 +8914,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -8951,7 +8951,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -8994,7 +8994,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9023,7 +9023,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9054,7 +9054,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9085,7 +9085,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9116,7 +9116,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9147,7 +9147,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9184,7 +9184,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9221,7 +9221,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9252,7 +9252,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9289,7 +9289,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9320,7 +9320,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9351,7 +9351,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}",
                     "entry": {
                         "name": "In",
@@ -9382,7 +9382,7 @@
             ]
         },
         {
-            "key": "{E13859C4-1F24-5C44-A133-F17B4B050D7C}",
+            "base": "{E13859C4-1F24-5C44-A133-F17B4B050D7C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -9392,7 +9392,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{E13859C4-1F24-5C44-A133-F17B4B050D7C}",
                     "entry": {
                         "name": "In",
@@ -9426,7 +9426,7 @@
             ]
         },
         {
-            "key": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
+            "base": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -9436,7 +9436,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9473,7 +9473,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9516,7 +9516,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9545,7 +9545,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9576,7 +9576,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9607,7 +9607,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9638,7 +9638,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9669,7 +9669,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9706,7 +9706,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9743,7 +9743,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9774,7 +9774,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9811,7 +9811,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9842,7 +9842,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9873,7 +9873,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}",
                     "entry": {
                         "name": "In",
@@ -9904,7 +9904,7 @@
             ]
         },
         {
-            "key": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
+            "base": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -9914,7 +9914,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -9951,7 +9951,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -9995,7 +9995,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10024,7 +10024,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10055,7 +10055,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10086,7 +10086,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10117,7 +10117,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10148,7 +10148,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10185,7 +10185,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10222,7 +10222,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10253,7 +10253,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10291,7 +10291,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10322,7 +10322,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10353,7 +10353,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}",
                     "entry": {
                         "name": "In",
@@ -10384,7 +10384,7 @@
             ]
         },
         {
-            "key": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}",
+            "base": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -10392,7 +10392,7 @@
             }
         },
         {
-            "key": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
+            "base": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -10402,7 +10402,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10439,7 +10439,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10482,7 +10482,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10511,7 +10511,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10542,7 +10542,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10573,7 +10573,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10604,7 +10604,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10635,7 +10635,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10672,7 +10672,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10709,7 +10709,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10740,7 +10740,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10777,7 +10777,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10808,7 +10808,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10839,7 +10839,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}",
                     "entry": {
                         "name": "In",
@@ -10870,7 +10870,7 @@
             ]
         },
         {
-            "key": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
+            "base": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -10880,7 +10880,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -10911,7 +10911,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -10942,7 +10942,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -10979,7 +10979,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11008,7 +11008,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11045,7 +11045,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11076,7 +11076,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11099,7 +11099,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11130,7 +11130,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11167,7 +11167,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11198,7 +11198,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11227,7 +11227,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11256,7 +11256,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11293,7 +11293,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11330,7 +11330,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11353,7 +11353,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11384,7 +11384,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11421,7 +11421,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11458,7 +11458,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11489,7 +11489,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11520,7 +11520,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11555,7 +11555,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11586,7 +11586,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11629,7 +11629,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11658,7 +11658,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11687,7 +11687,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}",
                     "entry": {
                         "name": "In",
@@ -11720,7 +11720,7 @@
             ]
         },
         {
-            "key": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
+            "base": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -11730,7 +11730,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11761,7 +11761,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11792,7 +11792,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11829,7 +11829,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11858,7 +11858,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11895,7 +11895,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11926,7 +11926,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11949,7 +11949,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -11980,7 +11980,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12017,7 +12017,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12048,7 +12048,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12077,7 +12077,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12106,7 +12106,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12143,7 +12143,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12180,7 +12180,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12203,7 +12203,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12234,7 +12234,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12271,7 +12271,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12308,7 +12308,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12339,7 +12339,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12370,7 +12370,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12405,7 +12405,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12436,7 +12436,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12479,7 +12479,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12508,7 +12508,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12537,7 +12537,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}",
                     "entry": {
                         "name": "In",
@@ -12570,7 +12570,7 @@
             ]
         },
         {
-            "key": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
+            "base": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -12580,7 +12580,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12611,7 +12611,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12642,7 +12642,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12679,7 +12679,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12708,7 +12708,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12745,7 +12745,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12776,7 +12776,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12799,7 +12799,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12830,7 +12830,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12867,7 +12867,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12898,7 +12898,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12927,7 +12927,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12956,7 +12956,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -12993,7 +12993,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13030,7 +13030,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13053,7 +13053,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13084,7 +13084,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13121,7 +13121,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13158,7 +13158,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13189,7 +13189,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13220,7 +13220,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13255,7 +13255,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13286,7 +13286,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13329,7 +13329,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13358,7 +13358,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13387,7 +13387,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}",
                     "entry": {
                         "name": "In",
@@ -13420,7 +13420,7 @@
             ]
         },
         {
-            "key": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
+            "base": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -13430,7 +13430,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13467,7 +13467,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13510,7 +13510,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13539,7 +13539,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13570,7 +13570,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13601,7 +13601,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13632,7 +13632,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13663,7 +13663,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13700,7 +13700,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13737,7 +13737,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13768,7 +13768,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13805,7 +13805,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13836,7 +13836,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13867,7 +13867,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}",
                     "entry": {
                         "name": "In",
@@ -13898,7 +13898,7 @@
             ]
         },
         {
-            "key": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
+            "base": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -13908,7 +13908,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -13945,7 +13945,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -13989,7 +13989,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14018,7 +14018,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14049,7 +14049,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14080,7 +14080,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14111,7 +14111,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14142,7 +14142,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14179,7 +14179,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14216,7 +14216,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14247,7 +14247,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14285,7 +14285,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14316,7 +14316,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14347,7 +14347,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}",
                     "entry": {
                         "name": "In",
@@ -14378,7 +14378,7 @@
             ]
         },
         {
-            "key": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
+            "base": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -14388,7 +14388,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14419,7 +14419,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14451,7 +14451,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14488,7 +14488,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14517,7 +14517,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14555,7 +14555,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14587,7 +14587,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14610,7 +14610,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14641,7 +14641,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14679,7 +14679,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14710,7 +14710,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14739,7 +14739,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14769,7 +14769,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14807,7 +14807,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14845,7 +14845,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14868,7 +14868,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14899,7 +14899,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14936,7 +14936,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -14973,7 +14973,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15004,7 +15004,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15035,7 +15035,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15071,7 +15071,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15102,7 +15102,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15146,7 +15146,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15176,7 +15176,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15205,7 +15205,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}",
                     "entry": {
                         "name": "In",
@@ -15238,7 +15238,7 @@
             ]
         },
         {
-            "key": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
+            "base": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -15248,7 +15248,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15279,7 +15279,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15310,7 +15310,7 @@
                     ]
                 },
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15348,7 +15348,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15386,7 +15386,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15417,7 +15417,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15446,7 +15446,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15477,7 +15477,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15515,7 +15515,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15553,7 +15553,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15584,7 +15584,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15615,7 +15615,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15646,7 +15646,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}",
                     "entry": {
                         "name": "In",
@@ -15677,7 +15677,7 @@
             ]
         },
         {
-            "key": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
+            "base": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -15687,7 +15687,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15724,7 +15724,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15767,7 +15767,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15796,7 +15796,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15827,7 +15827,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15858,7 +15858,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15889,7 +15889,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15920,7 +15920,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15957,7 +15957,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -15994,7 +15994,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -16025,7 +16025,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -16062,7 +16062,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -16093,7 +16093,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -16124,7 +16124,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}",
                     "entry": {
                         "name": "In",
@@ -16155,7 +16155,7 @@
             ]
         },
         {
-            "key": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
+            "base": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -16165,7 +16165,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16196,7 +16196,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16227,7 +16227,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16264,7 +16264,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16293,7 +16293,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16330,7 +16330,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16361,7 +16361,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16384,7 +16384,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16415,7 +16415,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16452,7 +16452,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16483,7 +16483,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16512,7 +16512,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16541,7 +16541,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16578,7 +16578,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16615,7 +16615,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16638,7 +16638,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16669,7 +16669,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16706,7 +16706,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16743,7 +16743,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16774,7 +16774,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16805,7 +16805,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16840,7 +16840,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16871,7 +16871,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16914,7 +16914,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16943,7 +16943,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -16972,7 +16972,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}",
                     "entry": {
                         "name": "In",
@@ -17005,7 +17005,7 @@
             ]
         },
         {
-            "key": "{0521985E-FC3D-5123-922A-E4011E605660}",
+            "base": "{0521985E-FC3D-5123-922A-E4011E605660}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -17015,7 +17015,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17052,7 +17052,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17095,7 +17095,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17124,7 +17124,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17155,7 +17155,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17186,7 +17186,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17217,7 +17217,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17248,7 +17248,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17285,7 +17285,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17322,7 +17322,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17353,7 +17353,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17390,7 +17390,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17421,7 +17421,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17452,7 +17452,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{0521985E-FC3D-5123-922A-E4011E605660}",
                     "entry": {
                         "name": "In",
@@ -17483,7 +17483,7 @@
             ]
         },
         {
-            "key": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
+            "base": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -17493,7 +17493,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17530,7 +17530,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17573,7 +17573,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17602,7 +17602,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17633,7 +17633,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17664,7 +17664,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17695,7 +17695,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17726,7 +17726,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17763,7 +17763,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17800,7 +17800,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17831,7 +17831,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17868,7 +17868,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17899,7 +17899,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17930,7 +17930,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}",
                     "entry": {
                         "name": "In",
@@ -17961,7 +17961,7 @@
             ]
         },
         {
-            "key": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
+            "base": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -17971,7 +17971,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18008,7 +18008,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18051,7 +18051,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18080,7 +18080,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18111,7 +18111,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18142,7 +18142,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18173,7 +18173,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18204,7 +18204,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18241,7 +18241,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18278,7 +18278,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18309,7 +18309,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18346,7 +18346,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18377,7 +18377,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18408,7 +18408,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}",
                     "entry": {
                         "name": "In",
@@ -18439,7 +18439,7 @@
             ]
         },
         {
-            "key": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
+            "base": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -18447,7 +18447,7 @@
             },
             "methods": [
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
                     "entry": {
                         "name": "In",
@@ -18470,7 +18470,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
                     "entry": {
                         "name": "In",
@@ -18501,7 +18501,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
                     "entry": {
                         "name": "In",
@@ -18532,7 +18532,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}",
                     "entry": {
                         "name": "In",
@@ -18565,7 +18565,7 @@
             ]
         },
         {
-            "key": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
+            "base": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -18575,7 +18575,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18612,7 +18612,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18655,7 +18655,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18684,7 +18684,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18715,7 +18715,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18746,7 +18746,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18777,7 +18777,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18808,7 +18808,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18845,7 +18845,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18882,7 +18882,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18913,7 +18913,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18950,7 +18950,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -18981,7 +18981,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -19012,7 +19012,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}",
                     "entry": {
                         "name": "In",
@@ -19043,7 +19043,7 @@
             ]
         },
         {
-            "key": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
+            "base": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -19053,7 +19053,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19090,7 +19090,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19133,7 +19133,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19162,7 +19162,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19193,7 +19193,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19224,7 +19224,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19255,7 +19255,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19286,7 +19286,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19323,7 +19323,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19360,7 +19360,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19391,7 +19391,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19428,7 +19428,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19459,7 +19459,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19490,7 +19490,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}",
                     "entry": {
                         "name": "In",
@@ -19521,7 +19521,7 @@
             ]
         },
         {
-            "key": "{BEB6AE51-5283-5019-A320-294202035F80}",
+            "base": "{BEB6AE51-5283-5019-A320-294202035F80}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -19531,7 +19531,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19568,7 +19568,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19611,7 +19611,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19640,7 +19640,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19671,7 +19671,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19702,7 +19702,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19733,7 +19733,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19764,7 +19764,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19801,7 +19801,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19838,7 +19838,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19869,7 +19869,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19906,7 +19906,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19937,7 +19937,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19968,7 +19968,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{BEB6AE51-5283-5019-A320-294202035F80}",
                     "entry": {
                         "name": "In",
@@ -19999,7 +19999,7 @@
             ]
         },
         {
-            "key": "{2E879A16-9143-5862-A5B3-EDED931C60BC}",
+            "base": "{2E879A16-9143-5862-A5B3-EDED931C60BC}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -20009,7 +20009,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{2E879A16-9143-5862-A5B3-EDED931C60BC}",
                     "entry": {
                         "name": "In",
@@ -20043,7 +20043,7 @@
             ]
         },
         {
-            "key": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
+            "base": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -20051,7 +20051,7 @@
             },
             "methods": [
                 {
-                    "key": "One",
+                    "base": "One",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20074,7 +20074,7 @@
                     ]
                 },
                 {
-                    "key": "LinearToGamma",
+                    "base": "LinearToGamma",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20105,7 +20105,7 @@
                     ]
                 },
                 {
-                    "key": "FromVector3",
+                    "base": "FromVector3",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20136,7 +20136,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20173,7 +20173,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20204,7 +20204,7 @@
                     ]
                 },
                 {
-                    "key": "Dot3",
+                    "base": "Dot3",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20241,7 +20241,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20278,7 +20278,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20327,7 +20327,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20364,7 +20364,7 @@
                     ]
                 },
                 {
-                    "key": "FromVector3AndNumber",
+                    "base": "FromVector3AndNumber",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20401,7 +20401,7 @@
                     ]
                 },
                 {
-                    "key": "GammaToLinear",
+                    "base": "GammaToLinear",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20432,7 +20432,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20475,7 +20475,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20512,7 +20512,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByColor",
+                    "base": "MultiplyByColor",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20549,7 +20549,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20586,7 +20586,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}",
                     "entry": {
                         "name": "In",
@@ -20625,7 +20625,7 @@
             ]
         },
         {
-            "key": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
+            "base": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -20635,7 +20635,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20672,7 +20672,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20715,7 +20715,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20744,7 +20744,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20775,7 +20775,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20806,7 +20806,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20837,7 +20837,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20868,7 +20868,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20905,7 +20905,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20942,7 +20942,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -20973,7 +20973,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -21010,7 +21010,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -21041,7 +21041,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -21072,7 +21072,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
                     "entry": {
                         "name": "In",
@@ -21103,7 +21103,7 @@
             ]
         },
         {
-            "key": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
+            "base": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -21113,7 +21113,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21150,7 +21150,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21193,7 +21193,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21222,7 +21222,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21253,7 +21253,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21284,7 +21284,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21315,7 +21315,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21346,7 +21346,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21383,7 +21383,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21420,7 +21420,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21451,7 +21451,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21488,7 +21488,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21519,7 +21519,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21550,7 +21550,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}",
                     "entry": {
                         "name": "In",
@@ -21581,7 +21581,7 @@
             ]
         },
         {
-            "key": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
+            "base": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -21591,7 +21591,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21628,7 +21628,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21671,7 +21671,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21700,7 +21700,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21731,7 +21731,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21762,7 +21762,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21793,7 +21793,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21824,7 +21824,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21861,7 +21861,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21898,7 +21898,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21929,7 +21929,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21966,7 +21966,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -21997,7 +21997,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -22028,7 +22028,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}",
                     "entry": {
                         "name": "In",
@@ -22059,7 +22059,7 @@
             ]
         },
         {
-            "key": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
+            "base": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -22067,7 +22067,7 @@
             },
             "methods": [
                 {
-                    "key": "GetPosition",
+                    "base": "GetPosition",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22098,7 +22098,7 @@
                     ]
                 },
                 {
-                    "key": "GetAxisY",
+                    "base": "GetAxisY",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22129,7 +22129,7 @@
                     ]
                 },
                 {
-                    "key": "GetAxisX",
+                    "base": "GetAxisX",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22160,7 +22160,7 @@
                     ]
                 },
                 {
-                    "key": "FromAabb",
+                    "base": "FromAabb",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22191,7 +22191,7 @@
                     ]
                 },
                 {
-                    "key": "FromPositionRotationAndHalfLengths",
+                    "base": "FromPositionRotationAndHalfLengths",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22234,7 +22234,7 @@
                     ]
                 },
                 {
-                    "key": "GetAxisZ",
+                    "base": "GetAxisZ",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22265,7 +22265,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}",
                     "entry": {
                         "name": "In",
@@ -22298,7 +22298,7 @@
             ]
         },
         {
-            "key": "{781AD4B3-F61B-5C95-9447-F90AB07AB480}",
+            "base": "{781AD4B3-F61B-5C95-9447-F90AB07AB480}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -22308,7 +22308,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{781AD4B3-F61B-5C95-9447-F90AB07AB480}",
                     "entry": {
                         "name": "In",
@@ -22341,7 +22341,7 @@
             ]
         },
         {
-            "key": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}",
+            "base": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -22349,7 +22349,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}",
                     "entry": {
                         "name": "In",
@@ -22380,7 +22380,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}",
                     "entry": {
                         "name": "In",
@@ -22411,7 +22411,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}",
                     "entry": {
                         "name": "In",
@@ -22436,7 +22436,7 @@
             ]
         },
         {
-            "key": "{009022A1-16A5-50B0-958F-F69C729985A3}",
+            "base": "{009022A1-16A5-50B0-958F-F69C729985A3}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -22446,7 +22446,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22477,7 +22477,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22508,7 +22508,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22545,7 +22545,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22574,7 +22574,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22611,7 +22611,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22642,7 +22642,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22665,7 +22665,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22696,7 +22696,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22733,7 +22733,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22764,7 +22764,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22793,7 +22793,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22822,7 +22822,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22859,7 +22859,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22896,7 +22896,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22919,7 +22919,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22950,7 +22950,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -22987,7 +22987,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23024,7 +23024,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23055,7 +23055,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23086,7 +23086,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23121,7 +23121,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23152,7 +23152,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23195,7 +23195,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23224,7 +23224,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23253,7 +23253,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{009022A1-16A5-50B0-958F-F69C729985A3}",
                     "entry": {
                         "name": "In",
@@ -23286,7 +23286,7 @@
             ]
         },
         {
-            "key": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
+            "base": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -23296,7 +23296,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23333,7 +23333,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23376,7 +23376,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23405,7 +23405,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23436,7 +23436,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23467,7 +23467,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23498,7 +23498,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23529,7 +23529,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23566,7 +23566,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23603,7 +23603,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23634,7 +23634,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23671,7 +23671,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23702,7 +23702,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23733,7 +23733,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}",
                     "entry": {
                         "name": "In",
@@ -23764,7 +23764,7 @@
             ]
         },
         {
-            "key": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
+            "base": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -23774,7 +23774,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -23811,7 +23811,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -23854,7 +23854,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -23883,7 +23883,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -23914,7 +23914,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -23945,7 +23945,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -23976,7 +23976,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24007,7 +24007,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24044,7 +24044,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24081,7 +24081,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24112,7 +24112,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24149,7 +24149,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24180,7 +24180,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24211,7 +24211,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}",
                     "entry": {
                         "name": "In",
@@ -24242,7 +24242,7 @@
             ]
         },
         {
-            "key": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
+            "base": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -24252,7 +24252,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24283,7 +24283,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24314,7 +24314,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24351,7 +24351,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24380,7 +24380,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24417,7 +24417,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24448,7 +24448,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24471,7 +24471,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24502,7 +24502,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24539,7 +24539,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24570,7 +24570,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24599,7 +24599,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24628,7 +24628,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24665,7 +24665,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24702,7 +24702,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24725,7 +24725,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24756,7 +24756,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24793,7 +24793,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24830,7 +24830,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24861,7 +24861,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24892,7 +24892,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24927,7 +24927,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -24958,7 +24958,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -25001,7 +25001,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -25030,7 +25030,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -25059,7 +25059,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}",
                     "entry": {
                         "name": "In",
@@ -25092,7 +25092,7 @@
             ]
         },
         {
-            "key": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
+            "base": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -25102,7 +25102,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25133,7 +25133,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25164,7 +25164,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25201,7 +25201,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25230,7 +25230,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25267,7 +25267,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25298,7 +25298,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25321,7 +25321,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25352,7 +25352,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25389,7 +25389,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25420,7 +25420,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25449,7 +25449,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25478,7 +25478,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25515,7 +25515,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25552,7 +25552,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25575,7 +25575,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25606,7 +25606,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25643,7 +25643,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25680,7 +25680,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25711,7 +25711,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25742,7 +25742,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25777,7 +25777,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25808,7 +25808,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25851,7 +25851,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25880,7 +25880,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25909,7 +25909,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}",
                     "entry": {
                         "name": "In",
@@ -25942,7 +25942,7 @@
             ]
         },
         {
-            "key": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
+            "base": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -25952,7 +25952,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -25989,7 +25989,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26032,7 +26032,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26061,7 +26061,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26092,7 +26092,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26123,7 +26123,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26154,7 +26154,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26185,7 +26185,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26222,7 +26222,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26259,7 +26259,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26290,7 +26290,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26327,7 +26327,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26358,7 +26358,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26389,7 +26389,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}",
                     "entry": {
                         "name": "In",
@@ -26420,7 +26420,7 @@
             ]
         },
         {
-            "key": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
+            "base": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -26430,7 +26430,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26461,7 +26461,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26492,7 +26492,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26529,7 +26529,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26558,7 +26558,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26595,7 +26595,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26626,7 +26626,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26649,7 +26649,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26680,7 +26680,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26717,7 +26717,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26748,7 +26748,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26777,7 +26777,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26806,7 +26806,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26843,7 +26843,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26880,7 +26880,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26903,7 +26903,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26934,7 +26934,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -26971,7 +26971,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27008,7 +27008,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27039,7 +27039,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27070,7 +27070,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27105,7 +27105,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27136,7 +27136,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27179,7 +27179,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27208,7 +27208,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27237,7 +27237,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}",
                     "entry": {
                         "name": "In",
@@ -27270,7 +27270,7 @@
             ]
         },
         {
-            "key": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
+            "base": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -27280,7 +27280,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27311,7 +27311,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27342,7 +27342,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27379,7 +27379,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27408,7 +27408,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27445,7 +27445,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27476,7 +27476,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27499,7 +27499,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27530,7 +27530,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27567,7 +27567,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27598,7 +27598,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27627,7 +27627,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27656,7 +27656,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27693,7 +27693,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27730,7 +27730,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27753,7 +27753,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27784,7 +27784,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27821,7 +27821,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27858,7 +27858,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27889,7 +27889,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27920,7 +27920,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27955,7 +27955,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -27986,7 +27986,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -28029,7 +28029,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -28058,7 +28058,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -28087,7 +28087,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}",
                     "entry": {
                         "name": "In",
@@ -28120,7 +28120,7 @@
             ]
         },
         {
-            "key": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}",
+            "base": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -28128,7 +28128,7 @@
             },
             "methods": [
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}",
                     "entry": {
                         "name": "In",
@@ -28159,7 +28159,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}",
                     "entry": {
                         "name": "In",
@@ -28182,7 +28182,7 @@
                     ]
                 },
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}",
                     "entry": {
                         "name": "In",
@@ -28213,7 +28213,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}",
                     "entry": {
                         "name": "In",
@@ -28246,7 +28246,7 @@
             ]
         },
         {
-            "key": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
+            "base": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -28256,7 +28256,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28294,7 +28294,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28338,7 +28338,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28367,7 +28367,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28398,7 +28398,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28429,7 +28429,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28460,7 +28460,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28491,7 +28491,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28529,7 +28529,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28567,7 +28567,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28598,7 +28598,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28636,7 +28636,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28667,7 +28667,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28698,7 +28698,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}",
                     "entry": {
                         "name": "In",
@@ -28729,7 +28729,7 @@
             ]
         },
         {
-            "key": "{36AD4D04-5A5D-52DC-A864-7027D563EFA2}",
+            "base": "{36AD4D04-5A5D-52DC-A864-7027D563EFA2}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -28737,7 +28737,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{36AD4D04-5A5D-52DC-A864-7027D563EFA2}",
                     "entry": {
                         "name": "In",
@@ -28770,7 +28770,7 @@
             ]
         },
         {
-            "key": "{D1FEE25B-F252-5625-863C-1312E1F822A0}",
+            "base": "{D1FEE25B-F252-5625-863C-1312E1F822A0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -28778,7 +28778,7 @@
             },
             "methods": [
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}",
                     "entry": {
                         "name": "In",
@@ -28801,7 +28801,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}",
                     "entry": {
                         "name": "In",
@@ -28832,7 +28832,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}",
                     "entry": {
                         "name": "In",
@@ -28863,7 +28863,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}",
                     "entry": {
                         "name": "In",
@@ -28896,7 +28896,7 @@
             ]
         },
         {
-            "key": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
+            "base": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -28906,7 +28906,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -28937,7 +28937,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -28968,7 +28968,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29005,7 +29005,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29034,7 +29034,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29071,7 +29071,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29102,7 +29102,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29125,7 +29125,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29156,7 +29156,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29193,7 +29193,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29224,7 +29224,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29253,7 +29253,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29282,7 +29282,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29319,7 +29319,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29356,7 +29356,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29379,7 +29379,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29410,7 +29410,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29447,7 +29447,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29484,7 +29484,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29515,7 +29515,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29546,7 +29546,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29581,7 +29581,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29612,7 +29612,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29655,7 +29655,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29684,7 +29684,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29713,7 +29713,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}",
                     "entry": {
                         "name": "In",
@@ -29746,7 +29746,7 @@
             ]
         },
         {
-            "key": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
+            "base": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -29756,7 +29756,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29793,7 +29793,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29836,7 +29836,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29865,7 +29865,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29896,7 +29896,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29927,7 +29927,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29958,7 +29958,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -29989,7 +29989,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30026,7 +30026,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30063,7 +30063,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30094,7 +30094,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30131,7 +30131,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30162,7 +30162,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30193,7 +30193,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}",
                     "entry": {
                         "name": "In",
@@ -30224,7 +30224,7 @@
             ]
         },
         {
-            "key": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
+            "base": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -30234,7 +30234,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30265,7 +30265,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30296,7 +30296,7 @@
                     ]
                 },
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30333,7 +30333,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30370,7 +30370,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30401,7 +30401,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30430,7 +30430,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30461,7 +30461,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30498,7 +30498,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30535,7 +30535,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30566,7 +30566,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30597,7 +30597,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30628,7 +30628,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}",
                     "entry": {
                         "name": "In",
@@ -30659,7 +30659,7 @@
             ]
         },
         {
-            "key": "{C0311D23-97F1-556C-B6A4-ECD726543686}",
+            "base": "{C0311D23-97F1-556C-B6A4-ECD726543686}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -30669,7 +30669,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{C0311D23-97F1-556C-B6A4-ECD726543686}",
                     "entry": {
                         "name": "In",
@@ -30702,7 +30702,7 @@
             ]
         },
         {
-            "key": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
+            "base": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -30712,7 +30712,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30749,7 +30749,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30792,7 +30792,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30821,7 +30821,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30852,7 +30852,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30883,7 +30883,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30914,7 +30914,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30945,7 +30945,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -30982,7 +30982,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -31019,7 +31019,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -31050,7 +31050,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -31087,7 +31087,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -31118,7 +31118,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -31149,7 +31149,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}",
                     "entry": {
                         "name": "In",
@@ -31180,7 +31180,7 @@
             ]
         },
         {
-            "key": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
+            "base": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -31190,7 +31190,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31227,7 +31227,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31270,7 +31270,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31299,7 +31299,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31330,7 +31330,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31361,7 +31361,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31392,7 +31392,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31423,7 +31423,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31460,7 +31460,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31497,7 +31497,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31528,7 +31528,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31565,7 +31565,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31596,7 +31596,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31627,7 +31627,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}",
                     "entry": {
                         "name": "In",
@@ -31658,7 +31658,7 @@
             ]
         },
         {
-            "key": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
+            "base": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -31666,7 +31666,7 @@
             },
             "methods": [
                 {
-                    "key": "remove_prefix",
+                    "base": "remove_prefix",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31695,7 +31695,7 @@
                     ]
                 },
                 {
-                    "key": "substr",
+                    "base": "substr",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31738,7 +31738,7 @@
                     ]
                 },
                 {
-                    "key": "find",
+                    "base": "find",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31781,7 +31781,7 @@
                     ]
                 },
                 {
-                    "key": "length",
+                    "base": "length",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31812,7 +31812,7 @@
                     ]
                 },
                 {
-                    "key": "data",
+                    "base": "data",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31843,7 +31843,7 @@
                     ]
                 },
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31874,7 +31874,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31905,7 +31905,7 @@
                     ]
                 },
                 {
-                    "key": "remove_suffix",
+                    "base": "remove_suffix",
                     "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}",
                     "entry": {
                         "name": "In",
@@ -31936,7 +31936,7 @@
             ]
         },
         {
-            "key": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
+            "base": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -31946,7 +31946,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -31983,7 +31983,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32026,7 +32026,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32055,7 +32055,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32086,7 +32086,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32117,7 +32117,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32148,7 +32148,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32179,7 +32179,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32216,7 +32216,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32253,7 +32253,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32284,7 +32284,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32321,7 +32321,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32352,7 +32352,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32383,7 +32383,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}",
                     "entry": {
                         "name": "In",
@@ -32414,7 +32414,7 @@
             ]
         },
         {
-            "key": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
+            "base": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -32422,7 +32422,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32453,7 +32453,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32484,7 +32484,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32515,7 +32515,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32546,7 +32546,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32577,7 +32577,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32608,7 +32608,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32639,7 +32639,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}",
                     "entry": {
                         "name": "In",
@@ -32672,7 +32672,7 @@
             ]
         },
         {
-            "key": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
+            "base": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -32682,7 +32682,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32719,7 +32719,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32762,7 +32762,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32791,7 +32791,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32822,7 +32822,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32853,7 +32853,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32884,7 +32884,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32915,7 +32915,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32952,7 +32952,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -32989,7 +32989,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -33020,7 +33020,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -33057,7 +33057,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -33088,7 +33088,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -33119,7 +33119,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}",
                     "entry": {
                         "name": "In",
@@ -33150,7 +33150,7 @@
             ]
         },
         {
-            "key": "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}",
+            "base": "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -33158,7 +33158,7 @@
             },
             "methods": [
                 {
-                    "key": "FromString",
+                    "base": "FromString",
                     "context": "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}",
                     "entry": {
                         "name": "In",
@@ -33191,7 +33191,7 @@
             ]
         },
         {
-            "key": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
+            "base": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -33199,7 +33199,7 @@
             },
             "methods": [
                 {
-                    "key": "SetW",
+                    "base": "SetW",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33236,7 +33236,7 @@
                     ]
                 },
                 {
-                    "key": "SetX",
+                    "base": "SetX",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33273,7 +33273,7 @@
                     ]
                 },
                 {
-                    "key": "IsNormalized",
+                    "base": "IsNormalized",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33310,7 +33310,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33341,7 +33341,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33378,7 +33378,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33409,7 +33409,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33446,7 +33446,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33495,7 +33495,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33526,7 +33526,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33557,7 +33557,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33594,7 +33594,7 @@
                     ]
                 },
                 {
-                    "key": "DirectionTo",
+                    "base": "DirectionTo",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33637,7 +33637,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByVector",
+                    "base": "DivideByVector",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33674,7 +33674,7 @@
                     ]
                 },
                 {
-                    "key": "LengthReciprocal",
+                    "base": "LengthReciprocal",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33705,7 +33705,7 @@
                     ]
                 },
                 {
-                    "key": "SetZ",
+                    "base": "SetZ",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33742,7 +33742,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33773,7 +33773,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33810,7 +33810,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33853,7 +33853,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33890,7 +33890,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33927,7 +33927,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33964,7 +33964,7 @@
                     ]
                 },
                 {
-                    "key": "Reciprocal",
+                    "base": "Reciprocal",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -33995,7 +33995,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -34032,7 +34032,7 @@
                     ]
                 },
                 {
-                    "key": "Absolute",
+                    "base": "Absolute",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -34063,7 +34063,7 @@
                     ]
                 },
                 {
-                    "key": "SetY",
+                    "base": "SetY",
                     "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}",
                     "entry": {
                         "name": "In",
@@ -34102,7 +34102,7 @@
             ]
         },
         {
-            "key": "{36669095-4036-5479-B116-41A32E4E16EA}",
+            "base": "{36669095-4036-5479-B116-41A32E4E16EA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -34110,7 +34110,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{36669095-4036-5479-B116-41A32E4E16EA}",
                     "entry": {
                         "name": "In",
@@ -34141,7 +34141,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{36669095-4036-5479-B116-41A32E4E16EA}",
                     "entry": {
                         "name": "In",
@@ -34172,7 +34172,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{36669095-4036-5479-B116-41A32E4E16EA}",
                     "entry": {
                         "name": "In",
@@ -34197,7 +34197,7 @@
             ]
         },
         {
-            "key": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
+            "base": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -34207,7 +34207,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34244,7 +34244,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34287,7 +34287,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34316,7 +34316,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34347,7 +34347,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34378,7 +34378,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34409,7 +34409,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34440,7 +34440,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34477,7 +34477,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34514,7 +34514,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34545,7 +34545,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34582,7 +34582,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34613,7 +34613,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34644,7 +34644,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}",
                     "entry": {
                         "name": "In",
@@ -34675,7 +34675,7 @@
             ]
         },
         {
-            "key": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
+            "base": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -34685,7 +34685,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34716,7 +34716,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34747,7 +34747,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34784,7 +34784,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34813,7 +34813,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34850,7 +34850,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34881,7 +34881,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34904,7 +34904,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34935,7 +34935,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -34972,7 +34972,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35003,7 +35003,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35032,7 +35032,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35061,7 +35061,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35098,7 +35098,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35135,7 +35135,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35158,7 +35158,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35189,7 +35189,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35226,7 +35226,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35263,7 +35263,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35294,7 +35294,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35325,7 +35325,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35360,7 +35360,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35391,7 +35391,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35434,7 +35434,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35463,7 +35463,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35492,7 +35492,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}",
                     "entry": {
                         "name": "In",
@@ -35525,7 +35525,7 @@
             ]
         },
         {
-            "key": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
+            "base": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -35535,7 +35535,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35566,7 +35566,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35597,7 +35597,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35634,7 +35634,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35663,7 +35663,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35700,7 +35700,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35731,7 +35731,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35754,7 +35754,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35785,7 +35785,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35822,7 +35822,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35853,7 +35853,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35882,7 +35882,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35911,7 +35911,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35948,7 +35948,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -35985,7 +35985,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36008,7 +36008,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36039,7 +36039,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36076,7 +36076,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36113,7 +36113,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36144,7 +36144,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36175,7 +36175,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36210,7 +36210,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36241,7 +36241,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36284,7 +36284,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36313,7 +36313,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36342,7 +36342,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}",
                     "entry": {
                         "name": "In",
@@ -36375,7 +36375,7 @@
             ]
         },
         {
-            "key": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
+            "base": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -36383,7 +36383,7 @@
             },
             "methods": [
                 {
-                    "key": "GetRow",
+                    "base": "GetRow",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36420,7 +36420,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationXDegrees",
+                    "base": "FromRotationXDegrees",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36451,7 +36451,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationZDegrees",
+                    "base": "FromRotationZDegrees",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36482,7 +36482,7 @@
                     ]
                 },
                 {
-                    "key": "FromRows",
+                    "base": "FromRows",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36531,7 +36531,7 @@
                     ]
                 },
                 {
-                    "key": "ToScale",
+                    "base": "ToScale",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36562,7 +36562,7 @@
                     ]
                 },
                 {
-                    "key": "FromQuaternion",
+                    "base": "FromQuaternion",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36593,7 +36593,7 @@
                     ]
                 },
                 {
-                    "key": "FromScale",
+                    "base": "FromScale",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36624,7 +36624,7 @@
                     ]
                 },
                 {
-                    "key": "FromTransform",
+                    "base": "FromTransform",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36655,7 +36655,7 @@
                     ]
                 },
                 {
-                    "key": "GetTranslation",
+                    "base": "GetTranslation",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36686,7 +36686,7 @@
                     ]
                 },
                 {
-                    "key": "FromQuaternionAndTranslation",
+                    "base": "FromQuaternionAndTranslation",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36723,7 +36723,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumn",
+                    "base": "GetColumn",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36760,7 +36760,7 @@
                     ]
                 },
                 {
-                    "key": "GetDiagonal",
+                    "base": "GetDiagonal",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36791,7 +36791,7 @@
                     ]
                 },
                 {
-                    "key": "Invert",
+                    "base": "Invert",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36822,7 +36822,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36865,7 +36865,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3",
+                    "base": "FromMatrix3x3",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36896,7 +36896,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumns",
+                    "base": "GetColumns",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36927,7 +36927,7 @@
                     ]
                 },
                 {
-                    "key": "GetRows",
+                    "base": "GetRows",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36958,7 +36958,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByMatrix",
+                    "base": "MultiplyByMatrix",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -36995,7 +36995,7 @@
                     ]
                 },
                 {
-                    "key": "FromDiagonal",
+                    "base": "FromDiagonal",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37026,7 +37026,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationYDegrees",
+                    "base": "FromRotationYDegrees",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37057,7 +37057,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37100,7 +37100,7 @@
                     ]
                 },
                 {
-                    "key": "Transpose",
+                    "base": "Transpose",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37131,7 +37131,7 @@
                     ]
                 },
                 {
-                    "key": "FromColumns",
+                    "base": "FromColumns",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37180,7 +37180,7 @@
                     ]
                 },
                 {
-                    "key": "FromTranslation",
+                    "base": "FromTranslation",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37211,7 +37211,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37242,7 +37242,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37279,7 +37279,7 @@
                     ]
                 },
                 {
-                    "key": "Zero",
+                    "base": "Zero",
                     "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}",
                     "entry": {
                         "name": "In",
@@ -37304,7 +37304,7 @@
             ]
         },
         {
-            "key": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
+            "base": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -37314,7 +37314,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37351,7 +37351,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37394,7 +37394,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37423,7 +37423,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37454,7 +37454,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37485,7 +37485,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37516,7 +37516,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37547,7 +37547,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37584,7 +37584,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37621,7 +37621,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37652,7 +37652,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37689,7 +37689,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37720,7 +37720,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37751,7 +37751,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}",
                     "entry": {
                         "name": "In",
@@ -37782,7 +37782,7 @@
             ]
         },
         {
-            "key": "{097C0043-AC31-5230-B07E-330022B002DB}",
+            "base": "{097C0043-AC31-5230-B07E-330022B002DB}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -37792,7 +37792,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -37829,7 +37829,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -37872,7 +37872,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -37901,7 +37901,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -37932,7 +37932,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -37963,7 +37963,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -37994,7 +37994,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38025,7 +38025,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38062,7 +38062,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38099,7 +38099,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38130,7 +38130,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38167,7 +38167,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38198,7 +38198,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38229,7 +38229,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{097C0043-AC31-5230-B07E-330022B002DB}",
                     "entry": {
                         "name": "In",
@@ -38260,7 +38260,7 @@
             ]
         },
         {
-            "key": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
+            "base": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -38270,7 +38270,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38301,7 +38301,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38332,7 +38332,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38369,7 +38369,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38398,7 +38398,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38435,7 +38435,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38466,7 +38466,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38489,7 +38489,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38520,7 +38520,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38557,7 +38557,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38588,7 +38588,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38617,7 +38617,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38646,7 +38646,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38683,7 +38683,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38720,7 +38720,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38743,7 +38743,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38774,7 +38774,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38811,7 +38811,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38848,7 +38848,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38879,7 +38879,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38910,7 +38910,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38945,7 +38945,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -38976,7 +38976,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -39019,7 +39019,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -39048,7 +39048,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -39077,7 +39077,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}",
                     "entry": {
                         "name": "In",
@@ -39110,7 +39110,7 @@
             ]
         },
         {
-            "key": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
+            "base": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -39118,7 +39118,7 @@
             },
             "methods": [
                 {
-                    "key": "RandomPointOnSphere",
+                    "base": "RandomPointOnSphere",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39149,7 +39149,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInCircle",
+                    "base": "RandomPointInCircle",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39180,7 +39180,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInSquare",
+                    "base": "RandomPointInSquare",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39211,7 +39211,7 @@
                     ]
                 },
                 {
-                    "key": "RandomUnitVector2",
+                    "base": "RandomUnitVector2",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39234,7 +39234,7 @@
                     ]
                 },
                 {
-                    "key": "RandomVector2",
+                    "base": "RandomVector2",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39271,7 +39271,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInCylinder",
+                    "base": "RandomPointInCylinder",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39308,7 +39308,7 @@
                     ]
                 },
                 {
-                    "key": "RandomQuaternion",
+                    "base": "RandomQuaternion",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39345,7 +39345,7 @@
                     ]
                 },
                 {
-                    "key": "RandomVector4",
+                    "base": "RandomVector4",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39382,7 +39382,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInBox",
+                    "base": "RandomPointInBox",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39413,7 +39413,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointOnCircle",
+                    "base": "RandomPointOnCircle",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39444,7 +39444,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInEllipsoid",
+                    "base": "RandomPointInEllipsoid",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39475,7 +39475,7 @@
                     ]
                 },
                 {
-                    "key": "RandomInteger",
+                    "base": "RandomInteger",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39512,7 +39512,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInWedge",
+                    "base": "RandomPointInWedge",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39573,7 +39573,7 @@
                     ]
                 },
                 {
-                    "key": "RandomGrayscale",
+                    "base": "RandomGrayscale",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39610,7 +39610,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInCone",
+                    "base": "RandomPointInCone",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39647,7 +39647,7 @@
                     ]
                 },
                 {
-                    "key": "RandomColor",
+                    "base": "RandomColor",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39684,7 +39684,7 @@
                     ]
                 },
                 {
-                    "key": "RandomNumber",
+                    "base": "RandomNumber",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39721,7 +39721,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInSphere",
+                    "base": "RandomPointInSphere",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39752,7 +39752,7 @@
                     ]
                 },
                 {
-                    "key": "RandomUnitVector3",
+                    "base": "RandomUnitVector3",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39775,7 +39775,7 @@
                     ]
                 },
                 {
-                    "key": "RandomVector3",
+                    "base": "RandomVector3",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39812,7 +39812,7 @@
                     ]
                 },
                 {
-                    "key": "RandomPointInArc",
+                    "base": "RandomPointInArc",
                     "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}",
                     "entry": {
                         "name": "In",
@@ -39869,7 +39869,7 @@
             ]
         },
         {
-            "key": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
+            "base": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -39877,7 +39877,7 @@
             },
             "methods": [
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
                     "entry": {
                         "name": "In",
@@ -39900,7 +39900,7 @@
                     ]
                 },
                 {
-                    "key": "Get3",
+                    "base": "Get3",
                     "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
                     "entry": {
                         "name": "In",
@@ -39931,7 +39931,7 @@
                     ]
                 },
                 {
-                    "key": "Get2",
+                    "base": "Get2",
                     "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
                     "entry": {
                         "name": "In",
@@ -39962,7 +39962,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
                     "entry": {
                         "name": "In",
@@ -39993,7 +39993,7 @@
                     ]
                 },
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}",
                     "entry": {
                         "name": "In",
@@ -40026,7 +40026,7 @@
             ]
         },
         {
-            "key": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
+            "base": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -40036,7 +40036,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40073,7 +40073,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40116,7 +40116,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40145,7 +40145,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40176,7 +40176,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40207,7 +40207,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40238,7 +40238,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40269,7 +40269,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40306,7 +40306,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40343,7 +40343,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40374,7 +40374,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40411,7 +40411,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40442,7 +40442,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40473,7 +40473,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}",
                     "entry": {
                         "name": "In",
@@ -40504,7 +40504,7 @@
             ]
         },
         {
-            "key": "{E51F56F8-D4E9-5C9F-AE6F-3F9C5D28F4C6}",
+            "base": "{E51F56F8-D4E9-5C9F-AE6F-3F9C5D28F4C6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -40514,7 +40514,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{E51F56F8-D4E9-5C9F-AE6F-3F9C5D28F4C6}",
                     "entry": {
                         "name": "In",
@@ -40547,7 +40547,7 @@
             ]
         },
         {
-            "key": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}",
+            "base": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -40555,7 +40555,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}",
                     "entry": {
                         "name": "In",
@@ -40586,7 +40586,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}",
                     "entry": {
                         "name": "In",
@@ -40617,7 +40617,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}",
                     "entry": {
                         "name": "In",
@@ -40642,7 +40642,7 @@
             ]
         },
         {
-            "key": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
+            "base": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -40652,7 +40652,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40690,7 +40690,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40734,7 +40734,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40763,7 +40763,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40794,7 +40794,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40825,7 +40825,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40856,7 +40856,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40887,7 +40887,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40925,7 +40925,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40963,7 +40963,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -40994,7 +40994,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -41032,7 +41032,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -41063,7 +41063,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -41094,7 +41094,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}",
                     "entry": {
                         "name": "In",
@@ -41125,7 +41125,7 @@
             ]
         },
         {
-            "key": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
+            "base": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -41135,7 +41135,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41172,7 +41172,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41215,7 +41215,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41244,7 +41244,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41275,7 +41275,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41306,7 +41306,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41337,7 +41337,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41368,7 +41368,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41405,7 +41405,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41442,7 +41442,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41473,7 +41473,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41510,7 +41510,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41541,7 +41541,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41572,7 +41572,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}",
                     "entry": {
                         "name": "In",
@@ -41603,7 +41603,7 @@
             ]
         },
         {
-            "key": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
+            "base": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -41611,7 +41611,7 @@
             },
             "methods": [
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
                     "entry": {
                         "name": "In",
@@ -41642,7 +41642,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
                     "entry": {
                         "name": "In",
@@ -41673,7 +41673,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
                     "entry": {
                         "name": "In",
@@ -41704,7 +41704,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
                     "entry": {
                         "name": "In",
@@ -41735,7 +41735,7 @@
                     ]
                 },
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}",
                     "entry": {
                         "name": "In",
@@ -41768,7 +41768,7 @@
             ]
         },
         {
-            "key": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
+            "base": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -41778,7 +41778,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -41816,7 +41816,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -41861,7 +41861,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -41890,7 +41890,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -41921,7 +41921,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -41952,7 +41952,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -41983,7 +41983,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42014,7 +42014,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42052,7 +42052,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42090,7 +42090,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42121,7 +42121,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42160,7 +42160,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42191,7 +42191,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42222,7 +42222,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}",
                     "entry": {
                         "name": "In",
@@ -42253,7 +42253,7 @@
             ]
         },
         {
-            "key": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
+            "base": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -42263,7 +42263,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42300,7 +42300,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42343,7 +42343,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42372,7 +42372,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42403,7 +42403,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42434,7 +42434,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42465,7 +42465,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42496,7 +42496,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42533,7 +42533,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42570,7 +42570,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42601,7 +42601,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42638,7 +42638,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42669,7 +42669,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42700,7 +42700,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}",
                     "entry": {
                         "name": "In",
@@ -42731,7 +42731,7 @@
             ]
         },
         {
-            "key": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}",
+            "base": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -42739,7 +42739,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}",
                     "entry": {
                         "name": "In",
@@ -42770,7 +42770,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}",
                     "entry": {
                         "name": "In",
@@ -42801,7 +42801,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}",
                     "entry": {
                         "name": "In",
@@ -42826,7 +42826,7 @@
             ]
         },
         {
-            "key": "{5B700838-21A2-4579-9303-F4A4822AFEF4}",
+            "base": "{5B700838-21A2-4579-9303-F4A4822AFEF4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -42834,7 +42834,7 @@
             },
             "methods": [
                 {
-                    "key": "ToLower",
+                    "base": "ToLower",
                     "context": "{5B700838-21A2-4579-9303-F4A4822AFEF4}",
                     "entry": {
                         "name": "In",
@@ -42865,7 +42865,7 @@
                     ]
                 },
                 {
-                    "key": "ToUpper",
+                    "base": "ToUpper",
                     "context": "{5B700838-21A2-4579-9303-F4A4822AFEF4}",
                     "entry": {
                         "name": "In",
@@ -42896,7 +42896,7 @@
                     ]
                 },
                 {
-                    "key": "Substring",
+                    "base": "Substring",
                     "context": "{5B700838-21A2-4579-9303-F4A4822AFEF4}",
                     "entry": {
                         "name": "In",
@@ -42941,7 +42941,7 @@
             ]
         },
         {
-            "key": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
+            "base": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -42951,7 +42951,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -42988,7 +42988,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43031,7 +43031,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43060,7 +43060,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43091,7 +43091,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43122,7 +43122,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43153,7 +43153,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43184,7 +43184,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43221,7 +43221,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43258,7 +43258,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43289,7 +43289,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43326,7 +43326,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43357,7 +43357,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43388,7 +43388,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}",
                     "entry": {
                         "name": "In",
@@ -43419,7 +43419,7 @@
             ]
         },
         {
-            "key": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
+            "base": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -43427,7 +43427,7 @@
             },
             "methods": [
                 {
-                    "key": "Overlaps",
+                    "base": "Overlaps",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43464,7 +43464,7 @@
                     ]
                 },
                 {
-                    "key": "SurfaceArea",
+                    "base": "SurfaceArea",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43495,7 +43495,7 @@
                     ]
                 },
                 {
-                    "key": "ToSphere",
+                    "base": "ToSphere",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43526,7 +43526,7 @@
                     ]
                 },
                 {
-                    "key": "FromOBB",
+                    "base": "FromOBB",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43557,7 +43557,7 @@
                     ]
                 },
                 {
-                    "key": "Translate",
+                    "base": "Translate",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43594,7 +43594,7 @@
                     ]
                 },
                 {
-                    "key": "ContainsVector3",
+                    "base": "ContainsVector3",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43631,7 +43631,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43668,7 +43668,7 @@
                     ]
                 },
                 {
-                    "key": "FromPoint",
+                    "base": "FromPoint",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43699,7 +43699,7 @@
                     ]
                 },
                 {
-                    "key": "Null",
+                    "base": "Null",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43722,7 +43722,7 @@
                     ]
                 },
                 {
-                    "key": "YExtent",
+                    "base": "YExtent",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43753,7 +43753,7 @@
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43790,7 +43790,7 @@
                     ]
                 },
                 {
-                    "key": "ContainsAABB",
+                    "base": "ContainsAABB",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43827,7 +43827,7 @@
                     ]
                 },
                 {
-                    "key": "Expand",
+                    "base": "Expand",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43864,7 +43864,7 @@
                     ]
                 },
                 {
-                    "key": "Extents",
+                    "base": "Extents",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43895,7 +43895,7 @@
                     ]
                 },
                 {
-                    "key": "FromCenterHalfExtents",
+                    "base": "FromCenterHalfExtents",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43932,7 +43932,7 @@
                     ]
                 },
                 {
-                    "key": "GetMin",
+                    "base": "GetMin",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -43963,7 +43963,7 @@
                     ]
                 },
                 {
-                    "key": "ApplyTransform",
+                    "base": "ApplyTransform",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44000,7 +44000,7 @@
                     ]
                 },
                 {
-                    "key": "Center",
+                    "base": "Center",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44031,7 +44031,7 @@
                     ]
                 },
                 {
-                    "key": "FromMinMax",
+                    "base": "FromMinMax",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44068,7 +44068,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44099,7 +44099,7 @@
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44130,7 +44130,7 @@
                     ]
                 },
                 {
-                    "key": "GetMax",
+                    "base": "GetMax",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44161,7 +44161,7 @@
                     ]
                 },
                 {
-                    "key": "XExtent",
+                    "base": "XExtent",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44192,7 +44192,7 @@
                     ]
                 },
                 {
-                    "key": "AddPoint",
+                    "base": "AddPoint",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44229,7 +44229,7 @@
                     ]
                 },
                 {
-                    "key": "AddAABB",
+                    "base": "AddAABB",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44266,7 +44266,7 @@
                     ]
                 },
                 {
-                    "key": "FromCenterRadius",
+                    "base": "FromCenterRadius",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44303,7 +44303,7 @@
                     ]
                 },
                 {
-                    "key": "ZExtent",
+                    "base": "ZExtent",
                     "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}",
                     "entry": {
                         "name": "In",
@@ -44336,7 +44336,7 @@
             ]
         },
         {
-            "key": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
+            "base": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -44344,7 +44344,7 @@
             },
             "methods": [
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44381,7 +44381,7 @@
                     ]
                 },
                 {
-                    "key": "RotationYDegrees",
+                    "base": "RotationYDegrees",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44412,7 +44412,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44443,7 +44443,7 @@
                     ]
                 },
                 {
-                    "key": "LengthReciprocal",
+                    "base": "LengthReciprocal",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44474,7 +44474,7 @@
                     ]
                 },
                 {
-                    "key": "CreateFromEulerAngles",
+                    "base": "CreateFromEulerAngles",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44517,7 +44517,7 @@
                     ]
                 },
                 {
-                    "key": "IsIdentity",
+                    "base": "IsIdentity",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44554,7 +44554,7 @@
                     ]
                 },
                 {
-                    "key": "FromTransform",
+                    "base": "FromTransform",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44585,7 +44585,7 @@
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44628,7 +44628,7 @@
                     ]
                 },
                 {
-                    "key": "RotationZDegrees",
+                    "base": "RotationZDegrees",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44659,7 +44659,7 @@
                     ]
                 },
                 {
-                    "key": "ConvertTransformToRotation",
+                    "base": "ConvertTransformToRotation",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44690,7 +44690,7 @@
                     ]
                 },
                 {
-                    "key": "ShortestArc",
+                    "base": "ShortestArc",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44727,7 +44727,7 @@
                     ]
                 },
                 {
-                    "key": "RotationXDegrees",
+                    "base": "RotationXDegrees",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44758,7 +44758,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44795,7 +44795,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44838,7 +44838,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44869,7 +44869,7 @@
                     ]
                 },
                 {
-                    "key": "Conjugate",
+                    "base": "Conjugate",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44900,7 +44900,7 @@
                     ]
                 },
                 {
-                    "key": "ToAngleDegrees",
+                    "base": "ToAngleDegrees",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44931,7 +44931,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44968,7 +44968,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -44999,7 +44999,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45036,7 +45036,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45073,7 +45073,7 @@
                     ]
                 },
                 {
-                    "key": "Slerp",
+                    "base": "Slerp",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45116,7 +45116,7 @@
                     ]
                 },
                 {
-                    "key": "InvertFull",
+                    "base": "InvertFull",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45147,7 +45147,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix4x4",
+                    "base": "FromMatrix4x4",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45178,7 +45178,7 @@
                     ]
                 },
                 {
-                    "key": "RotateVector3",
+                    "base": "RotateVector3",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45215,7 +45215,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3",
+                    "base": "FromMatrix3x3",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45246,7 +45246,7 @@
                     ]
                 },
                 {
-                    "key": "Squad",
+                    "base": "Squad",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45301,7 +45301,7 @@
                     ]
                 },
                 {
-                    "key": "FromAxisAngleDegrees",
+                    "base": "FromAxisAngleDegrees",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45338,7 +45338,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45369,7 +45369,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45400,7 +45400,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45437,7 +45437,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByRotation",
+                    "base": "MultiplyByRotation",
                     "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}",
                     "entry": {
                         "name": "In",
@@ -45476,7 +45476,7 @@
             ]
         },
         {
-            "key": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
+            "base": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -45486,7 +45486,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45517,7 +45517,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45548,7 +45548,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45585,7 +45585,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45614,7 +45614,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45651,7 +45651,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45682,7 +45682,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45705,7 +45705,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45736,7 +45736,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45773,7 +45773,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45804,7 +45804,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45833,7 +45833,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45862,7 +45862,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45899,7 +45899,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45936,7 +45936,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45959,7 +45959,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -45990,7 +45990,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46027,7 +46027,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46064,7 +46064,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46095,7 +46095,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46126,7 +46126,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46161,7 +46161,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46192,7 +46192,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46235,7 +46235,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46264,7 +46264,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46293,7 +46293,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}",
                     "entry": {
                         "name": "In",
@@ -46326,7 +46326,7 @@
             ]
         },
         {
-            "key": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
+            "base": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -46336,7 +46336,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46367,7 +46367,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46398,7 +46398,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46435,7 +46435,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46464,7 +46464,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46501,7 +46501,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46532,7 +46532,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46555,7 +46555,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46586,7 +46586,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46623,7 +46623,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46654,7 +46654,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46683,7 +46683,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46712,7 +46712,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46749,7 +46749,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46786,7 +46786,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46809,7 +46809,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46840,7 +46840,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46877,7 +46877,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46914,7 +46914,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46945,7 +46945,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -46976,7 +46976,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -47011,7 +47011,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -47042,7 +47042,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -47085,7 +47085,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -47114,7 +47114,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -47143,7 +47143,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}",
                     "entry": {
                         "name": "In",
@@ -47176,7 +47176,7 @@
             ]
         },
         {
-            "key": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
+            "base": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -47184,7 +47184,7 @@
             },
             "methods": [
                 {
-                    "key": "Split",
+                    "base": "Split",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47221,7 +47221,7 @@
                     ]
                 },
                 {
-                    "key": "Join",
+                    "base": "Join",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47258,7 +47258,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47295,7 +47295,7 @@
                     ]
                 },
                 {
-                    "key": "ToLower",
+                    "base": "ToLower",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47326,7 +47326,7 @@
                     ]
                 },
                 {
-                    "key": "Replace",
+                    "base": "Replace",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47369,7 +47369,7 @@
                     ]
                 },
                 {
-                    "key": "TrimRight",
+                    "base": "TrimRight",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47400,7 +47400,7 @@
                     ]
                 },
                 {
-                    "key": "Equal",
+                    "base": "Equal",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47437,7 +47437,7 @@
                     ]
                 },
                 {
-                    "key": "Find",
+                    "base": "Find",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47480,7 +47480,7 @@
                     ]
                 },
                 {
-                    "key": "Substring",
+                    "base": "Substring",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47523,7 +47523,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47554,7 +47554,7 @@
                     ]
                 },
                 {
-                    "key": "ReplaceByIndex",
+                    "base": "ReplaceByIndex",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47603,7 +47603,7 @@
                     ]
                 },
                 {
-                    "key": "c_str",
+                    "base": "c_str",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47634,7 +47634,7 @@
                     ]
                 },
                 {
-                    "key": "TrimLeft",
+                    "base": "TrimLeft",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47665,7 +47665,7 @@
                     ]
                 },
                 {
-                    "key": "ToUpper",
+                    "base": "ToUpper",
                     "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}",
                     "entry": {
                         "name": "In",
@@ -47698,7 +47698,7 @@
             ]
         },
         {
-            "key": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}",
+            "base": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -47706,7 +47706,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}",
                     "entry": {
                         "name": "In",
@@ -47739,7 +47739,7 @@
             ]
         },
         {
-            "key": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
+            "base": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -47749,7 +47749,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47780,7 +47780,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47811,7 +47811,7 @@
                     ]
                 },
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47848,7 +47848,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47885,7 +47885,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47916,7 +47916,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47945,7 +47945,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -47976,7 +47976,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -48013,7 +48013,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -48050,7 +48050,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -48081,7 +48081,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -48112,7 +48112,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -48143,7 +48143,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}",
                     "entry": {
                         "name": "In",
@@ -48174,7 +48174,7 @@
             ]
         },
         {
-            "key": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
+            "base": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -48184,7 +48184,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48221,7 +48221,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48264,7 +48264,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48293,7 +48293,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48324,7 +48324,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48355,7 +48355,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48386,7 +48386,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48417,7 +48417,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48454,7 +48454,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48491,7 +48491,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48522,7 +48522,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48559,7 +48559,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48590,7 +48590,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48621,7 +48621,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}",
                     "entry": {
                         "name": "In",
@@ -48652,7 +48652,7 @@
             ]
         },
         {
-            "key": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
+            "base": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -48660,7 +48660,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48691,7 +48691,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48722,7 +48722,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48753,7 +48753,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48784,7 +48784,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48815,7 +48815,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48846,7 +48846,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48877,7 +48877,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}",
                     "entry": {
                         "name": "In",
@@ -48910,7 +48910,7 @@
             ]
         },
         {
-            "key": "{2D49E44A-E561-5108-B585-5392D40F9949}",
+            "base": "{2D49E44A-E561-5108-B585-5392D40F9949}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -48920,7 +48920,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -48958,7 +48958,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49002,7 +49002,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49031,7 +49031,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49062,7 +49062,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49093,7 +49093,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49124,7 +49124,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49155,7 +49155,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49193,7 +49193,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49231,7 +49231,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49262,7 +49262,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49300,7 +49300,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49331,7 +49331,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49362,7 +49362,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{2D49E44A-E561-5108-B585-5392D40F9949}",
                     "entry": {
                         "name": "In",
@@ -49393,7 +49393,7 @@
             ]
         },
         {
-            "key": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
+            "base": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -49403,7 +49403,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49434,7 +49434,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49465,7 +49465,7 @@
                     ]
                 },
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49502,7 +49502,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49539,7 +49539,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49570,7 +49570,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49599,7 +49599,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49630,7 +49630,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49667,7 +49667,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49704,7 +49704,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49735,7 +49735,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49766,7 +49766,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49797,7 +49797,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}",
                     "entry": {
                         "name": "In",
@@ -49828,7 +49828,7 @@
             ]
         },
         {
-            "key": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
+            "base": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -49838,7 +49838,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -49875,7 +49875,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -49918,7 +49918,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -49947,7 +49947,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -49978,7 +49978,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50009,7 +50009,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50040,7 +50040,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50071,7 +50071,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50108,7 +50108,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50145,7 +50145,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50176,7 +50176,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50213,7 +50213,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50244,7 +50244,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50275,7 +50275,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}",
                     "entry": {
                         "name": "In",
@@ -50306,7 +50306,7 @@
             ]
         },
         {
-            "key": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
+            "base": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -50316,7 +50316,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50347,7 +50347,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50378,7 +50378,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50415,7 +50415,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50444,7 +50444,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50481,7 +50481,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50512,7 +50512,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50535,7 +50535,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50566,7 +50566,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50603,7 +50603,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50634,7 +50634,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50663,7 +50663,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50692,7 +50692,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50729,7 +50729,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50766,7 +50766,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50789,7 +50789,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50820,7 +50820,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50857,7 +50857,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50894,7 +50894,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50925,7 +50925,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50956,7 +50956,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -50991,7 +50991,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -51022,7 +51022,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -51065,7 +51065,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -51094,7 +51094,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -51123,7 +51123,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}",
                     "entry": {
                         "name": "In",
@@ -51156,7 +51156,7 @@
             ]
         },
         {
-            "key": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}",
+            "base": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -51164,7 +51164,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}",
                     "entry": {
                         "name": "In",
@@ -51195,7 +51195,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}",
                     "entry": {
                         "name": "In",
@@ -51226,7 +51226,7 @@
                     ]
                 },
                 {
-                    "key": "Get2",
+                    "base": "Get2",
                     "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}",
                     "entry": {
                         "name": "In",
@@ -51257,7 +51257,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}",
                     "entry": {
                         "name": "In",
@@ -51282,7 +51282,7 @@
             ]
         },
         {
-            "key": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
+            "base": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -51290,7 +51290,7 @@
             },
             "methods": [
                 {
-                    "key": "DirectionTo",
+                    "base": "DirectionTo",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51333,7 +51333,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51370,7 +51370,7 @@
                     ]
                 },
                 {
-                    "key": "Project",
+                    "base": "Project",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51407,7 +51407,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51444,7 +51444,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51481,7 +51481,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51518,7 +51518,7 @@
                     ]
                 },
                 {
-                    "key": "Angle",
+                    "base": "Angle",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51549,7 +51549,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51580,7 +51580,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51617,7 +51617,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51654,7 +51654,7 @@
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51697,7 +51697,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51734,7 +51734,7 @@
                     ]
                 },
                 {
-                    "key": "Slerp",
+                    "base": "Slerp",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51777,7 +51777,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51814,7 +51814,7 @@
                     ]
                 },
                 {
-                    "key": "SetY",
+                    "base": "SetY",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51851,7 +51851,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51894,7 +51894,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51931,7 +51931,7 @@
                     ]
                 },
                 {
-                    "key": "IsNormalized",
+                    "base": "IsNormalized",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51968,7 +51968,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -51999,7 +51999,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52030,7 +52030,7 @@
                     ]
                 },
                 {
-                    "key": "ToPerpendicular",
+                    "base": "ToPerpendicular",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52061,7 +52061,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52092,7 +52092,7 @@
                     ]
                 },
                 {
-                    "key": "Max",
+                    "base": "Max",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52129,7 +52129,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52166,7 +52166,7 @@
                     ]
                 },
                 {
-                    "key": "Absolute",
+                    "base": "Absolute",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52197,7 +52197,7 @@
                     ]
                 },
                 {
-                    "key": "SetX",
+                    "base": "SetX",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52234,7 +52234,7 @@
                     ]
                 },
                 {
-                    "key": "Min",
+                    "base": "Min",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52271,7 +52271,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByVector",
+                    "base": "DivideByVector",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52308,7 +52308,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceSquared",
+                    "base": "DistanceSquared",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52345,7 +52345,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52376,7 +52376,7 @@
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}",
                     "entry": {
                         "name": "In",
@@ -52421,7 +52421,7 @@
             ]
         },
         {
-            "key": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
+            "base": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -52431,7 +52431,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52469,7 +52469,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52513,7 +52513,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52542,7 +52542,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52573,7 +52573,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52604,7 +52604,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52635,7 +52635,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52666,7 +52666,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52704,7 +52704,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52742,7 +52742,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52773,7 +52773,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52811,7 +52811,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52842,7 +52842,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52873,7 +52873,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}",
                     "entry": {
                         "name": "In",
@@ -52904,7 +52904,7 @@
             ]
         },
         {
-            "key": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
+            "base": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -52914,7 +52914,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -52951,7 +52951,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -52994,7 +52994,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53023,7 +53023,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53054,7 +53054,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53085,7 +53085,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53116,7 +53116,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53147,7 +53147,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53184,7 +53184,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53221,7 +53221,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53252,7 +53252,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53289,7 +53289,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53320,7 +53320,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53351,7 +53351,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}",
                     "entry": {
                         "name": "In",
@@ -53382,7 +53382,7 @@
             ]
         },
         {
-            "key": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
+            "base": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -53392,7 +53392,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53429,7 +53429,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53472,7 +53472,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53501,7 +53501,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53532,7 +53532,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53563,7 +53563,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53594,7 +53594,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53625,7 +53625,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53662,7 +53662,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53699,7 +53699,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53730,7 +53730,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53767,7 +53767,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53798,7 +53798,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53829,7 +53829,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}",
                     "entry": {
                         "name": "In",
@@ -53860,7 +53860,7 @@
             ]
         },
         {
-            "key": "{F429F985-AF00-529B-8449-16E56694E5F9}",
+            "base": "{F429F985-AF00-529B-8449-16E56694E5F9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -53868,7 +53868,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{F429F985-AF00-529B-8449-16E56694E5F9}",
                     "entry": {
                         "name": "In",
@@ -53901,7 +53901,7 @@
             ]
         },
         {
-            "key": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
+            "base": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -53911,7 +53911,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -53948,7 +53948,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -53991,7 +53991,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54020,7 +54020,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54051,7 +54051,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54082,7 +54082,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54113,7 +54113,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54144,7 +54144,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54181,7 +54181,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54218,7 +54218,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54249,7 +54249,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54286,7 +54286,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54317,7 +54317,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54348,7 +54348,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}",
                     "entry": {
                         "name": "In",
@@ -54379,7 +54379,7 @@
             ]
         },
         {
-            "key": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}",
+            "base": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -54387,7 +54387,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}",
                     "entry": {
                         "name": "In",
@@ -54420,7 +54420,7 @@
             ]
         },
         {
-            "key": "{9A6CD726-97FC-54C4-A34B-5996F6948697}",
+            "base": "{9A6CD726-97FC-54C4-A34B-5996F6948697}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -54430,7 +54430,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{9A6CD726-97FC-54C4-A34B-5996F6948697}",
                     "entry": {
                         "name": "In",
@@ -54463,7 +54463,7 @@
             ]
         },
         {
-            "key": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
+            "base": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -54473,7 +54473,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54504,7 +54504,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54535,7 +54535,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54572,7 +54572,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54601,7 +54601,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54638,7 +54638,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54669,7 +54669,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54692,7 +54692,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54723,7 +54723,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54760,7 +54760,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54791,7 +54791,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54820,7 +54820,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54849,7 +54849,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54886,7 +54886,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54923,7 +54923,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54946,7 +54946,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -54977,7 +54977,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55014,7 +55014,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55051,7 +55051,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55082,7 +55082,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55113,7 +55113,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55148,7 +55148,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55179,7 +55179,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55222,7 +55222,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55251,7 +55251,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55280,7 +55280,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}",
                     "entry": {
                         "name": "In",
@@ -55313,7 +55313,7 @@
             ]
         },
         {
-            "key": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
+            "base": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -55323,7 +55323,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55354,7 +55354,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55385,7 +55385,7 @@
                     ]
                 },
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55422,7 +55422,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55459,7 +55459,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55490,7 +55490,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55519,7 +55519,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55550,7 +55550,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55587,7 +55587,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55624,7 +55624,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55655,7 +55655,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55686,7 +55686,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55717,7 +55717,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}",
                     "entry": {
                         "name": "In",
@@ -55748,7 +55748,7 @@
             ]
         },
         {
-            "key": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
+            "base": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -55758,7 +55758,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55795,7 +55795,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55838,7 +55838,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55867,7 +55867,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55898,7 +55898,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55929,7 +55929,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55960,7 +55960,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -55991,7 +55991,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56028,7 +56028,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56065,7 +56065,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56096,7 +56096,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56133,7 +56133,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56164,7 +56164,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56195,7 +56195,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}",
                     "entry": {
                         "name": "In",
@@ -56226,7 +56226,7 @@
             ]
         },
         {
-            "key": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}",
+            "base": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -56234,7 +56234,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}",
                     "entry": {
                         "name": "In",
@@ -56267,7 +56267,7 @@
             ]
         },
         {
-            "key": "{444B2C18-8D7E-5B43-9524-0C9F6C351542}",
+            "base": "{444B2C18-8D7E-5B43-9524-0C9F6C351542}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -56277,7 +56277,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{444B2C18-8D7E-5B43-9524-0C9F6C351542}",
                     "entry": {
                         "name": "In",
@@ -56310,7 +56310,7 @@
             ]
         },
         {
-            "key": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
+            "base": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -56320,7 +56320,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56357,7 +56357,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56400,7 +56400,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56429,7 +56429,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56460,7 +56460,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56491,7 +56491,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56522,7 +56522,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56553,7 +56553,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56590,7 +56590,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56627,7 +56627,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56658,7 +56658,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56695,7 +56695,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56726,7 +56726,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56757,7 +56757,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}",
                     "entry": {
                         "name": "In",
@@ -56788,7 +56788,7 @@
             ]
         },
         {
-            "key": "{B51CFD94-318D-5E30-BE18-6ACC6CFCC2EC}",
+            "base": "{B51CFD94-318D-5E30-BE18-6ACC6CFCC2EC}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -56798,7 +56798,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{B51CFD94-318D-5E30-BE18-6ACC6CFCC2EC}",
                     "entry": {
                         "name": "In",
@@ -56831,7 +56831,7 @@
             ]
         },
         {
-            "key": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
+            "base": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -56841,7 +56841,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -56872,7 +56872,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -56903,7 +56903,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -56940,7 +56940,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -56969,7 +56969,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57006,7 +57006,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57037,7 +57037,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57060,7 +57060,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57091,7 +57091,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57128,7 +57128,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57159,7 +57159,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57188,7 +57188,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57217,7 +57217,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57254,7 +57254,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57291,7 +57291,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57314,7 +57314,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57345,7 +57345,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57382,7 +57382,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57419,7 +57419,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57450,7 +57450,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57481,7 +57481,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57516,7 +57516,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57547,7 +57547,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57590,7 +57590,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57619,7 +57619,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57648,7 +57648,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}",
                     "entry": {
                         "name": "In",
@@ -57681,7 +57681,7 @@
             ]
         },
         {
-            "key": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
+            "base": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -57691,7 +57691,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57728,7 +57728,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57771,7 +57771,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57800,7 +57800,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57831,7 +57831,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57862,7 +57862,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57893,7 +57893,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57924,7 +57924,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57961,7 +57961,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -57998,7 +57998,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -58029,7 +58029,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -58066,7 +58066,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -58097,7 +58097,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -58128,7 +58128,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}",
                     "entry": {
                         "name": "In",
@@ -58159,7 +58159,7 @@
             ]
         },
         {
-            "key": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
+            "base": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -58167,7 +58167,7 @@
             },
             "methods": [
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
                     "entry": {
                         "name": "In",
@@ -58198,7 +58198,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
                     "entry": {
                         "name": "In",
@@ -58229,7 +58229,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
                     "entry": {
                         "name": "In",
@@ -58260,7 +58260,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
                     "entry": {
                         "name": "In",
@@ -58291,7 +58291,7 @@
                     ]
                 },
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}",
                     "entry": {
                         "name": "In",
@@ -58324,7 +58324,7 @@
             ]
         },
         {
-            "key": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
+            "base": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -58334,7 +58334,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58365,7 +58365,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58396,7 +58396,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58433,7 +58433,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58462,7 +58462,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58499,7 +58499,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58530,7 +58530,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58553,7 +58553,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58584,7 +58584,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58621,7 +58621,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58652,7 +58652,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58681,7 +58681,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58710,7 +58710,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58747,7 +58747,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58784,7 +58784,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58807,7 +58807,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58838,7 +58838,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58875,7 +58875,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58912,7 +58912,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58943,7 +58943,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -58974,7 +58974,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -59009,7 +59009,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -59040,7 +59040,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -59083,7 +59083,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -59112,7 +59112,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -59141,7 +59141,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}",
                     "entry": {
                         "name": "In",
@@ -59174,7 +59174,7 @@
             ]
         },
         {
-            "key": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
+            "base": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -59184,7 +59184,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59221,7 +59221,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59264,7 +59264,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59293,7 +59293,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59324,7 +59324,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59355,7 +59355,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59386,7 +59386,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59417,7 +59417,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59454,7 +59454,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59491,7 +59491,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59522,7 +59522,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59559,7 +59559,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59590,7 +59590,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59621,7 +59621,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}",
                     "entry": {
                         "name": "In",
@@ -59652,7 +59652,7 @@
             ]
         },
         {
-            "key": "{033C4408-7E4A-5382-81D8-102FC8336005}",
+            "base": "{033C4408-7E4A-5382-81D8-102FC8336005}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -59662,7 +59662,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59700,7 +59700,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59744,7 +59744,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59773,7 +59773,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59804,7 +59804,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59835,7 +59835,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59866,7 +59866,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59897,7 +59897,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59935,7 +59935,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -59973,7 +59973,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -60004,7 +60004,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -60042,7 +60042,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -60073,7 +60073,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -60104,7 +60104,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{033C4408-7E4A-5382-81D8-102FC8336005}",
                     "entry": {
                         "name": "In",
@@ -60135,7 +60135,7 @@
             ]
         },
         {
-            "key": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
+            "base": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -60143,7 +60143,7 @@
             },
             "methods": [
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
                     "entry": {
                         "name": "In",
@@ -60166,7 +60166,7 @@
                     ]
                 },
                 {
-                    "key": "Get3",
+                    "base": "Get3",
                     "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
                     "entry": {
                         "name": "In",
@@ -60197,7 +60197,7 @@
                     ]
                 },
                 {
-                    "key": "Get2",
+                    "base": "Get2",
                     "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
                     "entry": {
                         "name": "In",
@@ -60228,7 +60228,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
                     "entry": {
                         "name": "In",
@@ -60259,7 +60259,7 @@
                     ]
                 },
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}",
                     "entry": {
                         "name": "In",
@@ -60292,7 +60292,7 @@
             ]
         },
         {
-            "key": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
+            "base": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -60300,7 +60300,7 @@
             },
             "methods": [
                 {
-                    "key": "ToString",
+                    "base": "ToString",
                     "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
                     "entry": {
                         "name": "In",
@@ -60332,7 +60332,7 @@
                     ]
                 },
                 {
-                    "key": "IsValid",
+                    "base": "IsValid",
                     "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
                     "entry": {
                         "name": "In",
@@ -60364,7 +60364,7 @@
                     ]
                 },
                 {
-                    "key": "GetEntityForward",
+                    "base": "GetEntityForward",
                     "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
                     "entry": {
                         "name": "In",
@@ -60402,7 +60402,7 @@
                     ]
                 },
                 {
-                    "key": "IsActive",
+                    "base": "IsActive",
                     "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
                     "entry": {
                         "name": "In",
@@ -60434,7 +60434,7 @@
                     ]
                 },
                 {
-                    "key": "GetEntityRight",
+                    "base": "GetEntityRight",
                     "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
                     "entry": {
                         "name": "In",
@@ -60472,7 +60472,7 @@
                     ]
                 },
                 {
-                    "key": "GetEntityUp",
+                    "base": "GetEntityUp",
                     "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}",
                     "entry": {
                         "name": "In",
@@ -60512,7 +60512,7 @@
             ]
         },
         {
-            "key": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
+            "base": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -60522,7 +60522,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60559,7 +60559,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60602,7 +60602,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60631,7 +60631,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60662,7 +60662,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60693,7 +60693,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60724,7 +60724,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60755,7 +60755,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60792,7 +60792,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60829,7 +60829,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60860,7 +60860,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60897,7 +60897,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60928,7 +60928,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60959,7 +60959,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}",
                     "entry": {
                         "name": "In",
@@ -60990,7 +60990,7 @@
             ]
         },
         {
-            "key": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
+            "base": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -61000,7 +61000,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61037,7 +61037,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61080,7 +61080,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61109,7 +61109,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61140,7 +61140,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61171,7 +61171,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61202,7 +61202,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61233,7 +61233,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61270,7 +61270,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61307,7 +61307,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61338,7 +61338,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61375,7 +61375,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61406,7 +61406,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61437,7 +61437,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}",
                     "entry": {
                         "name": "In",
@@ -61468,7 +61468,7 @@
             ]
         },
         {
-            "key": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
+            "base": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -61478,7 +61478,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61515,7 +61515,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61558,7 +61558,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61587,7 +61587,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61618,7 +61618,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61649,7 +61649,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61680,7 +61680,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61711,7 +61711,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61748,7 +61748,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61785,7 +61785,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61816,7 +61816,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61853,7 +61853,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61884,7 +61884,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61915,7 +61915,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}",
                     "entry": {
                         "name": "In",
@@ -61946,7 +61946,7 @@
             ]
         },
         {
-            "key": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
+            "base": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -61956,7 +61956,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -61993,7 +61993,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62036,7 +62036,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62065,7 +62065,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62096,7 +62096,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62127,7 +62127,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62158,7 +62158,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62189,7 +62189,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62226,7 +62226,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62263,7 +62263,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62294,7 +62294,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62331,7 +62331,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62362,7 +62362,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62393,7 +62393,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}",
                     "entry": {
                         "name": "In",
@@ -62424,7 +62424,7 @@
             ]
         },
         {
-            "key": "{6ACECB77-D489-52CF-8473-9116466ABC59}",
+            "base": "{6ACECB77-D489-52CF-8473-9116466ABC59}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -62432,7 +62432,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{6ACECB77-D489-52CF-8473-9116466ABC59}",
                     "entry": {
                         "name": "In",
@@ -62465,7 +62465,7 @@
             ]
         },
         {
-            "key": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
+            "base": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -62473,7 +62473,7 @@
             },
             "methods": [
                 {
-                    "key": "has_value",
+                    "base": "has_value",
                     "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
                     "entry": {
                         "name": "In",
@@ -62504,7 +62504,7 @@
                     ]
                 },
                 {
-                    "key": "__bool__",
+                    "base": "__bool__",
                     "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
                     "entry": {
                         "name": "In",
@@ -62535,7 +62535,7 @@
                     ]
                 },
                 {
-                    "key": "value",
+                    "base": "value",
                     "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
                     "entry": {
                         "name": "In",
@@ -62566,7 +62566,7 @@
                     ]
                 },
                 {
-                    "key": "value_or",
+                    "base": "value_or",
                     "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}",
                     "entry": {
                         "name": "In",
@@ -62605,7 +62605,7 @@
             ]
         },
         {
-            "key": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
+            "base": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -62615,7 +62615,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62652,7 +62652,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62695,7 +62695,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62724,7 +62724,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62755,7 +62755,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62786,7 +62786,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62817,7 +62817,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62848,7 +62848,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62885,7 +62885,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62922,7 +62922,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62953,7 +62953,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -62990,7 +62990,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -63021,7 +63021,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -63052,7 +63052,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}",
                     "entry": {
                         "name": "In",
@@ -63083,7 +63083,7 @@
             ]
         },
         {
-            "key": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
+            "base": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -63093,7 +63093,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63130,7 +63130,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63173,7 +63173,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63202,7 +63202,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63233,7 +63233,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63264,7 +63264,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63295,7 +63295,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63326,7 +63326,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63363,7 +63363,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63400,7 +63400,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63431,7 +63431,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63468,7 +63468,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63499,7 +63499,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63530,7 +63530,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}",
                     "entry": {
                         "name": "In",
@@ -63561,7 +63561,7 @@
             ]
         },
         {
-            "key": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
+            "base": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -63571,7 +63571,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63602,7 +63602,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63633,7 +63633,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63670,7 +63670,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63699,7 +63699,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63736,7 +63736,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63767,7 +63767,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63790,7 +63790,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63821,7 +63821,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63858,7 +63858,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63889,7 +63889,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63918,7 +63918,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63947,7 +63947,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -63984,7 +63984,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64021,7 +64021,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64044,7 +64044,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64075,7 +64075,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64112,7 +64112,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64149,7 +64149,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64180,7 +64180,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64211,7 +64211,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64246,7 +64246,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64277,7 +64277,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64320,7 +64320,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64349,7 +64349,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64378,7 +64378,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}",
                     "entry": {
                         "name": "In",
@@ -64411,7 +64411,7 @@
             ]
         },
         {
-            "key": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
+            "base": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -64419,7 +64419,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64450,7 +64450,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64481,7 +64481,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64512,7 +64512,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64543,7 +64543,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64574,7 +64574,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64605,7 +64605,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64636,7 +64636,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}",
                     "entry": {
                         "name": "In",
@@ -64669,7 +64669,7 @@
             ]
         },
         {
-            "key": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
+            "base": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -64677,7 +64677,7 @@
             },
             "methods": [
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
                     "entry": {
                         "name": "In",
@@ -64708,7 +64708,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
                     "entry": {
                         "name": "In",
@@ -64739,7 +64739,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
                     "entry": {
                         "name": "In",
@@ -64770,7 +64770,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
                     "entry": {
                         "name": "In",
@@ -64801,7 +64801,7 @@
                     ]
                 },
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}",
                     "entry": {
                         "name": "In",
@@ -64834,7 +64834,7 @@
             ]
         },
         {
-            "key": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}",
+            "base": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -64842,7 +64842,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}",
                     "entry": {
                         "name": "In",
@@ -64875,7 +64875,7 @@
             ]
         },
         {
-            "key": "{BE75E564-1859-566D-821F-3343675C4977}",
+            "base": "{BE75E564-1859-566D-821F-3343675C4977}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -64885,7 +64885,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -64922,7 +64922,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -64965,7 +64965,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -64994,7 +64994,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65025,7 +65025,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65056,7 +65056,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65087,7 +65087,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65118,7 +65118,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65155,7 +65155,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65192,7 +65192,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65223,7 +65223,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65260,7 +65260,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65291,7 +65291,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65322,7 +65322,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{BE75E564-1859-566D-821F-3343675C4977}",
                     "entry": {
                         "name": "In",
@@ -65353,7 +65353,7 @@
             ]
         },
         {
-            "key": "{93942742-473F-5EE3-8420-D8F22C612221}",
+            "base": "{93942742-473F-5EE3-8420-D8F22C612221}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -65361,7 +65361,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{93942742-473F-5EE3-8420-D8F22C612221}",
                     "entry": {
                         "name": "In",
@@ -65392,7 +65392,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{93942742-473F-5EE3-8420-D8F22C612221}",
                     "entry": {
                         "name": "In",
@@ -65423,7 +65423,7 @@
                     ]
                 },
                 {
-                    "key": "Get2",
+                    "base": "Get2",
                     "context": "{93942742-473F-5EE3-8420-D8F22C612221}",
                     "entry": {
                         "name": "In",
@@ -65454,7 +65454,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{93942742-473F-5EE3-8420-D8F22C612221}",
                     "entry": {
                         "name": "In",
@@ -65479,7 +65479,7 @@
             ]
         },
         {
-            "key": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
+            "base": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -65489,7 +65489,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65526,7 +65526,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65570,7 +65570,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65599,7 +65599,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65630,7 +65630,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65661,7 +65661,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65692,7 +65692,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65723,7 +65723,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65760,7 +65760,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65797,7 +65797,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65828,7 +65828,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65866,7 +65866,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65897,7 +65897,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65928,7 +65928,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}",
                     "entry": {
                         "name": "In",
@@ -65959,7 +65959,7 @@
             ]
         },
         {
-            "key": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
+            "base": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -65967,7 +65967,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -65998,7 +65998,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66029,7 +66029,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66060,7 +66060,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66091,7 +66091,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66122,7 +66122,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66153,7 +66153,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66184,7 +66184,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}",
                     "entry": {
                         "name": "In",
@@ -66217,7 +66217,7 @@
             ]
         },
         {
-            "key": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
+            "base": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -66227,7 +66227,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66264,7 +66264,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66307,7 +66307,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66336,7 +66336,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66367,7 +66367,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66398,7 +66398,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66429,7 +66429,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66460,7 +66460,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66497,7 +66497,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66534,7 +66534,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66565,7 +66565,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66602,7 +66602,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66633,7 +66633,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66664,7 +66664,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}",
                     "entry": {
                         "name": "In",
@@ -66695,7 +66695,7 @@
             ]
         },
         {
-            "key": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
+            "base": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -66705,7 +66705,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66743,7 +66743,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66787,7 +66787,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66816,7 +66816,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66847,7 +66847,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66878,7 +66878,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66909,7 +66909,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66940,7 +66940,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -66978,7 +66978,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -67016,7 +67016,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -67047,7 +67047,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -67085,7 +67085,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -67116,7 +67116,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -67147,7 +67147,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}",
                     "entry": {
                         "name": "In",
@@ -67178,7 +67178,7 @@
             ]
         },
         {
-            "key": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
+            "base": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -67188,7 +67188,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67225,7 +67225,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67268,7 +67268,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67297,7 +67297,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67328,7 +67328,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67359,7 +67359,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67390,7 +67390,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67421,7 +67421,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67458,7 +67458,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67495,7 +67495,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67526,7 +67526,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67563,7 +67563,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67594,7 +67594,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67625,7 +67625,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}",
                     "entry": {
                         "name": "In",
@@ -67656,7 +67656,7 @@
             ]
         },
         {
-            "key": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
+            "base": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -67664,7 +67664,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67695,7 +67695,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67726,7 +67726,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67757,7 +67757,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67788,7 +67788,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67819,7 +67819,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67850,7 +67850,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67881,7 +67881,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}",
                     "entry": {
                         "name": "In",
@@ -67914,7 +67914,7 @@
             ]
         },
         {
-            "key": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
+            "base": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -67924,7 +67924,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -67962,7 +67962,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68006,7 +68006,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68035,7 +68035,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68066,7 +68066,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68097,7 +68097,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68128,7 +68128,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68159,7 +68159,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68197,7 +68197,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68235,7 +68235,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68266,7 +68266,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68304,7 +68304,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68335,7 +68335,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68366,7 +68366,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}",
                     "entry": {
                         "name": "In",
@@ -68397,7 +68397,7 @@
             ]
         },
         {
-            "key": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
+            "base": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -68407,7 +68407,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68444,7 +68444,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68487,7 +68487,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68516,7 +68516,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68547,7 +68547,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68578,7 +68578,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68609,7 +68609,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68640,7 +68640,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68677,7 +68677,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68714,7 +68714,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68745,7 +68745,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68782,7 +68782,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68813,7 +68813,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68844,7 +68844,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}",
                     "entry": {
                         "name": "In",
@@ -68875,7 +68875,7 @@
             ]
         },
         {
-            "key": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
+            "base": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -68885,7 +68885,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -68922,7 +68922,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -68965,7 +68965,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -68994,7 +68994,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69025,7 +69025,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69056,7 +69056,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69087,7 +69087,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69118,7 +69118,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69155,7 +69155,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69192,7 +69192,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69223,7 +69223,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69260,7 +69260,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69291,7 +69291,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69322,7 +69322,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}",
                     "entry": {
                         "name": "In",
@@ -69353,7 +69353,7 @@
             ]
         },
         {
-            "key": "{76898795-2B30-4645-B6D4-67568ECC889F}",
+            "base": "{76898795-2B30-4645-B6D4-67568ECC889F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -69361,7 +69361,7 @@
             },
             "methods": [
                 {
-                    "key": "ThreeGeneric",
+                    "base": "ThreeGeneric",
                     "context": "{76898795-2B30-4645-B6D4-67568ECC889F}",
                     "entry": {
                         "name": "In",
@@ -69404,7 +69404,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyAndAdd",
+                    "base": "MultiplyAndAdd",
                     "context": "{76898795-2B30-4645-B6D4-67568ECC889F}",
                     "entry": {
                         "name": "In",
@@ -69447,7 +69447,7 @@
                     ]
                 },
                 {
-                    "key": "StringToNumber",
+                    "base": "StringToNumber",
                     "context": "{76898795-2B30-4645-B6D4-67568ECC889F}",
                     "entry": {
                         "name": "In",
@@ -69480,7 +69480,7 @@
             ]
         },
         {
-            "key": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
+            "base": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -69488,7 +69488,7 @@
             },
             "methods": [
                 {
-                    "key": "RotationZDegrees",
+                    "base": "RotationZDegrees",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69519,7 +69519,7 @@
                     ]
                 },
                 {
-                    "key": "GetUp",
+                    "base": "GetUp",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69556,7 +69556,7 @@
                     ]
                 },
                 {
-                    "key": "GetForward",
+                    "base": "GetForward",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69593,7 +69593,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69636,7 +69636,7 @@
                     ]
                 },
                 {
-                    "key": "RotationXDegrees",
+                    "base": "RotationXDegrees",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69667,7 +69667,7 @@
                     ]
                 },
                 {
-                    "key": "FromTranslation",
+                    "base": "FromTranslation",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69698,7 +69698,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69729,7 +69729,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByUniformScale",
+                    "base": "MultiplyByUniformScale",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69766,7 +69766,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByTransform",
+                    "base": "MultiplyByTransform",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69803,7 +69803,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotation",
+                    "base": "FromRotation",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69834,7 +69834,7 @@
                     ]
                 },
                 {
-                    "key": "RotationYDegrees",
+                    "base": "RotationYDegrees",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69865,7 +69865,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationAndTranslation",
+                    "base": "FromRotationAndTranslation",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69902,7 +69902,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector3",
+                    "base": "MultiplyByVector3",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69939,7 +69939,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector4",
+                    "base": "MultiplyByVector4",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -69976,7 +69976,7 @@
                     ]
                 },
                 {
-                    "key": "ToScale",
+                    "base": "ToScale",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70007,7 +70007,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3",
+                    "base": "FromMatrix3x3",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70038,7 +70038,7 @@
                     ]
                 },
                 {
-                    "key": "GetRight",
+                    "base": "GetRight",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70075,7 +70075,7 @@
                     ]
                 },
                 {
-                    "key": "IsOrthogonal",
+                    "base": "IsOrthogonal",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70112,7 +70112,7 @@
                     ]
                 },
                 {
-                    "key": "Orthogonalize",
+                    "base": "Orthogonalize",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70143,7 +70143,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix3x3AndTranslation",
+                    "base": "FromMatrix3x3AndTranslation",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70180,7 +70180,7 @@
                     ]
                 },
                 {
-                    "key": "FromScale",
+                    "base": "FromScale",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70211,7 +70211,7 @@
                     ]
                 },
                 {
-                    "key": "GetTranslation",
+                    "base": "GetTranslation",
                     "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}",
                     "entry": {
                         "name": "In",
@@ -70244,7 +70244,7 @@
             ]
         },
         {
-            "key": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
+            "base": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -70254,7 +70254,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70291,7 +70291,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70334,7 +70334,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70363,7 +70363,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70394,7 +70394,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70425,7 +70425,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70456,7 +70456,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70487,7 +70487,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70524,7 +70524,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70561,7 +70561,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70592,7 +70592,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70629,7 +70629,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70660,7 +70660,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70691,7 +70691,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}",
                     "entry": {
                         "name": "In",
@@ -70722,7 +70722,7 @@
             ]
         },
         {
-            "key": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
+            "base": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -70730,7 +70730,7 @@
             },
             "methods": [
                 {
-                    "key": "Transpose",
+                    "base": "Transpose",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70761,7 +70761,7 @@
                     ]
                 },
                 {
-                    "key": "Zero",
+                    "base": "Zero",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70784,7 +70784,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70821,7 +70821,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70864,7 +70864,7 @@
                     ]
                 },
                 {
-                    "key": "Invert",
+                    "base": "Invert",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70895,7 +70895,7 @@
                     ]
                 },
                 {
-                    "key": "GetDiagonal",
+                    "base": "GetDiagonal",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70926,7 +70926,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumn",
+                    "base": "GetColumn",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -70963,7 +70963,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71000,7 +71000,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71037,7 +71037,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71068,7 +71068,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71105,7 +71105,7 @@
                     ]
                 },
                 {
-                    "key": "ToAdjugate",
+                    "base": "ToAdjugate",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71136,7 +71136,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71179,7 +71179,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByMatrix",
+                    "base": "MultiplyByMatrix",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71216,7 +71216,7 @@
                     ]
                 },
                 {
-                    "key": "IsOrthogonal",
+                    "base": "IsOrthogonal",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71247,7 +71247,7 @@
                     ]
                 },
                 {
-                    "key": "Orthogonalize",
+                    "base": "Orthogonalize",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71278,7 +71278,7 @@
                     ]
                 },
                 {
-                    "key": "GetRows",
+                    "base": "GetRows",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71309,7 +71309,7 @@
                     ]
                 },
                 {
-                    "key": "FromCrossProduct",
+                    "base": "FromCrossProduct",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71340,7 +71340,7 @@
                     ]
                 },
                 {
-                    "key": "GetColumns",
+                    "base": "GetColumns",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71371,7 +71371,7 @@
                     ]
                 },
                 {
-                    "key": "FromTransform",
+                    "base": "FromTransform",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71402,7 +71402,7 @@
                     ]
                 },
                 {
-                    "key": "FromScale",
+                    "base": "FromScale",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71433,7 +71433,7 @@
                     ]
                 },
                 {
-                    "key": "ToScale",
+                    "base": "ToScale",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71464,7 +71464,7 @@
                     ]
                 },
                 {
-                    "key": "FromQuaternion",
+                    "base": "FromQuaternion",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71495,7 +71495,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71532,7 +71532,7 @@
                     ]
                 },
                 {
-                    "key": "GetRow",
+                    "base": "GetRow",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71569,7 +71569,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationYDegrees",
+                    "base": "FromRotationYDegrees",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71600,7 +71600,7 @@
                     ]
                 },
                 {
-                    "key": "FromRows",
+                    "base": "FromRows",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71643,7 +71643,7 @@
                     ]
                 },
                 {
-                    "key": "FromDiagonal",
+                    "base": "FromDiagonal",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71674,7 +71674,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationZDegrees",
+                    "base": "FromRotationZDegrees",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71705,7 +71705,7 @@
                     ]
                 },
                 {
-                    "key": "FromMatrix4x4",
+                    "base": "FromMatrix4x4",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71736,7 +71736,7 @@
                     ]
                 },
                 {
-                    "key": "FromColumns",
+                    "base": "FromColumns",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71779,7 +71779,7 @@
                     ]
                 },
                 {
-                    "key": "FromRotationXDegrees",
+                    "base": "FromRotationXDegrees",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71810,7 +71810,7 @@
                     ]
                 },
                 {
-                    "key": "ToDeterminant",
+                    "base": "ToDeterminant",
                     "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}",
                     "entry": {
                         "name": "In",
@@ -71843,7 +71843,7 @@
             ]
         },
         {
-            "key": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
+            "base": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -71853,7 +71853,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -71890,7 +71890,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -71933,7 +71933,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -71962,7 +71962,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -71993,7 +71993,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72024,7 +72024,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72055,7 +72055,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72086,7 +72086,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72123,7 +72123,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72160,7 +72160,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72191,7 +72191,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72228,7 +72228,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72259,7 +72259,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72290,7 +72290,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}",
                     "entry": {
                         "name": "In",
@@ -72321,7 +72321,7 @@
             ]
         },
         {
-            "key": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
+            "base": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -72331,7 +72331,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72368,7 +72368,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72411,7 +72411,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72440,7 +72440,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72471,7 +72471,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72502,7 +72502,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72533,7 +72533,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72564,7 +72564,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72601,7 +72601,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72638,7 +72638,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72669,7 +72669,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72706,7 +72706,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72737,7 +72737,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72768,7 +72768,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}",
                     "entry": {
                         "name": "In",
@@ -72799,7 +72799,7 @@
             ]
         },
         {
-            "key": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
+            "base": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -72807,7 +72807,7 @@
             },
             "methods": [
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
                     "entry": {
                         "name": "In",
@@ -72838,7 +72838,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
                     "entry": {
                         "name": "In",
@@ -72869,7 +72869,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
                     "entry": {
                         "name": "In",
@@ -72901,7 +72901,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
                     "entry": {
                         "name": "In",
@@ -72933,7 +72933,7 @@
                     ]
                 },
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}",
                     "entry": {
                         "name": "In",
@@ -72966,7 +72966,7 @@
             ]
         },
         {
-            "key": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
+            "base": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -72976,7 +72976,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73007,7 +73007,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73038,7 +73038,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73075,7 +73075,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73104,7 +73104,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73141,7 +73141,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73172,7 +73172,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73195,7 +73195,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73226,7 +73226,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73263,7 +73263,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73294,7 +73294,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73323,7 +73323,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73352,7 +73352,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73389,7 +73389,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73426,7 +73426,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73449,7 +73449,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73480,7 +73480,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73517,7 +73517,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73554,7 +73554,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73585,7 +73585,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73616,7 +73616,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73651,7 +73651,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73682,7 +73682,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73725,7 +73725,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73754,7 +73754,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73783,7 +73783,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}",
                     "entry": {
                         "name": "In",
@@ -73816,7 +73816,7 @@
             ]
         },
         {
-            "key": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
+            "base": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -73826,7 +73826,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -73857,7 +73857,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -73888,7 +73888,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -73925,7 +73925,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -73954,7 +73954,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -73991,7 +73991,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74022,7 +74022,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74045,7 +74045,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74076,7 +74076,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74113,7 +74113,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74144,7 +74144,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74173,7 +74173,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74202,7 +74202,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74239,7 +74239,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74276,7 +74276,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74299,7 +74299,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74330,7 +74330,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74367,7 +74367,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74404,7 +74404,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74435,7 +74435,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74466,7 +74466,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74501,7 +74501,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74532,7 +74532,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74575,7 +74575,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74604,7 +74604,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74633,7 +74633,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}",
                     "entry": {
                         "name": "In",
@@ -74666,7 +74666,7 @@
             ]
         },
         {
-            "key": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
+            "base": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -74676,7 +74676,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74713,7 +74713,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74756,7 +74756,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74785,7 +74785,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74816,7 +74816,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74847,7 +74847,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74878,7 +74878,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74909,7 +74909,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74946,7 +74946,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -74983,7 +74983,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -75014,7 +75014,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -75051,7 +75051,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -75082,7 +75082,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -75113,7 +75113,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}",
                     "entry": {
                         "name": "In",
@@ -75144,7 +75144,7 @@
             ]
         },
         {
-            "key": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
+            "base": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -75154,7 +75154,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75185,7 +75185,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75216,7 +75216,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75253,7 +75253,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75282,7 +75282,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75319,7 +75319,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75350,7 +75350,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75373,7 +75373,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75404,7 +75404,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75441,7 +75441,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75472,7 +75472,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75501,7 +75501,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75530,7 +75530,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75567,7 +75567,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75604,7 +75604,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75627,7 +75627,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75658,7 +75658,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75695,7 +75695,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75732,7 +75732,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75763,7 +75763,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75794,7 +75794,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75829,7 +75829,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75860,7 +75860,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75903,7 +75903,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75932,7 +75932,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75961,7 +75961,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}",
                     "entry": {
                         "name": "In",
@@ -75994,7 +75994,7 @@
             ]
         },
         {
-            "key": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
+            "base": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -76002,7 +76002,7 @@
             },
             "methods": [
                 {
-                    "key": "has_value",
+                    "base": "has_value",
                     "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
                     "entry": {
                         "name": "In",
@@ -76033,7 +76033,7 @@
                     ]
                 },
                 {
-                    "key": "__bool__",
+                    "base": "__bool__",
                     "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
                     "entry": {
                         "name": "In",
@@ -76064,7 +76064,7 @@
                     ]
                 },
                 {
-                    "key": "value",
+                    "base": "value",
                     "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
                     "entry": {
                         "name": "In",
@@ -76095,7 +76095,7 @@
                     ]
                 },
                 {
-                    "key": "value_or",
+                    "base": "value_or",
                     "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}",
                     "entry": {
                         "name": "In",
@@ -76134,7 +76134,7 @@
             ]
         },
         {
-            "key": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}",
+            "base": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -76142,7 +76142,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}",
                     "entry": {
                         "name": "In",
@@ -76173,7 +76173,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}",
                     "entry": {
                         "name": "In",
@@ -76204,7 +76204,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}",
                     "entry": {
                         "name": "In",
@@ -76229,7 +76229,7 @@
             ]
         },
         {
-            "key": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
+            "base": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -76237,7 +76237,7 @@
             },
             "methods": [
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
                     "entry": {
                         "name": "In",
@@ -76268,7 +76268,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
                     "entry": {
                         "name": "In",
@@ -76299,7 +76299,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
                     "entry": {
                         "name": "In",
@@ -76330,7 +76330,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
                     "entry": {
                         "name": "In",
@@ -76361,7 +76361,7 @@
                     ]
                 },
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}",
                     "entry": {
                         "name": "In",
@@ -76394,7 +76394,7 @@
             ]
         },
         {
-            "key": "{4B687295-2381-5741-AA96-F7441F09267B}",
+            "base": "{4B687295-2381-5741-AA96-F7441F09267B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -76402,7 +76402,7 @@
             },
             "methods": [
                 {
-                    "key": "GetError",
+                    "base": "GetError",
                     "context": "{4B687295-2381-5741-AA96-F7441F09267B}",
                     "entry": {
                         "name": "In",
@@ -76433,7 +76433,7 @@
                     ]
                 },
                 {
-                    "key": "IsSuccess",
+                    "base": "IsSuccess",
                     "context": "{4B687295-2381-5741-AA96-F7441F09267B}",
                     "entry": {
                         "name": "In",
@@ -76464,7 +76464,7 @@
                     ]
                 },
                 {
-                    "key": "Success",
+                    "base": "Success",
                     "context": "{4B687295-2381-5741-AA96-F7441F09267B}",
                     "entry": {
                         "name": "In",
@@ -76495,7 +76495,7 @@
                     ]
                 },
                 {
-                    "key": "GetValue",
+                    "base": "GetValue",
                     "context": "{4B687295-2381-5741-AA96-F7441F09267B}",
                     "entry": {
                         "name": "In",
@@ -76526,7 +76526,7 @@
                     ]
                 },
                 {
-                    "key": "Failure",
+                    "base": "Failure",
                     "context": "{4B687295-2381-5741-AA96-F7441F09267B}",
                     "entry": {
                         "name": "In",
@@ -76559,7 +76559,7 @@
             ]
         },
         {
-            "key": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
+            "base": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -76569,7 +76569,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76606,7 +76606,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76649,7 +76649,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76678,7 +76678,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76709,7 +76709,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76740,7 +76740,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76771,7 +76771,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76802,7 +76802,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76839,7 +76839,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76876,7 +76876,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76907,7 +76907,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76944,7 +76944,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -76975,7 +76975,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -77006,7 +77006,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}",
                     "entry": {
                         "name": "In",
@@ -77037,7 +77037,7 @@
             ]
         },
         {
-            "key": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
+            "base": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -77047,7 +77047,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77084,7 +77084,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77127,7 +77127,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77156,7 +77156,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77187,7 +77187,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77218,7 +77218,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77249,7 +77249,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77280,7 +77280,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77317,7 +77317,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77354,7 +77354,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77385,7 +77385,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77422,7 +77422,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77453,7 +77453,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77484,7 +77484,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}",
                     "entry": {
                         "name": "In",
@@ -77515,7 +77515,7 @@
             ]
         },
         {
-            "key": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
+            "base": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -77525,7 +77525,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77556,7 +77556,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77587,7 +77587,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77624,7 +77624,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77653,7 +77653,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77690,7 +77690,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77721,7 +77721,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77744,7 +77744,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77775,7 +77775,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77812,7 +77812,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77843,7 +77843,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77872,7 +77872,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77901,7 +77901,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77938,7 +77938,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77975,7 +77975,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -77998,7 +77998,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78029,7 +78029,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78066,7 +78066,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78103,7 +78103,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78134,7 +78134,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78165,7 +78165,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78200,7 +78200,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78231,7 +78231,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78274,7 +78274,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78303,7 +78303,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78332,7 +78332,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}",
                     "entry": {
                         "name": "In",
@@ -78365,7 +78365,7 @@
             ]
         },
         {
-            "key": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
+            "base": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -78375,7 +78375,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78406,7 +78406,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78438,7 +78438,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78475,7 +78475,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78504,7 +78504,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78542,7 +78542,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78574,7 +78574,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78597,7 +78597,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78628,7 +78628,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78666,7 +78666,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78697,7 +78697,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78726,7 +78726,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78756,7 +78756,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78794,7 +78794,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78832,7 +78832,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78855,7 +78855,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78886,7 +78886,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78923,7 +78923,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78960,7 +78960,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -78991,7 +78991,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79022,7 +79022,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79058,7 +79058,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79089,7 +79089,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79133,7 +79133,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79163,7 +79163,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79192,7 +79192,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}",
                     "entry": {
                         "name": "In",
@@ -79225,7 +79225,7 @@
             ]
         },
         {
-            "key": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
+            "base": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -79235,7 +79235,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79266,7 +79266,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79297,7 +79297,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79334,7 +79334,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79363,7 +79363,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79400,7 +79400,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79431,7 +79431,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79454,7 +79454,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79485,7 +79485,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79522,7 +79522,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79553,7 +79553,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79582,7 +79582,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79611,7 +79611,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79648,7 +79648,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79685,7 +79685,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79708,7 +79708,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79739,7 +79739,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79776,7 +79776,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79813,7 +79813,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79844,7 +79844,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79875,7 +79875,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79910,7 +79910,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79941,7 +79941,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -79984,7 +79984,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -80013,7 +80013,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -80042,7 +80042,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}",
                     "entry": {
                         "name": "In",
@@ -80075,7 +80075,7 @@
             ]
         },
         {
-            "key": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
+            "base": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -80085,7 +80085,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80116,7 +80116,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80147,7 +80147,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80184,7 +80184,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80213,7 +80213,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80250,7 +80250,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80281,7 +80281,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80304,7 +80304,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80335,7 +80335,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80372,7 +80372,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80403,7 +80403,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80432,7 +80432,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80461,7 +80461,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80498,7 +80498,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80535,7 +80535,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80558,7 +80558,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80589,7 +80589,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80626,7 +80626,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80663,7 +80663,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80694,7 +80694,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80725,7 +80725,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80760,7 +80760,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80791,7 +80791,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80834,7 +80834,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80863,7 +80863,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80892,7 +80892,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}",
                     "entry": {
                         "name": "In",
@@ -80925,7 +80925,7 @@
             ]
         },
         {
-            "key": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
+            "base": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -80935,7 +80935,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -80973,7 +80973,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81017,7 +81017,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81046,7 +81046,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81077,7 +81077,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81108,7 +81108,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81139,7 +81139,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81170,7 +81170,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81208,7 +81208,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81246,7 +81246,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81277,7 +81277,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81315,7 +81315,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81346,7 +81346,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81377,7 +81377,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}",
                     "entry": {
                         "name": "In",
@@ -81408,7 +81408,7 @@
             ]
         },
         {
-            "key": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
+            "base": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -81418,7 +81418,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81449,7 +81449,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81480,7 +81480,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81517,7 +81517,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81546,7 +81546,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81583,7 +81583,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81614,7 +81614,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81637,7 +81637,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81668,7 +81668,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81705,7 +81705,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81736,7 +81736,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81765,7 +81765,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81794,7 +81794,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81831,7 +81831,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81868,7 +81868,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81891,7 +81891,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81922,7 +81922,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81959,7 +81959,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -81996,7 +81996,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82027,7 +82027,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82058,7 +82058,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82093,7 +82093,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82124,7 +82124,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82167,7 +82167,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82196,7 +82196,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82225,7 +82225,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}",
                     "entry": {
                         "name": "In",
@@ -82258,7 +82258,7 @@
             ]
         },
         {
-            "key": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
+            "base": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -82268,7 +82268,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82305,7 +82305,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82348,7 +82348,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82377,7 +82377,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82408,7 +82408,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82439,7 +82439,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82470,7 +82470,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82501,7 +82501,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82538,7 +82538,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82575,7 +82575,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82606,7 +82606,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82643,7 +82643,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82674,7 +82674,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82705,7 +82705,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}",
                     "entry": {
                         "name": "In",
@@ -82736,7 +82736,7 @@
             ]
         },
         {
-            "key": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
+            "base": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -82746,7 +82746,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82783,7 +82783,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82827,7 +82827,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82856,7 +82856,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82887,7 +82887,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82918,7 +82918,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82949,7 +82949,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -82980,7 +82980,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83017,7 +83017,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83054,7 +83054,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83085,7 +83085,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83123,7 +83123,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83154,7 +83154,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83185,7 +83185,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}",
                     "entry": {
                         "name": "In",
@@ -83216,7 +83216,7 @@
             ]
         },
         {
-            "key": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}",
+            "base": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -83224,7 +83224,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}",
                     "entry": {
                         "name": "In",
@@ -83255,7 +83255,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}",
                     "entry": {
                         "name": "In",
@@ -83286,7 +83286,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}",
                     "entry": {
                         "name": "In",
@@ -83311,7 +83311,7 @@
             ]
         },
         {
-            "key": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
+            "base": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -83319,7 +83319,7 @@
             },
             "methods": [
                 {
-                    "key": "GetPlaneEquationCoefficients",
+                    "base": "GetPlaneEquationCoefficients",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83350,7 +83350,7 @@
                     ]
                 },
                 {
-                    "key": "GetDistance",
+                    "base": "GetDistance",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83381,7 +83381,7 @@
                     ]
                 },
                 {
-                    "key": "Project",
+                    "base": "Project",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83418,7 +83418,7 @@
                     ]
                 },
                 {
-                    "key": "FromNormalAndPoint",
+                    "base": "FromNormalAndPoint",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83455,7 +83455,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83486,7 +83486,7 @@
                     ]
                 },
                 {
-                    "key": "Transform",
+                    "base": "Transform",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83523,7 +83523,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceToPoint",
+                    "base": "DistanceToPoint",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83560,7 +83560,7 @@
                     ]
                 },
                 {
-                    "key": "FromCoefficients",
+                    "base": "FromCoefficients",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83609,7 +83609,7 @@
                     ]
                 },
                 {
-                    "key": "FromNormalAndDistance",
+                    "base": "FromNormalAndDistance",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83646,7 +83646,7 @@
                     ]
                 },
                 {
-                    "key": "GetNormal",
+                    "base": "GetNormal",
                     "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}",
                     "entry": {
                         "name": "In",
@@ -83679,7 +83679,7 @@
             ]
         },
         {
-            "key": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
+            "base": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -83689,7 +83689,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83726,7 +83726,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83769,7 +83769,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83798,7 +83798,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83829,7 +83829,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83860,7 +83860,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83891,7 +83891,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83922,7 +83922,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83959,7 +83959,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -83996,7 +83996,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -84027,7 +84027,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -84064,7 +84064,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -84095,7 +84095,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -84126,7 +84126,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}",
                     "entry": {
                         "name": "In",
@@ -84157,7 +84157,7 @@
             ]
         },
         {
-            "key": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
+            "base": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -84167,7 +84167,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84198,7 +84198,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84229,7 +84229,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84266,7 +84266,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84295,7 +84295,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84332,7 +84332,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84363,7 +84363,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84386,7 +84386,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84417,7 +84417,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84454,7 +84454,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84485,7 +84485,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84514,7 +84514,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84543,7 +84543,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84580,7 +84580,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84617,7 +84617,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84640,7 +84640,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84671,7 +84671,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84708,7 +84708,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84745,7 +84745,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84776,7 +84776,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84807,7 +84807,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84842,7 +84842,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84873,7 +84873,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84916,7 +84916,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84945,7 +84945,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -84974,7 +84974,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}",
                     "entry": {
                         "name": "In",
@@ -85007,7 +85007,7 @@
             ]
         },
         {
-            "key": "{3127F618-4C25-512D-97E2-888640B6303D}",
+            "base": "{3127F618-4C25-512D-97E2-888640B6303D}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -85017,7 +85017,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85054,7 +85054,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85098,7 +85098,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85127,7 +85127,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85158,7 +85158,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85189,7 +85189,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85220,7 +85220,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85251,7 +85251,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85288,7 +85288,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85325,7 +85325,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85356,7 +85356,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85394,7 +85394,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85425,7 +85425,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85456,7 +85456,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{3127F618-4C25-512D-97E2-888640B6303D}",
                     "entry": {
                         "name": "In",
@@ -85487,7 +85487,7 @@
             ]
         },
         {
-            "key": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
+            "base": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -85497,7 +85497,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85534,7 +85534,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85577,7 +85577,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85606,7 +85606,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85637,7 +85637,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85668,7 +85668,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85699,7 +85699,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85730,7 +85730,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85767,7 +85767,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85804,7 +85804,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85835,7 +85835,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85872,7 +85872,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85903,7 +85903,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85934,7 +85934,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}",
                     "entry": {
                         "name": "In",
@@ -85965,7 +85965,7 @@
             ]
         },
         {
-            "key": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}",
+            "base": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -85973,7 +85973,7 @@
             },
             "methods": [
                 {
-                    "key": "Get0",
+                    "base": "Get0",
                     "context": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}",
                     "entry": {
                         "name": "In",
@@ -86004,7 +86004,7 @@
                     ]
                 },
                 {
-                    "key": "Get1",
+                    "base": "Get1",
                     "context": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}",
                     "entry": {
                         "name": "In",
@@ -86035,7 +86035,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}",
                     "entry": {
                         "name": "In",
@@ -86060,7 +86060,7 @@
             ]
         },
         {
-            "key": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
+            "base": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -86070,7 +86070,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86107,7 +86107,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86150,7 +86150,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86179,7 +86179,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86210,7 +86210,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86241,7 +86241,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86272,7 +86272,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86303,7 +86303,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86340,7 +86340,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86377,7 +86377,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86408,7 +86408,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86445,7 +86445,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86476,7 +86476,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86507,7 +86507,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}",
                     "entry": {
                         "name": "In",
@@ -86538,7 +86538,7 @@
             ]
         },
         {
-            "key": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
+            "base": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -86548,7 +86548,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86585,7 +86585,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86628,7 +86628,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86657,7 +86657,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86688,7 +86688,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86719,7 +86719,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86750,7 +86750,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86781,7 +86781,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86818,7 +86818,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86855,7 +86855,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86886,7 +86886,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86923,7 +86923,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86954,7 +86954,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -86985,7 +86985,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}",
                     "entry": {
                         "name": "In",
@@ -87016,7 +87016,7 @@
             ]
         },
         {
-            "key": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
+            "base": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -87024,7 +87024,7 @@
             },
             "methods": [
                 {
-                    "key": "IsLoading",
+                    "base": "IsLoading",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87055,7 +87055,7 @@
                     ]
                 },
                 {
-                    "key": "GetType",
+                    "base": "GetType",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87086,7 +87086,7 @@
                     ]
                 },
                 {
-                    "key": "IsError",
+                    "base": "IsError",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87117,7 +87117,7 @@
                     ]
                 },
                 {
-                    "key": "GetHint",
+                    "base": "GetHint",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87148,7 +87148,7 @@
                     ]
                 },
                 {
-                    "key": "GetData",
+                    "base": "GetData",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87179,7 +87179,7 @@
                     ]
                 },
                 {
-                    "key": "IsReady",
+                    "base": "IsReady",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87210,7 +87210,7 @@
                     ]
                 },
                 {
-                    "key": "GetStatus",
+                    "base": "GetStatus",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87241,7 +87241,7 @@
                     ]
                 },
                 {
-                    "key": "GetId",
+                    "base": "GetId",
                     "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}",
                     "entry": {
                         "name": "In",
@@ -87274,7 +87274,7 @@
             ]
         },
         {
-            "key": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
+            "base": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -87284,7 +87284,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87321,7 +87321,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87364,7 +87364,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87393,7 +87393,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87424,7 +87424,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87455,7 +87455,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87486,7 +87486,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87517,7 +87517,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87554,7 +87554,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87591,7 +87591,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87622,7 +87622,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87659,7 +87659,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87690,7 +87690,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87721,7 +87721,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}",
                     "entry": {
                         "name": "In",
@@ -87752,7 +87752,7 @@
             ]
         },
         {
-            "key": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
+            "base": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -87762,7 +87762,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87799,7 +87799,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87842,7 +87842,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87871,7 +87871,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87902,7 +87902,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87933,7 +87933,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87964,7 +87964,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -87995,7 +87995,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88032,7 +88032,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88069,7 +88069,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88100,7 +88100,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88137,7 +88137,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88168,7 +88168,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88199,7 +88199,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}",
                     "entry": {
                         "name": "In",
@@ -88230,7 +88230,7 @@
             ]
         },
         {
-            "key": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
+            "base": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -88238,7 +88238,7 @@
             },
             "methods": [
                 {
-                    "key": "Reciprocal",
+                    "base": "Reciprocal",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88269,7 +88269,7 @@
                     ]
                 },
                 {
-                    "key": "Subtract",
+                    "base": "Subtract",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88306,7 +88306,7 @@
                     ]
                 },
                 {
-                    "key": "Project",
+                    "base": "Project",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88343,7 +88343,7 @@
                     ]
                 },
                 {
-                    "key": "Normalize",
+                    "base": "Normalize",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88374,7 +88374,7 @@
                     ]
                 },
                 {
-                    "key": "Distance",
+                    "base": "Distance",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88411,7 +88411,7 @@
                     ]
                 },
                 {
-                    "key": "SetZ",
+                    "base": "SetZ",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88448,7 +88448,7 @@
                     ]
                 },
                 {
-                    "key": "Max",
+                    "base": "Max",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88485,7 +88485,7 @@
                     ]
                 },
                 {
-                    "key": "GetElement",
+                    "base": "GetElement",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88522,7 +88522,7 @@
                     ]
                 },
                 {
-                    "key": "Absolute",
+                    "base": "Absolute",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88553,7 +88553,7 @@
                     ]
                 },
                 {
-                    "key": "BuildTangentBasis",
+                    "base": "BuildTangentBasis",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88584,7 +88584,7 @@
                     ]
                 },
                 {
-                    "key": "Clamp",
+                    "base": "Clamp",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88627,7 +88627,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByNumber",
+                    "base": "MultiplyByNumber",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88664,7 +88664,7 @@
                     ]
                 },
                 {
-                    "key": "Slerp",
+                    "base": "Slerp",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88707,7 +88707,7 @@
                     ]
                 },
                 {
-                    "key": "IsZero",
+                    "base": "IsZero",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88744,7 +88744,7 @@
                     ]
                 },
                 {
-                    "key": "SetY",
+                    "base": "SetY",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88781,7 +88781,7 @@
                     ]
                 },
                 {
-                    "key": "IsClose",
+                    "base": "IsClose",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88824,7 +88824,7 @@
                     ]
                 },
                 {
-                    "key": "Cross",
+                    "base": "Cross",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88861,7 +88861,7 @@
                     ]
                 },
                 {
-                    "key": "DirectionTo",
+                    "base": "DirectionTo",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88904,7 +88904,7 @@
                     ]
                 },
                 {
-                    "key": "MultiplyByVector",
+                    "base": "MultiplyByVector",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88941,7 +88941,7 @@
                     ]
                 },
                 {
-                    "key": "Negate",
+                    "base": "Negate",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -88972,7 +88972,7 @@
                     ]
                 },
                 {
-                    "key": "Add",
+                    "base": "Add",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89009,7 +89009,7 @@
                     ]
                 },
                 {
-                    "key": "IsPerpendicular",
+                    "base": "IsPerpendicular",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89052,7 +89052,7 @@
                     ]
                 },
                 {
-                    "key": "IsFinite",
+                    "base": "IsFinite",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89083,7 +89083,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByNumber",
+                    "base": "DivideByNumber",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89120,7 +89120,7 @@
                     ]
                 },
                 {
-                    "key": "IsNormalized",
+                    "base": "IsNormalized",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89157,7 +89157,7 @@
                     ]
                 },
                 {
-                    "key": "LengthSquared",
+                    "base": "LengthSquared",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89188,7 +89188,7 @@
                     ]
                 },
                 {
-                    "key": "FromValues",
+                    "base": "FromValues",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89231,7 +89231,7 @@
                     ]
                 },
                 {
-                    "key": "Dot",
+                    "base": "Dot",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89268,7 +89268,7 @@
                     ]
                 },
                 {
-                    "key": "SetX",
+                    "base": "SetX",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89305,7 +89305,7 @@
                     ]
                 },
                 {
-                    "key": "LengthReciprocal",
+                    "base": "LengthReciprocal",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89336,7 +89336,7 @@
                     ]
                 },
                 {
-                    "key": "Min",
+                    "base": "Min",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89373,7 +89373,7 @@
                     ]
                 },
                 {
-                    "key": "DistanceSquared",
+                    "base": "DistanceSquared",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89410,7 +89410,7 @@
                     ]
                 },
                 {
-                    "key": "Length",
+                    "base": "Length",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89441,7 +89441,7 @@
                     ]
                 },
                 {
-                    "key": "DivideByVector",
+                    "base": "DivideByVector",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89478,7 +89478,7 @@
                     ]
                 },
                 {
-                    "key": "Lerp",
+                    "base": "Lerp",
                     "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}",
                     "entry": {
                         "name": "In",
@@ -89523,7 +89523,7 @@
             ]
         },
         {
-            "key": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}",
+            "base": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -89531,7 +89531,7 @@
             },
             "methods": [
                 {
-                    "key": "HasHandlerConnected",
+                    "base": "HasHandlerConnected",
                     "context": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}",
                     "entry": {
                         "name": "In",
@@ -89564,7 +89564,7 @@
             ]
         },
         {
-            "key": "{2F556390-49B3-5F20-8206-21D323D977E6}",
+            "base": "{2F556390-49B3-5F20-8206-21D323D977E6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -89574,7 +89574,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89611,7 +89611,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89654,7 +89654,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89683,7 +89683,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89714,7 +89714,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89745,7 +89745,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89776,7 +89776,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89807,7 +89807,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89844,7 +89844,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89881,7 +89881,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89912,7 +89912,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89949,7 +89949,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -89980,7 +89980,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -90011,7 +90011,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{2F556390-49B3-5F20-8206-21D323D977E6}",
                     "entry": {
                         "name": "In",
@@ -90042,7 +90042,7 @@
             ]
         },
         {
-            "key": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
+            "base": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -90052,7 +90052,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90089,7 +90089,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90132,7 +90132,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90161,7 +90161,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90192,7 +90192,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90223,7 +90223,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90254,7 +90254,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90285,7 +90285,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90322,7 +90322,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90359,7 +90359,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90390,7 +90390,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90427,7 +90427,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90458,7 +90458,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90489,7 +90489,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}",
                     "entry": {
                         "name": "In",
@@ -90520,7 +90520,7 @@
             ]
         },
         {
-            "key": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
+            "base": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -90530,7 +90530,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90567,7 +90567,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90610,7 +90610,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90639,7 +90639,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90670,7 +90670,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90701,7 +90701,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90732,7 +90732,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90763,7 +90763,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90800,7 +90800,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90837,7 +90837,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90868,7 +90868,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90905,7 +90905,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90936,7 +90936,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90967,7 +90967,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}",
                     "entry": {
                         "name": "In",
@@ -90998,7 +90998,7 @@
             ]
         },
         {
-            "key": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
+            "base": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -91008,7 +91008,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91045,7 +91045,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91088,7 +91088,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91117,7 +91117,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91148,7 +91148,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91179,7 +91179,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91210,7 +91210,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91241,7 +91241,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91278,7 +91278,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91315,7 +91315,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91346,7 +91346,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91383,7 +91383,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91414,7 +91414,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91445,7 +91445,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}",
                     "entry": {
                         "name": "In",
@@ -91476,7 +91476,7 @@
             ]
         },
         {
-            "key": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
+            "base": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -91486,7 +91486,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91524,7 +91524,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91568,7 +91568,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91597,7 +91597,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91628,7 +91628,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91659,7 +91659,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91690,7 +91690,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91721,7 +91721,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91759,7 +91759,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91797,7 +91797,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91828,7 +91828,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91866,7 +91866,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91897,7 +91897,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91928,7 +91928,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}",
                     "entry": {
                         "name": "In",
@@ -91959,7 +91959,7 @@
             ]
         },
         {
-            "key": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
+            "base": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -91969,7 +91969,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92000,7 +92000,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92031,7 +92031,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92068,7 +92068,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92097,7 +92097,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92134,7 +92134,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92165,7 +92165,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92188,7 +92188,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92219,7 +92219,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92256,7 +92256,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92287,7 +92287,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92316,7 +92316,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92345,7 +92345,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92382,7 +92382,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92419,7 +92419,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92442,7 +92442,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92473,7 +92473,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92510,7 +92510,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92547,7 +92547,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92578,7 +92578,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92609,7 +92609,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92644,7 +92644,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92675,7 +92675,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92718,7 +92718,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92747,7 +92747,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92776,7 +92776,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}",
                     "entry": {
                         "name": "In",
@@ -92809,7 +92809,7 @@
             ]
         },
         {
-            "key": "{2B7F6107-B177-5C17-9408-823396E6D8B8}",
+            "base": "{2B7F6107-B177-5C17-9408-823396E6D8B8}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -92819,7 +92819,7 @@
             },
             "methods": [
                 {
-                    "key": "get",
+                    "base": "get",
                     "context": "{2B7F6107-B177-5C17-9408-823396E6D8B8}",
                     "entry": {
                         "name": "In",
@@ -92852,7 +92852,7 @@
             ]
         },
         {
-            "key": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
+            "base": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -92862,7 +92862,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -92893,7 +92893,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -92925,7 +92925,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -92962,7 +92962,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -92991,7 +92991,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93029,7 +93029,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93061,7 +93061,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93084,7 +93084,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93115,7 +93115,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93153,7 +93153,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93184,7 +93184,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93213,7 +93213,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93243,7 +93243,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93281,7 +93281,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93319,7 +93319,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93342,7 +93342,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93373,7 +93373,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93410,7 +93410,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93447,7 +93447,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93478,7 +93478,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93509,7 +93509,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93545,7 +93545,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93576,7 +93576,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93620,7 +93620,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93650,7 +93650,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93679,7 +93679,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}",
                     "entry": {
                         "name": "In",
@@ -93712,7 +93712,7 @@
             ]
         },
         {
-            "key": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
+            "base": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -93722,7 +93722,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93759,7 +93759,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93802,7 +93802,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93831,7 +93831,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93862,7 +93862,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93893,7 +93893,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93924,7 +93924,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93955,7 +93955,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -93992,7 +93992,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -94029,7 +94029,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -94060,7 +94060,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -94097,7 +94097,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -94128,7 +94128,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -94159,7 +94159,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}",
                     "entry": {
                         "name": "In",
@@ -94190,7 +94190,7 @@
             ]
         },
         {
-            "key": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
+            "base": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -94200,7 +94200,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94237,7 +94237,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94280,7 +94280,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94309,7 +94309,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94340,7 +94340,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94371,7 +94371,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94402,7 +94402,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94433,7 +94433,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94470,7 +94470,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94507,7 +94507,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94538,7 +94538,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94575,7 +94575,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94606,7 +94606,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94637,7 +94637,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}",
                     "entry": {
                         "name": "In",
@@ -94668,7 +94668,7 @@
             ]
         },
         {
-            "key": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
+            "base": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -94678,7 +94678,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94715,7 +94715,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94758,7 +94758,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94787,7 +94787,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94818,7 +94818,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94849,7 +94849,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94880,7 +94880,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94911,7 +94911,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94948,7 +94948,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -94985,7 +94985,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -95016,7 +95016,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -95053,7 +95053,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -95084,7 +95084,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -95115,7 +95115,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}",
                     "entry": {
                         "name": "In",
@@ -95146,7 +95146,7 @@
             ]
         },
         {
-            "key": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
+            "base": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -95156,7 +95156,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95187,7 +95187,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95218,7 +95218,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95255,7 +95255,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95284,7 +95284,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95321,7 +95321,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95352,7 +95352,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95375,7 +95375,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95406,7 +95406,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95443,7 +95443,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95474,7 +95474,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95503,7 +95503,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95532,7 +95532,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95569,7 +95569,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95606,7 +95606,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95629,7 +95629,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95660,7 +95660,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95697,7 +95697,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95734,7 +95734,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95765,7 +95765,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95796,7 +95796,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95831,7 +95831,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95862,7 +95862,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95905,7 +95905,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95934,7 +95934,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95963,7 +95963,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}",
                     "entry": {
                         "name": "In",
@@ -95996,7 +95996,7 @@
             ]
         },
         {
-            "key": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
+            "base": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -96006,7 +96006,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96044,7 +96044,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96088,7 +96088,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96117,7 +96117,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96148,7 +96148,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96179,7 +96179,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96210,7 +96210,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96241,7 +96241,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96279,7 +96279,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96317,7 +96317,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96348,7 +96348,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96386,7 +96386,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96417,7 +96417,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96448,7 +96448,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}",
                     "entry": {
                         "name": "In",
@@ -96479,7 +96479,7 @@
             ]
         },
         {
-            "key": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
+            "base": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -96489,7 +96489,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96527,7 +96527,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96571,7 +96571,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96600,7 +96600,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96631,7 +96631,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96662,7 +96662,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96693,7 +96693,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96724,7 +96724,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96762,7 +96762,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96800,7 +96800,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96831,7 +96831,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96869,7 +96869,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96900,7 +96900,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96931,7 +96931,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}",
                     "entry": {
                         "name": "In",
@@ -96962,7 +96962,7 @@
             ]
         },
         {
-            "key": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
+            "base": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -96972,7 +96972,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97009,7 +97009,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97052,7 +97052,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97081,7 +97081,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97112,7 +97112,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97143,7 +97143,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97174,7 +97174,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97205,7 +97205,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97242,7 +97242,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97279,7 +97279,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97310,7 +97310,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97347,7 +97347,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97378,7 +97378,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97409,7 +97409,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}",
                     "entry": {
                         "name": "In",
@@ -97440,7 +97440,7 @@
             ]
         },
         {
-            "key": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
+            "base": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -97448,7 +97448,7 @@
             },
             "methods": [
                 {
-                    "key": "has_value",
+                    "base": "has_value",
                     "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
                     "entry": {
                         "name": "In",
@@ -97479,7 +97479,7 @@
                     ]
                 },
                 {
-                    "key": "__bool__",
+                    "base": "__bool__",
                     "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
                     "entry": {
                         "name": "In",
@@ -97510,7 +97510,7 @@
                     ]
                 },
                 {
-                    "key": "value",
+                    "base": "value",
                     "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
                     "entry": {
                         "name": "In",
@@ -97541,7 +97541,7 @@
                     ]
                 },
                 {
-                    "key": "value_or",
+                    "base": "value_or",
                     "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}",
                     "entry": {
                         "name": "In",
@@ -97580,7 +97580,7 @@
             ]
         },
         {
-            "key": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
+            "base": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -97590,7 +97590,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97627,7 +97627,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97670,7 +97670,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97699,7 +97699,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97730,7 +97730,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97761,7 +97761,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97792,7 +97792,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97823,7 +97823,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97860,7 +97860,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97897,7 +97897,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97928,7 +97928,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97965,7 +97965,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -97996,7 +97996,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -98027,7 +98027,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}",
                     "entry": {
                         "name": "In",
@@ -98058,7 +98058,7 @@
             ]
         },
         {
-            "key": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
+            "base": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -98066,7 +98066,7 @@
             },
             "methods": [
                 {
-                    "key": "has_value",
+                    "base": "has_value",
                     "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
                     "entry": {
                         "name": "In",
@@ -98097,7 +98097,7 @@
                     ]
                 },
                 {
-                    "key": "__bool__",
+                    "base": "__bool__",
                     "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
                     "entry": {
                         "name": "In",
@@ -98128,7 +98128,7 @@
                     ]
                 },
                 {
-                    "key": "value",
+                    "base": "value",
                     "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
                     "entry": {
                         "name": "In",
@@ -98159,7 +98159,7 @@
                     ]
                 },
                 {
-                    "key": "value_or",
+                    "base": "value_or",
                     "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}",
                     "entry": {
                         "name": "In",
@@ -98198,7 +98198,7 @@
             ]
         },
         {
-            "key": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
+            "base": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -98206,7 +98206,7 @@
             },
             "methods": [
                 {
-                    "key": "has_value",
+                    "base": "has_value",
                     "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
                     "entry": {
                         "name": "In",
@@ -98237,7 +98237,7 @@
                     ]
                 },
                 {
-                    "key": "__bool__",
+                    "base": "__bool__",
                     "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
                     "entry": {
                         "name": "In",
@@ -98268,7 +98268,7 @@
                     ]
                 },
                 {
-                    "key": "value",
+                    "base": "value",
                     "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
                     "entry": {
                         "name": "In",
@@ -98299,7 +98299,7 @@
                     ]
                 },
                 {
-                    "key": "value_or",
+                    "base": "value_or",
                     "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}",
                     "entry": {
                         "name": "In",
@@ -98338,7 +98338,7 @@
             ]
         },
         {
-            "key": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
+            "base": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -98348,7 +98348,7 @@
             },
             "methods": [
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98385,7 +98385,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98428,7 +98428,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98457,7 +98457,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98488,7 +98488,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98519,7 +98519,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98550,7 +98550,7 @@
                     ]
                 },
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98581,7 +98581,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98618,7 +98618,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98655,7 +98655,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98686,7 +98686,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98723,7 +98723,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98754,7 +98754,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98785,7 +98785,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}",
                     "entry": {
                         "name": "In",
@@ -98816,7 +98816,7 @@
             ]
         },
         {
-            "key": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
+            "base": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -98826,7 +98826,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -98857,7 +98857,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -98888,7 +98888,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -98925,7 +98925,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -98954,7 +98954,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -98991,7 +98991,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99022,7 +99022,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99045,7 +99045,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99076,7 +99076,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99113,7 +99113,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99144,7 +99144,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99173,7 +99173,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99202,7 +99202,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99239,7 +99239,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99276,7 +99276,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99299,7 +99299,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99330,7 +99330,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99367,7 +99367,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99404,7 +99404,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99435,7 +99435,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99466,7 +99466,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99501,7 +99501,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99532,7 +99532,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99575,7 +99575,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99604,7 +99604,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99633,7 +99633,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}",
                     "entry": {
                         "name": "In",
@@ -99666,7 +99666,7 @@
             ]
         },
         {
-            "key": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
+            "base": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -99676,7 +99676,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99707,7 +99707,7 @@
                     ]
                 },
                 {
-                    "key": "GetKeys",
+                    "base": "GetKeys",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99738,7 +99738,7 @@
                     ]
                 },
                 {
-                    "key": "contains",
+                    "base": "contains",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99775,7 +99775,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99812,7 +99812,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99843,7 +99843,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99872,7 +99872,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99903,7 +99903,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99940,7 +99940,7 @@
                     ]
                 },
                 {
-                    "key": "Erase",
+                    "base": "Erase",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -99977,7 +99977,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -100008,7 +100008,7 @@
                     ]
                 },
                 {
-                    "key": "BucketCount",
+                    "base": "BucketCount",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -100039,7 +100039,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -100070,7 +100070,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}",
                     "entry": {
                         "name": "In",
@@ -100101,7 +100101,7 @@
             ]
         },
         {
-            "key": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
+            "base": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -100111,7 +100111,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100142,7 +100142,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100173,7 +100173,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100210,7 +100210,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100239,7 +100239,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100276,7 +100276,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100307,7 +100307,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100330,7 +100330,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100361,7 +100361,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100398,7 +100398,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100429,7 +100429,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100458,7 +100458,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100487,7 +100487,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100524,7 +100524,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100561,7 +100561,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100584,7 +100584,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100615,7 +100615,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100652,7 +100652,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100689,7 +100689,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100720,7 +100720,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100751,7 +100751,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100786,7 +100786,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100817,7 +100817,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100860,7 +100860,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100889,7 +100889,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100918,7 +100918,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}",
                     "entry": {
                         "name": "In",
@@ -100951,7 +100951,7 @@
             ]
         },
         {
-            "key": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
+            "base": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
             "context": "OnDemandReflected",
             "variant": "",
             "details": {
@@ -100961,7 +100961,7 @@
             },
             "methods": [
                 {
-                    "key": "Size",
+                    "base": "Size",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -100992,7 +100992,7 @@
                     ]
                 },
                 {
-                    "key": "Front",
+                    "base": "Front",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101023,7 +101023,7 @@
                     ]
                 },
                 {
-                    "key": "HasKey",
+                    "base": "HasKey",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101060,7 +101060,7 @@
                     ]
                 },
                 {
-                    "key": "Resize",
+                    "base": "Resize",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101089,7 +101089,7 @@
                     ]
                 },
                 {
-                    "key": "at",
+                    "base": "at",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101126,7 +101126,7 @@
                     ]
                 },
                 {
-                    "key": "Back",
+                    "base": "Back",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101157,7 +101157,7 @@
                     ]
                 },
                 {
-                    "key": "pop_back",
+                    "base": "pop_back",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101180,7 +101180,7 @@
                     ]
                 },
                 {
-                    "key": "size",
+                    "base": "size",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101211,7 +101211,7 @@
                     ]
                 },
                 {
-                    "key": "At",
+                    "base": "At",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101248,7 +101248,7 @@
                     ]
                 },
                 {
-                    "key": "Empty",
+                    "base": "Empty",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101279,7 +101279,7 @@
                     ]
                 },
                 {
-                    "key": "Swap",
+                    "base": "Swap",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101308,7 +101308,7 @@
                     ]
                 },
                 {
-                    "key": "push_back",
+                    "base": "push_back",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101337,7 +101337,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack_VM",
+                    "base": "PushBack_VM",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101374,7 +101374,7 @@
                     ]
                 },
                 {
-                    "key": "AtUnchecked",
+                    "base": "AtUnchecked",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101411,7 +101411,7 @@
                     ]
                 },
                 {
-                    "key": "clear",
+                    "base": "clear",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101434,7 +101434,7 @@
                     ]
                 },
                 {
-                    "key": "NotEmpty",
+                    "base": "NotEmpty",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101465,7 +101465,7 @@
                     ]
                 },
                 {
-                    "key": "Erase_VM",
+                    "base": "Erase_VM",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101502,7 +101502,7 @@
                     ]
                 },
                 {
-                    "key": "EraseCheck_VM",
+                    "base": "EraseCheck_VM",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101539,7 +101539,7 @@
                     ]
                 },
                 {
-                    "key": "Capacity",
+                    "base": "Capacity",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101570,7 +101570,7 @@
                     ]
                 },
                 {
-                    "key": "Clear",
+                    "base": "Clear",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101601,7 +101601,7 @@
                     ]
                 },
                 {
-                    "key": "AssignAt",
+                    "base": "AssignAt",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101636,7 +101636,7 @@
                     ]
                 },
                 {
-                    "key": "GetSize",
+                    "base": "GetSize",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101667,7 +101667,7 @@
                     ]
                 },
                 {
-                    "key": "Insert",
+                    "base": "Insert",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101710,7 +101710,7 @@
                     ]
                 },
                 {
-                    "key": "PushBack",
+                    "base": "PushBack",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101739,7 +101739,7 @@
                     ]
                 },
                 {
-                    "key": "Reserve",
+                    "base": "Reserve",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
@@ -101768,7 +101768,7 @@
                     ]
                 },
                 {
-                    "key": "Iterate_VM",
+                    "base": "Iterate_VM",
                     "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}",
                     "entry": {
                         "name": "In",
diff --git a/Gems/ScriptCanvas/Code/CMakeLists.txt b/Gems/ScriptCanvas/Code/CMakeLists.txt
index 9bdacde4df..7be5ec962e 100644
--- a/Gems/ScriptCanvas/Code/CMakeLists.txt
+++ b/Gems/ScriptCanvas/Code/CMakeLists.txt
@@ -57,6 +57,7 @@ ly_add_target(
     NAME ScriptCanvas.Static STATIC
     NAMESPACE Gem
     FILES_CMAKE
+        scriptcanvasgem_headers.cmake
         scriptcanvasgem_common_files.cmake
         scriptcanvasgem_runtime_asset_files.cmake
     INCLUDE_DIRECTORIES
@@ -89,6 +90,22 @@ ly_add_target(
         Gem::ScriptCanvasDebugger
 )
 
+ly_add_target(
+    NAME ScriptCanvas.API HEADERONLY
+    NAMESPACE Gem
+    FILES_CMAKE
+        scriptcanvasgem_headers.cmake
+    COMPILE_DEFINITIONS
+        INTERFACE
+            SCRIPTCANVAS_ERRORS_ENABLED
+            ${SCRIPT_CANVAS_COMMON_DEFINES}
+    INCLUDE_DIRECTORIES
+        INTERFACE
+            .
+            Include
+            ${SCRIPT_CANVAS_AUTOGEN_BUILD_DIR}
+)
+
 ly_add_target(
     NAME ScriptCanvas ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
index 8741505030..79621bbddb 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
@@ -1111,9 +1111,11 @@ namespace ScriptCanvasEditor
         return CanCreateConnectionBetween(scSourceEndpoint, scTargetEndpoint).IsSuccess();
     }
 
-    AZStd::string Graph::GetDataTypeString(const AZ::Uuid& typeId)
+    AZStd::string Graph::GetDataTypeString(const AZ::Uuid&)
     {
-        return TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId));
+        // This is used by the default tooltip setting in GraphCanvas, returning an empty string
+        // in order for tooltips to be fully controlled by ScriptCanvas
+        return {};
     }
 
     void Graph::OnRemoveUnusedNodes()
diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp
index bdd0ddf2ac..715489280d 100644
--- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp
@@ -11,6 +11,7 @@
 
 #include <GraphCanvas/Components/Nodes/NodeBus.h>
 
+#include <ScriptCanvas/Core/Slot.h>
 #include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
 
 #include <Editor/GraphCanvas/Components/DynamicSlotComponent.h>
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
index 158bfae9a0..06f2cd539f 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
@@ -168,6 +168,14 @@ namespace ScriptCanvasEditor::Nodes
 
         GraphCanvas::NodeTitleRequestBus::Event(graphCanvasEntity->GetId(), &GraphCanvas::NodeTitleRequests::SetTitle, details.m_name);
         GraphCanvas::NodeTitleRequestBus::Event(graphCanvasEntity->GetId(), &GraphCanvas::NodeTitleRequests::SetSubTitle, details.m_category);
+
+        // Add to the tooltip the C++ class for reference
+        if (!details.m_tooltip.empty())
+        {
+            details.m_tooltip.append("\n");
+        }
+        details.m_tooltip.append(AZStd::string::format("[C++] %s", node->GetNodeTypeName().c_str()));
+
         GraphCanvas::NodeRequestBus::Event(graphCanvasEntity->GetId(), &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
 
         if (!nodeConfiguration.m_titlePalette.empty())
@@ -258,17 +266,20 @@ namespace ScriptCanvasEditor::Nodes
         graphCanvasEntity->CreateComponent<SlotMappingComponent>(methodNode->GetEntityId());
         graphCanvasEntity->CreateComponent<SceneMemberMappingComponent>(methodNode->GetEntityId());
 
+        bool isAccessor = false;
         switch (methodNode->GetMethodType())
         {
         case ScriptCanvas::MethodType::Event:
             graphCanvasEntity->CreateComponent<EBusSenderNodeDescriptorComponent>();
             break;
-        case ScriptCanvas::MethodType::Member:
         case ScriptCanvas::MethodType::Getter:
         case ScriptCanvas::MethodType::Setter:
         case ScriptCanvas::MethodType::Free:
+            isAccessor = true;
+        case ScriptCanvas::MethodType::Member:
             graphCanvasEntity->CreateComponent<ClassMethodNodeDescriptorComponent>();
             break;
+            break;
         default:
             AZ_Error("ScriptCanvas", false, "Invalid method node type, node creation failed. This node needs to be deleted.");
             break;
@@ -288,20 +299,70 @@ namespace ScriptCanvasEditor::Nodes
 
         const bool isEBusSender = (methodNode->GetMethodType() == ScriptCanvas::MethodType::Event);
         const AZStd::string& className = methodNode->GetMethodClassName();
-        const AZStd::string& methodName = methodNode->GetName();
+        AZStd::string methodName = methodNode->GetName();
 
         GraphCanvas::TranslationKey key;
-        key = isEBusSender ? "EBusSender" : "BehaviorClass";
-        key << className;
-        key << "methods" << methodName;
+
+        if (isAccessor)
+        {
+            AZ::StringFunc::Replace(methodName, "::Getter", "");
+            AZ::StringFunc::Replace(methodName, "::Setter", "");
+        }
 
         GraphCanvas::TranslationRequests::Details details;
         details.m_name = methodName;
 
+        AZStd::string context;
+        if (methodNode->GetMethodType() == ScriptCanvas::MethodType::Free)
+        {
+            context = "Constant";
+        }
+        else
+        {
+            context = isEBusSender ? "EBusSender" : "BehaviorClass";
+        }
+        key << context << className;
+
         GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key + ".details", details);
 
-        GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetDetails, details.m_name, details.m_subtitle);
-        GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
+        // Set the class' name as the subtitle fallback
+        details.m_subtitle = details.m_name;
+
+        // Get the method's text data
+        GraphCanvas::TranslationRequests::Details methodDetails;
+        methodDetails.m_name = details.m_name; // fallback
+        key << "methods";
+        AZStd::string updatedMethodName = methodName;
+        if (isAccessor)
+        {
+            if (methodNode->GetMethodType() == ScriptCanvas::MethodType::Getter || methodNode->GetMethodType() == ScriptCanvas::MethodType::Free)
+            {
+                updatedMethodName = "Get";
+            }
+            else
+            {
+                updatedMethodName = "Set";
+            }
+            updatedMethodName.append(methodName);
+        }
+        key << updatedMethodName;
+        GraphCanvas::TranslationRequestBus::BroadcastResult(methodDetails, &GraphCanvas::TranslationRequests::GetDetails, key + ".details", methodDetails);
+
+
+        if (methodDetails.m_subtitle.empty())
+        {
+            methodDetails.m_subtitle = details.m_category;
+        }
+
+        // Add to the tooltip the C++ class for reference
+        if (!methodDetails.m_tooltip.empty())
+        {
+            methodDetails.m_tooltip.append("\n");
+        }
+        methodDetails.m_tooltip.append(AZStd::string::format("[C++] %s", className.c_str()));
+
+        GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetDetails, methodDetails.m_name, methodDetails.m_subtitle);
+        GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, methodDetails.m_tooltip);
 
         int paramIndex = 0;
         int outputIndex = 0;
@@ -329,8 +390,8 @@ namespace ScriptCanvasEditor::Nodes
 
                     if (slot.IsData())
                     {
-                        key = isEBusSender ? "EBusSender" : "BehaviorClass";
-                        key << className << "methods" << methodName;
+                        key.clear();
+                        key << context << className << "methods" << updatedMethodName;
                         if (slot.IsData() && slot.IsInput())
                         {
                             key << "params";
@@ -345,7 +406,7 @@ namespace ScriptCanvasEditor::Nodes
                     }
 
                     if (slot.IsData())
-                    {
+                    { 
                         index++;
                     }
                 }
@@ -449,6 +510,13 @@ namespace ScriptCanvasEditor::Nodes
         details.m_name = busName;
         GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
 
+        // Add to the tooltip the C++ class for reference
+        if (!details.m_tooltip.empty())
+        {
+            details.m_tooltip.append("\n");
+        }
+        details.m_tooltip.append(AZStd::string::format("[C++] %s", busName.c_str()));
+
         GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
         GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetTitle, details.m_name);
         GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetDefaultPalette, "HandlerWrapperNodeTitlePalette");
@@ -486,6 +554,13 @@ namespace ScriptCanvasEditor::Nodes
         // Set the name
         graphCanvasEntity->SetName(AZStd::string::format("GC-Node(%s)", decoratedName.c_str()));
 
+        // Add to the tooltip the C++ class for reference
+        if (!details.m_tooltip.empty())
+        {
+            details.m_tooltip.append("\n");
+        }
+        details.m_tooltip.append(AZStd::string::format("[C++] %s", busName.c_str()));
+
         GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
 
         GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetTitle, details.m_name);
@@ -730,7 +805,7 @@ namespace ScriptCanvasEditor::Nodes
         return graphCanvasNodeId;
     }
 
-// Function Nodes
+    // Function Nodes
     AZ::EntityId DisplayFunctionNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Core::FunctionCallNode* functionNode)
     {
         return DisplayFunctionNode(graphCanvasGraphId, const_cast<ScriptCanvas::Nodes::Core::FunctionCallNode*>(functionNode));
diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
index 262ea8c061..7ebbd4bc6d 100644
--- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
@@ -12,6 +12,7 @@
 #include <GraphCanvas/Components/Slots/SlotBus.h>
 #include <GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.h>
 
+#include <ScriptCanvas/Core/ModifiableDatumView.h>
 #include <ScriptCanvas/Core/NodeBus.h>
 
 namespace ScriptCanvasEditor::Nodes
diff --git a/Gems/ScriptCanvas/Code/Editor/Settings.cpp b/Gems/ScriptCanvas/Code/Editor/Settings.cpp
index 295f499e8d..84744f77e3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Settings.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Settings.cpp
@@ -398,6 +398,7 @@ namespace ScriptCanvasEditor
                     ->Field("ShowUpgradeDialog", &ScriptCanvasEditorSettings::m_showUpgradeDialog)
                     ->Field("ZoomSettings", &ScriptCanvasEditorSettings::m_zoomSettings)
                     ->Field("ExperimentalSettings", &ScriptCanvasEditorSettings::m_experimentalSettings)
+                    ->Field("SceneContextMenuNodePaletteWidth", &ScriptCanvasEditorSettings::m_sceneContextMenuNodePaletteWidth)
                     ;
 
                 AZ::EditContext* editContext = serialize->GetEditContext();
@@ -470,13 +471,13 @@ namespace ScriptCanvasEditor
                             ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_snapDistance, "Connection Snap Distance", "The distance from a slot under which connections will snap to it.")
                             ->Attribute(AZ::Edit::Attributes::Min, 10.0)
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_enableGroupDoubleClickCollapse, "Double Click to Collapse/Uncollapse Group", "Enables the user to decide whether you can double click on a group to collapse/uncollapse a group.")
+                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_enableGroupDoubleClickCollapse, "Double Click to Collapse/Expand Group", "Enables the user to decide whether you can double click on a group to collapse/expand a group.")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_allowBookmarkViewpointControl, "Bookmark Zooming", "Will cause the bookmarks to force the viewport into the state determined by the bookmark type\nBookmark Anchors - The viewport that exists when the bookmark is created.\nNode Groups - The area the Node Group covers")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_dragNodeCouplingConfig, "Node Coupling Configuration", "Controls for managing Node Coupling.\nNode Coupling is when you are dragging a node and leave it hovered over another Node, we will try to connect the sides you overlapped with each other.")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_dragNodeSplicingConfig, "Drag Node Splicing Configuration", "Controls for managing Node Splicing on a Drag.\nNode Splicing on a Drag will let you drag a node onto a connection, and splice that node onto the specified connection.")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_dropNodeSplicingConfig, "Drop Node Splicing Configuration", "Controls for managing Node Splicing on a Drag.\nNode Splicing on a drop will let you drop a node onto a connection from the Node Palette, and splice that node onto the specified connection.")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_autoSaveConfig, "AutoSave Configuration", "Controls for managing Auto Saving.\nAuto Saving will occur after the specified time of inactivity on a graph.")
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_shakeDespliceConfig, "Shake To Desplice", "Settings that controls various parameters of the Shake to Desplice feature")
+                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_shakeDespliceConfig, "Shake To De-splice", "Settings that controls various parameters of the Shake to De-splice feature")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_allowNodeNudging, "Allow Node Nudging", "Controls whether or not nodes will attempt to nudge each other out of the way under various interactions.")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_alignmentTimeMS, "Alignment Time", "Controls the amount of time nodes will take to slide into place when performing alignment commands")
                             ->Attribute(AZ::Edit::Attributes::Min, 0)
@@ -488,8 +489,10 @@ namespace ScriptCanvasEditor
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_experimentalSettings, "Experimental Settings", "Settings that will control elements that are under development and may not work as expected")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_saveRawTranslationOuputToFile, "Save Translation File", "Save out the raw result of translation for debug purposes")
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &SettingsCpp::UpdateProcessingSettings)
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_printAbstractCodeModel, "Print Abstract Modeld", "Print out the Abstract Code Model to the console at the end of parsing for debug purposes")
+                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_printAbstractCodeModel, "Print Abstract Model", "Print out the Abstract Code Model to the console at the end of parsing for debug purposes")
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &SettingsCpp::UpdateProcessingSettings)
+                        ->DataElement(AZ::Edit::UIHandlers::Default, &ScriptCanvasEditorSettings::m_sceneContextMenuNodePaletteWidth, "Context Menu Width", "Allows you to configure the width of the context menu that opens on a Script Canvas graph")
+                            ->Attribute(AZ::Edit::Attributes::Min, 120)
                         ;
 
                     editContext->Class<ExperimentalSettings>("Experimental", "Settings for features under development that may not behave as expected yet.")
diff --git a/Gems/ScriptCanvas/Code/Editor/Settings.h b/Gems/ScriptCanvas/Code/Editor/Settings.h
index 2871b3deca..27039d8a70 100644
--- a/Gems/ScriptCanvas/Code/Editor/Settings.h
+++ b/Gems/ScriptCanvas/Code/Editor/Settings.h
@@ -357,6 +357,8 @@ namespace ScriptCanvasEditor
             AZ::u32 m_alignmentTimeMS;
 
             StylingSettings m_stylingSettings;
+
+            AZ::u32 m_sceneContextMenuNodePaletteWidth = 300;
         };
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
index 189b665647..4d7eed7075 100644
--- a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
+++ b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
@@ -8,16 +8,8 @@
 
 #pragma once
 
-#include <QCoreApplication>
-
-#include <AzCore/Serialization/Json/StackedString.h>
-#include <AzCore/std/string/conversions.h>
-
-#include <ScriptCanvas/Core/Slot.h>
-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <Source/Translation/TranslationBus.h>
-#include <AzFramework/Gem/GemInfo.h>
-#include <AzCore/Settings/SettingsRegistry.h>
+#include <ScriptCanvas/Data/Data.h>
 
 namespace Translation
 {
@@ -28,447 +20,32 @@ namespace Translation
         static constexpr const char* MissingFunctionKey = "Globals.MissingFunction";
         static constexpr const char* EBusHandlerOutSlot = "Globals.EBusHandler.OutSlot";
     }
-
-    static inline bool GetValue(const AZStd::string key, AZStd::string& value)
-    {
-        GraphCanvas::TranslationKey tkey;
-        tkey = key;
-
-        bool result = false;
-        GraphCanvas::TranslationRequestBus::BroadcastResult(result, &GraphCanvas::TranslationRequests::Get, key, value);
-        return result;
-    }
-}
-
-
-namespace GraphCanvasAttributeHelper
-{
-    template <typename T>
-    AZStd::string GetStringAttribute(const T* source, const AZ::Crc32& attribute)
-    {
-        AZStd::string attributeValue = "";
-        if (auto attributeItem = azrtti_cast<AZ::AttributeData<AZStd::string>*>(AZ::FindAttribute(attribute, source->m_attributes)))
-        {
-            attributeValue = attributeItem->Get(nullptr);
-        }
-        return attributeValue;
-    }
-
-    inline AZStd::string ReadStringAttribute(const AZ::AttributeArray& attributes, const AZ::Crc32& attribute)
-    {
-        AZStd::string attributeValue = "";
-        if (auto attributeItem = azrtti_cast<AZ::AttributeData<AZStd::string>*>(AZ::FindAttribute(attribute, attributes)))
-        {
-            attributeValue = attributeItem->Get(nullptr);
-            return attributeValue;
-        }
-
-        if (auto attributeItem = azrtti_cast<AZ::AttributeData<const char*>*>(AZ::FindAttribute(attribute, attributes)))
-        {
-            attributeValue = attributeItem->Get(nullptr);
-            return attributeValue;
-        }
-
-        return {};
-    }
 }
 
 namespace ScriptCanvasEditor
 {
-    enum class TranslationContextGroup : AZ::u32
+    namespace TranslationHelper
     {
-        EbusSender,
-        EbusHandler,
-        ClassMethod,
-        GlobalMethod,
-        Invalid
-    };
-
-    enum class TranslationItemType : AZ::u32
-    {
-        Node,
-        Wrapper,
-        ExecutionInSlot,
-        ExecutionOutSlot,
-        ParamDataSlot,
-        ReturnDataSlot,
-        BusIdSlot,
-        Invalid
-    };
-
-    enum class TranslationKeyId : AZ::u32
-    {
-        Name,
-        Tooltip,
-        Category,
-        Invalid
-    };
-
-
-    namespace TranslationKeyParts
-    {
-        const char* const handler = "HANDLER_";
-        const char* const name = "NAME";
-        const char* const tooltip = "TOOLTIP";
-        const char* const category = "CATEGORY";
-        const char* const in = "IN";
-        const char* const out = "OUT";
-        const char* const param = "PARAM";
-        const char* const output = "OUTPUT";
-        const char* const busid = "BUSID";
-    }
-
-    namespace TranslationContextGroupParts
-    {
-        const char* const ebusSender  = "EBus";
-        const char* const ebusHandler = "Handler";
-        const char* const classMethod = "Method";
-        constexpr const char* const globalMethod = "GlobalMethod";
-    };
-
-    // The context name and keys generated by TranslationHelper should match the keys
-    // being exported by the TSGenerateAction.cpp in the ScriptCanvasDeveloper Gem.
-    class TranslationHelper
-    {
-    public:
-        static AZStd::string GetContextName(TranslationContextGroup group, AZStd::string_view keyBase)
-        {
-            if (group == TranslationContextGroup::Invalid || keyBase.empty())
-            {
-                // Missing information
-                return AZStd::string();
-            }
-
-            const char* groupPart;
-
-            switch (group)
-            {
-            case TranslationContextGroup::EbusSender:
-                groupPart = TranslationContextGroupParts::ebusSender;
-                break;
-            case TranslationContextGroup::EbusHandler:
-                groupPart = TranslationContextGroupParts::ebusHandler;
-                break;
-            case TranslationContextGroup::ClassMethod:
-                groupPart = TranslationContextGroupParts::classMethod;
-                break;
-            case TranslationContextGroup::GlobalMethod:
-                groupPart = TranslationContextGroupParts::globalMethod;
-                break;
-            default:
-                AZ_Warning("TranslationComponent", false, "Invalid translation group ID.");
-                groupPart = "";
-            }
-
-            AZStd::string fullKey = AZStd::string::format("%s: %.*s", groupPart,
-                aznumeric_cast<int>(keyBase.size()), keyBase.data());
-
-            return fullKey;
-        }
-        
-        // UserDefined
-        static AZStd::string GetUserDefinedNodeKey(AZStd::string_view contextName, AZStd::string_view nodeName, TranslationKeyId keyId)
-        {
-            return GetKey(TranslationContextGroup::ClassMethod, contextName, nodeName, TranslationItemType::Node, keyId);
-        }
-        ////
-
-        static AZStd::string GetKey(TranslationContextGroup group, AZStd::string_view keyBase, AZStd::string_view keyName, TranslationItemType type, TranslationKeyId keyId, int paramIndex = 0)
-        {
-            if (group == TranslationContextGroup::Invalid || keyBase.empty()
-                || type == TranslationItemType::Invalid || keyId == TranslationKeyId::Invalid)
-            {
-                // Missing information
-                return AZStd::string();
-            }
-
-            if (type != TranslationItemType::Wrapper && keyName.empty())
-            {
-                // Missing information
-                return AZStd::string();
-            }
-
-            AZStd::string fullKey;
-
-            const char* prefix = "";
-            if (group == TranslationContextGroup::EbusHandler)
-            {
-                prefix = TranslationKeyParts::handler;
-            }
-
-            const char* keyPart = GetKeyPart(keyId);
-
-            switch (type)
-            {
-            case TranslationItemType::Node:
-                fullKey = AZStd::string::format("%s%.*s_%.*s_%s",
-                    prefix,
-                    aznumeric_cast<int>(keyBase.size()),
-                    keyBase.data(),
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    keyPart
-                );
-                break;
-            case TranslationItemType::Wrapper:
-                fullKey = GetClassKey(group, keyBase, keyId);
-                break;
-            case TranslationItemType::ExecutionInSlot:
-                fullKey = AZStd::string::format("%s%.*s_%.*s_%s_%s",
-                    prefix,
-                    aznumeric_cast<int>(keyBase.size()),
-                    keyBase.data(),
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::in,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ExecutionOutSlot:
-                fullKey = AZStd::string::format("%s%.*s_%.*s_%s_%s",
-                    prefix,
-                    aznumeric_cast<int>(keyBase.size()),
-                    keyBase.data(),
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::out,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ParamDataSlot:
-                fullKey = AZStd::string::format("%s%.*s_%.*s_%s%d_%s",
-                    prefix,
-                    aznumeric_cast<int>(keyBase.size()),
-                    keyBase.data(),
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::param,
-                    paramIndex,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ReturnDataSlot:
-                fullKey = AZStd::string::format("%s%.*s_%.*s_%s%d_%s",
-                    prefix,
-                    aznumeric_cast<int>(keyBase.size()),
-                    keyBase.data(),
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::output,
-                    paramIndex,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::BusIdSlot:
-                fullKey = AZStd::string::format("%s%.*s_%.*s_%s_%s",
-                    prefix,
-                    aznumeric_cast<int>(keyBase.size()),
-                    keyBase.data(),
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::busid,
-                    keyPart
-                );
-                break;
-            default:
-                AZ_Warning("ScriptCanvas TranslationHelper", false, "Invalid translation item type.");
-            }
-
-            AZStd::to_upper(fullKey.begin(), fullKey.end());
-
-            return fullKey;
-        }
-
-        static AZStd::string GetClassKey(TranslationContextGroup group, AZStd::string_view keyBase, TranslationKeyId keyId)
-        {
-            const char* prefix = "";
-            if (group == TranslationContextGroup::EbusHandler)
-            {
-                prefix = TranslationKeyParts::handler;
-            }
-
-            const char* keyPart = GetKeyPart(keyId);
-
-            AZStd::string fullKey = AZStd::string::format("%s%.*s_%s",
-                prefix,
-                aznumeric_cast<int>(keyBase.size()),
-                keyBase.data(),
-                keyPart
-            );
-
-            AZStd::to_upper(fullKey.begin(), fullKey.end());
-
-            return fullKey;
-        }
-
-        static AZStd::string GetGlobalMethodKey(AZStd::string_view keyName, TranslationItemType keyType,
-            TranslationKeyId keyId, int paramIndex = 0)
-        {
-            const char* keyPart = GetKeyPart(keyId);
-
-            AZStd::string fullKey;
-            switch (keyType)
-            {
-            case TranslationItemType::Node:
-                fullKey = AZStd::string::format("%.*s_%s",
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ExecutionInSlot:
-                fullKey = AZStd::string::format("%.*s_%s_%s",
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::in,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ExecutionOutSlot:
-                fullKey = AZStd::string::format("%.*s_%s_%s",
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::out,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ParamDataSlot:
-                fullKey = AZStd::string::format("%.*s_%s%d_%s",
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::param,
-                    paramIndex,
-                    keyPart
-                );
-                break;
-            case TranslationItemType::ReturnDataSlot:
-                fullKey = AZStd::string::format("%.*s_%s%d_%s",
-                    aznumeric_cast<int>(keyName.size()),
-                    keyName.data(),
-                    TranslationKeyParts::output,
-                    paramIndex,
-                    keyPart
-                );
-                break;
-            default:
-                AZ_Warning("ScriptCanvas TranslationHelper", false, "Invalid translation item type.");
-            }
-
-            AZStd::to_upper(fullKey.begin(), fullKey.end());
-
-            return fullKey;
-        }
-
-        static const char* GetKeyPart(TranslationKeyId keyId)
-        {
-            const char* keyPart = "";
-
-            switch (keyId)
-            {
-            case TranslationKeyId::Name:
-                keyPart = TranslationKeyParts::name;
-                break;
-            case TranslationKeyId::Tooltip:
-                keyPart = TranslationKeyParts::tooltip;
-                break;
-            case TranslationKeyId::Category:
-                keyPart = TranslationKeyParts::category;
-                break;
-
-
-            default:
-                AZ_Warning("ScriptCanvas TranslationHelper", false, "Invalid translation key ID.");
-            }
-
-            return keyPart;
-        }
-
-        static TranslationItemType GetItemType(ScriptCanvas::SlotDescriptor slotDescriptor)
-        {
-            if (slotDescriptor == ScriptCanvas::SlotDescriptors::ExecutionIn())
-            {
-                return TranslationItemType::ExecutionInSlot;
-            }
-            else if (slotDescriptor == ScriptCanvas::SlotDescriptors::ExecutionOut())
-            {
-                return TranslationItemType::ExecutionOutSlot;
-            }
-            else if (slotDescriptor == ScriptCanvas::SlotDescriptors::DataIn())
-            {
-                return TranslationItemType::ParamDataSlot;
-            }
-            else if (slotDescriptor == ScriptCanvas::SlotDescriptors::DataOut())
-            {
-                return TranslationItemType::ReturnDataSlot;
-            }
-
-            return TranslationItemType::Invalid;
-        }
-
-        static AZStd::string GetSafeTypeName(ScriptCanvas::Data::Type dataType)
+        inline AZStd::string GetSafeTypeName(ScriptCanvas::Data::Type dataType)
         {
             if (!dataType.IsValid())
             {
                 return "";
             }
 
-            return ScriptCanvas::Data::GetName(dataType);
+            AZStd::string azType = dataType.GetAZType().ToString<AZStd::string>();
+
+            GraphCanvas::TranslationKey key;
+            key << "BehaviorType" << azType << "details";
+
+            GraphCanvas::TranslationRequests::Details details;
+
+            details.m_name = ScriptCanvas::Data::GetName(dataType);
+
+            GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
+
+            return details.m_name;
         }
-
-        static AZStd::string GetKeyTranslation(TranslationContextGroup group, AZStd::string_view keyBase, AZStd::string_view keyName, TranslationItemType type, TranslationKeyId keyId, int paramIndex = 0)
-        {
-            AZStd::string translationContext = TranslationHelper::GetContextName(group, keyBase);
-            AZStd::string translationKey = TranslationHelper::GetKey(group, keyBase, keyName, type, keyId, paramIndex);
-            AZStd::string translated = QCoreApplication::translate(translationContext.c_str(), translationKey.c_str()).toUtf8().data();
-
-            if (translated == translationKey)
-            {
-                return AZStd::string();
-            }
-
-            return translated;
-        }
-
-        static AZStd::string GetClassKeyTranslation(TranslationContextGroup group, AZStd::string_view keyBase, TranslationKeyId keyId)
-        {
-            AZStd::string translationContext = TranslationHelper::GetContextName(group, keyBase);
-            AZStd::string translationKey = TranslationHelper::GetClassKey(group, keyBase, keyId);
-            AZStd::string translated = QCoreApplication::translate(translationContext.c_str(), translationKey.c_str()).toUtf8().data();
-
-            if (translated == translationKey)
-            {
-                return AZStd::string();
-            }
-
-            return translated;
-        }
-
-        static AZStd::string GetGlobalMethodKeyTranslation(AZStd::string_view keyName,
-            TranslationItemType keyType, TranslationKeyId keyId, int paramIndex = 0)
-        {
-            AZStd::string translationKey = TranslationHelper::GetGlobalMethodKey(keyName, keyType, keyId, paramIndex);
-            AZStd::string translated = QCoreApplication::translate(TranslationContextGroupParts::globalMethod, translationKey.c_str()).toUtf8().data();
-
-            if (translated == translationKey)
-            {
-                return AZStd::string();
-            }
-
-            return translated;
-        }
-
-        // Use the StackedString to index the translation keys as a Json Pointer
-        static AZ::StackedString GetAzEventHandlerRootPointer(AZStd::string_view eventName)
-        {
-            AZ::StackedString path(AZ::StackedString::Format::JsonPointer);
-            path.Push(eventName);
-
-            return path;
-        }
-
-        
-
-    };
-
-
+    }
 }
+
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp
index 722e9d1c71..aa427b2629 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp
@@ -69,6 +69,9 @@ namespace ScriptCanvasEditor
         void CanvasWidget::ShowScene(const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
         {
             EditorGraphRequests* editorGraphRequests = EditorGraphRequestBus::FindFirstHandler(scriptCanvasId);
+
+                // #sc-editor-asset check if needed: editorGraphRequests->SetAssetId(m_assetId);
+            
             editorGraphRequests->CreateGraphCanvasScene();
 
             AZ::EntityId graphCanvasSceneId = editorGraphRequests->GetGraphCanvasGraphId();
@@ -81,6 +84,13 @@ namespace ScriptCanvasEditor
         void CanvasWidget::SetAssetId(const ScriptCanvasEditor::SourceHandle& assetId)
         {
             m_assetId = assetId;
+            // #sc-editor-asset check if needed: 
+            /*
+            if (EditorGraphRequests* editorGraphRequests = EditorGraphRequestBus::FindFirstHandler(m_scriptCanvasId))
+            {
+                editorGraphRequests->SetAssetId(m_assetId);
+            }
+            */
         }
 
         const GraphCanvas::ViewId& CanvasWidget::GetViewId() const
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
index 0b2b4f3bcc..6e8550b1f8 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
@@ -16,7 +16,6 @@
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/UserSettings/UserSettings.h>
 
-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <GraphCanvas/Components/SceneBus.h>
 #include <GraphCanvas/Components/StyleBus.h>
 
@@ -200,7 +199,7 @@ namespace ScriptCanvasEditor
     
     AZ::TypeId DataTypePaletteModel::FindTypeIdForIndex(const QModelIndex& index) const
     {   
-        AZ::TypeId retVal;
+        AZ::TypeId retVal = AZ::TypeId::CreateNull();
 
         if (index.row() >= 0 && index.row() < m_variableTypes.size())
         {
@@ -244,7 +243,16 @@ namespace ScriptCanvasEditor
 
     AZStd::string DataTypePaletteModel::FindTypeNameForTypeId(const AZ::TypeId& typeId) const
     {
-        return TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId));
+        GraphCanvas::TranslationKey key;
+        key << "BehaviorType" << typeId.ToString<AZStd::string>() << "details";
+
+        GraphCanvas::TranslationRequests::Details details;
+
+        details.m_name = TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId));
+
+        GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
+
+        return details.m_name;
     }
 
     void DataTypePaletteModel::TogglePendingPinChange(const AZ::Uuid& azVarType)
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp
index d73fe8a91b..b6bd26fa6c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp
@@ -83,7 +83,16 @@ namespace ScriptCanvasEditor
         , m_propertyStatus(propertyStatus)
     {
         GraphCanvas::TranslationKey key;
-        key << "BehaviorClass" << className << "methods" << methodName << "details";
+
+
+        AZStd::string updatedMethodName;
+        if (propertyStatus != ScriptCanvas::PropertyStatus::None)
+        {
+            updatedMethodName = (propertyStatus == ScriptCanvas::PropertyStatus::Getter) ? "Get" : "Set";
+        }
+        updatedMethodName.append(methodName);
+
+        key << "BehaviorClass" << className << "methods" << updatedMethodName << "details";
 
         GraphCanvas::TranslationRequests::Details details;
         details.m_name = methodName;
@@ -94,15 +103,6 @@ namespace ScriptCanvasEditor
         SetName(details.m_name.c_str());
         SetToolTip(details.m_tooltip.c_str());
 
-        if (propertyStatus == ScriptCanvas::PropertyStatus::Getter)
-        {
-            SetName(AZStd::string::format("Get %s", GetName().toUtf8().data()).data());
-        }
-        else if (propertyStatus == ScriptCanvas::PropertyStatus::Setter)
-        {
-            SetName(AZStd::string::format("Set %s", GetName().toUtf8().data()).data());
-        }
-
         SetTitlePalette("MethodNodeTitlePalette");
     }
 
@@ -160,13 +160,14 @@ namespace ScriptCanvasEditor
         : DraggableNodePaletteTreeItem(nodeModelInformation.m_methodName, ScriptCanvasEditor::AssetEditorId)
         , m_methodName{ nodeModelInformation.m_methodName }
     {
-        SetToolTip(QString::fromUtf8(nodeModelInformation.m_displayName.data(),
-            aznumeric_cast<int>(nodeModelInformation.m_displayName.size())));
-
         SetToolTip(QString::fromUtf8(nodeModelInformation.m_toolTip.data(),
             aznumeric_cast<int>(nodeModelInformation.m_toolTip.size())));
 
         SetTitlePalette("MethodNodeTitlePalette");
+        if (!nodeModelInformation.m_displayName.empty())
+        {
+            SetName(nodeModelInformation.m_displayName.c_str());
+        }
     }
 
     GraphCanvas::GraphCanvasMimeEvent* GlobalMethodEventPaletteTreeItem::CreateMimeEvent() const
@@ -180,6 +181,27 @@ namespace ScriptCanvasEditor
         return m_methodName;
     }
 
+    AZ::IO::Path GlobalMethodEventPaletteTreeItem::GetTranslationDataPath() const
+    {
+        AZStd::string propertyName = m_methodName;
+        AZ::StringFunc::Replace(propertyName, "::Getter", "");
+        AZ::StringFunc::Replace(propertyName, "::Setter", "");
+
+        AZStd::string filename = GraphCanvas::TranslationKey::Sanitize(propertyName);
+
+        return AZ::IO::Path("Properties") / filename;
+    }
+
+    void GlobalMethodEventPaletteTreeItem::GenerateTranslationData()
+    {
+        AZStd::string propertyName = m_methodName;
+        AZ::StringFunc::Replace(propertyName, "::Getter", "");
+        AZ::StringFunc::Replace(propertyName, "::Setter", "");
+
+        ScriptCanvasEditorTools::TranslationGeneration translation;
+        translation.TranslateBehaviorProperty(propertyName);
+    }
+
     //////////////////////////////
     // CreateCustomNodeMimeEvent
     //////////////////////////////
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h
index f41e236577..c14d6c62ae 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h
@@ -70,10 +70,13 @@ namespace ScriptCanvasEditor
             AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext);
 
             const char* className = m_className.toUtf8().data();
-            auto behaviorClass = behaviorContext->m_classes.find(className);
+            if (behaviorContext->m_classes.contains(className))
+            {
+                auto behaviorClass = behaviorContext->m_classes.find(className);
 
-            ScriptCanvasEditorTools::TranslationGeneration translation;
-            translation.TranslateBehaviorClass(behaviorClass->second);
+                ScriptCanvasEditorTools::TranslationGeneration translation;
+                translation.TranslateBehaviorClass(behaviorClass->second);
+            }
         }
 
     private:
@@ -121,6 +124,10 @@ namespace ScriptCanvasEditor
 
         const AZStd::string& GetMethodName() const;
 
+        AZ::IO::Path GetTranslationDataPath() const override;
+        void GenerateTranslationData() override;
+
+
     private:
         AZStd::string m_methodName;
     };
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
index 167dc92009..dc221deec0 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
@@ -611,8 +611,9 @@ namespace
                     {
                         categoryPath.append(details.m_name.c_str());
                     }
-                    else
+                    else if (categoryPath.contains("Other"))
                     {
+                        // Use the BehaviorEBus name to categorize within the 'Other' category
                         categoryPath.append(behaviorEbus.m_name.c_str());
                     }
                 }
@@ -657,8 +658,9 @@ namespace
             {
                 categoryPath.append(details.m_name.c_str());
             }
-            else
+            else if (categoryPath.contains("Other"))
             {
+                // Use the behavior EBus name to categorize within the 'Other' category
                 categoryPath.append(behaviorEbus.m_name.c_str());
             }
 
@@ -877,6 +879,7 @@ namespace ScriptCanvasEditor
 
     void NodePaletteModel::RepopulateModel()
     {
+        AZ_PROFILE_FUNCTION(ScriptCanvas);
         ClearRegistry();
 
         PopulateNodePaletteModel((*this));
@@ -1019,12 +1022,19 @@ namespace ScriptCanvasEditor
             GraphCanvas::TranslationRequestBus::BroadcastResult(catdetails, &GraphCanvas::TranslationRequests::GetDetails, catkey, catdetails);
 
             GraphCanvas::TranslationKey key;
-            key << "BehaviorClass" << methodClass.c_str() << "methods" << methodName.c_str() << "details";
+
+            AZStd::string updatedMethodName;
+            if (propertyStatus != ScriptCanvas::PropertyStatus::None)
+            {
+                updatedMethodName = (propertyStatus == ScriptCanvas::PropertyStatus::Getter) ? "Get" : "Set";
+            }
+            updatedMethodName += methodName;
+            key << "BehaviorClass" << methodClass.c_str() << "methods" << updatedMethodName << "details";
 
             GraphCanvas::TranslationRequests::Details details;
             GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
 
-            methodModelInformation->m_displayName = details.m_name.empty() ? methodName : details.m_name;
+            methodModelInformation->m_displayName = details.m_name.empty() ? updatedMethodName : details.m_name;
             methodModelInformation->m_toolTip = details.m_tooltip;
             methodModelInformation->m_categoryPath = categoryPath;
 
@@ -1049,17 +1059,22 @@ namespace ScriptCanvasEditor
         if (auto registerIter = m_registeredNodes.find(nodeIdentifier); registerIter == m_registeredNodes.end())
         {
             auto  methodModelInformation = AZStd::make_unique<GlobalMethodNodeModelInformation>();
-            methodModelInformation->m_methodName = behaviorMethod.m_name;
             methodModelInformation->m_nodeIdentifier = nodeIdentifier;
+            methodModelInformation->m_methodName = behaviorMethod.m_name;
 
             methodModelInformation->m_titlePaletteOverride = "MethodNodeTitlePalette";
 
+            AZStd::string name = behaviorProperty->m_name;
+            AZ::StringFunc::Replace(name, "::Getter", "");
+            AZ::StringFunc::Replace(name, "::Setter", "");
+
             GraphCanvas::TranslationKey key;
-            key << "Constant" << behaviorProperty->m_name.c_str() << "details";
+            key << "Constant" << name << "details";
 
             GraphCanvas::TranslationRequests::Details details;
             GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
 
+
             methodModelInformation->m_displayName = details.m_name;
             methodModelInformation->m_toolTip = details.m_tooltip;
             methodModelInformation->m_categoryPath = details.m_category;
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
index 5b7d7a885f..bf8482f0ca 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
@@ -26,12 +26,18 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/UserSettings/UserSettings.h>
 #include <AzCore/std/containers/map.h>
+
+#include <AzFramework/Gem/GemInfo.h>
 #include <AzFramework/StringFunc/StringFunc.h>
+
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h>
 #include <AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h>
 #include <AzToolsFramework/AssetEditor/AssetEditorUtils.h>
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
+
+#include <AzQtComponents/Utilities/DesktopUtilities.h>
+
 #include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 #include <Editor/Components/IconComponent.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
@@ -50,9 +56,11 @@
 #include <Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h>
 #include <Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h>
 #include <Editor/View/Widgets/ui_ScriptCanvasNodePaletteToolbar.h>
+
 #include <GraphCanvas/Widgets/NodePalette/NodePaletteTreeView.h>
 #include <GraphCanvas/Widgets/NodePalette/NodePaletteWidget.h>
 #include <GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h>
+
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
 #include <ScriptCanvas/Core/Attributes.h>
 #include <ScriptCanvas/Core/SubgraphInterfaceUtility.h>
@@ -63,7 +71,6 @@
 #include <ScriptCanvas/Libraries/Libraries.h>
 #include <ScriptCanvas/Utils/NodeUtils.h>
 #include <ScriptEvents/ScriptEventsAsset.h>
-#include "AzQtComponents/Utilities/DesktopUtilities.h"
 
 namespace ScriptCanvasEditor
 {
@@ -639,7 +646,7 @@ namespace ScriptCanvasEditor
             m_mimeType = NodePaletteDockWidget::GetMimeType();
             m_isInContextMenu = isInContextMenu;
             m_allowArrowKeyNavigation = isInContextMenu;
-            m_saveIdentifier = m_isInContextMenu ? "ScriptCanvas" : "ScriptCnavas_ContextMenu";
+            m_saveIdentifier = m_isInContextMenu ? "ScriptCanvas" : "ScriptCanvas_ContextMenu";
 
             m_rootTreeItem = Widget::NodePaletteWidget::ExternalCreateNodePaletteRoot(nodePaletteModel, assetModel);
         }
@@ -710,7 +717,7 @@ namespace ScriptCanvasEditor
 
                 {
                     m_openTranslationData = new QAction(treeView);
-                    m_openTranslationData->setText("Open Translation Data");
+                    m_openTranslationData->setText("Explore Translation Data");
                     treeView->addAction(m_openTranslationData);
 
                     QObject::connect(m_openTranslationData, &QAction::triggered, this, &NodePaletteDockWidget::OpenTranslationData);
@@ -877,17 +884,14 @@ namespace ScriptCanvasEditor
         {
             QModelIndexList indexList = GetTreeView()->selectionModel()->selectedRows();
 
-            if (indexList.size() == 1)
+            QSortFilterProxyModel* filterModel = static_cast<QSortFilterProxyModel*>(GetTreeView()->model());
+
+            for (const QModelIndex& index : indexList)
             {
-                QSortFilterProxyModel* filterModel = static_cast<QSortFilterProxyModel*>(GetTreeView()->model());
+                QModelIndex sourceIndex = filterModel->mapToSource(index);
 
-                for (const QModelIndex& index : indexList)
-                {
-                    QModelIndex sourceIndex = filterModel->mapToSource(index);
-
-                    GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast<GraphCanvas::NodePaletteTreeItem*>(sourceIndex.internalPointer());
-                    nodePaletteItem->GenerateTranslationData();
-                }
+                GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast<GraphCanvas::NodePaletteTreeItem*>(sourceIndex.internalPointer());
+                nodePaletteItem->GenerateTranslationData();
             }
         }
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
index 00ce022cb5..2e9c5d1852 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
@@ -19,7 +19,6 @@
 
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
 
-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <GraphCanvas/Components/SceneBus.h>
 #include <GraphCanvas/Components/StyleBus.h>
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
index 56b0cb3e55..6fdf154d69 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
@@ -18,7 +18,6 @@
 
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
 
-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <GraphCanvas/Components/SceneBus.h>
 #include <GraphCanvas/Components/StyleBus.h>
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
index 3535fa34cf..06877a5659 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
@@ -416,6 +416,8 @@ namespace ScriptCanvasEditor
         , m_closeCurrentGraphAfterSave(false)
         , m_styleManager(ScriptCanvasEditor::AssetEditorId, "ScriptCanvas/StyleSheet/graphcanvas_style.json")
     {
+        AZ_PROFILE_FUNCTION(ScriptCanvas);
+
         VariablePaletteRequestBus::Handler::BusConnect();
         GraphCanvas::AssetEditorAutomationRequestBus::Handler::BusConnect(ScriptCanvasEditor::AssetEditorId);
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
index e4a95d7d19..6402a24b3a 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
@@ -12,6 +12,8 @@
 #include <QMimeData>
 #include <QInputDialog>
 
+#include <AzCore/UserSettings/UserSettings.h>
+
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
 #include <Editor/Nodes/NodeUtils.h>
@@ -41,6 +43,8 @@
 #include <Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h>
 
 #include "ScriptCanvasContextMenus.h"
+#include "Settings.h"
+
 #include <ScriptCanvas/Core/NodeBus.h>
 #include <ScriptCanvas/Core/Slot.h>
 #include <GraphCanvas/Editor/EditorTypes.h>
@@ -53,6 +57,7 @@
 #include <GraphCanvas/Components/Nodes/NodeTitleBus.h>
 #include <GraphCanvas/Components/NodeDescriptors/FunctionDefinitionNodeDescriptorComponent.h>
 
+
 namespace ScriptCanvasEditor
 {
     ////////////////////////////
@@ -805,6 +810,13 @@ namespace ScriptCanvasEditor
     SceneContextMenu::SceneContextMenu(const NodePaletteModel& paletteModel, AzToolsFramework::AssetBrowser::AssetBrowserFilterModel* assetModel)
         : GraphCanvas::SceneContextMenu(ScriptCanvasEditor::AssetEditorId)
     {
+
+        auto userSettings = AZ::UserSettings::CreateFind<EditorSettings::ScriptCanvasEditorSettings>(AZ_CRC("ScriptCanvasPreviewSettings", 0x1c5a2965), AZ::UserSettings::CT_LOCAL);
+        if (userSettings)
+        {
+            m_userNodePaletteWidth = userSettings->m_sceneContextMenuNodePaletteWidth;
+        }
+
         const bool inContextMenu = true;
         Widget::ScriptCanvasNodePaletteConfig paletteConfig(paletteModel, assetModel, inContextMenu);
         AddNodePaletteMenuAction(paletteConfig);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp
index 0dcd8ebbbd..d55fcf7838 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.cpp
@@ -59,6 +59,7 @@ namespace ScriptCanvas
             m_script = AZStd::move(other.m_script);
             m_requiredAssets = AZStd::move(other.m_requiredAssets);
             m_requiredScriptEvents = AZStd::move(other.m_requiredScriptEvents);
+            m_areStaticsInitialized = AZStd::move(other.m_areStaticsInitialized);
         }
 
         return *this;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
index 24c83b20a1..8c5da5ac07 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAsset.h
@@ -76,6 +76,9 @@ namespace ScriptCanvas
         AZStd::vector<AZ::BehaviorValueParameter> m_activationInputStorage;
         Execution::ActivationInputRange m_activationInputRange;
 
+        // used to initialize statics only once, and not necessarily on the loading thread
+        bool m_areStaticsInitialized = false;
+
         bool RequiresStaticInitialization() const;
 
         bool RequiresDependencyConstructionParameters() const;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
index df7b07d37b..05b6f4397b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
@@ -94,7 +94,6 @@ namespace ScriptCanvas
             RuntimeAsset* runtimeAsset = asset.GetAs<RuntimeAsset>();
             AZ_Assert(runtimeAsset, "RuntimeAssetHandler::InitAsset This should be a Script Canvas runtime asset, as this is the only type this handler processes!");
             Execution::Context::InitializeActivationData(runtimeAsset->GetData());
-            Execution::InitializeInterpretedStatics(runtimeAsset->GetData());
         }
     }
 
@@ -157,4 +156,5 @@ namespace ScriptCanvas
             }
         }
     }
+
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
index 4361446867..67f947004b 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
@@ -56,10 +56,16 @@ namespace ScriptCanvas
             {
                 const Data::Type outputType = (unpackedTypes.size() == 1 && AZ::BehaviorContextHelper::IsStringParameter(*result)) ? Data::Type::String() : Data::FromAZType(unpackedTypes[resultIndex]);
 
-                AZStd::string resultSlotName(AZStd::string::format("Result: %s", Data::GetName(outputType).data()));
+                AZStd::string resultSlotName(Data::GetName(outputType));
+
+                AZStd::string className = outputConfig.config.m_className ? *outputConfig.config.m_className : "";
+                if (className.empty())
+                {
+                    className = outputConfig.config.m_prettyClassName;
+                }
 
                 GraphCanvas::TranslationKey key;
-                key << "BehaviorClass" << *outputConfig.config.m_className << "methods" << *outputConfig.config.m_lookupName << "results" << resultIndex << "details";
+                key << "BehaviorClass" << className << "methods" << *outputConfig.config.m_lookupName << "results" << resultIndex << "details";
 
                 GraphCanvas::TranslationRequests::Details details;
                 GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
@@ -74,7 +80,6 @@ namespace ScriptCanvas
                 if (outputConfig.isReturnValueOverloaded)
                 {
                     DynamicDataSlotConfiguration slotConfiguration;
-                    //slotConfiguration.m_name = outputConfig.outputNamePrefix + resultSlotName;
 
                     slotConfiguration.m_dynamicDataType = outputConfig.methodNode->GetOverloadedOutputType(resultIndex);
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
index cdff40306f..c4143e7295 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
@@ -2963,6 +2963,11 @@ namespace ScriptCanvas
         }
     }
 
+    AZStd::string Node::GetNodeTypeName() const
+    {
+        return RTTI_GetTypeName();
+    }
+
     AZStd::string Node::GetDebugName() const
     {
         if (GetEntityId().IsValid())
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
index 2bd9beb563..97916c8af6 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
@@ -525,6 +525,7 @@ namespace ScriptCanvas
 
         void SignalDeserialized();
 
+        virtual AZStd::string GetNodeTypeName() const;
         virtual AZStd::string GetDebugName() const;
         virtual AZStd::string GetNodeName() const;
 
@@ -1093,7 +1094,7 @@ protected:
             {
                 DataSlotConfiguration slotConfiguration;
 
-                slotConfiguration.m_name = AZStd::string::format("%s: %s", t_Traits::GetResultName(0), Data::GetName(Data::FromAZType<AZStd::decay_t<ResultType>>()).data());
+                slotConfiguration.m_name = t_Traits::GetResultName(0);
                 slotConfiguration.SetType(Data::FromAZType<AZStd::decay_t<ResultType>>());
                 slotConfiguration.SetConnectionType(ConnectionType::Output);
 
@@ -1115,7 +1116,7 @@ protected:
             {
                 DataSlotConfiguration slotConfiguration;
 
-                slotConfiguration.m_name = AZStd::string::format("%s: %s", t_Traits::GetResultName(Index), Data::GetName(Data::FromAZType<AZStd::decay_t<AZStd::tuple_element_t<Index, ResultType>>>()).data());
+                slotConfiguration.m_name = t_Traits::GetResultName(Index);
                 slotConfiguration.SetType(Data::FromAZType<AZStd::decay_t<AZStd::tuple_element_t<Index, ResultType>>>());
 
                 slotConfiguration.SetConnectionType(connectionType);                
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
index 771a51f376..549c56d07d 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
@@ -256,7 +256,7 @@ namespace ScriptCanvas
         {
             DataSlotConfiguration slotConfiguration;
 
-            slotConfiguration.m_name = AZStd::string::format("%s: %s", Data::Traits<ArgType>::GetName().data(), t_Traits::GetArgName(Index));
+            slotConfiguration.m_name = t_Traits::GetArgName(Index);
             slotConfiguration.ConfigureDatum(AZStd::move(Datum(Data::FromAZType(Data::Traits<ArgType>::GetAZType()), Datum::eOriginality::Copy)));
 
             slotConfiguration.SetConnectionType(connectionType);
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h
index 6a3c95d1e1..ca25013d35 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h
@@ -182,7 +182,7 @@ namespace ScriptCanvas
 
             static AZ::Uuid GetAZType(const Data::Type& = {}) { return azrtti_typeid<CRCType>(); }
             static Data::Type GetSCType(const AZ::TypeId& = AZ::TypeId::CreateNull()) { return Data::Type::CRC(); }
-            static AZStd::string GetName(const Data::Type& = {}) { return "CRC"; }
+            static AZStd::string GetName(const Data::Type& = {}) { return "Tag"; }
             static Type GetDefault(const Data::Type& = {}) { return CRCType(); }
             static bool IsDefault(const Type& value, const Data::Type& = {}) { return value == GetDefault(); }
         };
@@ -198,7 +198,7 @@ namespace ScriptCanvas
 
             static AZ::Uuid GetAZType(const Data::Type& = {}) { return azrtti_typeid<EntityIDType>(); }
             static Data::Type GetSCType(const AZ::TypeId& = AZ::TypeId::CreateNull()) { return Data::Type::EntityID(); }
-            static AZStd::string GetName(const Data::Type& = {}) { return "EntityID"; }
+            static AZStd::string GetName(const Data::Type& = {}) { return "EntityId"; }
             static Type GetDefault(const Data::Type& = {}) { return GraphOwnerId; }
             static bool IsDefault(const Type& value, const Data::Type& = {}) { return value == GetDefault(); }
         };
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h
index 8c2f0a67c4..89ddf178f3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionState.h
@@ -19,6 +19,10 @@
 #include <ScriptCanvas/Execution/ExecutionStateDeclarations.h>
 #include <ScriptCanvas/Grammar/PrimitivesDeclarations.h>
 
+#if !defined(_RELEASE)
+#define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK
+#endif
+
 namespace AZ
 {
     class ReflectContext;
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
index 3b95c7895c..1855b348f2 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
@@ -501,41 +501,53 @@ namespace ScriptCanvas
             return lua_gettop(lua);
         }
 
-        void InitializeInterpretedStatics(const RuntimeData& runtimeData)
+        void InitializeInterpretedStatics(RuntimeData& runtimeData)
         {
-#if defined(AZ_PROFILE_BUILD) || defined(AZ_DEBUG_BUILD)
-            Execution::InitializeFromLuaStackFunctions(const_cast<Grammar::DebugSymbolMap&>(runtimeData.m_debugMap));
-#endif
-            if (runtimeData.RequiresStaticInitialization())
+            if (!runtimeData.m_areStaticsInitialized)
             {
-                AZ::ScriptLoadResult result{};
-                AZ::ScriptSystemRequestBus::BroadcastResult(result, &AZ::ScriptSystemRequests::LoadAndGetNativeContext, runtimeData.m_script, AZ::k_scriptLoadBinary, AZ::ScriptContextIds::DefaultScriptContextId);
-                AZ_Assert(result.status == AZ::ScriptLoadResult::Status::Initial, "ExecutionStateInterpreted script asset was valid but failed to load.");
-                AZ_Assert(result.lua, "Must have a default script context and a lua_State");
-                AZ_Assert(lua_istable(result.lua, -1), "No run-time execution was available for this script");
+                runtimeData.m_areStaticsInitialized = true;
 
-                auto lua = result.lua;
-                // Lua: table
-                lua_getfield(lua, -1, Grammar::k_InitializeStaticsName);
-                // Lua: table, ?
-                if (lua_isfunction(lua, -1))
+                for (auto& dependency : runtimeData.m_requiredAssets)
                 {
-                    // Lua: table, function
-                    lua_pushvalue(lua, -2);
-                    // Lua: table, function, table
-                    for (auto& clonerSource : runtimeData.m_cloneSources)
-                    {
-                        lua_pushlightuserdata(lua, const_cast<void*>(reinterpret_cast<const void*>(&clonerSource)));
-                    }
-                    // Lua: table, function, table, cloners...
-                    AZ::Internal::LuaSafeCall(lua, aznumeric_caster(runtimeData.m_cloneSources.size() + 1), 0);
-                    // Lua: table
-                    lua_pop(lua, 1);
+                    InitializeInterpretedStatics(dependency.Get()->GetData());
                 }
-                else
+
+#if defined(AZ_PROFILE_BUILD) || defined(AZ_DEBUG_BUILD)
+                Execution::InitializeFromLuaStackFunctions(const_cast<Grammar::DebugSymbolMap&>(runtimeData.m_debugMap));
+#endif
+                AZ_WarningOnce("ScriptCanvas", !runtimeData.m_areStaticsInitialized, "ScriptCanvas runtime data already initalized");
+
+                if (runtimeData.RequiresStaticInitialization())
                 {
+                    AZ::ScriptLoadResult result{};
+                    AZ::ScriptSystemRequestBus::BroadcastResult(result, &AZ::ScriptSystemRequests::LoadAndGetNativeContext, runtimeData.m_script, AZ::k_scriptLoadBinary, AZ::ScriptContextIds::DefaultScriptContextId);
+                    AZ_Assert(result.status == AZ::ScriptLoadResult::Status::Initial, "ExecutionStateInterpreted script asset was valid but failed to load.");
+                    AZ_Assert(result.lua, "Must have a default script context and a lua_State");
+                    AZ_Assert(lua_istable(result.lua, -1), "No run-time execution was available for this script");
+
+                    auto lua = result.lua;
+                    // Lua: table
+                    lua_getfield(lua, -1, Grammar::k_InitializeStaticsName);
                     // Lua: table, ?
-                    lua_pop(lua, 2);
+                    if (lua_isfunction(lua, -1))
+                    {
+                        // Lua: table, function
+                        lua_pushvalue(lua, -2);
+                        // Lua: table, function, table
+                        for (auto& clonerSource : runtimeData.m_cloneSources)
+                        {
+                            lua_pushlightuserdata(lua, const_cast<void*>(reinterpret_cast<const void*>(&clonerSource)));
+                        }
+                        // Lua: table, function, table, cloners...
+                        AZ::Internal::LuaSafeCall(lua, aznumeric_caster(runtimeData.m_cloneSources.size() + 1), 0);
+                        // Lua: table
+                        lua_pop(lua, 1);
+                    }
+                    else
+                    {
+                        // Lua: table, ?
+                        lua_pop(lua, 2);
+                    }
                 }
             }
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
index c86327bc8d..db8473a468 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
@@ -43,7 +43,7 @@ namespace ScriptCanvas
 
         void InterpretedUnloadData(RuntimeData& runtimeData);
 
-        void InitializeInterpretedStatics(const RuntimeData& runtimeData);
+        void InitializeInterpretedStatics(RuntimeData& runtimeData);
 
         int InitializeNodeableOutKeys(lua_State* lua);
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
index 05c5d6f857..3ae52846cd 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
@@ -6,14 +6,13 @@
  *
  */
 
-#include "ExecutionStateInterpreted.h"
-
 #include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Script/ScriptContext.h>
 #include <AzCore/Script/ScriptSystemBus.h>
-
-#include "Execution/Interpreted/ExecutionStateInterpretedUtility.h"
-#include "Execution/RuntimeComponent.h"
+#include <Execution/Interpreted/ExecutionInterpretedAPI.h>
+#include <Execution/Interpreted/ExecutionStateInterpreted.h>
+#include <Execution/Interpreted/ExecutionStateInterpretedUtility.h>
+#include <Execution/RuntimeComponent.h>
 
 namespace ExecutionStateInterpretedCpp
 {
@@ -33,7 +32,25 @@ namespace ScriptCanvas
     ExecutionStateInterpreted::ExecutionStateInterpreted(const ExecutionStateConfig& config)
         : ExecutionState(config)
         , m_interpretedAsset(config.runtimeData.m_script)
-    {}
+    {
+        RuntimeAsset* runtimeAsset = config.asset.Get();
+
+#if defined(SCRIPT_CANVAS_RUNTIME_ASSET_CHECK)
+        if (!runtimeAsset)
+        {
+            AZ_Error("ScriptCanvas", false
+                , "ExecutionStateInterpreted created with ExecutionStateConfig that contained bad runtime asset data. %s"
+                , config.asset.GetId().ToString<AZStd::string>().data());
+            return;
+        }
+#else
+        AZ_Assert(false
+            , "ExecutionStateInterpreted created with ExecutionStateConfig that contained bad runtime asset data. %s"
+            , config.asset.GetId().ToString<AZStd::string>().data());
+#endif
+
+        Execution::InitializeInterpretedStatics(runtimeAsset->GetData());
+    }
 
     void ExecutionStateInterpreted::ClearLuaRegistryIndex()
     {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
index 5fe5c32a48..930b84abe4 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
@@ -19,9 +19,8 @@
 #include <ScriptCanvas/Execution/ExecutionContext.h>
 #include <ScriptCanvas/Execution/ExecutionState.h>
 
-#if !defined(_RELEASE)
-#define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK
-#endif
+#include <ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h>
+#include <AzCore/Asset/AssetSerializer.h>
 
 AZ_DECLARE_BUDGET(ScriptCanvas);
 
@@ -112,11 +111,13 @@ namespace ScriptCanvas
 #if defined(SCRIPT_CANVAS_RUNTIME_ASSET_CHECK)
         if (!m_runtimeOverrides.m_runtimeAsset.Get())
         {
-            AZ_Error("ScriptCanvas", false, "RuntimeComponent::m_runtimeAsset AssetId: %s was valid, but the data was not pre-loaded, so this script will not run", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
+            AZ_Error("ScriptCanvas", false, "RuntimeComponent::m_runtimeAsset AssetId: %s was valid, but the data was not pre-loaded, so this script will not run"
+                , m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
             return;
         }
 #else
-        AZ_Assert(m_runtimeOverrides.m_runtimeAsset.Get(), "RuntimeComponent::m_runtimeAsset AssetId: %s was valid, but the data was not pre-loaded, so this script will not run", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
+        AZ_Assert(m_runtimeOverrides.m_runtimeAsset.Get(), "RuntimeComponent::m_runtimeAsset AssetId: %s was valid, but the data was not pre-loaded, so this script will not run"
+            , m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
 #endif
 
         AZ_PROFILE_SCOPE(ScriptCanvas, "RuntimeComponent::InitializeExecution (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
@@ -126,11 +127,13 @@ namespace ScriptCanvas
 #if defined(SCRIPT_CANVAS_RUNTIME_ASSET_CHECK)
         if (!m_executionState)
         {
-            AZ_Error("ScriptCanvas", false, "RuntimeComponent::m_runtimeAsset AssetId: %s failed to create an execution state, possibly due to missing dependent asset, script will not run", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
+            AZ_Error("ScriptCanvas", false, "RuntimeComponent::m_runtimeAsset AssetId: %s failed to create an execution state, possibly due to missing dependent asset, script will not run"
+                , m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
             return;
         }
 #else
-        AZ_Assert(m_executionState, "RuntimeComponent::m_runtimeAsset AssetId: %s failed to create an execution state, possibly due to missing dependent asset, script will not run", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
+        AZ_Assert(m_executionState, "RuntimeComponent::m_runtimeAsset AssetId: %s failed to create an execution state, possibly due to missing dependent asset, script will not run"
+            , m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
 #endif
 
         AZ::EntityBus::Handler::BusConnect(GetEntityId());
@@ -179,4 +182,3 @@ namespace ScriptCanvas
     }
 }
 
-#undef SCRIPT_CANVAS_RUNTIME_ASSET_CHECK
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
index a2ccfd46f2..65d1f21518 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
@@ -518,7 +518,7 @@ namespace ScriptCanvas
                 {
                     const AZ::BehaviorParameter& argument(event.m_parameters[AZ::eBehaviorBusForwarderEventIndices::Result]);
                     Data::Type inputType(AZ::BehaviorContextHelper::IsStringParameter(argument) ? Data::Type::String() : Data::FromAZType(argument.m_typeId));
-                    const AZStd::string argName(AZStd::string::format("Result: %s", Data::GetName(inputType).data()).data());
+                    const AZStd::string argName(Data::GetName(inputType));
 
                     DataSlotConfiguration resultConfiguration;
 
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
index ca57824b78..ccdf15a111 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
@@ -14,6 +14,7 @@
 #include <Core/SlotExecutionMap.h>
 #include <Libraries/Core/MethodUtility.h>
 #include <ScriptCanvas/Utils/BehaviorContextUtils.h>
+#include <AzCore/StringFunc/StringFunc.h>
 
 namespace MethodCPP
 {
@@ -389,6 +390,9 @@ namespace ScriptCanvas
                     MethodConfiguration config(*method, MethodType::Free);
                     config.m_namespaces = &m_namespaces;
                     config.m_lookupName = &methodName;
+                    config.m_prettyClassName = methodName;
+                    AZ::StringFunc::Replace(config.m_prettyClassName, "::Getter", "");
+                    AZ::StringFunc::Replace(config.m_prettyClassName, "::Setter", "");
                     InitializeMethod(config);
                 }
             }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
index c548176af5..14397d2be9 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
@@ -204,7 +204,7 @@ namespace ScriptCanvas
 
                     DataSlotConfiguration slotConfiguration;
 
-                    slotConfiguration.m_name = AZStd::string::format("Result: %s", argumentTypeName.c_str());
+                    slotConfiguration.m_name = argumentTypeName;
 
                     slotConfiguration.SetConnectionType(ConnectionType::Input);
                     slotConfiguration.ConfigureDatum(AZStd::move(Datum(inputType, Datum::eOriginality::Copy, nullptr, AZ::Uuid::CreateNull())));
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
index 8569380d99..26a9b4fc96 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
@@ -272,7 +272,7 @@ namespace ScriptCanvas
 
                             Data::Type outputType(AZ::BehaviorContextHelper::IsStringParameter(*result) ? Data::Type::String() : Data::FromAZType(result->m_typeId));
                             // multiple outs will need out value names
-                            const AZStd::string resultSlotName(AZStd::string::format("Result: %s", Data::GetName(outputType).c_str()));
+                            const AZStd::string resultSlotName(Data::GetName(outputType));
 
                             DataSlotConfiguration slotConfiguration;
 
@@ -343,7 +343,7 @@ namespace ScriptCanvas
                         {
                             Data::Type outputType(AZ::BehaviorContextHelper::IsStringParameter(*result) ? Data::Type::String() : Data::FromAZType(result->m_typeId));
                             // multiple outs will need out value names
-                            const AZStd::string resultSlotName(AZStd::string::format("Result: %s", Data::GetName(outputType).c_str()));
+                            const AZStd::string resultSlotName(Data::GetName(outputType));
 
                             Slot* slot = GetSlotByName(resultSlotName);
 
diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
index cba14feac6..33982bbcd7 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
@@ -89,7 +89,6 @@ protected:
     AZ::SerializeContext* GetSerializeContext() override { return m_serializeContext; }
     AZ::BehaviorContext*  GetBehaviorContext() override { return nullptr; }
     AZ::JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
-    const char* GetAppRoot() const override { return nullptr; }
     const char* GetEngineRoot() const override { return nullptr; }
     const char* GetExecutableFolder() const override { return nullptr; }
     void EnumerateEntities(const AZ::ComponentApplicationRequests::EntityCallback& /*callback*/) override {}
diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp
index c99d6b8c29..a0f26bcec9 100644
--- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp
+++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp
@@ -22,6 +22,7 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/std/string/regex.h>
 
 #include <AzFramework/Gem/GemInfo.h>
 
@@ -32,6 +33,8 @@
 
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzQtComponents/Utilities/DesktopUtilities.h>
+#include <Source/Translation/TranslationSerializer.h>
+#include "Data/DataRegistry.h"
 
 namespace ScriptCanvasEditorTools
 {
@@ -87,6 +90,8 @@ namespace ScriptCanvasEditorTools
                 entry.m_details.m_name = prettyName;
             }
 
+            SplitCamelCase(entry.m_details.m_name);
+
             for (auto event : behaviorEBus->m_events)
             {
                 const AZ::BehaviorEBusEventSender& ebusSender = event.second;
@@ -106,13 +111,14 @@ namespace ScriptCanvasEditorTools
                 Method eventEntry;
                 const char* eventName = event.first.c_str();
 
-                AZStd::string cleanName = GraphCanvas::TranslationKey::Sanitize(eventName);
-                eventEntry.m_key = cleanName;
+                eventEntry.m_key = eventName;
 
                 prettyName = Helpers::GetStringAttribute(behaviorEBus, AZ::ScriptCanvasAttributes::PrettyName);
                 eventEntry.m_details.m_name = prettyName.empty() ? eventName : prettyName;
                 eventEntry.m_details.m_tooltip = Helpers::ReadStringAttribute(event.second.m_attributes, AZ::Script::Attributes::ToolTip);
 
+                SplitCamelCase(eventEntry.m_details.m_name);
+
                 eventEntry.m_entry.m_name = "In";
                 eventEntry.m_entry.m_tooltip = AZStd::string::format("When signaled, this will invoke %s", eventEntry.m_details.m_name.c_str());
                 eventEntry.m_exit.m_name = "Out";
@@ -124,10 +130,26 @@ namespace ScriptCanvasEditorTools
                     Argument argument;
                     auto argumentType = method->GetArgument(i)->m_typeId;
 
+                    // Check the BC for metadata
+
                     Helpers::GetTypeNameAndDescription(argumentType, argument.m_details.m_name, argument.m_details.m_tooltip);
 
+                    auto name = method->GetArgumentName(i);
+                    if (name && !name->empty())
+                    {
+                        argument.m_details.m_name = *name;
+                    }
+
+                    auto tooltip = method->GetArgumentToolTip(i);
+                    if (tooltip && !tooltip->empty())
+                    {
+                        argument.m_details.m_tooltip = *tooltip;
+                    }
+
                     argument.m_typeId = argumentType.ToString<AZStd::string>();
 
+                    SplitCamelCase(argument.m_details.m_name);
+
                     eventEntry.m_arguments.push_back(argument);
                 }
 
@@ -136,10 +158,19 @@ namespace ScriptCanvasEditorTools
                     Argument result;
 
                     auto resultType = method->GetResult()->m_typeId;
+
                     Helpers::GetTypeNameAndDescription(resultType, result.m_details.m_name, result.m_details.m_tooltip);
 
+                    auto tooltip = method->GetArgumentToolTip(0);
+                    if (tooltip && !tooltip->empty())
+                    {
+                        result.m_details.m_tooltip = *tooltip;
+                    }
+
                     result.m_typeId = resultType.ToString<AZStd::string>();
 
+                    SplitCamelCase(result.m_details.m_name);
+
                     eventEntry.m_results.push_back(result);
                 }
 
@@ -209,6 +240,8 @@ namespace ScriptCanvasEditorTools
         details.m_category = Helpers::GetStringAttribute(behaviorClass, AZ::Script::Attributes::Category);
         details.m_tooltip = Helpers::GetStringAttribute(behaviorClass, AZ::Script::Attributes::ToolTip);
 
+        SplitCamelCase(details.m_name);
+
         if (!behaviorClass->m_methods.empty())
         {
             for (const auto& methodPair : behaviorClass->m_methods)
@@ -226,10 +259,14 @@ namespace ScriptCanvasEditorTools
                 methodEntry.m_details.m_tooltip = "";
                 methodEntry.m_details.m_name = methodPair.second->m_name;
 
+                AZStd::string prefix = className + "::";
+                AZ::StringFunc::Replace(methodEntry.m_details.m_name, prefix.c_str(), "");
+                SplitCamelCase(methodEntry.m_details.m_name);
+
                 methodEntry.m_entry.m_name = "In";
-                methodEntry.m_entry.m_tooltip = AZStd::string::format("When signaled, this will invoke %s", cleanName.c_str());
+                methodEntry.m_entry.m_tooltip = AZStd::string::format("When signaled, this will invoke %s", methodEntry.m_details.m_name.c_str());
                 methodEntry.m_exit.m_name = "Out";
-                methodEntry.m_exit.m_tooltip = AZStd::string::format("Signaled after %s is invoked", cleanName.c_str());
+                methodEntry.m_exit.m_tooltip = AZStd::string::format("Signaled after %s is invoked", methodEntry.m_details.m_name.c_str());
 
                 if (!Helpers::MethodHasAttribute(behaviorMethod, AZ::ScriptCanvasAttributes::FloatingFunction))
                 {
@@ -240,35 +277,45 @@ namespace ScriptCanvasEditorTools
                     methodEntry.m_details.m_category = Helpers::ReadStringAttribute(behaviorMethod->m_attributes, AZ::Script::Attributes::Category);
                 }
 
-                if (methodEntry.m_details.m_category.empty())
-                {
-                    methodEntry.m_details.m_category = "Other";
-                }
-
                 // Arguments (Input Slots)
                 if (behaviorMethod->GetNumArguments() > 0)
                 {
-                    for (size_t argIndex = 0; argIndex < behaviorMethod->GetNumArguments(); ++argIndex)
+                    size_t startIndex = behaviorMethod->HasResult() ? 1 : 0;
+                    for (size_t argIndex = startIndex; argIndex < behaviorMethod->GetNumArguments(); ++argIndex)
                     {
                         const AZ::BehaviorParameter* parameter = behaviorMethod->GetArgument(argIndex);
 
                         Argument argument;
 
                         AZStd::string argumentKey = parameter->m_typeId.ToString<AZStd::string>();
-                        AZStd::string argumentName = parameter->m_name;
-                        AZStd::string argumentDescription = "";
+                        AZStd::string argumentName;
+                        AZStd::string argumentDescription;
 
                         Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription);
 
+                        const AZStd::string* argName = behaviorMethod->GetArgumentName(argIndex);
+                        if (argName && !(*argName).empty())
+                        {
+                            argumentName = *argName;
+                        }
+
+                        const AZStd::string* argDesc = behaviorMethod->GetArgumentToolTip(argIndex);
+                        if (argDesc && !(*argDesc).empty())
+                        {
+                            argumentDescription = *argDesc;
+                        }
+
                         argument.m_typeId = argumentKey;
-                        argument.m_details.m_name = parameter->m_name;
-                        argument.m_details.m_category = "";
+                        argument.m_details.m_name = argumentName;
                         argument.m_details.m_tooltip = argumentDescription;
 
+                        SplitCamelCase(argument.m_details.m_name);
+
                         methodEntry.m_arguments.push_back(argument);
                     }
                 }
 
+                // Results (Output Slots)
                 const AZ::BehaviorParameter* resultParameter = behaviorMethod->HasResult() ? behaviorMethod->GetResult() : nullptr;
                 if (resultParameter)
                 {
@@ -284,6 +331,8 @@ namespace ScriptCanvasEditorTools
                     result.m_details.m_name = resultParameter->m_name;
                     result.m_details.m_tooltip = resultDescription;
 
+                    SplitCamelCase(result.m_details.m_name);
+
                     methodEntry.m_results.push_back(result);
                 }
 
@@ -291,9 +340,23 @@ namespace ScriptCanvasEditorTools
             }
         }
 
+        // Behavior Class properties
+        if (!behaviorClass->m_properties.empty())
+        {
+            for (const auto& propertyEntry : behaviorClass->m_properties)
+            {
+                AZ::BehaviorProperty* behaviorProperty = propertyEntry.second;
+                if (behaviorProperty)
+                {
+                    TranslateBehaviorProperty(behaviorProperty, behaviorClass->m_name, "BehaviorClass", &entry);
+                }
+            }
+        }
+
         translationRoot.m_entries.push_back(entry);
 
-        AZStd::string fileName = AZStd::string::format("Classes/%s", className.c_str());
+        AZStd::string sanitizedFilename = GraphCanvas::TranslationKey::Sanitize(className);
+        AZStd::string fileName = AZStd::string::format("Classes/%s", sanitizedFilename.c_str());
 
         SaveJSONData(fileName, translationRoot);
 
@@ -345,6 +408,8 @@ namespace ScriptCanvasEditorTools
             entry.m_context = "AZEventHandler";
             entry.m_details.m_name = azEventEntry.m_eventName;
 
+            SplitCamelCase(entry.m_details.m_name);
+
             for (const ScriptCanvas::Slot& slot : nodeComponent->GetSlots())
             {
                 Slot slotEntry;
@@ -444,6 +509,8 @@ namespace ScriptCanvasEditorTools
                 details.m_name = cleanName;
             }
 
+            SplitCamelCase(details.m_name);
+
             // Tooltip attribute takes priority over the edit data description
             AZStd::string tooltip = Helpers::GetStringAttribute(classData, AZ::Script::Attributes::ToolTip);
             if (!tooltip.empty())
@@ -631,6 +698,7 @@ namespace ScriptCanvasEditorTools
 
                 EntryDetails& details = entry.m_details;
                 details.m_name = behaviorClass->m_name;
+                SplitCamelCase(details.m_name);
 
                 // Get the pretty name
                 AZStd::string prettyName;
@@ -664,6 +732,7 @@ namespace ScriptCanvasEditorTools
 
                         methodEntry.m_details.m_tooltip = Helpers::GetStringAttribute(behaviorMethod, AZ::Script::Attributes::ToolTip);
                         methodEntry.m_details.m_name = methodPair.second->m_name;
+                        SplitCamelCase(methodEntry.m_details.m_name);
 
                         // Strip the className from the methodName
                         AZStd::string qualifiedName = behaviorClass->m_name + "::";
@@ -696,6 +765,8 @@ namespace ScriptCanvasEditorTools
                                 argument.m_details.m_category = "";
                                 argument.m_details.m_tooltip = argumentDescription;
 
+                                SplitCamelCase(argument.m_details.m_name);
+
                                 methodEntry.m_arguments.push_back(argument);
                             }
                         }
@@ -716,6 +787,8 @@ namespace ScriptCanvasEditorTools
                             result.m_details.m_name = resultName;
                             result.m_details.m_tooltip = resultDescription;
 
+                            SplitCamelCase(result.m_details.m_name);
+
                             methodEntry.m_results.push_back(result);
                         }
 
@@ -730,6 +803,190 @@ namespace ScriptCanvasEditorTools
         SaveJSONData("Types/OnDemandReflectedTypes", translationRoot);
     }
 
+    void TranslationGeneration::TranslateBehaviorGlobals()
+    {
+        for (const auto& [propertyName, behaviorProperty] : m_behaviorContext->m_properties)
+        {
+            TranslateBehaviorProperty(propertyName);
+        }
+    }
+
+    void TranslationGeneration::TranslateBehaviorProperty(const AZStd::string& propertyName)
+    {
+        const auto behaviorPropertyEntry = m_behaviorContext->m_properties.find(propertyName);
+        if (behaviorPropertyEntry == m_behaviorContext->m_properties.end())
+        {
+            return;
+        }
+
+        const AZ::BehaviorProperty* behaviorProperty = behaviorPropertyEntry->second;
+
+        Entry entry;
+
+        TranslateBehaviorProperty(behaviorProperty, propertyName, "Constant", &entry);
+
+        TranslationFormat translationRoot;
+        translationRoot.m_entries.push_back(entry);
+
+        AZStd::string cleanName = GraphCanvas::TranslationKey::Sanitize(behaviorProperty->m_name);
+        AZStd::string fileName = AZStd::string::format("Properties/%s", cleanName.c_str());
+        SaveJSONData(fileName, translationRoot);
+    }
+
+    void TranslationGeneration::TranslateDataTypes()
+    {
+        TranslationFormat translationRoot;
+
+        auto dataRegistry = ScriptCanvas::GetDataRegistry();
+        
+        for (auto& typePair : dataRegistry->m_creatableTypes)
+        {
+            if (ScriptCanvas::Data::IsContainerType(typePair.first))
+            {
+                continue;
+            }
+
+            const AZStd::string typeIDStr = typePair.first.GetAZType().ToString<AZStd::string>();
+            AZStd::string typeName = ScriptCanvas::Data::GetName(typePair.first);
+
+            Entry entry;
+            entry.m_key = typeIDStr;
+            entry.m_context = "BehaviorType";
+            entry.m_details.m_name = typeName;
+
+            translationRoot.m_entries.emplace_back(entry);
+        }
+
+        SaveJSONData("Types/BehaviorTypes", translationRoot);
+    }
+
+    void TranslationGeneration::TranslateMethod(AZ::BehaviorMethod* behaviorMethod, Method& methodEntry)
+    {
+        // Arguments (Input Slots)
+        if (behaviorMethod->GetNumArguments() > 0)
+        {
+            for (size_t argIndex = 0; argIndex < behaviorMethod->GetNumArguments(); ++argIndex)
+            {
+                const AZ::BehaviorParameter* parameter = behaviorMethod->GetArgument(argIndex);
+
+                Argument argument;
+
+                AZStd::string argumentKey = parameter->m_typeId.ToString<AZStd::string>();
+                AZStd::string argumentName = parameter->m_name;
+                AZStd::string argumentDescription;
+
+                Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription);
+
+                const AZStd::string* argName = behaviorMethod->GetArgumentName(argIndex);
+                argument.m_typeId = argumentKey;
+                argument.m_details.m_name = (argName && !argName->empty()) ? *argName : argumentName;
+                argument.m_details.m_category = "";
+                argument.m_details.m_tooltip = argumentDescription;
+
+                SplitCamelCase(argument.m_details.m_name);
+
+                methodEntry.m_arguments.push_back(argument);
+            }
+        }
+
+        // Results (Output Slots)
+        const AZ::BehaviorParameter* resultParameter = behaviorMethod->HasResult() ? behaviorMethod->GetResult() : nullptr;
+        if (resultParameter)
+        {
+            Argument result;
+
+            AZStd::string resultKey = resultParameter->m_typeId.ToString<AZStd::string>();
+            AZStd::string resultName = resultParameter->m_name;
+            AZStd::string resultDescription;
+
+            Helpers::GetTypeNameAndDescription(resultParameter->m_typeId, resultName, resultDescription);
+
+            const AZStd::string* resName = behaviorMethod->GetArgumentName(0);
+            result.m_typeId = resultKey;
+            result.m_details.m_name = (resName && !resName->empty()) ? *resName : resultName;
+            result.m_details.m_tooltip = resultDescription;
+
+            SplitCamelCase(result.m_details.m_name);
+
+            methodEntry.m_results.push_back(result);
+        }
+    }
+
+    void TranslationGeneration::TranslateBehaviorProperty(const AZ::BehaviorProperty* behaviorProperty, const AZStd::string& className, const AZStd::string& context, Entry* entry)
+    {
+        if (!behaviorProperty->m_getter && !behaviorProperty->m_setter)
+        {
+            return;
+        }
+
+        Entry localEntry;
+        if (!entry)
+        {
+            entry = &localEntry;
+        }
+        else if (entry->m_key.empty())
+        {
+            entry->m_key = className;
+            entry->m_context = context;
+
+            entry->m_details.m_name = className;
+            SplitCamelCase(entry->m_details.m_name);
+        }
+
+        if (behaviorProperty->m_getter)
+        {
+            AZStd::string cleanName = behaviorProperty->m_name;
+            AZ::StringFunc::Replace(cleanName, "::Getter", "");
+
+            Method method;
+
+            AZStd::string methodName = "Get";
+            methodName.append(cleanName);
+            method.m_key = methodName;
+            method.m_details.m_name = methodName;
+            method.m_details.m_tooltip = behaviorProperty->m_getter->m_debugDescription ? behaviorProperty->m_getter->m_debugDescription : "";
+
+            SplitCamelCase(method.m_details.m_name);
+
+            TranslateMethod(behaviorProperty->m_getter, method);
+
+            // We know this is a getter, so there will only be one parameter, we will use the method name as a best
+            // guess for the argument name
+            SplitCamelCase(cleanName);
+            method.m_arguments[1].m_details.m_name = cleanName;
+
+            entry->m_methods.push_back(method);
+
+        }
+
+        if (behaviorProperty->m_setter)
+        {
+            AZStd::string cleanName = behaviorProperty->m_name;
+            AZ::StringFunc::Replace(cleanName, "::Setter", "");
+
+            Method method;
+
+            AZStd::string methodName = "Set";
+            methodName.append(cleanName);
+
+            method.m_key = methodName;
+            method.m_details.m_name = methodName;
+            method.m_details.m_tooltip = behaviorProperty->m_setter->m_debugDescription ? behaviorProperty->m_getter->m_debugDescription : "";
+
+            SplitCamelCase(method.m_details.m_name);
+
+            TranslateMethod(behaviorProperty->m_setter, method);
+
+            // We know this is a setter, so there will only be one parameter, we will use the method name as a best
+            // guess for the argument name
+            SplitCamelCase(cleanName);
+            method.m_arguments[1].m_details.m_name = cleanName;
+
+            entry->m_methods.push_back(method);
+        }
+
+    }
+
     bool TranslationGeneration::TranslateEBusHandler(const AZ::BehaviorEBus* behaviorEbus, TranslationFormat& translationRoot)
     {
         // Must be a valid ebus handler
@@ -752,6 +1009,8 @@ namespace ScriptCanvasEditorTools
             entry.m_details.m_tooltip = behaviorEbus->m_toolTip;
             entry.m_details.m_category = "EBus Handlers";
 
+            SplitCamelCase(entry.m_details.m_name);
+
             for (const AZ::BehaviorEBusHandler::BusForwarderEvent& event : handler->GetEvents())
             {
                 Method methodEntry;
@@ -762,6 +1021,8 @@ namespace ScriptCanvasEditorTools
                 methodEntry.m_details.m_tooltip = "";
                 methodEntry.m_details.m_name = event.m_name;
 
+                SplitCamelCase(methodEntry.m_details.m_name);
+
                 // Arguments (Input Slots)
                 if (!event.m_parameters.empty())
                 {
@@ -786,10 +1047,28 @@ namespace ScriptCanvasEditorTools
                             Helpers::GetTypeNameAndDescription(parameter.m_typeId, argumentName, argumentDescription);
                         }
 
+                        if (!event.m_metadataParameters.empty() && event.m_metadataParameters.size() > argIndex)
+                        {
+                            auto name = event.m_metadataParameters[argIndex].m_name;
+                            auto tooltip = event.m_metadataParameters[argIndex].m_toolTip;
+
+                            if (!name.empty())
+                            {
+                                argumentName = name;
+                            }
+
+                            if (!tooltip.empty())
+                            {
+                                argumentDescription = tooltip;
+                            }
+                        }
+
                         argument.m_typeId = argumentKey;
                         argument.m_details.m_name = argumentName;
                         argument.m_details.m_tooltip = argumentDescription;
 
+                        SplitCamelCase(argument.m_details.m_name);
+
                         methodEntry.m_arguments.push_back(argument);
                     }
                 }
@@ -820,6 +1099,8 @@ namespace ScriptCanvasEditorTools
                     result.m_details.m_name = resultName;
                     result.m_details.m_tooltip = resultDescription;
 
+                    SplitCamelCase(result.m_details.m_name);
+
                     methodEntry.m_results.push_back(result);
                 }
 
@@ -853,13 +1134,13 @@ namespace ScriptCanvasEditorTools
             rapidjson_ly::Value value(rapidjson_ly::kStringType);
 
             value.SetString(entrySource.m_key.c_str(), document.GetAllocator());
-            entry.AddMember("key", value, document.GetAllocator());
+            entry.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator());
 
             value.SetString(entrySource.m_context.c_str(), document.GetAllocator());
-            entry.AddMember("context", value, document.GetAllocator());
+            entry.AddMember(GraphCanvas::Schema::Field::context, value, document.GetAllocator());
 
             value.SetString(entrySource.m_variant.c_str(), document.GetAllocator());
-            entry.AddMember("variant", value, document.GetAllocator());
+            entry.AddMember(GraphCanvas::Schema::Field::variant, value, document.GetAllocator());
 
             rapidjson_ly::Value details(rapidjson_ly::kObjectType);
             value.SetString(entrySource.m_details.m_name.c_str(), document.GetAllocator());
@@ -880,12 +1161,12 @@ namespace ScriptCanvasEditorTools
                     rapidjson_ly::Value theMethod(rapidjson_ly::kObjectType);
 
                     value.SetString(methodSource.m_key.c_str(), document.GetAllocator());
-                    theMethod.AddMember("key", value, document.GetAllocator());
+                    theMethod.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator());
 
                     if (!methodSource.m_context.empty())
                     {
                         value.SetString(methodSource.m_context.c_str(), document.GetAllocator());
-                        theMethod.AddMember("context", value, document.GetAllocator());
+                        theMethod.AddMember(GraphCanvas::Schema::Field::context, value, document.GetAllocator());
                     }
 
                     if (!methodSource.m_entry.m_name.empty())
@@ -993,7 +1274,7 @@ namespace ScriptCanvasEditorTools
                     rapidjson_ly::Value theSlot(rapidjson_ly::kObjectType);
 
                     value.SetString(slotSource.m_key.c_str(), document.GetAllocator());
-                    theSlot.AddMember("key", value, document.GetAllocator());
+                    theSlot.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator());
 
                     rapidjson_ly::Value sloDetails(rapidjson_ly::kObjectType);
                     if (!slotSource.m_details.m_name.empty())
@@ -1068,6 +1349,14 @@ namespace ScriptCanvasEditorTools
 
     }
 
+    void TranslationGeneration::SplitCamelCase(AZStd::string& text)
+    {
+        AZStd::regex splitRegex(R"(/[a-z]+|[0-9]+|(?:[A-Z][a-z]+)|(?:[A-Z]+(?=(?:[A-Z][a-z])|[^AZa-z]|[$\d\n]))/g)");
+        text = AZStd::regex_replace(text, splitRegex, " $&");
+        text = AZ::StringFunc::LStrip(text);
+        AZ::StringFunc::Replace(text, "  ", " ");
+    }
+
     namespace Helpers
     {
         AZStd::string ReadStringAttribute(const AZ::AttributeArray& attributes, const AZ::Crc32& attribute)
diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h
index 7df567d9a1..c6d482e115 100644
--- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h
+++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h
@@ -22,6 +22,7 @@ namespace AZ
     class BehaviorContext;
     class BehaviorEBus;
     class BehaviorMethod;
+    class BehaviorProperty;
     class Entity;
     class SerializeContext;
 }
@@ -121,14 +122,32 @@ namespace ScriptCanvasEditorTools
         //! Generate the translation data for on-demand reflected types
         void TranslateOnDemandReflectedTypes(TranslationFormat& translationRoot);
 
+        //! Generates the translation data for all global properties and methods in the BehaviorContext
+        void TranslateBehaviorGlobals();
+
+        //! Generates the translation data for the specified property in the BehaviorContext (global, by name)
+        void TranslateBehaviorProperty(const AZStd::string& propertyName);
+
+        //! Generates the translation data for the specified property in the BehaviorContext
+        void TranslateBehaviorProperty(const AZ::BehaviorProperty* behaviorProperty, const AZStd::string& className, const AZStd::string& context, Entry* entry = nullptr);
+
+        //! Generates a type map from reflected types that are suitable for BehaviorContext objects used by ScriptCanvas
+        void TranslateDataTypes();
+
     private:
 
+        //! Utility to populate a BehaviorMethod's translation data
+        void TranslateMethod(AZ::BehaviorMethod* behaviorMethod, Method& methodEntry);
+
         //! Generates the translation data for a BehaviorEBus that has an BehaviorEBusHandler
         bool TranslateEBusHandler(const AZ::BehaviorEBus* behaviorEbus, TranslationFormat& translationRoot);
 
         //! Utility function that saves a TranslationFormat object in the desired JSON format
         void SaveJSONData(const AZStd::string& filename, TranslationFormat& translationRoot);
 
+        //! Utility function that splits camel-case syntax string into separate words
+        void SplitCamelCase(AZStd::string&);
+
         //! Evaluates if the specified object has exclusion flags and should be skipped from generation
         template <typename T>
         bool ShouldSkip(const T* object) const
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
index 7984340b7a..eb50f5cb51 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
@@ -7,575 +7,210 @@
 #
 
 set(FILES
-    Include/ScriptCanvas/SystemComponent.h
     Source/SystemComponent.cpp
     Source/ScriptCanvasCommonGem.cpp
     Source/PerformanceStatistician.cpp
     Source/PerformanceTracker.cpp
-    Include/ScriptCanvas/ScriptCanvasGem.h
-    Include/ScriptCanvas/Asset/AssetDescription.h
     Include/ScriptCanvas/Asset/AssetRegistry.cpp
-    Include/ScriptCanvas/Asset/AssetRegistry.h
-    Include/ScriptCanvas/Asset/AssetRegistryBus.h
     Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp
-    Include/ScriptCanvas/Asset/ExecutionLogAsset.h
-    Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h
     Include/ScriptCanvas/Asset/RuntimeAsset.cpp
-    Include/ScriptCanvas/Asset/RuntimeAsset.h
     Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp
-    Include/ScriptCanvas/Asset/RuntimeAssetHandler.h
-    Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
-    Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h
     Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.cpp
-    Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h
-    Include/ScriptCanvas/Core/ScriptCanvasBus.h
     Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp
-    Include/ScriptCanvas/Core/ExecutionNotificationsBus.h
-    Include/ScriptCanvas/Core/GraphBus.h
-    Include/ScriptCanvas/Core/NodeBus.h
-    Include/ScriptCanvas/Core/EBusNodeBus.h
-    Include/ScriptCanvas/Core/NodelingBus.h
-    Include/ScriptCanvas/Core/ContractBus.h
-    Include/ScriptCanvas/Core/Attributes.h
     Include/ScriptCanvas/Core/Connection.cpp
-    Include/ScriptCanvas/Core/Connection.h
-    Include/ScriptCanvas/Core/ConnectionBus.h
     Include/ScriptCanvas/Core/Contract.cpp
-    Include/ScriptCanvas/Core/Contract.h
-    Include/ScriptCanvas/Core/Contracts.h
-    Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h
     Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.cpp
-    Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h
     Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.cpp
     Include/ScriptCanvas/Core/Core.cpp
-    Include/ScriptCanvas/Core/Core.h
     Include/ScriptCanvas/Core/Datum.cpp
-    Include/ScriptCanvas/Core/Datum.h
-    Include/ScriptCanvas/Core/DatumBus.h
-    Include/ScriptCanvas/Core/EBusHandler.h
     Include/ScriptCanvas/Core/EBusHandler.cpp
     Include/ScriptCanvas/Core/Endpoint.cpp
-    Include/ScriptCanvas/Core/Endpoint.h
     Include/ScriptCanvas/Core/Graph.cpp
-    Include/ScriptCanvas/Core/Graph.h
-    Include/ScriptCanvas/Core/GraphData.h
     Include/ScriptCanvas/Core/GraphData.cpp
-    Include/ScriptCanvas/Core/GraphScopedTypes.h
-    Include/ScriptCanvas/Core/MethodConfiguration.h
     Include/ScriptCanvas/Core/MethodConfiguration.cpp
     Include/ScriptCanvas/Core/ModifiableDatumView.cpp
-    Include/ScriptCanvas/Core/ModifiableDatumView.h
     Include/ScriptCanvas/Core/Node.cpp
-    Include/ScriptCanvas/Core/Node.h
     Include/ScriptCanvas/Core/Nodeable.cpp
-    Include/ScriptCanvas/Core/Nodeable.h
     Include/ScriptCanvas/Core/NodeableNode.cpp
-    Include/ScriptCanvas/Core/NodeableNode.h
     Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
-    Include/ScriptCanvas/Core/NodeableNodeOverloaded.h
-    Include/ScriptCanvas/Core/NodeFunctionGeneric.h
-    Include/ScriptCanvas/Core/SerializationListener.h
     Include/ScriptCanvas/Core/Slot.cpp
-    Include/ScriptCanvas/Core/Slot.h
-    Include/ScriptCanvas/Core/SlotConfigurationDefaults.h
     Include/ScriptCanvas/Core/SlotConfigurations.cpp
-    Include/ScriptCanvas/Core/SlotConfigurations.h
     Include/ScriptCanvas/Core/SlotExecutionMap.cpp
-    Include/ScriptCanvas/Core/SlotExecutionMap.h
     Include/ScriptCanvas/Core/SlotMetadata.cpp
-    Include/ScriptCanvas/Core/SlotMetadata.h
-    Include/ScriptCanvas/Core/SlotNames.h
-    Include/ScriptCanvas/Core/SubgraphInterface.h
     Include/ScriptCanvas/Core/SubgraphInterface.cpp
-    Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h
     Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp
-    Include/ScriptCanvas/Translation/AbstractModelTranslator.h
-    Include/ScriptCanvas/Translation/Configuration.h
     Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp
-    Include/ScriptCanvas/Translation/GraphToCPlusPlus.h
-    Include/ScriptCanvas/Translation/GraphToLua.h
     Include/ScriptCanvas/Translation/GraphToLua.cpp
-    Include/ScriptCanvas/Translation/GraphToLuaUtility.h
     Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp
-    Include/ScriptCanvas/Translation/GraphToX.h
     Include/ScriptCanvas/Translation/GraphToX.cpp
-    Include/ScriptCanvas/Translation/Translation.h
     Include/ScriptCanvas/Translation/Translation.cpp
-    Include/ScriptCanvas/Translation/TranslationContext.h
     Include/ScriptCanvas/Translation/TranslationContext.cpp
-    Include/ScriptCanvas/Translation/TranslationResult.h
     Include/ScriptCanvas/Translation/TranslationResult.cpp
-    Include/ScriptCanvas/Translation/TranslationUtilities.h
     Include/ScriptCanvas/Translation/TranslationUtilities.cpp
-    Include/ScriptCanvas/PerformanceStatistician.h
-    Include/ScriptCanvas/PerformanceStatisticsBus.h
-    Include/ScriptCanvas/PerformanceTracker.h
-    Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
-    Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
-    Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
-    Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
-    Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
-    Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
-    Include/ScriptCanvas/CodeGen/NodeableCodegen.h
     Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.cpp
-    Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h
     Include/ScriptCanvas/Core/Contracts/ContractRTTI.cpp
-    Include/ScriptCanvas/Core/Contracts/ContractRTTI.h
     Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.cpp
-    Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h
     Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.cpp
-    Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h
     Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp
-    Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h
     Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp
-    Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h
     Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp
-    Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h
     Include/ScriptCanvas/Core/Contracts/SlotTypeContract.cpp
-    Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h
     Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.cpp
-    Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h
     Include/ScriptCanvas/Core/Contracts/TypeContract.cpp
-    Include/ScriptCanvas/Core/Contracts/TypeContract.h
     Include/ScriptCanvas/Data/BehaviorContextObject.cpp
-    Include/ScriptCanvas/Data/BehaviorContextObject.h
     Include/ScriptCanvas/Data/BehaviorContextObjectPtr.cpp
-    Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h
     Include/ScriptCanvas/Data/Data.cpp
-    Include/ScriptCanvas/Data/Data.h
-    Include/ScriptCanvas/Data/DataMacros.h
     Include/ScriptCanvas/Data/DataRegistry.cpp
-    Include/ScriptCanvas/Data/DataRegistry.h
-    Include/ScriptCanvas/Data/NumericData.h
-    Include/ScriptCanvas/Deprecated/VariableDatumBase.h
     Include/ScriptCanvas/Deprecated/VariableDatumBase.cpp
-    Include/ScriptCanvas/Deprecated/VariableDatum.h
     Include/ScriptCanvas/Deprecated/VariableDatum.cpp
-    Include/ScriptCanvas/Deprecated/VariableHelpers.h
     Include/ScriptCanvas/Deprecated/VariableHelpers.cpp
-    Include/ScriptCanvas/Execution/ErrorBus.h
-    Include/ScriptCanvas/Execution/ExecutionBus.h
-    Include/ScriptCanvas/Execution/ExecutionContext.h
     Include/ScriptCanvas/Execution/ExecutionContext.cpp
-    Include/ScriptCanvas/Execution/ExecutionObjectCloning.h
     Include/ScriptCanvas/Execution/ExecutionObjectCloning.cpp
-    Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h
     Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.cpp
-    Include/ScriptCanvas/Execution/ExecutionState.h
     Include/ScriptCanvas/Execution/ExecutionState.cpp
-    Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h
-    Include/ScriptCanvas/Execution/NativeHostDeclarations.h
     Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp
-    Include/ScriptCanvas/Execution/NativeHostDefinitions.h
     Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
-    Include/ScriptCanvas/Execution/RuntimeComponent.h
     Include/ScriptCanvas/Execution/RuntimeComponent.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.cpp
-    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h
     Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.cpp
-    Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h
-    Include/ScriptCanvas/Grammar/AbstractCodeModel.h
     Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
-    Include/ScriptCanvas/Grammar/DebugMap.h
     Include/ScriptCanvas/Grammar/DebugMap.cpp
-    Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
     Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
-    Include/ScriptCanvas/Grammar/ParsingMetaData.h
     Include/ScriptCanvas/Grammar/ParsingMetaData.cpp
-    Include/ScriptCanvas/Grammar/ParsingUtilities.h
     Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
-    Include/ScriptCanvas/Grammar/Primitives.h
     Include/ScriptCanvas/Grammar/Primitives.cpp
-    Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
     Include/ScriptCanvas/Grammar/PrimitivesDeclarations.cpp
     Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp
-    Include/ScriptCanvas/Grammar/PrimitivesExecution.h
-    Include/ScriptCanvas/Grammar/SymbolNames.h
-    Include/ScriptCanvas/Execution/ErrorBus.h
     Include/ScriptCanvas/Execution/ExecutionContext.cpp
-    Include/ScriptCanvas/Execution/ExecutionContext.h
-    Include/ScriptCanvas/Execution/ExecutionBus.h
     Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp
-    Include/ScriptCanvas/Execution/NativeHostDeclarations.h
     Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp
-    Include/ScriptCanvas/Execution/NativeHostDefinitions.h
     Include/ScriptCanvas/Execution/RuntimeComponent.cpp
-    Include/ScriptCanvas/Execution/RuntimeComponent.h
     Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp
-    Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h
-    Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml
     Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp
-    Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
-    Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp
-    Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
-    Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp
-    Include/ScriptCanvas/Internal/Nodes/StringFormatted.h
-    Include/ScriptCanvas/Internal/Nodes/StringFormatted.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
-    Include/ScriptCanvas/Grammar/AbstractCodeModel.h
-    Include/ScriptCanvas/Libraries/Libraries.h
     Include/ScriptCanvas/Libraries/Libraries.cpp
     Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp
-    Include/ScriptCanvas/Libraries/Core/AzEventHandler.h
-    Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp
-    Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
     Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp
-    Include/ScriptCanvas/Libraries/Core/CoreNodes.h
-    Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h
     Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
-    Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
-    Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp
-    Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
-    Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h
     Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp
     Include/ScriptCanvas/Libraries/Core/ForEach.cpp
-    Include/ScriptCanvas/Libraries/Core/ForEach.h
-    Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/FunctionBus.h
     Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp
-    Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
-    Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
     Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp
     Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp
-    Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h
-    Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
-    Include/ScriptCanvas/Libraries/Core/GetVariable.h
-    Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/Method.cpp
-    Include/ScriptCanvas/Libraries/Core/Method.h
     Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp
-    Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h
     Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
-    Include/ScriptCanvas/Libraries/Core/MethodUtility.h
     Include/ScriptCanvas/Libraries/Core/Nodeling.cpp
-    Include/ScriptCanvas/Libraries/Core/Nodeling.h
-    Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
-    Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
-    Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/Repeater.cpp
-    Include/ScriptCanvas/Libraries/Core/Repeater.h
-    Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h
     Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.cpp
-    Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml
     Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp
-    Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
-    Include/ScriptCanvas/Libraries/Core/ScriptEventBase.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
-    Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
-    Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
-    Include/ScriptCanvas/Libraries/Core/SetVariable.h
-    Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Core/Start.h
-    Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp
-    Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
     Include/ScriptCanvas/Libraries/Entity/Entity.cpp
-    Include/ScriptCanvas/Libraries/Entity/Entity.h
-    Include/ScriptCanvas/Libraries/Entity/EntityNodes.h
     Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp
-    Include/ScriptCanvas/Libraries/Entity/RotateMethod.h
-    Include/ScriptCanvas/Libraries/Logic/And.h
     Include/ScriptCanvas/Libraries/Logic/Any.cpp
-    Include/ScriptCanvas/Libraries/Logic/Any.h
-    Include/ScriptCanvas/Libraries/Logic/Any.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Logic/Break.h
     Include/ScriptCanvas/Libraries/Logic/Break.cpp
-    Include/ScriptCanvas/Libraries/Logic/Break.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/Cycle.cpp
-    Include/ScriptCanvas/Libraries/Logic/Cycle.h
-    Include/ScriptCanvas/Libraries/Logic/Cycle.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/Gate.cpp
-    Include/ScriptCanvas/Libraries/Logic/Gate.h
-    Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Logic/Indexer.h
-    Include/ScriptCanvas/Libraries/Logic/Indexer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/IsNull.cpp
-    Include/ScriptCanvas/Libraries/Logic/IsNull.h
-    Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/Logic.cpp
-    Include/ScriptCanvas/Libraries/Logic/Logic.h
-    Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
-    Include/ScriptCanvas/Libraries/Logic/Multiplexer.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Logic/Not.h
     Include/ScriptCanvas/Libraries/Logic/Once.cpp
-    Include/ScriptCanvas/Libraries/Logic/Once.h
-    Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Logic/Or.h
     Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp
-    Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
-    Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
-    Include/ScriptCanvas/Libraries/Logic/Sequencer.h
-    Include/ScriptCanvas/Libraries/Logic/Sequencer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp
-    Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
-    Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp
-    Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
-    Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Logic/While.cpp
-    Include/ScriptCanvas/Libraries/Logic/While.h
-    Include/ScriptCanvas/Libraries/Logic/While.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Math/AABBNodes.h
-    Include/ScriptCanvas/Libraries/Math/ColorNodes.h
-    Include/ScriptCanvas/Libraries/Math/CRCNodes.h
-    Include/ScriptCanvas/Libraries/Math/Divide.h
     Include/ScriptCanvas/Libraries/Math/Math.cpp
-    Include/ScriptCanvas/Libraries/Math/Math.h
     Include/ScriptCanvas/Libraries/Math/MathExpression.cpp
-    Include/ScriptCanvas/Libraries/Math/MathExpression.h
-    Include/ScriptCanvas/Libraries/Math/MathExpression.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp
-    Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
-    Include/ScriptCanvas/Libraries/Math/MathGenerics.h
-    Include/ScriptCanvas/Libraries/Math/MathRandom.h
-    Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h
-    Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h
-    Include/ScriptCanvas/Libraries/Math/Multiply.h
-    Include/ScriptCanvas/Libraries/Math/OBBNodes.h
-    Include/ScriptCanvas/Libraries/Math/PlaneNodes.h
-    Include/ScriptCanvas/Libraries/Math/RotationNodes.h
-    Include/ScriptCanvas/Libraries/Math/Subtract.h
-    Include/ScriptCanvas/Libraries/Math/Sum.h
-    Include/ScriptCanvas/Libraries/Math/TransformNodes.h
-    Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
-    Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
-    Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
-    Include/ScriptCanvas/Libraries/Comparison/Comparison.h
     Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp
-    Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h
-    Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
-    Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
-    Include/ScriptCanvas/Libraries/Comparison/Less.h
-    Include/ScriptCanvas/Libraries/Comparison/Greater.h
-    Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
-    Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
-    Include/ScriptCanvas/Libraries/Time/Time.h
     Include/ScriptCanvas/Libraries/Time/Time.cpp
     Include/ScriptCanvas/Libraries/Time/Countdown.cpp
-    Include/ScriptCanvas/Libraries/Time/Countdown.h
-    Include/ScriptCanvas/Libraries/Time/Countdown.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
     Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp
-    Include/ScriptCanvas/Libraries/Time/DelayNodeable.ScriptCanvasNodeable.xml
     Include/ScriptCanvas/Libraries/Time/Duration.cpp
-    Include/ScriptCanvas/Libraries/Time/Duration.h
-    Include/ScriptCanvas/Libraries/Time/Duration.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp
-    Include/ScriptCanvas/Libraries/Time/HeartBeat.h
-    Include/ScriptCanvas/Libraries/Time/HeartBeat.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Time/Timer.cpp
-    Include/ScriptCanvas/Libraries/Time/Timer.h
-    Include/ScriptCanvas/Libraries/Time/Timer.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h
     Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.cpp
-    Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml
-    Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
     Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp
-    Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml
-    Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h
     Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.cpp
-    Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml
-    Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
     Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp
-    Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml
     Include/ScriptCanvas/Libraries/Spawning/Spawning.cpp
-    Include/ScriptCanvas/Libraries/Spawning/Spawning.h
     Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
-    Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
-    Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.ScriptCanvasNodeable.xml
     Include/ScriptCanvas/Libraries/String/Contains.cpp
-    Include/ScriptCanvas/Libraries/String/Contains.h
-    Include/ScriptCanvas/Libraries/String/Contains.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/String/Format.cpp
-    Include/ScriptCanvas/Libraries/String/Format.h
-    Include/ScriptCanvas/Libraries/String/Format.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/String/Print.h
-    Include/ScriptCanvas/Libraries/String/Print.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/String/Replace.cpp
-    Include/ScriptCanvas/Libraries/String/Replace.h
-    Include/ScriptCanvas/Libraries/String/Replace.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/String/String.h
     Include/ScriptCanvas/Libraries/String/String.cpp
-    Include/ScriptCanvas/Libraries/String/StringMethods.h
     Include/ScriptCanvas/Libraries/String/StringMethods.cpp
-    Include/ScriptCanvas/Libraries/String/StringGenerics.h
     Include/ScriptCanvas/Libraries/String/Utilities.cpp
-    Include/ScriptCanvas/Libraries/String/Utilities.h
-    Include/ScriptCanvas/Libraries/String/Utilities.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
-    Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
-    Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
-    Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
-    Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
-    Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h
-    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h
     Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h
     Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h
     Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
-    Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h
-    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h
     Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp
-    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h
     Include/ScriptCanvas/Libraries/Operators/Operators.cpp
-    Include/ScriptCanvas/Libraries/Operators/Operators.h
     Include/ScriptCanvas/Libraries/Operators/Operator.cpp
-    Include/ScriptCanvas/Libraries/Operators/Operator.h
-    Include/ScriptCanvas/Libraries/Operators/Operator.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
-    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.ScriptCanvasGrammar.xml
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.ScriptCanvasGrammar.xml
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp
-    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
     Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
-    Include/ScriptCanvas/Profiler/Driller.h
-    Include/ScriptCanvas/Profiler/Aggregator.h
     Include/ScriptCanvas/Profiler/Aggregator.cpp
-    Include/ScriptCanvas/Profiler/DrillerEvents.h
     Include/ScriptCanvas/Profiler/DrillerEvents.cpp
-    Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.h
     Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.cpp
-    Include/ScriptCanvas/Serialization/DatumSerializer.h
     Include/ScriptCanvas/Serialization/DatumSerializer.cpp
-    Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.h
     Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.cpp
     Include/ScriptCanvas/Data/DataTrait.cpp
-    Include/ScriptCanvas/Data/DataTrait.h
     Include/ScriptCanvas/Data/PropertyTraits.cpp
-    Include/ScriptCanvas/Data/PropertyTraits.h
-    Include/ScriptCanvas/Data/Traits.h
-    Include/ScriptCanvas/Variable/VariableBus.h
-    Include/ScriptCanvas/Variable/GraphVariable.h
     Include/ScriptCanvas/Variable/GraphVariable.cpp
-    Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h
     Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp
-    Include/ScriptCanvas/Variable/VariableCore.h
     Include/ScriptCanvas/Variable/VariableCore.cpp
-    Include/ScriptCanvas/Variable/VariableData.h
     Include/ScriptCanvas/Variable/VariableData.cpp
-    Include/ScriptCanvas/Utils/DataUtils.h
     Include/ScriptCanvas/Utils/DataUtils.cpp
-    Include/ScriptCanvas/Utils/NodeUtils.h
     Include/ScriptCanvas/Utils/NodeUtils.cpp
-    Include/ScriptCanvas/Utils/SerializationUtils.h
-    Include/ScriptCanvas/Utils/VersionConverters.h
     Include/ScriptCanvas/Utils/VersionConverters.cpp
     Include/ScriptCanvas/Utils/VersioningUtils.cpp
     Include/ScriptCanvas/Utils/VersioningUtils.cpp
-    Include/ScriptCanvas/Utils/BehaviorContextUtils.h
     Include/ScriptCanvas/Utils/BehaviorContextUtils.cpp
 )
 
 set(SKIP_UNITY_BUILD_INCLUSION_FILES
     Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp
-    Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
-    Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
     Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp
 )
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake
new file mode 100644
index 0000000000..7dfe9653b6
--- /dev/null
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake
@@ -0,0 +1,378 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    Include/ScriptCanvas/SystemComponent.h
+    Include/ScriptCanvas/ScriptCanvasGem.h
+    Include/ScriptCanvas/Asset/AssetDescription.h
+    Include/ScriptCanvas/Asset/AssetRegistry.h
+    Include/ScriptCanvas/Asset/AssetRegistryBus.h
+    Include/ScriptCanvas/Asset/ExecutionLogAsset.h
+    Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h
+    Include/ScriptCanvas/Asset/RuntimeAsset.h
+    Include/ScriptCanvas/Asset/RuntimeAssetHandler.h
+    Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
+    Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h
+    Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h
+    Include/ScriptCanvas/Core/ScriptCanvasBus.h
+    Include/ScriptCanvas/Core/ExecutionNotificationsBus.h
+    Include/ScriptCanvas/Core/GraphBus.h
+    Include/ScriptCanvas/Core/NodeBus.h
+    Include/ScriptCanvas/Core/EBusNodeBus.h
+    Include/ScriptCanvas/Core/NodelingBus.h
+    Include/ScriptCanvas/Core/ContractBus.h
+    Include/ScriptCanvas/Core/Attributes.h
+    Include/ScriptCanvas/Core/Connection.h
+    Include/ScriptCanvas/Core/ConnectionBus.h
+    Include/ScriptCanvas/Core/Contract.h
+    Include/ScriptCanvas/Core/Contracts.h
+    Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h
+    Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h
+    Include/ScriptCanvas/Core/Core.h
+    Include/ScriptCanvas/Core/Datum.h
+    Include/ScriptCanvas/Core/DatumBus.h
+    Include/ScriptCanvas/Core/EBusHandler.h
+    Include/ScriptCanvas/Core/Endpoint.h
+    Include/ScriptCanvas/Core/Graph.h
+    Include/ScriptCanvas/Core/GraphData.h
+    Include/ScriptCanvas/Core/GraphScopedTypes.h
+    Include/ScriptCanvas/Core/MethodConfiguration.h
+    Include/ScriptCanvas/Core/ModifiableDatumView.h
+    Include/ScriptCanvas/Core/Node.h
+    Include/ScriptCanvas/Core/Nodeable.h
+    Include/ScriptCanvas/Core/NodeableNode.h
+    Include/ScriptCanvas/Core/NodeableNodeOverloaded.h
+    Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+    Include/ScriptCanvas/Core/SerializationListener.h
+    Include/ScriptCanvas/Core/Slot.h
+    Include/ScriptCanvas/Core/SlotConfigurationDefaults.h
+    Include/ScriptCanvas/Core/SlotConfigurations.h
+    Include/ScriptCanvas/Core/SlotExecutionMap.h
+    Include/ScriptCanvas/Core/SlotMetadata.h
+    Include/ScriptCanvas/Core/SlotNames.h
+    Include/ScriptCanvas/Core/SubgraphInterface.h
+    Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h
+    Include/ScriptCanvas/Translation/AbstractModelTranslator.h
+    Include/ScriptCanvas/Translation/Configuration.h
+    Include/ScriptCanvas/Translation/GraphToCPlusPlus.h
+    Include/ScriptCanvas/Translation/GraphToLua.h
+    Include/ScriptCanvas/Translation/GraphToLuaUtility.h
+    Include/ScriptCanvas/Translation/GraphToX.h
+    Include/ScriptCanvas/Translation/Translation.h
+    Include/ScriptCanvas/Translation/TranslationContext.h
+    Include/ScriptCanvas/Translation/TranslationResult.h
+    Include/ScriptCanvas/Translation/TranslationUtilities.h
+    Include/ScriptCanvas/PerformanceStatistician.h
+    Include/ScriptCanvas/PerformanceStatisticsBus.h
+    Include/ScriptCanvas/PerformanceTracker.h
+    Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja
+    Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja
+    Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
+    Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
+    Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
+    Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
+    Include/ScriptCanvas/CodeGen/NodeableCodegen.h
+    Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h
+    Include/ScriptCanvas/Core/Contracts/ContractRTTI.h
+    Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h
+    Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h
+    Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h
+    Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h
+    Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h
+    Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h
+    Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h
+    Include/ScriptCanvas/Core/Contracts/TypeContract.h
+    Include/ScriptCanvas/Data/BehaviorContextObject.h
+    Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h
+    Include/ScriptCanvas/Data/Data.h
+    Include/ScriptCanvas/Data/DataMacros.h
+    Include/ScriptCanvas/Data/DataRegistry.h
+    Include/ScriptCanvas/Data/NumericData.h
+    Include/ScriptCanvas/Deprecated/VariableDatumBase.h
+    Include/ScriptCanvas/Deprecated/VariableDatum.h
+    Include/ScriptCanvas/Deprecated/VariableHelpers.h
+    Include/ScriptCanvas/Execution/ErrorBus.h
+    Include/ScriptCanvas/Execution/ExecutionBus.h
+    Include/ScriptCanvas/Execution/ExecutionContext.h
+    Include/ScriptCanvas/Execution/ExecutionObjectCloning.h
+    Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h
+    Include/ScriptCanvas/Execution/ExecutionState.h
+    Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h
+    Include/ScriptCanvas/Execution/NativeHostDeclarations.h
+    Include/ScriptCanvas/Execution/NativeHostDefinitions.h
+    Include/ScriptCanvas/Execution/RuntimeComponent.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h
+    Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h
+    Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h
+    Include/ScriptCanvas/Grammar/AbstractCodeModel.h
+    Include/ScriptCanvas/Grammar/DebugMap.h
+    Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
+    Include/ScriptCanvas/Grammar/ParsingMetaData.h
+    Include/ScriptCanvas/Grammar/ParsingUtilities.h
+    Include/ScriptCanvas/Grammar/Primitives.h
+    Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h
+    Include/ScriptCanvas/Grammar/PrimitivesExecution.h
+    Include/ScriptCanvas/Grammar/SymbolNames.h
+    Include/ScriptCanvas/Execution/ErrorBus.h
+    Include/ScriptCanvas/Execution/ExecutionContext.h
+    Include/ScriptCanvas/Execution/ExecutionBus.h
+    Include/ScriptCanvas/Execution/NativeHostDeclarations.h
+    Include/ScriptCanvas/Execution/NativeHostDefinitions.h
+    Include/ScriptCanvas/Execution/RuntimeComponent.h
+    Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h
+    Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h
+    Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h
+    Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Internal/Nodes/StringFormatted.h
+    Include/ScriptCanvas/Internal/Nodes/StringFormatted.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Grammar/AbstractCodeModel.h
+    Include/ScriptCanvas/Libraries/Libraries.h
+    Include/ScriptCanvas/Libraries/Core/AzEventHandler.h
+    Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/BinaryOperator.h
+    Include/ScriptCanvas/Libraries/Core/CoreNodes.h
+    Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h
+    Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
+    Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/ExtractProperty.h
+    Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h
+    Include/ScriptCanvas/Libraries/Core/ForEach.h
+    Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/FunctionBus.h
+    Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
+    Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
+    Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h
+    Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/GetVariable.h
+    Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/Method.h
+    Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h
+    Include/ScriptCanvas/Libraries/Core/MethodUtility.h
+    Include/ScriptCanvas/Libraries/Core/Nodeling.h
+    Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
+    Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/Repeater.h
+    Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h
+    Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h
+    Include/ScriptCanvas/Libraries/Core/ScriptEventBase.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h
+    Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/SetVariable.h
+    Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/Start.h
+    Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Core/UnaryOperator.h
+    Include/ScriptCanvas/Libraries/Entity/Entity.h
+    Include/ScriptCanvas/Libraries/Entity/EntityNodes.h
+    Include/ScriptCanvas/Libraries/Entity/RotateMethod.h
+    Include/ScriptCanvas/Libraries/Logic/And.h
+    Include/ScriptCanvas/Libraries/Logic/Any.h
+    Include/ScriptCanvas/Libraries/Logic/Any.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Break.h
+    Include/ScriptCanvas/Libraries/Logic/Break.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Cycle.h
+    Include/ScriptCanvas/Libraries/Logic/Cycle.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Gate.h
+    Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Indexer.h
+    Include/ScriptCanvas/Libraries/Logic/Indexer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/IsNull.h
+    Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Logic.h
+    Include/ScriptCanvas/Libraries/Logic/Multiplexer.h
+    Include/ScriptCanvas/Libraries/Logic/Multiplexer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Not.h
+    Include/ScriptCanvas/Libraries/Logic/Once.h
+    Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Or.h
+    Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
+    Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/Sequencer.h
+    Include/ScriptCanvas/Libraries/Logic/Sequencer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
+    Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
+    Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Logic/While.h
+    Include/ScriptCanvas/Libraries/Logic/While.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Math/AABBNodes.h
+    Include/ScriptCanvas/Libraries/Math/ColorNodes.h
+    Include/ScriptCanvas/Libraries/Math/CRCNodes.h
+    Include/ScriptCanvas/Libraries/Math/Divide.h
+    Include/ScriptCanvas/Libraries/Math/Math.h
+    Include/ScriptCanvas/Libraries/Math/MathExpression.h
+    Include/ScriptCanvas/Libraries/Math/MathExpression.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h
+    Include/ScriptCanvas/Libraries/Math/MathGenerics.h
+    Include/ScriptCanvas/Libraries/Math/MathRandom.h
+    Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h
+    Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h
+    Include/ScriptCanvas/Libraries/Math/Multiply.h
+    Include/ScriptCanvas/Libraries/Math/OBBNodes.h
+    Include/ScriptCanvas/Libraries/Math/PlaneNodes.h
+    Include/ScriptCanvas/Libraries/Math/RotationNodes.h
+    Include/ScriptCanvas/Libraries/Math/Subtract.h
+    Include/ScriptCanvas/Libraries/Math/Sum.h
+    Include/ScriptCanvas/Libraries/Math/TransformNodes.h
+    Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h
+    Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h
+    Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h
+    Include/ScriptCanvas/Libraries/Comparison/Comparison.h
+    Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h
+    Include/ScriptCanvas/Libraries/Comparison/EqualTo.h
+    Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h
+    Include/ScriptCanvas/Libraries/Comparison/Less.h
+    Include/ScriptCanvas/Libraries/Comparison/Greater.h
+    Include/ScriptCanvas/Libraries/Comparison/LessEqual.h
+    Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h
+    Include/ScriptCanvas/Libraries/Time/Time.h
+    Include/ScriptCanvas/Libraries/Time/Countdown.h
+    Include/ScriptCanvas/Libraries/Time/Countdown.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Time/DelayNodeable.h
+    Include/ScriptCanvas/Libraries/Time/DelayNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/Time/Duration.h
+    Include/ScriptCanvas/Libraries/Time/Duration.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Time/HeartBeat.h
+    Include/ScriptCanvas/Libraries/Time/HeartBeat.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Time/Timer.h
+    Include/ScriptCanvas/Libraries/Time/Timer.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h
+    Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/Time/DurationNodeable.h
+    Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h
+    Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/Time/TimerNodeable.h
+    Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/Spawning/Spawning.h
+    Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
+    Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.ScriptCanvasNodeable.xml
+    Include/ScriptCanvas/Libraries/String/Contains.h
+    Include/ScriptCanvas/Libraries/String/Contains.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/String/Format.h
+    Include/ScriptCanvas/Libraries/String/Format.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/String/Print.h
+    Include/ScriptCanvas/Libraries/String/Print.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/String/Replace.h
+    Include/ScriptCanvas/Libraries/String/Replace.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/String/String.h
+    Include/ScriptCanvas/Libraries/String/StringMethods.h
+    Include/ScriptCanvas/Libraries/String/StringGenerics.h
+    Include/ScriptCanvas/Libraries/String/Utilities.h
+    Include/ScriptCanvas/Libraries/String/Utilities.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h
+    Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h
+    Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h
+    Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h
+    Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h
+    Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h
+    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h
+    Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h
+    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h
+    Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h
+    Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h
+    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h
+    Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h
+    Include/ScriptCanvas/Libraries/Operators/Operators.h
+    Include/ScriptCanvas/Libraries/Operators/Operator.h
+    Include/ScriptCanvas/Libraries/Operators/Operator.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h
+    Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.ScriptCanvasGrammar.xml
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
+    Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
+    Include/ScriptCanvas/Profiler/Driller.h
+    Include/ScriptCanvas/Profiler/Aggregator.h
+    Include/ScriptCanvas/Profiler/DrillerEvents.h
+    Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.h
+    Include/ScriptCanvas/Serialization/DatumSerializer.h
+    Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.h
+    Include/ScriptCanvas/Data/DataTrait.h
+    Include/ScriptCanvas/Data/PropertyTraits.h
+    Include/ScriptCanvas/Data/Traits.h
+    Include/ScriptCanvas/Variable/VariableBus.h
+    Include/ScriptCanvas/Variable/GraphVariable.h
+    Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h
+    Include/ScriptCanvas/Variable/VariableCore.h
+    Include/ScriptCanvas/Variable/VariableData.h
+    Include/ScriptCanvas/Utils/DataUtils.h
+    Include/ScriptCanvas/Utils/NodeUtils.h
+    Include/ScriptCanvas/Utils/SerializationUtils.h
+    Include/ScriptCanvas/Utils/VersionConverters.h
+    Include/ScriptCanvas/Utils/BehaviorContextUtils.h
+)
+
+set(SKIP_UNITY_BUILD_INCLUSION_FILES
+    Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h
+    Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h
+)
diff --git a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
index ac25c7275b..0d25959066 100644
--- a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
+++ b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
@@ -32,7 +32,7 @@ ly_add_target(
         PRIVATE
             Legacy::CryCommon
             Gem::ScriptCanvasPhysics.Static
-            Gem::ScriptCanvas
+            Gem::ScriptCanvas.API
 )
 
 # By default, the above module is used by all application types, however, the module depends at runtime to ScriptCanvas
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
index f45b74d4f1..6e38f71eec 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
@@ -91,14 +91,6 @@ namespace ScriptCanvasTests
             AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
             AZ_Assert(fileIO, "SC unit tests require filehandling");
 
-            if (!fileIO->GetAlias("@engroot@"))
-            {
-                const char* engineRoot = nullptr;
-                AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-                AZ_Assert(engineRoot, "null engine root");
-                fileIO->SetAlias("@engroot@", engineRoot);
-            }
-
             s_setupSucceeded = fileIO->GetAlias("@engroot@") != nullptr;
             
             AZ::TickBus::AllowFunctionQueuing(true);
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml
index 0be3c8c81a..a2a89509e6 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml
+++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- These are examples on how to create different kinds of nodes, by default they do not show 
+on the Script Canvas node palette, to show them, remove the following attribute from the desired 
+node:
+
+EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
+-->
+
 <ScriptCanvas Include="Source/Nodes/Nodeables/ValuePointerReferenceExample.h" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Class Name="ReturnTypeExample"
             QualifiedName="ScriptCanvasTesting::Nodeables::ReturnTypeExample"
             PreferredClassName="Return Type Example"
             Base="ScriptCanvas::Nodeable"
             Icon="Icons/ScriptCanvas/Placeholder.png"
-            Category="Tests"
+            Category="Examples"
             GeneratePropertyFriend="True"
             Namespace="None"
+            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
             Description="Example of returning by value, pointer and reference.">
     <Input Name="Return By Value"  >
       <Return Name="Value" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;" />
@@ -24,9 +33,10 @@
             PreferredClassName="Branch Input Type Example"
             Base="ScriptCanvas::Nodeable"
             Icon="Icons/ScriptCanvas/Placeholder.png"
-            Category="Tests"
+            Category="Examples"
             GeneratePropertyFriend="True"
             Namespace="None"
+            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
             Description="Example of branch passing as input by value, pointer and reference.">
     <Input Name="Get Internal Vector" Description="">
       <Return Name="Result" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;" />
@@ -46,9 +56,10 @@
             PreferredClassName="Input Type Example"
             Base="ScriptCanvas::Nodeable"
             Icon="Icons/ScriptCanvas/Placeholder.png"
-            Category="Tests"
+            Category="Examples"
             GeneratePropertyFriend="True"
             Namespace="None"
+            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
             Description="Example of passing as input by value, pointer and reference.">
     <Input Name="Clear By Value" Description="">
       <Parameter Name="Value Input" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;"/>
@@ -65,9 +76,10 @@
             PreferredClassName="Property Example"
             Base="ScriptCanvas::Nodeable"
             Icon="Icons/ScriptCanvas/Placeholder.png"
-            Category="Tests"
+            Category="Examples"
             GeneratePropertyFriend="True"
             Namespace="None"
+            EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All"
             Description="Example of using properties.">
     <Input Name="In" Description=""/>
     <Property Name="Numbers" Type="AZStd::vector&lt;ScriptCanvas::Data::NumberType&gt;"/>
diff --git a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
index 0a0f71bead..c983717a0d 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
@@ -26,9 +26,12 @@ namespace ScriptCanvasTesting
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            behaviorContext->EnumProperty<(AZ::u32)TestEnum::Alpha>("ALPHA");
-            behaviorContext->EnumProperty<(AZ::u32)TestEnum::Bravo>("BRAVO");
-            behaviorContext->EnumProperty<(AZ::u32)TestEnum::Charlie>("CHARLIE");
+            behaviorContext->EnumProperty<(AZ::u32)TestEnum::Alpha>("ALPHA")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All);
+            behaviorContext->EnumProperty<(AZ::u32)TestEnum::Bravo>("BRAVO")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All);
+            behaviorContext->EnumProperty<(AZ::u32)TestEnum::Charlie>("CHARLIE")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All);
         }
     }
 
diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp
deleted file mode 100644
index 696d2af4d2..0000000000
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "ScriptEventReferencesComponent.h"
-
-namespace ScriptEvents
-{
-    namespace Components
-    {
-        void ScriptEventReferencesComponent::Reflect(AZ::ReflectContext* context)
-        {
-            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-            {
-                // The Script Event References component is no longer necessary, as all Script Event assets
-                // will be properly loaded as needed.
-                serializeContext->ClassDeprecate("ScriptEventReferencesComponent", "{D0F440AC-32D4-49EC-8B93-860B188266A6}");
-            }
-        }
-
-        void ScriptEventReferencesComponent::Activate()
-        {
-            for (auto& scriptEventReferences : m_scriptEventAssets)
-            {
-                const auto& asset = scriptEventReferences.GetAsset();
-                if (asset)
-                {
-                    if (!AZ::Data::AssetBus::MultiHandler::BusIsConnectedId(asset.GetId()))
-                    {
-                        AZ::Data::AssetBus::MultiHandler::BusConnect(asset.GetId());
-                    }
-                
-                    // Load the asset if it's not ready
-                    if (!asset.IsReady())
-                    {
-                        AZ::Data::AssetInfo assetInfo;
-                        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, asset.GetId());
-                        if (assetInfo.m_assetId.IsValid())
-                        {
-                            AZ::Data::AssetManager::Instance().GetAsset(asset.GetId(), azrtti_typeid<ScriptEventsAsset>(), AZ::Data::AssetLoadBehavior::Default)
-                                .BlockUntilLoadComplete();
-                        }
-                    }
-                }
-                else
-                {
-                    AZ_Warning("Script Events", false, "ScriptEventReferencesComponent could not find Script Event asset: %s", scriptEventReferences.GetDefinition() ? scriptEventReferences.GetDefinition()->GetName().c_str() : scriptEventReferences.GetAsset().GetId().ToString<AZStd::string>().c_str());
-                }
-            }
-        }
-
-        void ScriptEventReferencesComponent::Deactivate()
-        {
-            for (auto& scriptEventReferences : m_scriptEventAssets)
-            {
-                const auto& asset = scriptEventReferences.GetAsset();
-                if (asset)
-                {
-                    AZ::Data::AssetBus::MultiHandler::BusDisconnect(asset.GetId());
-                }
-            }
-        }
-
-        void ScriptEventReferencesComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("ScriptEventReference", 0x3df92d40));
-        }
-
-        void ScriptEventReferencesComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-        {
-            incompatible.push_back(AZ_CRC("ScriptEventReference", 0x3df92d40));
-        }
-
-        void ScriptEventReferencesComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-        {
-            dependent.push_back(AZ_CRC("LuaScriptService", 0x21d76c4b));
-        }
-
-        void ScriptEventReferencesComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
-        {
-            if (ScriptEventsAsset* scriptEventAsset = asset.GetAs<ScriptEventsAsset>())
-            {
-                scriptEventAsset->m_definition.RegisterInternal();
-            }
-        }
-
-    }
-}
diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h
deleted file mode 100644
index 562cab9b52..0000000000
--- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <ScriptEvents/ScriptEventsAssetRef.h>
-#include <AzCore/Asset/AssetCommon.h>
-
-namespace ScriptEvents
-{
-    namespace Components
-    {
-        class ScriptEventReferencesComponent 
-            : public AZ::Component
-            , private AZ::Data::AssetBus::MultiHandler
-
-        {
-        public:
-
-            AZ_COMPONENT(ScriptEventReferencesComponent, "{D0F440AC-32D4-49EC-8B93-860B188266A6}", AZ::Component);
-
-            //////////////////////////////////////////////////////////////////////////
-            // AZ::Component
-            void Init() override {}
-            void Activate() override;
-            void Deactivate() override;
-            //////////////////////////////////////////////////////////////////////////
-
-            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
-            static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
-            static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
-
-            void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-            static void Reflect(AZ::ReflectContext* reflection);
-
-            AZStd::vector<ScriptEvents::ScriptEventsAssetRef> m_scriptEventAssets;
-        };
-    }
-}
diff --git a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp
index 8ab014ec15..3dec167f73 100644
--- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp
+++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp
@@ -9,7 +9,6 @@
 #include <ScriptEvents/ScriptEventsGem.h>
 #include <Source/Editor/ScriptEventsSystemEditorComponent.h>
 
-#include <ScriptEvents/Components/ScriptEventReferencesComponent.h>
 #include <Builder/ScriptEventsBuilderComponent.h>
 #include <ScriptEvents/ScriptEventsBus.h>
 
@@ -74,7 +73,6 @@ namespace ScriptEvents
 
         m_descriptors.insert(m_descriptors.end(), {
             ScriptEventsEditor::ScriptEventEditorSystemComponent::CreateDescriptor(),
-            ScriptEvents::Components::ScriptEventReferencesComponent::CreateDescriptor(),
             ScriptEventsBuilder::ScriptEventsBuilderComponent::CreateDescriptor(),
         });
     }
diff --git a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp
index e4fb44f548..bc46993649 100644
--- a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp
+++ b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp
@@ -12,8 +12,6 @@
 
 #include <ScriptEvents/ScriptEventsGem.h>
 
-#include <ScriptEvents/Components/ScriptEventReferencesComponent.h>
-
 namespace ScriptEvents
 {
     ScriptEventsModule::ScriptEventsModule()
@@ -23,8 +21,7 @@ namespace ScriptEvents
         ScriptEventModuleConfigurationRequestBus::Handler::BusConnect();
 
         m_descriptors.insert(m_descriptors.end(), {
-            ScriptEvents::ScriptEventsSystemComponent::CreateDescriptor(),
-            ScriptEvents::Components::ScriptEventReferencesComponent::CreateDescriptor(),
+            ScriptEvents::ScriptEventsSystemComponent::CreateDescriptor()
         });
     }
 
diff --git a/Gems/ScriptEvents/Code/scriptevents_common_files.cmake b/Gems/ScriptEvents/Code/scriptevents_common_files.cmake
index a7ecd9e049..a038bb2c90 100644
--- a/Gems/ScriptEvents/Code/scriptevents_common_files.cmake
+++ b/Gems/ScriptEvents/Code/scriptevents_common_files.cmake
@@ -42,6 +42,4 @@ set(FILES
     Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventsBindingBus.h
     Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.h
     Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp
-    Include/ScriptEvents/Components/ScriptEventReferencesComponent.h
-    Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp
 )
diff --git a/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h
index 849a462ab2..9a36cf5222 100644
--- a/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h
+++ b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraConstants.h
@@ -24,17 +24,6 @@ namespace Camera
         Z_Axis = 2
     };
 
-    //////////////////////////////////////////////////////////////////////////
-    /// These are intended to be used as an index and needs to be implicitly
-    /// convertible to int.  See StartingPointCameraUtilities.h for examples
-    enum VectorComponentType : int
-    {
-        X_Component = 0,
-        Y_Component = 1,
-        Z_Component = 2,
-        None = 3,
-    };
-
     //////////////////////////////////////////////////////////////////////////
     /// These are intended to be used as an index and needs to be implicitly
     /// convertible to int.  See StartingPointCameraUtilities.h for examples
diff --git a/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h
index eec86059c5..c565bf9379 100644
--- a/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h
+++ b/Gems/StartingPointCamera/Code/Include/StartingPointCamera/StartingPointCameraUtilities.h
@@ -16,24 +16,16 @@ namespace Camera
 {
     const char* GetNameFromUuid(const AZ::Uuid& uuid);
 
-    //////////////////////////////////////////////////////////////////////////
-    /// This methods will 0 out a vector component and re-normalize it
-    //////////////////////////////////////////////////////////////////////////
-    void MaskComponentFromNormalizedVector(AZ::Vector3& v, VectorComponentType vectorComponentType);
+    //! This methods will 0 out specified vector components and re-normalize it
+    void MaskComponentFromNormalizedVector(AZ::Vector3& v, bool ignoreX, bool ignoreY, bool ignoreZ);
 
-    //////////////////////////////////////////////////////////////////////////
-    /// This will calculate the requested Euler angle from a given AZ::Quaternion
-    //////////////////////////////////////////////////////////////////////////
+    //! This will calculate the requested Euler angle from a given AZ::Quaternion
     float GetEulerAngleFromTransform(const AZ::Transform& rotation, EulerAngleType eulerAngleType);
 
-    //////////////////////////////////////////////////////////////////////////
-    /// This will calculate an AZ::Transform based on an Euler angle
-    //////////////////////////////////////////////////////////////////////////
+    //! This will calculate an AZ::Transform based on an Euler angle
     AZ::Transform CreateRotationFromEulerAngle(EulerAngleType rotationType, float radians);
 
-    //////////////////////////////////////////////////////////////////////////
-    /// Creates the Quaternion representing the rotation looking down the vector
-    //////////////////////////////////////////////////////////////////////////
+    //! Creates the Quaternion representing the rotation looking down the vector
     AZ::Quaternion CreateQuaternionFromViewVector(const AZ::Vector3 lookVector);
 
 } //namespace Camera
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp
index d7fcc771f4..1d8d6adf6c 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp
@@ -9,8 +9,8 @@
 #include "SlideAlongAxisBasedOnAngle.h"
 #include "StartingPointCamera/StartingPointCameraUtilities.h"
 #include <AzCore/Math/Quaternion.h>
-#include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Math/Transform.h>
+#include <AzCore/Serialization/EditContext.h>
 
 namespace Camera
 {
@@ -20,48 +20,79 @@ namespace Camera
         if (serializeContext)
         {
             serializeContext->Class<SlideAlongAxisBasedOnAngle>()
-                ->Version(1)
+                ->Version(2)
                 ->Field("Axis to slide along", &SlideAlongAxisBasedOnAngle::m_axisToSlideAlong)
                 ->Field("Angle Type", &SlideAlongAxisBasedOnAngle::m_angleTypeToChangeFor)
-                ->Field("Vector Component To Ignore", &SlideAlongAxisBasedOnAngle::m_vectorComponentToIgnore)
+                ->Field("Ignore X Component", &SlideAlongAxisBasedOnAngle::m_ignoreX)
+                ->Field("Ignore Y Component", &SlideAlongAxisBasedOnAngle::m_ignoreY)
+                ->Field("Ignore Z Component", &SlideAlongAxisBasedOnAngle::m_ignoreZ)
                 ->Field("Max Positive Slide Distance", &SlideAlongAxisBasedOnAngle::m_maximumPositiveSlideDistance)
                 ->Field("Max Negative Slide Distance", &SlideAlongAxisBasedOnAngle::m_maximumNegativeSlideDistance);
 
             AZ::EditContext* editContext = serializeContext->GetEditContext();
             if (editContext)
             {
-                editContext->Class<SlideAlongAxisBasedOnAngle>("SlideAlongAxisBasedOnAngle", "Slide 0..SlideDistance along Axis based on Angle Type.  Maps from 90..-90 degrees")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SlideAlongAxisBasedOnAngle::m_axisToSlideAlong, "Axis to slide along", "The Axis to slide along")
-                        ->EnumAttribute(RelativeAxisType::ForwardBackward, "Forwards and Backwards")
-                        ->EnumAttribute(RelativeAxisType::LeftRight, "Right and Left")
-                        ->EnumAttribute(RelativeAxisType::UpDown, "Up and Down")
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SlideAlongAxisBasedOnAngle::m_angleTypeToChangeFor, "Angle Type", "The angle type to base the slide off of")
-                        ->EnumAttribute(EulerAngleType::Pitch, "Pitch")
-                        ->EnumAttribute(EulerAngleType::Roll, "Roll")
-                        ->EnumAttribute(EulerAngleType::Yaw, "Yaw")
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SlideAlongAxisBasedOnAngle::m_vectorComponentToIgnore, "Vector Component To Ignore", "The Vector Component To Ignore")
-                        ->EnumAttribute(VectorComponentType::None, "None")
-                        ->EnumAttribute(VectorComponentType::X_Component, "X")
-                        ->EnumAttribute(VectorComponentType::Y_Component, "Y")
-                        ->EnumAttribute(VectorComponentType::Z_Component, "Z")
-                    ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_maximumPositiveSlideDistance, "Max Positive Slide Distance", "The maximum distance to slide in the positive")
-                        ->Attribute(AZ::Edit::Attributes::Suffix, "m")
-                    ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_maximumNegativeSlideDistance, "Max Negative Slide Distance", "The maximum distance to slide in the negative")
-                        ->Attribute(AZ::Edit::Attributes::Suffix, "m");
+                editContext->Class<SlideAlongAxisBasedOnAngle>("SlideAlongAxisBasedOnAngle",
+                    "Slide 0..SlideDistance along Axis based on Angle Type.  Maps from 90..-90 degrees")
+                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SlideAlongAxisBasedOnAngle::m_axisToSlideAlong, "Axis to slide along",
+                            "The Axis to slide along")
+                            ->EnumAttribute(RelativeAxisType::ForwardBackward, "Forwards and Backwards")
+                            ->EnumAttribute(RelativeAxisType::LeftRight, "Right and Left")
+                            ->EnumAttribute(RelativeAxisType::UpDown, "Up and Down")
+                        ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SlideAlongAxisBasedOnAngle::m_angleTypeToChangeFor, "Angle Type",
+                            "The angle type to base the slide off of")
+                            ->EnumAttribute(EulerAngleType::Pitch, "Pitch")
+                            ->EnumAttribute(EulerAngleType::Roll, "Roll")
+                            ->EnumAttribute(EulerAngleType::Yaw, "Yaw")
+                        ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_maximumPositiveSlideDistance, "Max Positive Slide Distance",
+                            "The maximum distance to slide in the positive")
+                            ->Attribute(AZ::Edit::Attributes::Suffix, "m")
+                        ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_maximumNegativeSlideDistance, "Max Negative Slide Distance",
+                            "The maximum distance to slide in the negative")
+                            ->Attribute(AZ::Edit::Attributes::Suffix, "m")
+                        ->ClassElement(AZ::Edit::ClassElements::Group, "Vector Components To Ignore")
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                            ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_ignoreX, "X", "When active, the X Component will be ignored.")
+                                ->Attribute(AZ::Edit::Attributes::ReadOnly, &SlideAlongAxisBasedOnAngle::YAndZIgnored)
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::AttributesAndValues)
+                            ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_ignoreY, "Y", "When active, the Y Component will be ignored.")
+                                ->Attribute(AZ::Edit::Attributes::ReadOnly, &SlideAlongAxisBasedOnAngle::XAndZIgnored)
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::AttributesAndValues)
+                            ->DataElement(0, &SlideAlongAxisBasedOnAngle::m_ignoreZ, "Z", "When active, the Z Component will be ignored.")
+                                ->Attribute(AZ::Edit::Attributes::ReadOnly, &SlideAlongAxisBasedOnAngle::XAndYIgnored)
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::AttributesAndValues)
+                    ;
             }
         }
     }
 
-    void SlideAlongAxisBasedOnAngle::AdjustLookAtTarget([[maybe_unused]] float deltaTime, [[maybe_unused]] const AZ::Transform& targetTransform, AZ::Transform& outLookAtTargetTransform)
+    void SlideAlongAxisBasedOnAngle::AdjustLookAtTarget(
+        [[maybe_unused]] float deltaTime, [[maybe_unused]] const AZ::Transform& targetTransform, AZ::Transform& outLookAtTargetTransform)
     {
         float angle = GetEulerAngleFromTransform(outLookAtTargetTransform, m_angleTypeToChangeFor);
         float currentPositionOnRange = -angle / AZ::Constants::HalfPi;
         float slideScale = currentPositionOnRange > 0.0f ? m_maximumPositiveSlideDistance : m_maximumNegativeSlideDistance;
 
         AZ::Vector3 basis = outLookAtTargetTransform.GetBasis(m_axisToSlideAlong);
-        MaskComponentFromNormalizedVector(basis, m_vectorComponentToIgnore);
+        MaskComponentFromNormalizedVector(basis, m_ignoreX, m_ignoreY, m_ignoreZ);
 
         outLookAtTargetTransform.SetTranslation(outLookAtTargetTransform.GetTranslation() + basis * currentPositionOnRange * slideScale);
     }
-}
+
+    bool SlideAlongAxisBasedOnAngle::XAndYIgnored() const
+    {
+        return m_ignoreX && m_ignoreY;
+    }
+
+    bool SlideAlongAxisBasedOnAngle::XAndZIgnored() const
+    {
+        return m_ignoreX && m_ignoreZ;
+    }
+
+    bool SlideAlongAxisBasedOnAngle::YAndZIgnored() const
+    {
+        return m_ignoreY && m_ignoreZ;
+    }
+
+} // namespace Camera
diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
index 3558fd7272..e517b6ffbd 100644
--- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
+++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.h
@@ -6,11 +6,11 @@
  *
  */
 #pragma once
-#include <CameraFramework/ICameraLookAtBehavior.h>
-#include <AzCore/Math/Transform.h>
-#include <AzCore/RTTI/ReflectContext.h>
 #include "StartingPointCamera/StartingPointCameraConstants.h"
+#include <AzCore/Math/Transform.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/RTTI/ReflectContext.h>
+#include <CameraFramework/ICameraLookAtBehavior.h>
 
 namespace Camera
 {
@@ -38,13 +38,19 @@ namespace Camera
         void Activate(AZ::EntityId) override {}
         void Deactivate() override {}
 
+        bool XAndYIgnored() const;
+        bool XAndZIgnored() const;
+        bool YAndZIgnored() const;
+
     private:
         //////////////////////////////////////////////////////////////////////////
         // Reflected data
         RelativeAxisType m_axisToSlideAlong = ForwardBackward;
         EulerAngleType m_angleTypeToChangeFor = Pitch;
-        VectorComponentType m_vectorComponentToIgnore = None;
         float m_maximumPositiveSlideDistance = 0.0f;
         float m_maximumNegativeSlideDistance = 0.0f;
+        bool m_ignoreX = false;
+        bool m_ignoreY = false;
+        bool m_ignoreZ = false;
     };
 } // namespace Camera
diff --git a/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp b/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp
index b8f0945c55..0831ef26e0 100644
--- a/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp
+++ b/Gems/StartingPointCamera/Code/Source/StartingPointCamera/StartingPointCameraUtilities.cpp
@@ -26,38 +26,32 @@ namespace Camera
         return "";
     }
 
-    //////////////////////////////////////////////////////////////////////////
-    /// This methods will 0 out a vector component and re-normalize it
-    //////////////////////////////////////////////////////////////////////////
-    void MaskComponentFromNormalizedVector(AZ::Vector3& v, VectorComponentType vectorComponentType)
+    void MaskComponentFromNormalizedVector(AZ::Vector3& v, bool ignoreX, bool ignoreY, bool ignoreZ)
     {
-        switch (vectorComponentType)
-        {
-        case X_Component:
+
+        if (ignoreX)
         {
             v.SetX(0.f);
-            break;
         }
-        case Y_Component:
+
+        if (ignoreY)
         {
             v.SetY(0.f);
-            break;
         }
-        case Z_Component:
+
+        if (ignoreZ)
         {
             v.SetZ(0.f);
-            break;
         }
-        default:
-            AZ_Assert(false, "MaskComponentFromNormalizedVector: VectorComponentType - unexpected value");
-            break;
+
+        if (v.IsZero())
+        {
+            AZ_Warning("StartingPointCameraUtilities", false, "MaskComponentFromNormalizedVector: trying to normalize zero vector.")
+            return;
         }
         v.Normalize();
     }
 
-    //////////////////////////////////////////////////////////////////////////
-    /// This will calculate the requested Euler angle from a given AZ::Quaternion
-    //////////////////////////////////////////////////////////////////////////
     float GetEulerAngleFromTransform(const AZ::Transform& rotation, EulerAngleType eulerAngleType)
     {
         AZ::Vector3 angles = rotation.GetEulerDegrees();
@@ -70,14 +64,11 @@ namespace Camera
         case Yaw:
             return angles.GetZ();
         default:
-            AZ_Warning("", false, "GetEulerAngleFromRotation: eulerAngleType - value not supported");
+            AZ_Warning("StartingPointCameraUtilities", false, "GetEulerAngleFromRotation: eulerAngleType - value not supported");
             return 0.f;
         }
     }
 
-    //////////////////////////////////////////////////////////////////////////
-    /// This will calculate an AZ::Transform based on an Euler angle
-    //////////////////////////////////////////////////////////////////////////
     AZ::Transform CreateRotationFromEulerAngle(EulerAngleType rotationType, float radians)
     {
         switch (rotationType)
@@ -89,14 +80,11 @@ namespace Camera
         case Yaw:
             return AZ::Transform::CreateRotationZ(radians);
         default:
-            AZ_Warning("", false, "CreateRotationFromEulerAngle: rotationType - value not supported");
+            AZ_Warning("StartingPointCameraUtilities", false, "CreateRotationFromEulerAngle: rotationType - value not supported");
             return AZ::Transform::Identity();
         }
     }
 
-    //////////////////////////////////////////////////////////////////////////
-    /// Creates the Quaternion representing the rotation looking down the vector
-    //////////////////////////////////////////////////////////////////////////
     AZ::Quaternion CreateQuaternionFromViewVector(const AZ::Vector3 lookVector)
     {
         float twoDimensionLength = AZ::Vector2(lookVector.GetX(), lookVector.GetY()).GetLength();
diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
index b25c428cfb..d5384161ad 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <AzTest/AzTest.h>
-#include <Mocks/ITimerMock.h>
 #include <Mocks/ICryPakMock.h>
 #include <Mocks/IConsoleMock.h>
 #include <Mocks/ISystemMock.h>
@@ -31,7 +30,6 @@ struct MockGlobalEnvironment
 {
     MockGlobalEnvironment()
     {
-        m_stubEnv.pTimer = &m_stubTimer;
         m_stubEnv.pCryPak = &m_stubPak;
         m_stubEnv.pConsole = &m_stubConsole;
         m_stubEnv.pSystem = &m_stubSystem;
@@ -45,7 +43,6 @@ struct MockGlobalEnvironment
 
 private:
     SSystemGlobalEnvironment m_stubEnv;
-    testing::NiceMock<TimerMock> m_stubTimer;
     testing::NiceMock<CryPakMock> m_stubPak;
     testing::NiceMock<ConsoleMock> m_stubConsole;
     testing::NiceMock<SystemMock> m_stubSystem;
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg
index 57835e9c20..78af20cc2d 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg
@@ -1,7 +1,5 @@
-<?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 / Environmental / Terrain Height</title>
-    <g id="icon-/-Environmental-/-Terrain-Height" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M15,4 L22,20 L7.9986687,19.9993631 L7.9986687,14.9993631 L10,15 L8,11 L7.9986687,11.0013631 L7.9986687,8.00136309 L8,8 L10.8,13.6 L15,4 Z M15,7 L13,12 L17,12 L15,7 Z M7.21914721,0.964363085 L7.21914721,5.50135833 L5.8081113,5.50135833 L5.8081113,6.20344432 L7.21914721,6.20344432 L7.21914721,7.31885826 L5.8081113,7.31885826 L5.8081113,7.94758992 L7.21914721,7.94758992 L7.21914721,9.12604407 L6.01490518,9.12604407 L6.01490518,9.69309095 L7.21914721,9.69309095 L7.21914721,10.8434468 L6.01490518,10.8434468 L6.01490518,11.3367478 L7.21914721,11.3367478 L7.21914721,12.561057 L6.01490518,12.561057 L6.01490518,13.2062487 L7.21914721,13.2062487 L7.21914721,14.3024381 L6.01490518,14.3024381 L6.01490518,14.9912747 L7.21914721,14.9912747 L7.21914721,16.0640829 L6.01490518,16.0640829 L6.01490518,16.762272 L7.21914721,16.762272 L7.21914721,17.9022362 L6.01490518,17.9022362 L6.01490518,18.5465186 L7.21914721,18.5465186 L7.21914721,19.5980239 L6.01490518,19.5980239 L6.01490518,20.2294467 L7.21914721,20.2294467 L7.21914721,21.2565316 L5.8081113,21.2565316 L5.8081113,21.9825184 L7.21914721,21.9825184 L7.21914721,23.0479225 L2.9026687,23.0479225 C2.35038395,23.0479225 1.9026687,22.6002072 1.9026687,22.0479225 L1.9026687,1.96436309 C1.9026687,1.41207834 2.35038395,0.964363085 2.9026687,0.964363085 L7.21914721,0.964363085 Z M4.60708525,1.76269886 C4.1792616,1.76269886 3.832442,2.10951846 3.832442,2.53734212 C3.832442,2.96516577 4.1792616,3.31198537 4.60708525,3.31198537 C5.03490891,3.31198537 5.38172851,2.96516577 5.38172851,2.53734212 C5.38172851,2.10951846 5.03490891,1.76269886 4.60708525,1.76269886 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Height">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M8.39932 20.9263H8.40041H14.4004H22.4004L15.4004 4.92626L11.2004 14.5263L8.40041 8.92626L8.39932 8.92844V11.9284L8.40041 11.9263L10.4004 15.9263H8.39932V20.9263ZM17.4004 12.9263L15.4004 7.92626L13.4004 12.9263H17.4004ZM7.6197 1.89062V6.01824H5.20867V7.5273H7.6197V9.50794H5.20867V11.0642H7.6197V13.0212H5.20867V14.4781H7.6197V16.5345H5.20867V18.0436H7.6197V20.0478H5.20867V21.5804H7.6197V23.9742H3.30322C2.75094 23.9742 2.30322 23.5265 2.30322 22.9742V2.89062C2.30322 2.33834 2.75094 1.89062 3.30322 1.89062H7.6197ZM5.00749 4.23825C5.43532 4.23825 5.78214 3.89143 5.78214 3.4636C5.78214 3.03578 5.43532 2.68896 5.00749 2.68896C4.57967 2.68896 4.23285 3.03578 4.23285 3.4636C4.23285 3.89143 4.57967 4.23825 5.00749 4.23825Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg
index df73d78276..ad7403d976 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg
@@ -1,7 +1,5 @@
-<?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 / Environmental / Generate Terrian </title>
-    <g id="icon-/-Environmental-/-Generate-Terrian-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9311553 L10.7351274,16.9317461 L10.786,16.8081553 L10.867,16.9694019 L16,5.23640192 Z M10.7866981,7.88269686 C11.1462033,8.9008023 11.3517156,9.91858532 11.3517156,10.6951961 C11.3517156,13.0695588 9.43072532,14.9943601 7.06106374,14.9943601 C4.69140216,14.9943601 2.77041189,13.0695588 2.77041189,10.6951961 C2.77041189,9.98779834 2.94092524,9.08030022 3.24301589,8.15472512 L5.48573411,10.2222098 L7.16571378,8.51342542 L8.83993571,10.2222098 L10.7866981,7.88269686 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M7.06106374,3.69215527 C8.35768587,3.69215527 9.51997507,5.07798918 10.306728,6.72204766 L8.83082438,8.28190713 L7.15660245,6.58611652 L5.47662277,8.28190713 L3.80919728,6.73502979 C4.59603726,5.08529116 5.76103013,3.69215527 7.06106374,3.69215527 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Generate Terrian ">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M10.5915 5.75867V3.78491L8.14171 5.75868L5.73579 3.78493V5.75869L8.14171 7.7209L10.5915 5.75867ZM4.6284 17.7275L2.47607 22.0322H24.4761L17.4761 6.03216L12.3431 17.7652L12.3213 17.7216L12.3189 17.7275L4.6284 17.7275ZM15.4761 14.0322L17.4761 9.03216L19.4761 14.0322H15.4761ZM13.2506 8.8115L13.2506 10.7737L8.11263 13.8174L3.19236 10.7737L3.19234 8.8115L8.11263 11.8879L13.2506 8.8115ZM12.2099 14.5311V12.4753L8.17521 14.7984L4.08817 12.4753V14.5311L8.17521 16.758L12.2099 14.5311ZM12.1813 6.18129V8.14351L8.12581 10.7259L4.20414 8.14355V6.18129L8.12581 8.69091L12.1813 6.18129Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg
new file mode 100644
index 0000000000..9a694bfbf7
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5903 17.9785L23.5387 21.8974C24.0255 22.3839 24.0255 23.1676 23.5387 23.6271C23.2953 23.8433 22.9978 23.9785 22.6733 23.9785C22.3488 23.9785 22.0513 23.8703 21.8079 23.6271L17.8866 19.6541C16.1558 21.0325 13.9923 21.7622 11.8018 21.7622C9.1515 21.7622 6.66349 20.7352 4.79748 18.8703C2.93147 17.0055 1.90381 14.519 1.90381 11.8703C1.90381 9.2217 2.93147 6.73521 4.79748 4.87035C6.66349 3.00548 9.1515 1.97845 11.8018 1.97845C14.4521 1.97845 16.9401 3.00548 18.8061 4.87035C22.3488 8.41089 22.6733 14.0325 19.5903 17.9785ZM17.0753 17.1406C18.4816 15.7352 19.2658 13.8703 19.2658 11.8703C19.2658 9.87035 18.4816 8.00548 17.0753 6.60008C15.669 5.19467 13.803 4.41089 11.8018 4.41089C9.82759 4.41089 7.93454 5.19467 6.52827 6.60008C5.122 8.00548 4.33774 9.87035 4.33774 11.8703C4.33774 13.8433 5.122 15.7352 6.52827 17.1406C7.93454 18.546 9.82759 19.3298 11.8018 19.3298C13.776 19.3298 15.669 18.546 17.0753 17.1406ZM18.0816 11.9162C18.0816 15.3082 15.2695 18.058 11.8006 18.058C8.33165 18.058 5.51953 15.3082 5.51953 11.9162C5.51953 8.52414 8.33165 5.77435 11.8006 5.77435C15.2695 5.77435 18.0816 8.52414 18.0816 11.9162ZM8.57961 7.4831L8.19536 7.45775L7.72224 7.7861L7.0996 8.36703L6.4769 9.47836L6.50604 10.343L6.94695 11.0336L7.34856 11.1443L7.65414 11.6224L8.19536 11.7768L8.91138 11.9146L9.33482 12.2333L9.07726 12.8133L9.12092 13.5482L9.29117 13.889L9.94598 14.3937L10.1948 14.7036L10.1555 16.2708L10.7405 17.258H11.3647V16.3992L11.8537 15.9255L12.2203 15.4341L12.4081 14.9117L12.7486 14.8807L13.0367 14.6195L13.2462 13.588L12.9843 13.2383L12.622 12.9107L12.0632 12.8575L11.0024 11.7768H9.36974L9.0467 11.5206L8.79788 11.4485L8.76295 11.0696L8.96376 10.9185L9.29117 10.8423L9.44068 11.0336H9.76699L9.80192 10.6263L11.4695 9.00157H11.7183L12.0632 8.8422L12.2073 8.43933L12.0632 8.08074L11.7183 7.76199L12.3731 7.54507L12.4517 7.23075L12.2815 6.97398H10.3432L9.93724 7.31487L9.83248 7.09794L9.61857 7.03596L8.96376 7.06695L8.57961 7.4831ZM14.5894 7.45775C14.5253 7.4662 14.3836 7.49549 14.3303 7.54507V7.76199L14.2341 8.00781L14.5302 8.2255L14.8263 8.00781L14.9299 7.7861L14.7448 7.45775H14.5894ZM17.4991 10.2534L17.1956 10.4014V10.6877L17.2242 10.746L17.0173 10.6877C16.9408 10.7392 16.7819 10.8423 16.7582 10.8423C16.7346 10.8423 16.3733 10.7893 16.1957 10.7628C16.0871 10.6977 15.8596 10.5571 15.8182 10.5151C15.7767 10.473 15.5887 10.3524 15.4999 10.2974L15.1594 10.343L14.6486 10.2974L14.2045 10.6877L13.9454 11.0336L14.0342 11.6936L14.4784 12.4143L14.6486 12.3542H15.2186C15.3074 12.3542 15.6997 12.3942 15.8848 12.4143L15.9736 12.647L16.2623 13.4202L16.1957 14.0357L16.3289 14.3937L16.5362 15.2968L16.5954 15.5371L17.1209 14.8807L17.5651 13.889L17.8242 12.8575V11.6561L17.6465 10.6877L17.4991 10.2534ZM16.5954 9.29896L16.2623 9.53167L16.3289 9.79441C16.3906 9.82944 16.5184 9.8935 16.5362 9.86948C16.5539 9.84545 16.5831 9.80942 16.5954 9.79441C16.6373 9.7819 16.7582 9.74336 16.9063 9.68931C17.0543 9.63527 16.9038 9.52616 16.8101 9.47836L16.5954 9.29896ZM17.1654 9.29896L16.8101 9.2239L16.5362 9.1113C16.3585 9.14883 15.9973 9.2239 15.9736 9.2239C15.9499 9.2239 15.6479 9.39354 15.4999 9.47836L15.2852 9.86948L14.8263 10.0647L14.2341 9.86948C14.2464 9.77464 14.2711 9.57432 14.2711 9.53167C14.2711 9.48903 14.2267 9.23365 14.2045 9.1113L14.5302 8.93864L14.9299 8.73596L15.0409 8.68341L15.2186 8.51076L15.2852 8.27805L15.3296 7.93274L15.3888 7.64748L15.5517 7.45775L15.6405 7.40727C15.7663 7.51747 16.0358 7.74271 16.1068 7.76199C16.1779 7.78128 16.6694 8.41934 16.9063 8.73596L17.1654 9.29896ZM7.15022 13.9306L6.99478 14.0357V14.4261C7.07373 14.4905 7.25503 14.6123 7.34856 14.5837C7.42293 14.5609 7.47518 14.4903 7.51098 14.4418C7.53147 14.4141 7.54657 14.3937 7.55734 14.3937C7.58103 14.3937 7.46852 14.1951 7.4093 14.0958L7.15022 13.9306Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg
new file mode 100644
index 0000000000..56ffb05464
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7165 3.56718V8.58933L13.773 6.64134L12.6468 8.34583L11.338 6.21522L10.8814 9.1372L6.83329 6.21522L8.90302 10.4156L4.97661 10.6895L8.35515 12.394L5.18967 14.342L7.56378 15.4377L1.38525 15.2247L6.16391 12.5462L1.96337 10.0503L7.07684 9.35026L4.42853 3.38455L10.029 7.00659L10.8814 4.11505L12.6468 6.21522L14.7165 3.56718ZM4.8511 17.0216L2.85254 21.0187H23.2807L16.7808 6.16187L12.0146 17.0566L11.9944 17.0162L11.9923 17.0216L4.8511 17.0216ZM14.9238 13.5903L16.7809 8.94749L18.638 13.5903H14.9238ZM12.6111 11.3781L12.4661 11.0843L12.3045 10.8102C12.3533 10.7181 12.4547 10.5202 12.4701 10.4659C12.475 10.4486 12.48 10.4124 12.4861 10.3676L12.4861 10.3676L12.4861 10.3675C12.5042 10.2361 12.5325 10.0309 12.5984 10.0131C12.669 9.99395 12.8785 9.85331 12.9745 9.78538L13.4633 9.92386L13.3558 10.5048C13.2817 10.6034 13.1371 10.8162 13.1519 10.8791C13.1667 10.942 13.1486 11.1689 13.1377 11.2746C13.186 11.2961 13.2734 11.371 13.2373 11.4984C13.2012 11.6258 13.1228 11.6918 13.088 11.7089C13.0123 11.6605 12.847 11.5599 12.7925 11.5444C12.738 11.529 12.6488 11.4271 12.6111 11.3781ZM9.87069 11.9189L10.0283 11.3625L10.1196 11.0403L10.4203 10.8724L10.7424 10.9637L10.9982 11.2892L11.3462 11.7358L10.9836 12.2342L10.4686 11.9301L9.87069 11.9189ZM8.66858 14.7105L8.1912 14.3854L7.92762 14.3107L7.71721 13.7133L8.45669 13.4482L9.07512 13.2754L9.36459 13.7054L9.04931 14.8183L8.66858 14.7105ZM10.746 14.4131L10.0275 14.7158L10.3428 15.0398L10.705 15.1424L11.0954 15.3183L11.3214 15.6204L11.6558 15.5567L11.7554 15.2053L11.5538 14.8002L11.2438 14.5542L10.746 14.4131ZM10.3529 13.5671L10.2727 13.2917L10.4096 13.1348L10.9115 13.0324L11.1499 13.1978L11.1476 13.5803L10.7644 13.7897L10.3529 13.5671ZM11.731 13.3624L11.7135 13.7407L12.096 13.743L12.2625 13.4152L12.4438 13.1486L12.8589 12.8342L13.0764 12.7572L13.0726 12.5115L12.9466 12.5248L12.8363 12.3386L12.5407 12.1734L12.316 12.1097L12.0282 12.3135L11.8522 12.6468L11.7111 13.1449C11.6957 13.1992 11.718 13.3126 11.731 13.3624Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg
new file mode 100644
index 0000000000..c4e8ce79d2
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.36963 5.82434C4.36963 6.65277 3.69806 7.32434 2.86963 7.32434C2.0412 7.32434 1.36963 6.65277 1.36963 5.82434C1.36963 4.99591 2.0412 4.32434 2.86963 4.32434C3.69806 4.32434 4.36963 4.99591 4.36963 5.82434ZM3.17354 17.2069L1.01855 21.5169H23.0186L16.0186 5.51691L10.8856 17.2499L10.8553 17.1894L10.8481 17.2069L3.17354 17.2069ZM14.0186 13.5169L16.0186 8.51691L18.0186 13.5169H14.0186ZM2.86963 11.5726C3.69806 11.5726 4.36963 10.901 4.36963 10.0726C4.36963 9.24414 3.69806 8.57257 2.86963 8.57257C2.0412 8.57257 1.36963 9.24414 1.36963 10.0726C1.36963 10.901 2.0412 11.5726 2.86963 11.5726ZM4.36963 14.3208C4.36963 15.1492 3.69806 15.8208 2.86963 15.8208C2.0412 15.8208 1.36963 15.1492 1.36963 14.3208C1.36963 13.4924 2.0412 12.8208 2.86963 12.8208C3.69806 12.8208 4.36963 13.4924 4.36963 14.3208ZM12.6904 4.81268H5.69043V6.81268H12.6904V4.81268ZM5.69043 9.01562H12.6904V11.0156H5.69043V9.01562ZM11.6664 13.2186L5.68753 13.2186V15.1799L10.7174 15.1799L11.6664 13.2186Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg
new file mode 100644
index 0000000000..5a25cb3be9
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2024 8.86384C14.5252 9.25573 14.8253 9.70547 15.0823 10.2077L16.7397 6.06409L18.7397 11.0641H15.4568C15.957 12.4269 16.1334 14.0867 15.6857 15.9661C15.4431 16.4279 15.2743 16.7516 15.1502 16.9897C14.9006 17.4684 14.8316 17.6007 14.7057 17.8118C14.8977 18.0184 15.3391 18.4966 15.8348 19.0641H23.7397L16.7397 3.06409L14.2024 8.86384ZM16.3592 20.5424L13.6912 17.8943C15.7744 15.2279 15.5551 11.4291 13.1612 9.03667C11.9003 7.77652 10.219 7.08252 8.42815 7.08252C6.63726 7.08252 4.95603 7.77652 3.6951 9.03667C2.43417 10.2968 1.73975 11.977 1.73975 13.7668C1.73975 15.5566 2.43417 17.2368 3.6951 18.497C4.95603 19.7571 6.63726 20.4511 8.42815 20.4511C9.90837 20.4511 11.3703 19.958 12.5399 19.0266L15.1896 21.7113C15.3541 21.8756 15.5551 21.9487 15.7744 21.9487C15.9937 21.9487 16.1947 21.8574 16.3592 21.7113C16.6881 21.4008 16.6881 20.8712 16.3592 20.5424ZM13.4719 13.7668C13.4719 15.1183 12.9419 16.3784 11.9916 17.3281C11.0414 18.2778 9.76217 18.8074 8.42815 18.8074C7.09412 18.8074 5.81492 18.2778 4.86466 17.3281C3.91439 16.3784 3.38444 15.1 3.38444 13.7668C3.38444 12.4153 3.91439 11.1552 4.86466 10.2055C5.81492 9.25583 7.09412 8.7262 8.42815 8.7262C9.78045 8.7262 11.0414 9.25583 11.9916 10.2055C12.9419 11.1552 13.4719 12.4153 13.4719 13.7668ZM7.31185 10.347L7.70199 10.1649L8.22233 10.5291V10.7372L7.88417 11.1534H7.05176V10.7372L7.31185 10.347ZM9.8418 10.861L9.4516 11.1211L9.28132 11.6934L9.65971 11.8235L10.1019 11.9733L10.5702 11.5634V11.3032V11.1211L9.8418 10.861ZM5.8877 14.1543L4.10791 14.8324C4.43285 15.4257 5.4048 16.7819 6.69314 17.4599C8.02872 18.1629 9.18941 17.8456 10.1027 17.596L10.1028 17.596C10.2907 17.5446 10.4681 17.4961 10.6344 17.4599C11.3751 17.2989 11.7976 16.0858 12.088 15.2521L12.088 15.2521C12.1798 14.9886 12.2584 14.763 12.3296 14.6205C12.5669 14.1459 12.4285 12.9536 12.3296 12.4168L11.6939 11.8235L10.1259 13.4339L9.65971 12.9677L7.92215 14.1543L6.94742 14.8324L5.8877 14.1543ZM6.69314 12.7402V12.1159H7.31204C7.36407 12.1604 7.48373 12.2829 7.54616 12.4168C7.60859 12.5506 7.82283 12.6882 7.92215 12.7402V12.9677L7.54616 13.2604L6.94742 13.4339L6.45362 13.2604L6.69314 12.7402ZM5.65997 12.954L5.49688 12.6952L5.19867 12.5466L4.9053 12.5837L4.97944 13.1704L5.30293 13.3717L5.44962 13.3532L5.65997 12.954Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg
index c6388d6215..f3c17f66e4 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg
@@ -1,8 +1,5 @@
-<?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 / Environmental / Terrain Refactor</title>
-    <g id="icon-/-Environmental-/-Terrain-Refactor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
-        <path d="M2,20 L8,8 L10.8,13.6 L15,4 L22,20 L2,20 Z M8,11 L6,15 L10,15 L8,11 Z M15,7 L13,12 L17,12 L15,7 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Refactor">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.9932 20.5717H14.9932H8.99316H2.99316L8.99316 8.57166L11.7932 14.1717L15.9932 4.57166L22.9932 20.5717ZM15.9932 7.57166L17.9932 12.5717H13.9932L15.9932 7.57166ZM8.99316 11.5717L10.9932 15.5717H6.99316L8.99316 11.5717Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg
index bd1512afda..b128d0f316 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg
@@ -1,8 +1,5 @@
-<?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 / Environmental / Terrain World Debugger</title>
-    <g id="icon-/-Environmental-/-Terrain-World-Debugger" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
-        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L4.034,15.1675981 L5.534,15.1675981 L5,16.2364019 L9,16.2364019 L8.466,15.1675981 L9.966,15.1675981 L10.867,16.9694019 L16,5.23640192 Z M5.7575896,2.84113022 C6.03130743,3.01216811 5.99303429,3.29144758 5.82199641,3.56516541 C5.5939459,3.93012252 5.63692265,4.11800916 5.79661523,4.47152561 C6.28699059,4.39735197 7.01109383,4.59333567 7.42167058,4.8498925 C7.55852949,4.93541144 7.6668821,5.06655002 7.80374101,5.15206897 C8.11735815,5.15774162 8.40246897,5.20903391 8.76170575,5.24321288 L9.24631309,4.46767902 C8.9379383,4.03250676 8.70982422,3.7208123 8.56197083,3.53259562 C8.34019074,3.25027061 9.17154039,2.55841555 9.4400416,2.93949264 C9.57872751,3.13632611 9.82791397,3.48184986 10.187601,3.9760639 C10.2921591,4.119728 10.3942808,4.6608066 10.3267772,4.76883491 L9.87364273,5.4940017 C10.1587536,5.54529399 10.3697384,5.61369961 10.5807233,5.68210522 C10.8373278,5.77901716 11.1395519,5.9044354 11.4132698,6.07547329 L11.7101975,5.60028961 C11.8353154,5.40005911 12.2927086,5.36754107 12.4693791,5.39797939 C13.0265899,5.49398048 13.4462261,5.56768275 13.7282877,5.61908617 C14.2855266,5.72063845 13.9217192,6.73248862 13.5801311,6.66829019 C13.3524057,6.62549124 12.9722579,6.55710151 12.4396878,6.46312102 L12.2686499,6.73683885 C12.5480881,7.10174828 13.0794962,7.47936459 13.5424736,8.2230391 C13.2332304,8.82332896 12.3709586,10.4987773 10.9556581,13.249384 C10.2300617,13.3746794 8.81376094,13.077921 8.3917912,12.9411097 L8.22075331,13.2148276 C8.50116176,13.5796109 8.72927585,13.8913054 8.90509558,14.149911 C9.16882518,14.5378194 8.27592007,15.0939625 8.02702481,14.743014 C7.89765153,14.5605944 7.64842782,14.2153849 7.2793537,13.7073854 C7.12105098,13.489495 7.07511207,13.0179769 7.14377888,12.908087 L7.42238579,12.4622227 C7.14866796,12.2911849 6.90345644,12.0745273 6.70386456,11.8863761 C6.50427268,11.6982249 6.37880675,11.4929604 6.22483451,11.3333155 L5.71101869,12.1555927 C5.66374222,12.2312508 5.39038727,12.3573847 5.30398078,12.3447359 C4.6772029,12.2529836 4.15546889,12.1592118 3.73877875,12.0634204 C3.21667547,11.8756628 3.41280304,11.0226842 3.88693529,11.0142164 C4.12232485,11.0454571 4.51197472,11.0986403 5.0558849,11.1737659 L5.54049224,10.3982321 C5.32378704,10.1359549 5.18120779,9.85656443 5.03862853,9.57717395 C4.8732633,9.53727464 4.70789807,9.49737534 4.57103915,9.4118564 C4.1604624,9.15529957 3.78986942,8.48459472 3.61306352,8.05695233 C3.17970079,8.03988668 2.99858532,8.18114181 2.77053481,8.54609893 C2.59949692,8.81981676 2.32495313,9.10238902 2.0512353,8.93135114 C1.77751746,8.76031325 1.77825895,8.55548589 1.94929684,8.28176806 C2.34838524,7.64309311 2.76327156,7.33075241 3.4931381,7.27936476 C3.53871006,6.80038239 3.65840797,6.3042867 3.94347111,5.84809031 C4.22853425,5.39189392 4.59344369,5.11245575 5.00397276,4.86152389 C4.73020724,4.18299733 4.73852278,3.70999986 5.13761117,3.07132492 C5.30864906,2.79760708 5.48387176,2.67009234 5.7575896,2.84113022 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M8.03008933,6.27169476 C7.86593803,6.90855503 7.62722372,7.47571465 7.31394641,7.9731736 C7.00066911,8.47063256 6.59764439,8.93015918 6.10487226,9.35175347 C6.78174598,10.4775099 7.41236887,11.2247577 7.99674093,11.5934967 C8.5453571,11.9396737 9.08387287,12.311171 9.87590139,12.1865085 C10.2486081,11.6217646 11.911756,8.7895471 12.3207747,8.14675221 C11.6119238,7.43916872 11.2609677,7.0257827 10.6750595,6.74648915 C9.90539682,6.37960262 8.70735067,6.16885245 8.03008933,6.27169476 Z M4.85586389,6.41821659 C4.37125655,7.19375045 4.50249049,8.10037522 5.14116544,8.49946362 C5.27802436,8.58498256 5.3267053,8.57787184 5.47944458,8.48580763 C5.99590493,8.07119781 6.32940283,7.74343935 6.4799383,7.50253224 C6.63347019,7.25682987 6.79975217,6.83183484 6.97878426,6.22754717 C7.02310864,5.99705844 6.98840321,5.84780422 6.85154429,5.76228528 C6.21286935,5.36319688 5.34047123,5.64268273 4.85586389,6.41821659 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Debugger">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M11.0131 14.6091C11.0131 14.6091 13.0294 10.43 13.47 9.51795C13.1593 9.04638 12.8241 8.7276 12.5478 8.4648L12.5478 8.46478C12.3954 8.31991 12.261 8.19204 12.1584 8.06496L12.3223 7.78694C12.8572 7.86721 13.2389 7.92581 13.4677 7.96275C13.8108 8.01815 14.1485 6.99729 13.5888 6.91009C13.3055 6.86594 12.8842 6.80305 12.3247 6.72139C12.1473 6.6955 11.6909 6.73976 11.5709 6.94313L11.2863 7.42579C11.0083 7.26184 10.7029 7.14422 10.4439 7.05394C10.2313 6.99097 10.0186 6.92801 9.73225 6.88406L10.1666 6.14749C10.2313 6.03776 10.1153 5.49949 10.0071 5.35855C9.63485 4.87374 9.37687 4.53473 9.23317 4.34153C8.95497 3.96747 8.14167 4.68045 8.37063 4.95699C8.52327 5.14135 8.75931 5.44708 9.07876 5.87419L8.61424 6.66191C8.48943 6.65327 8.37348 6.64233 8.26217 6.63184C8.05242 6.61207 7.85917 6.59385 7.65425 6.59541C7.58474 6.55442 7.52207 6.50185 7.45939 6.44927C7.39672 6.3967 7.33405 6.34413 7.26454 6.30314C6.84751 6.05722 6.11861 5.8799 5.6303 5.96664C5.46158 5.61735 5.41379 5.43062 5.63239 5.05993C5.79635 4.78191 5.82743 4.50174 5.54941 4.33779C5.27139 4.17384 5.0995 4.30581 4.93555 4.58383C4.553 5.23255 4.55684 5.7056 4.84794 6.37687C4.44399 6.63827 4.08638 6.92699 3.81313 7.39036C3.53988 7.85372 3.43296 8.35273 3.39971 8.83273C2.67141 8.90284 2.26468 9.22574 1.88213 9.87445C1.71818 10.1525 1.7227 10.3573 2.00072 10.5212C2.27874 10.6852 2.54593 10.3956 2.70988 10.1176C2.92849 9.74691 3.10591 9.60105 3.53957 9.60698C3.7273 10.0299 4.115 10.6909 4.53203 10.9368C4.67104 11.0188 4.83738 11.0544 5.00372 11.0901C5.15342 11.3657 5.30313 11.6413 5.5265 11.898L5.06198 12.6857C4.51632 12.6246 4.12543 12.5814 3.88932 12.5562C3.41556 12.5769 3.2414 13.4346 3.76816 13.6089C4.18717 13.6939 4.71114 13.7743 5.34007 13.8499C5.42677 13.8603 5.6968 13.7272 5.74212 13.6504L6.23464 12.8152C6.30169 12.8812 6.36383 12.9556 6.42876 13.0333L6.42879 13.0334L6.4288 13.0334C6.51687 13.1388 6.61009 13.2504 6.72772 13.3557C6.93208 13.5387 7.18277 13.749 7.46079 13.9129L7.19373 14.3658C7.12791 14.4774 7.18595 14.9476 7.34979 15.1614C7.73179 15.6597 7.9898 15.9984 8.12382 16.1775C8.38165 16.5219 9.25997 15.943 8.98637 15.562C8.80396 15.308 8.56792 15.0023 8.27823 14.6448L8.44218 14.3668C8.86752 14.4927 10.291 14.753 11.0131 14.6091ZM5.07854 10.0101C4.42982 9.62754 4.27534 8.72458 4.73987 7.93686C5.20439 7.14913 6.06932 6.84733 6.71804 7.22988C6.85705 7.31185 6.89558 7.46017 6.85719 7.69172C6.69374 8.30041 6.53843 8.72953 6.39126 8.9791C6.24696 9.22379 5.92199 9.56001 5.41635 9.98775C5.26603 10.0837 5.21755 10.0921 5.07854 10.0101ZM8.01264 13.0297L8.08964 13.0757C8.62097 13.3936 9.15418 13.7126 9.90642 13.5743C10.101 13.2623 10.6592 12.2713 11.1915 11.3265L11.1915 11.3265C11.6387 10.5325 12.0676 9.77128 12.2467 9.47307C12.1338 9.36604 12.0298 9.26589 11.9323 9.17206C11.4021 8.66175 11.0664 8.33867 10.5656 8.11554C9.78674 7.76855 8.58368 7.58864 7.90928 7.70885C7.76154 8.34971 7.53748 8.92282 7.23708 9.42816C6.93669 9.9335 6.5456 10.4032 6.06382 10.8373C6.76938 11.9453 7.41899 12.6761 8.01264 13.0297ZM1.66455 21.606L3.81953 17.296L11.4941 17.296L11.5013 17.2785L11.5316 17.339L16.6646 5.60601L23.6646 21.606H1.66455ZM16.6646 8.60601L14.6646 13.606H18.6646L16.6646 8.60601Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg
index ab3716ad5d..de97c005fc 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg
@@ -1,8 +1,5 @@
-<?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 / Environmental / Terrain World Renderer</title>
-    <g id="icon-/-Environmental-/-Terrain-World-Renderer" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
-        <path d="M14.128,5.993 L14.1280665,8 L16.5280665,8 L16.528,7.493 L16.75,7.999 L16.5280665,8 L16.5280665,10.4 L17.8,10.399 L18.85,12.799 L16.5280665,12.8 L16.5280665,15.2 L18.9280665,15.2 L18.928,12.978 L19.9,15.199 L18.9280665,15.2 L18.9280665,17.6 L20.95,17.599 L22,20 L14.1280665,20 L14.1280665,17.6 L11.7280665,17.6 L11.7280665,20 L2,20 L8,8 L10.8,13.6 L12.2,10.399 L14.1280665,10.4 L14.1280665,8 L13.25,7.999 L14.128,5.993 Z M18.9280665,17.6 L16.5280665,17.6 L16.5280665,20 L18.9280665,20 L18.9280665,17.6 Z M16.5280665,15.2 L14.1280665,15.2 L14.1280665,17.6 L16.5280665,17.6 L16.5280665,15.2 Z M14.1280665,12.8 L11.7280665,12.8 L11.7280665,15.2 L14.1280665,15.2 L14.1280665,12.8 Z M8,11 L6,15 L10,15 L8,11 Z M16.5280665,10.4 L14.1280665,10.4 L14.1280665,12.8 L16.5280665,12.8 L16.5280665,10.4 Z M15,4 L15.7,5.599 L14.3,5.599 L15,4 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Renderer">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.5239 20.567L15.5239 4.56696L11.3239 14.167L8.52393 8.56696L2.52393 20.567H8.52393H14.5239H22.5239ZM8.52393 11.567L10.5239 15.567H6.52393L8.52393 11.567ZM21.0005 19.5003L16.0303 7.58151L16.0267 7.58887L15.9981 7.51718H15.548L15.5478 7.51444H15.3548L15.3546 7.51718H14.9369L14.9369 7.50107L14.9301 7.51718H14.9043L14.2861 9.06204L9.93449 19.5002H9.96093L9.93421 19.5482H20.9364L20.9105 19.5003H21.0005ZM18.9946 18.567L18.3561 16.475H16.2325L16.3923 18.567H18.9946ZM14.7918 18.567L14.8984 16.475H12.5604L11.9347 18.567H14.7918ZM14.9484 15.4938H12.8539L13.4618 13.4612H15.0519L14.9484 15.4938ZM18.0566 15.4938H16.1575L16.0022 13.4612H17.4362L18.0566 15.4938ZM14.7353 9.20371L14.441 10.1877H15.2186L15.2687 9.20371H14.7353ZM15.6769 9.20371L15.752 10.1877H16.4371L16.1368 9.20371H15.6769ZM15.8105 10.9522H16.6704L17.1367 12.48H15.9272L15.8105 10.9522ZM14.2123 10.9522H15.1797L15.1019 12.48H13.7553L14.2123 10.9522Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg
index b87a0b4d7e..87a2d199bd 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg
@@ -1,25 +1,22 @@
-<?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 / Environmental / Terrain Height - box</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
-            <stop stop-color="#9D9D9D" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
-    </defs>
-    <g id="icon-/-Environmental-/-Terrain-Height---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/general/color/-box-template">
-            <mask id="mask-3" fill="white">
-                <use xlink:href="#path-2"></use>
-            </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
-                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
-                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
-                </g>
-            </g>
-        </g>
-        <path d="M15.0973313,4.03563691 L22.0973313,20.0356369 L8.096,20.035 L8.096,15.035 L10.0973313,15.0356369 L8.0973313,11.0356369 L8.096,11.037 L8.096,8.037 L8.0973313,8.03563691 L10.8973313,13.6356369 L15.0973313,4.03563691 Z M15.0973313,7.03563691 L13.0973313,12.0356369 L17.0973313,12.0356369 L15.0973313,7.03563691 Z M7.31647851,1 L7.31647851,5.53699525 L5.9054426,5.53699525 L5.9054426,6.23908123 L7.31647851,6.23908123 L7.31647851,7.35449518 L5.9054426,7.35449518 L5.9054426,7.98322684 L7.31647851,7.98322684 L7.31647851,9.16168098 L6.11223647,9.16168098 L6.11223647,9.72872786 L7.31647851,9.72872786 L7.31647851,10.8790837 L6.11223647,10.8790837 L6.11223647,11.3723847 L7.31647851,11.3723847 L7.31647851,12.5966939 L6.11223647,12.5966939 L6.11223647,13.2418856 L7.31647851,13.2418856 L7.31647851,14.338075 L6.11223647,14.338075 L6.11223647,15.0269116 L7.31647851,15.0269116 L7.31647851,16.0997198 L6.11223647,16.0997198 L6.11223647,16.7979089 L7.31647851,16.7979089 L7.31647851,17.9378731 L6.11223647,17.9378731 L6.11223647,18.5821555 L7.31647851,18.5821555 L7.31647851,19.6336608 L6.11223647,19.6336608 L6.11223647,20.2650836 L7.31647851,20.2650836 L7.31647851,21.2921685 L5.9054426,21.2921685 L5.9054426,22.0181553 L7.31647851,22.0181553 L7.31647851,23.0835594 L3,23.0835594 C2.44771525,23.0835594 2,22.6358441 2,22.0835594 L2,2 C2,1.44771525 2.44771525,1 3,1 L7.31647851,1 Z M4.70441655,1.79833578 C4.27659289,1.79833578 3.92977329,2.14515537 3.92977329,2.57297903 C3.92977329,3.00080269 4.27659289,3.34762229 4.70441655,3.34762229 C5.13224021,3.34762229 5.47905981,3.00080269 5.47905981,2.57297903 C5.47905981,2.14515537 5.13224021,1.79833578 4.70441655,1.79833578 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Height - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.2769 0.932434C23.4542 0.932434 24.3087 2.7109 24.3087 3.95109C24.3087 5.19127 24.3087 19.714 24.3087 21.5745C24.3087 23.3254 23.0802 24.8891 21.2769 24.8891C19.4735 24.8891 5.00135 24.8891 3.16134 24.8891C1.73867 24.8891 0.352051 23.4472 0.352051 22.0911C0.352051 20.735 0.352051 4.96776 0.352051 3.60499C0.352051 2.24221 1.71745 0.932434 2.96161 0.932434C4.20577 0.932434 19.3122 0.932434 21.2769 0.932434Z" fill="url(#paint0_linear_651_47649)"/>
+<mask id="mask0_651_47649" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.2769 0.932434C23.4542 0.932434 24.3087 2.7109 24.3087 3.95109C24.3087 5.19127 24.3087 19.714 24.3087 21.5745C24.3087 23.3254 23.0802 24.8891 21.2769 24.8891C19.4735 24.8891 5.00135 24.8891 3.16134 24.8891C1.73867 24.8891 0.352051 23.4472 0.352051 22.0911C0.352051 20.735 0.352051 4.96776 0.352051 3.60499C0.352051 2.24221 1.71745 0.932434 2.96161 0.932434C4.20577 0.932434 19.3122 0.932434 21.2769 0.932434Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_47649)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.352051" y="0.932434" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M8.39932 20.9263H8.40041H14.4004H22.4004L15.4004 4.92626L11.2004 14.5263L8.40041 8.92626L8.39932 8.92844V11.9284L8.40041 11.9263L10.4004 15.9263H8.39932V20.9263ZM17.4004 12.9263L15.4004 7.92626L13.4004 12.9263H17.4004ZM7.6197 1.89062V6.01824H5.20867V7.5273H7.6197V9.50794H5.20867V11.0642H7.6197V13.0212H5.20867V14.4781H7.6197V16.5345H5.20867V18.0436H7.6197V20.0478H5.20867V21.5804H7.6197V23.9742H3.30322C2.75094 23.9742 2.30322 23.5265 2.30322 22.9742V2.89062C2.30322 2.33834 2.75094 1.89062 3.30322 1.89062H7.6197ZM5.00749 4.23825C5.43532 4.23825 5.78214 3.89143 5.78214 3.4636C5.78214 3.03578 5.43532 2.68896 5.00749 2.68896C4.57967 2.68896 4.23285 3.03578 4.23285 3.4636C4.23285 3.89143 4.57967 4.23825 5.00749 4.23825Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_47649" x1="0.352051" y1="0.932434" x2="0.352051" y2="24.8891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg
index c078d32fe5..a89186819f 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg
@@ -1,25 +1,22 @@
-<?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 / Environmental / Generate Terrian - box</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
-            <stop stop-color="#9D9D9D" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
-    </defs>
-    <g id="icon-/-Environmental-/-Generate-Terrian---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/general/color/-box-template">
-            <mask id="mask-3" fill="white">
-                <use xlink:href="#path-2"></use>
-            </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
-                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
-                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
-                </g>
-            </g>
-        </g>
-        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9311553 L10.7351274,16.9317461 L10.786,16.8081553 L10.867,16.9694019 L16,5.23640192 Z M10.7866981,7.88269686 C11.1462033,8.9008023 11.3517156,9.91858532 11.3517156,10.6951961 C11.3517156,13.0695588 9.43072532,14.9943601 7.06106374,14.9943601 C4.69140216,14.9943601 2.77041189,13.0695588 2.77041189,10.6951961 C2.77041189,9.98779834 2.94092524,9.08030022 3.24301589,8.15472512 L5.48573411,10.2222098 L7.16571378,8.51342542 L8.83993571,10.2222098 L10.7866981,7.88269686 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M7.06106374,3.69215527 C8.35768587,3.69215527 9.51997507,5.07798918 10.306728,6.72204766 L8.83082438,8.28190713 L7.15660245,6.58611652 L5.47662277,8.28190713 L3.80919728,6.73502979 C4.59603726,5.08529116 5.76103013,3.69215527 7.06106374,3.69215527 Z" id="Combined-Shape" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Generate Terrian - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.628662C24.0953 0.628662 24.9498 2.40713 24.9498 3.64731C24.9498 4.8875 24.9498 19.4103 24.9498 21.2707C24.9498 23.0216 23.7213 24.5853 21.918 24.5853C20.1147 24.5853 5.64246 24.5853 3.80245 24.5853C2.37978 24.5853 0.993164 23.1434 0.993164 21.7873C0.993164 20.4312 0.993164 4.66399 0.993164 3.30122C0.993164 1.93844 2.35856 0.628662 3.60272 0.628662C4.84688 0.628662 19.9533 0.628662 21.918 0.628662Z" fill="url(#paint0_linear_651_45842)"/>
+<mask id="mask0_651_45842" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.628662C24.0953 0.628662 24.9498 2.40713 24.9498 3.64731C24.9498 4.8875 24.9498 19.4103 24.9498 21.2707C24.9498 23.0216 23.7213 24.5853 21.918 24.5853C20.1147 24.5853 5.64246 24.5853 3.80245 24.5853C2.37978 24.5853 0.993164 23.1434 0.993164 21.7873C0.993164 20.4312 0.993164 4.66399 0.993164 3.30122C0.993164 1.93844 2.35856 0.628662 3.60272 0.628662C4.84688 0.628662 19.9533 0.628662 21.918 0.628662Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_45842)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.993164" y="0.628662" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M10.5915 5.75867V3.78491L8.14171 5.75868L5.73579 3.78493V5.75869L8.14171 7.7209L10.5915 5.75867ZM4.6284 17.7275L2.47607 22.0322H24.4761L17.4761 6.03216L12.3431 17.7652L12.3213 17.7216L12.3189 17.7275L4.6284 17.7275ZM15.4761 14.0322L17.4761 9.03216L19.4761 14.0322H15.4761ZM13.2506 8.8115L13.2506 10.7737L8.11263 13.8174L3.19236 10.7737L3.19234 8.8115L8.11263 11.8879L13.2506 8.8115ZM12.2099 14.5311V12.4753L8.17521 14.7984L4.08817 12.4753V14.5311L8.17521 16.758L12.2099 14.5311ZM12.1813 6.18129V8.14351L8.12581 10.7259L4.20414 8.14355V6.18129L8.12581 8.69091L12.1813 6.18129Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_45842" x1="0.993164" y1="0.628662" x2="0.993164" y2="24.5853" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg
new file mode 100644
index 0000000000..177469e46e
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg
@@ -0,0 +1,16 @@
+<svg width="26" height="25" viewBox="0 0 26 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9981 0.278748C24.1754 0.278748 25.0299 2.05721 25.0299 3.2974C25.0299 4.53758 25.0299 19.0603 25.0299 20.9208C25.0299 22.6717 23.8014 24.2354 21.9981 24.2354C20.1947 24.2354 5.72254 24.2354 3.88253 24.2354C2.45986 24.2354 1.07324 22.7935 1.07324 21.4374C1.07324 20.0813 1.07324 4.31408 1.07324 2.9513C1.07324 1.58853 2.43864 0.278748 3.6828 0.278748C4.92696 0.278748 20.0334 0.278748 21.9981 0.278748Z" fill="url(#paint0_linear_826_47185)"/>
+<mask id="mask0_826_47185" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="0" width="25" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9981 0.278748C24.1754 0.278748 25.0299 2.05721 25.0299 3.2974C25.0299 4.53758 25.0299 19.0603 25.0299 20.9208C25.0299 22.6717 23.8014 24.2354 21.9981 24.2354C20.1947 24.2354 5.72254 24.2354 3.88253 24.2354C2.45986 24.2354 1.07324 22.7935 1.07324 21.4374C1.07324 20.0813 1.07324 4.31408 1.07324 2.9513C1.07324 1.58853 2.43864 0.278748 3.6828 0.278748C4.92696 0.278748 20.0334 0.278748 21.9981 0.278748Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47185)">
+<rect x="1.07324" y="0.278748" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6289 17.2106L23.5773 21.1296C24.0641 21.616 24.0641 22.3998 23.5773 22.8593C23.3339 23.0755 23.0364 23.2106 22.7119 23.2106C22.3874 23.2106 22.0899 23.1025 21.8465 22.8593L17.9252 18.8863C16.1944 20.2647 14.0309 20.9944 11.8404 20.9944C9.19008 20.9944 6.70206 19.9674 4.83605 18.1025C2.97004 16.2377 1.94238 13.7512 1.94238 11.1025C1.94238 8.45388 2.97004 5.96739 4.83605 4.10252C6.70206 2.23766 9.19008 1.21063 11.8404 1.21063C14.4906 1.21063 16.9786 2.23766 18.8447 4.10252C22.3874 7.64307 22.7119 13.2647 19.6289 17.2106ZM17.1139 16.3728C18.5201 14.9674 19.3044 13.1025 19.3044 11.1025C19.3044 9.10253 18.5201 7.23766 17.1139 5.83225C15.7076 4.42685 13.8416 3.64306 11.8404 3.64306C9.86617 3.64306 7.97311 4.42685 6.56684 5.83225C5.16058 7.23766 4.37631 9.10253 4.37631 11.1025C4.37631 13.0755 5.16058 14.9674 6.56684 16.3728C7.97311 17.7782 9.86617 18.562 11.8404 18.562C13.8145 18.562 15.7076 17.7782 17.1139 16.3728ZM18.1202 11.1483C18.1202 14.5404 15.3081 17.2902 11.8391 17.2902C8.37022 17.2902 5.55811 14.5404 5.55811 11.1483C5.55811 7.75631 8.37022 5.00653 11.8391 5.00653C15.3081 5.00653 18.1202 7.75631 18.1202 11.1483ZM8.61818 6.71527L8.23393 6.68993L7.76082 7.01828L7.13817 7.59921L6.51547 8.71054L6.54462 9.57515L6.98552 10.2658L7.38714 10.3764L7.69272 10.8546L8.23393 11.009L8.94995 11.1468L9.37339 11.4655L9.11584 12.0454L9.15949 12.7803L9.32974 13.1212L9.98455 13.6259L10.2334 13.9358L10.1941 15.503L10.7791 16.4902H11.4033V15.6314L11.8922 15.1577L12.2589 14.6663L12.4466 14.1439L12.7871 14.1129L13.0753 13.8517L13.2848 12.8202L13.0229 12.4704L12.6605 12.1428L12.1018 12.0897L11.041 11.009H9.40832L9.08528 10.7527L8.83645 10.6806L8.80153 10.3018L9.00234 10.1507L9.32974 10.0745L9.47926 10.2658H9.80557L9.84049 9.85848L11.5081 8.23375H11.7569L12.1018 8.07437L12.2458 7.67151L12.1018 7.31292L11.7569 6.99417L12.4117 6.77724L12.4903 6.46293L12.32 6.20616H10.3818L9.97582 6.54705L9.87105 6.33012L9.65714 6.26814L9.00234 6.29913L8.61818 6.71527ZM14.628 6.68993C14.5638 6.69838 14.4222 6.72767 14.3689 6.77724V6.99417L14.2727 7.23998L14.5688 7.45768L14.8648 7.23998L14.9685 7.01828L14.7834 6.68993H14.628ZM17.5377 9.4856L17.2342 9.6336V9.91989L17.2628 9.97816L17.0559 9.91989C16.9794 9.97141 16.8205 10.0745 16.7968 10.0745C16.7731 10.0745 16.4119 10.0215 16.2342 9.99495C16.1257 9.9299 15.8982 9.78927 15.8567 9.74723C15.8153 9.70519 15.6273 9.58459 15.5384 9.52954L15.1979 9.57515L14.6872 9.52954L14.2431 9.91989L13.984 10.2658L14.0728 10.9258L14.5169 11.6464L14.6872 11.5864H15.2572C15.346 11.5864 15.7383 11.6264 15.9234 11.6464L16.0122 11.8791L16.3009 12.6523L16.2342 13.2679L16.3675 13.6259L16.5747 14.529L16.634 14.7692L17.1595 14.1129L17.6037 13.1212L17.8627 12.0897V10.8883L17.6851 9.91989L17.5377 9.4856ZM16.634 8.53114L16.3009 8.76385L16.3675 9.02659C16.4292 9.06162 16.557 9.12568 16.5747 9.10165C16.5925 9.07763 16.6216 9.0416 16.634 9.02659C16.6759 9.01407 16.7968 8.97554 16.9449 8.92149C17.0929 8.86744 16.9424 8.75834 16.8486 8.71054L16.634 8.53114ZM17.2039 8.53114L16.8486 8.45607L16.5747 8.34347C16.3971 8.38101 16.0359 8.45607 16.0122 8.45607C15.9885 8.45607 15.6865 8.62572 15.5384 8.71054L15.3238 9.10165L14.8648 9.29683L14.2727 9.10165C14.285 9.00682 14.3097 8.8065 14.3097 8.76385C14.3097 8.7212 14.2653 8.46583 14.2431 8.34347L14.5688 8.17082L14.9685 7.96814L15.0795 7.91559L15.2572 7.74294L15.3238 7.51023L15.3682 7.16492L15.4274 6.87966L15.5903 6.68993L15.6791 6.63945C15.8049 6.74965 16.0744 6.97488 16.1454 6.99417C16.2165 7.01346 16.708 7.65152 16.9449 7.96814L17.2039 8.53114ZM7.1888 13.1628L7.03335 13.2679V13.6582C7.11231 13.7227 7.2936 13.8445 7.38714 13.8159C7.4615 13.7931 7.51375 13.7224 7.54956 13.674C7.57004 13.6463 7.58514 13.6259 7.59592 13.6259C7.6196 13.6259 7.50709 13.4273 7.44787 13.3279L7.1888 13.1628Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_826_47185" x1="1.07324" y1="0.278748" x2="1.07324" y2="24.2354" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg
new file mode 100644
index 0000000000..302e585f6e
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 0.0305176C23.2286 0.0305176 24.0831 1.80898 24.0831 3.04917C24.0831 4.28935 24.0831 18.8121 24.0831 20.6726C24.0831 22.4235 22.8546 23.9872 21.0513 23.9872C19.248 23.9872 4.77576 23.9872 2.93576 23.9872C1.51308 23.9872 0.126465 22.5453 0.126465 21.1892C0.126465 19.8331 0.126465 4.06585 0.126465 2.70307C0.126465 1.3403 1.49186 0.0305176 2.73602 0.0305176C3.98018 0.0305176 19.0866 0.0305176 21.0513 0.0305176Z" fill="url(#paint0_linear_835_46270)"/>
+<mask id="mask0_835_46270" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="24">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 0.0305176C23.2286 0.0305176 24.0831 1.80898 24.0831 3.04917C24.0831 4.28935 24.0831 18.8121 24.0831 20.6726C24.0831 22.4235 22.8546 23.9872 21.0513 23.9872C19.248 23.9872 4.77576 23.9872 2.93576 23.9872C1.51308 23.9872 0.126465 22.5453 0.126465 21.1892C0.126465 19.8331 0.126465 4.06585 0.126465 2.70307C0.126465 1.3403 1.49186 0.0305176 2.73602 0.0305176C3.98018 0.0305176 19.0866 0.0305176 21.0513 0.0305176Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_835_46270)">
+<rect x="0.126465" y="0.0305176" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.262 3.56718V8.58933L13.3184 6.64134L12.1922 8.34583L10.8834 6.21522L10.4268 9.1372L6.3787 6.21522L8.44843 10.4156L4.52202 10.6895L7.90056 12.394L4.73508 14.342L7.10919 15.4377L0.930664 15.2247L5.70932 12.5462L1.50879 10.0503L6.62225 9.35026L3.97394 3.38455L9.57444 7.00659L10.4268 4.11505L12.1922 6.21522L14.262 3.56718ZM4.39651 17.0216L2.39795 21.0187H22.8261L16.3262 6.16187L11.56 17.0566L11.5398 17.0162L11.5377 17.0216L4.39651 17.0216ZM14.4692 13.5903L16.3263 8.94749L18.1834 13.5903H14.4692ZM12.1565 11.3781L12.0115 11.0843L11.8499 10.8102C11.8987 10.7181 12.0001 10.5202 12.0155 10.4659C12.0204 10.4486 12.0254 10.4124 12.0315 10.3676L12.0315 10.3676L12.0315 10.3675C12.0496 10.2361 12.0779 10.0309 12.1438 10.0131C12.2144 9.99395 12.4239 9.85331 12.5199 9.78538L13.0087 9.92386L12.9012 10.5048C12.8271 10.6034 12.6825 10.8162 12.6973 10.8791C12.7121 10.942 12.694 11.1689 12.6831 11.2746C12.7314 11.2961 12.8188 11.371 12.7827 11.4984C12.7467 11.6258 12.6682 11.6918 12.6335 11.7089C12.5577 11.6605 12.3924 11.5599 12.3379 11.5444C12.2834 11.529 12.1943 11.4271 12.1565 11.3781ZM9.4161 11.9189L9.57374 11.3625L9.66501 11.0403L9.96567 10.8724L10.2878 10.9637L10.5436 11.2892L10.8916 11.7358L10.529 12.2342L10.014 11.9301L9.4161 11.9189ZM8.21399 14.7105L7.73661 14.3854L7.47303 14.3107L7.26262 13.7133L8.0021 13.4482L8.62053 13.2754L8.91 13.7054L8.59472 14.8183L8.21399 14.7105ZM10.2914 14.4131L9.57288 14.7158L9.88819 15.0398L10.2504 15.1424L10.6408 15.3183L10.8668 15.6204L11.2012 15.5567L11.3008 15.2053L11.0992 14.8002L10.7892 14.5542L10.2914 14.4131ZM9.89829 13.5671L9.81813 13.2917L9.95504 13.1348L10.4569 13.0324L10.6953 13.1978L10.693 13.5803L10.3098 13.7897L9.89829 13.5671ZM11.2764 13.3624L11.259 13.7407L11.6414 13.743L11.8079 13.4152L11.9892 13.1486L12.4043 12.8342L12.6218 12.7572L12.618 12.5115L12.492 12.5248L12.3817 12.3386L12.0861 12.1734L11.8614 12.1097L11.5736 12.3135L11.3976 12.6468L11.2565 13.1449C11.2411 13.1992 11.2634 13.3126 11.2764 13.3624Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_835_46270" x1="0.126465" y1="0.0305176" x2="0.126465" y2="23.9872" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg
new file mode 100644
index 0000000000..19cb144936
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="26" viewBox="0 0 25 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 1.12738C23.2286 1.12738 24.0831 2.90585 24.0831 4.14603C24.0831 5.38622 24.0831 19.909 24.0831 21.7694C24.0831 23.5204 22.8546 25.084 21.0513 25.084C19.248 25.084 4.77576 25.084 2.93576 25.084C1.51308 25.084 0.126465 23.6422 0.126465 22.286C0.126465 20.9299 0.126465 5.16271 0.126465 3.79993C0.126465 2.43716 1.49186 1.12738 2.73602 1.12738C3.98018 1.12738 19.0866 1.12738 21.0513 1.12738Z" fill="url(#paint0_linear_826_47189)"/>
+<mask id="mask0_826_47189" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="1" width="25" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 1.12738C23.2286 1.12738 24.0831 2.90585 24.0831 4.14603C24.0831 5.38622 24.0831 19.909 24.0831 21.7694C24.0831 23.5204 22.8546 25.084 21.0513 25.084C19.248 25.084 4.77576 25.084 2.93576 25.084C1.51308 25.084 0.126465 23.6422 0.126465 22.286C0.126465 20.9299 0.126465 5.16271 0.126465 3.79993C0.126465 2.43716 1.49186 1.12738 2.73602 1.12738C3.98018 1.12738 19.0866 1.12738 21.0513 1.12738Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47189)">
+<rect x="0.126465" y="1.12738" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.47754 5.82434C4.47754 6.65277 3.80597 7.32434 2.97754 7.32434C2.14911 7.32434 1.47754 6.65277 1.47754 5.82434C1.47754 4.99591 2.14911 4.32434 2.97754 4.32434C3.80597 4.32434 4.47754 4.99591 4.47754 5.82434ZM3.28145 17.2069L1.12646 21.5169H23.1265L16.1265 5.51691L10.9935 17.2499L10.9632 17.1894L10.956 17.2069L3.28145 17.2069ZM14.1265 13.5169L16.1265 8.51691L18.1265 13.5169H14.1265ZM2.97754 11.5726C3.80597 11.5726 4.47754 10.901 4.47754 10.0726C4.47754 9.24414 3.80597 8.57257 2.97754 8.57257C2.14911 8.57257 1.47754 9.24414 1.47754 10.0726C1.47754 10.901 2.14911 11.5726 2.97754 11.5726ZM4.47754 14.3208C4.47754 15.1492 3.80597 15.8208 2.97754 15.8208C2.14911 15.8208 1.47754 15.1492 1.47754 14.3208C1.47754 13.4924 2.14911 12.8208 2.97754 12.8208C3.80597 12.8208 4.47754 13.4924 4.47754 14.3208ZM12.7983 4.81268H5.79834V6.81268H12.7983V4.81268ZM5.79834 9.01562H12.7983V11.0156H5.79834V9.01562ZM11.7743 13.2186L5.79544 13.2186V15.1799L10.8253 15.1799L11.7743 13.2186Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_826_47189" x1="0.126465" y1="1.12738" x2="0.126465" y2="25.084" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg
new file mode 100644
index 0000000000..5179f61867
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg
@@ -0,0 +1,21 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_826_47187)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9556 0.614136C24.1329 0.614136 24.9874 2.3926 24.9874 3.63279C24.9874 4.87297 24.9874 19.3957 24.9874 21.2562C24.9874 23.0071 23.7589 24.5708 21.9556 24.5708C20.1523 24.5708 5.68006 24.5708 3.84005 24.5708C2.41738 24.5708 1.03076 23.1289 1.03076 21.7728C1.03076 20.4167 1.03076 4.64946 1.03076 3.28669C1.03076 1.92391 2.39616 0.614136 3.64032 0.614136C4.88448 0.614136 19.9909 0.614136 21.9556 0.614136Z" fill="url(#paint0_linear_826_47187)"/>
+<mask id="mask0_826_47187" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="0" width="24" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9556 0.614136C24.1329 0.614136 24.9874 2.3926 24.9874 3.63279C24.9874 4.87297 24.9874 19.3957 24.9874 21.2562C24.9874 23.0071 23.7589 24.5708 21.9556 24.5708C20.1523 24.5708 5.68006 24.5708 3.84005 24.5708C2.41738 24.5708 1.03076 23.1289 1.03076 21.7728C1.03076 20.4167 1.03076 4.64946 1.03076 3.28669C1.03076 1.92391 2.39616 0.614136 3.64032 0.614136C4.88448 0.614136 19.9909 0.614136 21.9556 0.614136Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47187)">
+<rect x="1.03076" y="0.614136" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.3665 8.86384C14.6892 9.25573 14.9893 9.70547 15.2463 10.2077L16.9038 6.06409L18.9038 11.0641H15.6208C16.1211 12.4269 16.2975 14.0867 15.8498 15.9661C15.6071 16.4279 15.4383 16.7516 15.3142 16.9897L15.3142 16.9898C15.0647 17.4684 14.9957 17.6007 14.8698 17.8118C15.0617 18.0184 15.5032 18.4966 15.9989 19.0641H23.9038L16.9038 3.06409L14.3665 8.86384ZM16.5233 20.5424L13.8552 17.8943C15.9385 15.2279 15.7192 11.4291 13.3253 9.03667C12.0643 7.77652 10.3831 7.08252 8.59221 7.08252C6.80133 7.08252 5.12009 7.77652 3.85916 9.03667C2.59823 10.2968 1.90381 11.977 1.90381 13.7668C1.90381 15.5566 2.59823 17.2368 3.85916 18.497C5.12009 19.7571 6.80133 20.4511 8.59221 20.4511C10.0724 20.4511 11.5344 19.958 12.7039 19.0266L15.3537 21.7113C15.5182 21.8756 15.7192 21.9487 15.9385 21.9487C16.1578 21.9487 16.3588 21.8574 16.5233 21.7113C16.8522 21.4008 16.8522 20.8712 16.5233 20.5424ZM13.6359 13.7668C13.6359 15.1183 13.106 16.3784 12.1557 17.3281C11.2054 18.2778 9.92624 18.8074 8.59221 18.8074C7.25819 18.8074 5.97898 18.2778 5.02872 17.3281C4.07845 16.3784 3.5485 15.1 3.5485 13.7668C3.5485 12.4153 4.07845 11.1552 5.02872 10.2055C5.97898 9.25583 7.25819 8.7262 8.59221 8.7262C9.94451 8.7262 11.2054 9.25583 12.1557 10.2055C13.106 11.1552 13.6359 12.4153 13.6359 13.7668ZM7.47592 10.347L7.86605 10.1649L8.3864 10.5291V10.7372L8.04823 11.1534H7.21582V10.7372L7.47592 10.347ZM10.0059 10.861L9.61567 11.1211L9.44539 11.6934L9.82377 11.8235L10.266 11.9733L10.7342 11.5634V11.3032V11.1211L10.0059 10.861ZM6.05176 14.1543L4.27197 14.8324C4.59691 15.4257 5.56886 16.7819 6.8572 17.4599C8.19278 18.1629 9.35347 17.8456 10.2667 17.596L10.2668 17.596C10.4547 17.5446 10.6322 17.4961 10.7985 17.4599C11.5391 17.2989 11.9617 16.0858 12.2521 15.2521L12.2521 15.2521C12.3439 14.9886 12.4224 14.763 12.4937 14.6205C12.731 14.1459 12.5926 12.9536 12.4937 12.4168L11.858 11.8235L10.2899 13.4339L9.82377 12.9677L8.08621 14.1543L7.11148 14.8324L6.05176 14.1543ZM6.8572 12.7402V12.1159H7.47611C7.52813 12.1604 7.64779 12.2829 7.71022 12.4168C7.77265 12.5506 7.98689 12.6882 8.08621 12.7402V12.9677L7.71022 13.2604L7.11148 13.4339L6.61768 13.2604L6.8572 12.7402ZM5.82403 12.954L5.66095 12.6952L5.36273 12.5466L5.06936 12.5837L5.1435 13.1704L5.46699 13.3717L5.61368 13.3532L5.82403 12.954Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_826_47187" x1="1.03076" y1="0.614136" x2="1.03076" y2="24.5708" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+<clipPath id="clip0_826_47187">
+<rect width="24" height="24" fill="white" transform="translate(0.903809 0.506409)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg
index 2aee65f2a8..5466395141 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg
@@ -1,25 +1,22 @@
-<?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 / Environmental / Terrain Refactor - box</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
-            <stop stop-color="#9D9D9D" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
-    </defs>
-    <g id="icon-/-Environmental-/-Terrain-Refactor---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/general/color/-box-template">
-            <mask id="mask-3" fill="white">
-                <use xlink:href="#path-2"></use>
-            </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
-                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
-                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
-                </g>
-            </g>
-        </g>
-        <path d="M2,20 L8,8 L10.8,13.6 L15,4 L22,20 L2,20 Z M8,11 L6,15 L10,15 L8,11 Z M15,7 L13,12 L17,12 L15,7 Z" id="Combined-Shape" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Refactor - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.571655C24.0953 0.571655 24.9498 2.35012 24.9498 3.59031C24.9498 4.83049 24.9498 19.3532 24.9498 21.2137C24.9498 22.9646 23.7213 24.5283 21.918 24.5283C20.1147 24.5283 5.64246 24.5283 3.80245 24.5283C2.37978 24.5283 0.993164 23.0864 0.993164 21.7303C0.993164 20.3742 0.993164 4.60698 0.993164 3.24421C0.993164 1.88143 2.35856 0.571655 3.60272 0.571655C4.84688 0.571655 19.9533 0.571655 21.918 0.571655Z" fill="url(#paint0_linear_651_55737)"/>
+<mask id="mask0_651_55737" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.571655C24.0953 0.571655 24.9498 2.35012 24.9498 3.59031C24.9498 4.83049 24.9498 19.3532 24.9498 21.2137C24.9498 22.9646 23.7213 24.5283 21.918 24.5283C20.1147 24.5283 5.64246 24.5283 3.80245 24.5283C2.37978 24.5283 0.993164 23.0864 0.993164 21.7303C0.993164 20.3742 0.993164 4.60698 0.993164 3.24421C0.993164 1.88143 2.35856 0.571655 3.60272 0.571655C4.84688 0.571655 19.9533 0.571655 21.918 0.571655Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_55737)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.993164" y="0.571655" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.9932 20.5717H14.9932H8.99316H2.99316L8.99316 8.57166L11.7932 14.1717L15.9932 4.57166L22.9932 20.5717ZM15.9932 7.57166L17.9932 12.5717H13.9932L15.9932 7.57166ZM8.99316 11.5717L10.9932 15.5717H6.99316L8.99316 11.5717Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_55737" x1="0.993164" y1="0.571655" x2="0.993164" y2="24.5283" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg
index 1b729ab73f..ea9935fefb 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg
@@ -1,25 +1,22 @@
-<?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 / Environmental / Terrain World Debugger - box</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
-            <stop stop-color="#9D9D9D" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
-    </defs>
-    <g id="icon-/-Environmental-/-Terrain-World-Debugger---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/general/color/-box-template">
-            <mask id="mask-3" fill="white">
-                <use xlink:href="#path-2"></use>
-            </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
-                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
-                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
-                </g>
-            </g>
-        </g>
-        <path d="M16.1386919,4 L23.1386919,20 L1.13869185,20 L4.17269185,13.9311962 L5.67269185,13.9311962 L5.13869185,15 L9.13869185,15 L8.60469185,13.9311962 L10.1046919,13.9311962 L11.0056919,15.733 L16.1386919,4 Z M5.89628145,1.6047283 C6.16999928,1.77576619 6.13172615,2.05504566 5.96068826,2.32876349 C5.73263775,2.6937206 5.7756145,2.88160724 5.93530708,3.23512368 C6.42568244,3.16095005 7.14978568,3.35693375 7.56036243,3.61349058 C7.69722134,3.69900952 7.80557395,3.8301481 7.94243286,3.91566705 C8.25605,3.9213397 8.54116082,3.97263199 8.9003976,4.00681096 L9.38500494,3.2312771 C9.07663015,2.79610484 8.84851607,2.48441038 8.70066268,2.2961937 C8.47888259,2.01386869 9.31023224,1.32201362 9.57873345,1.70309072 C9.71741936,1.89992419 9.96660582,2.24544794 10.3262928,2.73966198 C10.430851,2.88332607 10.5329727,3.42440468 10.4654691,3.53243299 L10.0123346,4.25759977 C10.2974454,4.30889207 10.5084303,4.37729768 10.7194151,4.4457033 C10.9760197,4.54261523 11.2782438,4.66803348 11.5519616,4.83907137 L11.8488893,4.36388769 C11.9740073,4.16365719 12.4314004,4.13113915 12.6080709,4.16157747 C13.1652817,4.25757856 13.5849179,4.33128082 13.8669795,4.38268425 C14.4242185,4.48423653 14.0604111,5.4960867 13.718823,5.43188827 C13.4910975,5.38908932 13.1109498,5.32069959 12.5783797,5.2267191 L12.4073418,5.50043693 C12.68678,5.86534636 13.2181881,6.24296266 13.6811655,6.98663718 C13.3719223,7.58692704 12.5096505,9.26237536 11.09435,12.0129821 C10.3687536,12.1382775 8.95245279,11.8415191 8.53048305,11.7047078 L8.35944516,11.9784257 C8.63985361,12.343209 8.8679677,12.6549035 9.04378743,12.9135091 C9.30751703,13.3014174 8.41461192,13.8575606 8.16571666,13.506612 C8.03634338,13.3241925 7.78711967,12.9789829 7.41804555,12.4709835 C7.25974283,12.2530931 7.21380392,11.7815749 7.28247073,11.6716851 L7.56107764,11.2258208 C7.28735981,11.0547829 7.04214829,10.8381254 6.84255641,10.6499742 C6.64296453,10.461823 6.5174986,10.2565585 6.36352636,10.0969136 L5.84971054,10.9191908 C5.80243407,10.9948489 5.52907912,11.1209828 5.44267263,11.108334 C4.81589475,11.0165817 4.29416074,10.9228098 3.8774706,10.8270185 C3.35536732,10.6392609 3.55149489,9.78628232 4.02562714,9.77781449 C4.2610167,9.8090552 4.65066657,9.86223838 5.19457675,9.93736403 L5.67918409,9.16183016 C5.46247889,8.899553 5.31989964,8.62016251 5.17732038,8.34077202 C5.01195515,8.30087272 4.84658992,8.26097342 4.709731,8.17545447 C4.29915425,7.91889765 3.92856127,7.2481928 3.75175537,6.82055041 C3.31839264,6.80348476 3.13727717,6.94473989 2.90922666,7.309697 C2.73818877,7.58341484 2.46364498,7.8659871 2.18992715,7.69494921 C1.91620931,7.52391133 1.91695081,7.31908397 2.08798869,7.04536614 C2.48707709,6.40669119 2.90196341,6.09435049 3.63182995,6.04296284 C3.67740191,5.56398047 3.79709982,5.06788478 4.08216296,4.61168839 C4.36722611,4.155492 4.73213554,3.87605383 5.14266461,3.62512197 C4.86889909,2.9465954 4.87721463,2.47359794 5.27630303,1.834923 C5.44734091,1.56120516 5.62256361,1.43369042 5.89628145,1.6047283 Z M16.1386919,7 L14.1386919,12 L18.1386919,12 L16.1386919,7 Z M8.16878118,5.03529284 C8.00462988,5.67215311 7.76591557,6.23931272 7.45263826,6.73677168 C7.13936096,7.23423064 6.73633624,7.69375726 6.24356411,8.11535154 C6.92043783,9.241108 7.55106072,9.98835574 8.13543278,10.3570948 C8.68404895,10.7032718 9.22256472,11.0747691 10.0145932,10.9501066 C10.3872999,10.3853627 12.0504479,7.55314517 12.4594665,6.91035029 C11.7506156,6.20276679 11.3996595,5.78938078 10.8137513,5.51008723 C10.0440887,5.1432007 8.84604252,4.93245053 8.16878118,5.03529284 Z M4.99455574,5.18181467 C4.5099484,5.95734853 4.64118234,6.8639733 5.27985729,7.2630617 C5.41671621,7.34858064 5.46539716,7.34146992 5.61813643,7.24940571 C6.13459678,6.83479589 6.46809468,6.50703743 6.61863015,6.26613032 C6.77216204,6.02042794 6.93844402,5.59543292 7.11747611,4.99114525 C7.16180049,4.76065652 7.12709506,4.6114023 6.99023614,4.52588336 C6.3515612,4.12679496 5.47916308,4.40628081 4.99455574,5.18181467 Z" id="Combined-Shape" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Debugger - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.5894 0.369629C23.7667 0.369629 24.6212 2.1481 24.6212 3.38828C24.6212 4.62846 24.6212 19.1512 24.6212 21.0117C24.6212 22.7626 23.3927 24.3263 21.5894 24.3263C19.786 24.3263 5.31385 24.3263 3.47384 24.3263C2.05117 24.3263 0.664551 22.8844 0.664551 21.5283C0.664551 20.1722 0.664551 4.40496 0.664551 3.04218C0.664551 1.67941 2.02995 0.369629 3.27411 0.369629C4.51827 0.369629 19.6247 0.369629 21.5894 0.369629Z" fill="url(#paint0_linear_651_55746)"/>
+<mask id="mask0_651_55746" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.5894 0.369629C23.7667 0.369629 24.6212 2.1481 24.6212 3.38828C24.6212 4.62846 24.6212 19.1512 24.6212 21.0117C24.6212 22.7626 23.3927 24.3263 21.5894 24.3263C19.786 24.3263 5.31385 24.3263 3.47384 24.3263C2.05117 24.3263 0.664551 22.8844 0.664551 21.5283C0.664551 20.1722 0.664551 4.40496 0.664551 3.04218C0.664551 1.67941 2.02995 0.369629 3.27411 0.369629C4.51827 0.369629 19.6247 0.369629 21.5894 0.369629Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_55746)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.664551" y="0.369629" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M11.0131 14.6091C11.0131 14.6091 13.0294 10.43 13.47 9.51795C13.1593 9.04638 12.8241 8.7276 12.5478 8.4648L12.5478 8.46478C12.3954 8.31991 12.261 8.19204 12.1584 8.06496L12.3223 7.78694C12.8572 7.86721 13.2389 7.92581 13.4677 7.96275C13.8108 8.01815 14.1485 6.99729 13.5888 6.91009C13.3055 6.86594 12.8842 6.80305 12.3247 6.72139C12.1473 6.6955 11.6909 6.73976 11.5709 6.94313L11.2863 7.42579C11.0083 7.26184 10.7029 7.14422 10.4439 7.05394C10.2313 6.99097 10.0186 6.92801 9.73225 6.88406L10.1666 6.14749C10.2313 6.03776 10.1153 5.49949 10.0071 5.35855C9.63485 4.87374 9.37687 4.53473 9.23317 4.34153C8.95497 3.96747 8.14167 4.68045 8.37063 4.95699C8.52327 5.14135 8.75931 5.44708 9.07876 5.87419L8.61424 6.66191C8.48943 6.65327 8.37348 6.64233 8.26217 6.63184C8.05242 6.61207 7.85917 6.59385 7.65425 6.59541C7.58474 6.55442 7.52207 6.50185 7.45939 6.44927C7.39672 6.3967 7.33405 6.34413 7.26454 6.30314C6.84751 6.05722 6.11861 5.8799 5.6303 5.96664C5.46158 5.61735 5.41379 5.43062 5.63239 5.05993C5.79635 4.78191 5.82743 4.50174 5.54941 4.33779C5.27139 4.17384 5.0995 4.30581 4.93555 4.58383C4.553 5.23255 4.55684 5.7056 4.84794 6.37687C4.44399 6.63827 4.08638 6.92699 3.81313 7.39036C3.53988 7.85372 3.43296 8.35273 3.39971 8.83272C2.67141 8.90284 2.26468 9.22574 1.88213 9.87445C1.71818 10.1525 1.7227 10.3573 2.00072 10.5212C2.27874 10.6852 2.54593 10.3956 2.70988 10.1176C2.92849 9.74691 3.10591 9.60105 3.53957 9.60698C3.7273 10.0299 4.115 10.6909 4.53203 10.9368C4.67104 11.0188 4.83738 11.0544 5.00372 11.0901C5.15342 11.3657 5.30313 11.6413 5.5265 11.898L5.06198 12.6857C4.51632 12.6246 4.12543 12.5814 3.88932 12.5562C3.41556 12.5769 3.2414 13.4346 3.76816 13.6089C4.18717 13.6939 4.71114 13.7743 5.34007 13.8499C5.42677 13.8603 5.6968 13.7272 5.74212 13.6504L6.23464 12.8152C6.30169 12.8812 6.36383 12.9556 6.42876 13.0333L6.42879 13.0334L6.4288 13.0334C6.51687 13.1388 6.61009 13.2504 6.72772 13.3557C6.93208 13.5387 7.18277 13.749 7.46079 13.9129L7.19373 14.3658C7.12791 14.4774 7.18595 14.9476 7.34979 15.1614C7.73179 15.6597 7.9898 15.9984 8.12382 16.1775C8.38165 16.5219 9.25997 15.943 8.98637 15.562C8.80396 15.308 8.56792 15.0023 8.27823 14.6448L8.44218 14.3668C8.86752 14.4927 10.291 14.753 11.0131 14.6091ZM5.07854 10.0101C4.42982 9.62754 4.27534 8.72458 4.73987 7.93686C5.20439 7.14913 6.06932 6.84733 6.71804 7.22988C6.85705 7.31185 6.89558 7.46017 6.85719 7.69172C6.69374 8.30041 6.53843 8.72953 6.39126 8.9791C6.24696 9.22379 5.92199 9.56001 5.41635 9.98775C5.26603 10.0837 5.21755 10.0921 5.07854 10.0101ZM8.01264 13.0297L8.08964 13.0757C8.62097 13.3936 9.15418 13.7126 9.90642 13.5743C10.101 13.2623 10.6592 12.2713 11.1915 11.3265L11.1915 11.3265C11.6387 10.5325 12.0676 9.77128 12.2467 9.47307C12.1338 9.36604 12.0298 9.26589 11.9323 9.17206C11.4021 8.66175 11.0664 8.33867 10.5656 8.11554C9.78674 7.76855 8.58368 7.58864 7.90928 7.70885C7.76154 8.34971 7.53748 8.92282 7.23708 9.42816C6.93669 9.9335 6.5456 10.4032 6.06382 10.8373C6.76938 11.9453 7.41899 12.6761 8.01264 13.0297ZM1.66455 21.606L3.81953 17.296L11.4941 17.296L11.5013 17.2785L11.5316 17.339L16.6646 5.60601L23.6646 21.606H1.66455ZM16.6646 8.60601L14.6646 13.606H18.6646L16.6646 8.60601Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_55746" x1="0.664551" y1="0.369629" x2="0.664551" y2="24.3263" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg
index 4287508f10..af235047db 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg
@@ -1,25 +1,22 @@
-<?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 / Environmental / Terrain World Renderer - box</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
-            <stop stop-color="#9D9D9D" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
-    </defs>
-    <g id="icon-/-Environmental-/-Terrain-World-Renderer---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/general/color/-box-template">
-            <mask id="mask-3" fill="white">
-                <use xlink:href="#path-2"></use>
-            </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-            <g id="Group" mask="url(#mask-3)" fill="#8B572A">
-                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
-                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
-                </g>
-            </g>
-        </g>
-        <path d="M14.128,5.993 L14.1280665,8 L16.5280665,8 L16.528,7.493 L16.75,7.999 L16.5280665,8 L16.5280665,10.4 L17.8,10.399 L18.85,12.799 L16.5280665,12.8 L16.5280665,15.2 L18.9280665,15.2 L18.928,12.978 L19.9,15.199 L18.9280665,15.2 L18.9280665,17.6 L20.95,17.599 L22,20 L14.1280665,20 L14.1280665,17.6 L11.7280665,17.6 L11.7280665,20 L2,20 L8,8 L10.8,13.6 L12.2,10.399 L14.1280665,10.4 L14.1280665,8 L13.25,7.999 L14.128,5.993 Z M18.9280665,17.6 L16.5280665,17.6 L16.5280665,20 L18.9280665,20 L18.9280665,17.6 Z M16.5280665,15.2 L14.1280665,15.2 L14.1280665,17.6 L16.5280665,17.6 L16.5280665,15.2 Z M14.1280665,12.8 L11.7280665,12.8 L11.7280665,15.2 L14.1280665,15.2 L14.1280665,12.8 Z M8,11 L6,15 L10,15 L8,11 Z M16.5280665,10.4 L14.1280665,10.4 L14.1280665,12.8 L16.5280665,12.8 L16.5280665,10.4 Z M15,4 L15.7,5.599 L14.3,5.599 L15,4 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Renderer - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.4487 0.566956C23.6261 0.566956 24.4806 2.34542 24.4806 3.58561C24.4806 4.82579 24.4806 19.3485 24.4806 21.209C24.4806 22.9599 23.2521 24.5236 21.4487 24.5236C19.6454 24.5236 5.17322 24.5236 3.33322 24.5236C1.91054 24.5236 0.523926 23.0817 0.523926 21.7256C0.523926 20.3695 0.523926 4.60228 0.523926 3.23951C0.523926 1.87673 1.88932 0.566956 3.13348 0.566956C4.37764 0.566956 19.484 0.566956 21.4487 0.566956Z" fill="url(#paint0_linear_651_55759)"/>
+<mask id="mask0_651_55759" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.4487 0.566956C23.6261 0.566956 24.4806 2.34542 24.4806 3.58561C24.4806 4.82579 24.4806 19.3485 24.4806 21.209C24.4806 22.9599 23.2521 24.5236 21.4487 24.5236C19.6454 24.5236 5.17322 24.5236 3.33322 24.5236C1.91054 24.5236 0.523926 23.0817 0.523926 21.7256C0.523926 20.3695 0.523926 4.60228 0.523926 3.23951C0.523926 1.87673 1.88932 0.566956 3.13348 0.566956C4.37764 0.566956 19.484 0.566956 21.4487 0.566956Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_55759)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.523926" y="0.566956" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.5239 20.567L15.5239 4.56696L11.3239 14.167L8.52393 8.56696L2.52393 20.567H8.52393H14.5239H22.5239ZM8.52393 11.567L10.5239 15.567H6.52393L8.52393 11.567ZM21.0005 19.5003L16.0303 7.58151L16.0267 7.58887L15.9981 7.51718H15.548L15.5478 7.51444H15.3548L15.3546 7.51718H14.9369L14.9369 7.50107L14.9301 7.51718H14.9043L14.2861 9.06204L9.93449 19.5002H9.96093L9.93421 19.5482H20.9364L20.9105 19.5003H21.0005ZM18.9946 18.567L18.3561 16.475H16.2325L16.3923 18.567H18.9946ZM14.7918 18.567L14.8984 16.475H12.5604L11.9347 18.567H14.7918ZM14.9484 15.4938H12.8539L13.4618 13.4612H15.0519L14.9484 15.4938ZM18.0566 15.4938H16.1575L16.0022 13.4612H17.4362L18.0566 15.4938ZM14.7353 9.20371L14.441 10.1877H15.2186L15.2687 9.20371H14.7353ZM15.6769 9.20371L15.752 10.1877H16.4371L16.1368 9.20371H15.6769ZM15.8105 10.9522H16.6704L17.1367 12.48H15.9272L15.8105 10.9522ZM14.2123 10.9522H15.1797L15.1019 12.48H13.7553L14.2123 10.9522Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_55759" x1="0.523926" y1="0.566956" x2="0.523926" y2="24.5236" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material
index d2acc2516a..53f6fd5b9e 100644
--- a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material
+++ b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material
@@ -5,20 +5,7 @@
     "propertyLayoutVersion": 1,
     "properties": {
         "baseColor": {
-            "color": [ 0.18, 0.18, 0.18 ],
-            "useTexture": false
-        },
-        "normal":
-        {
-            "useTexture": false
-        },
-        "roughness":
-        {   
-            "useTexture": false
-        },
-        "specularF0":
-        {
-            "useTexture": false
+            "color": [ 0.18, 0.18, 0.18 ]
         }
     }
 }
diff --git a/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype b/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype
index 235079d95e..1e7305cc11 100644
--- a/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype
+++ b/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype
@@ -88,62 +88,20 @@
                     }
                 }
             ],
+            "baseColor": [
+                {
+                    "name": "color",
+                    "displayName": "Color",
+                    "description": "Color is displayed as sRGB but the values are stored as linear color.",
+                    "type": "Color",
+                    "defaultValue": [ 1.0, 1.0, 1.0 ],
+                    "connection": {
+                        "type": "ShaderInput",
+                        "name": "m_baseColor"
+                    }
+                }
+            ],
             "settings": [
-                {
-                    "id": "heightmapImage",
-                    "displayName": "Heightmap Image",
-                    "description": "Heightmap of the terrain. Controlled by the runtime.",
-                    "visibility": "Hidden",
-                    "type": "Image",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_heightmapImage"
-                    }
-                },
-                {
-                    "id": "detailMaterialIdImage",
-                    "displayName": "Detail Material Id Image",
-                    "description": "Texture containing detail material Ids and weights. Controlled by the runtime.",
-                    "visibility": "Hidden",
-                    "type": "Image",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_detailMaterialIdImage"
-                    }
-                },
-                {
-                    "id": "detailMaterialIdCenter",
-                    "displayName": "Detail Material Id Image Center",
-                    "description": "The center position of the detail material Id image. Controlled by the runtime.",
-                    "visibility": "Hidden",
-                    "type": "Vector2",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_detailMaterialIdImageCenter"
-                    }
-                },
-                {
-                    "id": "detailAabb",
-                    "displayName": "Detail material bounds in 2d",
-                    "description": "The 2d world space bounds of the detail id material. Controlled by the runtime.",
-                    "visibility": "Hidden",
-                    "type": "Vector4",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_detailAabb"
-                    }
-                },
-                {
-                    "id": "detailHalfPixelUv",
-                    "displayName": "Detail texture half pixel uv size",
-                    "description": "Uv size of a half pixel in the detail material id texture. Controlled by the runtime.",
-                    "visibility": "Hidden",
-                    "type": "float",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_detailHalfPixelUv"
-                    }
-                },
                 {
                     "id": "detailTextureMultiplier",
                     "displayName": "Detail Texture UV Multiplier",
@@ -177,178 +135,6 @@
                         "id": "m_detailFadeLength"
                     }
                 }
-            ],
-            "baseColor": [
-                {
-                    "id": "color",
-                    "displayName": "Color",
-                    "description": "Color is displayed as sRGB but the values are stored as linear color.",
-                    "type": "Color",
-                    "defaultValue": [ 1.0, 1.0, 1.0 ],
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_baseColor"
-                    }
-                },
-                {
-                    "id": "factor",
-                    "displayName": "Factor",
-                    "description": "Strength factor for scaling the base color values. Zero (0.0) is black, white (1.0) is full color.",
-                    "type": "Float",
-                    "defaultValue": 1.0,
-                    "min": 0.0,
-                    "max": 1.0,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_baseColorFactor"
-                    }
-                },
-                {
-                    "id": "textureMap",
-                    "displayName": "Texture",
-                    "description": "Base color texture map",
-                    "type": "Image",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_baseColorMap"
-                    }
-                },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
-                {
-                    "id": "textureBlendMode",
-                    "displayName": "Texture Blend Mode",
-                    "description": "Selects the equation to use when combining Color, Factor, and Texture.",
-                    "type": "Enum",
-                    "enumValues": [ "Multiply", "LinearLight", "Lerp", "Overlay" ],
-                    "defaultValue": "Overlay",
-                    "connection": {
-                        "type": "ShaderOption",
-                        "id": "o_baseColorTextureBlendMode"
-                    }
-                }
-            ],
-            "normal": [
-                {
-                    "id": "textureMap",
-                    "displayName": "Texture",
-                    "description": "Texture for defining surface normal direction.",
-                    "type": "Image",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_normalMap"
-                    }
-                },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture, or just rely on vertex normals.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
-                {
-                    "id": "flipX",
-                    "displayName": "Flip X Channel",
-                    "description": "Flip tangent direction for this normal map.",
-                    "type": "Bool",
-                    "defaultValue": false,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_flipNormalX"
-                    }
-                },
-                {
-                    "id": "flipY",
-                    "displayName": "Flip Y Channel",
-                    "description": "Flip bitangent direction for this normal map.",
-                    "type": "Bool",
-                    "defaultValue": false,
-                    "connection": {
-                        "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"
-                    }
-                }
-            ],
-            "roughness": [
-                {
-                    "id": "textureMap",
-                    "displayName": "Texture",
-                    "description": "Texture for defining surface roughness.",
-                    "type": "Image",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_roughnessMap"
-                    }
-                },
-                {
-                    "id": "useTexture",
-                    "description": "Whether to use the texture, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
-                {
-                    "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"
-                    }
-                }
-            ],
-            "specularF0": [
-                {
-                    "id": "textureMap",
-                    "displayName": "Texture",
-                    "description": "Texture for defining surface reflectance.",
-                    "type": "Image",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_specularF0Map"
-                    }
-                },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
-                {
-                    "id": "factor",
-                    "displayName": "Factor",
-                    "description": "The default IOR is 1.5, which gives you 0.04 (4% of light reflected at 0 degree angle for dielectric materials). F0 values lie in the range 0-0.08, so that is why the default F0 slider is set on 0.5.",
-                    "type": "Float",
-                    "defaultValue": 0.5,
-                    "min": 0.0,
-                    "max": 1.0,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_specularF0Factor"
-                    }
-                }
             ]
         }
     },
@@ -364,39 +150,5 @@
         }
     ],
     "functors": [
-        {
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "baseColor.textureMap",
-                "useTextureProperty": "baseColor.useTexture",
-                "dependentProperties": ["baseColor.textureBlendMode"],
-                "shaderOption": "o_baseColor_useTexture"
-            }
-        },
-        {
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "specularF0.textureMap",
-                "useTextureProperty": "specularF0.useTexture",
-                "shaderOption": "o_specularF0_useTexture"
-            }
-        },
-        {
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "normal.textureMap",
-                "useTextureProperty": "normal.useTexture",
-                "dependentProperties": ["normal.factor", "normal.flipX", "normal.flipY"],
-                "shaderOption": "o_normal_useTexture"
-            }
-        },
-        {
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "roughness.textureMap",
-                "useTextureProperty": "roughness.useTexture",
-                "shaderOption": "o_roughness_useTexture"
-            }
-        }
     ]
 }
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli b/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli
index b97bbab669..770f877ea8 100644
--- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli
+++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli
@@ -15,8 +15,6 @@
 
 ShaderResourceGroup ObjectSrg : SRG_PerObject
 {
-    row_major float3x4 m_modelToWorld;
-
     struct TerrainData
     {
         float2 m_uvMin;
@@ -36,6 +34,8 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
         uint m_mapsInUse;
     };
 
+    row_major float3x4 m_modelToWorld;
+
     TerrainData m_terrainData;
 
     MacroMaterialData m_macroMaterialData[4];
@@ -43,7 +43,7 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
 
     Texture2D m_macroColorMap[4];
     Texture2D m_macroNormalMap[4];
-    
+
     // The below shouldn't be in this SRG but needs to be for now because the lighting functions depend on them.
 
     //! Reflection Probe (smallest probe volume that overlaps the object position)
@@ -56,6 +56,7 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
         float m_padding;
         bool m_useReflectionProbe;
         bool m_useParallaxCorrection;
+        float m_exposure;
     };
 
     ReflectionProbeData m_reflectionProbeData;
@@ -92,26 +93,6 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject
 
 ShaderResourceGroup TerrainMaterialSrg : SRG_PerMaterial
 {
-    Texture2D m_heightmapImage;
-    Texture2D<uint4> m_detailMaterialIdImage;
-    float2 m_detailMaterialIdImageCenter;
-    float m_detailTextureMultiplier;
-    float m_detailFadeDistance;
-    float m_detailFadeLength;
-
-    float4 m_detailAabb;
-    float m_detailHalfPixelUv;
-
-    Sampler HeightmapSampler
-    {
-        MinFilter = Linear;
-        MagFilter = Linear;
-        MipFilter = Point;
-        AddressU = Clamp;
-        AddressV = Clamp;
-        AddressW = Clamp;
-    };
-
     Sampler m_sampler
     {
         AddressU = Wrap;
@@ -122,41 +103,16 @@ ShaderResourceGroup TerrainMaterialSrg : SRG_PerMaterial
         MaxAnisotropy = 16;
     };
 
-    Sampler m_detailSampler
-    {
-        AddressU = Wrap;
-        AddressV = Wrap;
-        MinFilter = Point;
-        MagFilter = Point;
-        MipFilter = Point;
-    };
-
     // Base Color
     float3 m_baseColor;
-    float m_baseColorFactor;
-    Texture2D m_baseColorMap;
 
-    // Normal
-    Texture2D m_normalMap;
-    bool m_flipNormalX;
-    bool m_flipNormalY;
-    float m_normalFactor;
-
-    // Roughness
-    Texture2D m_roughnessMap;
-    float m_roughnessFactor;
-
-    // Specular
-    Texture2D m_specularF0Map;
-    float m_specularF0Factor;
+    // Detail Material Properties    
+    float m_detailTextureMultiplier;
+    float m_detailFadeDistance;
+    float m_detailFadeLength;
 }
 
 option bool o_useTerrainSmoothing = false;
-option bool o_baseColor_useTexture = true;
-option bool o_specularF0_useTexture = true;
-option bool o_normal_useTexture = true;
-option bool o_roughness_useTexture = true;
-option TextureBlendMode o_baseColorTextureBlendMode = TextureBlendMode::Multiply;
 
 struct VertexInput
 {
@@ -239,12 +195,12 @@ float GetHeight(float2 origUv)
     if (o_useTerrainSmoothing)
     {
         float2 textureSize;
-        TerrainMaterialSrg::m_heightmapImage.GetDimensions(textureSize.x, textureSize.y);
-        height = SampleBSpline5Tap(TerrainMaterialSrg::m_heightmapImage, TerrainMaterialSrg::HeightmapSampler, uv, textureSize, rcp(textureSize));
+        ViewSrg::m_heightmapImage.GetDimensions(textureSize.x, textureSize.y);
+        height = SampleBSpline5Tap(ViewSrg::m_heightmapImage, ViewSrg::HeightmapSampler, uv, textureSize, rcp(textureSize));
     }
     else
     {
-        height = TerrainMaterialSrg::m_heightmapImage.SampleLevel(TerrainMaterialSrg::HeightmapSampler, uv, 0).r;
+        height = ViewSrg::m_heightmapImage.SampleLevel(ViewSrg::HeightmapSampler, uv, 0).r;
     }
 
     return ObjectSrg::m_terrainData.m_heightScale * (height - 0.5f);
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli b/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli
new file mode 100644
index 0000000000..33c817c0f9
--- /dev/null
+++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <Atom/Features/ColorManagement/TransformColor.azsli>
+
+enum DetailTextureFlags
+{
+    UseTextureBaseColor =  0x00000001, //0b0000'0000'0000'0000'0000'0000'0000'0001
+    UseTextureNormal =     0x00000002, //0b0000'0000'0000'0000'0000'0000'0000'0010
+    UseTextureMetallic =   0x00000004, //0b0000'0000'0000'0000'0000'0000'0000'0100
+    UseTextureRoughness =  0x00000008, //0b0000'0000'0000'0000'0000'0000'0000'1000
+    UseTextureOcclusion =  0x00000010, //0b0000'0000'0000'0000'0000'0000'0001'0000
+    UseTextureHeight =     0x00000020, //0b0000'0000'0000'0000'0000'0000'0010'0000
+    UseTextureSpecularF0 = 0x00000040, //0b0000'0000'0000'0000'0000'0000'0100'0000
+
+    FlipNormalX =          0x00010000, //0b0000'0000'0000'0001'0000'0000'0000'0000
+    FlipNormalY =          0x00020000, //0b0000'0000'0000'0010'0000'0000'0000'0000
+
+    BlendModeMask =        0x000C0000, //0b0000'0000'0000'1100'0000'0000'0000'0000
+    BlendModeLerp =        0x00000000, //0b0000'0000'0000'0000'0000'0000'0000'0000
+    BlendModeLinearLight = 0x00040000, //0b0000'0000'0000'0100'0000'0000'0000'0000
+    BlendModeMultiply =    0x00080000, //0b0000'0000'0000'1000'0000'0000'0000'0000
+    BlendModeOverlay =     0x000C0000, //0b0000'0000'0000'1100'0000'0000'0000'0000
+};
+
+struct DetailSurface
+{
+    float3 m_color;
+    float3 m_normal;
+    float m_roughness;
+    float m_specularF0;
+    float m_metalness;
+    float m_occlusion;
+    float m_height;
+};
+
+option bool o_debugDetailMaterialIds = false;
+
+DetailSurface GetDefaultDetailSurface()
+{
+    DetailSurface surface;
+
+    surface.m_color = float3(0.5, 0.5, 0.5);
+    surface.m_normal = float3(0.0, 0.0, 1.0);
+    surface.m_roughness = 1.0;
+    surface.m_specularF0 = 0.5;
+    surface.m_metalness = 0.0;
+    surface.m_occlusion = 1.0;
+    surface.m_height = 0.5;
+
+    return surface;
+}
+
+void WeightDetailSurface(inout DetailSurface surface, in float weight)
+{
+    surface.m_color *= weight;
+    surface.m_normal *= weight;
+    surface.m_roughness *= weight; 
+    surface.m_specularF0 *= weight;
+    surface.m_metalness *= weight; 
+    surface.m_occlusion *= weight;
+    surface.m_height *= weight;
+}
+
+void AddDetailSurface(inout DetailSurface surface, in DetailSurface surfaceToAdd)
+{
+    surface.m_color += surfaceToAdd.m_color;
+    surface.m_normal += surfaceToAdd.m_normal;
+    surface.m_roughness += surfaceToAdd.m_roughness; 
+    surface.m_specularF0 += surfaceToAdd.m_specularF0;
+    surface.m_metalness += surfaceToAdd.m_metalness; 
+    surface.m_occlusion += surfaceToAdd.m_occlusion;
+    surface.m_height += surfaceToAdd.m_height;
+}
+
+// Detail material index getters
+
+uint GetDetailColorIndex(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_colorNormalImageIndices & 0x0000FFFF;
+}
+
+uint GetDetailNormalIndex(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_colorNormalImageIndices >> 16;
+}
+
+uint GetDetailRoughnessIndex(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_roughnessMetalnessImageIndices & 0x0000FFFF;
+}
+
+uint GetDetailMetalnessIndex(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_roughnessMetalnessImageIndices >> 16;
+}
+
+uint GetDetailSpecularF0Index(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_specularF0OcclusionImageIndices & 0x0000FFFF;
+}
+
+uint GetDetailOcclusionIndex(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_specularF0OcclusionImageIndices >> 16;
+}
+
+uint GetDetailHeightIndex(TerrainSrg::DetailMaterialData materialData)
+{
+    return materialData.m_heightImageIndex & 0x0000FFFF;
+}
+
+// Detail material value getters
+
+float3 GetDetailColor(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float3 color = materialData.m_baseColor;
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureBaseColor) > 0)
+    {
+        color = TerrainSrg::m_detailTextures[GetDetailColorIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).rgb;
+    }
+    return color * materialData.m_baseColorFactor;
+}
+
+float3 GetDetailNormal(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float2 normal = float2(0.0, 0.0);
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureNormal) > 0)
+    {
+        normal = TerrainSrg::m_detailTextures[GetDetailNormalIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).rg;
+    }
+    
+    // X and Y are inverted here to be consistent with SampleNormalXY in NormalInput.azsli.
+    if(materialData.m_flags & DetailTextureFlags::FlipNormalX)
+    {
+        normal.y = -normal.y;
+    }
+    if(materialData.m_flags & DetailTextureFlags::FlipNormalY)
+    {
+        normal.x = -normal.x;
+    }
+    return GetTangentSpaceNormal(normal, materialData.m_normalFactor);
+}
+
+float GetDetailRoughness(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float roughness = materialData.m_roughnessScale;
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureRoughness) > 0)
+    {
+        roughness = TerrainSrg::m_detailTextures[GetDetailRoughnessIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r;
+        roughness = materialData.m_roughnessBias + roughness * materialData.m_roughnessScale;
+    }
+    return roughness;
+}
+
+float GetDetailMetalness(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float metalness = 1.0;
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureMetallic) > 0)
+    {
+        metalness = TerrainSrg::m_detailTextures[GetDetailMetalnessIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r;
+    }
+    return metalness * materialData.m_metalFactor;
+}
+
+float GetDetailSpecularF0(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float specularF0 = 1.0;
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureSpecularF0) > 0)
+    {
+        specularF0 = TerrainSrg::m_detailTextures[GetDetailSpecularF0Index(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r;
+    }
+    return specularF0 * materialData.m_specularF0Factor;
+}
+
+float GetDetailOcclusion(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float occlusion = 1.0;
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureOcclusion) > 0)
+    {
+        occlusion = TerrainSrg::m_detailTextures[GetDetailOcclusionIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r;
+    }
+    return occlusion * materialData.m_occlusionFactor;
+}
+
+float GetDetailHeight(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy)
+{
+    float height = materialData.m_heightFactor;
+    if ((materialData.m_flags & DetailTextureFlags::UseTextureHeight) > 0)
+    {
+        height = TerrainSrg::m_detailTextures[GetDetailHeightIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r;
+        height = materialData.m_heightOffset + height * materialData.m_heightFactor;
+    }
+    return height;
+}
+
+void GetDetailSurfaceForMaterial(inout DetailSurface surface, uint materialId, float2 uv)
+{
+    TerrainSrg::DetailMaterialData detailMaterialData = TerrainSrg::m_detailMaterialData[materialId];
+
+    float2 uvDdx = ddx(uv);
+    float2 uvDdy = ddy(uv);
+
+    surface.m_color = GetDetailColor(detailMaterialData, uv, uvDdx, uvDdy);
+    surface.m_normal = GetDetailNormal(detailMaterialData, uv, uvDdx, uvDdy);
+    surface.m_roughness = GetDetailRoughness(detailMaterialData, uv, uvDdx, uvDdy);
+    surface.m_specularF0 = GetDetailSpecularF0(detailMaterialData, uv, uvDdx, uvDdy);
+    surface.m_metalness = GetDetailMetalness(detailMaterialData, uv, uvDdx, uvDdy);
+    surface.m_occlusion = GetDetailOcclusion(detailMaterialData, uv, uvDdx, uvDdy);
+    surface.m_height = GetDetailHeight(detailMaterialData, uv, uvDdx, uvDdy);
+}
+
+// Debugs the detail material by choosing a random color per material ID and rendering it without blending.
+void GetDebugDetailSurface(inout DetailSurface surface, uint material1, uint material2, float blend, float2 idUv)
+{
+    float3 material1Color = float3(0.1, 0.1, 0.1);
+    float3 material2Color = float3(0.1, 0.1, 0.1);
+
+    // Get a reasonably random hue for the material id
+    if (material1 != 255)
+    {
+        float hue1 = (material1 * 25043 % 256) / 256.0;
+        material1Color = HsvToRgb(float3(hue1, 1.0, 1.0));
+    }
+    if (material2 != 255)
+    {
+        float hue2 = (material2 * 25043 % 256) / 256.0;
+        material2Color = HsvToRgb(float3(hue2, 1.0, 1.0));
+    }
+
+    surface.m_color = lerp(material1Color, material2Color, blend);
+    float seamBlend = 0.0;
+    const float halfLineWidth = 1.0 / 2048.0;
+    if (any(frac(abs(idUv)) < halfLineWidth) || any(frac(abs(idUv)) > 1.0 - halfLineWidth))
+    {
+        seamBlend = 1.0;
+    }
+    surface.m_color = lerp(surface.m_color, float3(0.0, 0.0, 0.0), seamBlend); // draw texture seams
+    surface.m_color = pow(surface.m_color , 2.2);
+    
+    surface.m_normal = float3(0.0, 0.0, 1.0);
+    surface.m_roughness = 1.0;
+    surface.m_specularF0 = 0.5;
+    surface.m_metalness = 0.0;
+    surface.m_occlusion = 1.0;
+    surface.m_height = 0.5;
+}
+
+//Blend a single detail material sample (with two possible material ids) onto a DetailSurface.
+void BlendDetailMaterial(inout DetailSurface surface, uint material1, uint material2, float blend, float2 detailUv, float weight)
+{
+    DetailSurface tempSurface;
+    GetDetailSurfaceForMaterial(tempSurface, material1, detailUv);
+    WeightDetailSurface(tempSurface, weight * (1.0 - blend));
+    AddDetailSurface(surface, tempSurface);
+    if (material2 != 0xFF)
+    {
+        GetDetailSurfaceForMaterial(tempSurface, material2, detailUv);
+        WeightDetailSurface(tempSurface, weight * blend);
+        AddDetailSurface(surface, tempSurface);
+    }
+}
+
+/*
+Populates a DetailSurface with material data gathered form the 4 nearest samples to detailMaterialIdUv. The weight
+of each detail material's contribution is calculated based on the distance to the center point for that sample (for
+instance, if detailMaterialIdUv falls perfectly in-between all 4 samples, then each sample will be weighed at 25%).
+Each sample can have two different detail materials defined with a blend value to determine their relative contribution.
+The detailUv is used for sampling the textures of each detail material.
+*/
+bool GetDetailSurface(inout DetailSurface surface, float2 detailMaterialIdUv, float2 detailUv)
+{
+    float2 textureSize;
+    TerrainSrg::m_detailMaterialIdImage.GetDimensions(textureSize.x, textureSize.y);
+
+    float2 detailMaterialIdCoord = detailMaterialIdUv * textureSize; // uv -> pixel coordinate
+
+    // detailMaterialIdCoord could be negative, so add textureSize to ensure it is positive
+    detailMaterialIdCoord += textureSize; 
+
+    // The detail material id texture wraps since the "center" point can be anywhere in the texture, so mod by texturesize
+    int2 detailMaterailIdTopLeft = int2(detailMaterialIdCoord) % textureSize;
+    int2 detailMaterailIdBottomRight = (int2(detailMaterialIdCoord) + 1) % textureSize;
+
+    // Using Load() to gather the nearest 4 samples (Gather4() isn't used because of precision issues with uvs).
+    uint4 s1 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdTopLeft.x, detailMaterailIdBottomRight.y, 0));
+    uint4 s2 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdBottomRight, 0));
+    uint4 s3 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdBottomRight.x, detailMaterailIdTopLeft.y, 0));
+    uint4 s4 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdTopLeft, 0));
+
+    uint4 material1 = uint4(s1.x, s2.x, s3.x, s4.x);
+    uint4 material2 = uint4(s1.y, s2.y, s3.y, s4.y);
+    
+    // convert integer of 0-255 to float of 0-1.
+    const float maxBlendAmount = 0xFF;
+    float4 blends = float4(s1.z, s2.z, s3.z, s4.z) / maxBlendAmount;
+    
+    // Calculate weight based on proximity to detail material samples
+    float2 gatherWeight = frac(detailMaterialIdCoord);
+    // Adjust the gather weight for better interpolation by (3x^2 - 2x^3). This helps avoid diamond-shaped artifacts in binlinear filtering.
+    gatherWeight = gatherWeight * gatherWeight * (3.0 - 2.0 * gatherWeight);
+
+    if (o_debugDetailMaterialIds)
+    {
+        float2 idUv = (detailMaterialIdCoord + gatherWeight - 0.5) / textureSize;
+        GetDebugDetailSurface(surface, material1.x, material2.x, blends.x, idUv);
+        return true;
+    }
+
+    // If any sample has no materials, give up.
+    if (any(material1 == 0xFF))
+    {
+        return false;
+    }
+
+    if (all(material1.x == material1.yzw) && all(material2.x == material2.yzw))
+    {
+        // Fast path for same material ids
+        GetDetailSurfaceForMaterial(surface, material1.x, detailUv);
+        if (material2.x != 0xFF)
+        {
+            float4 material2Blends = 1.0 - blends;
+            DetailSurface tempSurface;
+            float weight = 
+                ((1.0 - gatherWeight.x) * gatherWeight.y * material2Blends.x) +
+                (gatherWeight.x * gatherWeight.y * material2Blends.y) + 
+                (gatherWeight.x * (1.0 - gatherWeight.y) * material2Blends.z) + 
+                ((1.0 - gatherWeight.x) * (1.0 - gatherWeight.y) * material2Blends.w);
+            WeightDetailSurface(surface, weight);
+            GetDetailSurfaceForMaterial(tempSurface, material2.x, detailUv);
+            WeightDetailSurface(tempSurface, 1.0 - weight);
+            AddDetailSurface(surface, tempSurface);
+        }
+    }
+    else
+    {
+        surface = (DetailSurface)0;
+
+        // X
+        float weight = (1.0 - gatherWeight.x) * gatherWeight.y;
+        BlendDetailMaterial(surface, material1.x, material2.x, blends.x, detailUv, weight);
+
+        // Y
+        weight = gatherWeight.x * gatherWeight.y;
+        BlendDetailMaterial(surface, material1.y, material2.y, blends.y, detailUv, weight);
+        
+        // Z
+        weight = gatherWeight.x * (1.0 - gatherWeight.y);
+        BlendDetailMaterial(surface, material1.z, material2.z, blends.z, detailUv, weight);
+
+        // W
+        weight = (1.0 - gatherWeight.x) * (1.0 - gatherWeight.y);
+        BlendDetailMaterial(surface, material1.w, material2.w, blends.w, detailUv, weight);
+    }
+
+    surface.m_normal = normalize(surface.m_normal);
+    
+    return true;
+}
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl
index 5a43fe1c37..ab9064e740 100644
--- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl
+++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl
@@ -7,8 +7,11 @@
  */
 
 #include <Atom/Features/SrgSemantics.azsli>
+
 #include <viewsrg.srgi>
+#include <TerrainSrg.azsli>
 #include <TerrainCommon.azsli>
+#include <TerrainDetailHelpers.azsli>
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 #include <Atom/Features/PBR/ForwardPassSrg.azsli>
 #include <Atom/Features/PBR/ForwardPassOutput.azsli>
@@ -17,7 +20,6 @@
 #include <Atom/Features/PBR/Lighting/StandardLighting.azsli>
 #include <Atom/Features/Shadow/DirectionalLightShadow.azsli>
 #include <Atom/Features/PBR/Decals.azsli>
-#include <Atom/Features/ColorManagement/TransformColor.azsli>
 
 struct VSOutput
 {
@@ -28,8 +30,6 @@ struct VSOutput
     float3 m_shadowCoords[ViewSrg::MaxCascadeCount] : UV2;
 };
 
-option bool o_debugDetailMaterialIds = false;
-
 VSOutput TerrainPBR_MainPassVS(VertexInput IN)
 {
     VSOutput OUT;
@@ -71,9 +71,9 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN)
 {
     // ------- Surface -------
     Surface surface;
-    
-    // Position
     surface.position = IN.m_worldPosition.xyz;
+    surface.vertexNormal = normalize(IN.m_normal);
+
     float viewDistance = length(ViewSrg::m_worldPosition - surface.position);
     float detailFactor = saturate((viewDistance - TerrainMaterialSrg::m_detailFadeDistance) / max(TerrainMaterialSrg::m_detailFadeLength, EPSILON));
     float2 detailUv = IN.m_uv * TerrainMaterialSrg::m_detailTextureMultiplier;
@@ -83,92 +83,81 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN)
     
     // ------- Macro Color / Normal -------
     float3 macroColor = TerrainMaterialSrg::m_baseColor.rgb;
-    [unroll] for (uint i = 0; i < 4 && (i < ObjectSrg::m_macroMaterialCount); ++i)
+
+    // There's a bug that shows up with an NVidia GTX 1660 Super card happening on driver versions as recent as 496.49 (10/26/21) in which
+    // the IN.m_uv values will intermittently "flicker" to 0.0 after entering and exiting game mode.  
+    // (See https://github.com/o3de/o3de/issues/5014)
+    // This bug has only shown up on PCs when using the DX12 RHI.  It doesn't show up with Vulkan or when capturing frames with PIX or
+    // RenderDoc.  Our best guess is that it is a driver bug.  The workaround is to use the IN.m_uv values in a calculation prior to the 
+    // point that we actually use them for macroUv below.  The "if(any(!isnan(IN.m_uv)))" seems to be sufficient for the workaround.  The
+    // if statement will always be true, but just the act of reading these values in the if statement makes the values stable.  Removing
+    // the if statement causes the flickering to occur using the steps documented in the bug.
+    if (any(!isnan(IN.m_uv)))
     {
-        float2 macroUvMin = ObjectSrg::m_macroMaterialData[i].m_uvMin;
-        float2 macroUvMax = ObjectSrg::m_macroMaterialData[i].m_uvMax;
-        float2 macroUv = lerp(macroUvMin, macroUvMax, IN.m_uv);
-        if (macroUv.x >= 0.0 && macroUv.x <= 1.0 && macroUv.y >= 0.0 && macroUv.y <= 1.0)
+        [unroll] for (uint i = 0; i < 4 && (i < ObjectSrg::m_macroMaterialCount); ++i)
         {
-            if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 1) > 0)
+            float2 macroUvMin = ObjectSrg::m_macroMaterialData[i].m_uvMin;
+            float2 macroUvMax = ObjectSrg::m_macroMaterialData[i].m_uvMax;
+            float2 macroUv = lerp(macroUvMin, macroUvMax, IN.m_uv);
+            if (macroUv.x >= 0.0 && macroUv.x <= 1.0 && macroUv.y >= 0.0 && macroUv.y <= 1.0)
             {
-                macroColor = GetBaseColorInput(ObjectSrg::m_macroColorMap[i], TerrainMaterialSrg::m_sampler, macroUv, macroColor, true);
+                if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 1) > 0)
+                {
+                    macroColor = GetBaseColorInput(ObjectSrg::m_macroColorMap[i], TerrainMaterialSrg::m_sampler, macroUv, macroColor, true);
+                }
+                if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 2) > 0)
+                {
+                    bool flipX = ObjectSrg::m_macroMaterialData[i].m_flipNormalX;
+                    bool flipY = ObjectSrg::m_macroMaterialData[i].m_flipNormalY;
+                    float factor = ObjectSrg::m_macroMaterialData[i].m_normalFactor;
+                    
+                    float2 sampledValue = SampleNormalXY(ObjectSrg::m_macroNormalMap[i], TerrainMaterialSrg::m_sampler, macroUv, flipX, flipY);
+                    macroNormal = normalize(GetTangentSpaceNormal_Unnormalized(sampledValue.xy, factor));
+                }
+                break;
             }
-            if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 2) > 0)
-            {
-                bool flipX = ObjectSrg::m_macroMaterialData[i].m_flipNormalX;
-                bool flipY = ObjectSrg::m_macroMaterialData[i].m_flipNormalY;
-                bool factor = ObjectSrg::m_macroMaterialData[i].m_normalFactor;
-                macroNormal = GetNormalInputTS(ObjectSrg::m_macroNormalMap[i], TerrainMaterialSrg::m_sampler, 
-                    macroUv, flipX, flipY, CreateIdentity3x3(), true, factor);
-            }
-            break;
         }
     }
-
-    float3 detailNormal = GetNormalInputTS(TerrainMaterialSrg::m_normalMap, TerrainMaterialSrg::m_sampler, 
-        detailUv, TerrainMaterialSrg::m_flipNormalX, TerrainMaterialSrg::m_flipNormalY, CreateIdentity3x3(), o_normal_useTexture, TerrainMaterialSrg::m_normalFactor);
-
-    detailNormal = ReorientTangentSpaceNormal(macroNormal, detailNormal);
-    surface.normal = lerp(detailNormal, macroNormal, detailFactor);
-    surface.normal = normalize(surface.normal);
-    surface.vertexNormal = normalize(IN.m_normal);
-
+    
     // ------- Base Color -------
-    float3 detailColor = GetBaseColorInput(TerrainMaterialSrg::m_baseColorMap, TerrainMaterialSrg::m_sampler, detailUv, TerrainMaterialSrg::m_baseColor.rgb, o_baseColor_useTexture);
-    float3 blendedColor = BlendBaseColor(lerp(detailColor, TerrainMaterialSrg::m_baseColor.rgb, detailFactor), macroColor, TerrainMaterialSrg::m_baseColorFactor, o_baseColorTextureBlendMode, o_baseColor_useTexture);
 
-    // ------- Debug detail materials using random colors -------
-    // This assigns a random color to each material, turns off any kind of distance fading, and draws a black line at the texture edges.
-    if (o_debugDetailMaterialIds) 
+    DetailSurface detailSurface = GetDefaultDetailSurface();
+    float2 detailRegionMin = TerrainSrg::m_detailAabb.xy;
+    float2 detailRegionMax = TerrainSrg::m_detailAabb.zw;
+    float2 detailRegionUv = (surface.position.xy - detailRegionMin) / (detailRegionMax - detailRegionMin);
+    bool hasDetailSurface = false;
+
+    // Check to make sure we're inside the detail texture's bounds and within where detail textures should be drawn.
+    if (detailFactor < 1.0 && all(detailRegionUv > TerrainSrg::m_detailHalfPixelUv) && all(detailRegionUv < 1.0 - TerrainSrg::m_detailHalfPixelUv))
     {
-        float2 detailRegionMin = TerrainMaterialSrg::m_detailAabb.xy;
-        float2 detailRegionMax = TerrainMaterialSrg::m_detailAabb.zw;
-        float2 detailRegionUv = (surface.position.xy - detailRegionMin) / (detailRegionMax - detailRegionMin);
-        if (all(detailRegionUv > TerrainMaterialSrg::m_detailHalfPixelUv) && all(detailRegionUv < 1.0 - TerrainMaterialSrg::m_detailHalfPixelUv))
-        {
-            detailRegionUv += TerrainMaterialSrg::m_detailMaterialIdImageCenter - (0.5);
-
-            uint material1 = TerrainMaterialSrg::m_detailMaterialIdImage.GatherRed(TerrainMaterialSrg::m_detailSampler, detailRegionUv, 0).r;
-            uint material2 = TerrainMaterialSrg::m_detailMaterialIdImage.GatherGreen(TerrainMaterialSrg::m_detailSampler, detailRegionUv, 0).r;
-            float blend = float(TerrainMaterialSrg::m_detailMaterialIdImage.GatherBlue(TerrainMaterialSrg::m_detailSampler, detailRegionUv, 0).r) / 0xFF;
-            
-            float3 material1Color = float3(0.1, 0.1, 0.1);
-            float3 material2Color = float3(0.1, 0.1, 0.1);
-
-            // Get a reasonably random hue for the material id
-            if (material1 != 255)
-            {
-                float hue1 = (material1 * 25043 % 256) / 256.0;
-                material1Color = HsvToRgb(float3(hue1, 1.0, 1.0));
-            }
-            if (material2 != 255)
-            {
-                float hue2 = (material2 * 25043 % 256) / 256.0;
-                material2Color = HsvToRgb(float3(hue2, 1.0, 1.0));
-            }
-
-            blendedColor = lerp(material1Color, material2Color, blend);
-            float seamBlend = 0.0;
-            const float halfLineWidth = 1.0 / 2048.0;
-            if (any(abs(detailRegionUv) % 1.0 < halfLineWidth) || any(abs(detailRegionUv) % 1.0 > 1.0 - halfLineWidth))
-            {
-                seamBlend = 1.0;
-            }
-            blendedColor = lerp(blendedColor, float3(0.0, 0.0, 0.0), seamBlend); // draw texture seams
-            blendedColor = pow(blendedColor , 2.2);
-        }
+        detailRegionUv += TerrainSrg::m_detailMaterialIdImageCenter - 0.5;
+        hasDetailSurface = GetDetailSurface(detailSurface, detailRegionUv, detailUv);
     }
 
-    // ------- Specular -------
-    float specularF0Factor = GetSpecularInput(TerrainMaterialSrg::m_specularF0Map, TerrainMaterialSrg::m_sampler, detailUv, TerrainMaterialSrg::m_specularF0Factor, o_specularF0_useTexture);
-    specularF0Factor = lerp(specularF0Factor, 0.5, detailFactor);
-    surface.SetAlbedoAndSpecularF0(blendedColor, specularF0Factor, 0.0);
+    const float macroRoughness = 1.0;
+    const float macroSpecularF0 = 0.5;
+    const float macroMetalness = 0.0;
 
-    // ------- Roughness -------
-    surface.roughnessLinear = GetRoughnessInput(TerrainMaterialSrg::m_roughnessMap, TerrainMaterialSrg::m_sampler, detailUv, TerrainMaterialSrg::m_roughnessFactor, 0.0, 1.0, o_roughness_useTexture);
-    surface.roughnessLinear = lerp(surface.roughnessLinear, 1.0, detailFactor);
-    surface.CalculateRoughnessA();
+    if (hasDetailSurface)
+    {
+        float3 blendedColor = lerp(detailSurface.m_color, macroColor, detailFactor);
+        float blendedSpecularF0 = lerp(detailSurface.m_specularF0, macroSpecularF0, detailFactor);
+        surface.SetAlbedoAndSpecularF0(blendedColor, blendedSpecularF0, detailSurface.m_metalness * (1.0 - detailFactor));
+
+        surface.roughnessLinear = lerp(detailSurface.m_roughness, macroRoughness, detailFactor);
+        surface.CalculateRoughnessA();
+
+        detailSurface.m_normal = ReorientTangentSpaceNormal(macroNormal, detailSurface.m_normal);
+        surface.normal = lerp(detailSurface.m_normal, macroNormal, detailFactor);
+        surface.normal = normalize(surface.normal);
+    }
+    else
+    {
+        surface.normal = macroNormal;
+        surface.SetAlbedoAndSpecularF0(macroColor, macroSpecularF0, macroMetalness);
+        surface.roughnessLinear = macroRoughness;
+        surface.CalculateRoughnessA();
+    }
 
     // Clear Coat, Transmission (Not used for terrain)
     surface.clearCoat.InitializeToZero();
@@ -184,6 +173,7 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN)
 
     // Shadow, Occlusion
     lightingData.shadowCoords = IN.m_shadowCoords;
+    lightingData.diffuseAmbientOcclusion = detailSurface.m_occlusion;
 
     // Diffuse and Specular response
     lightingData.specularResponse = FresnelSchlickWithRoughness(lightingData.NdotV, surface.specularF0, surface.roughnessLinear);
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader
index 0e6f0beb1d..66072567ec 100644
--- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader
+++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader
@@ -1,6 +1,12 @@
 {
     "Source" : "./TerrainPBR_ForwardPass.azsl",
 
+    "CompilerHints" :
+    { 
+        "DisableOptimizations" : false,
+        "GenerateDebugInfo" : false
+    },
+
     "DepthStencilState" :
     {
         "Depth" :
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli b/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli
new file mode 100644
index 0000000000..f980e02b9d
--- /dev/null
+++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <Atom/Features/SrgSemantics.azsli>
+
+ShaderResourceGroupSemantic SRG_Terrain
+{
+    FrequencyId = 7;
+};
+
+ShaderResourceGroup TerrainSrg : SRG_Terrain
+{
+    struct DetailMaterialData
+    {
+        // Uv
+        row_major float3x4 m_uvTransform;
+
+        float3 m_baseColor;
+
+        // Factor / Scale / Bias for input textures
+        float m_baseColorFactor;
+
+        float m_normalFactor;
+        float m_metalFactor;
+        float m_roughnessScale;
+        float m_roughnessBias;
+
+        float m_specularF0Factor;
+        float m_occlusionFactor;
+        float m_heightFactor;
+        float m_heightOffset;
+
+        float m_heightBlendFactor;
+
+        // Flags
+        uint m_flags; // see DetailTextureFlags
+
+        // Image indices
+        uint m_colorNormalImageIndices;
+        uint m_roughnessMetalnessImageIndices;
+
+        uint m_specularF0OcclusionImageIndices;
+        uint m_heightImageIndex; // only first 16 bits used
+
+        // 16 byte aligned
+        uint2 m_padding;
+    };
+
+    Texture2D<uint4> m_detailMaterialIdImage;
+    StructuredBuffer<DetailMaterialData> m_detailMaterialData;
+    Texture2D m_detailTextures[]; // bindless array of all textures for detail materials
+
+    float2 m_detailMaterialIdImageCenter;
+    float m_detailHalfPixelUv;
+    float4 m_detailAabb;
+
+}
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/ViewSrg.azsli b/Gems/Terrain/Assets/Shaders/Terrain/ViewSrg.azsli
new file mode 100644
index 0000000000..144f2abf6b
--- /dev/null
+++ b/Gems/Terrain/Assets/Shaders/Terrain/ViewSrg.azsli
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#ifndef AZ_COLLECTING_PARTIAL_SRGS
+#error Do not include this file directly. Include the main .srgi file instead.
+#endif
+
+partial ShaderResourceGroup ViewSrg
+{
+    Sampler HeightmapSampler
+    {
+        MinFilter = Linear;
+        MagFilter = Linear;
+        MipFilter = Point;
+        AddressU = Clamp;
+        AddressV = Clamp;
+        AddressW = Clamp;
+    };
+
+    Sampler DetailSampler
+    {
+        AddressU = Wrap;
+        AddressV = Wrap;
+        MinFilter = Point;
+        MagFilter = Point;
+        MipFilter = Point;
+    };
+
+    struct DetailMaterialData
+    {
+        // Uv
+        row_major float3x4 m_uvTransform;
+
+        float3 m_baseColor;
+
+        // Factor / Scale / Bias for input textures
+        float m_baseColorFactor;
+
+        float m_normalFactor;
+        float m_metalFactor;
+        float m_roughnessScale;
+        float m_roughnessBias;
+
+        float m_specularF0Factor;
+        float m_occlusionFactor;
+        float m_heightFactor;
+        float m_heightOffset;
+
+        float m_heightBlendFactor;
+
+        // Flags
+        uint m_flags; // see DetailTextureFlags
+
+        // Image indices
+        uint m_colorNormalImageIndices;
+        uint m_roughnessMetalnessImageIndices;
+
+        uint m_specularF0OcclusionImageIndices;
+        uint m_heightImageIndex; // only first 16 bits used
+
+        // 16 byte aligned
+        uint2 m_padding;
+    };
+
+    Texture2D m_heightmapImage;
+    Texture2D<uint4> m_detailMaterialIdImage;
+    StructuredBuffer<DetailMaterialData> m_detailMaterialData;
+    
+    Texture2D m_detailTextures[]; // bindless array of all textures for detail materials
+
+    float2 m_detailMaterialIdImageCenter;
+    float m_detailHalfPixelUv;
+    
+    float4 m_detailAabb;
+}
diff --git a/Gems/Terrain/Code/CMakeLists.txt b/Gems/Terrain/Code/CMakeLists.txt
index 4b2f32e172..d532284350 100644
--- a/Gems/Terrain/Code/CMakeLists.txt
+++ b/Gems/Terrain/Code/CMakeLists.txt
@@ -26,8 +26,6 @@ ly_add_target(
             Gem::GradientSignal
             Gem::SurfaceData
             Gem::LmbrCentral
-            
-            
 )
 
 ly_add_target(
@@ -49,14 +47,14 @@ ly_add_target(
 )
 
 # the above module is for use in all client/server types
-ly_create_alias(NAME Terrain.Servers  NAMESPACE Gem TARGETS Gem::Terrain)
-ly_create_alias(NAME Terrain.Clients  NAMESPACE Gem TARGETS Gem::Terrain)
+ly_create_alias(NAME Terrain.Servers  NAMESPACE Gem TARGETS Gem::Terrain Gem::SurfaceData.Servers Gem::GradientSignal.Servers)
+ly_create_alias(NAME Terrain.Clients  NAMESPACE Gem TARGETS Gem::Terrain Gem::SurfaceData.Clients Gem::GradientSignal.Clients)
 
 # If we are on a host platform, we want to add the host tools targets like the Terrain.Editor target which
 # will also depend on Terrain.Static
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
-        NAME Terrain.Editor MODULE
+        NAME Terrain.Editor GEM_MODULE
         NAMESPACE Gem
         AUTOMOC
         FILES_CMAKE
@@ -78,8 +76,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
     # the above module is for use in dev tool situations
-    ly_create_alias(NAME Terrain.Builders NAMESPACE Gem TARGETS Gem::Terrain.Editor)
-    ly_create_alias(NAME Terrain.Tools    NAMESPACE Gem TARGETS Gem::Terrain.Editor)
+    ly_create_alias(NAME Terrain.Builders NAMESPACE Gem TARGETS Gem::Terrain.Editor Gem::SurfaceData.Builders Gem::GradientSignal.Builders)
+    ly_create_alias(NAME Terrain.Tools    NAMESPACE Gem TARGETS Gem::Terrain.Editor Gem::SurfaceData.Tools Gem::GradientSignal.Tools)
 endif()
 
 ################################################################################
diff --git a/Gems/Terrain/Code/Mocks/Terrain/MockTerrain.h b/Gems/Terrain/Code/Mocks/Terrain/MockTerrain.h
index f9607fdafb..4704361229 100644
--- a/Gems/Terrain/Code/Mocks/Terrain/MockTerrain.h
+++ b/Gems/Terrain/Code/Mocks/Terrain/MockTerrain.h
@@ -34,28 +34,8 @@ namespace UnitTest
 
         MOCK_METHOD1(RegisterArea, void(AZ::EntityId areaId));
         MOCK_METHOD1(UnregisterArea, void(AZ::EntityId areaId));
-        MOCK_METHOD2(RefreshArea,
-            void(AZ::EntityId areaId, AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask));
-    };
-
-    class MockTerrainDataNotificationListener : public AzFramework::Terrain::TerrainDataNotificationBus::Handler
-    {
-    public:
-        MockTerrainDataNotificationListener()
-        {
-            AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
-        }
-
-        ~MockTerrainDataNotificationListener()
-        {
-            AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect();
-        }
-
-        MOCK_METHOD0(OnTerrainDataCreateBegin, void());
-        MOCK_METHOD0(OnTerrainDataCreateEnd, void());
-        MOCK_METHOD0(OnTerrainDataDestroyBegin, void());
-        MOCK_METHOD0(OnTerrainDataDestroyEnd, void());
-        MOCK_METHOD2(OnTerrainDataChanged, void(const AZ::Aabb& dirtyRegion, TerrainDataChangedMask dataChangedMask));
+        MOCK_METHOD2(
+            RefreshArea, void(AZ::EntityId areaId, AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask));
     };
 
     class MockTerrainAreaHeightRequests : public Terrain::TerrainAreaHeightRequestBus::Handler
@@ -91,45 +71,4 @@ namespace UnitTest
         MOCK_METHOD0(GetUseGroundPlane, bool());
     };
 
-    class MockTerrainDataRequests : public AzFramework::Terrain::TerrainDataRequestBus::Handler
-    {
-    public:
-        MockTerrainDataRequests()
-        {
-            AzFramework::Terrain::TerrainDataRequestBus::Handler::BusConnect();
-        }
-
-        ~MockTerrainDataRequests()
-        {
-            AzFramework::Terrain::TerrainDataRequestBus::Handler::BusDisconnect();
-        }
-
-        MOCK_CONST_METHOD0(GetTerrainHeightQueryResolution, AZ::Vector2());
-        MOCK_METHOD1(SetTerrainHeightQueryResolution, void(AZ::Vector2));
-        MOCK_CONST_METHOD0(GetTerrainAabb, AZ::Aabb());
-        MOCK_METHOD1(SetTerrainAabb, void(const AZ::Aabb&));
-        MOCK_CONST_METHOD3(GetHeight, float(const AZ::Vector3&, Sampler, bool*));
-        MOCK_CONST_METHOD3(GetHeightFromVector2, float(const AZ::Vector2&, Sampler, bool*));
-        MOCK_CONST_METHOD4(GetHeightFromFloats, float(float, float, Sampler, bool*));
-        MOCK_CONST_METHOD2(GetIsHole, bool(const AZ::Vector3&, Sampler));
-        MOCK_CONST_METHOD2(GetIsHoleFromVector2, bool(const AZ::Vector2&, Sampler));
-        MOCK_CONST_METHOD3(GetIsHoleFromFloats, bool(float, float, Sampler));
-        MOCK_CONST_METHOD3(GetNormal, AZ::Vector3(const AZ::Vector3&, Sampler, bool*));
-        MOCK_CONST_METHOD3(GetNormalFromVector2, AZ::Vector3(const AZ::Vector2&, Sampler, bool*));
-        MOCK_CONST_METHOD4(GetNormalFromFloats, AZ::Vector3(float, float, Sampler, bool*));
-        MOCK_CONST_METHOD3(GetMaxSurfaceWeight, AzFramework::SurfaceData::SurfaceTagWeight(const AZ::Vector3&, Sampler, bool*));
-        MOCK_CONST_METHOD3(GetMaxSurfaceWeightFromVector2, AzFramework::SurfaceData::SurfaceTagWeight(const AZ::Vector2&, Sampler, bool*));
-        MOCK_CONST_METHOD4(GetMaxSurfaceWeightFromFloats, AzFramework::SurfaceData::SurfaceTagWeight(float, float, Sampler, bool*));
-        MOCK_CONST_METHOD4(GetSurfaceWeights, void(const AZ::Vector3&, AzFramework::SurfaceData::SurfaceTagWeightList&, Sampler, bool*));
-        MOCK_CONST_METHOD4(
-            GetSurfaceWeightsFromVector2, void(const AZ::Vector2&, AzFramework::SurfaceData::SurfaceTagWeightList&, Sampler, bool*));
-        MOCK_CONST_METHOD5(
-            GetSurfaceWeightsFromFloats, void(float, float, AzFramework::SurfaceData::SurfaceTagWeightList&, Sampler, bool*));
-        MOCK_CONST_METHOD3(GetMaxSurfaceName, const char*(const AZ::Vector3&, Sampler, bool*));
-        MOCK_CONST_METHOD4(GetSurfacePoint, void(const AZ::Vector3&, AzFramework::SurfaceData::SurfacePoint&, Sampler, bool*));
-        MOCK_CONST_METHOD4(
-            GetSurfacePointFromVector2, void(const AZ::Vector2&, AzFramework::SurfaceData::SurfacePoint&, Sampler, bool*));
-        MOCK_CONST_METHOD5(
-            GetSurfacePointFromFloats, void(float, float, AzFramework::SurfaceData::SurfacePoint&, Sampler, bool*));
-    };
 } // namespace UnitTest
diff --git a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp
index e9c235c1bd..6c76e90fd0 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp
+++ b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp
@@ -185,12 +185,28 @@ namespace Terrain
 
     void TerrainPhysicsColliderComponent::GetHeightfieldHeightBounds(float& minHeightBounds, float& maxHeightBounds) const
     {
-        AZ::Aabb heightfieldAabb = GetHeightfieldAabb();
+        const AZ::Aabb heightfieldAabb = GetHeightfieldAabb();
 
         // Because our terrain heights are relative to the center of the bounding box, the min and max allowable heights are also
         // relative to the center.  They are also clamped to the size of the bounding box.
-        minHeightBounds = -(heightfieldAabb.GetZExtent() / 2.0f);
         maxHeightBounds = heightfieldAabb.GetZExtent() / 2.0f;
+        minHeightBounds = -maxHeightBounds;
+    }
+
+    float TerrainPhysicsColliderComponent::GetHeightfieldMinHeight() const
+    {
+        float minHeightBounds{ 0.0f };
+        float maxHeightBounds{ 0.0f };
+        GetHeightfieldHeightBounds(minHeightBounds, maxHeightBounds);
+        return minHeightBounds;
+    }
+
+    float TerrainPhysicsColliderComponent::GetHeightfieldMaxHeight() const
+    {
+        float minHeightBounds{ 0.0f };
+        float maxHeightBounds{ 0.0f };
+        GetHeightfieldHeightBounds(minHeightBounds, maxHeightBounds);
+        return maxHeightBounds;
     }
 
     AZ::Transform TerrainPhysicsColliderComponent::GetHeightfieldTransform() const
@@ -199,9 +215,7 @@ namespace Terrain
         AZ::Vector3 translate;
         AZ::TransformBus::EventResult(translate, GetEntityId(), &AZ::TransformBus::Events::GetWorldTranslation);
 
-        AZ::Transform transform = AZ::Transform::CreateTranslation(translate);
-
-        return transform;
+        return AZ::Transform::CreateTranslation(translate);
     }
 
     void TerrainPhysicsColliderComponent::GenerateHeightsInBounds(AZStd::vector<float>& heights) const
@@ -298,6 +312,24 @@ namespace Terrain
         numRows = aznumeric_cast<int32_t>((bounds.GetMax().GetY() - bounds.GetMin().GetY()) / gridResolution.GetY());
     }
 
+    int32_t TerrainPhysicsColliderComponent::GetHeightfieldGridColumns() const
+    {
+        int32_t numColumns{ 0 };
+        int32_t numRows{ 0 };
+
+        GetHeightfieldGridSize(numColumns, numRows);
+        return numColumns;
+    }
+
+    int32_t TerrainPhysicsColliderComponent::GetHeightfieldGridRows() const
+    {
+        int32_t numColumns{ 0 };
+        int32_t numRows{ 0 };
+
+        GetHeightfieldGridSize(numColumns, numRows);
+        return numRows;
+    }
+
     AZStd::vector<Physics::MaterialId> TerrainPhysicsColliderComponent::GetMaterialList() const
     {
         return AZStd::vector<Physics::MaterialId>();
diff --git a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h
index e268223689..6462909c89 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h
+++ b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h
@@ -58,7 +58,11 @@ namespace Terrain
         // HeightfieldProviderRequestsBus
         AZ::Vector2 GetHeightfieldGridSpacing() const override;
         void GetHeightfieldGridSize(int32_t& numColumns, int32_t& numRows) const override;
+        int32_t GetHeightfieldGridColumns() const override;
+        int32_t GetHeightfieldGridRows() const override;
         void GetHeightfieldHeightBounds(float& minHeightBounds, float& maxHeightBounds) const override;
+        float GetHeightfieldMinHeight() const override;
+        float GetHeightfieldMaxHeight() const override;
         AZ::Aabb GetHeightfieldAabb() const override;
         AZ::Transform GetHeightfieldTransform() const override;
         AZStd::vector<Physics::MaterialId> GetMaterialList() const override;
diff --git a/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp
index 7395e66d06..65e8600d62 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp
+++ b/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp
@@ -214,10 +214,10 @@ namespace Terrain
         {
             AZ_Assert((m_providerHandle != SurfaceData::InvalidSurfaceDataRegistryHandle), "Invalid surface data handle");
 
-            // Our terrain was valid before and after, it just changed in some way.  If we have a valid dirty region passed in
-            // then it's possible that the heightmap has been modified in the Editor.  Otherwise, just notify that the entire
-            // terrain has changed in some way.
-            if (dirtyRegion.IsValid())
+            // Our terrain was valid before and after, it just changed in some way.  If we have a valid dirty region, and the terrain
+            // bounds themselves haven't changed, just notify that our terrain data has changed within the bounds.  Otherwise, notify
+            // that the entire terrain provider needs to be updated, since it either has new bounds or the entire set of data is dirty.
+            if (dirtyRegion.IsValid() && m_terrainBounds.IsClose(terrainBoundsBeforeUpdate))
             {
                 SurfaceData::SurfaceDataSystemRequestBus::Broadcast(
                     &SurfaceData::SurfaceDataSystemRequestBus::Events::RefreshSurfaceData, dirtyRegion);
diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp
index bd65cf6abc..8d6bf8e4b0 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp
+++ b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp
@@ -40,15 +40,17 @@ namespace Terrain
 
                     ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainWorldConfig::m_worldMin, "World Bounds (Min)", "")
                     // Temporary constraint until the rest of the Terrain system is updated to support larger worlds.
+                    ->Attribute(AZ::Edit::Attributes::ChangeValidate, &TerrainWorldConfig::ValidateWorldMin)
                     ->Attribute(AZ::Edit::Attributes::Min, -2048.0f)
                     ->Attribute(AZ::Edit::Attributes::Max, 2048.0f)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainWorldConfig::m_worldMax, "World Bounds (Max)", "")
                     // Temporary constraint until the rest of the Terrain system is updated to support larger worlds.
+                    ->Attribute(AZ::Edit::Attributes::ChangeValidate, &TerrainWorldConfig::ValidateWorldMax)
                     ->Attribute(AZ::Edit::Attributes::Min, -2048.0f)
                     ->Attribute(AZ::Edit::Attributes::Max, 2048.0f)
                     ->DataElement(
                         AZ::Edit::UIHandlers::Default, &TerrainWorldConfig::m_heightQueryResolution, "Height Query Resolution (m)", "")
-                ;
+                    ->Attribute(AZ::Edit::Attributes::ChangeValidate, &TerrainWorldConfig::ValidateWorldHeight);
             }
         }
     }
@@ -128,4 +130,42 @@ namespace Terrain
         }
         return false;
     }
-}
+
+    float TerrainWorldConfig::NumberOfSamples(AZ::Vector3* min, AZ::Vector3* max, AZ::Vector2* heightQuery)
+    {
+        float numberOfSamples = ((max->GetX() - min->GetX()) / heightQuery->GetX()) * ((max->GetY() - min->GetY()) / heightQuery->GetY());
+        return numberOfSamples;
+    }
+
+    AZ::Outcome<void, AZStd::string> TerrainWorldConfig::DetermineMessage(float numSamples)
+    {
+        const float maximumSamplesAllowed = 8.0f * 1024.0f * 1024.0f;
+        if (numSamples < maximumSamplesAllowed)
+        {
+            return AZ::Success();
+        }
+        return AZ::Failure(AZStd::string("The number of samples exceeds the maximum allowed."));
+    }
+
+    AZ::Outcome<void, AZStd::string> TerrainWorldConfig::ValidateWorldMin(void* newValue, [[maybe_unused]]const AZ::Uuid& valueType)
+    {
+        AZ::Vector3 minValue = *static_cast<AZ::Vector3*>(newValue);
+
+        return DetermineMessage(NumberOfSamples(&minValue, &m_worldMax, &m_heightQueryResolution));
+    }
+
+    AZ::Outcome<void, AZStd::string> TerrainWorldConfig::ValidateWorldMax(void* newValue, [[maybe_unused]] const AZ::Uuid& valueType)
+    {
+        AZ::Vector3 maxValue = *static_cast<AZ::Vector3*>(newValue);
+
+        return DetermineMessage(NumberOfSamples(&m_worldMin, &maxValue, &m_heightQueryResolution));
+    }
+
+    AZ::Outcome<void, AZStd::string> TerrainWorldConfig::ValidateWorldHeight(void* newValue, [[maybe_unused]] const AZ::Uuid& valueType)
+    {
+        AZ::Vector2 heightValue = *static_cast<AZ::Vector2*>(newValue);
+
+        return DetermineMessage(NumberOfSamples(&m_worldMin, &m_worldMax, &heightValue));
+    }
+
+} // namespace Terrain
diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h
index 2dfe1135c8..a396bcefc8 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h
+++ b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h
@@ -32,6 +32,14 @@ namespace Terrain
         AZ::Vector3 m_worldMin{ 0.0f, 0.0f, 0.0f };
         AZ::Vector3 m_worldMax{ 1024.0f, 1024.0f, 1024.0f };
         AZ::Vector2 m_heightQueryResolution{ 1.0f, 1.0f };
+
+    private:
+        AZ::Outcome<void, AZStd::string> ValidateWorldMin(void* newValue, const AZ::Uuid& valueType);
+        AZ::Outcome<void, AZStd::string> ValidateWorldMax(void* newValue, const AZ::Uuid& valueType);
+        AZ::Outcome<void, AZStd::string> ValidateWorldHeight(void* newValue, const AZ::Uuid& valueType);
+        float NumberOfSamples(AZ::Vector3* min, AZ::Vector3* max, AZ::Vector2* heightQuery);
+        AZ::Outcome<void, AZStd::string> DetermineMessage(float numSamples);
+
     };
 
 
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h
index 2433eda009..623d58f1bc 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h
@@ -27,6 +27,6 @@ namespace Terrain
         static constexpr const char* const s_componentDescription = "Provides height data for a region to the terrain system";
         static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainHeight.svg";
         static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainHeight.svg";
-        static constexpr const char* const s_helpUrl = "";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/height_gradient_list/";
     };
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h
index 1eb3413d52..4018e0d377 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h
@@ -27,6 +27,6 @@ namespace Terrain
         static constexpr const char* const s_componentDescription = "Defines a terrain region for use by the terrain system";
         static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg";
         static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg";
-        static constexpr const char* const s_helpUrl = "";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/layer_spawner/";
     };
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
index d2254161a0..924426c262 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr auto s_categoryName = "Terrain";
         static constexpr auto s_componentName = "Terrain Physics Heightfield Collider";
         static constexpr auto s_componentDescription = "Provides terrain data to a physics collider in the form of a heightfield and surface->material mapping.";
-        static constexpr auto s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg";
-        static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg";
+        static constexpr auto s_icon = "Editor/Icons/Components/TerrainPhysicsCollider.svg";
+        static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg";
         static constexpr auto s_helpUrl = "";
     };
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
index e2c5f1b280..58cb776823 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Surface Gradient List";
         static constexpr const char* const s_componentDescription = "Provides a mapping between gradients and surface tags for use by the terrain system.";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg";
-        static constexpr const char* const s_helpUrl = "";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceGradientList.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/surface-gradient-list/";
     };
 }
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
index 3c6a213b02..5f2a50f903 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
@@ -74,7 +74,7 @@ namespace Terrain
 
                     ->DataElement(
                         AZ::Edit::UIHandlers::Default, &TerrainSurfaceMaterialsListConfig::m_surfaceMaterials,
-                        "Gradient to Material Mappings", "Maps surfaces to materials.");
+                        "Material Mappings", "Maps surfaces to materials.");
             }
         }
     }
@@ -134,12 +134,12 @@ namespace Terrain
     void TerrainSurfaceMaterialsListComponent::Deactivate()
     {
         TerrainAreaMaterialRequestBus::Handler::BusDisconnect();
-        AZ::Data::AssetBus::MultiHandler::BusDisconnect();
 
         for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
         {
             if (surfaceMaterialMapping.m_materialAsset.GetId().IsValid())
             {
+                AZ::Data::AssetBus::MultiHandler::BusDisconnect(surfaceMaterialMapping.m_materialAsset.GetId());
                 surfaceMaterialMapping.m_materialAsset.Release();
                 surfaceMaterialMapping.m_materialInstance.reset();
                 surfaceMaterialMapping.m_activeMaterialAssetId = AZ::Data::AssetId();
@@ -241,7 +241,7 @@ namespace Terrain
             // All materials have been deactivated, stop listening for requests and notifications.
             m_cachedAabb = AZ::Aabb::CreateNull();
             LmbrCentral::ShapeComponentNotificationsBus::Handler::BusDisconnect();
-            TerrainAreaMaterialRequestBus::Handler::BusConnect(GetEntityId());
+            TerrainAreaMaterialRequestBus::Handler::BusDisconnect();
         }
     }
 
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h
index a2fddf5768..67897b7dec 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Macro Material";
         static constexpr const char* const s_componentDescription = "Provides a macro material for a region to the terrain renderer";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerRenderer.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerRenderer.svg";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainMacroMaterial.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg";
         static constexpr const char* const s_helpUrl = "";
     };
 }
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h
index f0d03a6082..973e85a6d2 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Surface Materials List";
         static constexpr const char* const s_componentDescription = "Provides a mapping between surface tags and render materials.";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainHeight.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainHeight.svg";
-        static constexpr const char* const s_helpUrl = "";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceMaterials.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg";
+        static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/surface-material-list/";
     };
 }
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp
index 716c900f9b..9f83844243 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp
@@ -31,6 +31,9 @@
 #include <Atom/RPI.Public/Image/AttachmentImagePool.h>
 #include <Atom/RPI.Public/Model/Model.h>
 #include <Atom/RPI.Public/Material/Material.h>
+#include <Atom/RPI.Public/Pass/PassFilter.h>
+#include <Atom/RPI.Public/Pass/PassSystemInterface.h>
+#include <Atom/RPI.Public/Pass/RasterPass.h>
 
 #include <Atom/RPI.Reflect/Asset/AssetUtils.h>
 #include <Atom/RPI.Reflect/Buffer/BufferAssetCreator.h>
@@ -50,18 +53,24 @@ namespace Terrain
         const char* TerrainDetailChars = "TerrainDetail";
     }
 
-    namespace MaterialInputs
+    namespace ViewSrgInputs
     {
-        // Terrain material
-        static const char* const HeightmapImage("settings.heightmapImage");
-        static const char* const DetailMaterialIdImage("settings.detailMaterialIdImage");
-        static const char* const DetailCenter("settings.detailMaterialIdCenter");
-        static const char* const DetailAabb("settings.detailAabb");
-        static const char* const DetailHalfPixelUv("settings.detailHalfPixelUv");
+        static const char* const HeightmapImage("m_heightmapImage");
+    }
+
+    namespace TerrainSrgInputs
+    {
+        static const char* const DetailMaterialIdImage("m_detailMaterialIdImage");
+        static const char* const DetailMaterialData("m_detailMaterialData");
+        static const char* const DetailMaterialIdImageCenter("m_detailMaterialIdImageCenter");
+        static const char* const DetailHalfPixelUv("m_detailHalfPixelUv");
+        static const char* const DetailAabb("m_detailAabb");
+        static const char* const DetailTextures("m_detailTextures");
     }
 
     namespace DetailMaterialInputs
     {
+        static const char* const BaseColorColor("baseColor.color");
         static const char* const BaseColorMap("baseColor.textureMap");
         static const char* const BaseColorUseTexture("baseColor.useTexture");
         static const char* const BaseColorFactor("baseColor.factor");
@@ -72,8 +81,8 @@ namespace Terrain
         static const char* const RoughnessMap("roughness.textureMap");
         static const char* const RoughnessUseTexture("roughness.useTexture");
         static const char* const RoughnessFactor("roughness.factor");
-        static const char* const RoughnessUpperBound("roughness.lowerBound");
-        static const char* const RoughnessLowerBound("roughness.upperBound");
+        static const char* const RoughnessLowerBound("roughness.lowerBound");
+        static const char* const RoughnessUpperBound("roughness.upperBound");
         static const char* const SpecularF0Map("specularF0.textureMap");
         static const char* const SpecularF0UseTexture("specularF0.useTexture");
         static const char* const SpecularF0Factor("specularF0.factor");
@@ -126,6 +135,9 @@ namespace Terrain
 
     void TerrainFeatureProcessor::Activate()
     {
+        EnableSceneNotification();
+        CacheForwardPass();
+
         Initialize();
         AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
         
@@ -138,6 +150,13 @@ namespace Terrain
 
     void TerrainFeatureProcessor::Initialize()
     {
+        // Load indices for the View Srg.
+
+        auto viewSrgLayout = AZ::RPI::RPISystemInterface::Get()->GetViewSrgLayout();
+        
+        m_heightmapPropertyIndex = viewSrgLayout->FindShaderInputImageIndex(AZ::Name(ViewSrgInputs::HeightmapImage));
+        AZ_Error(TerrainFPName, m_heightmapPropertyIndex.IsValid(), "Failed to find view srg input constant %s.", ViewSrgInputs::HeightmapImage);
+        
         // Load the terrain material asynchronously
         const AZStd::string materialFilePath = "Materials/Terrain/DefaultPbrTerrain.azmaterial";
         m_materialAssetLoader = AZStd::make_unique<AZ::RPI::AssetUtils::AsyncAssetLoader>();
@@ -166,6 +185,7 @@ namespace Terrain
             return;
         }
         OnTerrainDataChanged(AZ::Aabb::CreateNull(), TerrainDataChangedMask::HeightData);
+
     }
 
     void TerrainFeatureProcessor::Deactivate()
@@ -173,6 +193,8 @@ namespace Terrain
         TerrainMacroMaterialNotificationBus::Handler::BusDisconnect();
         AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect();
         AZ::RPI::MaterialReloadNotificationBus::Handler::BusDisconnect();
+        
+        DisableSceneNotification();
 
         m_patchModel = {};
         m_areaData = {};
@@ -181,6 +203,7 @@ namespace Terrain
         m_macroMaterials.Clear();
         m_materialAssetLoader = {};
         m_materialInstance = {};
+
     }
 
     void TerrainFeatureProcessor::Render(const AZ::RPI::FeatureProcessor::RenderPacket& packet)
@@ -339,9 +362,47 @@ namespace Terrain
 
         uint16_t detailMaterialId = CreateOrUpdateDetailMaterial(material);
         materialRegion.m_materialsForSurfaces.push_back({ surfaceTag, detailMaterialId });
+        m_detailMaterials.GetData(detailMaterialId).refCount++;
         m_dirtyDetailRegion.AddAabb(materialRegion.m_region);
     }
 
+    void TerrainFeatureProcessor::OnRenderPipelinePassesChanged([[maybe_unused]] AZ::RPI::RenderPipeline* renderPipeline)
+    {
+        CacheForwardPass();
+    }
+
+    void TerrainFeatureProcessor::CheckDetailMaterialForDeletion(uint16_t detailMaterialId)
+    {
+        auto& detailMaterialData = m_detailMaterials.GetData(detailMaterialId);
+        if (--detailMaterialData.refCount == 0)
+        {
+            uint16_t bufferIndex = detailMaterialData.m_detailMaterialBufferIndex;
+            DetailMaterialShaderData& shaderData = m_detailMaterialShaderData.GetElement(bufferIndex);
+
+            for (uint16_t imageIndex :
+                {
+                    shaderData.m_colorImageIndex,
+                    shaderData.m_normalImageIndex,
+                    shaderData.m_roughnessImageIndex,
+                    shaderData.m_metalnessImageIndex,
+                    shaderData.m_specularF0ImageIndex,
+                    shaderData.m_occlusionImageIndex,
+                    shaderData.m_heightImageIndex
+                })
+            {
+                if (imageIndex != InvalidDetailImageIndex)
+                {
+                    m_detailImageViews.at(imageIndex) = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::Magenta)->GetImageView();
+                    m_detailImageViewFreeList.push_back(imageIndex);
+                    m_detailImagesNeedUpdate = true;
+                }
+            }
+
+            m_detailMaterialShaderData.Release(bufferIndex);
+            m_detailMaterials.RemoveIndex(detailMaterialId);
+        }
+    }
+
     void TerrainFeatureProcessor::OnTerrainSurfaceMaterialMappingDestroyed(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag)
     {
         DetailMaterialListRegion& materialRegion = FindOrCreateByEntityId(entityId, m_detailMaterialRegions);
@@ -350,6 +411,8 @@ namespace Terrain
         {
             if (surface.m_surfaceTag == surfaceTag)
             {
+                CheckDetailMaterialForDeletion(surface.m_detailMaterialId);
+
                 if (surface.m_surfaceTag != materialRegion.m_materialsForSurfaces.back().m_surfaceTag)
                 {
                     AZStd::swap(surface, materialRegion.m_materialsForSurfaces.back());
@@ -373,13 +436,19 @@ namespace Terrain
             if (surface.m_surfaceTag == surfaceTag)
             {
                 found = true;
-                surface.m_detailMaterialId = materialId;
+                if (surface.m_detailMaterialId != materialId)
+                {
+                    ++m_detailMaterials.GetData(materialId).refCount;
+                    CheckDetailMaterialForDeletion(surface.m_detailMaterialId);
+                    surface.m_detailMaterialId = materialId;
+                }
                 break;
             }
         }
 
         if (!found)
         {
+            ++m_detailMaterials.GetData(materialId).refCount;
             materialRegion.m_materialsForSurfaces.push_back({ surfaceTag, materialId });
         }
         m_dirtyDetailRegion.AddAabb(materialRegion.m_region);
@@ -398,138 +467,196 @@ namespace Terrain
         static constexpr uint16_t InvalidDetailMaterial = 0xFFFF;
         uint16_t detailMaterialId = InvalidDetailMaterial;
 
-        for (DetailMaterialData& detailMaterial : m_detailMaterials.GetDataVector())
+        for (auto& detailMaterialData : m_detailMaterials.GetDataVector())
         {
-            if (detailMaterial.m_assetId == material->GetAssetId())
+            if (detailMaterialData.m_assetId == material->GetAssetId())
             {
-                UpdateDetailMaterialData(detailMaterial, material);
-                detailMaterialId = m_detailMaterials.GetIndexForData(&detailMaterial);
+                detailMaterialId = m_detailMaterials.GetIndexForData(&detailMaterialData);
+                UpdateDetailMaterialData(detailMaterialId, material);
                 break;
             }
         }
 
-        if (detailMaterialId == InvalidDetailMaterial)
+        AZ_Assert(m_detailMaterialShaderData.GetSize() < 0xFF, "Only 255 detail materials supported.");
+
+        if (detailMaterialId == InvalidDetailMaterial && m_detailMaterialShaderData.GetSize() < 0xFF)
         {
             detailMaterialId = m_detailMaterials.GetFreeSlotIndex();
-            UpdateDetailMaterialData(m_detailMaterials.GetData(detailMaterialId), material);
+            auto& detailMaterialData = m_detailMaterials.GetData(detailMaterialId);
+            detailMaterialData.m_detailMaterialBufferIndex = aznumeric_cast<uint16_t>(m_detailMaterialShaderData.Reserve());
+            UpdateDetailMaterialData(detailMaterialId, material);
         }
         return detailMaterialId;
     }
 
-    void TerrainFeatureProcessor::UpdateDetailMaterialData(DetailMaterialData& materialData, MaterialInstance material)
+    void TerrainFeatureProcessor::UpdateDetailMaterialData(uint16_t detailMaterialIndex, MaterialInstance material)
     {
-        if (materialData.m_materialChangeId != material->GetCurrentChangeId())
+        DetailMaterialData& materialData = m_detailMaterials.GetData(detailMaterialIndex);
+        DetailMaterialShaderData& shaderData = m_detailMaterialShaderData.GetElement(materialData.m_detailMaterialBufferIndex);
+
+        if (materialData.m_materialChangeId == material->GetCurrentChangeId())
         {
-            materialData = DetailMaterialData();
-            DetailTextureFlags& flags = materialData.m_properties.m_flags;
-            materialData.m_materialChangeId = material->GetCurrentChangeId();
-            materialData.m_assetId = material->GetAssetId();
-            
-            auto getIndex = [&](const char* const indexName) -> AZ::RPI::MaterialPropertyIndex
-            {
-                const AZ::RPI::MaterialPropertyIndex index = material->FindPropertyIndex(AZ::Name(indexName));
-                AZ_Warning(TerrainFPName, index.IsValid(), "Failed to find shader input constant %s.", indexName);
-                return index;
-            };
-
-            auto applyProperty = [&](const char* const indexName, auto& ref) -> void
-            {
-                const auto index = getIndex(indexName);
-                if (index.IsValid())
-                {
-                    using TypeRefRemoved = AZStd::remove_cvref_t<decltype(ref)>;
-                    ref = material->GetPropertyValue(index).GetValue<TypeRefRemoved>();
-                }
-            };
-            
-            auto applyFlag = [&](const char* const indexName, DetailTextureFlags flagToSet) -> void
-            {
-                const auto index = getIndex(indexName);
-                if (index.IsValid())
-                {
-                    bool flagValue = material->GetPropertyValue(index).GetValue<bool>();
-                    flags = DetailTextureFlags(flagValue ? flags | flagToSet : flags);
-                }
-            };
-
-            auto getEnumName = [&](const char* const indexName) -> const AZStd::string_view
-            {
-                const auto index = getIndex(indexName);
-                if (index.IsValid())
-                {
-                    uint32_t enumIndex = material->GetPropertyValue(index).GetValue<uint32_t>();
-                    const AZ::Name& enumName = material->GetMaterialPropertiesLayout()->GetPropertyDescriptor(index)->GetEnumName(enumIndex);
-                    return enumName.GetStringView();
-                }
-                return "";
-            };
-
-            using namespace DetailMaterialInputs;
-            applyProperty(BaseColorMap, materialData.m_colorImage);
-            applyFlag(BaseColorUseTexture, DetailTextureFlags::UseTextureBaseColor);
-            applyProperty(BaseColorFactor, materialData.m_properties.m_baseColorFactor);
-
-            const AZStd::string_view& blendModeString = getEnumName(BaseColorBlendMode);
-            if (blendModeString == "Multiply")
-            {
-                flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeMultiply);
-            }
-            else if (blendModeString == "LinearLight")
-            {
-                flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeLinearLight);
-            }
-            else if (blendModeString == "Lerp")
-            {
-                flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeLerp);
-            }
-            else if (blendModeString == "Overlay")
-            {
-                flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeOverlay);
-            }
-            
-            applyProperty(MetallicMap, materialData.m_metalnessImage);
-            applyFlag(MetallicUseTexture, DetailTextureFlags::UseTextureMetallic);
-            applyProperty(MetallicFactor, materialData.m_properties.m_metalFactor);
-            
-            applyProperty(RoughnessMap, materialData.m_roughnessImage);
-            applyFlag(RoughnessUseTexture, DetailTextureFlags::UseTextureRoughness);
-
-            if ((flags & DetailTextureFlags::UseTextureRoughness) > 0)
-            {
-                float lowerBound = 0.0;
-                float upperBound = 1.0;
-                applyProperty(RoughnessLowerBound, lowerBound);
-                applyProperty(RoughnessUpperBound, upperBound);
-                materialData.m_properties.m_roughnessBias = lowerBound;
-                materialData.m_properties.m_roughnessScale = upperBound - lowerBound;
-            }
-            else
-            {
-                materialData.m_properties.m_roughnessBias = 0.0;
-                applyProperty(RoughnessFactor, materialData.m_properties.m_roughnessScale);
-            }
-            
-            applyProperty(SpecularF0Map, materialData.m_specularF0Image);
-            applyFlag(SpecularF0UseTexture, DetailTextureFlags::UseTextureSpecularF0);
-            applyProperty(SpecularF0Factor, materialData.m_properties.m_specularF0Factor);
-            
-            applyProperty(NormalMap, materialData.m_normalImage);
-            applyFlag(NormalUseTexture, DetailTextureFlags::UseTextureNormal);
-            applyProperty(NormalFactor, materialData.m_properties.m_normalFactor);
-            applyFlag(NormalFlipX, DetailTextureFlags::FlipNormalX);
-            applyFlag(NormalFlipY, DetailTextureFlags::FlipNormalY);
-            
-            applyProperty(DiffuseOcclusionMap, materialData.m_occlusionImage);
-            applyFlag(DiffuseOcclusionUseTexture, DetailTextureFlags::UseTextureOcclusion);
-            applyProperty(DiffuseOcclusionFactor, materialData.m_properties.m_occlusionFactor);
-            
-            applyProperty(HeightMap, materialData.m_heightImage);
-            applyFlag(HeightUseTexture, DetailTextureFlags::UseTextureHeight);
-            applyProperty(HeightFactor, materialData.m_properties.m_heightFactor);
-            applyProperty(HeightOffset, materialData.m_properties.m_heightOffset);
-            applyProperty(HeightBlendFactor, materialData.m_properties.m_heightBlendFactor);
-
+            return; // material hasn't changed, nothing to do
         }
+
+        materialData.m_materialChangeId = material->GetCurrentChangeId();
+        materialData.m_assetId = material->GetAssetId();
+            
+        DetailTextureFlags& flags = shaderData.m_flags;
+            
+        auto getIndex = [&](const char* const indexName) -> AZ::RPI::MaterialPropertyIndex
+        {
+            const AZ::RPI::MaterialPropertyIndex index = material->FindPropertyIndex(AZ::Name(indexName));
+            AZ_Warning(TerrainFPName, index.IsValid(), "Failed to find shader input constant %s.", indexName);
+            return index;
+        };
+
+        auto applyProperty = [&](const char* const indexName, auto& ref) -> void
+        {
+            const auto index = getIndex(indexName);
+            if (index.IsValid())
+            {
+                // GetValue<T>() expects the actaul type, not a reference type, so the reference needs to be removed.
+                using TypeRefRemoved = AZStd::remove_cvref_t<decltype(ref)>;
+                ref = material->GetPropertyValue(index).GetValue<TypeRefRemoved>();
+            }
+        };
+
+        auto applyImage = [&](const char* const indexName, AZ::Data::Instance<AZ::RPI::Image>& ref, const char* const usingFlagName, DetailTextureFlags flagToSet, uint16_t& imageIndex) -> void
+        {
+            // Determine if an image exists and if its using flag allows it to be used.
+            const auto index = getIndex(indexName);
+            const auto useTextureIndex = getIndex(usingFlagName);
+            bool useTextureValue = true;
+            if (useTextureIndex.IsValid())
+            {
+                useTextureValue = material->GetPropertyValue(useTextureIndex).GetValue<bool>();
+            }
+            if (index.IsValid() && useTextureValue)
+            {
+                ref = material->GetPropertyValue(index).GetValue<AZ::Data::Instance<AZ::RPI::Image>>();
+            }
+            useTextureValue = useTextureValue && ref;
+            flags = DetailTextureFlags(useTextureValue ? (flags | flagToSet) : (flags & ~flagToSet));
+
+            // Update queues to add/remove textures depending on if the image is used
+            if (ref)
+            {
+                if (imageIndex == InvalidDetailImageIndex)
+                {
+                    if (m_detailImageViewFreeList.size() > 0)
+                    {
+                        imageIndex = m_detailImageViewFreeList.back();
+                        m_detailImageViewFreeList.pop_back();
+                    }
+                    else
+                    {
+                        imageIndex = aznumeric_cast<uint16_t>(m_detailImageViews.size());
+                        m_detailImageViews.push_back();
+                    }
+                }
+                m_detailImageViews.at(imageIndex) = ref->GetImageView();
+                m_detailImagesNeedUpdate = true;
+            }
+            else if (imageIndex != InvalidDetailImageIndex)
+            {
+                m_detailImageViews.at(imageIndex) = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::Magenta)->GetImageView();
+                m_detailImageViewFreeList.push_back(imageIndex);
+                m_detailImagesNeedUpdate = true;
+                imageIndex = InvalidDetailImageIndex;
+            }
+        };
+            
+        auto applyFlag = [&](const char* const indexName, DetailTextureFlags flagToSet) -> void
+        {
+            const auto index = getIndex(indexName);
+            if (index.IsValid())
+            {
+                bool flagValue = material->GetPropertyValue(index).GetValue<bool>();
+                flags = DetailTextureFlags(flagValue ? flags | flagToSet : flags);
+            }
+        };
+
+        auto getEnumName = [&](const char* const indexName) -> const AZStd::string_view
+        {
+            const auto index = getIndex(indexName);
+            if (index.IsValid())
+            {
+                uint32_t enumIndex = material->GetPropertyValue(index).GetValue<uint32_t>();
+                const AZ::Name& enumName = material->GetMaterialPropertiesLayout()->GetPropertyDescriptor(index)->GetEnumName(enumIndex);
+                return enumName.GetStringView();
+            }
+            return "";
+        };
+
+        using namespace DetailMaterialInputs;
+        applyImage(BaseColorMap, materialData.m_colorImage, BaseColorUseTexture, DetailTextureFlags::UseTextureBaseColor, shaderData.m_colorImageIndex);
+        applyProperty(BaseColorFactor, shaderData.m_baseColorFactor);
+
+        const auto index = getIndex(BaseColorColor);
+        if (index.IsValid())
+        {
+            AZ::Color baseColor = material->GetPropertyValue(index).GetValue<AZ::Color>();
+            shaderData.m_baseColorRed = baseColor.GetR();
+            shaderData.m_baseColorGreen = baseColor.GetG();
+            shaderData.m_baseColorBlue = baseColor.GetB();
+        }
+
+        const AZStd::string_view& blendModeString = getEnumName(BaseColorBlendMode);
+        if (blendModeString == "Multiply")
+        {
+            flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeMultiply);
+        }
+        else if (blendModeString == "LinearLight")
+        {
+            flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeLinearLight);
+        }
+        else if (blendModeString == "Lerp")
+        {
+            flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeLerp);
+        }
+        else if (blendModeString == "Overlay")
+        {
+            flags = DetailTextureFlags(flags | DetailTextureFlags::BlendModeOverlay);
+        }
+            
+        applyImage(MetallicMap, materialData.m_metalnessImage, MetallicUseTexture, DetailTextureFlags::UseTextureMetallic, shaderData.m_metalnessImageIndex);
+        applyProperty(MetallicFactor, shaderData.m_metalFactor);
+            
+        applyImage(RoughnessMap, materialData.m_roughnessImage, RoughnessUseTexture, DetailTextureFlags::UseTextureRoughness, shaderData.m_roughnessImageIndex);
+
+        if ((flags & DetailTextureFlags::UseTextureRoughness) > 0)
+        {
+            float lowerBound = 0.0;
+            float upperBound = 1.0;
+            applyProperty(RoughnessLowerBound, lowerBound);
+            applyProperty(RoughnessUpperBound, upperBound);
+            shaderData.m_roughnessBias = lowerBound;
+            shaderData.m_roughnessScale = upperBound - lowerBound;
+        }
+        else
+        {
+            shaderData.m_roughnessBias = 0.0;
+            applyProperty(RoughnessFactor, shaderData.m_roughnessScale);
+        }
+            
+        applyImage(SpecularF0Map, materialData.m_specularF0Image, SpecularF0UseTexture, DetailTextureFlags::UseTextureSpecularF0, shaderData.m_specularF0ImageIndex);
+        applyProperty(SpecularF0Factor, shaderData.m_specularF0Factor);
+            
+        applyImage(NormalMap, materialData.m_normalImage, NormalUseTexture, DetailTextureFlags::UseTextureNormal, shaderData.m_normalImageIndex);
+        applyProperty(NormalFactor, shaderData.m_normalFactor);
+        applyFlag(NormalFlipX, DetailTextureFlags::FlipNormalX);
+        applyFlag(NormalFlipY, DetailTextureFlags::FlipNormalY);
+            
+        applyImage(DiffuseOcclusionMap, materialData.m_occlusionImage, DiffuseOcclusionUseTexture, DetailTextureFlags::UseTextureOcclusion, shaderData.m_occlusionImageIndex);
+        applyProperty(DiffuseOcclusionFactor, shaderData.m_occlusionFactor);
+            
+        applyImage(HeightMap, materialData.m_heightImage, HeightUseTexture, DetailTextureFlags::UseTextureHeight, shaderData.m_heightImageIndex);
+        applyProperty(HeightFactor, shaderData.m_heightFactor);
+        applyProperty(HeightOffset, shaderData.m_heightOffset);
+        applyProperty(HeightBlendFactor, shaderData.m_heightBlendFactor);
+
+        m_updateDetailMaterialBuffer = true;
     }
 
     void TerrainFeatureProcessor::CheckUpdateDetailTexture(const Aabb2i& newBounds, const Vector2i& newCenter)
@@ -765,7 +892,7 @@ namespace Terrain
                 {
                     if (materialSurface.m_surfaceTag == surfaceType)
                     {
-                        return materialSurface.m_detailMaterialId;
+                        return m_detailMaterials.GetData(materialSurface.m_detailMaterialId).m_detailMaterialBufferIndex;
                     }
                 }
             }
@@ -801,6 +928,7 @@ namespace Terrain
             
             // World size changed, so the whole height map needs updating.
             m_dirtyRegion = worldBounds;
+            m_imagesNeedUpdate = true;
         }
         
         int32_t xStart = aznumeric_cast<int32_t>(AZStd::ceilf(m_dirtyRegion.GetMin().GetX() / queryResolution));
@@ -889,21 +1017,48 @@ namespace Terrain
 
         m_macroNormalMapIndex = layout->FindShaderInputImageIndex(AZ::Name(ShaderInputs::MacroNormalMap));
         AZ_Error(TerrainFPName, m_macroNormalMapIndex.IsValid(), "Failed to find shader input constant %s.", ShaderInputs::MacroNormalMap);
-        
-        m_heightmapPropertyIndex = m_materialInstance->GetMaterialPropertiesLayout()->FindPropertyIndex(AZ::Name(MaterialInputs::HeightmapImage));
-        AZ_Error(TerrainFPName, m_heightmapPropertyIndex.IsValid(), "Failed to find material input constant %s.", MaterialInputs::HeightmapImage);
-        
-        m_detailMaterialIdPropertyIndex = m_materialInstance->GetMaterialPropertiesLayout()->FindPropertyIndex(AZ::Name(MaterialInputs::DetailMaterialIdImage));
-        AZ_Error(TerrainFPName, m_detailMaterialIdPropertyIndex.IsValid(), "Failed to find material input constant %s.", MaterialInputs::DetailMaterialIdImage);
-        
-        m_detailCenterPropertyIndex = m_materialInstance->GetMaterialPropertiesLayout()->FindPropertyIndex(AZ::Name(MaterialInputs::DetailCenter));
-        AZ_Error(TerrainFPName, m_detailCenterPropertyIndex.IsValid(), "Failed to find material input constant %s.", MaterialInputs::DetailCenter);
 
-        m_detailAabbPropertyIndex = m_materialInstance->GetMaterialPropertiesLayout()->FindPropertyIndex(AZ::Name(MaterialInputs::DetailAabb));
-        AZ_Error(TerrainFPName, m_detailAabbPropertyIndex.IsValid(), "Failed to find material input constant %s.", MaterialInputs::DetailAabb);
+        m_terrainSrg = {};
+        for (auto& shaderItem : m_materialInstance->GetShaderCollection())
+        {
+            if (shaderItem.GetShaderAsset()->GetDrawListName() == AZ::Name("forward"))
+            {
+                const auto& shaderAsset = shaderItem.GetShaderAsset();
+                m_terrainSrg = AZ::RPI::ShaderResourceGroup::Create(shaderItem.GetShaderAsset(), shaderAsset->GetSupervariantIndex(AZ::Name()), AZ::Name{"TerrainSrg"});
+                AZ_Error(TerrainFPName, m_terrainSrg, "Failed to create Terrain shader resource group");
+                break;
+            }
+        }
+
+        AZ_Error(TerrainFPName, m_terrainSrg, "Terrain Srg not found on any shader in the terrain material");
+
+        if (m_terrainSrg)
+        {
+            const AZ::RHI::ShaderResourceGroupLayout* terrainSrgLayout = m_terrainSrg->GetLayout();
+
+            m_detailMaterialIdPropertyIndex = terrainSrgLayout->FindShaderInputImageIndex(AZ::Name(TerrainSrgInputs::DetailMaterialIdImage));
+            AZ_Error(TerrainFPName, m_detailMaterialIdPropertyIndex.IsValid(), "Failed to find view srg input constant %s.", TerrainSrgInputs::DetailMaterialIdImage);
         
-        m_detailHalfPixelUvPropertyIndex = m_materialInstance->GetMaterialPropertiesLayout()->FindPropertyIndex(AZ::Name(MaterialInputs::DetailHalfPixelUv));
-        AZ_Error(TerrainFPName, m_detailHalfPixelUvPropertyIndex.IsValid(), "Failed to find material input constant %s.", MaterialInputs::DetailHalfPixelUv);
+            m_detailCenterPropertyIndex = terrainSrgLayout->FindShaderInputConstantIndex(AZ::Name(TerrainSrgInputs::DetailMaterialIdImageCenter));
+            AZ_Error(TerrainFPName, m_detailCenterPropertyIndex.IsValid(), "Failed to find view srg input constant %s.", TerrainSrgInputs::DetailMaterialIdImageCenter);
+
+            m_detailHalfPixelUvPropertyIndex = terrainSrgLayout->FindShaderInputConstantIndex(AZ::Name(TerrainSrgInputs::DetailHalfPixelUv));
+            AZ_Error(TerrainFPName, m_detailHalfPixelUvPropertyIndex.IsValid(), "Failed to find view srg input constant %s.", TerrainSrgInputs::DetailHalfPixelUv);
+        
+            m_detailAabbPropertyIndex = terrainSrgLayout->FindShaderInputConstantIndex(AZ::Name(TerrainSrgInputs::DetailAabb));
+            AZ_Error(TerrainFPName, m_detailAabbPropertyIndex.IsValid(), "Failed to find view srg input constant %s.", TerrainSrgInputs::DetailAabb);
+
+            m_detailTexturesIndex = terrainSrgLayout->FindShaderInputImageUnboundedArrayIndex(AZ::Name(TerrainSrgInputs::DetailTextures));
+            AZ_Error(TerrainFPName, m_detailTexturesIndex.IsValid(), "Failed to find view srg input constant %s.", TerrainSrgInputs::DetailTextures);
+
+            // Set up the gpu buffer for detail material data
+            AZ::Render::GpuBufferHandler::Descriptor desc;
+            desc.m_bufferName = "Detail Material Data";
+            desc.m_bufferSrgName = TerrainSrgInputs::DetailMaterialData;
+            desc.m_elementSize = sizeof(DetailMaterialShaderData);
+            desc.m_srgLayout = terrainSrgLayout;
+            m_detailMaterialDataBuffer = AZ::Render::GpuBufferHandler(desc);
+        }
 
         // Find any macro materials that have already been created.
         TerrainMacroMaterialRequestBus::EnumerateHandlers(
@@ -987,7 +1142,7 @@ namespace Terrain
                         auto objectSrg = AZ::RPI::ShaderResourceGroup::Create(shaderAsset, materialAsset->GetObjectSrgLayout()->GetName());
                         if (!objectSrg)
                         {
-                            AZ_Warning("TerrainFeatureProcessor", false, "Failed to create a new shader resource group, skipping.");
+                            AZ_Warning(TerrainFPName, false, "Failed to create a new shader resource group, skipping.");
                             continue;
                         }
                     
@@ -1003,7 +1158,7 @@ namespace Terrain
                             // set the shader option to select forward pass IBL specular if necessary
                             if (!drawPacket.SetShaderOption(AZ::Name("o_meshUseForwardPassIBLSpecular"), AZ::RPI::ShaderOptionValue{ false }))
                             {
-                                AZ_Warning("MeshDrawPacket", false, "Failed to set o_meshUseForwardPassIBLSpecular on mesh draw packet");
+                                AZ_Warning(TerrainFPName, false, "Failed to set o_meshUseForwardPassIBLSpecular on mesh draw packet");
                             }
                             const uint8_t stencilRef = AZ::Render::StencilRefs::UseDiffuseGIPass | AZ::Render::StencilRefs::UseIBLSpecularPass;
                             drawPacket.SetStencilRef(stencilRef);
@@ -1053,11 +1208,14 @@ namespace Terrain
             if (m_areaData.m_heightmapUpdated)
             {
                 UpdateTerrainData();
-                
-                const AZ::Data::Instance<AZ::RPI::Image> heightmapImage = m_areaData.m_heightmapImage; // cast StreamingImage to Image
-                m_materialInstance->SetPropertyValue(m_heightmapPropertyIndex, heightmapImage);
             }
             
+            if (m_updateDetailMaterialBuffer)
+            {
+                m_updateDetailMaterialBuffer = false;
+                m_detailMaterialDataBuffer.UpdateBuffer(m_detailMaterialShaderData.GetRawData(), aznumeric_cast<uint32_t>(m_detailMaterialShaderData.GetSize()));
+            }
+
             AZ::Vector3 cameraPosition = AZ::Vector3::CreateZero();
             for (auto& view : process.m_views)
             {
@@ -1068,7 +1226,7 @@ namespace Terrain
                 }
             }
 
-            if (m_dirtyDetailRegion.IsValid() || !cameraPosition.IsClose(m_previousCameraPosition))
+            if (m_dirtyDetailRegion.IsValid() || !cameraPosition.IsClose(m_previousCameraPosition) || m_detailImagesNeedUpdate)
             {
                 int32_t newDetailTexturePosX = aznumeric_cast<int32_t>(AZStd::roundf(cameraPosition.GetX() / DetailTextureScale));
                 int32_t newDetailTexturePosY = aznumeric_cast<int32_t>(AZStd::roundf(cameraPosition.GetY() / DetailTextureScale));
@@ -1091,8 +1249,6 @@ namespace Terrain
                 m_dirtyDetailRegion = AZ::Aabb::CreateNull();
 
                 m_previousCameraPosition = cameraPosition;
-                const AZ::Data::Instance<AZ::RPI::Image> detailTextureImage = m_detailTextureImage; // cast StreamingImage to Image
-                m_materialInstance->SetPropertyValue(m_detailMaterialIdPropertyIndex, detailTextureImage);
 
                 AZ::Vector4 detailAabb = AZ::Vector4(
                     m_detailTextureBounds.m_min.m_x * DetailTextureScale,
@@ -1100,11 +1256,16 @@ namespace Terrain
                     m_detailTextureBounds.m_max.m_x * DetailTextureScale,
                     m_detailTextureBounds.m_max.m_y * DetailTextureScale
                 );
-                m_materialInstance->SetPropertyValue(m_detailAabbPropertyIndex, detailAabb);
-                m_materialInstance->SetPropertyValue(m_detailHalfPixelUvPropertyIndex, 0.5f / DetailTextureSize);
-
                 AZ::Vector2 detailUvOffset = AZ::Vector2(float(newCenter.m_x) / DetailTextureSize, float(newCenter.m_y) / DetailTextureSize);
-                m_materialInstance->SetPropertyValue(m_detailCenterPropertyIndex, detailUvOffset);
+
+                if (m_terrainSrg)
+                {
+                    m_terrainSrg->SetConstant(m_detailAabbPropertyIndex, detailAabb);
+                    m_terrainSrg->SetConstant(m_detailHalfPixelUvPropertyIndex, 0.5f / DetailTextureSize);
+                    m_terrainSrg->SetConstant(m_detailCenterPropertyIndex, detailUvOffset);
+
+                    m_detailMaterialDataBuffer.UpdateSrg(m_terrainSrg.get());
+                }
             }
 
             if (m_areaData.m_heightmapUpdated || m_areaData.m_macroMaterialsUpdated)
@@ -1195,6 +1356,15 @@ namespace Terrain
                     sectorData.m_srg->Compile();
                 }
             }
+
+            // Currently there seems to be a bug in unbounded image arrays where flickering can occur if this isn't updated every frame.
+            if (m_terrainSrg/* && m_detailImagesUpdated*/)
+            {
+                AZStd::array_view<const AZ::RHI::ImageView*> imageViews(m_detailImageViews.data(), m_detailImageViews.size());
+                [[maybe_unused]] bool result = m_terrainSrg->SetImageViewUnboundedArray(m_detailTexturesIndex, imageViews);
+                AZ_Error(TerrainFPName, result, "Failed to set image view unbounded array into shader resource group.");
+                m_detailImagesNeedUpdate = false;
+            }
         }
 
         for (auto& sectorData : m_sectorData)
@@ -1236,10 +1406,30 @@ namespace Terrain
             }
         }
 
+        if (m_detailTextureImage && m_areaData.m_heightmapImage && m_imagesNeedUpdate)
+        {
+            m_imagesNeedUpdate = false;
+            for (auto& view : process.m_views)
+            {
+                auto viewSrg = view->GetShaderResourceGroup();
+                viewSrg->SetImage(m_heightmapPropertyIndex, m_areaData.m_heightmapImage);
+            }
+            if (m_terrainSrg)
+            {
+                m_terrainSrg->SetImage(m_detailMaterialIdPropertyIndex, m_detailTextureImage);
+            }
+        }
+
         if (m_materialInstance)
         {
             m_materialInstance->Compile();
         }
+
+        if (m_terrainSrg && m_forwardPass)
+        {
+            m_terrainSrg->Compile();
+            m_forwardPass->BindSrg(m_terrainSrg->GetRHIShaderResourceGroup());
+        }
     }
 
     void TerrainFeatureProcessor::InitializeTerrainPatch(uint16_t gridSize, float gridSpacing, PatchData& patchdata)
@@ -1368,6 +1558,7 @@ namespace Terrain
     
     void TerrainFeatureProcessor::OnMaterialReinitialized([[maybe_unused]] const MaterialInstance& material)
     {
+        PrepareMaterialData();
         for (auto& sectorData : m_sectorData)
         {
             for (auto& drawPacket : sectorData.m_drawPackets)
@@ -1375,6 +1566,8 @@ namespace Terrain
                 drawPacket.Update(*GetParentScene());
             }
         }
+        m_imagesNeedUpdate = true;
+        m_detailImagesNeedUpdate = true;
     }
 
     void TerrainFeatureProcessor::SetWorldSize([[maybe_unused]] AZ::Vector2 sizeInMeters)
@@ -1438,6 +1631,27 @@ namespace Terrain
             }
         }
     }
+
+    void TerrainFeatureProcessor::CacheForwardPass()
+    {
+        auto rasterPassFilter = AZ::RPI::PassFilter::CreateWithPassClass<AZ::RPI::RasterPass>();
+        rasterPassFilter.SetOwnerScene(GetParentScene());
+        AZ::RHI::RHISystemInterface* rhiSystem = AZ::RHI::RHISystemInterface::Get();
+        AZ::RHI::DrawListTag forwardTag = rhiSystem->GetDrawListTagRegistry()->AcquireTag(AZ::Name("forward"));
+        AZ::RPI::PassSystemInterface::Get()->ForEachPass(rasterPassFilter,
+            [&](AZ::RPI::Pass* pass) -> AZ::RPI::PassFilterExecutionFlow
+            {
+                auto* rasterPass = azrtti_cast<AZ::RPI::RasterPass*>(pass);
+                    
+                if (rasterPass && rasterPass->GetDrawListTag() == forwardTag)
+                {
+                    m_forwardPass = rasterPass;
+                    return AZ::RPI::PassFilterExecutionFlow::StopVisitingPasses;
+                }
+                return AZ::RPI::PassFilterExecutionFlow::ContinueVisitingPasses;
+            }
+        );
+    }
     
     auto TerrainFeatureProcessor::Vector2i::operator+(const Vector2i& rhs) const -> Vector2i
     {
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.h b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.h
index 9b66881ec6..7d68e6b185 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.h
@@ -19,7 +19,9 @@
 #include <Atom/RPI.Public/MeshDrawPacket.h>
 #include <Atom/RPI.Public/Material/MaterialReloadNotificationBus.h>
 #include <Atom/RPI.Public/Shader/ShaderSystemInterface.h>
+#include <Atom/Feature/Utils/GpuBufferHandler.h>
 #include <Atom/Feature/Utils/IndexedDataVector.h>
+#include <Atom/Feature/Utils/SparseVector.h>
 
 namespace AZ::RPI
 {
@@ -29,6 +31,7 @@ namespace AZ::RPI
     }
     class Material;
     class Model;
+    class RenderPass;
     class StreamingImage;
 }
 
@@ -125,17 +128,19 @@ namespace Terrain
             UseTextureHeight =     0b0000'0000'0000'0000'0000'0000'0010'0000,
             UseTextureSpecularF0 = 0b0000'0000'0000'0000'0000'0000'0100'0000,
 
-            FlipNormalX =          0b0000'0000'0000'0000'0000'0000'1000'0000,
-            FlipNormalY =          0b0000'0000'0000'0000'0000'0001'0000'0000,
+            FlipNormalX =          0b0000'0000'0000'0001'0000'0000'0000'0000,
+            FlipNormalY =          0b0000'0000'0000'0010'0000'0000'0000'0000,
 
-            BlendModeMask =        0b0000'0000'0000'0000'0000'0110'0000'0000,
+            BlendModeMask =        0b0000'0000'0000'1100'0000'0000'0000'0000,
             BlendModeLerp =        0b0000'0000'0000'0000'0000'0000'0000'0000,
-            BlendModeLinearLight = 0b0000'0000'0000'0000'0000'0010'0000'0000,
-            BlendModeMultiply =    0b0000'0000'0000'0000'0000'0100'0000'0000,
-            BlendModeOverlay =     0b0000'0000'0000'0000'0000'0110'0000'0000,
+            BlendModeLinearLight = 0b0000'0000'0000'0100'0000'0000'0000'0000,
+            BlendModeMultiply =    0b0000'0000'0000'1000'0000'0000'0000'0000,
+            BlendModeOverlay =     0b0000'0000'0000'1100'0000'0000'0000'0000,
         };
 
-        struct DetailMaterialShaderProperties
+        static constexpr uint16_t InvalidDetailImageIndex = 0xFFFF;
+
+        struct DetailMaterialShaderData
         {
             // Uv
             AZStd::array<float, 12> m_uvTransform
@@ -145,30 +150,50 @@ namespace Terrain
                 0.0, 0.0, 1.0, 0.0,
             };
 
+            float m_baseColorRed{ 1.0f };
+            float m_baseColorGreen{ 1.0f };
+            float m_baseColorBlue{ 1.0f };
+
             // Factor / Scale / Bias for input textures
             float m_baseColorFactor{ 1.0f };
+
             float m_normalFactor{ 1.0f };
             float m_metalFactor{ 1.0f };
             float m_roughnessScale{ 1.0f };
-
             float m_roughnessBias{ 0.0f };
+
             float m_specularF0Factor{ 1.0f };
             float m_occlusionFactor{ 1.0f };
             float m_heightFactor{ 1.0f };
-
             float m_heightOffset{ 0.0f };
+
             float m_heightBlendFactor{ 0.5f };
 
             // Flags
             DetailTextureFlags m_flags{ 0 };
 
-            float m_padding; // 16 byte aligned
+            // Image indices
+            uint16_t m_colorImageIndex{ InvalidDetailImageIndex };
+            uint16_t m_normalImageIndex{ InvalidDetailImageIndex };
+            uint16_t m_roughnessImageIndex{ InvalidDetailImageIndex };
+            uint16_t m_metalnessImageIndex{ InvalidDetailImageIndex };
+
+            uint16_t m_specularF0ImageIndex{ InvalidDetailImageIndex };
+            uint16_t m_occlusionImageIndex{ InvalidDetailImageIndex };
+            uint16_t m_heightImageIndex{ InvalidDetailImageIndex };
+
+            // 16 byte aligned
+            uint16_t m_padding1;
+            uint32_t m_padding2;
+            uint32_t m_padding3;
         };
 
         struct DetailMaterialData
         {
             AZ::Data::AssetId m_assetId;
             AZ::RPI::Material::ChangeId m_materialChangeId{AZ::RPI::Material::DEFAULT_CHANGE_ID};
+            uint32_t refCount = 0;
+            uint16_t m_detailMaterialBufferIndex{ 0xFFFF };
 
             AZ::Data::Instance<AZ::RPI::Image> m_colorImage;
             AZ::Data::Instance<AZ::RPI::Image> m_normalImage;
@@ -177,8 +202,6 @@ namespace Terrain
             AZ::Data::Instance<AZ::RPI::Image> m_specularF0Image;
             AZ::Data::Instance<AZ::RPI::Image> m_occlusionImage;
             AZ::Data::Instance<AZ::RPI::Image> m_heightImage;
-
-            DetailMaterialShaderProperties m_properties; // maps directly to shader
         };
 
         struct DetailMaterialSurface
@@ -217,6 +240,12 @@ namespace Terrain
             Aabb2i GetClamped(Aabb2i rhs) const;
             bool IsValid() const;
         };
+        
+        struct DetailTextureLocation
+        {
+            uint16_t m_index;
+            AZ::Data::Instance<AZ::RPI::Image> m_image;
+        };
 
         // AZ::RPI::MaterialReloadNotificationBus::Handler overrides...
         void OnMaterialReinitialized(const MaterialInstance& material) override;
@@ -237,6 +266,9 @@ namespace Terrain
         void OnTerrainSurfaceMaterialMappingChanged(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material) override;
         void OnTerrainSurfaceMaterialMappingRegionChanged(AZ::EntityId entityId, const AZ::Aabb& oldRegion, const AZ::Aabb& newRegion) override;
 
+        // AZ::RPI::SceneNotificationBus overrides...
+        void OnRenderPipelinePassesChanged(AZ::RPI::RenderPipeline* renderPipeline) override;
+
         void Initialize();
         void InitializeTerrainPatch(uint16_t gridSize, float gridSpacing, PatchData& patchdata);
         bool InitializePatchModel();
@@ -249,7 +281,8 @@ namespace Terrain
         void TerrainSurfaceDataUpdated(const AZ::Aabb& dirtyRegion);
 
         uint16_t CreateOrUpdateDetailMaterial(MaterialInstance material);
-        void UpdateDetailMaterialData(DetailMaterialData& materialData, MaterialInstance material);
+        void CheckDetailMaterialForDeletion(uint16_t detailMaterialId);
+        void UpdateDetailMaterialData(uint16_t detailMaterialIndex, MaterialInstance material);
         void CheckUpdateDetailTexture(const Aabb2i& newBounds, const Vector2i& newCenter);
         void UpdateDetailTexture(const Aabb2i& updateArea, const Aabb2i& textureBounds, const Vector2i& centerPixel);
         uint16_t GetDetailMaterialForSurfaceTypeAndPosition(AZ::Crc32 surfaceType, const AZ::Vector2& position);
@@ -271,6 +304,8 @@ namespace Terrain
         AZ::Outcome<AZ::Data::Asset<AZ::RPI::BufferAsset>> CreateBufferAsset(
             const void* data, const AZ::RHI::BufferViewDescriptor& bufferViewDescriptor, const AZStd::string& bufferName);
 
+        void CacheForwardPass();
+
         // System-level parameters
         static constexpr float GridSpacing{ 1.0f };
         static constexpr int32_t GridSize{ 64 }; // number of terrain quads (vertices are m_gridSize + 1)
@@ -281,6 +316,7 @@ namespace Terrain
 
         AZStd::unique_ptr<AZ::RPI::AssetUtils::AsyncAssetLoader> m_materialAssetLoader;
         MaterialInstance m_materialInstance;
+        AZ::Data::Instance<AZ::RPI::ShaderResourceGroup> m_terrainSrg;
 
         AZ::RHI::ShaderInputConstantIndex m_modelToWorldIndex;
         AZ::RHI::ShaderInputConstantIndex m_terrainDataIndex;
@@ -288,11 +324,13 @@ namespace Terrain
         AZ::RHI::ShaderInputConstantIndex m_macroMaterialCountIndex;
         AZ::RHI::ShaderInputImageIndex m_macroColorMapIndex;
         AZ::RHI::ShaderInputImageIndex m_macroNormalMapIndex;
-        AZ::RPI::MaterialPropertyIndex m_heightmapPropertyIndex;
-        AZ::RPI::MaterialPropertyIndex m_detailMaterialIdPropertyIndex;
-        AZ::RPI::MaterialPropertyIndex m_detailCenterPropertyIndex;
-        AZ::RPI::MaterialPropertyIndex m_detailAabbPropertyIndex;
-        AZ::RPI::MaterialPropertyIndex m_detailHalfPixelUvPropertyIndex;
+        AZ::RHI::ShaderInputImageIndex m_heightmapPropertyIndex;
+        AZ::RHI::ShaderInputImageIndex m_detailMaterialIdPropertyIndex;
+        AZ::RHI::ShaderInputBufferIndex m_detailMaterialDataIndex;
+        AZ::RHI::ShaderInputConstantIndex m_detailCenterPropertyIndex;
+        AZ::RHI::ShaderInputConstantIndex m_detailAabbPropertyIndex;
+        AZ::RHI::ShaderInputConstantIndex m_detailHalfPixelUvPropertyIndex;
+        AZ::RHI::ShaderInputImageUnboundedArrayIndex m_detailTexturesIndex;
 
         AZ::Data::Instance<AZ::RPI::Model> m_patchModel;
         AZ::Vector3 m_previousCameraPosition = AZ::Vector3(AZStd::numeric_limits<float>::max(), 0.0, 0.0);
@@ -312,17 +350,26 @@ namespace Terrain
         TerrainAreaData m_areaData;
         AZ::Aabb m_dirtyRegion{ AZ::Aabb::CreateNull() };
         AZ::Aabb m_dirtyDetailRegion{ AZ::Aabb::CreateNull() };
+        bool m_updateDetailMaterialBuffer{ false };
 
         Aabb2i m_detailTextureBounds;
         Vector2i m_detailTextureCenter;
         AZ::Data::Instance<AZ::RPI::AttachmentImage> m_detailTextureImage;
         AZ::RPI::ShaderSystemInterface::GlobalShaderOptionUpdatedEvent::Handler m_handleGlobalShaderOptionUpdate;
-        bool m_forceRebuildDrawPackets = false;
+        bool m_forceRebuildDrawPackets{ false };
+        bool m_imagesNeedUpdate{ false };
 
         AZStd::vector<SectorData> m_sectorData;
 
         AZ::Render::IndexedDataVector<MacroMaterialData> m_macroMaterials;
         AZ::Render::IndexedDataVector<DetailMaterialData> m_detailMaterials;
         AZ::Render::IndexedDataVector<DetailMaterialListRegion> m_detailMaterialRegions;
+        AZ::Render::SparseVector<DetailMaterialShaderData> m_detailMaterialShaderData;
+        AZ::Render::GpuBufferHandler m_detailMaterialDataBuffer;
+        AZ::RPI::RenderPass* m_forwardPass;
+
+        AZStd::vector<const AZ::RHI::ImageView*> m_detailImageViews;
+        AZStd::vector<uint16_t> m_detailImageViewFreeList;
+        bool m_detailImagesNeedUpdate{ false };
     };
 }
diff --git a/Gems/Terrain/Code/Tests/LayerSpawnerTests.cpp b/Gems/Terrain/Code/Tests/LayerSpawnerTests.cpp
index 3778ba860f..9de441eecf 100644
--- a/Gems/Terrain/Code/Tests/LayerSpawnerTests.cpp
+++ b/Gems/Terrain/Code/Tests/LayerSpawnerTests.cpp
@@ -6,15 +6,13 @@
  *
  */
 
+#include <AzTest/AzTest.h>
+
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Memory/MemoryComponent.h>
 
-#include <AzFramework/Terrain/TerrainDataRequestBus.h>
-
 #include <Components/TerrainLayerSpawnerComponent.h>
-#include <LmbrCentral/Shape/BoxShapeComponentBus.h>
-#include <AzTest/AzTest.h>
 
 #include <Terrain/MockTerrain.h>
 #include <MockAxisAlignedBoxShapeComponent.h>
@@ -23,21 +21,12 @@ using ::testing::NiceMock;
 using ::testing::AtLeast;
 using ::testing::_;
 
-using ::testing::NiceMock;
-using ::testing::AtLeast;
-using ::testing::_;
-
 class LayerSpawnerComponentTest
     : public ::testing::Test
 {
 protected:
     AZ::ComponentApplication m_app;
 
-    AZStd::unique_ptr<AZ::Entity> m_entity;
-    Terrain::TerrainLayerSpawnerComponent* m_layerSpawnerComponent;
-    UnitTest::MockAxisAlignedBoxShapeComponent* m_shapeComponent;
-    AZStd::unique_ptr<NiceMock<UnitTest::MockTerrainSystemService>> m_terrainSystem;
-
     void SetUp() override
     {
         AZ::ComponentApplication::Descriptor appDesc;
@@ -50,78 +39,86 @@ protected:
 
     void TearDown() override
     {
-        m_entity.reset();
-        m_terrainSystem.reset();
         m_app.Destroy();
     }
 
-    void CreateEntity()
+    AZStd::unique_ptr<AZ::Entity> CreateEntity()
     {
-        m_entity = AZStd::make_unique<AZ::Entity>();
-        m_entity->Init();
+        auto entity = AZStd::make_unique<AZ::Entity>();
+        entity->Init();
 
-        ASSERT_TRUE(m_entity);
+        return entity;
     }
 
-    void AddLayerSpawnerAndShapeComponentToEntity()
+    Terrain::TerrainLayerSpawnerComponent* AddLayerSpawnerToEntity(AZ::Entity* entity, const Terrain::TerrainLayerSpawnerConfig& config)
     {
-        AddLayerSpawnerAndShapeComponentToEntity(Terrain::TerrainLayerSpawnerConfig());
+        auto layerSpawnerComponent = entity->CreateComponent<Terrain::TerrainLayerSpawnerComponent>(config);
+        m_app.RegisterComponentDescriptor(layerSpawnerComponent->CreateDescriptor());
+
+        return layerSpawnerComponent;
     }
 
-    void AddLayerSpawnerAndShapeComponentToEntity(const Terrain::TerrainLayerSpawnerConfig& config)
+    UnitTest::MockAxisAlignedBoxShapeComponent* AddShapeComponentToEntity(AZ::Entity* entity)
     {
-        m_layerSpawnerComponent = m_entity->CreateComponent<Terrain::TerrainLayerSpawnerComponent>(config);
-        m_app.RegisterComponentDescriptor(m_layerSpawnerComponent->CreateDescriptor());
+        UnitTest::MockAxisAlignedBoxShapeComponent* shapeComponent = entity->CreateComponent<UnitTest::MockAxisAlignedBoxShapeComponent>();
+        m_app.RegisterComponentDescriptor(shapeComponent->CreateDescriptor());
 
-        m_shapeComponent = m_entity->CreateComponent<UnitTest::MockAxisAlignedBoxShapeComponent>();
-        m_app.RegisterComponentDescriptor(m_shapeComponent->CreateDescriptor());
-
-        ASSERT_TRUE(m_layerSpawnerComponent);
-        ASSERT_TRUE(m_shapeComponent);
-    }
-
-    void CreateMockTerrainSystem()
-    {
-        m_terrainSystem = AZStd::make_unique<NiceMock<UnitTest::MockTerrainSystemService>>();
+        return shapeComponent;
     }
 };
 
-TEST_F(LayerSpawnerComponentTest, ActivatEntityActivateSuccess)
+TEST_F(LayerSpawnerComponentTest, ActivateEntityWithoutShapeFails)
 {
-    CreateEntity();
-    AddLayerSpawnerAndShapeComponentToEntity();
+    auto entity = CreateEntity();
 
-    m_entity->Activate();
-    EXPECT_EQ(m_entity->GetState(), AZ::Entity::State::Active);
-     
-    m_entity->Deactivate();
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+
+    const AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
+    EXPECT_FALSE(sortOutcome.IsSuccess());
+
+    entity.reset();
+}
+
+TEST_F(LayerSpawnerComponentTest, ActivateEntityActivateSuccess)
+{
+    auto entity = CreateEntity();
+
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+    AddShapeComponentToEntity(entity.get());
+
+    entity->Activate();
+    EXPECT_EQ(entity->GetState(), AZ::Entity::State::Active);
+
+    entity.reset();
 }
 
 TEST_F(LayerSpawnerComponentTest, LayerSpawnerDefaultValuesCorrect)
 {
-    CreateEntity();
-    AddLayerSpawnerAndShapeComponentToEntity();
+    auto entity = CreateEntity();
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+    AddShapeComponentToEntity(entity.get());
 
-    m_entity->Activate();
+    entity->Activate();
 
     AZ::u32 priority = 999, layer = 999;
-    Terrain::TerrainSpawnerRequestBus::Event(m_entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetPriority, layer, priority);
+    Terrain::TerrainSpawnerRequestBus::Event(entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetPriority, layer, priority);
 
     EXPECT_EQ(0, priority);
     EXPECT_EQ(1, layer);
 
     bool useGroundPlane = false;
 
-    Terrain::TerrainSpawnerRequestBus::EventResult(useGroundPlane, m_entity->GetId(),  &Terrain::TerrainSpawnerRequestBus::Events::GetUseGroundPlane);
+    Terrain::TerrainSpawnerRequestBus::EventResult(
+        useGroundPlane, entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetUseGroundPlane);
 
     EXPECT_TRUE(useGroundPlane);
 
-    m_entity->Deactivate();
+    entity.reset();
 }
 
 TEST_F(LayerSpawnerComponentTest, LayerSpawnerConfigValuesCorrect)
 {
-    CreateEntity();
+    auto entity = CreateEntity();
 
     constexpr static AZ::u32 testPriority = 15;
     constexpr static AZ::u32 testLayer = 0;
@@ -131,12 +128,13 @@ TEST_F(LayerSpawnerComponentTest, LayerSpawnerConfigValuesCorrect)
     config.m_priority = testPriority;
     config.m_useGroundPlane = false;
 
-    AddLayerSpawnerAndShapeComponentToEntity(config);
+    AddLayerSpawnerToEntity(entity.get(), config);
+    AddShapeComponentToEntity(entity.get());
 
-    m_entity->Activate();
+    entity->Activate();
 
     AZ::u32 priority = 999, layer = 999;
-    Terrain::TerrainSpawnerRequestBus::Event(m_entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetPriority, layer, priority);
+    Terrain::TerrainSpawnerRequestBus::Event(entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetPriority, layer, priority);
 
     EXPECT_EQ(testPriority, priority);
     EXPECT_EQ(testLayer, layer);
@@ -144,82 +142,86 @@ TEST_F(LayerSpawnerComponentTest, LayerSpawnerConfigValuesCorrect)
     bool useGroundPlane = true;
 
     Terrain::TerrainSpawnerRequestBus::EventResult(
-        useGroundPlane, m_entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetUseGroundPlane);
+        useGroundPlane, entity->GetId(), &Terrain::TerrainSpawnerRequestBus::Events::GetUseGroundPlane);
 
     EXPECT_FALSE(useGroundPlane);
 
-    m_entity->Deactivate();
+    entity.reset();
 }
 
 TEST_F(LayerSpawnerComponentTest, LayerSpawnerRegisterAreaUpdatesTerrainSystem)
 {
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    CreateMockTerrainSystem();
+    NiceMock<UnitTest::MockTerrainSystemService> terrainSystem;
 
     // The Activate call should register the area.
-    EXPECT_CALL(*m_terrainSystem, RegisterArea(_)).Times(1);
+    EXPECT_CALL(terrainSystem, RegisterArea(_)).Times(1);
 
-    AddLayerSpawnerAndShapeComponentToEntity();
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+    AddShapeComponentToEntity(entity.get());
 
-    m_entity->Activate();
+    entity->Activate();
 
-    m_entity->Deactivate();
+    entity.reset();
 }
 
 TEST_F(LayerSpawnerComponentTest, LayerSpawnerUnregisterAreaUpdatesTerrainSystem)
 {
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    CreateMockTerrainSystem();
+    NiceMock<UnitTest::MockTerrainSystemService> terrainSystem;
 
     // The Deactivate call should unregister the area.
-    EXPECT_CALL(*m_terrainSystem, UnregisterArea(_)).Times(1);
+    EXPECT_CALL(terrainSystem, UnregisterArea(_)).Times(1);
 
-    AddLayerSpawnerAndShapeComponentToEntity();
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+    AddShapeComponentToEntity(entity.get());
 
-    m_entity->Activate();
+    entity->Activate();
 
-    m_entity->Deactivate();
+    entity.reset();
 }
 
 TEST_F(LayerSpawnerComponentTest, LayerSpawnerTransformChangedUpdatesTerrainSystem)
 {
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    CreateMockTerrainSystem();
+    NiceMock<UnitTest::MockTerrainSystemService> terrainSystem;
 
     // The TransformChanged call should refresh the area.
-    EXPECT_CALL(*m_terrainSystem, RefreshArea(_, _)).Times(1);
+    EXPECT_CALL(terrainSystem, RefreshArea(_, _)).Times(1);
 
-    AddLayerSpawnerAndShapeComponentToEntity();
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+    AddShapeComponentToEntity(entity.get());
 
-    m_entity->Activate();
+    entity->Activate();
 
     // The component gets transform change notifications via the shape bus.
     LmbrCentral::ShapeComponentNotificationsBus::Event(
-        m_entity->GetId(), &LmbrCentral::ShapeComponentNotificationsBus::Events::OnShapeChanged,
+        entity->GetId(), &LmbrCentral::ShapeComponentNotificationsBus::Events::OnShapeChanged,
         LmbrCentral::ShapeComponentNotifications::ShapeChangeReasons::TransformChanged);
 
-    m_entity->Deactivate();
+    entity.reset();
 }
 
 TEST_F(LayerSpawnerComponentTest, LayerSpawnerShapeChangedUpdatesTerrainSystem)
 {
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    CreateMockTerrainSystem();
+    NiceMock<UnitTest::MockTerrainSystemService> terrainSystem;
 
     // The ShapeChanged call should refresh the area.
-    EXPECT_CALL(*m_terrainSystem, RefreshArea(_, _)).Times(1);
+    EXPECT_CALL(terrainSystem, RefreshArea(_, _)).Times(1);
 
-    AddLayerSpawnerAndShapeComponentToEntity();
+    AddLayerSpawnerToEntity(entity.get(), Terrain::TerrainLayerSpawnerConfig());
+    AddShapeComponentToEntity(entity.get());
 
-    m_entity->Activate();
+    entity->Activate();
 
-   LmbrCentral::ShapeComponentNotificationsBus::Event(
-        m_entity->GetId(), &LmbrCentral::ShapeComponentNotificationsBus::Events::OnShapeChanged,
+    LmbrCentral::ShapeComponentNotificationsBus::Event(
+        entity->GetId(), &LmbrCentral::ShapeComponentNotificationsBus::Events::OnShapeChanged,
         LmbrCentral::ShapeComponentNotifications::ShapeChangeReasons::ShapeChanged);
 
-    m_entity->Deactivate();
+    entity.reset();
 }
diff --git a/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp b/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp
index ec500d6ada..57a4e0ee03 100644
--- a/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp
@@ -17,9 +17,9 @@
 #include <LmbrCentral/Shape/MockShapes.h>
 #include <Terrain/MockTerrainLayerSpawner.h>
 #include <Terrain/MockTerrain.h>
+#include <Tests/Mocks/Terrain/MockTerrainDataRequestBus.h>
 
 using ::testing::_;
-using ::testing::AtLeast;
 using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::Return;
@@ -29,8 +29,6 @@ class TerrainHeightGradientListComponentTest : public ::testing::Test
 protected:
     AZ::ComponentApplication m_app;
 
-    AZStd::unique_ptr<AZ::Entity> m_entity;
-
     void SetUp() override
     {
         AZ::ComponentApplication::Descriptor appDesc;
@@ -46,47 +44,70 @@ protected:
         m_app.Destroy();
     }
 
-    void CreateEntity()
+    AZStd::unique_ptr<AZ::Entity> CreateEntity()
     {
-        m_entity = AZStd::make_unique<AZ::Entity>();
-        ASSERT_TRUE(m_entity);
-
-        // Create the required box component.
-        UnitTest::MockAxisAlignedBoxShapeComponent* boxComponent = m_entity->CreateComponent<UnitTest::MockAxisAlignedBoxShapeComponent>();
-        m_app.RegisterComponentDescriptor(boxComponent->CreateDescriptor());
+        auto entity = AZStd::make_unique<AZ::Entity>();
+        entity->Init();
+        return entity;
+    }
 
+    Terrain::TerrainHeightGradientListComponent* AddHeightGradientListToEntity(AZ::Entity* entity)
+    {
         // Create the TerrainHeightGradientListComponent with an entity in its configuration.
         Terrain::TerrainHeightGradientListConfig config;
-        config.m_gradientEntities.push_back(m_entity->GetId());
+        config.m_gradientEntities.push_back(entity->GetId());
 
-        Terrain::TerrainHeightGradientListComponent* heightGradientListComponent = m_entity->CreateComponent<Terrain::TerrainHeightGradientListComponent>(config);
+        auto heightGradientListComponent = entity->CreateComponent<Terrain::TerrainHeightGradientListComponent>(config);
         m_app.RegisterComponentDescriptor(heightGradientListComponent->CreateDescriptor());
 
-        // Create a MockTerrainLayerSpawnerComponent to provide the required TerrainAreaService.
-        UnitTest::MockTerrainLayerSpawnerComponent* layerSpawner = m_entity->CreateComponent<UnitTest::MockTerrainLayerSpawnerComponent>();
-        m_app.RegisterComponentDescriptor(layerSpawner->CreateDescriptor());
+        return heightGradientListComponent;
+    }
 
-        m_entity->Init();
+    void AddRequiredComponetsToEntity(AZ::Entity* entity)
+    {
+        // Create the required box component.
+        UnitTest::MockAxisAlignedBoxShapeComponent* boxComponent = entity->CreateComponent<UnitTest::MockAxisAlignedBoxShapeComponent>();
+        m_app.RegisterComponentDescriptor(boxComponent->CreateDescriptor());
+
+        // Create a MockTerrainLayerSpawnerComponent to provide the required TerrainAreaService.
+        UnitTest::MockTerrainLayerSpawnerComponent* layerSpawner = entity->CreateComponent<UnitTest::MockTerrainLayerSpawnerComponent>();
+        m_app.RegisterComponentDescriptor(layerSpawner->CreateDescriptor());
     }
 };
 
+TEST_F(TerrainHeightGradientListComponentTest, MissingRequiredComponentsActivateFailure)
+{
+    auto entity = CreateEntity();
+
+    AddHeightGradientListToEntity(entity.get());
+
+    const AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
+    EXPECT_FALSE(sortOutcome.IsSuccess());
+}
+
 TEST_F(TerrainHeightGradientListComponentTest, ActivateEntityActivateSuccess)
 {
     // Check that the entity activates.
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    m_entity->Activate();
-    EXPECT_EQ(m_entity->GetState(), AZ::Entity::State::Active);
+    AddHeightGradientListToEntity(entity.get());
 
-    m_entity.reset();
+    AddRequiredComponetsToEntity(entity.get());
+
+    entity->Activate();
+    EXPECT_EQ(entity->GetState(), AZ::Entity::State::Active);
 }
 
 TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientRefreshesTerrainSystem)
 {
     // Check that the HeightGradientListComponent informs the TerrainSystem when the composition changes.
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    m_entity->Activate();
+    AddHeightGradientListToEntity(entity.get());
+
+    AddRequiredComponetsToEntity(entity.get());
+
+    entity->Activate();
 
     NiceMock<UnitTest::MockTerrainSystemService> terrainSystem;
 
@@ -95,32 +116,34 @@ TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientRefreshesTer
     // and once when the HeightGradientListComponent gets the OnCompositionChanged directly through the DependencyNotificationBus.
     EXPECT_CALL(terrainSystem, RefreshArea(_, _)).Times(2);
 
-    LmbrCentral::DependencyNotificationBus::Event(m_entity->GetId(), &LmbrCentral::DependencyNotificationBus::Events::OnCompositionChanged);
+    LmbrCentral::DependencyNotificationBus::Event(entity->GetId(), &LmbrCentral::DependencyNotificationBus::Events::OnCompositionChanged);
 
     // Stop the EXPECT_CALL check now, as OnCompositionChanged will get called twice again during the reset.
     Mock::VerifyAndClearExpectations(&terrainSystem);
-
-    m_entity.reset();
 }
 
 TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientListReturnsHeights)
 {
     // Check that the HeightGradientListComponent returns expected height values.
-    CreateEntity();
+    auto entity = CreateEntity();
 
-    NiceMock<UnitTest::MockTerrainAreaHeightRequests> heightfieldRequestBus(m_entity->GetId());
+    AddHeightGradientListToEntity(entity.get());
 
-    m_entity->Activate();
+    AddRequiredComponetsToEntity(entity.get());
+
+    NiceMock<UnitTest::MockTerrainAreaHeightRequests> heightfieldRequestBus(entity->GetId());
+
+    entity->Activate();
 
     const float mockGradientValue = 0.25f;
-    NiceMock<UnitTest::MockGradientRequests> gradientRequests(m_entity->GetId());
+    NiceMock<UnitTest::MockGradientRequests> gradientRequests(entity->GetId());
     ON_CALL(gradientRequests, GetValue).WillByDefault(Return(mockGradientValue));
 
     // Setup a mock to provide the encompassing Aabb to the HeightGradientListComponent.
     const float min = 0.0f;
     const float max = 1000.0f;
     const AZ::Aabb aabb = AZ::Aabb::CreateFromMinMax(AZ::Vector3(min), AZ::Vector3(max));
-    NiceMock<UnitTest::MockShapeComponentRequests> mockShapeRequests(m_entity->GetId());
+    NiceMock<UnitTest::MockShapeComponentRequests> mockShapeRequests(entity->GetId());
     ON_CALL(mockShapeRequests, GetEncompassingAabb).WillByDefault(Return(aabb));
 
     const float worldMax = 10000.0f;
@@ -130,17 +153,16 @@ TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientListReturnsH
     ON_CALL(mockterrainDataRequests, GetTerrainAabb).WillByDefault(Return(worldAabb));
 
     // Ensure the cached values in the HeightGradientListComponent are up to date.
-    LmbrCentral::DependencyNotificationBus::Event(m_entity->GetId(), &LmbrCentral::DependencyNotificationBus::Events::OnCompositionChanged);
+    LmbrCentral::DependencyNotificationBus::Event(entity->GetId(), &LmbrCentral::DependencyNotificationBus::Events::OnCompositionChanged);
 
     const AZ::Vector3 inPosition = AZ::Vector3::CreateZero();
     AZ::Vector3 outPosition = AZ::Vector3::CreateZero();
     bool terrainExists = false;
-    Terrain::TerrainAreaHeightRequestBus::Event(m_entity->GetId(), &Terrain::TerrainAreaHeightRequestBus::Events::GetHeight, inPosition, outPosition, terrainExists);
+    Terrain::TerrainAreaHeightRequestBus::Event(
+        entity->GetId(), &Terrain::TerrainAreaHeightRequestBus::Events::GetHeight, inPosition, outPosition, terrainExists);
 
     const float height = outPosition.GetZ();
 
     EXPECT_NEAR(height, mockGradientValue * max, 0.01f);
-
-    m_entity.reset();
 }
 
diff --git a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp
index d1deca897c..8770c1d6dd 100644
--- a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp
@@ -21,7 +21,7 @@
 #include <AzTest/AzTest.h>
 
 #include <MockAxisAlignedBoxShapeComponent.h>
-#include <Terrain/MockTerrain.h>
+#include <Tests/Mocks/Terrain/MockTerrainDataRequestBus.h>
 
 using ::testing::NiceMock;
 using ::testing::AtLeast;
diff --git a/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp b/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp
index dea861bda5..71f5d64fa8 100644
--- a/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp
@@ -11,8 +11,6 @@
 #include <GradientSignal/Ebuses/MockGradientRequestBus.h>
 
 using ::testing::NiceMock;
-using ::testing::AtLeast;
-using ::testing::_;
 using ::testing::Return;
 
 namespace UnitTest
@@ -22,10 +20,6 @@ namespace UnitTest
     protected:
         AZ::ComponentApplication m_app;
 
-        AZStd::unique_ptr<AZ::Entity> m_entity;
-        UnitTest::MockTerrainLayerSpawnerComponent* m_layerSpawnerComponent = nullptr;
-        AZStd::unique_ptr<AZ::Entity> m_gradientEntity1, m_gradientEntity2;
-
         const AZStd::string surfaceTag1 = "testtag1";
         const AZStd::string surfaceTag2 = "testtag2";
 
@@ -37,81 +31,76 @@ namespace UnitTest
             appDesc.m_stackRecordLevels = 20;
 
             m_app.Create(appDesc);
-
-            CreateEntities();
         }
 
         void TearDown() override
         {
-            m_gradientEntity2.reset();
-            m_gradientEntity1.reset();
-            m_entity.reset();
-
             m_app.Destroy();
         }
 
-        void CreateEntities()
+        AZStd::unique_ptr<AZ::Entity> CreateEntity()
         {
-            m_entity = AZStd::make_unique<AZ::Entity>();
-            ASSERT_TRUE(m_entity);
-
-            m_entity->Init();
-
-            m_gradientEntity1 = AZStd::make_unique<AZ::Entity>();
-            ASSERT_TRUE(m_gradientEntity1);
-
-            m_gradientEntity1->Init();
-
-            m_gradientEntity2 = AZStd::make_unique<AZ::Entity>();
-            ASSERT_TRUE(m_gradientEntity2);
-
-            m_gradientEntity2->Init();
+            auto entity = AZStd::make_unique<AZ::Entity>();
+            entity->Init();
+            return entity;
         }
 
-        void AddSurfaceGradientListToEntities()
+        UnitTest::MockTerrainLayerSpawnerComponent* AddRequiredComponentsToEntity(AZ::Entity* entity)
         {
-            m_layerSpawnerComponent = m_entity->CreateComponent<UnitTest::MockTerrainLayerSpawnerComponent>();
-            m_app.RegisterComponentDescriptor(m_layerSpawnerComponent->CreateDescriptor());
+            auto layerSpawnerComponent = entity->CreateComponent<UnitTest::MockTerrainLayerSpawnerComponent>();
+            m_app.RegisterComponentDescriptor(layerSpawnerComponent->CreateDescriptor());
 
-            Terrain::TerrainSurfaceGradientListConfig config;
-
-            Terrain::TerrainSurfaceGradientMapping mapping1;
-            mapping1.m_gradientEntityId = m_gradientEntity1->GetId();
-            mapping1.m_surfaceTag = SurfaceData::SurfaceTag(surfaceTag1);
-            config.m_gradientSurfaceMappings.emplace_back(mapping1);
-
-            Terrain::TerrainSurfaceGradientMapping mapping2;
-            mapping2.m_gradientEntityId = m_gradientEntity2->GetId();
-            mapping2.m_surfaceTag = SurfaceData::SurfaceTag(surfaceTag2);
-            config.m_gradientSurfaceMappings.emplace_back(mapping2);
-
-            Terrain::TerrainSurfaceGradientListComponent* terrainSurfaceGradientListComponent =
-                m_entity->CreateComponent<Terrain::TerrainSurfaceGradientListComponent>(config);
-            m_app.RegisterComponentDescriptor(terrainSurfaceGradientListComponent->CreateDescriptor());
+            return layerSpawnerComponent;
         }
     };
 
+    TEST_F(TerrainSurfaceGradientListTest, SurfaceGradientMissingRequirementsActivateFails)
+    {
+        auto entity = CreateEntity();
+
+        auto terrainSurfaceGradientListComponent = entity->CreateComponent<Terrain::TerrainSurfaceGradientListComponent>();
+        m_app.RegisterComponentDescriptor(terrainSurfaceGradientListComponent->CreateDescriptor());
+
+        const AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
+        EXPECT_FALSE(sortOutcome.IsSuccess());
+    }
+
+    TEST_F(TerrainSurfaceGradientListTest, SurfaceGradientActivateSuccess)
+    {
+        auto entity = CreateEntity();
+
+        AddRequiredComponentsToEntity(entity.get());
+
+        auto terrainSurfaceGradientListComponent = entity->CreateComponent<Terrain::TerrainSurfaceGradientListComponent>();
+        m_app.RegisterComponentDescriptor(terrainSurfaceGradientListComponent->CreateDescriptor());
+
+        entity->Activate();
+
+        EXPECT_EQ(entity->GetState(), AZ::Entity::State::Active);
+    }
+
     TEST_F(TerrainSurfaceGradientListTest, SurfaceGradientReturnsSurfaceWeights)
     {
         // When there is more than one surface/weight defined and added to the component, they should all
         // be returned.  The component isn't required to return them in descending order.
-        AddSurfaceGradientListToEntities();
+        auto entity = CreateEntity();
 
-        m_entity->Activate();
-        m_gradientEntity1->Activate();
-        m_gradientEntity2->Activate();
+        AddRequiredComponentsToEntity(entity.get());
+
+        auto gradientEntity1 = CreateEntity();
+        auto gradientEntity2 = CreateEntity();
 
         const float gradient1Value = 0.3f;
-        NiceMock<UnitTest::MockGradientRequests> mockGradientRequests1(m_gradientEntity1->GetId());
+        NiceMock<UnitTest::MockGradientRequests> mockGradientRequests1(gradientEntity1->GetId());
         ON_CALL(mockGradientRequests1, GetValue).WillByDefault(Return(gradient1Value));
 
         const float gradient2Value = 1.0f;
-        NiceMock<UnitTest::MockGradientRequests> mockGradientRequests2(m_gradientEntity2->GetId());
+        NiceMock<UnitTest::MockGradientRequests> mockGradientRequests2(gradientEntity2->GetId());
         ON_CALL(mockGradientRequests2, GetValue).WillByDefault(Return(gradient2Value));
 
         AzFramework::SurfaceData::SurfaceTagWeightList weightList;
         Terrain::TerrainAreaSurfaceRequestBus::Event(
-            m_entity->GetId(), &Terrain::TerrainAreaSurfaceRequestBus::Events::GetSurfaceWeights, AZ::Vector3::CreateZero(), weightList);
+            entity->GetId(), &Terrain::TerrainAreaSurfaceRequestBus::Events::GetSurfaceWeights, AZ::Vector3::CreateZero(), weightList);
 
         AZ::Crc32 expectedCrcList[] = { AZ::Crc32(surfaceTag1), AZ::Crc32(surfaceTag2) };
         const float expectedWeightList[] = { gradient1Value, gradient2Value };
diff --git a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp
index 4d149e8527..e5434c0a1d 100644
--- a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp
@@ -15,8 +15,9 @@
 #include <Components/TerrainLayerSpawnerComponent.h>
 
 #include <GradientSignal/Ebuses/MockGradientRequestBus.h>
-#include <Terrain/MockTerrain.h>
+#include <Tests/Mocks/Terrain/MockTerrainDataRequestBus.h>
 #include <Terrain/MockTerrainAreaSurfaceRequestBus.h>
+#include <Terrain/MockTerrain.h>
 #include <MockAxisAlignedBoxShapeComponent.h>
 
 using ::testing::AtLeast;
@@ -41,7 +42,6 @@ namespace UnitTest
         };
 
         AZ::ComponentApplication m_app;
-        AZStd::unique_ptr<Terrain::TerrainSystem> m_terrainSystem;
 
         AZStd::unique_ptr<NiceMock<UnitTest::MockBoxShapeComponentRequests>> m_boxShapeRequests;
         AZStd::unique_ptr<NiceMock<UnitTest::MockShapeComponentRequests>> m_shapeRequests;
@@ -59,7 +59,6 @@ namespace UnitTest
 
         void TearDown() override
         {
-            m_terrainSystem.reset();
             m_boxShapeRequests.reset();
             m_shapeRequests.reset();
             m_terrainAreaHeightRequests.reset();
@@ -96,16 +95,17 @@ namespace UnitTest
 
         // Create a terrain system with reasonable defaults for testing, but with the ability to override the defaults
         // on a test-by-test basis.
-        void CreateAndActivateTerrainSystem(
+        AZStd::unique_ptr<Terrain::TerrainSystem> CreateAndActivateTerrainSystem(
             AZ::Vector2 queryResolution = AZ::Vector2(1.0f),
             AZ::Aabb worldBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-128.0f), AZ::Vector3(128.0f)))
         {
             // Create the terrain system and give it one tick to fully initialize itself.
-            m_terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
-            m_terrainSystem->SetTerrainAabb(worldBounds);
-            m_terrainSystem->SetTerrainHeightQueryResolution(queryResolution);
-            m_terrainSystem->Activate();
+            auto terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
+            terrainSystem->SetTerrainAabb(worldBounds);
+            terrainSystem->SetTerrainHeightQueryResolution(queryResolution);
+            terrainSystem->Activate();
             AZ::TickBus::Broadcast(&AZ::TickBus::Events::OnTick, 0.f, AZ::ScriptTimePoint{});
+            return terrainSystem;
         }
 
         AZStd::unique_ptr<AZ::Entity> CreateAndActivateMockTerrainLayerSpawner(
@@ -144,16 +144,16 @@ namespace UnitTest
     {
         // Trivially verify that the terrain system can successfully be constructed and destructed without errors.
 
-        m_terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
+        auto terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
     }
 
     TEST_F(TerrainSystemTest, TrivialActivateDeactivate)
     {
         // Verify that the terrain system can be activated and deactivated without errors.
 
-        m_terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
-        m_terrainSystem->Activate();
-        m_terrainSystem->Deactivate();
+        auto terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
+        terrainSystem->Activate();
+        terrainSystem->Deactivate();
     }
 
     TEST_F(TerrainSystemTest, CreateEventsCalledOnActivation)
@@ -164,8 +164,8 @@ namespace UnitTest
         EXPECT_CALL(mockTerrainListener, OnTerrainDataCreateBegin()).Times(AtLeast(1));
         EXPECT_CALL(mockTerrainListener, OnTerrainDataCreateEnd()).Times(AtLeast(1));
 
-        m_terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
-        m_terrainSystem->Activate();
+        auto terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
+        terrainSystem->Activate();
     }
 
     TEST_F(TerrainSystemTest, DestroyEventsCalledOnDeactivation)
@@ -176,9 +176,9 @@ namespace UnitTest
         EXPECT_CALL(mockTerrainListener, OnTerrainDataDestroyBegin()).Times(AtLeast(1));
         EXPECT_CALL(mockTerrainListener, OnTerrainDataDestroyEnd()).Times(AtLeast(1));
 
-        m_terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
-        m_terrainSystem->Activate();
-        m_terrainSystem->Deactivate();
+        auto terrainSystem = AZStd::make_unique<Terrain::TerrainSystem>();
+        terrainSystem->Activate();
+        terrainSystem->Deactivate();
     }
 
     TEST_F(TerrainSystemTest, TerrainDoesNotExistWhenNoTerrainLayerSpawnersAreRegistered)
@@ -190,9 +190,9 @@ namespace UnitTest
         // a normal facing up the Z axis.
 
         // Create and activate the terrain system with our testing defaults for world bounds and query resolution.
-        CreateAndActivateTerrainSystem();
+        auto terrainSystem = CreateAndActivateTerrainSystem();
 
-        AZ::Aabb worldBounds = m_terrainSystem->GetTerrainAabb();
+        AZ::Aabb worldBounds = terrainSystem->GetTerrainAabb();
 
         // Loop through several points within the world bounds, including on the edges, and verify that they all return false for
         // terrainExists with default heights and normals.
@@ -203,17 +203,17 @@ namespace UnitTest
                 AZ::Vector3 position(x, y, 0.0f);
                 bool terrainExists = true;
                 float height =
-                    m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists);
+                    terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists);
                 EXPECT_FALSE(terrainExists);
                 EXPECT_FLOAT_EQ(height, worldBounds.GetMin().GetZ());
 
                 terrainExists = true;
                 AZ::Vector3 normal =
-                    m_terrainSystem->GetNormal(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists);
+                    terrainSystem->GetNormal(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists);
                 EXPECT_FALSE(terrainExists);
                 EXPECT_EQ(normal, AZ::Vector3::CreateAxisZ());
 
-                bool isHole = m_terrainSystem->GetIsHoleFromFloats(
+                bool isHole = terrainSystem->GetIsHoleFromFloats(
                     position.GetX(), position.GetY(), AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT);
                 EXPECT_TRUE(isHole);
             }
@@ -242,7 +242,7 @@ namespace UnitTest
         // Verify that terrain exists within the layer spawner bounds, and doesn't exist outside of it.
 
         // Create and activate the terrain system with our testing defaults for world bounds and query resolution.
-        CreateAndActivateTerrainSystem();
+        auto terrainSystem = CreateAndActivateTerrainSystem();
 
         // Create a box that's twice as big as the layer spawner box.  Loop through it and verify that points within the layer box contain
         // terrain and the expected height & normal values, and points outside the layer box don't contain terrain.
@@ -255,9 +255,9 @@ namespace UnitTest
             {
                 AZ::Vector3 position(x, y, 0.0f);
                 bool heightQueryTerrainExists = false;
-                float height = m_terrainSystem->GetHeight(
+                float height = terrainSystem->GetHeight(
                     position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists);
-                bool isHole = m_terrainSystem->GetIsHoleFromFloats(
+                bool isHole = terrainSystem->GetIsHoleFromFloats(
                     position.GetX(), position.GetY(), AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT);
 
                 if (spawnerBox.Contains(AZ::Vector3(position.GetX(), position.GetY(), spawnerBox.GetMin().GetZ())))
@@ -297,7 +297,7 @@ namespace UnitTest
         // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution that exactly matches
         // the frequency of our sine wave.  If our height queries rely on the query resolution, we should always get a value of 0.
         const AZ::Vector2 queryResolution(frequencyMeters);
-        CreateAndActivateTerrainSystem(queryResolution);
+        auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution);
 
         // Test an arbitrary set of points that should all produce non-zero heights with the EXACT sampler.  They're not aligned with the
         // query resolution, or with the 0 points on the sine wave.
@@ -307,7 +307,7 @@ namespace UnitTest
             AZ::Vector3 position(nonZeroPoint.GetX(), nonZeroPoint.GetY(), 0.0f);
             bool heightQueryTerrainExists = false;
             float height =
-                m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists);
+                terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists);
 
             // We've chosen a bunch of places on the sine wave that should return a non-zero positive or negative value.
             constexpr float epsilon = 0.0001f;
@@ -322,7 +322,7 @@ namespace UnitTest
             AZ::Vector3 position(zeroPoint.GetX(), zeroPoint.GetY(), 0.0f);
             bool heightQueryTerrainExists = false;
             float height =
-                m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists);
+                terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists);
 
             constexpr float epsilon = 0.0001f;
             EXPECT_NEAR(height, 0.0f, epsilon);
@@ -348,7 +348,7 @@ namespace UnitTest
         // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 0.25 meter
         // intervals.
         const AZ::Vector2 queryResolution(0.25f);
-        CreateAndActivateTerrainSystem(queryResolution);
+        auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution);
 
         // Test some points and verify that the results always go "downward", whether they're in positive or negative space.
         // (Z contains the the expected result for convenience).
@@ -371,7 +371,7 @@ namespace UnitTest
             AZ::Vector3 position(testPoint.m_testLocation.GetX(), testPoint.m_testLocation.GetY(), 0.0f);
             bool heightQueryTerrainExists = false;
             float height =
-                m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP, &heightQueryTerrainExists);
+                terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP, &heightQueryTerrainExists);
 
             constexpr float epsilon = 0.0001f;
             EXPECT_NEAR(height, expectedHeight, epsilon);
@@ -410,7 +410,7 @@ namespace UnitTest
 
         // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 1 meter intervals.
         const AZ::Vector2 queryResolution(frequencyMeters);
-        CreateAndActivateTerrainSystem(queryResolution);
+        auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution);
 
         // Test some points and verify that the results are the expected bilinear filtered result,
         // whether they're in positive or negative space.
@@ -466,7 +466,7 @@ namespace UnitTest
 
             AZ::Vector3 position(testPoint.m_testLocation.GetX(), testPoint.m_testLocation.GetY(), 0.0f);
             bool heightQueryTerrainExists = false;
-            float height = m_terrainSystem->GetHeight(
+            float height = terrainSystem->GetHeight(
                 position, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, &heightQueryTerrainExists);
 
             // Verify that our height query returned the bilinear filtered result we expect.
@@ -479,7 +479,7 @@ namespace UnitTest
     {
         // When there is more than one surface/weight defined, they should all be returned in descending weight order.
 
-        CreateAndActivateTerrainSystem();
+        auto terrainSystem = CreateAndActivateTerrainSystem();
 
         const AZ::Aabb aabb = AZ::Aabb::CreateFromMinMax(AZ::Vector3::CreateZero(), AZ::Vector3::CreateOne());
         auto entity = CreateAndActivateMockTerrainLayerSpawner(
@@ -508,11 +508,11 @@ namespace UnitTest
         AzFramework::SurfaceData::SurfaceTagWeightList outSurfaceWeights;
 
         // Asking for values outside the layer spawner bounds, should result in no results.
-        m_terrainSystem->GetSurfaceWeights(aabb.GetMax() + AZ::Vector3::CreateOne(), outSurfaceWeights);
+        terrainSystem->GetSurfaceWeights(aabb.GetMax() + AZ::Vector3::CreateOne(), outSurfaceWeights);
         EXPECT_TRUE(outSurfaceWeights.empty());
 
         // Inside the layer spawner box should give us all of the added surface weights.
-        m_terrainSystem->GetSurfaceWeights(aabb.GetCenter(), outSurfaceWeights);
+        terrainSystem->GetSurfaceWeights(aabb.GetCenter(), outSurfaceWeights);
 
         EXPECT_EQ(outSurfaceWeights.size(), 3);
 
@@ -531,7 +531,7 @@ namespace UnitTest
 
     TEST_F(TerrainSystemTest, GetMaxSurfaceWeightsReturnsBiggestValidSurfaceWeight)
     {
-        CreateAndActivateTerrainSystem();
+        auto terrainSystem = CreateAndActivateTerrainSystem();
 
         const AZ::Aabb aabb = AZ::Aabb::CreateFromMinMax(AZ::Vector3::CreateZero(), AZ::Vector3::CreateOne());
         auto entity = CreateAndActivateMockTerrainLayerSpawner(
@@ -562,12 +562,12 @@ namespace UnitTest
 
         // Asking for values outside the layer spawner bounds, should result in an invalid result.
         AzFramework::SurfaceData::SurfaceTagWeight tagWeight =
-            m_terrainSystem->GetMaxSurfaceWeight(aabb.GetMax() + AZ::Vector3::CreateOne());
+            terrainSystem->GetMaxSurfaceWeight(aabb.GetMax() + AZ::Vector3::CreateOne());
 
         EXPECT_EQ(tagWeight.m_surfaceType, AZ::Crc32(AzFramework::SurfaceData::Constants::s_unassignedTagName));
 
         // Inside the layer spawner box should give us the highest weighted tag (tag1).
-        tagWeight = m_terrainSystem->GetMaxSurfaceWeight(aabb.GetCenter());
+        tagWeight = terrainSystem->GetMaxSurfaceWeight(aabb.GetCenter());
 
         EXPECT_EQ(tagWeight.m_surfaceType, tagWeight1.m_surfaceType);
         EXPECT_NEAR(tagWeight.m_weight, tagWeight1.m_weight, 0.01f);
diff --git a/Gems/Terrain/Code/terrain_mocks_files.cmake b/Gems/Terrain/Code/terrain_mocks_files.cmake
index 874e17f028..4a70c8cce1 100644
--- a/Gems/Terrain/Code/terrain_mocks_files.cmake
+++ b/Gems/Terrain/Code/terrain_mocks_files.cmake
@@ -7,7 +7,7 @@
 #
 
 set(FILES
-    Mocks/Terrain/MockTerrain.h
     Mocks/Terrain/MockTerrainLayerSpawner.h
     Mocks/Terrain/MockTerrainAreaSurfaceRequestBus.h
+    Mocks/Terrain/MockTerrain.h
 )
diff --git a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp
index 77890bf32b..73c13f4fea 100644
--- a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp
+++ b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp
@@ -51,8 +51,6 @@ namespace Twitch
 
     void TwitchSystemComponent::SetApplicationID(const AZStd::string& twitchApplicationID)
     {
-        bool success = false;
-
         /*
         ** THIS CAN ONLY BE SET ONCE!!!!!!
         */
@@ -62,7 +60,6 @@ namespace Twitch
             if (IsValidTwitchAppID(twitchApplicationID))
             {
                 m_applicationID = twitchApplicationID;
-                success = true;
             }
             else
             {
diff --git a/Gems/UiBasics/Assets/UI/Slices/Library/Button.slice b/Gems/UiBasics/Assets/UI/Slices/Library/Button.slice
index 276d181ad6..020db8367a 100644
--- a/Gems/UiBasics/Assets/UI/Slices/Library/Button.slice
+++ b/Gems/UiBasics/Assets/UI/Slices/Library/Button.slice
@@ -112,7 +112,7 @@
 																</Class>
 																<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 																	<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-																		<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+																		<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/button_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 																	</Class>
 																</Class>
 																<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -158,7 +158,7 @@
 										<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
 											<Class name="AddressType" field="value1" value="AZStd::vector({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17165417810190062216·2/AZStd::vector({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiImageComponent({BDBEFD23-DBB4-4726-A32D-4FEAC24E51F6})#17217584308910145132·7/AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;({68E92460-5C0C-4031-9620-6F1A08763243})::SpritePath·1/SimpleAssetReferenceBase({E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8})::BaseClass1·1/AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::AssetPath·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="ui/textures/prefab/button_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+												<Class name="AZStd::string" field="m_data" value="ui/textures/prefab/button_normal.tif.streamingimage" 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/Slices/Library/Checkbox.slice b/Gems/UiBasics/Assets/UI/Slices/Library/Checkbox.slice
index 9334903463..74e7bb1c2b 100644
--- a/Gems/UiBasics/Assets/UI/Slices/Library/Checkbox.slice
+++ b/Gems/UiBasics/Assets/UI/Slices/Library/Checkbox.slice
@@ -30,7 +30,7 @@
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_hover.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_hover.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 												</Class>
 											</Class>
 											<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -55,7 +55,7 @@
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_hover.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_hover.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 												</Class>
 											</Class>
 											<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -74,7 +74,7 @@
 											</Class>
 											<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="Sprite" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 												<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_disabled.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+													<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_disabled.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 												</Class>
 											</Class>
 											<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -234,7 +234,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_box_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -311,7 +311,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Slices/Library/Dropdown.slice b/Gems/UiBasics/Assets/UI/Slices/Library/Dropdown.slice
index e73c53e0d5..4185e80332 100644
--- a/Gems/UiBasics/Assets/UI/Slices/Library/Dropdown.slice
+++ b/Gems/UiBasics/Assets/UI/Slices/Library/Dropdown.slice
@@ -231,7 +231,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -383,7 +383,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -1218,7 +1218,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="textures/basic/checkbox_check.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Slices/Library/Textinput.slice b/Gems/UiBasics/Assets/UI/Slices/Library/Textinput.slice
index cb9eaeb213..f57d307543 100644
--- a/Gems/UiBasics/Assets/UI/Slices/Library/Textinput.slice
+++ b/Gems/UiBasics/Assets/UI/Slices/Library/Textinput.slice
@@ -75,7 +75,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/textinput_normal.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/textinput_normal.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -233,7 +233,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/textinput_hover.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/textinput_hover.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Slices/Library/TooltipDisplay.slice b/Gems/UiBasics/Assets/UI/Slices/Library/TooltipDisplay.slice
index e92f722837..5c9aa5cbf2 100644
--- a/Gems/UiBasics/Assets/UI/Slices/Library/TooltipDisplay.slice
+++ b/Gems/UiBasics/Assets/UI/Slices/Library/TooltipDisplay.slice
@@ -79,7 +79,7 @@
 								<Class name="int" field="SpriteType" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
 								<Class name="AzFramework::SimpleAssetReference&lt;LmbrCentral::TextureAsset&gt;" field="SpritePath" version="1" type="{68E92460-5C0C-4031-9620-6F1A08763243}">
 									<Class name="SimpleAssetReferenceBase" field="BaseClass1" version="1" type="{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}">
-										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/tooltip_sliced.dds" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+										<Class name="AZStd::string" field="AssetPath" value="ui/textures/prefab/tooltip_sliced.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 									</Class>
 								</Class>
 								<Class name="unsigned int" field="Index" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Vegetation/Code/CMakeLists.txt b/Gems/Vegetation/Code/CMakeLists.txt
index 735bb35bd9..53fa6bd59f 100644
--- a/Gems/Vegetation/Code/CMakeLists.txt
+++ b/Gems/Vegetation/Code/CMakeLists.txt
@@ -103,6 +103,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzTest
                 AZ::AzFrameworkTestShared
                 Gem::Vegetation.Static
+                Gem::LmbrCentral.Mocks
     )
     ly_add_googletest(
         NAME Gem::Vegetation.Tests
diff --git a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h
index 0c9db4811c..b79bae92a0 100644
--- a/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h
+++ b/Gems/Vegetation/Code/Include/Vegetation/Editor/EditorVegetationComponentTypeIds.h
@@ -35,7 +35,4 @@ namespace Vegetation
 
     // Vegetation Area Selectors
     static const char* EditorDescriptorWeightSelectorComponentTypeId = "{0FB90550-149B-4E05-B22C-2753F6526E97}";
-
-    // Vegetation Reference Shape
-    static const char* EditorReferenceShapeComponentTypeId = "{21BC79CA-C2F4-428F-AF2E-B76E233D4254}";
 }
diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
index 6684aef913..e497fcec12 100644
--- a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
@@ -356,7 +356,6 @@ namespace Vegetation
         AreaSystemRequestBus::Handler::BusConnect();
         GradientSignal::SectorDataRequestBus::Handler::BusConnect();
         SystemConfigurationRequestBus::Handler::BusConnect();
-        InstanceStatObjEventBus::Handler::BusConnect();
         CrySystemEventBus::Handler::BusConnect();
         AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
         SurfaceData::SurfaceDataSystemNotificationBus::Handler::BusConnect();
@@ -378,7 +377,6 @@ namespace Vegetation
         AreaSystemRequestBus::Handler::BusDisconnect();
         GradientSignal::SectorDataRequestBus::Handler::BusDisconnect();
         SystemConfigurationRequestBus::Handler::BusDisconnect();
-        InstanceStatObjEventBus::Handler::BusDisconnect();
         CrySystemEventBus::Handler::BusDisconnect();
         AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect();
         SurfaceData::SurfaceDataSystemNotificationBus::Handler::BusDisconnect();
diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.h b/Gems/Vegetation/Code/Source/AreaSystemComponent.h
index 703a44c70a..c45bdac887 100644
--- a/Gems/Vegetation/Code/Source/AreaSystemComponent.h
+++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.h
@@ -18,7 +18,6 @@
 #include <GradientSignal/Ebuses/SectorDataRequestBus.h>
 #include <SurfaceData/SurfaceDataSystemNotificationBus.h>
 #include <CrySystemBus.h>
-#include <StatObjBus.h>
 #include <ISystem.h>
 #include <AzFramework/Terrain/TerrainDataRequestBus.h>
 
@@ -81,7 +80,6 @@ namespace Vegetation
         , private AreaSystemRequestBus::Handler
         , private GradientSignal::SectorDataRequestBus::Handler
         , private SystemConfigurationRequestBus::Handler
-        , private InstanceStatObjEventBus::Handler
         , private CrySystemEventBus::Handler
         , private ISystemEventListener
         , private SurfaceData::SurfaceDataSystemNotificationBus::Handler
@@ -138,9 +136,6 @@ namespace Vegetation
         // SurfaceData::SurfaceDataSystemNotificationBus
         void OnSurfaceChanged(const AZ::EntityId& entityId, const AZ::Aabb& oldBounds, const AZ::Aabb& newBounds) override;
 
-        //////////////////////////////////////////////////////////////////////////
-        // InstanceStatObjEventBus
-        void ReleaseData() override;
 
         ////////////////////////////////////////////////////////////////////////////
         // CrySystemEvents
@@ -460,6 +455,7 @@ namespace Vegetation
 
         bool ApplyPendingConfigChanges();
 
+        void ReleaseData();
         void ReleaseAllClaims();
         void ReleaseWithoutCleanup();
 
diff --git a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
index dd38daa633..85ba4bda61 100644
--- a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
@@ -15,9 +15,6 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-#include <LmbrCentral/Rendering/MaterialAsset.h>
-#include <LmbrCentral/Rendering/MeshAsset.h>
-
 #include <Vegetation/Ebuses/AreaInfoBus.h>
 #include <Vegetation/Ebuses/AreaSystemRequestBus.h>
 #include <Vegetation/Ebuses/DebugNotificationBus.h>
diff --git a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
index 3210df644f..8d4e1d0558 100644
--- a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
@@ -18,7 +18,6 @@
 #include <Editor/EditorLevelSettingsComponent.h>
 #include <Editor/EditorMeshBlockerComponent.h>
 #include <Editor/EditorPositionModifierComponent.h>
-#include <Editor/EditorReferenceShapeComponent.h>
 #include <Editor/EditorRotationModifierComponent.h>
 #include <Editor/EditorScaleModifierComponent.h>
 #include <Editor/EditorShapeIntersectionFilterComponent.h>
@@ -50,7 +49,6 @@ namespace Vegetation
             EditorLevelSettingsComponent::CreateDescriptor(),
             EditorMeshBlockerComponent::CreateDescriptor(),
             EditorPositionModifierComponent::CreateDescriptor(),
-            EditorReferenceShapeComponent::CreateDescriptor(),
             EditorRotationModifierComponent::CreateDescriptor(),
             EditorScaleModifierComponent::CreateDescriptor(),
             EditorShapeIntersectionFilterComponent::CreateDescriptor(),
diff --git a/Gems/Vegetation/Code/Source/VegetationModule.cpp b/Gems/Vegetation/Code/Source/VegetationModule.cpp
index b103575ed1..747617d033 100644
--- a/Gems/Vegetation/Code/Source/VegetationModule.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationModule.cpp
@@ -18,7 +18,6 @@
 #include <Components/LevelSettingsComponent.h>
 #include <Components/MeshBlockerComponent.h>
 #include <Components/PositionModifierComponent.h>
-#include <Components/ReferenceShapeComponent.h>
 #include <Components/RotationModifierComponent.h>
 #include <Components/ScaleModifierComponent.h>
 #include <Components/ShapeIntersectionFilterComponent.h>
@@ -52,7 +51,6 @@ namespace Vegetation
             LevelSettingsComponent::CreateDescriptor(),
             MeshBlockerComponent::CreateDescriptor(),
             PositionModifierComponent::CreateDescriptor(),
-            ReferenceShapeComponent::CreateDescriptor(),
             RotationModifierComponent::CreateDescriptor(),
             ScaleModifierComponent::CreateDescriptor(),
             ShapeIntersectionFilterComponent::CreateDescriptor(),
diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
index abb76c8c2d..221a2da432 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
@@ -8,6 +8,8 @@
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
+#include <LmbrCentral/Shape/MockShapes.h>
+
 #include <AzTest/AzTest.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/Component/Entity.h>
diff --git a/Gems/Vegetation/Code/Tests/VegetationMocks.h b/Gems/Vegetation/Code/Tests/VegetationMocks.h
index ec3760057c..ece0833433 100644
--- a/Gems/Vegetation/Code/Tests/VegetationMocks.h
+++ b/Gems/Vegetation/Code/Tests/VegetationMocks.h
@@ -31,7 +31,6 @@
 #include <Source/InstanceSystemComponent.h>
 #include <ISerialize.h>
 #include <IIndexedMesh.h>
-#include <IStatObj.h>
 
 //////////////////////////////////////////////////////////////////////////
 // mock event bus classes for testing vegetation
@@ -313,74 +312,6 @@ namespace UnitTest
         }
     };
 
-    class MockShape
-        : public LmbrCentral::ShapeComponentRequestsBus::Handler
-    {
-    public:
-        AZ::Entity m_entity;
-        mutable int m_count = 0;
-
-        MockShape()
-        {
-            LmbrCentral::ShapeComponentRequestsBus::Handler::BusConnect(m_entity.GetId());
-        }
-
-        ~MockShape()
-        {
-            LmbrCentral::ShapeComponentRequestsBus::Handler::BusDisconnect();
-        }
-
-        AZ::Crc32 GetShapeType() override
-        {
-            ++m_count;
-            return AZ_CRC("TestShape", 0x856ca50c);
-        }
-
-        AZ::Aabb m_aabb = AZ::Aabb::CreateNull();
-        AZ::Aabb GetEncompassingAabb() override
-        {
-            ++m_count;
-            return m_aabb;
-        }
-
-        AZ::Transform m_localTransform = AZ::Transform::CreateIdentity();
-        AZ::Aabb m_localBounds = AZ::Aabb::CreateNull();
-        void GetTransformAndLocalBounds(AZ::Transform& transform, AZ::Aabb& bounds) override
-        {
-            ++m_count;
-            transform = m_localTransform;
-            bounds = m_localBounds;
-        }
-
-        bool m_pointInside = true;
-        bool IsPointInside([[maybe_unused]] const AZ::Vector3& point) override
-        {
-            ++m_count;
-            return m_pointInside;
-        }
-
-        float m_distanceSquaredFromPoint = 0.0f;
-        float DistanceSquaredFromPoint([[maybe_unused]] const AZ::Vector3& point) override
-        {
-            ++m_count;
-            return m_distanceSquaredFromPoint;
-        }
-
-        AZ::Vector3 m_randomPointInside = AZ::Vector3::CreateZero();
-        AZ::Vector3 GenerateRandomPointInside([[maybe_unused]] AZ::RandomDistributionType randomDistribution) override
-        {
-            ++m_count;
-            return m_randomPointInside;
-        }
-
-        bool m_intersectRay = false;
-        bool IntersectRay([[maybe_unused]] const AZ::Vector3& src, [[maybe_unused]] const AZ::Vector3& dir, [[maybe_unused]] float& distance) override
-        {
-            ++m_count;
-            return m_intersectRay;
-        }
-    };
-
     struct MockSurfaceHandler
         : public SurfaceData::SurfaceDataSystemRequestBus::Handler
     {
diff --git a/Gems/Vegetation/Code/Tests/VegetationTest.cpp b/Gems/Vegetation/Code/Tests/VegetationTest.cpp
index 774a9fcd00..033e988c9b 100644
--- a/Gems/Vegetation/Code/Tests/VegetationTest.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationTest.cpp
@@ -27,7 +27,6 @@
 #include <Source/Components/LevelSettingsComponent.h>
 #include <Source/Components/MeshBlockerComponent.h>
 #include <Source/Components/PositionModifierComponent.h>
-#include <Source/Components/ReferenceShapeComponent.h>
 #include <Source/Components/RotationModifierComponent.h>
 #include <Source/Components/ScaleModifierComponent.h>
 #include <Source/Components/ShapeIntersectionFilterComponent.h>
@@ -190,8 +189,6 @@ namespace UnitTest
         EXPECT_FALSE((AreComponentsCompatible<Vegetation::RotationModifierComponent, Vegetation::RotationModifierComponent>()));
         EXPECT_FALSE((AreComponentsCompatible<Vegetation::ScaleModifierComponent, Vegetation::ScaleModifierComponent>()));
 
-        EXPECT_FALSE((AreComponentsCompatible<Vegetation::ReferenceShapeComponent, Vegetation::ReferenceShapeComponent>()));
-
         EXPECT_FALSE((AreComponentsCompatible<Vegetation::DescriptorListComponent, Vegetation::DescriptorListComponent>()));
         EXPECT_FALSE((AreComponentsCompatible<Vegetation::DescriptorListComponent, Vegetation::DescriptorListCombinerComponent>()));
 
@@ -231,7 +228,6 @@ namespace UnitTest
         CreateWith<Vegetation::LevelSettingsComponent, MockVegetationAreaServiceComponent>();
         CreateWith<Vegetation::MeshBlockerComponent, MockMeshServiceComponent>();
         CreateWith<Vegetation::PositionModifierComponent, MockVegetationAreaServiceComponent>();
-        CreateWith<Vegetation::ReferenceShapeComponent, MockVegetationAreaServiceComponent>();
         CreateWith<Vegetation::RotationModifierComponent, MockVegetationAreaServiceComponent>();
         CreateWith<Vegetation::ScaleModifierComponent, MockVegetationAreaServiceComponent>();
         CreateWith<Vegetation::ShapeIntersectionFilterComponent, MockVegetationAreaServiceComponent>();
@@ -287,94 +283,6 @@ namespace UnitTest
         EXPECT_EQ(defaultProcessTime, instConfig->m_maxInstanceProcessTimeMicroseconds);
     }
 
-    TEST_F(VegetationComponentTestsBasics, ReferenceShapeComponent_WithValidReference)
-    {
-        UnitTest::MockShape testShape;
-
-        Vegetation::ReferenceShapeConfig config;
-        config.m_shapeEntityId = testShape.m_entity.GetId();
-
-        Vegetation::ReferenceShapeComponent* component;
-        auto entity = CreateEntity(config, &component);
-
-        AZ::RandomDistributionType randomDistribution = AZ::RandomDistributionType::Normal;
-        AZ::Vector3 randPos = AZ::Vector3::CreateOne();
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(randPos, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GenerateRandomPointInside, randomDistribution);
-        EXPECT_EQ(AZ::Vector3::CreateZero(), randPos);
-
-        testShape.m_aabb = AZ::Aabb::CreateFromPoint(AZ::Vector3(1.0f, 21.0f, 31.0f));
-        AZ::Aabb resultAABB;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultAABB, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetEncompassingAabb);
-        EXPECT_EQ(testShape.m_aabb, resultAABB);
-
-        AZ::Crc32 resultCRC = {};
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultCRC, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetShapeType);
-        EXPECT_EQ(AZ_CRC("TestShape", 0x856ca50c), resultCRC);
-
-        testShape.m_localBounds = AZ::Aabb::CreateFromPoint(AZ::Vector3(1.0f, 21.0f, 31.0f));
-        testShape.m_localTransform = AZ::Transform::CreateTranslation(testShape.m_localBounds.GetCenter());
-        AZ::Transform resultTransform = AZ::Transform::CreateIdentity();
-        AZ::Aabb resultBounds = AZ::Aabb::CreateNull();
-        LmbrCentral::ShapeComponentRequestsBus::Event(entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetTransformAndLocalBounds, resultTransform, resultBounds);
-        EXPECT_EQ(testShape.m_localTransform, resultTransform);
-        EXPECT_EQ(testShape.m_localBounds, resultBounds);
-
-        testShape.m_pointInside = true;
-        bool resultPointInside = false;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultPointInside, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IsPointInside, AZ::Vector3::CreateZero());
-        EXPECT_EQ(testShape.m_pointInside, resultPointInside);
-
-        testShape.m_distanceSquaredFromPoint = 456.0f;
-        float resultdistanceSquaredFromPoint = 0;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultdistanceSquaredFromPoint, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::DistanceSquaredFromPoint, AZ::Vector3::CreateZero());
-        EXPECT_EQ(testShape.m_distanceSquaredFromPoint, resultdistanceSquaredFromPoint);
-
-        testShape.m_intersectRay = false;
-        bool resultIntersectRay = false;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultIntersectRay, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IntersectRay, AZ::Vector3::CreateZero(), AZ::Vector3::CreateZero(), 0.0f);
-        EXPECT_TRUE(testShape.m_intersectRay == resultIntersectRay);
-    }
-
-    TEST_F(VegetationComponentTestsBasics, ReferenceShapeComponent_WithInvalidReference)
-    {
-        Vegetation::ReferenceShapeConfig config;
-        config.m_shapeEntityId = AZ::EntityId();
-
-        Vegetation::ReferenceShapeComponent* component;
-        auto entity = CreateEntity(config, &component);
-
-        AZ::RandomDistributionType randomDistribution = AZ::RandomDistributionType::Normal;
-        AZ::Vector3 randPos = AZ::Vector3::CreateOne();
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(randPos, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GenerateRandomPointInside, randomDistribution);
-        EXPECT_EQ(randPos, AZ::Vector3::CreateZero());
-
-        AZ::Aabb resultAABB;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultAABB, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetEncompassingAabb);
-        EXPECT_EQ(resultAABB, AZ::Aabb::CreateNull());
-
-        AZ::Crc32 resultCRC;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultCRC, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetShapeType);
-        EXPECT_EQ(resultCRC, AZ::Crc32(AZ::u32(0)));
-
-        AZ::Transform resultTransform;
-        AZ::Aabb resultBounds;
-        LmbrCentral::ShapeComponentRequestsBus::Event(entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::GetTransformAndLocalBounds, resultTransform, resultBounds);
-        EXPECT_EQ(resultTransform, AZ::Transform::CreateIdentity());
-        EXPECT_EQ(resultBounds, AZ::Aabb::CreateNull());
-
-        bool resultPointInside = true;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultPointInside, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IsPointInside, AZ::Vector3::CreateZero());
-        EXPECT_EQ(resultPointInside, false);
-
-        float resultdistanceSquaredFromPoint = 0;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultdistanceSquaredFromPoint, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::DistanceSquaredFromPoint, AZ::Vector3::CreateZero());
-        EXPECT_EQ(resultdistanceSquaredFromPoint, FLT_MAX);
-
-        bool resultIntersectRay = true;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(resultIntersectRay, entity->GetId(), &LmbrCentral::ShapeComponentRequestsBus::Events::IntersectRay, AZ::Vector3::CreateZero(), AZ::Vector3::CreateZero(), 0.0f);
-        EXPECT_EQ(resultIntersectRay, false);
-    }
-
     TEST_F(VegetationComponentTestsBasics, Components_HaveMinMaxRanges)
     {
         ValidateHasMinMaxRanges<Vegetation::AreaSystemConfig>();
diff --git a/Gems/Vegetation/Code/vegetation_editor_files.cmake b/Gems/Vegetation/Code/vegetation_editor_files.cmake
index aa6b399db9..9e4ea2ca78 100644
--- a/Gems/Vegetation/Code/vegetation_editor_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_editor_files.cmake
@@ -36,8 +36,6 @@ set(FILES
     Source/Editor/EditorMeshBlockerComponent.h
     Source/Editor/EditorPositionModifierComponent.cpp
     Source/Editor/EditorPositionModifierComponent.h
-    Source/Editor/EditorReferenceShapeComponent.cpp
-    Source/Editor/EditorReferenceShapeComponent.h
     Source/Editor/EditorRotationModifierComponent.cpp
     Source/Editor/EditorRotationModifierComponent.h
     Source/Editor/EditorScaleModifierComponent.cpp
diff --git a/Gems/Vegetation/Code/vegetation_files.cmake b/Gems/Vegetation/Code/vegetation_files.cmake
index 64048b5d91..b4d4e3a356 100644
--- a/Gems/Vegetation/Code/vegetation_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_files.cmake
@@ -46,7 +46,6 @@ set(FILES
     Include/Vegetation/Ebuses/AreaBlenderRequestBus.h
     Include/Vegetation/Ebuses/BlockerRequestBus.h
     Include/Vegetation/Ebuses/DescriptorListCombinerRequestBus.h
-    Include/Vegetation/Ebuses/ReferenceShapeRequestBus.h
     Include/Vegetation/Ebuses/MeshBlockerRequestBus.h
     Include/Vegetation/Ebuses/SpawnerRequestBus.h
     Include/Vegetation/Ebuses/DescriptorListRequestBus.h
@@ -71,8 +70,6 @@ set(FILES
     Source/Components/MeshBlockerComponent.h
     Source/Components/PositionModifierComponent.cpp
     Source/Components/PositionModifierComponent.h
-    Source/Components/ReferenceShapeComponent.cpp
-    Source/Components/ReferenceShapeComponent.h
     Source/Components/RotationModifierComponent.cpp
     Source/Components/RotationModifierComponent.h
     Source/Components/ScaleModifierComponent.cpp
diff --git a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
index c22be6f072..c245f60fed 100644
--- a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
@@ -180,11 +180,11 @@ namespace WhiteBox
         // fill vertex position array
         size_t index = 0;
         const auto faceHandles = Api::MeshFaceHandles(whiteBox);
-        for (const auto faceHandle : faceHandles)
+        for (const auto& faceHandle : faceHandles)
         {
             const auto faceHalfedgeHandles = Api::FaceHalfedgeHandles(whiteBox, faceHandle);
 
-            for (const auto halfEdgeHandle : faceHalfedgeHandles)
+            for (const auto& halfEdgeHandle : faceHalfedgeHandles)
             {
                 const auto vh = Api::HalfedgeVertexHandleAtTip(whiteBox, halfEdgeHandle);
                 vertices[index] = Api::VertexPosition(whiteBox, vh);
diff --git a/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp b/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
index afba511603..8d5078dacd 100644
--- a/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
+++ b/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
@@ -426,10 +426,6 @@ namespace WhiteBox
         Mesh::TexCoord2D(0.0f, 0.0f),
     };
 
-    // indices related to halfedges - start iterating on first halfedge, pointing to
-    // vertex 0, then follow next to get vertex 2 and then 3 (anti-clockwise winding)
-    const int g_indices[] = {0, 1, 2, 0, 2, 3};
-
     // conversion functions between OpenMesh and AZ types
 
     // convert WhiteBox face handle to OpenMesh face handle
@@ -600,7 +596,7 @@ namespace WhiteBox
 
             VertexHandles vertexHandles;
             vertexHandles.reserve(whiteBox.mesh.n_vertices());
-            for (const auto vertexHandle : whiteBox.mesh.vertices())
+            for (const auto& vertexHandle : whiteBox.mesh.vertices())
             {
                 vertexHandles.push_back(wb_vh(vertexHandle));
             }
@@ -614,7 +610,7 @@ namespace WhiteBox
 
             FaceHandles faceHandles;
             faceHandles.reserve(whiteBox.mesh.n_faces());
-            for (const auto faceHandle : whiteBox.mesh.faces())
+            for (const auto& faceHandle : whiteBox.mesh.faces())
             {
                 faceHandles.push_back(wb_fh(faceHandle));
             }
@@ -660,7 +656,7 @@ namespace WhiteBox
                 EdgeHandles orderedEdgeHandles;
                 orderedEdgeHandles.reserve(halfedgeHandles.size());
 
-                for (const auto halfedgeHandle : halfedgeHandles)
+                for (const auto& halfedgeHandle : halfedgeHandles)
                 {
                     orderedEdgeHandles.push_back(HalfedgeEdgeHandle(whiteBox, halfedgeHandle));
                 }
@@ -712,7 +708,7 @@ namespace WhiteBox
 
             EdgeHandles edgeHandles;
             edgeHandles.reserve(whiteBox.mesh.n_edges());
-            for (const auto edgeHandle : whiteBox.mesh.edges())
+            for (const auto& edgeHandle : whiteBox.mesh.edges())
             {
                 edgeHandles.push_back(wb_eh(edgeHandle));
             }
@@ -771,7 +767,7 @@ namespace WhiteBox
             EdgeHandles edgeHandles;
             edgeHandles.reserve(3);
 
-            for (const auto halfedgeHandle : FaceHalfedgeHandles(whiteBox, faceHandle))
+            for (const auto& halfedgeHandle : FaceHalfedgeHandles(whiteBox, faceHandle))
             {
                 edgeHandles.push_back(HalfedgeEdgeHandle(whiteBox, halfedgeHandle));
             }
@@ -789,7 +785,7 @@ namespace WhiteBox
             VertexHandles vertexHandles;
             vertexHandles.reserve(3);
 
-            for (const auto halfedgeHandle : FaceHalfedgeHandles(whiteBox, faceHandle))
+            for (const auto& halfedgeHandle : FaceHalfedgeHandles(whiteBox, faceHandle))
             {
                 vertexHandles.emplace_back(HalfedgeVertexHandleAtTip(whiteBox, halfedgeHandle));
             }
@@ -809,7 +805,7 @@ namespace WhiteBox
             AZStd::vector<AZ::Vector3> triangles;
             triangles.reserve(faceHandles.size() * 3);
 
-            for (const auto faceHandle : faceHandles)
+            for (const auto& faceHandle : faceHandles)
             {
                 const auto corners = FaceVertexPositions(whiteBox, faceHandle);
                 triangles.insert(triangles.end(), corners.begin(), corners.end());
@@ -953,7 +949,7 @@ namespace WhiteBox
                 // all halfedges for a given face
                 const auto halfedges = FaceHalfedgeHandles(whiteBox, faceHandle);
 
-                for (const HalfedgeHandle halfedgeHandle : halfedges)
+                for (const HalfedgeHandle& halfedgeHandle : halfedges)
                 {
                     const FaceHandle oppositeFaceHandle = OppositeFaceHandle(whiteBox, halfedgeHandle);
 
@@ -983,15 +979,15 @@ namespace WhiteBox
 
             // build all possible halfedge handles
             HalfedgeHandles halfedgeHandles;
-            for (const auto faceHandle : faceHandles)
+            for (const auto& faceHandle : faceHandles)
             {
                 // find all vertices for a given face
                 const auto vertexHandles = FaceVertexHandles(whiteBox, faceHandle);
-                for (const auto vertexHandle : vertexHandles)
+                for (const auto& vertexHandle : vertexHandles)
                 {
                     // find all outgoing halfedges from vertex
                     const auto outgoingHalfedgeHandles = VertexOutgoingHalfedgeHandles(whiteBox, vertexHandle);
-                    for (const auto halfedgeHandle : outgoingHalfedgeHandles)
+                    for (const auto& halfedgeHandle : outgoingHalfedgeHandles)
                     {
                         // find what face corresponds to this halfedge
                         const FaceHandle halfedgeFaceHandle = HalfedgeFaceHandle(whiteBox, halfedgeHandle);
@@ -1098,7 +1094,7 @@ namespace WhiteBox
                 VertexHandles orderedVertexHandles;
                 orderedVertexHandles.reserve(halfedgeHandles.size());
 
-                for (const auto halfedgeHandle : halfedgeHandles)
+                for (const auto& halfedgeHandle : halfedgeHandles)
                 {
                     orderedVertexHandles.push_back(HalfedgeVertexHandleAtTip(whiteBox, halfedgeHandle));
                 }
@@ -1121,10 +1117,10 @@ namespace WhiteBox
             AZ_PROFILE_FUNCTION(AzToolsFramework);
 
             VertexHandles vertexHandles;
-            for (const FaceHandle faceHandle : faceHandles)
+            for (const FaceHandle& faceHandle : faceHandles)
             {
                 const auto faceVertexHandles = FaceVertexHandles(whiteBox, faceHandle);
-                for (const VertexHandle faceVertexHandle : faceVertexHandles)
+                for (const VertexHandle& faceVertexHandle : faceVertexHandles)
                 {
                     const auto* const vertexIt =
                         AZStd::find(vertexHandles.cbegin(), vertexHandles.cend(), faceVertexHandle);
@@ -1318,10 +1314,10 @@ namespace WhiteBox
                 visitedVertexHandles.push_back(vertexHandle);
 
                 // for all connected vertex handles to this edge
-                for (const auto vertexEdgeHandle : VertexEdgeHandles(whiteBox, vertexHandle))
+                for (const auto& vertexEdgeHandle : VertexEdgeHandles(whiteBox, vertexHandle))
                 {
                     // check all halfedges in the edge
-                    for (const auto halfedgeHandle : EdgeHalfedgeHandles(whiteBox, vertexEdgeHandle))
+                    for (const auto& halfedgeHandle : EdgeHalfedgeHandles(whiteBox, vertexEdgeHandle))
                     {
                         // only track the edge if it's a 'user' edge (selectable - not a 'mesh' edge)
                         if (!EdgeIsUser(whiteBox, halfedgeHandle, vertexEdgeHandle))
@@ -1339,7 +1335,7 @@ namespace WhiteBox
                         // store the edge to the grouping
                         edgeGrouping.push_back(vertexEdgeHandle);
 
-                        for (const auto nextVertexHandle : Api::EdgeVertexHandles(whiteBox, vertexEdgeHandle))
+                        for (const auto& nextVertexHandle : Api::EdgeVertexHandles(whiteBox, vertexEdgeHandle))
                         {
                             // if we haven't seen this vertex yet, add it to
                             // the vertex handles to explore
@@ -1978,7 +1974,7 @@ namespace WhiteBox
 
             Faces faces;
             faces.reserve(MeshFaceCount(whiteBox));
-            for (const auto faceHandle : MeshFaceHandles(whiteBox))
+            for (const auto& faceHandle : MeshFaceHandles(whiteBox))
             {
                 const auto halfEdgeHandles = FaceHalfedgeHandles(whiteBox, faceHandle);
 
@@ -2002,14 +1998,13 @@ namespace WhiteBox
             AZ_PROFILE_FUNCTION(AzToolsFramework);
 
             auto& mesh = whiteBox.mesh;
-            for (const auto faceHandle : faceHandles)
+            for (const auto& faceHandle : faceHandles)
             {
                 for (Mesh::ConstFaceHalfedgeCCWIter faceHalfedgeIt = mesh.fh_ccwiter(om_fh(faceHandle));
                      faceHalfedgeIt.is_valid(); ++faceHalfedgeIt)
                 {
                     const Mesh::HalfedgeHandle heh = *faceHalfedgeIt;
                     const Mesh::VertexHandle vh = mesh.to_vertex_handle(heh);
-                    const Mesh::FaceHandle fh = mesh.face_handle(heh);
 
                     const AZ::Vector3 position = mesh.point(vh);
                     const AZ::Vector3 normal = FaceNormal(whiteBox, faceHandle);
@@ -2064,7 +2059,7 @@ namespace WhiteBox
                 polygonHandle.m_faceHandles.push_back(faceHandleToVisit);
 
                 // for all halfedges
-                for (const auto faceHalfedgeHandle : faceHalfedges)
+                for (const auto& faceHalfedgeHandle : faceHalfedges)
                 {
                     const EdgeHandle edgeHandle = HalfedgeEdgeHandle(whiteBox, faceHalfedgeHandle);
                     // if we haven't seen this halfedge before and we want to track it,
@@ -2092,10 +2087,10 @@ namespace WhiteBox
 
         static void PopulatePolygonProps(FaceHandlePolygonMapping& polygonProps, const FaceHandles& faceHandles)
         {
-            for (const auto faceHandle : faceHandles)
+            for (const auto& faceHandle : faceHandles)
             {
                 auto polygonIt = polygonProps.find(om_fh(faceHandle));
-                for (const auto innerFaceHandle : faceHandles)
+                for (const auto& innerFaceHandle : faceHandles)
                 {
                     polygonIt->second.push_back(om_fh(innerFaceHandle));
                 }
@@ -2104,7 +2099,7 @@ namespace WhiteBox
 
         static void ClearPolygonProps(FaceHandlePolygonMapping& polygonProps, const FaceHandles& faceHandles)
         {
-            for (const auto faceHandle : faceHandles)
+            for (const auto& faceHandle : faceHandles)
             {
                 if (auto polygonIt = polygonProps.find(om_fh(faceHandle)); polygonIt != polygonProps.end())
                 {
@@ -2116,9 +2111,9 @@ namespace WhiteBox
         // restore all vertices along the restored edges (after creating a new polygon)
         static void RestoreVertexHandlesForEdges(WhiteBoxMesh& whiteBox, const EdgeHandles& restoredEdgeHandles)
         {
-            for (const auto edgeHandle : restoredEdgeHandles)
+            for (const auto& edgeHandle : restoredEdgeHandles)
             {
-                for (const auto vertexHandle : EdgeVertexHandles(whiteBox, edgeHandle))
+                for (const auto& vertexHandle : EdgeVertexHandles(whiteBox, edgeHandle))
                 {
                     RestoreVertex(whiteBox, vertexHandle);
                 }
@@ -2280,19 +2275,19 @@ namespace WhiteBox
             auto& polygonProps = whiteBox.mesh.property(polygonPropsHandle);
 
             // update all face handles to refer to the new face handles in the group
-            for (const auto faceHandle : combinedFaceHandles)
+            for (const auto& faceHandle : combinedFaceHandles)
             {
                 auto polygonIt = polygonProps.find(om_fh(faceHandle));
                 polygonIt->second.clear();
 
-                for (const auto innerFaceHandle : combinedFaceHandles)
+                for (const auto& innerFaceHandle : combinedFaceHandles)
                 {
                     polygonIt->second.push_back(om_fh(innerFaceHandle));
                 }
             }
 
             // hide any vertices that are not connected to a 'user' edge
-            for (const auto vertexHandle : firstPolygonVertexHandles)
+            for (const auto& vertexHandle : firstPolygonVertexHandles)
             {
                 if (VertexIsIsolated(whiteBox, vertexHandle))
                 {
@@ -2339,7 +2334,7 @@ namespace WhiteBox
             omFaceHandles.erase(AZStd::unique(omFaceHandles.begin(), omFaceHandles.end()), omFaceHandles.end());
 
             // update all face handles to point to the new polygon grouping
-            for (const auto omFaceHandle2 : omFaceHandles)
+            for (const auto& omFaceHandle2 : omFaceHandles)
             {
                 polygonProps[omFaceHandle2] = omFaceHandles;
             }
@@ -2413,7 +2408,7 @@ namespace WhiteBox
                         omExistingPolygonHandle.push_back(om_fh(newFaceHandle));
 
                         // update all face handles to point to the new polygon grouping
-                        for (const Mesh::FaceHandle faceHandle : omExistingPolygonHandle)
+                        for (const Mesh::FaceHandle& faceHandle : omExistingPolygonHandle)
                         {
                             polygonProps[faceHandle] = omExistingPolygonHandle;
                         }
@@ -2510,7 +2505,7 @@ namespace WhiteBox
 
             auto& polygonProps = whiteBox.mesh.property(polygonPropsHandle);
             // multiple face handles map to a polygon handle
-            for (const auto faceHandle : polygon)
+            for (const auto& faceHandle : polygon)
             {
                 polygonProps[faceHandle] = polygon;
             }
@@ -2658,7 +2653,7 @@ namespace WhiteBox
         {
             AZ_PROFILE_FUNCTION(AzToolsFramework);
 
-            for (const Mesh::FaceHandle faceHandle : whiteBox.mesh.faces())
+            for (const Mesh::FaceHandle& faceHandle : whiteBox.mesh.faces())
             {
                 for (Mesh::FaceHalfedgeCCWIter faceHalfedgeIt = whiteBox.mesh.fh_ccwiter(faceHandle);
                      faceHalfedgeIt.is_valid(); ++faceHalfedgeIt)
@@ -2705,7 +2700,7 @@ namespace WhiteBox
             AZ_PROFILE_FUNCTION(AzToolsFramework);
 
             AzToolsFramework::MidpointCalculator midpointCalculator;
-            for (const auto vertexHandle : vertexHandles)
+            for (const auto& vertexHandle : vertexHandles)
             {
                 midpointCalculator.AddPosition(VertexPosition(whiteBox, vertexHandle));
             }
@@ -2723,7 +2718,7 @@ namespace WhiteBox
             const auto adjacentPolygonEdgeHandles = PolygonBorderEdgeHandlesFlattened(whiteBox, adjacentPolygonHandle);
 
             // iterate over all halfedges in the adjacent polygon
-            for (const auto edgeHandle : adjacentPolygonEdgeHandles)
+            for (const auto& edgeHandle : adjacentPolygonEdgeHandles)
             {
                 const auto* const foundEdgeHandleInSelectedPolygon =
                     AZStd::find(selectedPolygonEdgeHandles.cbegin(), selectedPolygonEdgeHandles.cend(), edgeHandle);
@@ -2732,7 +2727,7 @@ namespace WhiteBox
                 if (foundEdgeHandleInSelectedPolygon == selectedPolygonEdgeHandles.cend())
                 {
                     // find outgoing edge handles
-                    for (const auto halfedgeHandle :
+                    for (const auto& halfedgeHandle :
                          VertexOutgoingHalfedgeHandles(whiteBox, vertexHandlePair.m_existing))
                     {
                         // attempt to find one of the outgoing halfedge handles in the adjacent polygon
@@ -2793,7 +2788,7 @@ namespace WhiteBox
             FaceVertHandlesCollection& vertsForLinkingAdjacentPolygons)
         {
             // find all faces connected to this edge
-            for (const auto faceHandle : EdgeFaceHandles(whiteBox, edgeHandle))
+            for (const auto& faceHandle : EdgeFaceHandles(whiteBox, edgeHandle))
             {
                 // find a face that is _not_ part of the polygon being appended/selected
                 if (AZStd::find(
@@ -2934,7 +2929,7 @@ namespace WhiteBox
 
             // erase face handles from the polygon map and
             // delete the faces from OpenMesh
-            for (const auto faceHandle : faceHandles)
+            for (const auto& faceHandle : faceHandles)
             {
                 polygonProps.erase(om_fh(faceHandle));
                 whiteBox.mesh.delete_face(om_fh(faceHandle), false);
@@ -2975,10 +2970,9 @@ namespace WhiteBox
             using ModifiedFaceHandle = AZStd::pair<Mesh::FaceHandle, Mesh::FaceHandle>;
             using ModifiedFaceHandles = AZStd::vector<ModifiedFaceHandle>;
 
-            // find all face handles that no longer match (where garbage_collect has invalidated the handles)
-            const ModifiedFaceHandles modifiedFaceHandles = std::transform_reduce(
-                faceHandlesCopy.cbegin(), faceHandlesCopy.cend(), faceHandlePtrs.cbegin(), ModifiedFaceHandles{},
-                // reduce
+            const ModifiedFaceHandles modifiedFaceHandles = AZStd::inner_product(
+                faceHandlesCopy.begin(), faceHandlesCopy.end(), faceHandlePtrs.begin(), ModifiedFaceHandles{},
+                //reduce 
                 [](ModifiedFaceHandles modifiedFaceHandles, const ModifiedFaceHandle& fh)
                 {
                     if (fh.first.is_valid())
@@ -2988,7 +2982,7 @@ namespace WhiteBox
 
                     return modifiedFaceHandles;
                 },
-                // transform
+                //transform
                 [](const Mesh::FaceHandle lhs, const Mesh::FaceHandle* rhs)
                 {
                     // if any of the faceHandlePtrs differ, we know the handles
@@ -3030,14 +3024,14 @@ namespace WhiteBox
             faces.reserve(existingFaces.size());
 
             // for each face
-            for (const FaceHandle faceHandle : existingFaces)
+            for (const FaceHandle& faceHandle : existingFaces)
             {
                 VertexHandles vertexHandlesForFace;
                 vertexHandlesForFace.reserve(3);
 
                 const auto vertexHandles = FaceVertexHandles(whiteBox, faceHandle);
                 // for each vertex handle
-                for (const VertexHandle vertexHandle : vertexHandles)
+                for (const VertexHandle& vertexHandle : vertexHandles)
                 {
                     // find vertex handle in vertices list
                     const auto* const vertexHandlePairIt = AZStd::find_if(
@@ -3092,11 +3086,11 @@ namespace WhiteBox
             Internal::AppendedVerts appendedVerts;
             appendedVerts.m_vertexHandlePairs.reserve(existingVertexHandles.size());
 
-            for (const VertexHandle existingVertexHandle : existingVertexHandles)
+            for (const VertexHandle& existingVertexHandle : existingVertexHandles)
             {
                 bool vertexHandleAdded = false;
                 // visit all connected halfedge handles
-                for (const auto halfedgeHandle : VertexHalfedgeHandles(whiteBox, existingVertexHandle))
+                for (const auto& halfedgeHandle : VertexHalfedgeHandles(whiteBox, existingVertexHandle))
                 {
                     const auto edgeHandle = HalfedgeEdgeHandle(whiteBox, halfedgeHandle);
                     const bool boundaryEdge = EdgeIsBoundary(whiteBox, edgeHandle);
@@ -3372,7 +3366,7 @@ namespace WhiteBox
             AZ_PROFILE_FUNCTION(AzToolsFramework);
 
             const AZ::Transform polygonSpace = PolygonSpace(whiteBox, polygonHandle, pivot);
-            for (const auto vertexHandle : PolygonVertexHandles(whiteBox, polygonHandle))
+            for (const auto& vertexHandle : PolygonVertexHandles(whiteBox, polygonHandle))
             {
                 SetVertexPosition(
                     whiteBox, vertexHandle,
diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
index ee0052d5b9..5c6fa73bb2 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
@@ -92,7 +92,7 @@ namespace WhiteBox
         };
 
         const auto faceHandles = Api::MeshFaceHandles(whiteBox);
-        for (const auto faceHandle : faceHandles)
+        for (const auto& faceHandle : faceHandles)
         {
             faceData.push_back(createWhiteBoxFaceFromHandle(faceHandle));
         }
@@ -817,7 +817,7 @@ namespace WhiteBox
 
         debugDisplay.DepthTestOn();
 
-        for (const auto faceHandle : Api::MeshFaceHandles(whiteBoxMesh))
+        for (const auto& faceHandle : Api::MeshFaceHandles(whiteBoxMesh))
         {
             const auto faceHalfedgeHandles = Api::FaceHalfedgeHandles(whiteBoxMesh, faceHandle);
 
@@ -832,7 +832,7 @@ namespace WhiteBox
                     }) /
                 3.0f;
 
-            for (const auto halfedgeHandle : faceHalfedgeHandles)
+            for (const auto& halfedgeHandle : faceHalfedgeHandles)
             {
                 const Api::VertexHandle vertexHandleAtTip =
                     Api::HalfedgeVertexHandleAtTip(whiteBoxMesh, halfedgeHandle);
@@ -887,7 +887,7 @@ namespace WhiteBox
 
         if (cl_whiteBoxDebugEdgeHandles)
         {
-            for (const auto edgeHandle : Api::MeshEdgeHandles(whiteBoxMesh))
+            for (const auto& edgeHandle : Api::MeshEdgeHandles(whiteBoxMesh))
             {
                 const AZ::Vector3 localEdgeMidpoint = Api::EdgeMidpoint(whiteBoxMesh, edgeHandle);
                 const AZ::Vector3 worldEdgeMidpoint = worldFromLocal.TransformPoint(localEdgeMidpoint);
diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
index 4bca7a9c96..de0fdf4cf9 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
@@ -25,8 +25,6 @@ namespace WhiteBox
 {
     AZ_CLASS_ALLOCATOR_IMPL(EditorWhiteBoxComponentMode, AZ::SystemAllocator, 0)
 
-    static const int DefaultWidgetBottomMargin = 5;
-
     // helper function to return what modifier keys move us to restore mode
     static bool RestoreModifier(AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers)
     {
@@ -410,7 +408,7 @@ namespace WhiteBox
         }();
 
         // all edges that are valid to interact with at this time
-        for (const auto edgeHandle : edgeHandles)
+        for (const auto& edgeHandle : edgeHandles)
         {
             const auto edge = Api::EdgeVertexPositions(*whiteBox, edgeHandle);
             m_intersectionAndRenderData->m_whiteBoxIntersectionData.m_edgeBounds.emplace_back(
@@ -418,14 +416,14 @@ namespace WhiteBox
         }
 
         // handle drawing 'user' and 'mesh' edges slightly differently
-        for (const auto edgeHandle : edgeHandlesPair.m_user)
+        for (const auto& edgeHandle : edgeHandlesPair.m_user)
         {
             const auto edge = Api::EdgeVertexPositions(*whiteBox, edgeHandle);
             m_intersectionAndRenderData->m_whiteBoxEdgeRenderData.m_bounds.m_user.emplace_back(
                 EdgeBoundWithHandle{EdgeBound{edge[0], edge[1], cl_whiteBoxEdgeSelectionWidth}, edgeHandle});
         }
 
-        for (const auto edgeHandle : edgeHandlesPair.m_mesh)
+        for (const auto& edgeHandle : edgeHandlesPair.m_mesh)
         {
             const auto edge = Api::EdgeVertexPositions(*whiteBox, edgeHandle);
             m_intersectionAndRenderData->m_whiteBoxEdgeRenderData.m_bounds.m_mesh.emplace_back(
diff --git a/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake
index 3927f19061..13b045e67a 100644
--- a/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/WhiteBox/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -6,4 +6,4 @@
 #
 #
 
-set(PAL_TRAIT_WHITEBOX_SUPPORTED FALSE)
+set(PAL_TRAIT_WHITEBOX_SUPPORTED TRUE)
diff --git a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
index a96ccd98be..671e2f290d 100644
--- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
+++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
@@ -10,6 +10,7 @@
 
 #include "PackedFloat2.h"
 
+#include <Atom/RPI.Public/Buffer/Buffer.h>
 #include <Atom/RPI.Reflect/Buffer/BufferAsset.h>
 #include <Atom/RPI.Reflect/Buffer/BufferAssetCreator.h>
 #include <Atom/RPI.Reflect/Buffer/BufferAssetView.h>
diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp
index 3d6d9a4c0a..608605be62 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp
@@ -33,8 +33,8 @@ namespace WhiteBox
         AZ::Color, cl_whiteBoxVertexIndicatorColor, AZ::Color::CreateFromRgba(0, 0, 0, 102), nullptr,
         AZ::ConsoleFunctorFlags::Null, "The color of the vertex indicator");
 
-    static const AZ::Crc32 HideEdge = AZ_CRC("com.o3de.action.whitebox.hide_edge", 0x6a60ae23);
-    static const AZ::Crc32 HideVertex = AZ_CRC("com.o3de.action.whitebox.hide_vertex", 0x4a4bd092);
+    static const AZ::Crc32 HideEdge = AZ_CRC("com.o3de.action.whitebox.hide_edge", 0x84f6a9b9);
+    static const AZ::Crc32 HideVertex = AZ_CRC("com.o3de.action.whitebox.hide_vertex", 0x5f81c937);
 
     static const char* const HideEdgeTitle = "Hide Edge";
     static const char* const HideEdgeDesc = "Hide the selected edge to merge the two connected polygons";
diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp
index fee23811a8..977b725b84 100644
--- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp
+++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp
@@ -155,7 +155,7 @@ namespace WhiteBox
 
         // special handling for edges in the process of being restored - an edge may be clicked
         // and remain 'orphaned' from a polygon until another connection (loop) can be made.
-        for (const Api::EdgeHandle edgeHandleRestore : m_edgeHandlesBeingRestored)
+        for (const Api::EdgeHandle& edgeHandleRestore : m_edgeHandlesBeingRestored)
         {
             if (AZStd::any_of(
                     interactiveEdgeHandles.begin(), interactiveEdgeHandles.end(),
diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp
index fb9d790111..2ce8bd4764 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp
@@ -14,7 +14,8 @@
 #include "Viewport/WhiteBoxViewportConstants.h"
 #include "WhiteBoxEdgeTranslationModifier.h"
 #include "WhiteBoxManipulatorViews.h"
-
+#include <AzCore/std/sort.h>
+#include <AzCore/std/numeric.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/ManipulatorView.h>
 #include <AzToolsFramework/Manipulators/PlanarManipulator.h>
@@ -65,19 +66,17 @@ namespace WhiteBox
     // (ensure to remove duplicates as vertices will be shared across edges)
     static Api::VertexHandles VertexHandlesForEdges(const WhiteBoxMesh& whiteBox, const Api::EdgeHandles& edgeHandles)
     {
-        auto vertexHandles = std::reduce(
+        Api::VertexHandles vertexHandles = AZStd::accumulate(
             edgeHandles.cbegin(), edgeHandles.cend(), Api::VertexHandles{},
-            [&whiteBox](Api::VertexHandles vertexHandles, const Api::EdgeHandle edgeHandle)
+            [&whiteBox](Api::VertexHandles vertexHandles, const Api::EdgeHandle edgeHandle) 
             {
                 const auto edgeVertexHandles = Api::EdgeVertexHandles(whiteBox, edgeHandle);
-                vertexHandles.push_back(edgeVertexHandles[0]);
-                vertexHandles.push_back(edgeVertexHandles[1]);
+                vertexHandles.insert(vertexHandles.end(), edgeVertexHandles.begin(), edgeVertexHandles.end());
                 return vertexHandles;
             });
-
-        std::sort(vertexHandles.begin(), vertexHandles.end());
-        vertexHandles.erase(std::unique(vertexHandles.begin(), vertexHandles.end()), vertexHandles.end());
-
+            
+        AZStd::sort(vertexHandles.begin(), vertexHandles.end());
+        vertexHandles.erase(AZStd::unique(vertexHandles.begin(), vertexHandles.end()), vertexHandles.end());
         return vertexHandles;
     }
 
@@ -208,7 +207,7 @@ namespace WhiteBox
                     const AZ::Vector3 displacement = position - sharedState->m_prevPosition;
 
                     // have to make sure we don't move verts more than once
-                    for (const auto vertexHandle : VertexHandlesForEdges(*whiteBox, m_edgeHandles))
+                    for (const auto& vertexHandle : VertexHandlesForEdges(*whiteBox, m_edgeHandles))
                     {
                         SetVertexPosition(
                             *whiteBox, vertexHandle, VertexPosition(*whiteBox, vertexHandle) + displacement);
diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp
index c4e106cba0..3e166e9d72 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp
@@ -169,7 +169,7 @@ namespace WhiteBox
                     sharedState->m_appendStage == AppendStage::Complete)
                 {
                     size_t vertexIndex = 0;
-                    for (const Api::VertexHandle vertexHandle : m_vertexHandles)
+                    for (const Api::VertexHandle& vertexHandle : m_vertexHandles)
                     {
                         const AZ::Vector3 vertexPosition = sharedState->m_vertexPositions[vertexIndex++] +
                             action.LocalPositionOffset() - sharedState->m_activeAppendOffset;
diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
index daa81c9aa3..c4613e24c7 100644
--- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
+++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
@@ -148,7 +148,7 @@ namespace WhiteBox
 
                 m_localPositionAtMouseDown = m_translationManipulator->GetLocalPosition();
 
-                for (const auto edgeHandle : Api::VertexUserEdgeHandles(*whiteBox, m_vertexHandle))
+                for (const auto& edgeHandle : Api::VertexUserEdgeHandles(*whiteBox, m_vertexHandle))
                 {
                     const auto edgeVertexPositions = Api::EdgeVertexPositions(*whiteBox, edgeHandle);
                     sharedState->m_edgeBeginEnds.push_back(
diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp
index 056c85512f..aa5d4645ae 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp
@@ -563,7 +563,7 @@ namespace UnitTest
         const auto polygonHandle = Api::InitializeAsUnitQuad(*m_whiteBox);
         const auto edgeHandles = Api::PolygonBorderEdgeHandlesFlattened(*m_whiteBox, polygonHandle);
 
-        for (const auto edgeHandle : edgeHandles)
+        for (const auto& edgeHandle : edgeHandles)
         {
             // when
             const auto tail = Api::HalfedgeVertexPositionAtTail(
@@ -702,7 +702,7 @@ namespace UnitTest
 
         // given
         const auto edgeHandles = Api::MeshEdgeHandles(*m_whiteBox);
-        for (const auto edgeHandle : edgeHandles)
+        for (const auto& edgeHandle : edgeHandles)
         {
             const auto firstHalfedgeHandle = Api::EdgeHalfedgeHandle(*m_whiteBox, edgeHandle, Api::EdgeHalfedge::First);
             const auto secondHalfedgeHandle =
@@ -992,7 +992,7 @@ namespace UnitTest
         const auto polygonHandles = Api::InitializeAsUnitCube(*m_whiteBox);
 
         // hide all 'logical'/'visible' edges (those that define the bounds of a polygon)
-        for (const auto edgeHandle :
+        for (const auto& edgeHandle :
              {Api::EdgeHandle{1}, Api::EdgeHandle{3}, Api::EdgeHandle{4}, Api::EdgeHandle{0}, Api::EdgeHandle{6}})
         {
             Api::HideEdge(*m_whiteBox, edgeHandle);
@@ -1024,7 +1024,7 @@ namespace UnitTest
             *m_whiteBox, Api::PolygonHandle{Api::FaceHandles{{Api::FaceHandle{4}, Api::FaceHandle{5}}}}, -0.25f);
 
         // hide all 'logical'/'visible' edges for scale appended face
-        for (const auto edgeHandle : {Api::EdgeHandle{25}, Api::EdgeHandle{27}, Api::EdgeHandle{24}})
+        for (const auto& edgeHandle : {Api::EdgeHandle{25}, Api::EdgeHandle{27}, Api::EdgeHandle{24}})
         {
             Api::HideEdge(*m_whiteBox, edgeHandle);
         }
@@ -1065,7 +1065,7 @@ namespace UnitTest
         Api::InitializeAsUnitCube(*m_whiteBox);
 
         // hide all vertical 'logical'/'visible' edges
-        for (const auto edgeHandle : {Api::EdgeHandle{13}, Api::EdgeHandle{15}, Api::EdgeHandle{12}})
+        for (const auto& edgeHandle : {Api::EdgeHandle{13}, Api::EdgeHandle{15}, Api::EdgeHandle{12}})
         {
             Api::HideEdge(*m_whiteBox, edgeHandle);
         }
@@ -1138,7 +1138,7 @@ namespace UnitTest
         int restoreCount = 0;
         Api::EdgeHandles restoringEdgeHandles; // inout param
         AZStd::optional<AZStd::array<Api::PolygonHandle, 2>> splitPolygons;
-        for (const Api::EdgeHandle edgeHandleToRestore : edgeHandlesToRestore)
+        for (const Api::EdgeHandle& edgeHandleToRestore : edgeHandlesToRestore)
         {
             splitPolygons = Api::RestoreEdge(*m_whiteBox, edgeHandleToRestore, restoringEdgeHandles);
             restoreCount++;
@@ -1792,14 +1792,14 @@ namespace UnitTest
         Api::InitializeAsUnitCube(*m_whiteBox);
 
         // hide all top vertices
-        for (const auto vertexHandle :
+        for (const auto& vertexHandle :
              {Api::VertexHandle{0}, Api::VertexHandle{1}, Api::VertexHandle{2}, Api::VertexHandle{3}})
         {
             Api::HideVertex(*m_whiteBox, vertexHandle);
         }
 
         // hide all vertical edges
-        for (const auto edgeHandle :
+        for (const auto& edgeHandle :
              {Api::EdgeHandle{15}, Api::EdgeHandle{13}, Api::EdgeHandle{12}, Api::EdgeHandle{10}})
         {
             Api::HideEdge(*m_whiteBox, edgeHandle);
@@ -2116,7 +2116,7 @@ namespace UnitTest
 
         bool edgeRestored = false;
         Api::EdgeHandles restoringEdgeHandles; // inout param
-        for (const Api::EdgeHandle edgeHandleToRestore : edgeHandlesToRestore)
+        for (const Api::EdgeHandle& edgeHandleToRestore : edgeHandlesToRestore)
         {
             if (Api::RestoreEdge(*m_whiteBox, edgeHandleToRestore, restoringEdgeHandles))
             {
diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp
index 8db48ca0aa..c173f7b6a9 100644
--- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp
+++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp
@@ -158,8 +158,6 @@ namespace UnitTest
         // the initial starting position of the entity (in front and to the left of the camera)
         const AZ::Transform initialEntityTransformWorld =
             AZ::Transform::CreateTranslation(AZ::Vector3(-10.0f, 10.0f, 0.0f));
-        // world space delta we will be moving the polygon face
-        const auto worldTranslationDelta = AZ::Vector3::CreateAxisX(20.0f);
         // the face handle we will use to get the parent polygon from
         const int faceHandle = 7;
         // the polygon vertex handle we will be dragging
diff --git a/README.md b/README.md
index 6f500a3dd3..063a59de74 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ To set up a project-centric source engine, complete the following steps. For oth
     
     Example:
     ```
-    cmake -B C:\o3de\build\windows_vs2019 -S C:\o3de -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages
+    cmake -B C:\o3de\build\windows -S C:\o3de -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages
     ```
     
     > Note:  Do not use trailing slashes for the <3rdParty package path>.
@@ -102,12 +102,12 @@ For more details on the steps above, refer to [Setting up O3DE from GitHub](http
 
 1. Configure a solution for your project.
     ```
-    cmake -B <your project build path> -S <your new project source path> -G "Visual Studio 16" -DLY_3RDPARTY_PATH=<3rdParty cache path>
+    cmake -B <your project build path> -S <your new project source path> -G "Visual Studio 16"
     ```
 
     Example:
     ```
-    cmake -B C:\my-project\build\windows_vs2019 -S C:\my-project -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages
+    cmake -B C:\my-project\build\windows -S C:\my-project -G "Visual Studio 16"
     ```
     
     > Note:  Do not use trailing slashes for the <3rdParty cache path>.
diff --git a/RETIRED_CODE.md b/RETIRED_CODE.md
new file mode 100644
index 0000000000..56a9df4fd1
--- /dev/null
+++ b/RETIRED_CODE.md
@@ -0,0 +1,33 @@
+## This is a list of functionality that was removed at some point.
+
+The main goal of this list, is to enable future developers to find old code that might be useful when implementing new,or re-implementing missing features.
+
+|Date  | Commit hash | Short description of removed functionality|
+|--|--|--|
+| 2021-11-25 |  | ObjectManager - parameter begin/end editing callbacks|
+| 2021-11-25 |  | ObjectManager - `InvertSelection()`|
+| 2021-11-25 |  | ObjectManager - unused named selection group support|
+| 2021-11-25 |  | ObjectManager - unused xml export functionality|
+| 2021-11-25 |  | ObjectManager - unused object hiding and freezing functionality|
+| 2021-11-25 |  | ObjectManager - unused object renaming and duplicate name detection|
+| 2021-11-25 |  | ObjectManager - unused selection callbacks and serialization|
+| 2021-11-26 |  | ObjectManager - unused selection support, MoveObjects/HitTestObject/EndEditParams|
+| 2021-11-26 |  | Unused code - CloneObject,SelectEntities,EnableUniqueObjectNames,NotifyObjectListeners,CloneChildren, PostClone|
+| 2021-11-26 |  | Unused code - GetClassCategories/SetCreateGameObject/FindAndRenameProperty2/IsExporting/IsReloading/StartObjectLoading|
+| 2021-11-26 |  | ObjectManager - unused code - ForceID/ConvertToType/SetSkipUpdate/LoadRegistry/UpdateRegisterObjectName/HitTestObjectAgainstRect/SelectObjectInRect|
+| 2021-11-26 |  | ObjectManager - unused GetObjects/SelectObjects, ObjectLoader - LoadObjects|
+| 2021-11-26 |  | CBaseObject - unused material layers mask support|
+| 2021-11-26 |  | CBaseObject - GetWarningsText/HideOrder, unused scaling functions,IsChildOf and GetLinkParent|
+| 2021-11-26 |  | CBaseObject - SubObj selection, IsParentAttachmentValid, IMouseCreateCallback,GetWorldAngles|
+| 2021-11-26 |  | CBaseObject - procedural floor management, EditTags, HelperScale|
+| 2021-11-26 |  | CBaseObject - PropertyChanged,SetNameInternal,OnMenuShowInAssetBrowser|
+| 2021-11-26 |  | CObjectArchive - unused sequence remapping, loaded object access |
+| 2021-11-26 |  | IDisplayViewport - unused interface `HitTestLine/GetGridStep/setHitcontext`|
+| 2021-11-27 |  | CBaseObject and children - unused HitHelperTest/MouseCreateCallback|
+| 2021-11-28 |  | CBaseObject - unused OnContextMenu and unused undo description strings. |
+| 2021-11-28 |  | Editor KDTree implementation |
+| 2021-11-28 |  | CExportManager - unused AddStatObj/AddMeshes/AddMesh|
+| 2021-11-28 |  | unused CUndoBaseLibraryManager and CUndoBaseLibrary|
+| 2021-11-28 |  | IXmlNode - unused shareChildren/deleteChildAt/clone/insertChild/replaceChild functionality|
+| 2021-11-28 |  | CXmlArchive - unused Load/Save methods|
+
diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg
index c8d8dd9a80..cf793a9802 100644
--- a/Registry/AssetProcessorPlatformConfig.setreg
+++ b/Registry/AssetProcessorPlatformConfig.setreg
@@ -21,6 +21,19 @@
     "Amazon": {
         "AssetProcessor": {
             "Settings": {
+                "Stats": {
+                    // Setting MachineReadable to true will output stats in more of a CSV-like format that is ideal for script ingestion
+                    "MachineReadable" : false,
+                    // Setting HumanReadable to true will output stats in a friendly human format that is ideal for human reading
+                    "HumanReadable" : true,
+                    // To turn off stats output entirely, set both HumanReadable and MachineReadable to false.
+                    // the maximum number of stats to show for cumulative stats like the time taken
+                    // across all jobs of a certain type, or all jobs cumulative across a whole platform
+                    "MaxCumulativeStats" : 4,
+                    // the maximum number of stats to show for individual stats like how long a specific
+                    // individual job took.
+                    "MaxIndividualStats" : 4
+                },
                 "Platform pc": {
                     "tags": "tools,renderer,dx12,vulkan,null"
                 },
diff --git a/Templates/CMakeLists.txt b/Templates/CMakeLists.txt
index 9735907a6a..5f5d561a9f 100644
--- a/Templates/CMakeLists.txt
+++ b/Templates/CMakeLists.txt
@@ -14,5 +14,6 @@ ly_install_directory(
         DefaultGem
         DefaultProject
         MinimalProject
+        GemRepo
     VERBATIM
 )
diff --git a/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake b/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake
index cf6614e4a5..60bda1d45b 100644
--- a/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake
+++ b/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake
@@ -9,5 +9,5 @@
 # File to tweak compiler settings before compiler detection happens (before project() is called)
 # We dont have PAL enabled at this point, so we can only use pure-CMake variables
 if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-    include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake)
+    include(cmake/Platform/Linux/CompilerSettings_linux.cmake)
 endif()
diff --git a/Templates/DefaultProject/Template/cmake/EngineFinder.cmake b/Templates/DefaultProject/Template/cmake/EngineFinder.cmake
index 98ad61bae8..15b96eb8a9 100644
--- a/Templates/DefaultProject/Template/cmake/EngineFinder.cmake
+++ b/Templates/DefaultProject/Template/cmake/EngineFinder.cmake
@@ -13,8 +13,8 @@
 include_guard()
 
 # Read the engine name from the project_json file
-file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json)
-set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json)
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/project.json project_json)
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/project.json)
 
 string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine)
 if(json_error)
diff --git a/Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake b/Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake
similarity index 100%
rename from Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake
rename to Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake
diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json
index a36926f632..fcffafcb34 100644
--- a/Templates/DefaultProject/template.json
+++ b/Templates/DefaultProject/template.json
@@ -193,8 +193,8 @@
             "isOptional": false
         },
         {
-            "file": "cmake/Platform/Linux/CompilerSettings.cmake",
-            "origin": "cmake/Platform/Linux/CompilerSettings.cmake",
+            "file": "cmake/Platform/Linux/CompilerSettings_linux.cmake",
+            "origin": "cmake/Platform/Linux/CompilerSettings_linux.cmake",
             "isTemplated": false,
             "isOptional": false
         },
diff --git a/Templates/GemRepo/Template/gem.json b/Templates/GemRepo/Template/gem.json
new file mode 100644
index 0000000000..292681b2b5
--- /dev/null
+++ b/Templates/GemRepo/Template/gem.json
@@ -0,0 +1,19 @@
+{
+    "gem_name": "${Name}Gem",
+    "display_name": "${Name}Gem",
+    "license": "What license ${Name}Gem uses goes here: i.e. Apache-2.0 Or MIT",
+    "license_url": "",
+    "origin": "The primary repo for ${Name}Gem goes here: i.e. http://www.mydomain.com",
+    "summary": "A short description of ${Name}Gem which is zipped up in an archive named gem.zip in the root of the Gem Repo. Though not required, it is recommended that the sha256 of the gem.zip file should be placed in the sha256 field of this gem.json so the download can be verified.",
+    "origin_uri": "${RepoURI}/gem.zip",
+    "sha256": "",
+    "type": "Code",
+    "canonical_tags": [
+        "Gem"
+    ],
+    "user_tags": [
+        "${Name}Gem"
+    ],
+    "icon_path": "preview.png",
+    "requirements": ""
+}
diff --git a/Templates/GemRepo/Template/repo.json b/Templates/GemRepo/Template/repo.json
new file mode 100644
index 0000000000..2af1fcfd2a
--- /dev/null
+++ b/Templates/GemRepo/Template/repo.json
@@ -0,0 +1,11 @@
+{
+    "repo_name":"${Name}",
+    "origin":"Origin for the ${Name} Gem Repository",
+    "repo_uri": "${RepoURI}",
+    "summary": "A Gem Repository with a single Gem in the root of the repository.",
+    "additional_info": "Additional info for ${Name}",
+    "last_updated": "",
+    "gems": [
+        "${RepoURI}"
+    ]
+}
diff --git a/Templates/GemRepo/preview.png b/Templates/GemRepo/preview.png
new file mode 100644
index 0000000000..78a2a735d2
--- /dev/null
+++ b/Templates/GemRepo/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ae503ec99c8358991dc3c6e50737844d3602b81a49abbbed7d697d7238547c0
+size 28026
diff --git a/Templates/GemRepo/template.json b/Templates/GemRepo/template.json
new file mode 100644
index 0000000000..88123a9dae
--- /dev/null
+++ b/Templates/GemRepo/template.json
@@ -0,0 +1,27 @@
+{
+    "template_name": "GemRepo",
+    "origin": "The primary repo for GemRepo goes here: i.e. http://www.mydomain.com",
+    "license": "What license GemRepo uses goes here: i.e. https://opensource.org/licenses/MIT",
+    "display_name": "GemRepo",
+    "summary": "A Gem Repository that contains a single Gem.",
+    "canonical_tags": [],
+    "user_tags": [
+        "GemRepo"
+    ],
+    "icon_path": "preview.png",
+    "copyFiles": [
+        {
+            "file": "gem.json",
+            "origin": "gem.json",
+            "isTemplated": true,
+            "isOptional": false
+        },
+        {
+            "file": "repo.json",
+            "origin": "repo.json",
+            "isTemplated": true,
+            "isOptional": false
+        }
+    ],
+    "createDirectories": []
+}
diff --git a/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake b/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake
index cf6614e4a5..60bda1d45b 100644
--- a/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake
+++ b/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake
@@ -9,5 +9,5 @@
 # File to tweak compiler settings before compiler detection happens (before project() is called)
 # We dont have PAL enabled at this point, so we can only use pure-CMake variables
 if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-    include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake)
+    include(cmake/Platform/Linux/CompilerSettings_linux.cmake)
 endif()
diff --git a/Templates/MinimalProject/Template/cmake/EngineFinder.cmake b/Templates/MinimalProject/Template/cmake/EngineFinder.cmake
index 98ad61bae8..15b96eb8a9 100644
--- a/Templates/MinimalProject/Template/cmake/EngineFinder.cmake
+++ b/Templates/MinimalProject/Template/cmake/EngineFinder.cmake
@@ -13,8 +13,8 @@
 include_guard()
 
 # Read the engine name from the project_json file
-file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json)
-set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json)
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/project.json project_json)
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/project.json)
 
 string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine)
 if(json_error)
diff --git a/cmake/Platform/Linux/CompilerSettings.cmake b/Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake
similarity index 100%
rename from cmake/Platform/Linux/CompilerSettings.cmake
rename to Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake
diff --git a/Templates/MinimalProject/template.json b/Templates/MinimalProject/template.json
index 4260e71527..7d6a4f9b94 100644
--- a/Templates/MinimalProject/template.json
+++ b/Templates/MinimalProject/template.json
@@ -185,8 +185,8 @@
             "isOptional": false
         },
         {
-            "file": "cmake/Platform/Linux/CompilerSettings.cmake",
-            "origin": "cmake/Platform/Linux/CompilerSettings.cmake",
+            "file": "cmake/Platform/Linux/CompilerSettings_linux.cmake",
+            "origin": "cmake/Platform/Linux/CompilerSettings_linux.cmake",
             "isTemplated": false,
             "isOptional": false
         },
diff --git a/Templates/PythonToolGem/Template/Code/CMakeLists.txt b/Templates/PythonToolGem/Template/Code/CMakeLists.txt
index a6044e717b..b90f2d7703 100644
--- a/Templates/PythonToolGem/Template/Code/CMakeLists.txt
+++ b/Templates/PythonToolGem/Template/Code/CMakeLists.txt
@@ -53,6 +53,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
         BUILD_DEPENDENCIES
             PUBLIC
                 Gem::${Name}.Editor.Static
+        RUNTIME_DEPENDENCIES
+            Gem::QtForPython.Editor
     )
 
     # By default, we will specify that the above target ${Name} would be used by
diff --git a/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp b/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp
index 0027af011a..fdd971440e 100644
--- a/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp
+++ b/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp
@@ -10,6 +10,7 @@
 
 #include <${Name}ModuleInterface.h>
 #include <${Name}EditorSystemComponent.h>
+#include <AzToolsFramework/API/PythonLoader.h>
 
 void Init${SanitizedCppName}Resources()
 {
@@ -21,6 +22,7 @@ namespace ${SanitizedCppName}
 {
     class ${SanitizedCppName}EditorModule
         : public ${SanitizedCppName}ModuleInterface
+        , public AzToolsFramework::EmbeddedPython::PythonLoader
     {
     public:
         AZ_RTTI(${SanitizedCppName}EditorModule, "${ModuleClassId}", ${SanitizedCppName}ModuleInterface);
diff --git a/Templates/PythonToolGem/Template/gem.json b/Templates/PythonToolGem/Template/gem.json
index d4ff637bee..84f5b65a3e 100644
--- a/Templates/PythonToolGem/Template/gem.json
+++ b/Templates/PythonToolGem/Template/gem.json
@@ -13,5 +13,8 @@
         "${Name}"
     ],
     "icon_path": "preview.png",
-    "requirements": ""
+    "requirements": "",
+    "dependencies": [
+        "QtForPython"
+    ]
 }
diff --git a/Tools/LyTestTools/README.txt b/Tools/LyTestTools/README.txt
index 61ad507dc4..4372bc5201 100644
--- a/Tools/LyTestTools/README.txt
+++ b/Tools/LyTestTools/README.txt
@@ -35,8 +35,8 @@ INSTALL
 It is recommended to set up these these tools with Lumberyard's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
     cd /path/to/lumberyard/dev/
-    mkdir windows_vs2019
-    cd windows_vs2019
+    mkdir windows
+    cd windows
     cmake -E time cmake --build . --target ALL_BUILD --config profile
 
 To manually install the project in development mode using your own installed Python interpreter:
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 fccc94bdcc..d11980658d 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
@@ -277,7 +277,7 @@ class AbstractResourceLocator(object):
     def get_shader_compiler_path(self):
         """
         Return path to shader compiler executable
-        ex. engine_root/dev/windows_vs2019/bin/profile/CrySCompileServer
+        ex. engine_root/dev/windows/bin/profile/CrySCompileServer
         :return: path to CrySCompileServer executable
         """
         return os.path.join(self.build_directory(), 'CrySCompileServer')
@@ -313,7 +313,7 @@ class AbstractResourceLocator(object):
     def shader_compiler_config_file(self):
         """
         Return path to the Shader Compiler config file
-        ex. engine_root/dev/windows_vs2019/bin/profile/config.ini
+        ex. engine_root/dev/windows/bin/profile/config.ini
         :return: path to the Shader Compiler config file
         """
         return os.path.join(self.build_directory(), 'config.ini')
@@ -321,7 +321,7 @@ class AbstractResourceLocator(object):
     def shader_cache(self):
         """
         Return path to the shader cache for the current build
-        ex. engine_root/dev/windows_vs2019/bin/profile/Cache
+        ex. engine_root/dev/windows/bin/profile/Cache
         :return: path to the shader cache for the current build
         """
         return os.path.join(self.build_directory(), 'Cache')
@@ -378,7 +378,7 @@ class AbstractResourceLocator(object):
     def editor_log(self):
         """
         Return path to the project's editor log dir using the builds project and platform
-        :return: path to editor.log
+        :return: path to Editor.log
         """
         raise NotImplementedError(
             "editor_log() is not implemented on the base AbstractResourceLocator() class. "
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py
index fea60cc9cb..151a4a3e2b 100644
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py
@@ -49,9 +49,9 @@ class _LinuxResourceManager(AbstractResourceLocator):
 
     def editor_log(self):
         """
-        :return: path to editor.log
+        :return: path to Editor.log
         """
-        return os.path.join(self.project_log(), "editor.log")
+        return os.path.join(self.project_log(), "Editor.log")
 
 
 class LinuxWorkspaceManager(AbstractWorkspaceManager):
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 cc8f23f0e1..4a187b188c 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
@@ -58,9 +58,9 @@ class _MacResourceLocator(AbstractResourceLocator):
     def editor_log(self):
         """
         Return path to the project's editor log dir using the builds project and platform
-        :return: path to editor.log
+        :return: path to Editor.log
         """
-        return os.path.join(self.project_log(), "editor.log")
+        return os.path.join(self.project_log(), "Editor.log")
 
 
 class MacWorkspaceManager(AbstractWorkspaceManager):
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 1fad15acce..29289166d4 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
@@ -64,9 +64,9 @@ class _WindowsResourceLocator(AbstractResourceLocator):
     def editor_log(self):
         """
         Return path to the project's editor log dir using the builds project and platform
-        :return: path to editor.log
+        :return: path to Editor.log
         """
-        return os.path.join(self.project_log(), "editor.log")
+        return os.path.join(self.project_log(), "Editor.log")
 
 
 class WindowsWorkspaceManager(AbstractWorkspaceManager):
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py
index ac412acf84..801729f008 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py
@@ -119,7 +119,7 @@ class AbstractWorkspaceManager:
 
     def clear_bin(self):
         """
-        Clears the relative Bin folder (i.e. engine_root/dev/windows_vs2019/bin/profile/)
+        Clears the relative Bin folder (i.e. engine_root/dev/windows/bin/profile/)
         :return: None
         """
         if os.path.exists(self.paths.build_directory()):
diff --git a/Tools/LyTestTools/ly_test_tools/environment/file_system.py b/Tools/LyTestTools/ly_test_tools/environment/file_system.py
index d8ecd7d908..c67ecc5b23 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/file_system.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/file_system.py
@@ -219,7 +219,8 @@ def unlock_file(file_name):
     :return: True if unlock succeeded, else False
     """
     if not os.access(file_name, os.W_OK):
-        os.chmod(file_name, stat.S_IWRITE)
+        file_stat = os.stat(file_name)
+        os.chmod(file_name, file_stat.st_mode | stat.S_IWRITE)
         logger.warning(f'Clearing write lock for file {file_name}.')
         return True
     else:
@@ -235,7 +236,8 @@ def lock_file(file_name):
     :return: True if lock succeeded, else False
     """
     if os.access(file_name, os.W_OK):
-        os.chmod(file_name, stat.S_IREAD)
+        file_stat = os.stat(file_name)
+        os.chmod(file_name, file_stat.st_mode & (~stat.S_IWRITE))
         logger.warning(f'Write locking file {file_name}')
         return True
     else:
diff --git a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
index f8245495fa..44288203da 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
@@ -20,6 +20,7 @@ _PROCESS_OUTPUT_ENCODING = 'utf-8'
 
 # Default list of processes names to kill
 LY_PROCESS_KILL_LIST = [
+    'AssetBuilder', 'AssetProcessor', 'AssetProcessorBatch',
     'CrySCompileServer', 'Editor',
     'Profiler', 'RemoteConsole',
     'rc'  # Resource Compiler
@@ -376,18 +377,18 @@ def _safe_kill_processes(processes):
             logger.info(f"Terminating process '{proc.name()}' with id '{proc.pid}'")
             proc.kill()
         except psutil.AccessDenied:
-            logger.warning("Termination failed, Access Denied", exc_info=True)
+            logger.warning("Termination failed, Access Denied with stacktrace:", exc_info=True)
         except psutil.NoSuchProcess:
-            logger.debug("Termination request ignored, process was already terminated during iteration", exc_info=True)
+            logger.debug("Termination request ignored, process was already terminated during iteration with stacktrace:", exc_info=True)
         except Exception:  # purposefully broad
-            logger.warning("Unexpected exception ignored while terminating process", exc_info=True)
+            logger.debug("Unexpected exception ignored while terminating process, with stacktrace:", exc_info=True)
 
     def on_terminate(proc):
         logger.info(f"process '{proc.name()}' with id '{proc.pid}' terminated with exit code {proc.returncode}")
     try:
         psutil.wait_procs(processes, timeout=30, callback=on_terminate)
     except Exception:  # purposefully broad
-        logger.warning("Unexpected exception while waiting for processes to terminate", exc_info=True)
+        logger.debug("Unexpected exception while waiting for processes to terminate, with stacktrace:", exc_info=True)
 
 
 def _terminate_and_confirm_dead(proc):
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
index d32be10562..c9458899b4 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
@@ -91,7 +91,7 @@ class Launcher(object):
                         open(os.path.join(self.workspace.paths.project_log(), artifact), 'w').close() # clear it
                         log.info(f"Clearing pre-existing artifact {artifact} from calling Launcher.setup()")
                 except PermissionError:
-                    log.warn(f'Unable to remove artifact: {artifact}, skipping.')
+                    log.warning(f'Unable to remove artifact: {artifact}, skipping.')
                     pass
 
         # In case this is the first run, we will create default logs to prevent the logmonitor from not finding the file
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
index 9f8ee9649e..65319e05de 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
@@ -416,13 +416,8 @@ class AssetProcessor(object):
         self.restore_ap_settings()
 
     def process_exists(self):
-        try:
-            my_pid = self.get_pid()
-            if my_pid == -1:
-                return False
-            return psutil.pid_exists(my_pid)
-        except psutil.NoSuchProcess:
-            pass
+        if self._ap_proc:
+            return self._ap_proc.poll() is None
         return False
 
     def batch_process(self, timeout=DEFAULT_TIMEOUT_SECONDS, fastscan=True, capture_output=False, platforms=None,
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
index f30ed2f233..8551e5c0ef 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
@@ -8,11 +8,12 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 import logging
 import os
 import subprocess
+import psutil
 
 import ly_test_tools.environment.process_utils as process_utils
 
 logger = logging.getLogger(__name__)
-
+processList = ["AssetProcessor_tmp","AssetProcessor","AssetProcessorBatch","AssetBuilder","rc","Lua Editor"]
 
 def start_asset_processor(bin_dir):
     """
@@ -39,9 +40,16 @@ def kill_asset_processor():
 
     :return: None
     """
-    process_utils.kill_processes_named('AssetProcessor_tmp', ignore_extensions=True)
-    process_utils.kill_processes_named('AssetProcessor', ignore_extensions=True)
-    process_utils.kill_processes_named('AssetProcessorBatch', ignore_extensions=True)
-    process_utils.kill_processes_named('AssetBuilder', ignore_extensions=True)
-    process_utils.kill_processes_named('rc', ignore_extensions=True)
-    process_utils.kill_processes_named('Lua Editor', ignore_extensions=True)
+    for n in processList:
+        process_utils.kill_processes_named(n, ignore_extensions=True)
+
+
+# Uses psutil to check if a specified process is running.
+def check_ap_running(processName):
+    for proc in psutil.process_iter():
+        try:
+            if processName.lower() in proc.name().lower():
+                return True
+        except (psutil.AccessDenied, psutil.NoSuchProcess, psutil.ZombieProcess):
+            pass
+        return False
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py b/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py
index ae6ed16321..29b6573f7a 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py
@@ -303,6 +303,8 @@ class EditorTestSuite():
     use_null_renderer = True
     # Maximum time for a single editor to stay open on a shared test
     timeout_editor_shared_test = 300
+    # Flag to determine whether to use new prefab system or use deprecated slice system for this test suite
+    enable_prefab_system = True
 
     # Function to calculate number of editors to run in parallel, this can be overriden by the user
     @staticmethod
@@ -741,7 +743,11 @@ class EditorTestSuite():
             test_cmdline_args += ["--attach-debugger"]
         if test_spec.wait_for_debugger:
             test_cmdline_args += ["--wait-for-debugger"]
-            
+        if self.enable_prefab_system:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]
+        else:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]
+
         # Cycle any old crash report in case it wasn't cycled properly
         editor_utils.cycle_crash_report(run_id, workspace)
 
@@ -804,7 +810,11 @@ class EditorTestSuite():
             test_cmdline_args += ["--attach-debugger"]
         if any([t.wait_for_debugger for t in test_spec_list]):
             test_cmdline_args += ["--wait-for-debugger"]
-            
+        if self.enable_prefab_system:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]
+        else:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]
+
         # Cycle any old crash report in case it wasn't cycled properly
         editor_utils.cycle_crash_report(run_id, workspace)
 
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py
index 35fbe93d37..9f1e01342c 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py
@@ -126,9 +126,9 @@ def retrieve_editor_log_content(run_id: int, log_name: str, workspace: AbstractW
         with open(editor_log) as f:
             editor_info = ""
             for line in f:
-                editor_info += f"[editor.log]  {line}"
+                editor_info += f"[{log_name}]  {line}"
     except Exception as ex:
-        editor_info = f"-- Error reading editor.log: {str(ex)} --"
+        editor_info = f"-- Error reading {log_name}: {str(ex)} --"
     return editor_info
 
 def retrieve_last_run_test_index_from_output(test_spec_list: list[EditorTestBase], output: str) -> int:
diff --git a/Tools/LyTestTools/tests/unit/test_editor_test_utils.py b/Tools/LyTestTools/tests/unit/test_editor_test_utils.py
index bf7fae7189..cd361d9e8a 100644
--- a/Tools/LyTestTools/tests/unit/test_editor_test_utils.py
+++ b/Tools/LyTestTools/tests/unit/test_editor_test_utils.py
@@ -74,9 +74,9 @@ class TestEditorTestUtils(unittest.TestCase):
     def test_RetrieveCrashOutput_CrashLogNotExists_ReturnsError(self, mock_retrieve_log_path):
         mock_retrieve_log_path.return_value = 'mock_log_path'
         mock_workspace = mock.MagicMock()
-        expected = "-- No crash log available --\n[Errno 2] No such file or directory: 'mock_log_path\\\\error.log'"
+        error_message = "No crash log available"
 
-        assert expected == editor_test_utils.retrieve_crash_output(0, mock_workspace, 0)
+        assert error_message in editor_test_utils.retrieve_crash_output(0, mock_workspace, 0)
 
     @mock.patch('os.path.getmtime', mock.MagicMock())
     @mock.patch('os.rename')
@@ -119,7 +119,7 @@ class TestEditorTestUtils(unittest.TestCase):
         mock_log = 'mock log info'
 
         with mock.patch('builtins.open', mock.mock_open(read_data=mock_log)) as mock_file:
-            assert f'[editor.log]  {mock_log}' == editor_test_utils.retrieve_editor_log_content(0, mock_logname, mock_workspace)
+            assert f'[{mock_logname}]  {mock_log}' == editor_test_utils.retrieve_editor_log_content(0, mock_logname, mock_workspace)
 
     @mock.patch('ly_test_tools.o3de.editor_test_utils.retrieve_log_path')
     @mock.patch('ly_test_tools.environment.waiter.wait_for', mock.MagicMock())
@@ -127,7 +127,7 @@ class TestEditorTestUtils(unittest.TestCase):
         mock_retrieve_log_path.return_value = 'mock_log_path'
         mock_logname = 'mock_log.log'
         mock_workspace = mock.MagicMock()
-        expected = f"-- Error reading editor.log"
+        expected = f"-- Error reading {mock_logname}"
 
         assert expected in editor_test_utils.retrieve_editor_log_content(0, mock_logname, mock_workspace)
 
diff --git a/Tools/LyTestTools/tests/unit/test_file_system.py b/Tools/LyTestTools/tests/unit/test_file_system.py
index 53ca5a700e..2ddd3f8934 100755
--- a/Tools/LyTestTools/tests/unit/test_file_system.py
+++ b/Tools/LyTestTools/tests/unit/test_file_system.py
@@ -8,6 +8,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 import errno
 import logging
 import os
+import stat
 import psutil
 import subprocess
 import sys
@@ -454,24 +455,33 @@ class TestChangePermissions(unittest.TestCase):
         self.assertEqual(file_system.change_permissions('.', 0o777), False)
 
 
+class MockStatResult():
+    def __init__(self, st_mode):
+        self.st_mode = st_mode
+
 class TestUnlockFile(unittest.TestCase):
 
     def setUp(self):
         self.file_name = 'file'
 
+    @mock.patch('os.stat')
     @mock.patch('os.chmod')
     @mock.patch('os.access')
-    def test_UnlockFile_WriteLocked_UnlockFile(self, mock_access, mock_chmod):
+    def test_UnlockFile_WriteLocked_UnlockFile(self, mock_access, mock_chmod, mock_stat):
         mock_access.return_value = False
+        os.stat.return_value = MockStatResult(stat.S_IREAD)
 
         success = file_system.unlock_file(self.file_name)
+        mock_chmod.assert_called_once_with(self.file_name, stat.S_IREAD | stat.S_IWRITE)
 
         self.assertTrue(success)
 
+    @mock.patch('os.stat')
     @mock.patch('os.chmod')
     @mock.patch('os.access')
-    def test_UnlockFile_AlreadyUnlocked_LogAlreadyUnlocked(self, mock_access, mock_chmod):
+    def test_UnlockFile_AlreadyUnlocked_LogAlreadyUnlocked(self, mock_access, mock_chmod, mock_stat):
         mock_access.return_value = True
+        os.stat.return_value = MockStatResult(stat.S_IREAD | stat.S_IWRITE)
 
         success = file_system.unlock_file(self.file_name)
 
@@ -483,19 +493,24 @@ class TestLockFile(unittest.TestCase):
     def setUp(self):
         self.file_name = 'file'
 
+    @mock.patch('os.stat')
     @mock.patch('os.chmod')
     @mock.patch('os.access')
-    def test_UnlockFile_UnlockedFile_FileLockedSuccessReturnsTrue(self, mock_access, mock_chmod):
+    def test_LockFile_UnlockedFile_FileLockedSuccessReturnsTrue(self, mock_access, mock_chmod, mock_stat):
         mock_access.return_value = True
+        os.stat.return_value = MockStatResult(stat.S_IREAD | stat.S_IWRITE)
 
         success = file_system.lock_file(self.file_name)
+        mock_chmod.assert_called_once_with(self.file_name, stat.S_IREAD)
 
         self.assertTrue(success)
 
+    @mock.patch('os.stat')
     @mock.patch('os.chmod')
     @mock.patch('os.access')
-    def test_UnlockFile_AlreadyLocked_FileLockedFailedReturnsFalse(self, mock_access, mock_chmod):
+    def test_LockFile_AlreadyLocked_FileLockedFailedReturnsFalse(self, mock_access, mock_chmod, mock_stat):
         mock_access.return_value = False
+        os.stat.return_value = MockStatResult(stat.S_IREAD)
 
         success = file_system.lock_file(self.file_name)
 
diff --git a/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py b/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py
index e91b810f9d..e195aa5796 100755
--- a/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py
+++ b/Tools/LyTestTools/tests/unit/test_manager_platforms_mac.py
@@ -76,7 +76,7 @@ class TestMacResourceLocator(object):
                                                                                                   mock_project)
         expected = os.path.join(
             mac_resource_locator.project_log(),
-            'editor.log')
+            'Editor.log')
 
         assert mac_resource_locator.editor_log() == expected
 
diff --git a/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py b/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
index 7e30289da0..b7cc8edf40 100755
--- a/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
+++ b/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
@@ -80,7 +80,7 @@ class TestWindowsResourceLocator(object):
             mock_build_directory, mock_project)
         expected = os.path.join(
             windows_resource_locator.project_log(),
-            'editor.log')
+            'Editor.log')
 
         assert windows_resource_locator.editor_log() == expected
 
diff --git a/Tools/LyTestTools/tests/unit/test_process_utils.py b/Tools/LyTestTools/tests/unit/test_process_utils.py
index bd6a79fb09..87b5790b78 100755
--- a/Tools/LyTestTools/tests/unit/test_process_utils.py
+++ b/Tools/LyTestTools/tests/unit/test_process_utils.py
@@ -371,15 +371,15 @@ class TestProcessMatching(unittest.TestCase):
         mock_log_warn.assert_called()
 
     @mock.patch('psutil.wait_procs')
-    @mock.patch('logging.Logger.warning')
-    def test_SafeKillProcList_RaisesError_NoRaiseAndLogsError(self, mock_log_warn, mock_wait_procs):
+    @mock.patch('logging.Logger.debug')
+    def test_SafeKillProcList_RaisesError_NoRaiseAndLogsError(self, mock_log, mock_wait_procs):
         mock_wait_procs.side_effect = psutil.PermissionError()
         proc_mock = mock.MagicMock()
 
         process_utils._safe_kill_processes(proc_mock)
 
         mock_wait_procs.assert_called()
-        mock_log_warn.assert_called()
+        mock_log.assert_called()
 
     @mock.patch('psutil.process_iter')
     @mock.patch('logging.Logger.debug')
diff --git a/Tools/RemoteConsole/ly_remote_console/README.txt b/Tools/RemoteConsole/ly_remote_console/README.txt
index 497179ac15..0c5d8c67af 100644
--- a/Tools/RemoteConsole/ly_remote_console/README.txt
+++ b/Tools/RemoteConsole/ly_remote_console/README.txt
@@ -22,8 +22,7 @@ installed on your system.
 
 INSTALL
 -----------
-It is recommended to set up these these tools with the lmbr_test tool Lumberyard's root directory:
-  lmbr_test pysetup install
+Installation of these tools happen automatically when get_python and cmake is run.
 
 To manually install the project in development mode:
   python -m pip install -e .
diff --git a/cmake/3rdParty.cmake b/cmake/3rdParty.cmake
index 4b7f929279..7d98c3ea3e 100644
--- a/cmake/3rdParty.cmake
+++ b/cmake/3rdParty.cmake
@@ -25,6 +25,15 @@ define_property(TARGET PROPERTY LY_SYSTEM_LIBRARY
 # \arg:output_third_party_path name of variable to set the default project directory into
 # It defaults to the ~/.o3de/3rdParty directory
 function(get_default_third_party_folder output_third_party_path)
+    
+    # 1. Highest priority, cache variable, that will override the value of any of the cases below
+    # 2. if defined in an env variable, take it from there
+    if($ENV{LY_3RDPARTY_PATH})
+        set(${output_third_party_path} $ENV{LY_3RDPARTY_PATH} PARENT_SCOPE)
+        return()
+    endif()
+
+    # 3. If defined in the o3de_manifest.json, take it from there
     cmake_path(SET home_directory "$ENV{USERPROFILE}") # Windows
     if(NOT EXISTS ${home_directory})
         cmake_path(SET home_directory "$ENV{HOME}") # Unix
@@ -33,7 +42,20 @@ function(get_default_third_party_folder output_third_party_path)
         endif()
     endif()
 
+    set(manifest_path ${home_directory}/.o3de/o3de_manifest.json)
+    if(EXISTS ${manifest_path})
+        file(READ ${manifest_path} manifest_json)
+        string(JSON default_third_party_folder ERROR_VARIABLE json_error GET ${manifest_json} default_third_party_folder)
+        if(NOT json_error)
+            set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${manifest_path})
+            set(${output_third_party_path} ${default_third_party_folder} PARENT_SCOPE)
+            return()
+        endif()
+    endif()
+
+    # 4. Lowest priority, use the home directory as the location for 3rdparty
     set(${output_third_party_path} ${home_directory}/.o3de/3rdParty PARENT_SCOPE)
+
 endfunction()
 
 get_default_third_party_folder(o3de_default_third_party_path)
diff --git a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
index 9dbdbbd8aa..6bd50861c7 100644
--- a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
+++ b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
@@ -20,7 +20,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev4-android         TARGETS TIF
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-android         TARGETS freetype        PACKAGE_HASH df9e4d559ea0f03b0666b48c79813b1cd4d9624429148a249865de9f5c2c11cd)
 ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.9.50-rev1-android   TARGETS AWSNativeSDK    PACKAGE_HASH 33771499f9080cbaab613459927e52911e68f94fa356397885e85005efbd1490)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-android             TARGETS Lua             PACKAGE_HASH 1f638e94a17a87fe9e588ea456d5893876094b4db191234380e4c4eb9e06c300)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-android  TARGETS PhysX           PACKAGE_HASH b8cb6aa46b2a21671f6cb1f6a78713a3ba88824d0447560ff5ce6c01014b9f43)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-android  TARGETS PhysX           PACKAGE_HASH b346e8f9bc55f367a97d781d94c8a5c3bff8059478b8a7007e5fd17708dc1d07)
 ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-android          TARGETS mikkelsen       PACKAGE_HASH 075e8e4940884971063b5a9963014e2e517246fa269c07c7dc55b8cf2cd99705)
 ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-android      TARGETS googletest      PACKAGE_HASH 95671be75287a61c9533452835c3647e9c1b30f81b34b43bcb0ec1997cc23894)
 ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-android TARGETS GoogleBenchmark PACKAGE_HASH 20b46e572211a69d7d94ddad1c89ec37bb958711d6ad4025368ac89ea83078fb)
diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
index 25424a348c..5c84fc3198 100644
--- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
+++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
@@ -27,7 +27,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-linux
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-linux                          TARGETS freetype                    PACKAGE_HASH 3f10c703d9001ecd2bb51a3bd003d3237c02d8f947ad0161c0252fdc54cbcf97)
 ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev6-linux                   TARGETS AWSNativeSDK                PACKAGE_HASH 490291e4c8057975c3ab86feb971b8a38871c58bac5e5d86abdd1aeb7141eec4)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-linux                              TARGETS Lua                         PACKAGE_HASH 1adc812abe3dd0dbb2ca9756f81d8f0e0ba45779ac85bf1d8455b25c531a38b0)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-linux                   TARGETS PhysX                       PACKAGE_HASH a110249cbef4f266b0002c4ee9a71f59f373040cefbe6b82f1e1510c811edde6)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-linux                   TARGETS PhysX                       PACKAGE_HASH fa72365df409376aef02d1763194dc91d255bdfcb4e8febcfbb64d23a3e50b96)
 ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.2-rev1-linux                        TARGETS mcpp                        PACKAGE_HASH df7a998d0bc3fedf44b5bdebaf69ddad6033355b71a590e8642445ec77bc6c41)
 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)
@@ -43,6 +43,7 @@ ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-linux
 ly_associate_package(PACKAGE_NAME azslc-1.7.34-rev1-linux                           TARGETS azslc                       PACKAGE_HASH 6d7dc671936c34ff70d2632196107ca1b8b2b41acdd021bfbc69a9fd56215c22)
 ly_associate_package(PACKAGE_NAME zlib-1.2.11-rev5-linux                            TARGETS ZLIB                        PACKAGE_HASH 9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc)
 ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-linux                     TARGETS squish-ccr                  PACKAGE_HASH 85fecafbddc6a41a27c5f59ed4a5dfb123a94cb4666782cf26e63c0a4724c530)
-ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev1-linux                       TARGETS astc-encoder                PACKAGE_HASH 2ba97a06474d609945f0ab4419af1f6bbffdd294ca6b869f5fcebec75c573c0f)
+ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev2-linux                       TARGETS astc-encoder                PACKAGE_HASH 71549d1ca9e4d48391b92a89ea23656d3393810e6777879f6f8a9def2db1610c)
 ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-linux                    TARGETS ISPCTexComp                 PACKAGE_HASH 065fd12abe4247dde247330313763cf816c3375c221da030bdec35024947f259)
 ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev4-linux                        TARGETS lz4                         PACKAGE_HASH 5de3dbd3e2a3537c6555d759b3c5bb98e5456cf85c74ff6d046f809b7087290d)
+ly_associate_package(PACKAGE_NAME pyside2-5.15.2-rev2-linux                         TARGETS pyside2                     PACKAGE_HASH 7589c397c8224d0c3ad691ff02e1afd55d9a1f9de1967c14eb8105dd2b0c4dd1)
diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
index 1ac7568a98..3f2dc8cedf 100644
--- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
@@ -28,7 +28,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-mac
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-mac                            TARGETS freetype                    PACKAGE_HASH f159b346ac3251fb29cb8dd5f805c99b0015ed7fdb3887f656945ca701a61d0d)
 ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev5-mac                     TARGETS AWSNativeSDK                PACKAGE_HASH ffb890bd9cf23afb429b9214ad9bac1bf04696f07a0ebb93c42058c482ab2f01)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev6-mac                                TARGETS Lua                         PACKAGE_HASH b9079fd35634774c9269028447562c6b712dbc83b9c64975c095fd423ff04c08)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-mac                     TARGETS PhysX                       PACKAGE_HASH 5e092a11d5c0a50c4dd99bb681a04b566a4f6f29aa08443d9bffc8dc12c27c8e)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-mac                     TARGETS PhysX                       PACKAGE_HASH 83940b3876115db82cd8ffcb9e902278e75846d6ad94a41e135b155cee1ee186)
 ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.2-rev1-mac                          TARGETS mcpp                        PACKAGE_HASH be9558905c9c49179ef3d7d84f0a5472415acdf7fe2d76eb060d9431723ddf2e)
 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)
@@ -40,7 +40,7 @@ ly_associate_package(PACKAGE_NAME libpng-1.6.37-mac
 ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-mac                      TARGETS libsamplerate               PACKAGE_HASH b912af40c0ac197af9c43d85004395ba92a6a859a24b7eacd920fed5854a97fe)
 ly_associate_package(PACKAGE_NAME zlib-1.2.11-rev5-mac                              TARGETS ZLIB                        PACKAGE_HASH b6fea9c79b8bf106d4703b67fecaa133f832ad28696c2ceef45fb5f20013c096)
 ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-mac                       TARGETS squish-ccr                  PACKAGE_HASH 155bfbfa17c19a9cd2ef025de14c5db598f4290045d5b0d83ab58cb345089a77)
-ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev1-mac                         TARGETS astc-encoder                PACKAGE_HASH 96f6ea8c3e45ec7fe525230c7c53ca665c8300d8e28456cc19bb3159ce6f8dcc)
+ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev2-mac                         TARGETS astc-encoder                PACKAGE_HASH 06f129d26995845824f1fb906a5135b2c71d44d66c768342af85fa28a175906f)
 ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-mac                      TARGETS ISPCTexComp                 PACKAGE_HASH 8a4e93277b8face6ea2fd57c6d017bdb55643ed3d6387110bc5f6b3b884dd169)
 ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev4-mac                          TARGETS lz4                         PACKAGE_HASH 891ff630bf34f7ab1d8eaee2ea0a8f1fca89dbdc63fca41ee592703dd488a73b)
 ly_associate_package(PACKAGE_NAME azslc-1.7.34-rev1-mac                             TARGETS azslc                       PACKAGE_HASH a9d81946b42ffa55c0d14d6a9249b3340e59a8fb8835e7a96c31df80f14723bc)
diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
index 3189625611..6e2d2a92e2 100644
--- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
@@ -29,7 +29,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-windows
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-windows                            TARGETS freetype                    PACKAGE_HASH 9809255f1c59b07875097aa8d8c6c21c97c47a31fb35e30f2bb93188e99a85ff)
 ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-windows                     TARGETS AWSNativeSDK                PACKAGE_HASH a900e80f7259e43aed5c847afee2599ada37f29db70505481397675bcbb6c76c)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-windows                                TARGETS Lua                         PACKAGE_HASH 136faccf1f73891e3fa3b95f908523187792e56f5b92c63c6a6d7e72d1158d40)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-windows                     TARGETS PhysX                       PACKAGE_HASH 0c5ffbd9fa588e5cf7643721a7cfe74d0fe448bf82252d39b3a96d06dfca2298)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-windows                     TARGETS PhysX                       PACKAGE_HASH 4e31a3e1f5bf3952d8af8e28d1a29f04167995a6362fc3a7c20c25f74bf01e23)
 ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.2-rev1-windows                          TARGETS mcpp                        PACKAGE_HASH 794789aba639bfe2f4e8fcb4424d679933dd6290e523084aa0a4e287ac44acb2)
 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)
@@ -46,7 +46,7 @@ ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-windows
 ly_associate_package(PACKAGE_NAME Crashpad-0.8.0-rev1-windows                           TARGETS Crashpad                    PACKAGE_HASH d162aa3070147bc0130a44caab02c5fe58606910252caf7f90472bd48d4e31e2)
 ly_associate_package(PACKAGE_NAME zlib-1.2.11-rev5-windows                              TARGETS ZLIB                        PACKAGE_HASH 8847112429744eb11d92c44026fc5fc53caa4a06709382b5f13978f3c26c4cbd)
 ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-windows                       TARGETS squish-ccr                  PACKAGE_HASH 5c3d9fa491e488ccaf802304ad23b932268a2b2846e383f088779962af2bfa84)
-ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev1-windows                         TARGETS astc-encoder                PACKAGE_HASH 3addc6fc1a7eb0d6b7f3d530e962af967e6d92b3825ef485da243346357cf78e)
+ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev2-windows                         TARGETS astc-encoder                PACKAGE_HASH 17249bfa438afb34e21449865d9c9297471174ae0cea9b2f9def2ee206038295)
 ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-windows                      TARGETS ISPCTexComp                 PACKAGE_HASH b6fa6ea28a2808a9a5524c72c37789c525925e435770f2d94eb2d387360fa2d0)
 ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev4-windows                          TARGETS lz4                         PACKAGE_HASH 4ea457b833cd8cfaf8e8e06ed6df601d3e6783b606bdbc44a677f77e19e0db16)
 ly_associate_package(PACKAGE_NAME azslc-1.7.34-rev1-windows                             TARGETS azslc                       PACKAGE_HASH 44eb2e0fc4b0f1c75d0fb6f24c93a5753655b84dbc3e6ad45389ed3b9cf7a4b0)
diff --git a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
index 8042c888c7..1eea5082da 100644
--- a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
+++ b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
@@ -21,7 +21,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-ios         TARGETS TIFF
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-ios         TARGETS freetype        PACKAGE_HASH 3ac3c35e056ae4baec2e40caa023d76a7a3320895ef172b6655e9261b0dc2e29)
 ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-ios  TARGETS AWSNativeSDK    PACKAGE_HASH d10e7496ca705577032821011beaf9f2507689f23817bfa0ed4d2a2758afcd02)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-ios             TARGETS Lua             PACKAGE_HASH c2d3c4e67046c293049292317a7d60fdb8f23effeea7136aefaef667163e5ffe)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-ios  TARGETS PhysX           PACKAGE_HASH b1bbc1fc068d2c6e1eb18eecd4e8b776adc516833e8da3dcb1970cef2a8f0cbd)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-ios  TARGETS PhysX           PACKAGE_HASH 4a5e38b385837248590018eb133444b4e440190414e6756191200a10c8fa5615)
 ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios          TARGETS mikkelsen       PACKAGE_HASH 976aaa3ccd8582346132a10af253822ccc5d5bcc9ea5ba44d27848f65ee88a8a)
 ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-ios      TARGETS googletest      PACKAGE_HASH 2f121ad9784c0ab73dfaa58e1fee05440a82a07cc556bec162eeb407688111a7)
 ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-ios TARGETS GoogleBenchmark PACKAGE_HASH c2ffaed2b658892b1bcf81dee4b44cd1cb09fc78d55584ef5cb8ab87f2d8d1ae)
diff --git a/cmake/3rdPartyPackages.cmake b/cmake/3rdPartyPackages.cmake
index efe67b4d24..a3f15bdb22 100644
--- a/cmake/3rdPartyPackages.cmake
+++ b/cmake/3rdPartyPackages.cmake
@@ -7,7 +7,7 @@
 
 include_guard()
 
-include(cmake/LySet.cmake)
+include(${LY_ROOT_FOLDER}/cmake/LySet.cmake)
 
 # OVERVIEW:
 # this is the Open 3D Engine Package system.
@@ -80,10 +80,7 @@ macro(ly_package_message)
     endif()
 endmacro()
 
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages)
-
-include(cmake/LYPackage_S3Downloader.cmake)
-
+include(${LY_ROOT_FOLDER}/cmake/LYPackage_S3Downloader.cmake)
 
 # Attempts one time to download a file.
 # sets should_retry to true if the caller should retry due to an intermittent problem
@@ -711,11 +708,11 @@ if (NOT CMAKE_SCRIPT_MODE_FILE)
     # include the built in 3rd party packages that are for every platform.
     # you can put your package associations anywhere, but this provides
     # a good starting point.
-    include(cmake/3rdParty/BuiltInPackages.cmake)
+    include(${LY_ROOT_FOLDER}/cmake/3rdParty/BuiltInPackages.cmake)
 endif()
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
-    include(cmake/LYWrappers.cmake)
+    include(${LY_ROOT_FOLDER}/cmake/LYWrappers.cmake)
     # Importing this globally to handle AUTOMOC, AUTOUIC, AUTORCC
     ly_parse_third_party_dependencies(3rdParty::Qt)
 endif()
diff --git a/cmake/CompilerSettings.cmake b/cmake/CompilerSettings.cmake
index cf6614e4a5..60bda1d45b 100644
--- a/cmake/CompilerSettings.cmake
+++ b/cmake/CompilerSettings.cmake
@@ -9,5 +9,5 @@
 # File to tweak compiler settings before compiler detection happens (before project() is called)
 # We dont have PAL enabled at this point, so we can only use pure-CMake variables
 if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-    include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake)
+    include(cmake/Platform/Linux/CompilerSettings_linux.cmake)
 endif()
diff --git a/cmake/Deployment.cmake b/cmake/Deployment.cmake
index b6b7aa1869..1f6f2fc0f3 100644
--- a/cmake/Deployment.cmake
+++ b/cmake/Deployment.cmake
@@ -10,5 +10,3 @@
 
 set(LY_ASSET_DEPLOY_MODE "LOOSE" CACHE STRING "Set the Asset deployment when deploying to the target platform (LOOSE, PAK, VFS)")
 set(LY_ASSET_OVERRIDE_PAK_FOLDER_ROOT "" CACHE STRING "Optional root path to where Pak file folders are stored. By default, blank will use a predefined 'paks' root.")
-
-
diff --git a/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake
index 0416d41ece..d4bf1d7423 100644
--- a/cmake/LYWrappers.cmake
+++ b/cmake/LYWrappers.cmake
@@ -354,7 +354,7 @@ function(ly_add_target)
             # of running the copy of runtime dependencies, the stamp file is touched so the timestamp is updated.
             # Adding a config as part of the name since the stamp file is added to the VS project.
             # Note the STAMP_OUTPUT_FILE need to match with the one used in runtime dependencies (e.g. RuntimeDependencies_common.cmake)
-            set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$<CONFIG>/${ly_add_target_NAME}_$<CONFIG>.stamp)
+            set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$<CONFIG>/${ly_add_target_NAME}.stamp)
             add_custom_command(
                 OUTPUT ${STAMP_OUTPUT_FILE}
                 DEPENDS "$<GENEX_EVAL:$<TARGET_PROPERTY:${ly_add_target_NAME},RUNTIME_DEPENDENCIES_DEPENDS>>"
@@ -367,7 +367,7 @@ function(ly_add_target)
             # stamp file on each configuration so it gets properly excluded by the generator
             unset(stamp_files_per_config)
             foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
-                set(stamp_file_conf ${CMAKE_BINARY_DIR}/runtime_dependencies/${conf}/${ly_add_target_NAME}_${conf}.stamp)
+                set(stamp_file_conf ${CMAKE_BINARY_DIR}/runtime_dependencies/${conf}/${ly_add_target_NAME}.stamp)
                 set_source_files_properties(${stamp_file_conf} PROPERTIES GENERATED TRUE SKIP_AUTOGEN TRUE)
                 list(APPEND stamp_files_per_config $<$<CONFIG:${conf}>:${stamp_file_conf}>)
             endforeach()
@@ -653,36 +653,6 @@ function(ly_add_source_properties)
 endfunction()
 
 
-#! ly_project_add_subdirectory: calls add_subdirectory() if the project name is in the project list
-#
-# This can be useful when including subdirs in the restricted folder only if the project is in the project list
-# If you give it a second parameter it will add_subdirectory using that instead, if the project is in the project list
-#
-# add_subdirectory(AutomatedTesting) if Automatedtesting is in the project list
-# EX. ly_project_add_subdirectory(AutomatedTesting)
-#
-# add_subdirectory(SamplesProject) if Automatedtesting is in the project list
-# EX. ly_project_add_subdirectory(AutomatedTesting SamplesProject)
-#
-# \arg:project_name the name of the project that may be enabled
-# \arg:binary_project_dir optional, if supplied that binary_project_dir will be added when project name is enabled.
-#
-function(ly_project_add_subdirectory project_name)
-    if(${project_name} IN_LIST LY_PROJECTS)
-       if(ARGC GREATER 1)
-           list(GET ARGN 0 subdir)
-       endif()
-       if(ARGC GREATER 2)
-           list(GET ARGN 1 binary_project_dir)
-       endif()
-       if(subdir)
-           add_subdirectory(${subdir} ${binary_project_dir})
-       else()
-           add_subdirectory(${project_name} ${binary_project_dir})
-       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)
diff --git a/cmake/Monolithic.cmake b/cmake/Monolithic.cmake
index 1e121c2b20..2310d8d0d7 100644
--- a/cmake/Monolithic.cmake
+++ b/cmake/Monolithic.cmake
@@ -16,7 +16,6 @@ if(LY_MONOLITHIC_GAME)
     ly_set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE)
     ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
     ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED FALSE)
-    ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE)
 else()
     ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE SHARED)
     ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE GEM_MODULE)
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 6a1e2d8cef..4ba4e750de 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -24,18 +24,23 @@ number will automatically appended as '<version>/<host>'.  If LY_INSTALLER_AUTO_
 full URL format will be: <base_url>/<build_tag>/<host>"
 )
 
-set(LY_INSTALLER_UPLOAD_URL "" CACHE STRING
-"Base URL used to upload the installer artifacts after generation, the host target and version number \
-will automatically appended as '<version>/<host>'.  If LY_INSTALLER_AUTO_GEN_TAG is set, the full URL \
-format will be: <base_url>/<build_tag>/<host>.  Can also be set via LY_INSTALLER_UPLOAD_URL environment \
-variable.  Currently only accepts S3 URLs e.g. s3://<bucket>/<prefix>"
+set(CPACK_UPLOAD_URL "" CACHE STRING
+"URL used to upload the installer artifacts after generation, the host target and version number \
+will automatically appended as '<version>/<host>'. If LY_INSTALLER_AUTO_GEN_TAG is set, the full URL \
+format will be: <base_url>/<build_tag>/<host>. Currently only accepts S3 URLs e.g. s3://<bucket>/<prefix>"
 )
 
-set(LY_INSTALLER_AWS_PROFILE "" CACHE STRING
-"AWS CLI profile for uploading artifacts.  Can also be set via LY_INSTALLER_AWS_PROFILE environment variable."
+set(CPACK_AWS_PROFILE "" CACHE STRING
+"AWS CLI profile for uploading artifacts."
 )
 
+set(CPACK_THREADS 0)
 set(CPACK_DESIRED_CMAKE_VERSION 3.20.2)
+if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION})
+    message(FATAL_ERROR
+        "The desired version of CMake to be included in the package is "
+        "below the minimum required version of CMake to run")
+endif()
 
 # 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
@@ -44,15 +49,16 @@ set(CPACK_DESIRED_CMAKE_VERSION 3.20.2)
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_FULL_NAME "Open3D Engine")
 set(CPACK_PACKAGE_VENDOR "O3DE Binary Project a Series of LF Projects, LLC")
+set(CPACK_PACKAGE_CONTACT "info@o3debinaries.org")
 set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installation Tool")
 
 string(TOLOWER "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}" CPACK_PACKAGE_FILE_NAME)
 
 set(DEFAULT_LICENSE_NAME "Apache-2.0")
-set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
 
-set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE})
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_LICENSE_URL ${LY_INSTALLER_LICENSE_URL})
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -60,6 +66,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSI
 # 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
+set(CPACK_OUTPUT_FILE_PREFIX CPackUploads)
 
 # this config file allows the dynamic setting of cpack variables at cpack-time instead of cmake configure
 set(CPACK_PROJECT_CONFIG_FILE ${CPACK_SOURCE_DIR}/PackagingConfig.cmake)
@@ -74,132 +81,38 @@ if(NOT CPACK_GENERATOR)
     return()
 endif()
 
-if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION})
-    message(FATAL_ERROR
-        "The desired version of CMake to be included in the package is "
-        "below the minimum required version of CMake to run")
-endif()
-
-# pull down the desired copy of CMake so it can be included in the package
+# We will download the desired copy of CMake so it can be included in the package, we defer the downloading
+# to the install process, to do so we generate a script that will perform the download and execute such script
+# during the install process (before packaging)
 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})
+# We download it to a different location because CPACK_PACKAGING_INSTALL_PREFIX will be removed during
+# cpack generation. CPACK_BINARY_DIR persists across cpack invocations
+set(LY_CMAKE_PACKAGE_DOWNLOAD_PATH ${CPACK_BINARY_DIR}/${CPACK_CMAKE_PACKAGE_FILE})
 
-if(EXISTS ${_cmake_package_dest})
-    file(SHA256 ${_cmake_package_dest} hash_of_downloaded_file)
-    if (NOT "${hash_of_downloaded_file}" STREQUAL "${CPACK_CMAKE_PACKAGE_HASH}")
-        message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found at ${_cmake_package_dest} but expected hash missmatches, re-downloading...")
-        file(REMOVE ${_cmake_package_dest})
-    else()
-        message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found")
-    endif()
-endif()
-if(NOT EXISTS ${_cmake_package_dest})
-    # download it
-    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 "Downloading CMake ${CPACK_DESIRED_CMAKE_VERSION} 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 "CMake ${CPACK_DESIRED_CMAKE_VERSION} found")
-    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()
-endif()
-
-ly_install(FILES ${_cmake_package_dest}
-    DESTINATION ./Tools/Redistributables/CMake
+configure_file(${LY_ROOT_FOLDER}/cmake/Packaging/CMakeDownload.cmake.in
+    ${CPACK_BINARY_DIR}/CMakeDownload.cmake
+    @ONLY
+)
+ly_install(SCRIPT ${CPACK_BINARY_DIR}/CMakeDownload.cmake
+    COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
+)
+ly_install(FILES ${LY_CMAKE_PACKAGE_DOWNLOAD_PATH}
+    DESTINATION Tools/Redistributables/CMake
     COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
 )
 
-# the version string and git tags are intended to be synchronized so it should be safe to use that instead
-# of directly calling into git which could get messy in certain scenarios
-if(${CPACK_PACKAGE_VERSION} VERSION_GREATER "0.0.0.0")
-    set(_3rd_party_license_filename NOTICES.txt)
-
-    set(_3rd_party_license_url "https://raw.githubusercontent.com/o3de/3p-package-source/${CPACK_PACKAGE_VERSION}/${_3rd_party_license_filename}")
-    set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename})
-
-    # use the plain file downloader as we don't have the file hash available and using a dummy will
-    # delete the file once it fails hash verification
-    file(DOWNLOAD
-        ${_3rd_party_license_url}
-        ${_3rd_party_license_dest}
-        STATUS _status
-        TLS_VERIFY ON
-    )
-    list(POP_FRONT _status _status_code)
-
-    if (${_status_code} EQUAL 0 AND EXISTS ${_3rd_party_license_dest})
-        ly_install(FILES ${_3rd_party_license_dest}
-            DESTINATION .
-            COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-        )
-    else()
-        file(REMOVE ${_3rd_party_license_dest})
-        message(FATAL_ERROR "Failed to acquire the 3rd Party license manifest file at ${_3rd_party_license_url}.  Error: ${_status}")
-    endif()
-endif()
-
-# checks for and removes trailing slash
-function(strip_trailing_slash in_url out_url)
-    string(LENGTH ${in_url} _url_length)
-    MATH(EXPR _url_length "${_url_length}-1")
-
-    string(SUBSTRING ${in_url} 0 ${_url_length} _clean_url)
-    if("${in_url}" STREQUAL "${_clean_url}/")
-        set(${out_url} ${_clean_url} PARENT_SCOPE)
-    else()
-        set(${out_url} ${in_url} PARENT_SCOPE)
-    endif()
-endfunction()
-
-if(NOT LY_INSTALLER_UPLOAD_URL AND DEFINED ENV{LY_INSTALLER_UPLOAD_URL})
-    set(LY_INSTALLER_UPLOAD_URL $ENV{LY_INSTALLER_UPLOAD_URL})
-endif()
-
-if(LY_INSTALLER_UPLOAD_URL)
-    ly_is_s3_url(${LY_INSTALLER_UPLOAD_URL} _is_s3_bucket)
-    if(NOT _is_s3_bucket)
-        message(FATAL_ERROR "Only S3 installer uploading is supported at this time")
-    endif()
-
-    if (LY_INSTALLER_AWS_PROFILE)
-        set(CPACK_AWS_PROFILE ${LY_INSTALLER_AWS_PROFILE})
-    elseif (DEFINED ENV{LY_INSTALLER_AWS_PROFILE})
-        set(CPACK_AWS_PROFILE $ENV{LY_INSTALLER_AWS_PROFILE})
-    endif()
-
-    strip_trailing_slash(${LY_INSTALLER_UPLOAD_URL} LY_INSTALLER_UPLOAD_URL)
-    set(CPACK_UPLOAD_URL ${LY_INSTALLER_UPLOAD_URL})
-endif()
+# Set common CPACK variables to all platforms/generators
+set(CPACK_STRIP_FILES TRUE) # always strip symbols on packaging
+set(CPACK_PACKAGE_CHECKSUM SHA256) # Generate checksum file
+set(CPACK_PRE_BUILD_SCRIPTS ${pal_dir}/PackagingPreBuild_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake)
+set(CPACK_POST_BUILD_SCRIPTS ${pal_dir}/PackagingPostBuild_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake)
+set(CPACK_CODESIGN_SCRIPT ${pal_dir}/PackagingCodeSign_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake)
+set(CPACK_LY_PYTHON_CMD ${LY_PYTHON_CMD})
 
 # IMPORTANT: required to be included AFTER setting all property overrides
 include(CPack REQUIRED)
@@ -268,13 +181,26 @@ foreach(external_dir ${LY_INSTALL_EXTERNAL_BUILD_DIRS})
     )
 endforeach()
 
+# checks for and removes trailing slash
+function(strip_trailing_slash in_url out_url)
+    string(LENGTH ${in_url} _url_length)
+    MATH(EXPR _url_length "${_url_length}-1")
+
+    string(SUBSTRING ${in_url} 0 ${_url_length} _clean_url)
+    if("${in_url}" STREQUAL "${_clean_url}/")
+        set(${out_url} ${_clean_url} PARENT_SCOPE)
+    else()
+        set(${out_url} ${in_url} PARENT_SCOPE)
+    endif()
+endfunction()
+
 if(LY_INSTALLER_DOWNLOAD_URL)
     strip_trailing_slash(${LY_INSTALLER_DOWNLOAD_URL} LY_INSTALLER_DOWNLOAD_URL)
 
     # this will set the following variables: CPACK_DOWNLOAD_SITE, CPACK_DOWNLOAD_ALL, and CPACK_UPLOAD_DIRECTORY (local)
     cpack_configure_downloads(
         ${LY_INSTALLER_DOWNLOAD_URL}
-        UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/_CPack_Uploads # to match the _CPack_Packages directory
+        UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/CPackUploads # to match the _CPack_Packages directory
         ALL
     )
 endif()
diff --git a/cmake/Packaging/CMakeDownload.cmake.in b/cmake/Packaging/CMakeDownload.cmake.in
new file mode 100644
index 0000000000..e84611b354
--- /dev/null
+++ b/cmake/Packaging/CMakeDownload.cmake.in
@@ -0,0 +1,54 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(LY_ROOT_FOLDER "@LY_ROOT_FOLDER@")
+set(CMAKE_SCRIPT_MODE_FILE TRUE)
+include(@LY_ROOT_FOLDER@/cmake/3rdPartyPackages.cmake)
+
+if(EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@")
+    file(SHA256 "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@" hash_of_downloaded_file)
+    if (NOT "${hash_of_downloaded_file}" STREQUAL "@CPACK_CMAKE_PACKAGE_HASH@")
+        message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found at @LY_CMAKE_PACKAGE_DOWNLOAD_PATH@ but expected hash missmatches, re-downloading...")
+        file(REMOVE "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@")
+    else()
+        message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found")
+    endif()
+endif()
+if(NOT EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@")
+    # download it
+    string(REPLACE "." ";" _version_components "@CPACK_DESIRED_CMAKE_VERSION@")
+    list(GET _version_components 0 _major_version)
+    list(GET _version_components 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 "Downloading CMake @CPACK_DESIRED_CMAKE_VERSION@ for packaging...")
+    download_file(
+        URL ${_package_url}
+        TARGET_FILE @LY_CMAKE_PACKAGE_DOWNLOAD_PATH@
+        EXPECTED_HASH @CPACK_CMAKE_PACKAGE_HASH@
+        RESULTS _results
+    )
+    list(GET _results 0 _status_code)
+
+    if (${_status_code} EQUAL 0 AND EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@")
+        message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found")
+    else()
+        file(REMOVE "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@")
+        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()
+endif()
diff --git a/cmake/Platform/Android/Toolchain_android.cmake b/cmake/Platform/Android/Toolchain_android.cmake
index aff5c6faf8..b5c4a56fd6 100644
--- a/cmake/Platform/Android/Toolchain_android.cmake
+++ b/cmake/Platform/Android/Toolchain_android.cmake
@@ -11,10 +11,14 @@ if(LY_TOOLCHAIN_NDK_API_LEVEL)
 endif()
 
 # Verify that the NDK environment is set and points to the support NDK
-
+if(NOT ${LY_NDK_DIR})
+    if($ENV{LY_NDK_DIR})
+        set(LY_NDK_DIR $ENV{LY_NDK_DIR})
+    endif()
+endif()
 file(TO_CMAKE_PATH "${LY_NDK_DIR}" LY_NDK_DIR)
 if(NOT LY_NDK_DIR)
-    message(FATAL_ERROR "Environment var for NDK is empty. Could not find the NDK installation folder")
+    message(FATAL_ERROR "Environment and cache var for NDK is empty. Could not find the NDK installation folder")
 endif()
 
 set(LY_ANDROID_NDK_TOOLCHAIN ${LY_NDK_DIR}/build/cmake/android.toolchain.cmake)
diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index 5e9f6ad0ce..46130f1345 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -202,18 +202,16 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
     endforeach()
     list(JOIN INCLUDE_DIRECTORIES_PLACEHOLDER "\n" INCLUDE_DIRECTORIES_PLACEHOLDER)
 
-    string(REPEAT " " 8 PLACEHOLDER_INDENT)
-    get_target_property(RUNTIME_DEPENDENCIES_PLACEHOLDER ${TARGET_NAME} MANUALLY_ADDED_DEPENDENCIES)
-    if(RUNTIME_DEPENDENCIES_PLACEHOLDER) # not found properties return the name of the variable with a "-NOTFOUND" at the end, here we set it to empty if not found
-        set(RUNTIME_DEPENDENCIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${RUNTIME_DEPENDENCIES_PLACEHOLDER}")
-        list(JOIN RUNTIME_DEPENDENCIES_PLACEHOLDER "\n${PLACEHOLDER_INDENT}" RUNTIME_DEPENDENCIES_PLACEHOLDER)
-    else()
-        unset(RUNTIME_DEPENDENCIES_PLACEHOLDER)
-    endif()
-
     string(REPEAT " " 12 PLACEHOLDER_INDENT)
     get_property(interface_build_dependencies_props TARGET ${TARGET_NAME} PROPERTY LY_DELAYED_LINK)
     unset(INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER)
+    # We can have private build dependencies that contains direct or indirect runtime dependencies.
+    # Since imported targets cannot contain build dependencies, we need another way to propagate the runtime dependencies.
+    # We dont want to put such dependencies in the interface because a user can mistakenly use a symbol that is not available 
+    # when using the engine from source (and that the author of the target didn't want to set public). 
+    # To overcome this, we will actually expose the private build dependencies as runtime dependencies. Our runtime dependency
+    # algorithm will walk recursively also through static libraries and will only copy binaries to the output.
+    unset(RUNTIME_DEPENDENCIES_PLACEHOLDER) 
     if(interface_build_dependencies_props)
         cmake_parse_arguments(build_deps "" "" "PRIVATE;PUBLIC;INTERFACE" ${interface_build_dependencies_props})
         # Interface and public dependencies should always be exposed
@@ -226,6 +224,14 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
         if("${target_type}" STREQUAL "STATIC_LIBRARY")
             set(build_deps_target "${build_deps_target};${build_deps_PRIVATE}")
         endif()
+
+        # But we will also pass the private dependencies as runtime dependencies (as long as they are targets, note the comment above)
+        foreach(build_dep_private IN LISTS build_deps_PRIVATE)
+            if(TARGET ${build_dep_private})
+                list(APPEND RUNTIME_DEPENDENCIES_PLACEHOLDER "${build_dep_private}")
+            endif()
+        endforeach()
+        
         foreach(build_dependency IN LISTS build_deps_target)
             # Skip wrapping produced when targets are not created in the same directory
             if(build_dependency)
@@ -235,6 +241,18 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
     endif()
     list(JOIN INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER "\n" INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER)
 
+    string(REPEAT " " 8 PLACEHOLDER_INDENT)
+    get_target_property(manually_added_dependencies ${TARGET_NAME} MANUALLY_ADDED_DEPENDENCIES)
+    if(manually_added_dependencies) # not found properties return the name of the variable with a "-NOTFOUND" at the end, here we set it to empty if not found
+        list(APPEND RUNTIME_DEPENDENCIES_PLACEHOLDER ${manually_added_dependencies})
+    endif()
+    if(RUNTIME_DEPENDENCIES_PLACEHOLDER)   
+        set(RUNTIME_DEPENDENCIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${RUNTIME_DEPENDENCIES_PLACEHOLDER}")
+        list(JOIN RUNTIME_DEPENDENCIES_PLACEHOLDER "\n${PLACEHOLDER_INDENT}" RUNTIME_DEPENDENCIES_PLACEHOLDER)
+    else()
+        unset(RUNTIME_DEPENDENCIES_PLACEHOLDER)
+    endif()
+
     string(REPEAT " " 8 PLACEHOLDER_INDENT)
     # If a target has an LY_PROJECT_NAME property, forward that property to new target
     get_target_property(target_project_association ${TARGET_NAME} LY_PROJECT_NAME)
@@ -557,9 +575,13 @@ function(ly_setup_runtime_dependencies)
             string(TOUPPER ${conf} UCONF)
             ly_install(CODE
 "function(ly_copy source_file target_directory)
-    cmake_path(GET source_file FILENAME file_name)
-    if(NOT EXISTS \${target_directory}/\${file_name})
-        file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS})
+    cmake_path(GET source_file FILENAME target_filename)
+    cmake_path(APPEND full_target_directory \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\" \"\${target_directory}\")
+    cmake_path(APPEND target_file \"\${full_target_directory}\" \"\${target_filename}\")
+    if(\"\${source_file}\" IS_NEWER_THAN \"\${target_file}\")
+        message(STATUS \"Copying \${source_file} to \${full_target_directory}...\")
+        file(COPY \"\${source_file}\" DESTINATION \"\${full_target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS} FOLLOW_SYMLINK_CHAIN)
+        file(TOUCH_NOCREATE \"${target_file}\")
     endif()
 endfunction()"
                 COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}
@@ -584,12 +606,7 @@ endfunction()"
         endif()
 
         # runtime dependencies that need to be copied to the output
-        # Anywhere CMAKE_INSTALL_PREFIX is used, it has to be escaped so it is baked into the cmake_install.cmake script instead
-        # of baking the path. This is needed so `cmake --install --prefix <someprefix>` works regardless of the CMAKE_INSTALL_PREFIX
-        # used to generate the solution.
-        # CMAKE_INSTALL_PREFIX is still used when building the INSTALL target
-        set(install_output_folder "\${CMAKE_INSTALL_PREFIX}/${runtime_output_directory}")
-        set(target_file_dir "${install_output_folder}/${target_runtime_output_subdirectory}")
+        set(target_file_dir "${runtime_output_directory}/${target_runtime_output_subdirectory}")
         ly_get_runtime_dependencies(runtime_dependencies ${target})
         foreach(runtime_dependency ${runtime_dependencies})
             unset(runtime_command)
@@ -798,4 +815,4 @@ set(LY_CORE_COMPONENT_ALREADY_INCLUDED FALSE)"
         ly_post_install_steps()
     endif()
 
-endfunction()
\ No newline at end of file
+endfunction()
diff --git a/cmake/Platform/Common/PackagingPostBuild_common.cmake b/cmake/Platform/Common/PackagingPostBuild_common.cmake
new file mode 100644
index 0000000000..6e3c7ddf0b
--- /dev/null
+++ b/cmake/Platform/Common/PackagingPostBuild_common.cmake
@@ -0,0 +1,114 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+message(STATUS "Executing packaging postbuild...")
+
+# ly_is_s3_url
+# if the given URL is a s3 url of thr form "s3://(stuff)" then sets
+# the output_variable_name to TRUE otherwise unsets it.
+function (ly_is_s3_url download_url output_variable_name)
+    if ("${download_url}" MATCHES "s3://.*")
+        set(${output_variable_name} TRUE PARENT_SCOPE)
+    else()
+        unset(${output_variable_name} PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(ly_upload_to_url in_url in_local_path in_file_regex)
+
+    message(STATUS "Uploading ${in_local_path}/${in_file_regex} artifacts to ${CPACK_UPLOAD_URL}")
+    ly_is_s3_url(${in_url} _is_s3_bucket)
+    if(NOT _is_s3_bucket)
+        message(FATAL_ERROR "Only S3 installer uploading is supported at this time")
+    endif()
+
+    # strip the scheme and extract the bucket/key prefix from the URL
+    string(REPLACE "s3://" "" _stripped_url ${in_url})
+    string(REPLACE "/" ";" _tokens ${_stripped_url})
+
+    list(POP_FRONT _tokens _bucket)
+    string(JOIN "/" _prefix ${_tokens})
+
+    set(_extra_args [[{"ACL":"bucket-owner-full-control"}]])
+
+    file(TO_NATIVE_PATH "${LY_ROOT_FOLDER}/scripts/build/tools/upload_to_s3.py" _upload_script)
+
+    set(_upload_command
+        ${CPACK_LY_PYTHON_CMD} -s
+        -u ${_upload_script}
+        --base_dir ${in_local_path}
+        --file_regex="${in_file_regex}"
+        --bucket ${_bucket}
+        --key_prefix ${_prefix}
+        --extra_args ${_extra_args}
+    )
+
+    if(CPACK_AWS_PROFILE)
+        list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE})
+    endif()
+
+    execute_process(
+        COMMAND ${_upload_command}
+        RESULT_VARIABLE _upload_result
+        OUTPUT_VARIABLE _upload_output
+        ERROR_VARIABLE _upload_error
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if (${_upload_result} EQUAL 0)
+        message(STATUS "Artifact uploading complete!")
+    else()
+        message(FATAL_ERROR "An error occurred uploading to s3.\n  Output: ${_upload_output}\n\  Error: ${_upload_error}")
+    endif()
+endfunction()
+
+function(ly_upload_to_latest in_url in_path)
+
+    message(STATUS "Updating latest tagged build")
+
+    # make sure we can extra the commit info from the URL first
+    string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)"
+        commit_info ${in_url}
+    )
+    if(NOT commit_info)
+        message(FATAL_ERROR "Failed to extract the build tag")
+    endif()
+
+    # Create a temp directory where we are going to rename the file to take out the version
+    # and then upload it
+    set(temp_dir ${CPACK_BINARY_DIR}/temp)
+    if(NOT EXISTS ${temp_dir})
+        file(MAKE_DIRECTORY ${temp_dir})
+    endif()
+    file(COPY ${in_path} DESTINATION ${temp_dir})
+
+    cmake_path(GET in_path FILENAME in_path_filename)
+    string(REPLACE "_${CPACK_PACKAGE_VERSION}" "" non_versioned_in_path_filename ${in_path_filename})
+    file(RENAME "${temp_dir}/${in_path_filename}" "${temp_dir}/${non_versioned_in_path_filename}")
+
+    # include the commit info in a text file that will live next to the exe
+    set(_temp_info_file ${temp_dir}/build_tag.txt)
+    file(WRITE ${_temp_info_file} ${commit_info})
+
+    # update the URL and upload
+    string(REPLACE
+        ${commit_info} "Latest"
+        latest_upload_url ${in_url}
+    )
+
+    ly_upload_to_url(
+        ${latest_upload_url}
+        ${temp_dir}
+        ".*(${non_versioned_in_path_filename}|build_tag.txt)$"
+    )
+
+    # cleanup the temp files
+    file(REMOVE_RECURSE ${temp_dir})
+    message(STATUS "Latest build update complete!")
+
+endfunction()
\ No newline at end of file
diff --git a/cmake/Platform/Common/PackagingPreBuild_common.cmake b/cmake/Platform/Common/PackagingPreBuild_common.cmake
new file mode 100644
index 0000000000..e6b8a7796e
--- /dev/null
+++ b/cmake/Platform/Common/PackagingPreBuild_common.cmake
@@ -0,0 +1,5 @@
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
diff --git a/cmake/Platform/Common/RuntimeDependencies_common.cmake b/cmake/Platform/Common/RuntimeDependencies_common.cmake
index 60e55453f8..a03f7f667b 100644
--- a/cmake/Platform/Common/RuntimeDependencies_common.cmake
+++ b/cmake/Platform/Common/RuntimeDependencies_common.cmake
@@ -272,7 +272,7 @@ function(ly_delayed_generate_runtime_dependencies)
         endforeach()
 
         # Generate the output file, note the STAMP_OUTPUT_FILE need to match with the one defined in LYWrappers.cmake
-        set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$<CONFIG>/${target}_$<CONFIG>.stamp)
+        set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$<CONFIG>/${target}.stamp)
         set(target_file_dir "$<TARGET_FILE_DIR:${target}>")
         set(target_file "$<TARGET_FILE:${target}>")
         ly_file_read(${LY_RUNTIME_DEPENDENCIES_TEMPLATE} template_file)
diff --git a/cmake/Platform/Common/runtime_dependencies_common.cmake.in b/cmake/Platform/Common/runtime_dependencies_common.cmake.in
index 6e41dbaad1..8717710a3b 100644
--- a/cmake/Platform/Common/runtime_dependencies_common.cmake.in
+++ b/cmake/Platform/Common/runtime_dependencies_common.cmake.in
@@ -9,14 +9,22 @@
 cmake_policy(SET CMP0012 NEW) # new policy for the if that evaluates a boolean out of "if(NOT ${same_location})"
 
 function(ly_copy source_file target_directory)
-    get_filename_component(target_filename "${source_file}" NAME)
-    cmake_path(COMPARE "${source_file}" EQUAL "${target_directory}/${target_filename}" same_location)
+    cmake_path(GET source_file FILENAME target_filename)
+    cmake_path(APPEND target_file "${target_directory}" "${target_filename}")
+    cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location)
     if(NOT ${same_location})
-        file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300)
-        if("${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
+        file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300)
+        file(SIZE "${source_file}" source_file_size)
+        if(EXISTS "${target_file}")
+            file(SIZE "${target_file}" target_file_size)
+        else()
+            set(target_file_size 0)
+        endif()
+        if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}")
             message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
+            file(MAKE_DIRECTORY "${full_target_directory}")
             file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
-            file(TOUCH_NOCREATE ${target_directory}/${target_filename})
+            file(TOUCH_NOCREATE ${target_file})
         endif()
     endif()    
 endfunction()
diff --git a/cmake/Platform/Linux/CompilerSettings_linux.cmake b/cmake/Platform/Linux/CompilerSettings_linux.cmake
new file mode 100644
index 0000000000..9bb629c53b
--- /dev/null
+++ b/cmake/Platform/Linux/CompilerSettings_linux.cmake
@@ -0,0 +1,34 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+if(NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER AND NOT "$ENV{CC}" AND NOT "$ENV{CXX}")
+    set(path_search
+        /bin
+        /usr/bin
+        /usr/local/bin
+        /sbin
+        /usr/sbin
+        /usr/local/sbin
+    )
+    list(TRANSFORM path_search APPEND "/clang-[0-9]*")
+    file(GLOB clang_versions ${path_search})
+    if(clang_versions)
+        # Find and pick the highest installed version
+        list(SORT clang_versions COMPARE NATURAL)
+        list(GET clang_versions 0 clang_higher_version_path)
+        string(REGEX MATCH "clang-([0-9.]*)" clang_higher_version ${clang_higher_version_path})
+        if(CMAKE_MATCH_1)
+            set(CMAKE_C_COMPILER clang-${CMAKE_MATCH_1})
+            set(CMAKE_CXX_COMPILER clang++-${CMAKE_MATCH_1})
+        else()
+            message(FATAL_ERROR "Clang not found, please install clang")
+        endif()
+    else()
+        message(FATAL_ERROR "Clang not found, please install clang")
+    endif()
+endif()
diff --git a/cmake/Platform/Linux/Install_linux.cmake b/cmake/Platform/Linux/Install_linux.cmake
index 02baa6e61e..0f5494131a 100644
--- a/cmake/Platform/Linux/Install_linux.cmake
+++ b/cmake/Platform/Linux/Install_linux.cmake
@@ -9,14 +9,27 @@
 #! ly_setup_runtime_dependencies_copy_function_override: Linux-specific copy function to handle RPATH fixes
 set(ly_copy_template [[
 function(ly_copy source_file target_directory)
-    file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
-    get_filename_component(target_filename_ext "${source_file}" LAST_EXT)
-    if("${source_file}" MATCHES "qt/plugins" AND "${target_filename_ext}" STREQUAL ".so")
-        get_filename_component(target_filename "${source_file}" NAME)
-        file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..")
-    elseif("${source_file}" MATCHES "lrelease")
-        get_filename_component(target_filename "${source_file}" NAME)
-        file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../lib" NEW_RPATH "\$ORIGIN")
+    cmake_path(GET source_file FILENAME target_filename)
+    cmake_path(APPEND full_target_directory "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "${target_directory}")
+    cmake_path(APPEND target_file "${full_target_directory}" "${target_filename}")
+    if("${source_file}" IS_NEWER_THAN "${target_file}")
+        message(STATUS "Copying ${source_file} to ${full_target_directory}...")
+        file(MAKE_DIRECTORY "${full_target_directory}")
+        file(COPY "${source_file}" DESTINATION "${full_target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
+        file(TOUCH_NOCREATE "${target_file}")
+        
+        # Special case for install
+        cmake_PATH(GET source_file EXTENSION target_filename_ext)
+        if("${target_filename_ext}" STREQUAL ".so")
+            if("${source_file}" MATCHES "qt/plugins")
+                file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..")
+            endif()
+            if(CMAKE_INSTALL_DO_STRIP)
+                execute_process(COMMAND @CMAKE_STRIP@ "${target_file}")
+            endif()
+        elseif("${source_file}" MATCHES "lrelease")
+            file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../lib" NEW_RPATH "\$ORIGIN")
+        endif()
     endif()
 endfunction()]])
 
diff --git a/cmake/Platform/Linux/PAL_linux.cmake b/cmake/Platform/Linux/PAL_linux.cmake
index e74adb287e..b7fd062c8c 100644
--- a/cmake/Platform/Linux/PAL_linux.cmake
+++ b/cmake/Platform/Linux/PAL_linux.cmake
@@ -16,14 +16,14 @@ ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS)
 ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE FALSE)
-ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED FALSE)
+ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED TRUE)
 
 ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE)
 
 # Test library support
 ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED TRUE)
-ly_set(PAL_TRAIT_TEST_LYTESTTOOLS_SUPPORTED FALSE)
+ly_set(PAL_TRAIT_TEST_LYTESTTOOLS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_PYTEST_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_TARGET_TYPE MODULE)
 
diff --git a/cmake/Platform/Linux/Packaging/postinst.in b/cmake/Platform/Linux/Packaging/postinst.in
new file mode 100644
index 0000000000..c6c0ba228d
--- /dev/null
+++ b/cmake/Platform/Linux/Packaging/postinst.in
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set -o errexit # exit on the first failure encountered
+
+{
+    if [[ ! -f "/usr/lib/x86_64-linux-gnu/libffi.so.6" ]]; then
+        sudo ln -s /usr/lib/x86_64-linux-gnu/libffi.so.7 /usr/lib/x86_64-linux-gnu/libffi.so.6
+    fi
+
+    pushd @CPACK_PACKAGING_INSTALL_PREFIX@
+    python/get_python.sh
+    chown -R $SUDO_USER .
+    popd
+} &> /dev/null # hide output
diff --git a/cmake/Platform/Linux/Packaging/postrm.in b/cmake/Platform/Linux/Packaging/postrm.in
new file mode 100644
index 0000000000..cd6f37abe4
--- /dev/null
+++ b/cmake/Platform/Linux/Packaging/postrm.in
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set -o errexit # exit on the first failure encountered
diff --git a/cmake/Platform/Linux/Packaging/prerm.in b/cmake/Platform/Linux/Packaging/prerm.in
new file mode 100644
index 0000000000..843f21da24
--- /dev/null
+++ b/cmake/Platform/Linux/Packaging/prerm.in
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set -o errexit # exit on the first failure encountered
+
+{
+    # We dont remove this symlink that we potentially created because the user could have
+    # installed themselves. 
+    #if [[ -L "/usr/lib/x86_64-linux-gnu/libffi.so.6" ]]; then
+    #    sudo rm /usr/lib/x86_64-linux-gnu/libffi.so.6
+    #fi
+
+    pushd @CPACK_PACKAGING_INSTALL_PREFIX@
+    # delete python downloads
+    rm -rf python/downloaded_packages python/runtime
+    find . -type d -name *.egg-info -prune -exec rm -rf {} \;
+    popd
+} &> /dev/null # hide output
diff --git a/cmake/Platform/Linux/PackagingCodeSign_linux.cmake b/cmake/Platform/Linux/PackagingCodeSign_linux.cmake
new file mode 100644
index 0000000000..c4b6375385
--- /dev/null
+++ b/cmake/Platform/Linux/PackagingCodeSign_linux.cmake
@@ -0,0 +1,33 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+function(ly_sign_binaries in_path)
+    message(STATUS "Executing package signing...")
+    file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path)
+    unset(_signing_command)
+
+    cmake_path(SET _sign_script "${_root_path}/scripts/signer/Platform/Linux/signer.sh")
+
+    list(APPEND _signing_command
+        ${_sign_script}
+    )
+    message(STATUS "Signing package files in ${in_path}")
+    execute_process(
+        COMMAND ${_signing_command} ${in_path}
+        RESULT_VARIABLE _signing_result
+        ERROR_VARIABLE _signing_errors
+        OUTPUT_VARIABLE _signing_output
+        ECHO_OUTPUT_VARIABLE
+    )
+
+    if(NOT ${_signing_result} EQUAL 0)
+        message(FATAL_ERROR "An error occurred during signing files.  ${_signing_errors}")
+    else()
+        message(STATUS "Signing complete!")
+    endif()
+endfunction()
diff --git a/cmake/Platform/Linux/PackagingPostBuild_linux.cmake b/cmake/Platform/Linux/PackagingPostBuild_linux.cmake
new file mode 100644
index 0000000000..ebeefe3833
--- /dev/null
+++ b/cmake/Platform/Linux/PackagingPostBuild_linux.cmake
@@ -0,0 +1,64 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER)
+include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake)
+include(${CPACK_CODESIGN_SCRIPT})
+
+file(${CPACK_PACKAGE_CHECKSUM} ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb file_checksum)
+file(WRITE ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb.sha256 "${file_checksum}  ${CPACK_PACKAGE_FILE_NAME}.deb")
+
+if(CPACK_UPLOAD_URL)
+
+    # use the internal default path if somehow not specified from cpack_configure_downloads
+    if(NOT CPACK_UPLOAD_DIRECTORY)
+        set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads)
+    endif()
+
+    # Sign and regenerate checksum
+    ly_sign_binaries("${CPACK_TOPLEVEL_DIRECTORY}/*.deb" "")
+    file(WRITE ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb.sha256 "${file_checksum}  ${CPACK_PACKAGE_FILE_NAME}.deb")
+
+    # Copy the artifacts intended to be uploaded to a remote server into the folder specified
+    # through CPACK_UPLOAD_DIRECTORY. This mimics the same process cpack does natively for
+    # some other frameworks that have built-in online installer support.
+    message(STATUS "Copying packaging artifacts to upload directory...")
+    file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY})
+    file(GLOB _artifacts 
+        "${CPACK_TOPLEVEL_DIRECTORY}/*.deb" 
+        "${CPACK_TOPLEVEL_DIRECTORY}/*.sha256"
+        "${LY_ROOT_FOLDER}/scripts/signer/Platform/Linux/*.gpg"
+    )
+    file(COPY ${_artifacts}
+        DESTINATION ${CPACK_UPLOAD_DIRECTORY}
+    )
+    message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}")
+
+    ly_upload_to_url(
+        ${CPACK_UPLOAD_URL}
+        ${CPACK_UPLOAD_DIRECTORY}
+        ".*(.deb|.gpg|.sha256)$"
+    )
+
+    # for auto tagged builds, we will also upload a second copy of just the boostrapper
+    # to a special "Latest" folder under the branch in place of the commit date/hash
+    if(CPACK_AUTO_GEN_TAG)
+
+        set(latest_deb_package "${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_NAME}_latest.deb")
+        file(COPY_FILE 
+            ${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb
+            ${latest_deb_package}
+        )
+        ly_upload_to_latest(${CPACK_UPLOAD_URL} ${latest_deb_package})
+        
+        # Generate a checksum file for latest and upload it
+        set(latest_hash_file "${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_NAME}_latest.deb.sha256")
+        file(WRITE "${latest_hash_file}" "${file_checksum}  ${CPACK_PACKAGE_NAME}_latest.deb")
+        ly_upload_to_latest(${CPACK_UPLOAD_URL} "${latest_hash_file}")
+    endif()
+endif()
diff --git a/cmake/Platform/Linux/PackagingPreBuild_linux.cmake b/cmake/Platform/Linux/PackagingPreBuild_linux.cmake
new file mode 100644
index 0000000000..39108355ea
--- /dev/null
+++ b/cmake/Platform/Linux/PackagingPreBuild_linux.cmake
@@ -0,0 +1,14 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER)
+include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake)
+
+if(NOT CPACK_UPLOAD_URL) # Skip this step if we are not uploading the package
+    return()
+endif()
diff --git a/cmake/Platform/Linux/Packaging_linux.cmake b/cmake/Platform/Linux/Packaging_linux.cmake
new file mode 100644
index 0000000000..2e178429c3
--- /dev/null
+++ b/cmake/Platform/Linux/Packaging_linux.cmake
@@ -0,0 +1,56 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(CPACK_GENERATOR DEB)
+
+set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}/${LY_VERSION_STRING}")
+
+set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-linux-x86_64")
+set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.tar.gz")
+set(CPACK_CMAKE_PACKAGE_HASH "3f827544f9c82e74ddf5016461fdfcfea4ede58a26f82612f473bf6bfad8bfc2")
+
+# get all the package dependencies, extracted from scripts\build\build_node\Platform\Linux\package-list.ubuntu-focal.txt
+set(package_dependencies
+    libffi7
+    clang-12
+    ninja-build
+    # Build Libraries
+    libglu1-mesa-dev                        # For Qt (GL dependency)
+    libxcb-xinerama0                        # For Qt plugins at runtime
+    libxcb-xinput0                          # For Qt plugins at runtime
+    libfontconfig1-dev                      # For Qt plugins at runtime
+    libcurl4-openssl-dev                    # For HttpRequestor
+    # libsdl2-dev                             # for WWise/Audio
+    libxcb-xkb-dev                          # For xcb keyboard input
+    libxkbcommon-x11-dev                    # For xcb keyboard input
+    libxkbcommon-dev                        # For xcb keyboard input
+    libxcb-xfixes0-dev                      # For mouse input
+    libxcb-xinput-dev                       # For mouse input
+    zlib1g-dev
+    mesa-common-dev
+)
+list(JOIN package_dependencies "," CPACK_DEBIAN_PACKAGE_DEPENDS)
+
+# Post-installation and pre/post removal scripts
+configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postinst.in"
+    "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postinst"
+    @ONLY
+)
+configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/prerm.in"
+    "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/prerm"
+    @ONLY
+)
+configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postrm.in"
+    "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postrm"
+    @ONLY
+)
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
+    ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/postinst 
+    ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/prerm 
+    ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/postrm
+)
diff --git a/cmake/Platform/Linux/platform_linux_files.cmake b/cmake/Platform/Linux/platform_linux_files.cmake
index fa5545cd26..dd10c47ca6 100644
--- a/cmake/Platform/Linux/platform_linux_files.cmake
+++ b/cmake/Platform/Linux/platform_linux_files.cmake
@@ -10,11 +10,20 @@ set(FILES
     ../Common/Configurations_common.cmake
     ../Common/Clang/Configurations_clang.cmake
     ../Common/Install_common.cmake
+    ../Common/PackagingPostBuild_common.cmake
+    ../Common/PackagingPreBuild_common.cmake
+    CompilerSettings_linux.cmake
     Configurations_linux.cmake
     Install_linux.cmake
     LYTestWrappers_linux.cmake
     LYWrappers_linux.cmake
+    Packaging_linux.cmake
+    PackagingCodeSign_linux.cmake
+    PackagingPostBuild_linux.cmake
+    PackagingPreBuild_linux.cmake
     PAL_linux.cmake
     PALDetection_linux.cmake
     RPathChange.cmake
+    runtime_dependencies_linux.cmake.in
+    RuntimeDependencies_linux.cmake    
 )
diff --git a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in
index 394252e284..16445ef8d9 100644
--- a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in
+++ b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in
@@ -9,23 +9,34 @@
 cmake_policy(SET CMP0012 NEW) # new policy for the if that evaluates a boolean out of "if(NOT ${same_location})"
 
 function(ly_copy source_file target_directory)
-    get_filename_component(target_filename "${source_file}" NAME)
-    get_filename_component(target_filename_ext "${source_file}" LAST_EXT)
-    cmake_path(COMPARE "${source_file}" EQUAL "${target_directory}/${target_filename}" same_location)
+    cmake_path(GET source_file FILENAME target_filename)
+    cmake_PATH(GET source_file EXTENSION target_filename_ext)
+    cmake_path(APPEND target_file "${target_directory}" "${target_filename}")
+    cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location)
     if(NOT ${same_location})
-        file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300)
-        if("${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
+        file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300)
+        file(SIZE "${source_file}" source_file_size)
+        if(EXISTS "${target_file}")
+            file(SIZE "${target_file}" target_file_size)
+        else()
+            set(target_file_size 0)
+        endif()
+        if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}")
+            message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
+            file(MAKE_DIRECTORY "${full_target_directory}")
             file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
-            
+            file(TOUCH_NOCREATE "${target_file}")
+
             # Special case, shared libraries that are copied from qt/plugins have their RPATH set to \$ORIGIN/../../lib 
             # which is the correct relative path based on the source location. But when we copy it to their subfolder, 
             # the rpath needs to be adjusted to the parent ($ORIGIN/..)
             if("${source_file}" MATCHES "qt/plugins" AND "${target_filename_ext}" STREQUAL ".so")
-                file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..")
+                file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..")
             endif()
-
         endif()
     endif()    
 endfunction()
 
 @LY_COPY_COMMANDS@
+
+file(TOUCH @STAMP_OUTPUT_FILE@)
diff --git a/cmake/Platform/Mac/InstallUtils_mac.cmake.in b/cmake/Platform/Mac/InstallUtils_mac.cmake.in
index d73c4db459..89ce4a59f2 100644
--- a/cmake/Platform/Mac/InstallUtils_mac.cmake.in
+++ b/cmake/Platform/Mac/InstallUtils_mac.cmake.in
@@ -130,27 +130,36 @@ endfunction()
 
 function(ly_copy source_file target_directory)
     
-    if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]")
+    if("${source_file}" MATCHES "\\.[Ff]ramework")
 
         # fixup origin to copy the whole Framework folder
         string(REGEX REPLACE "(.*\\.[Ff]ramework).*" "\\1" source_file "${source_file}")
 
     endif()
-    get_filename_component(target_filename "${source_file}" NAME)
-    file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
 
-    # Our Qt and Python frameworks aren't in the correct bundle format to be codesigned.
-    if("${target_filename}" MATCHES "(Qt[^.]+)\\.[Ff]ramework")
-        fixup_qt_framework(${CMAKE_MATCH_1} "${target_directory}/${target_filename}")
-        # For some Qt frameworks(QtCore), signing the bundle doesn't work because of bundle
-        # format issues(despite the fixes above). But once we've patched the framework above, there's
-        # only one executable that we need to sign so we can do it directly.
-        set(target_filename "${target_filename}/Versions/5/${CMAKE_MATCH_1}")
-    elseif("${target_filename}" MATCHES "Python.framework")
-        fixup_python_framework("${target_directory}/${target_filename}")
-        codesign_python_framework_binaries("${target_directory}/${target_filename}")
+    cmake_path(GET source_file FILENAME target_filename)
+    cmake_path(APPEND full_target_directory "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "${target_directory}")
+    cmake_path(APPEND target_file "${full_target_directory}" "${target_filename}")
+    
+    if("${source_file}" IS_NEWER_THAN "${target_file}")
+        message(STATUS "Copying ${source_file} to ${full_target_directory}...")
+        file(MAKE_DIRECTORY "${full_target_directory}")
+        file(COPY "${source_file}" DESTINATION "${full_target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
+        file(TOUCH_NOCREATE "${target_file}")
+
+        # Our Qt and Python frameworks aren't in the correct bundle format to be codesigned.
+        if("${target_filename}" MATCHES "(Qt[^.]+)\\.[Ff]ramework")
+            fixup_qt_framework(${CMAKE_MATCH_1} "${target_file}")
+            # For some Qt frameworks(QtCore), signing the bundle doesn't work because of bundle
+            # format issues(despite the fixes above). But once we've patched the framework above, there's
+            # only one executable that we need to sign so we can do it directly.
+            set(target_filename "${target_filename}/Versions/5/${CMAKE_MATCH_1}")
+        elseif("${target_filename}" MATCHES "Python.framework")
+            fixup_python_framework("${target_file}")
+            codesign_python_framework_binaries("${target_file}")
+        endif()
+        codesign_file("${target_file}" "none")
     endif()
-    codesign_file("${target_directory}/${target_filename}" "none")
 
 endfunction()
 
diff --git a/cmake/Platform/Mac/Install_mac.cmake b/cmake/Platform/Mac/Install_mac.cmake
index c75d860c3e..d5ab5d0fed 100644
--- a/cmake/Platform/Mac/Install_mac.cmake
+++ b/cmake/Platform/Mac/Install_mac.cmake
@@ -147,4 +147,3 @@ function(ly_post_install_steps)
     ")
 
 endfunction()
-
diff --git a/cmake/Platform/Mac/PackagingPostBuild_mac.cmake b/cmake/Platform/Mac/PackagingPostBuild_mac.cmake
new file mode 100644
index 0000000000..5fa3787c21
--- /dev/null
+++ b/cmake/Platform/Mac/PackagingPostBuild_mac.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER)
+include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake)
diff --git a/cmake/Platform/Mac/PackagingPreBuild_mac.cmake b/cmake/Platform/Mac/PackagingPreBuild_mac.cmake
new file mode 100644
index 0000000000..1d30e21767
--- /dev/null
+++ b/cmake/Platform/Mac/PackagingPreBuild_mac.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER)
+include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake)
diff --git a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
index 11551f608f..892a90640f 100644
--- a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
+++ b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
@@ -34,7 +34,7 @@ endif()
 
 function(ly_copy source_file target_directory)
     
-    get_filename_component(target_filename "${source_file}" NAME)
+    cmake_path(GET source_file FILENAME target_filename)
     
     # If target_directory is a bundle
     if("${target_directory}" MATCHES "\\.app/Contents/MacOS")
@@ -113,20 +113,37 @@ function(ly_copy source_file target_directory)
 
     endif()
 
-    cmake_path(COMPARE "${source_file}" EQUAL "${target_directory}/${target_filename}" same_location)
+    cmake_path(APPEND target_file "${target_directory}" "${target_filename}")
+    cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location)
     if(NOT ${same_location})
         if(NOT EXISTS "${target_directory}")
             file(MAKE_DIRECTORY "${target_directory}")
         endif()
-        if(NOT EXISTS "${target_directory}/${target_filename}" OR "${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
-            message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
-            if(NOT target_is_bundle)
-                # if it is a bundle, there is no contention about the files in the destination, each bundle target will copy everything
-                # we dont want these files to invalidate the bundle and cause a new signature
-                file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300)
+
+        set(is_framework FALSE)
+        if("${source_file}" MATCHES "\\.[Ff]ramework")
+            set(is_framework TRUE)
+        endif()
+        if(NOT is_framework)
+            # if it is a bundle, there is no contention about the files in the destination, each bundle target will copy everything
+            # we dont want these files to invalidate the bundle and cause a new signature
+            file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300)
+            file(SIZE "${source_file}" source_file_size)
+            if(EXISTS "${target_file}")
+                file(SIZE "${target_file}" target_file_size)
+            else()
+                set(target_file_size 0)
             endif()
+        else()
+            set(source_file_size 0)
+            set(target_file_size 0)
+        endif()
+        
+        if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}")
+            message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
+            file(MAKE_DIRECTORY "${target_directory}")
             file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
-            file(TOUCH_NOCREATE ${target_directory}/${target_filename})
+            file(TOUCH_NOCREATE "${target_file}")
             set(anything_new TRUE PARENT_SCOPE)
         endif()
     endif()
diff --git a/cmake/Platform/Windows/PackagingCodeSign_windows.cmake b/cmake/Platform/Windows/PackagingCodeSign_windows.cmake
new file mode 100644
index 0000000000..8ef7f79e40
--- /dev/null
+++ b/cmake/Platform/Windows/PackagingCodeSign_windows.cmake
@@ -0,0 +1,56 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+function(ly_sign_binaries in_path in_path_type)
+    message(STATUS "Executing package signing...")
+    file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path)
+    unset(_signing_command)
+    
+    cmake_path(SET _sign_script "${_root_path}/scripts/signer/Platform/Windows/signer.ps1")
+
+    find_program(_psiexec_path psexec.exe)
+    if(_psiexec_path)
+        list(APPEND _signing_command
+            ${_psiexec_path}
+            -accepteula
+            -nobanner
+            -s
+        )
+    endif()
+
+    find_program(_powershell_path powershell.exe REQUIRED)
+    list(APPEND _signing_command
+        ${_powershell_path}
+        -NoLogo
+        -ExecutionPolicy Bypass
+        -File ${_sign_script}
+    )
+
+    # This requires to have a valid local certificate. In continuous integration, these certificates are stored
+    # in the machine directly. 
+    # You can generate a test certificate to be able to run this in a PowerShell elevated promp with:
+    # New-SelfSignedCertificate -DnsName foo.o3de.com -Type CodeSigning -CertStoreLocation Cert:\CurrentUser\My
+    # Export-Certificate -Cert (Get-ChildItem Cert:\CurrentUser\My\<cert thumbprint>) -Filepath "c:\selfsigned.crt"
+    # Import-Certificate -FilePath "c:\selfsigned.crt" -Cert Cert:\CurrentUser\TrustedPublisher
+    # Import-Certificate -FilePath "c:\selfsigned.crt" -Cert Cert:\CurrentUser\Root
+    
+    message(STATUS "Signing ${in_path_type} files in ${in_path}")
+    execute_process(
+        COMMAND ${_signing_command} -${in_path_type} ${in_path}
+        RESULT_VARIABLE _signing_result
+        ERROR_VARIABLE _signing_errors
+        OUTPUT_VARIABLE _signing_output
+        ECHO_OUTPUT_VARIABLE
+    )
+
+    if(NOT ${_signing_result} EQUAL 0)
+        message(FATAL_ERROR "An error occurred during signing files for ${in_path_type}.  ${_signing_errors}")
+    else()
+        message(STATUS "Signing complete!")
+    endif()
+endfunction()
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
deleted file mode 100644
index ac457bea87..0000000000
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ /dev/null
@@ -1,249 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# convert the path to a windows style path using string replace because TO_NATIVE_PATH
-# only works on real paths
-string(REPLACE "/" "\\" _fixed_package_install_dir ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-
-# directory where the auto generated files live e.g <build>/_CPack_Package/win64/WIX
-set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY})
-set(_bootstrap_out_dir "${CPACK_TOPLEVEL_DIRECTORY}/bootstrap")
-
-set(_bootstrap_filename "${CPACK_PACKAGE_FILE_NAME}_installer.exe")
-set(_bootstrap_output_file ${_cpack_wix_out_dir}/${_bootstrap_filename})
-
-set(_ext_flags
-    -ext WixBalExtension
-)
-
-set(_addtional_defines
-    -dCPACK_BOOTSTRAP_THEME_FILE=${CPACK_BINARY_DIR}/BootstrapperTheme
-    -dCPACK_BOOTSTRAP_UPGRADE_GUID=${CPACK_WIX_BOOTSTRAP_UPGRADE_GUID}
-    -dCPACK_DOWNLOAD_SITE=${CPACK_DOWNLOAD_SITE}
-    -dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir}
-    -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME}
-    -dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir}
-    -dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO}
-    -dCPACK_RESOURCE_PATH=${CPACK_SOURCE_DIR}/Platform/Windows/Packaging
-)
-
-if(CPACK_LICENSE_URL)
-    list(APPEND _addtional_defines -dCPACK_LICENSE_URL=${CPACK_LICENSE_URL})
-endif()
-
-set(_candle_command
-    ${CPACK_WIX_CANDLE_EXECUTABLE}
-    -nologo
-    -arch x64
-    "-I${_cpack_wix_out_dir}" # to include cpack_variables.wxi
-    ${_addtional_defines}
-    ${_ext_flags}
-    "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Bootstrapper.wxs"
-    -o "${_bootstrap_out_dir}/"
-)
-
-set(_light_command
-    ${CPACK_WIX_LIGHT_EXECUTABLE}
-    -nologo
-    ${_ext_flags}
-    ${_bootstrap_out_dir}/*.wixobj
-    -o "${_bootstrap_output_file}"
-)
-
-if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package
-    file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path)
-    file(TO_NATIVE_PATH "${_root_path}/scripts/signer/Platform/Windows/signer.ps1" _sign_script)
-
-    unset(_signing_command)
-    find_program(_psiexec_path psexec.exe)
-    if(_psiexec_path)
-        list(APPEND _signing_command
-            ${_psiexec_path}
-            -accepteula 
-            -nobanner 
-            -s
-        )
-    endif()
-
-    find_program(_powershell_path powershell.exe REQUIRED)
-    list(APPEND _signing_command
-        ${_powershell_path}
-        -NoLogo
-        -ExecutionPolicy Bypass 
-        -File ${_sign_script}
-    )
-
-    message(STATUS "Signing package files in ${_cpack_wix_out_dir}")
-    execute_process(
-        COMMAND ${_signing_command} -packagePath ${_cpack_wix_out_dir}
-        RESULT_VARIABLE _signing_result
-        ERROR_VARIABLE _signing_errors
-        OUTPUT_VARIABLE _signing_output
-        ECHO_OUTPUT_VARIABLE
-    )
-
-    if(NOT ${_signing_result} EQUAL 0)
-        message(FATAL_ERROR "An error occurred during signing package files.  ${_signing_errors}")
-    endif()
-endif()
-
-message(STATUS "Creating Bootstrap Installer...")
-execute_process(
-    COMMAND ${_candle_command}
-    RESULT_VARIABLE _candle_result
-    ERROR_VARIABLE _candle_errors
-)
-if(NOT ${_candle_result} EQUAL 0)
-    message(FATAL_ERROR "An error occurred invoking candle.exe.  ${_candle_errors}")
-endif()
-
-execute_process(
-    COMMAND ${_light_command}
-    RESULT_VARIABLE _light_result
-    ERROR_VARIABLE _light_errors
-)
-if(NOT ${_light_result} EQUAL 0)
-    message(FATAL_ERROR "An error occurred invoking light.exe.  ${_light_errors}")
-endif()
-
-file(COPY ${_bootstrap_output_file}
-    DESTINATION ${CPACK_PACKAGE_DIRECTORY}
-)
-
-message(STATUS "Bootstrap installer generated to ${CPACK_PACKAGE_DIRECTORY}/${_bootstrap_filename}")
-
-if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package
-    message(STATUS "Signing bootstrap installer in ${CPACK_PACKAGE_DIRECTORY}")
-    execute_process(
-        COMMAND ${_signing_command} -bootstrapPath ${CPACK_PACKAGE_DIRECTORY}/${_bootstrap_filename}
-        RESULT_VARIABLE _signing_result
-        ERROR_VARIABLE _signing_errors
-        OUTPUT_VARIABLE _signing_output
-        ECHO_OUTPUT_VARIABLE
-    )
-
-    if(NOT ${_signing_result} EQUAL 0)
-        message(FATAL_ERROR "An error occurred during signing bootstrap installer.  ${_signing_errors}")
-    endif()
-endif()
-
-# use the internal default path if somehow not specified from cpack_configure_downloads
-if(NOT CPACK_UPLOAD_DIRECTORY)
-    set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads)
-endif()
-
-# copy the artifacts intended to be uploaded to a remote server into the folder specified
-# through cpack_configure_downloads.  this mimics the same process cpack does natively for
-# some other frameworks that have built-in online installer support.
-message(STATUS "Copying installer artifacts to upload directory...")
-file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY})
-file(GLOB _artifacts "${_cpack_wix_out_dir}/*.msi" "${_cpack_wix_out_dir}/*.cab")
-file(COPY ${_artifacts}
-    DESTINATION ${CPACK_UPLOAD_DIRECTORY}
-)
-message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}")
-
-if(NOT CPACK_UPLOAD_URL)
-    return()
-endif()
-
-file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir)
-file(TO_NATIVE_PATH "${_root_path}/python/python.cmd" _python_cmd)
-file(TO_NATIVE_PATH "${_root_path}/scripts/build/tools/upload_to_s3.py" _upload_script)
-
-function(upload_to_s3 in_url in_local_path in_file_regex)
-
-    # strip the scheme and extract the bucket/key prefix from the URL
-    string(REPLACE "s3://" "" _stripped_url ${in_url})
-    string(REPLACE "/" ";" _tokens ${_stripped_url})
-
-    list(POP_FRONT _tokens _bucket)
-    string(JOIN "/" _prefix ${_tokens})
-
-    set(_extra_args [[{"ACL":"bucket-owner-full-control"}]])
-
-    set(_upload_command
-        ${_python_cmd} -s
-        -u ${_upload_script}
-        --base_dir ${in_local_path}
-        --file_regex="${in_file_regex}"
-        --bucket ${_bucket}
-        --key_prefix ${_prefix}
-        --extra_args ${_extra_args}
-    )
-
-    if(CPACK_AWS_PROFILE)
-        list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE})
-    endif()
-
-    execute_process(
-        COMMAND ${_upload_command}
-        RESULT_VARIABLE _upload_result
-        OUTPUT_VARIABLE _upload_output
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
-    if (NOT ${_upload_result} EQUAL 0)
-        message(FATAL_ERROR "An error occurred uploading to s3.\nOutput:\n${_upload_output}")
-    endif()
-endfunction()
-
-message(STATUS "Uploading artifacts to ${CPACK_UPLOAD_URL}")
-upload_to_s3(
-    ${CPACK_UPLOAD_URL}
-    ${_cpack_wix_out_dir}
-    ".*(cab|exe|msi)$"
-)
-message(STATUS "Artifact uploading complete!")
-
-# for auto tagged builds, we will also upload a second copy of just the boostrapper
-# to a special "Latest" folder under the branch in place of the commit date/hash
-if(CPACK_AUTO_GEN_TAG)
-    message(STATUS "Updating latest tagged build")
-
-    # make sure we can extra the commit info from the URL first
-    string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)"
-        _commit_info ${CPACK_UPLOAD_URL}
-    )
-    if(NOT _commit_info)
-        message(FATAL_ERROR "Failed to extract the build tag")
-    endif()
-
-    set(_temp_dir ${_cpack_wix_out_dir}/temp)
-    if(NOT EXISTS ${_temp_dir})
-        file(MAKE_DIRECTORY ${_temp_dir})
-    endif()
-
-    # strip the version number form the exe name in the one uploaded to latest
-    string(TOLOWER "${CPACK_PACKAGE_NAME}_installer.exe" _non_versioned_exe)
-    set(_temp_exe_copy ${_temp_dir}/${_non_versioned_exe})
-
-    file(COPY ${_bootstrap_output_file} DESTINATION ${_temp_dir})
-    file(RENAME "${_temp_dir}/${_bootstrap_filename}" ${_temp_exe_copy})
-
-    # include the commit info in a text file that will live next to the exe
-    set(_temp_info_file ${_temp_dir}/build_tag.txt)
-    file(WRITE ${_temp_info_file} ${_commit_info})
-
-    # update the URL and upload
-    string(REPLACE
-        ${_commit_info} "Latest"
-        _latest_upload_url ${CPACK_UPLOAD_URL}
-    )
-
-    upload_to_s3(
-        ${_latest_upload_url}
-        ${_temp_dir}
-        ".*(${_non_versioned_exe}|build_tag.txt)$"
-    )
-
-    # cleanup the temp files
-    file(REMOVE_RECURSE ${_temp_dir})
-
-    message(STATUS "Latest build update complete!")
-endif()
diff --git a/cmake/Platform/Windows/PackagingPostBuild_windows.cmake b/cmake/Platform/Windows/PackagingPostBuild_windows.cmake
new file mode 100644
index 0000000000..10f0f902a3
--- /dev/null
+++ b/cmake/Platform/Windows/PackagingPostBuild_windows.cmake
@@ -0,0 +1,124 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER)
+include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake)
+include(${CPACK_CODESIGN_SCRIPT})
+
+# convert the path to a windows style path using string replace because TO_NATIVE_PATH
+# only works on real paths
+string(REPLACE "/" "\\" _fixed_package_install_dir ${CPACK_PACKAGE_INSTALL_DIRECTORY})
+
+# directory where the auto generated files live e.g <build>/_CPack_Package/win64/WIX
+set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY})
+set(_bootstrap_out_dir "${CPACK_TOPLEVEL_DIRECTORY}/bootstrap")
+
+set(_bootstrap_filename "${CPACK_PACKAGE_FILE_NAME}_installer.exe")
+set(_bootstrap_output_file ${_cpack_wix_out_dir}/${_bootstrap_filename})
+
+set(_ext_flags
+    -ext WixBalExtension
+)
+
+set(_addtional_defines
+    -dCPACK_BOOTSTRAP_THEME_FILE=${CPACK_BINARY_DIR}/BootstrapperTheme
+    -dCPACK_BOOTSTRAP_UPGRADE_GUID=${CPACK_WIX_BOOTSTRAP_UPGRADE_GUID}
+    -dCPACK_DOWNLOAD_SITE=${CPACK_DOWNLOAD_SITE}
+    -dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir}
+    -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME}
+    -dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir}
+    -dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO}
+    -dCPACK_RESOURCE_PATH=${CPACK_SOURCE_DIR}/Platform/Windows/Packaging
+)
+
+if(CPACK_LICENSE_URL)
+    list(APPEND _addtional_defines -dCPACK_LICENSE_URL=${CPACK_LICENSE_URL})
+endif()
+
+set(_candle_command
+    ${CPACK_WIX_CANDLE_EXECUTABLE}
+    -nologo
+    -arch x64
+    "-I${_cpack_wix_out_dir}" # to include cpack_variables.wxi
+    ${_addtional_defines}
+    ${_ext_flags}
+    "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Bootstrapper.wxs"
+    -o "${_bootstrap_out_dir}/"
+)
+
+set(_light_command
+    ${CPACK_WIX_LIGHT_EXECUTABLE}
+    -nologo
+    ${_ext_flags}
+    ${_bootstrap_out_dir}/*.wixobj
+    -o "${_bootstrap_output_file}"
+)
+
+if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package
+    ly_sign_binaries("${_cpack_wix_out_dir}" "packagePath")
+endif()
+
+message(STATUS "Creating Bootstrap Installer...")
+execute_process(
+    COMMAND ${_candle_command}
+    RESULT_VARIABLE _candle_result
+    ERROR_VARIABLE _candle_errors
+)
+if(NOT ${_candle_result} EQUAL 0)
+    message(FATAL_ERROR "An error occurred invoking candle.exe.  ${_candle_errors}")
+endif()
+
+execute_process(
+    COMMAND ${_light_command}
+    RESULT_VARIABLE _light_result
+    ERROR_VARIABLE _light_errors
+)
+if(NOT ${_light_result} EQUAL 0)
+    message(FATAL_ERROR "An error occurred invoking light.exe.  ${_light_errors}")
+endif()
+
+message(STATUS "Bootstrap installer generated to ${_bootstrap_output_file}")
+
+if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package
+    ly_sign_binaries("${_bootstrap_output_file}" "bootstrapPath")
+endif()
+
+# use the internal default path if somehow not specified from cpack_configure_downloads
+if(NOT CPACK_UPLOAD_DIRECTORY)
+    set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads)
+endif()
+
+# Copy the artifacts intended to be uploaded to a remote server into the folder specified
+# through CPACK_UPLOAD_DIRECTORY. This mimics the same process cpack does natively for
+# some other frameworks that have built-in online installer support.
+message(STATUS "Copying packaging artifacts to upload directory...")
+file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY})
+file(GLOB _artifacts 
+    "${_cpack_wix_out_dir}/*.msi" 
+    "${_cpack_wix_out_dir}/*.cab"
+    "${_cpack_wix_out_dir}/*.exe"
+)
+file(COPY ${_artifacts}
+    DESTINATION ${CPACK_UPLOAD_DIRECTORY}
+)
+message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}")
+
+if(CPACK_UPLOAD_URL)
+    file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir)
+    ly_upload_to_url(
+        ${CPACK_UPLOAD_URL}
+        ${_cpack_wix_out_dir}
+        ".*(cab|exe|msi)$"
+    )
+
+    # for auto tagged builds, we will also upload a second copy of just the boostrapper
+    # to a special "Latest" folder under the branch in place of the commit date/hash
+    if(CPACK_AUTO_GEN_TAG)
+        ly_upload_to_latest(${CPACK_UPLOAD_URL} ${_bootstrap_output_file})
+    endif()
+endif()
diff --git a/cmake/Platform/Windows/PackagingPreBuild.cmake b/cmake/Platform/Windows/PackagingPreBuild.cmake
deleted file mode 100644
index 7f2eedf352..0000000000
--- a/cmake/Platform/Windows/PackagingPreBuild.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-if(NOT CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package
-    return()
-endif()
-
-file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path)
-set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY})
-file(TO_NATIVE_PATH "${_root_path}/scripts/signer/Platform/Windows/signer.ps1" _sign_script)
-
-unset(_signing_command)
-find_program(_psiexec_path psexec.exe)
-if(_psiexec_path)
-    list(APPEND _signing_command
-        ${_psiexec_path}
-        -accepteula
-        -nobanner
-        -s
-    )
-endif()
-
-find_program(_powershell_path powershell.exe REQUIRED)
-list(APPEND _signing_command
-    ${_powershell_path}
-    -NoLogo
-    -ExecutionPolicy Bypass
-    -File ${_sign_script}
-)
-
-# This requires to have a valid local certificate. In continuous integration, these certificates are stored
-# in the machine directly. 
-# You can generate a test certificate to be able to run this in a PowerShell elevated promp with:
-# New-SelfSignedCertificate -DnsName foo.o3de.com -Type CodeSigning -CertStoreLocation Cert:\CurrentUser\My
-# Export-Certificate -Cert (Get-ChildItem Cert:\CurrentUser\My\<cert thumbprint>) -Filepath "c:\selfsigned.crt"
-# Import-Certificate -FilePath "c:\selfsigned.crt" -Cert Cert:\CurrentUser\TrustedPublisher
-# Import-Certificate -FilePath "c:\selfsigned.crt" -Cert Cert:\CurrentUser\Root
-
-message(STATUS "Signing executable files in ${_cpack_wix_out_dir}")
-execute_process(
-    COMMAND ${_signing_command} -exePath ${_cpack_wix_out_dir}
-    RESULT_VARIABLE _signing_result
-    ERROR_VARIABLE _signing_errors
-    OUTPUT_VARIABLE _signing_output
-    ECHO_OUTPUT_VARIABLE
-)
-
-if(NOT ${_signing_result} EQUAL 0)
-    message(FATAL_ERROR "An error occurred during signing executable files.  ${_signing_errors}")
-else()
-    message(STATUS "Signing exes complete!")
-endif()
diff --git a/cmake/Platform/Windows/PackagingPreBuild_windows.cmake b/cmake/Platform/Windows/PackagingPreBuild_windows.cmake
new file mode 100644
index 0000000000..b6b5708a8c
--- /dev/null
+++ b/cmake/Platform/Windows/PackagingPreBuild_windows.cmake
@@ -0,0 +1,18 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER)
+include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake)
+include(${CPACK_CODESIGN_SCRIPT})
+
+if(NOT CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package
+    return()
+endif()
+
+set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY})
+ly_sign_binaries("${_cpack_wix_out_dir}" "exePath")
\ No newline at end of file
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 7b8f5a6c19..f24e9dee1c 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -23,7 +23,6 @@ set(CPACK_WIX_ROOT ${LY_INSTALLER_WIX_ROOT})
 
 set(CPACK_GENERATOR WIX)
 
-set(CPACK_THREADS 0)
 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")
@@ -105,47 +104,35 @@ set(_raw_text_license [[
         <Text Name="EulaAcceptance" X="42" Y="-56" Width="-42" Height="18" TabStop="yes" FontId="1" HideWhenDisabled="yes">#(loc.InstallEulaAcceptance)</Text>
 ]])
 
-# The offline installer generation will be a single monolithic MSI. The WIX burn tool for the bootstrapper EXE has a size limitation. 
-# So we will exclude the generation of the boostrapper EXE in the offline case.
-if(LY_INSTALLER_DOWNLOAD_URL)
-    set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png)
+set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png)
 
-    if(LY_INSTALLER_LICENSE_URL)
-        set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license})
-        set(WIX_THEME_EULA_ACCEPTANCE_TEXT "&lt;a href=\"#\"&gt;Terms of Use&lt;/a&gt;")
-    else()
-        set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license})
-        set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above")
-    endif()
-
-    # theme ux file
-    configure_file(
-        "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in"
-        "${CPACK_BINARY_DIR}/BootstrapperTheme.xml"
-        @ONLY
-    )
-
-    # theme localization file
-    configure_file(
-        "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in"
-        "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl"
-        @ONLY
-    )
-
-    set(_embed_artifacts "no")
-
-    # the bootstrapper will at the very least need a different upgrade guid
-    generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode")
-
-    set(CPACK_PRE_BUILD_SCRIPTS
-        ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPreBuild.cmake
-    )
-
-    set(CPACK_POST_BUILD_SCRIPTS
-        ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPostBuild.cmake
-    )
+if(LY_INSTALLER_LICENSE_URL)
+    set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license})
+    set(WIX_THEME_EULA_ACCEPTANCE_TEXT "&lt;a href=\"#\"&gt;Terms of Use&lt;/a&gt;")
+else()
+    set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license})
+    set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above")
 endif()
 
+# theme ux file
+configure_file(
+    "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in"
+    "${CPACK_BINARY_DIR}/BootstrapperTheme.xml"
+    @ONLY
+)
+
+# theme localization file
+configure_file(
+    "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in"
+    "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl"
+    @ONLY
+)
+
+set(_embed_artifacts "no")
+
+# the bootstrapper will at the very least need a different upgrade guid
+generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode")
+
 set(CPACK_WIX_CANDLE_EXTRA_FLAGS
     -dCPACK_EMBED_ARTIFACTS=${_embed_artifacts}
     -dCPACK_CMAKE_PACKAGE_NAME=${_cmake_package_name}
diff --git a/cmake/Platform/Windows/platform_windows_files.cmake b/cmake/Platform/Windows/platform_windows_files.cmake
index fcc47ab6eb..8ad242f842 100644
--- a/cmake/Platform/Windows/platform_windows_files.cmake
+++ b/cmake/Platform/Windows/platform_windows_files.cmake
@@ -15,6 +15,8 @@ set(FILES
     ../Common/MSVC/VisualStudio_common.cmake
     ../Common/Install_common.cmake
     ../Common/LYWrappers_default.cmake
+    ../Common/PackagingPostBuild_common.cmake
+    ../Common/PackagingPreBuild_common.cmake
     ../Common/TargetIncludeSystemDirectories_unsupported.cmake
     Configurations_windows.cmake
     LYTestWrappers_windows.cmake
@@ -23,7 +25,9 @@ set(FILES
     PALDetection_windows.cmake
     Install_windows.cmake
     Packaging_windows.cmake
-    PackagingPostBuild.cmake
+    PackagingCodeSign_windows.cmake
+    PackagingPostBuild_windows.cmake
+    PackagingPreBuild_windows.cmake
     Packaging/Bootstrapper.wxs
     Packaging/BootstrapperTheme.wxl.in
     Packaging/BootstrapperTheme.xml.in
diff --git a/cmake/Projects.cmake b/cmake/Projects.cmake
index 2c42533e35..13161c9e0f 100644
--- a/cmake/Projects.cmake
+++ b/cmake/Projects.cmake
@@ -183,7 +183,9 @@ if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$")
         cmake_path(GET gem_source_path_setreg FILENAME setreg_filename)
         list(APPEND artifacts_to_remove "${cache_product_path}/registry/${setreg_filename}")
     endforeach()
-    file(REMOVE ${artifacts_to_remove})
+    if (artifacts_to_remove)
+        file(REMOVE ${artifacts_to_remove})
+    endif()
 endif()
 ]=])
 
diff --git a/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake
index c677aba7cf..e8c14ac8a0 100644
--- a/cmake/SettingsRegistry.cmake
+++ b/cmake/SettingsRegistry.cmake
@@ -33,6 +33,34 @@ set(gems_json_template [[
 [=[            }]=]
 )
 
+#!ly_detect_cycle_through_visitation: Detects if there is a cycle based on a list of visited
+# items. If the passed item is in the list, then there is a cycle. 
+# \arg:item - item being checked for the cycle
+# \arg:visited_items - list of visited items
+# \arg:visited_items_var - list of visited items variable, "item" will be added to the list
+# \arg:cycle(variable) - empty string if there is no cycle (an empty string in cmake evaluates 
+#     to false). If there is a cycle a cycle dependency string detailing the sequence of items
+#     that produce a cycle, e.g. A --> B --> C --> A
+# 
+function(ly_detect_cycle_through_visitation item visited_items visited_items_var cycle)
+    if(item IN_LIST visited_items)
+        unset(dependency_cycle_loop)
+        foreach(visited_item IN LISTS visited_items)
+            string(APPEND dependency_cycle_loop ${visited_item})
+            if(visited_item STREQUAL item)
+                string(APPEND dependency_cycle_loop " (cycle starts)")
+            endif()
+            string(APPEND dependency_cycle_loop " --> ")
+        endforeach()
+        string(APPEND dependency_cycle_loop "${item} (cycle ends)")
+        set(${cycle} "${dependency_cycle_loop}" PARENT_SCOPE)
+    else()
+        set(cycle "" PARENT_SCOPE) # no cycles
+    endif()
+    list(APPEND visited_items ${item})
+    set(${visited_items_var} "${visited_items}" PARENT_SCOPE)
+endfunction()
+
 #!ly_get_gem_load_dependencies: Retrieves the list of "load" dependencies for a target
 # Visits through only MANUALLY_ADDED_DEPENDENCIES of targets with a GEM_MODULE property
 # to determine which gems a target needs to load
@@ -44,6 +72,13 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET)
     if(NOT TARGET ${ly_TARGET})
         return() # Nothing to do
     endif()
+    # Internally we use a third parameter to pass the list of targets that we have traversed. This is 
+    # used to detect runtime cycles
+    if(ARGC EQUAL 3)
+        set(ly_CYCLE_DETECTION_TARGETS ${ARGV2})
+    else()
+        set(ly_CYCLE_DETECTION_TARGETS "")
+    endif()
 
     # Optimize the search by caching gem load dependencies
     get_property(are_dependencies_cached GLOBAL PROPERTY LY_GEM_LOAD_DEPENDENCIES_${ly_TARGET} SET)
@@ -54,6 +89,13 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET)
         return()
     endif()
 
+    # detect cycles
+    unset(cycle_detected)
+    ly_detect_cycle_through_visitation(${ly_TARGET} "${ly_CYCLE_DETECTION_TARGETS}" ly_CYCLE_DETECTION_TARGETS cycle_detected)
+    if(cycle_detected)
+        message(FATAL_ERROR "Runtime dependency detected: ${cycle_detected}")
+    endif()
+
     unset(all_gem_load_dependencies)
 
     # For load dependencies, we want to copy over the dependency and traverse them
@@ -69,7 +111,7 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET)
             # and recurse into its manually added dependencies
             if (is_gem_target)
                 unset(dependencies)
-                ly_get_gem_load_dependencies(dependencies ${dealias_load_dependency})
+                ly_get_gem_load_dependencies(dependencies ${dealias_load_dependency} "${ly_CYCLE_DETECTION_TARGETS}")
                 list(APPEND all_gem_load_dependencies ${dependencies})
                 list(APPEND all_gem_load_dependencies ${dealias_load_dependency})
             endif()
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 662e75c3db..de93ebefef 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -11,3 +11,8 @@ set(LY_VERSION_COPYRIGHT_YEAR ${current_year} CACHE STRING "Open 3D Engine's cop
 set(LY_VERSION_STRING "0.0.0.0" CACHE STRING "Open 3D Engine's version")
 set(LY_VERSION_BUILD_NUMBER 0 CACHE STRING "Open 3D Engine's build number")
 set(LY_VERSION_ENGINE_NAME "o3de" CACHE STRING "Open 3D Engine's engine name")
+
+if("$ENV{O3DE_VERSION}")
+    # Overriding through environment
+    set(LY_VERSION_STRING "$ENV{O3DE_VERSION}")
+endif()
diff --git a/engine.json b/engine.json
index 05ccd0abfd..2d182c78aa 100644
--- a/engine.json
+++ b/engine.json
@@ -90,6 +90,7 @@
         "AutomatedTesting"
     ],
     "templates": [
+        "Templates/GemRepo",
         "Templates/AssetGem",
         "Templates/DefaultGem",
         "Templates/DefaultProject",
diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index beb4a21620..98011503af 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -102,10 +102,6 @@ def IsJobEnabled(branchName, buildTypeMap, pipelineName, platformName) {
     }
 }
 
-def IsAPLogUpload(branchName, jobName) {
-    return !IsPullRequest(branchName) && jobName.toLowerCase().contains('asset') && env.AP_LOGS_S3_BUCKET
-}
-
 def GetRunningPipelineName(JENKINS_JOB_NAME) {
     // If the job name has an underscore
     def job_parts = JENKINS_JOB_NAME.tokenize('/')[0].tokenize('_')
@@ -433,26 +429,37 @@ def ExportTestScreenshots(Map options, String branchName, String platformName, S
     }
 }
 
-def UploadAPLogs(Map options, String branchName, String platformName, String jobName, String workspace, Map params) {
-    dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
-        projects = params.CMAKE_LY_PROJECTS.split(",")
-        projects.each{ project ->
-            def apLogsPath = "${project}/user/log"
-            def s3UploadScriptPath = "scripts/build/tools/upload_to_s3.py"
-            if(env.IS_UNIX) {
-                pythonPath = "${options.PYTHON_DIR}/python.sh"
-            }
-            else {
-                pythonPath = "${options.PYTHON_DIR}/python.cmd"
-            }
-            def command = "${pythonPath} -u ${s3UploadScriptPath} --base_dir ${apLogsPath} " +
-                          "--file_regex \".*\" --bucket ${env.AP_LOGS_S3_BUCKET} " +
-                          "--search_subdirectories True --key_prefix ${env.JENKINS_JOB_NAME}/${branchName}/${env.BUILD_NUMBER}/${platformName}/${jobName} " +
-                          '--extra_args {\\"ACL\\":\\"bucket-owner-full-control\\"}'
-            palSh(command, "Uploading AP logs for job ${jobName} for branch ${branchName}", false)
+// All files are included by default.
+// --include will only re-include files that have been excluded from an --exclude filter.
+//See more details at https://docs.aws.amazon.com/cli/latest/reference/s3/#use-of-exclude-and-include-filters
+def ArchiveArtifactsOnS3(String artifactsSource, String s3Prefix="", boolean recursive=false, List<String> includes=[], List<String> excludes=[]) {
+    if (!fileExists(s3Prefix)) {
+        palMkdir(s3Prefix)
+    }
+    palSh("echo ${env.BUILD_URL} > ${s3Prefix}/build_url.txt")
+    // archiveArtifacts is very slow, so we only archive one file and upload the rest artifacts to the same bucket using S3 CLI.
+    archiveArtifacts artifacts: "${s3Prefix}/build_url.txt"
+    def command = "aws s3 cp ${artifactsSource} s3://${env.JENKINS_ARTIFACTS_S3_BUCKET}/${env.JENKINS_JOB_NAME}/${env.BUILD_NUMBER}/artifacts/${s3Prefix} "
+    excludes.each{ exclude ->
+        command += "--exclude \"${exclude}\" "
+    }
+    includes.each{ include ->
+        command += "--include \"${include}\" "
+    }
+    if (recursive) command += "--recursive "
+    palSh(command, "Archiving artifacts to ${env.JENKINS_JOB_NAME}/${env.BUILD_NUMBER}/artifacts/${s3Prefix}", false)
+}
+
+def UploadAPLogs(String platformName, String jobName, String workspace, Map params) {
+    catchError(message: "Error archiving AssetProcessor logs (this won't fail the build)", buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+        dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
+            projects = params.CMAKE_LY_PROJECTS.split(",")
+            projects.each{ project ->
+                ArchiveArtifactsOnS3("${project}/user/log", "ap_logs/${platformName}/${jobName}/${project}", true)
             }
         }
     }
+}
 
 def PostBuildCommonSteps(String workspace, boolean mount = true) {
     echo 'Starting post-build common steps...'
@@ -517,10 +524,10 @@ def CreateExportTestScreenshotsStage(Map pipelineConfig, String branchName, Stri
     }
 }
 
-def CreateUploadAPLogsStage(Map pipelineConfig, String branchName, String platformName, String jobName, String workspace, Map params) {
+def CreateUploadAPLogsStage(String platformName, String jobName, String workspace, Map params) {
     return {
         stage("${jobName}_upload_ap_logs") {
-            UploadAPLogs(pipelineConfig, branchName, platformName, jobName, workspace, params)
+            UploadAPLogs(platformName, jobName, workspace, params)
         }
     }
 }
@@ -576,8 +583,8 @@ def CreateSingleNode(Map pipelineConfig, def platform, def build_job, Map envVar
                                 error "Node disconnected during build: ${e}"  // Error raised to retry stage on a new node
                             }
                         }
-                        if (IsAPLogUpload(branchName, build_job_name)) {
-                            CreateUploadAPLogsStage(pipelineConfig, branchName, platform.key, build_job_name, envVars['WORKSPACE'], platform.value.build_types[build_job_name].PARAMETERS).call()
+                        if (build_job_name.toLowerCase().contains('asset') && env.IS_UPLOAD_AP_LOGS?.toBoolean()) {
+                            CreateUploadAPLogsStage(platform.key, build_job_name, envVars['WORKSPACE'], platform.value.build_types[build_job_name].PARAMETERS).call()
                         }
                         // All other errors will be raised outside the retry block
                         currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE'
diff --git a/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py b/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py
index 8b0164e3e8..6ea2e135a7 100644
--- a/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py
+++ b/scripts/build/Jenkins/tools/jenkins_pipeline_metrics.py
@@ -16,9 +16,8 @@ from datetime import datetime, timezone
 from requests.auth import HTTPBasicAuth
 
 cur_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.join(os.path.dirname(os.path.dirname(cur_dir)), 'package'))
-from util import *
-
+sys.path.insert(0, os.path.abspath(f'{cur_dir}/../../../util'))
+import util
 
 class JenkinsAPIClient:
     def __init__(self, jenkins_base_url, jenkins_username, jenkins_api_token):
@@ -36,7 +35,7 @@ class JenkinsAPIClient:
             except Exception:
                 traceback.print_exc()
                 print(f'WARN: Get request {url} failed, retying....')
-        error(f'Get request {url} failed, see exception for more details.')
+        util.error(f'Get request {url} failed, see exception for more details.')
 
     def get_builds(self, pipeline_name, branch_name=''):
         url = self.jenkins_base_url + self.blueocean_api_path + f'/{pipeline_name}/{branch_name}/runs'
@@ -123,9 +122,9 @@ def upload_files_to_s3(env, formatted_date):
     else:
         python = os.path.join(engine_root, 'python', 'python.sh')
     upload_csv_cmd = [python, upload_to_s3_script_path, '--base_dir', cur_dir, '--file_regex', env['CSV_REGEX'], '--bucket', env['BUCKET'], '--key_prefix', csv_s3_prefix]
-    execute_system_call(upload_csv_cmd)
+    util.execute_system_call(upload_csv_cmd)
     upload_manifest_cmd = [python, upload_to_s3_script_path, '--base_dir', cur_dir, '--file_regex', env['MANIFEST_REGEX'], '--bucket', env['BUCKET'], '--key_prefix', manifest_s3_prefix]
-    execute_system_call(upload_manifest_cmd)
+    util.execute_system_call(upload_manifest_cmd)
 
 
 def get_required_env(env, keys):
@@ -134,7 +133,7 @@ def get_required_env(env, keys):
         try:
             env[key] = os.environ[key].strip()
         except KeyError:
-            error(f'{key} is not set in environment variable')
+            util.error(f'{key} is not set in environment variable')
             success = False
     return success
 
@@ -143,7 +142,7 @@ def main():
     env = {}
     required_env_list = ['JENKINS_URL', 'PIPELINE_NAME', 'BRANCH_NAME', 'JENKINS_USERNAME', 'JENKINS_API_TOKEN', 'BUCKET', 'CSV_REGEX', 'CSV_PREFIX', 'MANIFEST_REGEX', 'MANIFEST_PREFIX', 'DAYS_TO_COLLECT']
     if not get_required_env(env, required_env_list):
-        error('Required environment variable is not set, see log for more details.')
+        util.error('Required environment variable is not set, see log for more details.')
 
     target_date = datetime.today().date()
     formatted_date = f'{target_date.year}/{target_date:%m}/{target_date:%d}'
diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json
index 5e2da44a3c..06fa1ffb5f 100644
--- a/scripts/build/Platform/Android/build_config.json
+++ b/scripts/build/Platform/Android/build_config.json
@@ -35,7 +35,7 @@
     "PARAMETERS": {
       "CONFIGURATION":"debug",
       "OUTPUT_DIRECTORY":"build\\android",
-      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"",
+      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
       "CMAKE_LY_PROJECTS":"AutomatedTesting",
       "CMAKE_TARGET":"all",
       "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -60,7 +60,7 @@
     "PARAMETERS": {
       "CONFIGURATION":"profile",
       "OUTPUT_DIRECTORY":"build\\android",
-      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"",
+      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
       "CMAKE_LY_PROJECTS":"AutomatedTesting",
       "CMAKE_TARGET":"all",
       "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -76,7 +76,7 @@
     "PARAMETERS": {
       "CONFIGURATION":"profile",
       "OUTPUT_DIRECTORY":"build\\android",
-      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_UNITY_BUILD=FALSE",
+      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_UNITY_BUILD=FALSE",
       "CMAKE_LY_PROJECTS":"AutomatedTesting",
       "CMAKE_TARGET":"all",
       "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -92,7 +92,7 @@
     "COMMAND":"../Windows/build_asset_windows.cmd",
     "PARAMETERS": {
         "CONFIGURATION":"profile",
-        "OUTPUT_DIRECTORY":"build\\windows_vs2019",
+        "OUTPUT_DIRECTORY":"build\\windows",
         "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
         "CMAKE_LY_PROJECTS":"AutomatedTesting",
         "CMAKE_TARGET":"AssetProcessorBatch",
@@ -112,7 +112,7 @@
     "PARAMETERS": {
       "CONFIGURATION":"release",
       "OUTPUT_DIRECTORY":"build\\android",
-      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"",
+      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"",
       "CMAKE_LY_PROJECTS":"AutomatedTesting",
       "CMAKE_TARGET":"all",
       "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
@@ -128,7 +128,7 @@
     "PARAMETERS": {
       "CONFIGURATION":"release",
       "OUTPUT_DIRECTORY":"build\\mono_android",
-      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_MONOLITHIC_GAME=TRUE",
+      "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_MONOLITHIC_GAME=TRUE",
       "CMAKE_LY_PROJECTS":"AutomatedTesting",
       "CMAKE_TARGET":"all",
       "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!"
diff --git a/scripts/build/Platform/Android/gradle_windows.cmd b/scripts/build/Platform/Android/gradle_windows.cmd
index b353a8f641..bb98799444 100644
--- a/scripts/build/Platform/Android/gradle_windows.cmd
+++ b/scripts/build/Platform/Android/gradle_windows.cmd
@@ -23,23 +23,6 @@ IF NOT EXIST "%GRADLE_BUILD_HOME%" (
     GOTO :error
 )
 
-IF NOT EXIST "%LY_NINJA_PATH%" (
-    SET LY_NINJA_PATH=%LY_3RDPARTY_PATH%/ninja/1.10.1/Windows
-)
-IF NOT EXIST "%LY_NINJA_PATH%" (
-    ECHO [ci_build] FAIL: LY_NINJA_PATH=%LY_NINJA_PATH%
-    GOTO :error
-)
-
-REM Make sure that Ninja in the Path variable
-ECHO Testing ninja on the current path variable
-call ninja --version
-IF %ERRORLEVEL%==0 GOTO ninja_on_path
-ECHO Ninja wasnt in the call path, add the value set by LY_NINJA_PATH 
-SET PATH=%PATH%;%LY_NINJA_PATH%
-
-:ninja_on_path
-
 IF NOT "%ANDROID_GRADLE_PLUGIN%" == "" (
     set ANDROID_GRADLE_PLUGIN_OPTION=--gradle-plugin-version=%ANDROID_GRADLE_PLUGIN%
 )
@@ -132,11 +115,11 @@ IF "%GENERATE_SIGNED_APK%"=="true" (
         ECHO Using keystore file at %CI_ANDROID_KEYSTORE_FILE_ABS%
     )
 
-    ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
-    CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
+    ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
+    CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
 ) ELSE (
-    ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% %GRADLE_OVERRIDE_OPTION% --ninja-install-path=%LY_NINJA_PATH%  --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
-    CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
+    ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% %GRADLE_OVERRIDE_OPTION% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
+    CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing
 )
 
 REM Validate the android project generation
diff --git a/scripts/build/Platform/Android/pipeline.json b/scripts/build/Platform/Android/pipeline.json
index 551374a027..230d5d3477 100644
--- a/scripts/build/Platform/Android/pipeline.json
+++ b/scripts/build/Platform/Android/pipeline.json
@@ -2,7 +2,8 @@
     "ENV": {
         "GRADLE_HOME": "C:/Gradle/gradle-7.0",
         "NODE_LABEL": "windows-b3c8994f1",
-        "LY_3RDPARTY_PATH": "C:/ly/3rdParty",
+        "LY_3RDPARTY_PATH": "D:/workspace/3rdParty",
+        "LY_NDK_DIR": "C:/ly/3rdParty/android-ndk/r21d",
         "TIMEOUT": 30,
         "WORKSPACE": "D:/workspace",
         "MOUNT_VOLUME": true
diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json
index 103f243aae..b6fcd5b0ba 100644
--- a/scripts/build/Platform/Linux/build_config.json
+++ b/scripts/build/Platform/Linux/build_config.json
@@ -37,7 +37,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "debug",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all"
     }
@@ -53,7 +53,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all"
     }
@@ -66,7 +66,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all"
     }
@@ -80,10 +80,10 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
-      "CTEST_OPTIONS": "-E Gem::EMotionFX.Editor.Tests -LE (SUITE_sandbox|SUITE_awsi) -L FRAMEWORK_googletest --no-tests=error",
+      "CTEST_OPTIONS": "-E (AutomatedTesting::Atom_TestSuite_Main|AutomatedTesting::TerrainTests_Main|Gem::EMotionFX.Editor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error",
       "TEST_RESULTS": "True"
     }
   },
@@ -93,10 +93,10 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
-      "CTEST_OPTIONS": "-E Gem::EMotionFX.Editor.Tests -LE (SUITE_sandbox|SUITE_awsi) -L FRAMEWORK_googletest --no-tests=error",
+      "CTEST_OPTIONS": "-E (AutomatedTesting::Atom_TestSuite_Main|AutomatedTesting::TerrainTests_Main|Gem::EMotionFX.Editor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error",
       "TEST_RESULTS": "True"
     }
   },
@@ -110,7 +110,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "AssetProcessorBatch",
       "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -124,7 +124,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "AssetProcessorBatch",
       "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -142,7 +142,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_periodic",
       "CTEST_OPTIONS": "-L (SUITE_periodic) --no-tests=error",
@@ -162,7 +162,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4 -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
       "CTEST_OPTIONS": "-L (SUITE_sandbox) --no-tests=error"
@@ -178,7 +178,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_benchmark",
       "CTEST_OPTIONS": "-L (SUITE_benchmark) --no-tests=error",
@@ -195,7 +195,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "release",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all"
     }
@@ -210,7 +210,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "release",
       "OUTPUT_DIRECTORY": "build/mono_linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all"
     }
@@ -221,10 +221,28 @@
     "PARAMETERS": {
         "CONFIGURATION": "profile",
         "OUTPUT_DIRECTORY": "build/linux",
-        "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE",
+        "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE",
         "CMAKE_TARGET": "install"
     }
   },
+  "installer": {
+    "TAGS": [
+      "nightly-clean",
+      "nightly-installer"
+    ],
+    "PIPELINE_ENV":{
+      "NODE_LABEL":"linux-707531fc7-packaging"
+    },
+    "COMMAND": "build_installer_linux.sh",
+    "PARAMETERS": {
+        "CONFIGURATION": "profile",
+        "OUTPUT_DIRECTORY": "build/linux",
+        "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk",
+        "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=${INSTALLER_DOWNLOAD_URL} -DLY_INSTALLER_LICENSE_URL=${INSTALLER_DOWNLOAD_URL}/license",
+        "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=${CPACK_UPLOAD_URL}",
+        "CMAKE_TARGET": "all"
+    }
+  },
   "install_profile_pipe": {
     "TAGS": [
       "nightly-incremental",
@@ -254,7 +272,7 @@
       "COMMAND_CWD": "${WORKSPACE}/${PROJECT_REPOSITORY_NAME}",
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/linux",
-      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake",
+      "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake",
       "CMAKE_TARGET": "all"
     }
   }
diff --git a/scripts/build/Platform/Linux/build_installer_linux.sh b/scripts/build/Platform/Linux/build_installer_linux.sh
new file mode 100755
index 0000000000..301eb5f16d
--- /dev/null
+++ b/scripts/build/Platform/Linux/build_installer_linux.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set -o errexit # exit on the first failure encountered
+
+BASEDIR=$(dirname "$0")
+source $BASEDIR/build_linux.sh
+
+source $BASEDIR/installer_linux.sh
diff --git a/scripts/build/Platform/Linux/build_linux.sh b/scripts/build/Platform/Linux/build_linux.sh
index ab51913550..328445738b 100755
--- a/scripts/build/Platform/Linux/build_linux.sh
+++ b/scripts/build/Platform/Linux/build_linux.sh
@@ -17,7 +17,7 @@ SOURCE_DIRECTORY=${PWD}
 pushd $OUTPUT_DIRECTORY
 
 LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
-CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}"
+CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
 if [[ -n "$CMAKE_LY_PROJECTS" ]]; then
     CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'"
 fi
@@ -37,13 +37,13 @@ else
 fi
 if [[ ! -z "$RUN_CONFIGURE" ]]; then
     # have to use eval since $CMAKE_OPTIONS (${EXTRA_CMAKE_OPTIONS}) contains quotes that need to be processed
-    echo [ci_build] ${CONFIGURE_CMD}
+    eval echo [ci_build] ${CONFIGURE_CMD}
     eval ${CONFIGURE_CMD}
     # Save the run only if success
-    echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE}
+    eval echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE}
 fi
 
-echo [ci_build] cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS}
-cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS}
+eval echo [ci_build] cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS}
+eval cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS}
 
 popd
diff --git a/scripts/build/Platform/Linux/installer_linux.sh b/scripts/build/Platform/Linux/installer_linux.sh
new file mode 100755
index 0000000000..3ded242522
--- /dev/null
+++ b/scripts/build/Platform/Linux/installer_linux.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set -o errexit # exit on the first failure encountered
+
+BASEDIR=$(dirname "$0")
+source $BASEDIR/env_linux.sh
+
+mkdir -p ${OUTPUT_DIRECTORY}
+SOURCE_DIRECTORY=${PWD}
+pushd $OUTPUT_DIRECTORY
+
+if ! command -v cpack &> /dev/null; then
+    echo "[ci_build] CPack not found"
+    exit 1
+fi
+
+echo [ci_build] cpack --version
+cpack --version
+
+eval echo [ci_build] cpack -C ${CONFIGURATION} ${CPACK_OPTIONS}
+eval cpack -C ${CONFIGURATION} ${CPACK_OPTIONS}
+
+popd
diff --git a/scripts/build/Platform/Linux/pipeline.json b/scripts/build/Platform/Linux/pipeline.json
index 7f16ec6ab5..f44ed5f9de 100644
--- a/scripts/build/Platform/Linux/pipeline.json
+++ b/scripts/build/Platform/Linux/pipeline.json
@@ -1,7 +1,7 @@
 {
     "ENV": {
         "NODE_LABEL": "linux-707531fc7",
-        "LY_3RDPARTY_PATH": "/home/lybuilder/ly/workspace/3rdParty",
+        "LY_3RDPARTY_PATH": "/data/workspace/3rdParty",
         "TIMEOUT": 30,
         "WORKSPACE": "/data/workspace",
         "MOUNT_VOLUME": true
diff --git a/scripts/build/Platform/Mac/build_mac.sh b/scripts/build/Platform/Mac/build_mac.sh
index 169e91c24f..a0401f664c 100755
--- a/scripts/build/Platform/Mac/build_mac.sh
+++ b/scripts/build/Platform/Mac/build_mac.sh
@@ -17,7 +17,7 @@ SOURCE_DIRECTORY=${PWD}
 pushd $OUTPUT_DIRECTORY
 
 LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
-CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}"
+CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
 if [[ -n "$CMAKE_LY_PROJECTS" ]]; then
     CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'"
 fi
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index 3260c9af79..c591ca0eac 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -15,24 +15,24 @@
       "validation"
     ]
   },
-  "debug_vs2019_pipe": {
+  "debug_pipe": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean"
     ],
     "steps": [
-      "debug_vs2019",
-      "test_debug_vs2019"
+      "debug",
+      "test_debug"
     ]
   },
-  "profile_vs2019_pipe": {
+  "profile_pipe": {
     "TAGS": [
       "default"
     ],
     "steps": [
-      "profile_vs2019",
-      "asset_profile_vs2019",
-      "test_cpu_profile_vs2019"
+      "profile",
+      "asset_profile",
+      "test_cpu_profile"
     ]
   },
   "scrubbing": {
@@ -79,40 +79,40 @@
       "SCRIPT_PARAMETERS": "--platform 3rdParty --type 3rdParty_all"
     }
   },
-  "test_impact_analysis_profile_vs2019": {
+  "test_impact_analysis_profile": {
     "TAGS": [
     ],
     "COMMAND": "python_windows.cmd",
     "PARAMETERS": {
-      "OUTPUT_DIRECTORY": "build/windows_vs2019",
+      "OUTPUT_DIRECTORY": "build/windows",
       "CONFIGURATION": "profile",
       "SCRIPT_PATH": "scripts/build/TestImpactAnalysis/tiaf_driver.py",
       "SCRIPT_PARAMETERS": 
       "--config=\"%OUTPUT_DIRECTORY%/bin/TestImpactFramework/profile/Persistent/tiaf.json\" --src-branch=%BRANCH_NAME% --dst-branch=%CHANGE_TARGET% --commit=%CHANGE_ID% --s3-bucket=%TEST_IMPACT_S3_BUCKET% --mars-index-prefix=jonawals --s3-top-level-dir=%REPOSITORY_NAME% --build-number=%BUILD_NUMBER% --suite=main --test-failure-policy=continue"
     }
   },
-  "debug_vs2019": {
+  "debug": {
     "TAGS": [
         "weekly-build-metrics"
     ],
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "debug",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "test_debug_vs2019": {
+  "test_debug": {
     "TAGS": [
         "weekly-build-metrics"
     ],
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "debug",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
@@ -122,7 +122,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "profile_vs2019": {
+  "profile": {
     "TAGS": [
       "daily-pipeline-metrics",
       "weekly-build-metrics"
@@ -130,14 +130,14 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_TEST_IMPACT_INSTRUMENTATION_BIN=%TEST_IMPACT_WIN_BINARY%",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "profile_vs2019_nounity": {
+  "profile_nounity": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -146,14 +146,14 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=FALSE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "test_cpu_profile_vs2019": {
+  "test_cpu_profile": {
     "TAGS": [
         "daily-pipeline-metrics",
         "weekly-build-metrics"
@@ -161,7 +161,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
@@ -171,7 +171,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "test_gpu_profile_vs2019": {
+  "test_gpu_profile": {
     "TAGS":[
       "nightly-incremental",
       "nightly-clean"
@@ -182,7 +182,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
@@ -193,7 +193,7 @@
       "TEST_SCREENSHOTS": "True"
     }
   },
-  "asset_profile_vs2019": {
+  "asset_profile": {
     "TAGS": [
       "weekly-build-metrics",
       "nightly-incremental",
@@ -202,7 +202,7 @@
     "COMMAND": "build_asset_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "AssetProcessorBatch",
@@ -212,18 +212,18 @@
       "ASSET_PROCESSOR_PLATFORMS": "pc,server"
     }
   },
-  "awsi_test_profile_vs2019_pipe": {
+  "awsi_test_profile_pipe": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean"
     ],
     "steps": [
       "awsi_deployment",
-      "awsi_test_profile_vs2019",
+      "awsi_test_profile",
       "awsi_destruction"
     ]
   },
-  "awsi_test_profile_vs2019": {
+  "awsi_test_profile": {
     "TAGS": [
         "weekly-build-metrics"
     ],
@@ -233,7 +233,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_awsi",
@@ -243,7 +243,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "periodic_test_profile_vs2019": {
+  "periodic_test_profile": {
     "TAGS": [
         "nightly-incremental",
         "nightly-clean",
@@ -252,7 +252,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_periodic",
@@ -262,7 +262,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "sandbox_test_profile_vs2019": {
+  "sandbox_test_profile": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -274,7 +274,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_sandbox",
@@ -284,7 +284,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "benchmark_test_profile_vs2019": {
+  "benchmark_test_profile": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -293,7 +293,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_benchmark",
@@ -303,7 +303,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "release_vs2019": {
+  "release": {
     "TAGS": [
       "default",
       "nightly-incremental",
@@ -313,14 +313,14 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "release",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "monolithic_release_vs2019": {
+  "monolithic_release": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -329,25 +329,25 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "release",
-      "OUTPUT_DIRECTORY": "build\\mono_windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\mono_windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_MONOLITHIC_GAME=TRUE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "install_profile_vs2019": {
+  "install_profile": {
     "TAGS": [],
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
         "CONFIGURATION": "profile",
-        "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+        "OUTPUT_DIRECTORY": "build\\windows",
         "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE",
         "CMAKE_TARGET": "INSTALL",
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "installer_vs2019": {
+  "installer": {
     "TAGS": [
       "nightly-clean",
       "nightly-installer"
@@ -358,15 +358,15 @@
     "COMMAND": "build_installer_windows.cmd",
     "PARAMETERS": {
         "CONFIGURATION": "profile",
-        "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+        "OUTPUT_DIRECTORY": "build\\windows",
         "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"",
-        "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license",
-        "CPACK_BUCKET": "%INSTALLER_BUCKET%",
+        "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license",
         "CMAKE_TARGET": "ALL_BUILD",
+        "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=\"!CPACK_UPLOAD_URL!\"",
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "install_profile_vs2019_pipe": {
+  "install_profile_pipe": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean"
@@ -375,9 +375,9 @@
       "PROJECT_REPOSITORY_NAME": "TestProject"
     },
     "steps": [
-      "install_profile_vs2019",
+      "install_profile",
       "project_generate",
-      "project_engineinstall_profile_vs2019"
+      "project_engineinstall_profile"
     ]
   },
   "project_generate": {
@@ -388,7 +388,7 @@
       "SCRIPT_PARAMETERS": "create-project -pp %WORKSPACE%\\%PROJECT_REPOSITORY_NAME% --force"
     }
   },
-  "project_enginesource_profile_vs2019": {
+  "project_enginesource_profile": {
     "TAGS": [
       "project"
     ],
@@ -398,13 +398,13 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_MODULE_PATH=%WORKSPACE%/o3de/cmake",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "project_engineinstall_profile_vs2019": {
+  "project_engineinstall_profile": {
     "TAGS": [],
     "PIPELINE_ENV": {
       "EXECUTE_FROM_PROJECT": "1"
@@ -413,19 +413,19 @@
     "PARAMETERS": {
       "COMMAND_CWD": "%WORKSPACE%\\%PROJECT_REPOSITORY_NAME%",
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_MODULE_PATH=%WORKSPACE%/o3de/install/cmake",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "project_engineinstall_profile_vs2019_pipe": {
+  "project_engineinstall_profile_pipe": {
     "TAGS": [
       "project"
     ],
     "steps": [
-      "install_profile_vs2019",
-      "project_engineinstall_profile_vs2019"
+      "install_profile",
+      "project_engineinstall_profile"
     ]
   },
   "awsi_deployment": {
diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index b9e862e04f..9e9b124adb 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -9,13 +9,6 @@ REM
 
 SETLOCAL EnableDelayedExpansion
 
-REM Jenkins reports MSB8029 when TMP/TEMP is not defined, define a dummy folder
-SET TMP=%cd%/temp
-SET TEMP=%cd%/temp
-IF NOT EXIST %TMP% (
-    MKDIR temp
-)
-
 CALL %~dp0env_windows.cmd
 
 IF NOT EXIST "%OUTPUT_DIRECTORY%" (
@@ -36,7 +29,7 @@ REM Compute half the amount of processors so some jobs can run
 SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
 
 SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
-SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" 
+SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS%
 IF NOT "%CMAKE_LY_PROJECTS%"=="" (
     SET CONFIGURE_CMD=!CONFIGURE_CMD! -DLY_PROJECTS="%CMAKE_LY_PROJECTS%"
 )
diff --git a/scripts/build/Platform/Windows/deploy_cdk_applications.cmd b/scripts/build/Platform/Windows/deploy_cdk_applications.cmd
index 006e0158c0..f3d68d2fe8 100644
--- a/scripts/build/Platform/Windows/deploy_cdk_applications.cmd
+++ b/scripts/build/Platform/Windows/deploy_cdk_applications.cmd
@@ -7,7 +7,7 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
 REM
 
-REM Deploy the CDK applcations for AWS gems (Windows only)
+REM Deploy the CDK applications for AWS gems (Windows only)
 REM Prerequisites:
 REM 1) Node.js is installed
 REM 2) Node.js version >= 10.13.0, except for versions 13.0.0 - 13.6.0. A version in active long-term support is recommended.
@@ -57,7 +57,7 @@ IF ERRORLEVEL 1 (
     exit /b 1
 )
 
-CALL :DeployCDKApplication AWSCore "-c disable_access_log=true --all"
+CALL :DeployCDKApplication AWSCore "-c disable_access_log=true -c remove_all_storage_on_destroy=true --all"
 IF ERRORLEVEL 1 (
     exit /b 1
 )
diff --git a/scripts/build/Platform/Windows/env_windows.cmd b/scripts/build/Platform/Windows/env_windows.cmd
index f11d394519..78b5ca6c1a 100644
--- a/scripts/build/Platform/Windows/env_windows.cmd
+++ b/scripts/build/Platform/Windows/env_windows.cmd
@@ -7,6 +7,9 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
 REM
 
+REM To get recursive folder creation
+SETLOCAL EnableExtensions EnableDelayedExpansion
+
 where /Q cmake
 IF NOT %ERRORLEVEL%==0 (
     ECHO [ci_build] CMake not found
@@ -18,7 +21,26 @@ IF NOT "%COMMAND_CWD%"=="" (
     CD %COMMAND_CWD%
 )
 
+REM Ending the local environment to be able to propagate the TMP/TEMP variables to the calling script
+ENDLOCAL
+
+REM Jenkins does not defined TMP
+IF "%TMP%"=="" (
+    IF "%WORKSPACE%"=="" (
+        SET TMP=%APPDATA%\Local\Temp
+        SET TEMP=%APPDATA%\Local\Temp
+    ) ELSE (
+        SET TMP=%WORKSPACE%\Temp
+        SET TEMP=%WORKSPACE%\Temp
+        REM This folder may not be created in the workspace
+        IF NOT EXIST "!TMP!" (
+            MKDIR "!TMP!"
+        )
+    )
+)
+
 EXIT /b 0
 
 :error
+ENDLOCAL
 EXIT /b 1
\ No newline at end of file
diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index 87f53adc7f..8dc111c256 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -17,12 +17,6 @@ IF NOT EXIST %OUTPUT_DIRECTORY% (
 )
 PUSHD %OUTPUT_DIRECTORY%
 
-REM Override the temporary directory used by wix to the workspace
-SET "WIX_TEMP=!WORKSPACE_TMP!/wix"
-IF NOT EXIST "%WIX_TEMP%" (
-    MKDIR "%WIX_TEMP%"
-)
-
 REM Make sure we are using the CMake version of CPack and not the one that comes with chocolatey
 SET CPACK_PATH=
 IF "%LY_CMAKE_PATH%"=="" (
@@ -47,10 +41,6 @@ IF ERRORLEVEL 1 (
     GOTO :popd_error
 )
 
-IF NOT "%CPACK_BUCKET%"=="" (
-    SET "CPACK_OPTIONS=-D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%"
-)
-
 ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION% %CPACK_OPTIONS%
 "!CPACK_PATH!"  -C %CONFIGURATION% %CPACK_OPTIONS%
 IF NOT %ERRORLEVEL%==0 (
diff --git a/scripts/build/Platform/Windows/package_build_config.json b/scripts/build/Platform/Windows/package_build_config.json
deleted file mode 100644
index 5eb96f1e38..0000000000
--- a/scripts/build/Platform/Windows/package_build_config.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "profile_vs2019_atom": {
-    "COMMAND":"build_windows.cmd",
-    "PARAMETERS": {
-      "CONFIGURATION":"profile",
-      "OUTPUT_DIRECTORY":"windows_vs2019",
-      "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
-      "CMAKE_LY_PROJECTS":"AtomTest;AtomSampleViewer",
-      "CMAKE_TARGET":"ALL_BUILD",
-      "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
-    }
-  }
-}
diff --git a/scripts/build/Platform/Windows/pipeline.json b/scripts/build/Platform/Windows/pipeline.json
index 6be55ec82d..b18a1e8c63 100644
--- a/scripts/build/Platform/Windows/pipeline.json
+++ b/scripts/build/Platform/Windows/pipeline.json
@@ -1,7 +1,7 @@
 {
     "ENV": {
         "NODE_LABEL": "windows-b3c8994f1",
-        "LY_3RDPARTY_PATH": "C:/ly/3rdParty",
+        "LY_3RDPARTY_PATH": "D:/workspace/3rdParty",
         "TIMEOUT": 30,
         "WORKSPACE": "D:/workspace",
         "MOUNT_VOLUME": true
diff --git a/scripts/build/Platform/iOS/build_config.json b/scripts/build/Platform/iOS/build_config.json
index 895f74daae..ec2b763dda 100644
--- a/scripts/build/Platform/iOS/build_config.json
+++ b/scripts/build/Platform/iOS/build_config.json
@@ -76,7 +76,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/mac",
-      "CMAKE_OPTIONS": "-G Xcode -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE",
+      "CMAKE_OPTIONS": "-G Xcode",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "AssetProcessorBatch",
       "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
@@ -112,7 +112,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "profile",
       "OUTPUT_DIRECTORY": "build/ios_test",
-      "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\"  -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE",
+      "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\"  -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "",
       "TARGET_DEVICE_NAME": "Lumberyard",
diff --git a/scripts/build/Platform/iOS/build_ios_test.sh b/scripts/build/Platform/iOS/build_ios_test.sh
index b683948e72..7869b900db 100755
--- a/scripts/build/Platform/iOS/build_ios_test.sh
+++ b/scripts/build/Platform/iOS/build_ios_test.sh
@@ -19,7 +19,7 @@ SOURCE_DIRECTORY=${PWD}
 ECHO Configuring for iOS Testing
 
 LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
-CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}"
+CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
 if [[ ! -e "CMakeCache.txt" ]]; then
     echo [ci_build] First run, generating
     RUN_CONFIGURE=1
diff --git a/scripts/build/Platform/iOS/pipeline.json b/scripts/build/Platform/iOS/pipeline.json
index e8cea0f06d..a5e2ff710e 100644
--- a/scripts/build/Platform/iOS/pipeline.json
+++ b/scripts/build/Platform/iOS/pipeline.json
@@ -1,7 +1,7 @@
 {
     "ENV": {
         "NODE_LABEL": "mac-bigsur-2fc3a22",
-        "LY_3RDPARTY_PATH": "/Users/lybuilder/3rdParty",
+        "LY_3RDPARTY_PATH": "/Users/lybuilder/workspace/3rdParty",
         "TIMEOUT": 30,
         "WORKSPACE": "/Users/lybuilder/workspace",
         "MOUNT_VOLUME": false
diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt
index 2af55ab180..30259a6dc7 100644
--- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt
+++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt
@@ -12,7 +12,7 @@ libxcb-xinerama0                        # For Qt plugins at runtime
 libxcb-xinput0                          # For Qt plugins at runtime
 libfontconfig1-dev                      # For Qt plugins at runtime
 libcurl4-openssl-dev                    # For HttpRequestor
-libsdl2-dev                             # For WWise/Audio
+# libsdl2-dev                             # For WWise/Audio
 libxcb-xkb-dev                          # For xcb keyboard input
 libxkbcommon-x11-dev                    # For xcb keyboard input
 libxkbcommon-dev                        # For xcb keyboard input
diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
index e0e03cda90..71958d74bd 100644
--- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
+++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
@@ -12,7 +12,7 @@ libxcb-xinerama0                        # For Qt plugins at runtime
 libxcb-xinput0                          # For Qt plugins at runtime
 libfontconfig1-dev                      # For Qt plugins at runtime
 libcurl4-openssl-dev                    # For HttpRequestor
-libsdl2-dev                             # for WWise/Audio
+# libsdl2-dev                             # for WWise/Audio
 libxcb-xkb-dev                          # For xcb keyboard input
 libxkbcommon-x11-dev                    # For xcb keyboard input
 libxkbcommon-dev                        # For xcb keyboard input
diff --git a/scripts/build/package/PackageEnv.py b/scripts/build/package/PackageEnv.py
deleted file mode 100755
index 1f2d102214..0000000000
--- a/scripts/build/package/PackageEnv.py
+++ /dev/null
@@ -1,191 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-from Params import Params
-from util import *
-
-
-class PackageEnv(Params):
-    def __init__(self, platform, type, json_file):
-        super(PackageEnv, self).__init__()
-        self.__cur_dir = os.path.dirname(os.path.abspath(__file__))
-        global_env_file = os.path.join(self.__cur_dir, json_file)
-        with open(global_env_file, 'r') as source:
-            data = json.load(source)
-            self.__global_env = data.get('global_env')
-        platform_env_file = os.path.join(self.__cur_dir, 'Platform', platform, json_file)
-        if not os.path.exists(platform_env_file):
-            print(f'{platform_env_file} is not found.')
-            # Search restricted platform folders
-            engine_root = self.get('ENGINE_ROOT')
-            # Use real path in case engine root is a symlink path
-            if os.name == 'posix' and os.path.islink(engine_root):
-                engine_root = os.readlink(engine_root)
-            rel_path = os.path.relpath(self.__cur_dir, engine_root)
-            platform_env_file = os.path.join(engine_root, 'restricted', platform, rel_path, json_file)
-            if not os.path.exists(platform_env_file):
-                ly_build_error(f'{platform_env_file} is not found.')
-        with open(platform_env_file, 'r') as source:
-            data = json.load(source)
-            types = data.get('types')
-            if type not in types:
-                ly_build_error(f'Package type {type} is not supported')
-            self.__platform = platform
-            self.__platform_env = data.get('local_env')
-            self.__platform_env.update(self.__global_env)
-            self.__type = type
-            self.__type_env = types.get(type)
-
-    def get_platform(self):
-        return self.__platform
-
-    def get_type(self):
-        return self.__type
-
-    def get_platform_env(self):
-        return self.__platform_env
-
-    def get_type_env(self):
-        return self.__type_env
-
-    def __get_platform_value(self, key):
-        key = key.upper()
-        value = self.__platform_env.get(key)
-        if value is None:
-            ly_build_error(f'{key} is not defined in global env nor in local env')
-        return value
-
-    def __get_type_value(self, key):
-        key = key.upper()
-        value = self.__type_env.get(key)
-        if value is None:
-            ly_build_error(f'{key} is not defined in package type {self.__type} for platform {self.__platform}')
-        return value
-
-    def __evaluate_boolean(self, v):
-        return str(v).lower() in ['1', 'true']
-
-    def __get_engine_root(self):
-        def validate_engine_root(engine_root):
-            if not os.path.isdir(engine_root):
-                return False
-            return os.path.exists(os.path.join(engine_root, 'engine.json'))
-
-        workspace = os.getenv('WORKSPACE')
-        if workspace is not None:
-            print(f'Environment variable WORKSPACE={workspace} detected')
-            if validate_engine_root(workspace):
-                print(f'Setting ENGINE_ROOT to {workspace}')
-                return workspace
-            print('Cannot locate ENGINE_ROOT with Environment variable WORKSPACE')
-
-        engine_root = os.getenv('ENGINE_ROOT', '')
-        if validate_engine_root(engine_root):
-            return engine_root
-
-        print('Environment variable ENGINE_ROOT is not set or invalid, checking ENGINE_ROOT in env json file')
-        engine_root = self.__global_env.get('ENGINE_ROOT')
-        if validate_engine_root(engine_root):
-            return engine_root
-
-        # Set engine_root based on script location
-        engine_root = os.path.dirname(os.path.dirname(os.path.dirname(self.__cur_dir)))
-        print(f'ENGINE_ROOT from env json file is invalid, defaulting to {engine_root}')
-        if validate_engine_root(engine_root):
-            return engine_root
-        else:
-            error('Cannot Locate ENGINE_ROOT')
-
-    def __get_thirdparty_home(self):
-        third_party_home = os.getenv('LY_3RDPARTY_PATH', '')
-        if os.path.exists(third_party_home):
-            print(f'LY_3RDPARTY_PATH found, using {third_party_home} as 3rdParty path.')
-            return third_party_home
-        third_party_home = self.__get_platform_value('THIRDPARTY_HOME')
-        if os.path.isdir(third_party_home):
-            return third_party_home
-
-        # Set engine_root based on script location
-        print('THIRDPARTY_HOME is not valid, looking for THIRD_PARTY_HOME')
-
-        # Finding THIRD_PARTY_HOME
-        cur_dir = self.__get_engine_root()
-        last_dir = None
-        while last_dir != cur_dir:
-            third_party_home = os.path.join(cur_dir, '3rdParty')
-            print(f'Cheking THIRDPARTY_HOME {third_party_home}')
-            if os.path.exists(os.path.join(third_party_home, '3rdParty.txt')):
-                print(f'Setting THIRDPARTY_HOME to {third_party_home}')
-                return third_party_home
-            last_dir = cur_dir
-            cur_dir = os.path.dirname(cur_dir)
-        error('Cannot locate THIRDPARTY_HOME')
-
-    def __get_package_name_pattern(self):
-        package_name_pattern = self.__get_platform_value('PACKAGE_NAME_PATTERN')
-        if os.getenv('PACKAGE_NAME_PATTERN') is not None:
-            package_name_pattern = os.getenv('PACKAGE_NAME_PATTERN')
-        return package_name_pattern
-
-    def __get_branch_name(self):
-        branch_name = self.__get_platform_value('BRANCH_NAME')
-        if os.getenv('BRANCH_NAME') is not None:
-            branch_name = os.getenv('BRANCH_NAME')
-        branch_name = branch_name.replace('/', '_').replace('\\', '_')
-        return branch_name
-
-    def __get_build_number(self):
-        build_number = self.__get_platform_value('BUILD_NUMBER')
-        if os.getenv('BUILD_NUMBER') is not None:
-            build_number = os.getenv('BUILD_NUMBER')
-        return build_number
-
-    def __get_scrub_params(self):
-        return self.__get_type_value('SCRUB_PARAMS')
-
-    def __get_validator_platforms(self):
-        return self.__get_type_value('VALIDATOR_PLATFORMS')
-
-    def __get_package_targets(self):
-        return self.__get_type_value('PACKAGE_TARGETS')
-
-    def __get_build_targets(self):
-        return self.__get_type_value('BUILD_TARGETS')
-
-    def __get_asset_processor_path(self):
-        return self.__get_type_value('ASSET_PROCESSOR_PATH')
-
-    def __get_asset_game_folders(self):
-        return self.__get_type_value('ASSET_GAME_FOLDERS')
-
-    def __get_asset_platform(self):
-        return self.__get_type_value('ASSET_PLATFORM')
-
-    def __get_bootstrap_cfg_game_folder(self):
-        return self.__get_type_value('BOOTSTRAP_CFG_GAME_FOLDER')
-
-    def __get_skip_build(self):
-        skip_build = os.getenv('SKIP_BUILD')
-        if skip_build is None:
-            skip_build = self.__get_type_value('SKIP_BUILD')
-        return self.__evaluate_boolean(skip_build)
-
-    def __get_skip_scrubbing(self):
-        skip_scrubbing = os.getenv('SKIP_SCRUBBING')
-        if skip_scrubbing is None:
-            skip_scrubbing = self.__type_env.get('SKIP_SCRUBBING', 'False')
-        return self.__evaluate_boolean(skip_scrubbing)
-
-    def __get_internal_s3_bucket(self):
-        return self.__get_platform_value('INTERNAL_S3_BUCKET')
-
-    def __get_qa_s3_bucket(self):
-        return self.__get_platform_value('QA_S3_BUCKET')
-
-    def __get_s3_prefix(self):
-        return self.__get_platform_value('S3_PREFIX')
diff --git a/scripts/build/package/Params.py b/scripts/build/package/Params.py
deleted file mode 100755
index 994d28486a..0000000000
--- a/scripts/build/package/Params.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-import os
-import sys
-import re
-from util import ly_build_error
-
-
-class Params(object):
-    def __init__(self):
-        # Cache params
-        self.__params = {}
-
-    def get(self, param_name):
-        param_value = self.__params.get(param_name)
-        if param_value is not None:
-            return param_value
-        # Call __get_${param_name} function
-        func = getattr(self, '_{}__get_{}'.format(self.__class__.__name__, param_name.lower()), None)
-        if func is not None:
-            param_value = func()
-            # Replace all ${env} in value
-            if isinstance(param_value, str):
-                param_value = self.__process_string(param_name, param_value)
-            elif isinstance(param_value, list):
-                param_value = self.__process_list(param_name, param_value)
-            elif isinstance(param_value, dict):
-                param_value = self.__process_dict(param_name, param_value)
-            # Cache param
-            self.__params[param_name] = param_value
-            return param_value
-        ly_build_error('method __get_{} is not defined in class {}'.format(param_name.lower(), self.__class__.__name__))
-
-    def set(self, param_name, param_value):
-        self.__params[param_name] = param_value
-
-    def exists(self, param_name):
-        try:
-            self.get(param_name)
-        except LyBuildError:
-            return False
-        return True
-
-    def __process_string(self, param_name, param_value):
-        # Find all param with format ${param}
-        params = re.findall('\${(\w+)}', param_value)
-        # Avoid using the same param name in value, like 'WORKSPACE': '${WORKSPACE} some string'
-        if param_name in params:
-            ly_build_error('The use of same parameter name({}) in value is not allowed'.format(param_name))
-        # Replace ${param} with actual value
-        for param in params:
-            param_value = param_value.replace('${' + param + '}', self.get(param))
-        return param_value
-
-    def __process_list(self, param_name, param_value):
-        processed_list = []
-        for entry in param_value:
-            if isinstance(entry, str):
-                entry = self.__process_string(param_name, entry)
-            elif isinstance(entry, list):
-                entry = self.__process_list(param_name, entry)
-            elif isinstance(entry, dict):
-                entry = self.__process_dict(param_name, entry)
-            processed_list.append(entry)
-        return processed_list
-
-    def __process_dict(self, param_name, param_value):
-        for key in param_value:
-            if isinstance(param_value[key], str):
-                param_value[key] = self.__process_string(param_name, param_value[key])
-            elif isinstance(param_value[key], list):
-                param_value[key] = self.__process_list(param_name, param_value[key])
-            elif isinstance(param_value[key], dict):
-                param_value[key] = self.__process_dict(param_name, param_value[key])
-        return param_value
\ No newline at end of file
diff --git a/scripts/build/package/Platform/3rdParty/package_env.json b/scripts/build/package/Platform/3rdParty/package_env.json
deleted file mode 100644
index 5059132664..0000000000
--- a/scripts/build/package/Platform/3rdParty/package_env.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "local_env": {
-        "S3_PREFIX": "${BRANCH_NAME}/3rdParty"
-    },
-    "types": {
-        "3rdParty_all": {
-            "PACKAGE_TARGETS":[
-                {
-                    "FILE_LIST": "3rdParty.json",
-                    "FILE_LIST_TYPE": "3rdParty",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-3rdParty-all-${BUILD_NUMBER}.zip"
-                }
-            ],
-            "BOOTSTRAP_CFG_GAME_FOLDER":"CMakeTestbed",
-            "SKIP_BUILD": 1,
-            "SKIP_SCRUBBING": 1
-        }
-    }
-}
diff --git a/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json b/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json
deleted file mode 100644
index 915368dd0b..0000000000
--- a/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "@3rdParty": {
-        "3rdParty.txt": "#include",
-        "AWS/AWSNativeSDK/1.7.167-az.2/**": "#include",
-        "CMake/3.19.1/**": "#include",
-        "DirectXShaderCompiler/1.0.1-az.1/**": "#include",
-        "DirectXShaderCompiler/2020.08.07/**": "#include",
-        "DirectXShaderCompiler/5.0.0-az/**": "#include",
-        "dyad/0.2.0-17-amazon/**": "#include",
-        "etc2comp/2017_04_24-az.2/**": "#include",
-        "expat/2.1.0-pkg.3/**": "#include",
-        "FbxSdk/2016.1.2-az.1/**": "#include",
-        "OpenSSL/1.1.1b-noasm-az/**": "#include",
-        "Qt/5.15.1.2-az/**": "#include",
-        "tiff/3.9.5-az.3/**": "#include",
-        "Wwise/2019.2.8.7432/**": "#include"
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/package/Platform/Android/package_env.json b/scripts/build/package/Platform/Android/package_env.json
deleted file mode 100644
index 017937413a..0000000000
--- a/scripts/build/package/Platform/Android/package_env.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "local_env": {
-        "S3_PREFIX": "${BRANCH_NAME}/Android"
-    },
-    "types":{
-        "all":{
-            "PACKAGE_TARGETS":[
-                {
-                    "FILE_LIST": "all.json",
-                    "FILE_LIST_TYPE": "All",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-android-all-${BUILD_NUMBER}.zip"
-                }
-            ],
-            "BOOTSTRAP_CFG_GAME_FOLDER":"AutomatedTesting",
-            "SKIP_BUILD": 0,
-            "BUILD_TARGETS":[
-                {
-                    "BUILD_CONFIG_FILENAME": "build_config.json",
-                    "PLATFORM": "Android",
-                    "TYPE": "profile"
-                }
-            ]
-        }
-    }
-}
diff --git a/scripts/build/package/Platform/Mac/package_env.json b/scripts/build/package/Platform/Mac/package_env.json
deleted file mode 100644
index f21c9fdaab..0000000000
--- a/scripts/build/package/Platform/Mac/package_env.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "local_env": {
-        "S3_PREFIX": "${BRANCH_NAME}/Mac"
-    },
-    "types":{
-        "all":{
-            "PACKAGE_TARGETS":[
-                {
-                    "FILE_LIST": "all.json",
-                    "FILE_LIST_TYPE": "All",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-mac-all-${BUILD_NUMBER}.zip"
-                },
-                {
-                    "FILE_LIST": "3rdParty.json",
-                    "FILE_LIST_TYPE": "Mac",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-mac-3rdParty-${BUILD_NUMBER}.zip"
-                },
-                {
-                    "FILE_LIST": "3rdParty.json",
-                    "FILE_LIST_TYPE": "3rdParty",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-mac-3rdParty-Warsaw-${BUILD_NUMBER}.zip"
-                }
-            ],
-            "BOOTSTRAP_CFG_GAME_FOLDER":"CMakeTestbed",
-            "SKIP_BUILD": 0,
-            "BUILD_TARGETS":[
-                {
-                    "BUILD_CONFIG_FILENAME": "build_config.json",
-                    "PLATFORM": "Mac",
-                    "TYPE": "profile"
-                },
-                {
-                    "BUILD_CONFIG_FILENAME": "build_config.json",
-                    "PLATFORM": "iOS",
-                    "TYPE": "profile"
-                }
-            ]
-        }
-    }
-}
diff --git a/scripts/build/package/Platform/Mac/package_filelists/3rdParty.json b/scripts/build/package/Platform/Mac/package_filelists/3rdParty.json
deleted file mode 100644
index ff019f701f..0000000000
--- a/scripts/build/package/Platform/Mac/package_filelists/3rdParty.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "@3rdParty":{
-        "3rdParty.txt":"#include",
-        "AWS/AWSNativeSDK/1.7.167-az.2":{
-            "*":"#include",
-            "include/**":"#include",
-            "LICENSE*":"#include",
-            "lib/mac/**":"#include",
-            "bin/mac/**":"#include",
-            "lib/ios/**":"#include",
-            "bin/ios/**":"#include"
-        },
-        "DirectXShaderCompiler/1.0.1-az.1":{
-            "*":"#include",
-            "src/**":"#include",
-            "bin/darwin_x64/**":"#include"
-        },
-        "DirectXShaderCompiler/2020.08.07":{
-            "*":"#include",
-            "bin/darwin_x64/**":"#include"
-        },
-        "DirectXShaderCompiler/5.0.0-az":{
-            "*":"#include",
-            "bin/darwin_x64/**":"#include"
-        },
-        "etc2comp/2017_04_24-az.2":{
-            "*":"#include",
-            "EtcLib/Etc/**":"#include",
-            "EtcLib/EtcCodec/**":"#include",
-            "EtcLib/*":"#include",
-            "EtcLib/OSX_x86/**":"#include"
-        },
-        "expat/2.1.0-pkg.3":{
-            "*":"#include",
-            "amiga/**":"#include",
-            "bcb5/**":"#include",
-            "conftools/**":"#include",
-            "doc/**":"#include",
-            "examples/**":"#include",
-            "lib/**":"#include",
-            "m4/**":"#include",
-            "tests/**":"#include",
-            "vms/**":"#include",
-            "win32/**":"#include",
-            "xmlwf/**":"#include",
-            "build/osx/**":"#include"
-        },
-        "FreeType2/2.5.0.1-pkg.3":{
-            "freetype-2.5.0.1/**":"#include",
-            "dist/**":"#include",
-            "mac/**":"#include",
-            "ios*/**":"#include",
-            "build/osx/**":"#include"
-        },
-        "Redistributables/FbxSdk/2016.1.2":{
-            "*mac*":"#include"
-        },
-        "OpenSSL/1.1.1b-noasm-az":{
-            "include/**":"#include",
-            "ssl/**":"#include",
-            "LICENSE":"#include",
-            "bin/**":"#include",
-            "lib/darwin*/**":"#include",
-            "lib/ios*/**":"#include"
-        },
-        "Qt/5.15.1.2-az":{
-            "LICENSE":"#include",
-            "LGPL_EXCEPTION.TXT":"#include",
-            "LICENSE.GPLV3":"#include",
-            "LICENSE.LGPLV3":"#include",
-            "QT-NOTICE.TXT":"#include",
-            "clang_64/**":"#include"
-        },
-        "tiff/3.9.5-az.3":{
-            "COPYRIGHT":"#include",
-            "README":"#include",
-            "RELEASE-DATE":"#include",
-            "VERSION":"#include",
-            "libtiff/macosx_clang/**":"#include"
-        }
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/package/Platform/Windows/package_env.json b/scripts/build/package/Platform/Windows/package_env.json
deleted file mode 100644
index 970361bacc..0000000000
--- a/scripts/build/package/Platform/Windows/package_env.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "local_env": {
-        "S3_PREFIX": "${BRANCH_NAME}/Windows"
-    },
-    "types":{
-        "all":{
-            "PACKAGE_TARGETS":[
-                {
-                    "FILE_LIST": "all.json",
-                    "FILE_LIST_TYPE": "All",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-windows-all-${BUILD_NUMBER}.zip"
-                },
-                {
-                    "FILE_LIST": "symbols.json",
-                    "FILE_LIST_TYPE": "All",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-windows-all-symbols-${BUILD_NUMBER}.zip"
-                },
-                {
-                    "FILE_LIST": "3rdParty.json",
-                    "FILE_LIST_TYPE": "Windows",
-                    "PACKAGE_NAME": "${PACKAGE_NAME_PATTERN}-windows-3rdparty-${BUILD_NUMBER}.zip"
-                }
-            ],
-            "BOOTSTRAP_CFG_GAME_FOLDER":"CMakeTestbed",
-            "SKIP_BUILD": 0,
-            "BUILD_TARGETS":[
-                {
-                    "BUILD_CONFIG_FILENAME": "build_config.json",
-                    "PLATFORM": "Windows",
-                    "TYPE": "profile_vs2019"
-                }
-            ]
-        }
-    }
-}
diff --git a/scripts/build/package/Platform/Windows/package_filelists/3rdParty.json b/scripts/build/package/Platform/Windows/package_filelists/3rdParty.json
deleted file mode 100644
index d9e5d85090..0000000000
--- a/scripts/build/package/Platform/Windows/package_filelists/3rdParty.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "@3rdParty":{
-        "3rdParty.txt":"#include",
-        "AMD/AGS Lib/2.2":{
-            "*":"#include",
-            "inc/**":"#include",
-            "lib/x64/**":"#include"
-        },
-        "AWS/AWSNativeSDK/1.7.167-az.2":{
-            "*":"#include",
-            "include/**":"#include",
-            "LICENSE*":"#include",
-            "lib/windows/**":"#include",
-            "bin/windows/**":"#include",
-            "lib/android/arm64-v8a/**":"#include",
-            "bin/android/arm64-v8a/**":"#include",
-            "bin/linux/**":"#include",
-            "lib/linux/**":"#include"
-        },
-        "DirectXShaderCompiler/1.0.1-az.1":{
-            "*":"#include",
-            "src/**":"#include",
-            "bin/win_x64/**":"#include"
-        },
-        "DirectXShaderCompiler/2020.08.07":{
-            "*":"#include",
-            "bin/win_x64/**":"#include"
-        },
-        "DirectXShaderCompiler/5.0.0-az":{
-            "*":"#include",
-            "bin/win_x64/**":"#include"
-        },
-        "dyad/0.2.0-17-amazon":{
-            "*":"#include",
-            "doc/**":"#include",
-            "example/**":"#include",
-            "projects/**":"#include",
-            "src/**":"#include",
-            "lib/x64_v140_Debug/**":"#include",
-            "lib/x64_v140_Release/**":"#include",
-            "lib/linux_debug/**":"#include",
-            "lib/linux_release/**":"#include"
-        },
-        "etc2comp/2017_04_24-az.2":{
-            "EtcLib/Etc/**":"#include",
-            "EtcLib/EtcCodec/**":"#include",
-            "LICENSE":"#include",
-            "EtcLib/Windows_x86_64/**":"#include",
-            "EtcLib/Linux_x64_linux/**":"#include"
-        },
-        "expat/2.1.0-pkg.3":{
-            "*":"#include",
-            "amiga/**":"#include",
-            "bcb5/**":"#include",
-            "conftools/**":"#include",
-            "doc/**":"#include",
-            "examples/**":"#include",
-            "lib/**":"#include",
-            "m4/**":"#include",
-            "tests/**":"#include",
-            "vms/**":"#include",
-            "win32/**":"#include",
-            "xmlwf/**":"#include",
-            "build/win_x64/vc140/**":"#include",
-            "build/win_x64/android_ndk_r12/android-*/**":"#include",
-            "build/linux/**":"#include"
-        },
-        "FreeType2/2.5.0.1-pkg.3":{
-            "freetype-2.5.0.1/**":"#include",
-            "dist/**":"#include",
-            "vc140_x64/**":"#include",
-            "build/win_x64/vc140/**":"#include",
-            "android*/**":"#include",
-            "build/win_x64/android_ndk_r12/android-*/**":"#include",
-            "build/linux/clang-3.4/**":"#include"
-        },
-        "Redistributables/FbxSdk/2016.1.2":{
-            "*win*":"#include",
-            "*vs2013*":"#exclude"
-        },
-        "OpenSSL/1.1.1b-noasm-az":{
-            "include/**":"#include",
-            "ssl/**":"#include",
-            "LICENSE":"#include",
-            "bin/**":"#include",
-            "lib/vc140_x64_debug/**":"#include",
-            "lib/vc140_x64_release/**":"#include",
-            "lib/android_ndk_r15c/android-*/**":"#include",
-            "lib/linux-x86_64-clang-debug/**":"#include",
-            "lib/linux-x86_64-clang-release/**":"#include"
-        },
-        "Qt/5.15.1.2-az":{
-            "LICENSE":"#include",
-            "LGPL_EXCEPTION.TXT":"#include",
-            "LICENSE.GPLV3":"#include",
-            "LICENSE.LGPLV3":"#include",
-            "QT-NOTICE.TXT":"#include",
-            "msvc*/**":"#include",
-            "gcc_64/**":"#include"
-        },
-        "tiff/3.9.5-az.3":{
-            "COPYRIGHT":"#include",
-            "README":"#include",
-            "RELEASE-DATE":"#include",
-            "VERSION":"#include",
-            "libtiff/buildLib32Lib64.bat":"#include",
-            "libtiff/readme.txt":"#include",
-            "include/libtiff/*.h":"#include",
-            "libtiff/*vc140.lib":"#include",
-            "libtiff/linux_gcc/**":"#include"
-        }
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/package/glob3.py b/scripts/build/package/glob3.py
deleted file mode 100755
index b46683a4be..0000000000
--- a/scripts/build/package/glob3.py
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-import os
-import re
-import fnmatch
-
-__all__ = ["glob", "iglob", "escape"]
-
-def glob(pathname, recursive=False):
-    """Return a list of paths matching a pathname pattern.
-    The pattern may contain simple shell-style wildcards a la
-    fnmatch. However, unlike fnmatch, filenames starting with a
-    dot are special cases that are not matched by '*' and '?'
-    patterns.
-    If recursive is true, the pattern '**' will match any files and
-    zero or more directories and subdirectories.
-    """
-    return list(iglob(pathname, recursive=recursive))
-
-def iglob(pathname, recursive=False):
-    """Return an iterator which yields the paths matching a pathname pattern.
-    The pattern may contain simple shell-style wildcards a la
-    fnmatch. However, unlike fnmatch, filenames starting with a
-    dot are special cases that are not matched by '*' and '?'
-    patterns.
-    If recursive is true, the pattern '**' will match any files and
-    zero or more directories and subdirectories.
-    """
-    it = _iglob(pathname, recursive, False)
-    if recursive and _isrecursive(pathname):
-        s = next(it)  # skip empty string
-        assert not s
-    return it
-
-def _iglob(pathname, recursive, dironly):
-    dirname, basename = os.path.split(pathname)
-    if not has_magic(pathname):
-        assert not dironly
-        if basename:
-            if os.path.lexists(pathname):
-                yield pathname
-        else:
-            # Patterns ending with a slash should match only directories
-            if os.path.isdir(dirname):
-                yield pathname
-        return
-    if not dirname:
-        if recursive and _isrecursive(basename):
-            yield _glob2(dirname, basename, dironly)
-        else:
-            yield _glob1(dirname, basename, dironly)
-        return
-    # `os.path.split()` returns the argument itself as a dirname if it is a
-    # drive or UNC path.  Prevent an infinite recursion if a drive or UNC path
-    # contains magic characters (i.e. r'\\?\C:').
-    if dirname != pathname and has_magic(dirname):
-        dirs = _iglob(dirname, recursive, True)
-    else:
-        dirs = [dirname]
-    if has_magic(basename):
-        if recursive and _isrecursive(basename):
-            glob_in_dir = _glob2
-        else:
-            glob_in_dir = _glob1
-    else:
-        glob_in_dir = _glob0
-    for dirname in dirs:
-        for name in glob_in_dir(dirname, basename, dironly):
-            yield os.path.join(dirname, name)
-
-# These 2 helper functions non-recursively glob inside a literal directory.
-# They return a list of basenames.  _glob1 accepts a pattern while _glob0
-# takes a literal basename (so it only has to check for its existence).
-
-def _glob1(dirname, pattern, dironly):
-    names = list(_iterdir(dirname, dironly))
-    return fnmatch.filter(names, pattern)
-
-def _glob0(dirname, basename, dironly):
-    if not basename:
-        # `os.path.split()` returns an empty basename for paths ending with a
-        # directory separator.  'q*x/' should match only directories.
-        if os.path.isdir(dirname):
-            return [basename]
-    else:
-        if os.path.lexists(os.path.join(dirname, basename)):
-            return [basename]
-    return []
-
-# Following functions are not public but can be used by third-party code.
-
-def glob0(dirname, pattern):
-    return _glob0(dirname, pattern, False)
-
-def glob1(dirname, pattern):
-    return _glob1(dirname, pattern, False)
-
-# This helper function recursively yields relative pathnames inside a literal
-# directory.
-
-def _glob2(dirname, pattern, dironly):
-    assert _isrecursive(pattern)
-    return [pattern[:0]] + list(_rlistdir(dirname, dironly))
-
-# If dironly is false, yields all file names inside a directory.
-# If dironly is true, yields only directory names.
-def _iterdir(dirname, dironly):
-    if not dirname:
-        if isinstance(dirname, bytes):
-            dirname = bytes(os.curdir, 'ASCII')
-        else:
-            dirname = os.curdir
-    try:
-        for entry in os.listdir(dirname):
-            yield entry
-    except OSError:
-        return
-
-# Recursively yields relative pathnames inside a literal directory.
-def _rlistdir(dirname, dironly):
-    if not os.path.islink(dirname):
-        names = list(_iterdir(dirname, dironly))
-        for x in names:
-            yield x
-            path = os.path.join(dirname, x) if dirname else x
-            for y in _rlistdir(path, dironly):
-                yield os.path.join(x, y)
-magic_check = re.compile('([*?[])')
-magic_check_bytes = re.compile(b'([*?[])')
-
-def has_magic(s):
-    if isinstance(s, bytes):
-        match = magic_check_bytes.search(s)
-    else:
-        match = magic_check.search(s)
-    return match is not None
-
-def _ishidden(path):
-    return path[0] in ('.', b'.'[0])
-
-def _isrecursive(pattern):
-    if isinstance(pattern, bytes):
-        return pattern == b'**'
-    else:
-        return pattern == '**'
-
-def escape(pathname):
-    """Escape all special characters.
-    """
-    # Escaping is done by wrapping any of "*?[" between square brackets.
-    # Metacharacters do not work in the drive part and shouldn't be escaped.
-    drive, pathname = os.path.splitdrive(pathname)
-    if isinstance(pathname, bytes):
-        pathname = magic_check_bytes.sub(br'[\1]', pathname)
-    else:
-        pathname = magic_check.sub(r'[\1]', pathname)
-    return drive + pathname
\ No newline at end of file
diff --git a/scripts/build/package/glob_to_regex.py b/scripts/build/package/glob_to_regex.py
deleted file mode 100755
index 53ad3d850d..0000000000
--- a/scripts/build/package/glob_to_regex.py
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-from __future__ import absolute_import
-import os
-import re
-import json
-import sys
-try:
-    import six
-except ImportError:
-    import pip
-    pip.main(['install', 'six', '--ignore-installed', '-q'])
-    import six
-from pathlib import Path
-
-this_file_path = os.path.dirname(os.path.realpath(__file__))
-
-# resolve symlinks and eliminate ".." components
-engine_root_path = Path(__file__).resolve().parents[3]
-    
-def convert_glob_pattern_to_regex_pattern(glob_pattern):
-    # switch to forward slashes because way easier to pattern match against
-    pattern = re.sub(r'\\', r'/', glob_pattern)
-
-    # Replace the dots and question marks
-    pattern = re.sub(r'\.', r'\\.', pattern)
-    pattern = re.sub(r'\?', r'.', pattern)
-
-    # Handle the * vs ** expansions
-    pattern = re.sub(r'([^*])\*($|[^*])', r'\1[^/\\\\]*\2', pattern)
-    pattern = re.sub(r'\*\*/', r'(.*/)?', pattern)
-    pattern = re.sub(r'\*\*', r'.*', pattern)
-
-    # replace the forward slashes with [/\\] so it works on PC/unix
-    pattern = re.sub(r'([^^])/', r'\1[/\\\\]', pattern)
-    return pattern
-
-# Convert the package json into a pair of regexes we can use to look for includes and excludes
-def convert_glob_list_to_regex_list(filelist, prefix):
-    includes = []
-    excludes = []
-    for key, value in six.iteritems(filelist):
-        glob_pattern = os.path.join(prefix, key)
-        if isinstance(value, dict):
-            (sub_includes, sub_excludes) = convert_glob_list_to_regex_list(value, glob_pattern)
-            includes.extend(sub_includes)
-            excludes.extend(sub_excludes)
-        else:
-            # Simulate what glob would do with file walking to scope the * within a directory
-            # and ** across directories
-            regex_pattern = convert_glob_pattern_to_regex_pattern(os.path.normpath(glob_pattern))
-
-            # Deal with the commands. include/exclude are straight forward. Moves/renames are to be considered
-            # includes, and we will stick with validating the original contents for now
-            if value == "#include":
-                includes.append(regex_pattern)
-            elif value == "#exclude":
-                excludes.append(regex_pattern)
-            elif value.startswith('#move:'):
-                includes.append(regex_pattern)
-            elif value.startswith('#rename:'):
-                includes.append(regex_pattern)
-            else:
-                pass
-    return (includes, excludes)
-
-def generate_excludes_for_platform(root, platform):
-    if platform == 'all':
-        platform_exclusions_filename = os.path.join(this_file_path, 'platform_exclusions.json')
-        with open(platform_exclusions_filename, 'r') as platform_exclusions_file:
-            platform_exclusions = json.load(platform_exclusions_file)
-    else:
-        # Use real path in case root is a symlink path
-        if os.name == 'posix' and os.path.islink(root):
-            root = os.readlink(root)
-        # "root" is the root of the folder structure we're validating 
-        # "engine_root_path" is the engine root where the restricted platform folder is linked
-        relative_folder = os.path.relpath(this_file_path, engine_root_path)
-        platform_exclusions_filename = os.path.join(engine_root_path, 'restricted', platform, relative_folder, platform.lower() + '_exclusions.json')
-        with open(platform_exclusions_filename, 'r') as platform_exclusions_file:
-            platform_exclusions = json.load(platform_exclusions_file)
-        
-    if platform not in platform_exclusions:
-        raise KeyError('No {} found in {}'.format(platform, platform_exclusions_filename))
-    if '@lyengine' not in platform_exclusions[platform]:
-        raise KeyError('No {}/@lyengine found in {}'.format(platform, package_file_list))
-    (_, excludes) = convert_glob_list_to_regex_list(platform_exclusions[platform]['@lyengine'], root)
-    del _
-    return excludes
-
-def generate_include_exclude_regexes(package_platform, package_type, root, prohibited_platforms):
-    # The general contents will be indicated by the package file
-    if package_type == 'all':
-        package_file_list = os.path.join(this_file_path, 'package_filelists', 'all.json')
-    else:
-        # Search non-restricted platform first
-        package_file_list = os.path.join(this_file_path, 'Platform', package_platform, 'package_filelists', f'{package_type}.json')
-        if not os.path.exists(filelist):
-            # Use real path in case root is a symlink path
-            if os.name == 'posix' and os.path.islink(root):
-                root = os.readlink(root)
-            # "root" is the root of the folder structure we're validating
-            # "engine_root_path" is the engine root where the restricted platform folder is linked
-            rel_path = os.path.relpath(this_file_path, engine_root_path)
-            package_file_list = os.path.join(engine_root_path, 'restricted', package_platform, rel_path, 'package_filelists',
-                                    f'{package_type}.json')
-    with open(package_file_list, 'r') as package_file:
-        package = json.load(package_file)
-
-    if '@lyengine' not in package:
-        raise KeyError('No @lyengine found in {}'.format(package_file_list))
-
-    (includes_list, excludes_list) = convert_glob_list_to_regex_list(package['@lyengine'], root)
-    prohibited_platforms.append('all')
-
-    # Add the exclusions of each prohibited platform
-    for p in prohibited_platforms:
-        excludes_list.extend(generate_excludes_for_platform(root, p))
-
-    includes = re.compile('|'.join(includes_list), re.IGNORECASE)
-    excludes = re.compile('|'.join(excludes_list), re.IGNORECASE)
-    return (includes, excludes)
-
-def generate_exclude_regexes_for_platform(root, platform):
-    return re.compile('|'.join(generate_excludes_for_platform(root, platform)), re.IGNORECASE)
diff --git a/scripts/build/package/package.py b/scripts/build/package/package.py
deleted file mode 100755
index d33601ba45..0000000000
--- a/scripts/build/package/package.py
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-import os
-import sys
-import zipfile
-import timeit
-import progressbar
-from optparse import OptionParser
-from PackageEnv import PackageEnv
-cur_dir = cur_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, f'{cur_dir}/..')
-from ci_build import build
-from util import *
-from glob3 import glob
-
-
-def package(options):
-    package_env = PackageEnv(options.platform, options.type, options.package_env)
-
-    if not package_env.get('SKIP_BUILD'):
-        print(package_env.get('SKIP_BUILD'))
-        print('SKIP_BUILD is False, running CMake build...')
-        cmake_build(package_env)
-
-    # TODO Compile Assets
-    #if package_env.exists('ASSET_PROCESSOR_PATH'):
-    #    compile_assets(package_env)
-
-    #create packages
-    package_targets = package_env.get('PACKAGE_TARGETS')
-    for package_target in package_targets:
-        create_package(package_env, package_target)
-        upload_package(package_env, package_target)
-
-
-def get_python_path(package_env):
-    if sys.platform == 'win32':
-        return os.path.join(package_env.get('ENGINE_ROOT'), 'python', 'python.cmd')
-    else:
-        return os.path.join(package_env.get('ENGINE_ROOT'), 'python', 'python.sh')
-
-
-def cmake_build(package_env):
-    build_targets = package_env.get('BUILD_TARGETS')
-    for build_target in build_targets:
-        build(build_target['BUILD_CONFIG_FILENAME'], build_target['PLATFORM'], build_target['TYPE'])
-
-
-def create_package(package_env, package_target):
-    print('Creating zipfile for package target {}'.format(package_target))
-    cur_dir = os.path.dirname(os.path.abspath(__file__))
-    file_list_type = package_target['FILE_LIST_TYPE']
-    if file_list_type == 'All':
-        filelist = os.path.join(cur_dir, 'package_filelists', package_target['FILE_LIST'])
-    else:
-        filelist = os.path.join(cur_dir, 'Platform', file_list_type, 'package_filelists', package_target['FILE_LIST'])
-    with open(filelist, 'r') as source:
-        data = json.load(source)
-    lyengine = package_env.get('ENGINE_ROOT')
-    print('Calculating filelists...')
-    files = {}
-
-    if '@lyengine' in data:
-        files.update(filter_files(data['@lyengine'], lyengine))
-    if '@3rdParty' in data:
-        files.update(filter_files(data['@3rdParty'], package_env.get('THIRDPARTY_HOME')))
-    package_path = os.path.join(lyengine, package_target['PACKAGE_NAME'])
-    print('Creating zipfile at {}'.format(package_path))
-    start = timeit.default_timer()
-    with progressbar.ProgressBar(max_value=len(files), redirect_stderr=True) as bar:
-        with zipfile.ZipFile(package_path, 'w', compression=zipfile.ZIP_DEFLATED, allowZip64=True) as myzip:
-            i = 0
-            bar.update(i)
-            last_bar_update = timeit.default_timer()
-            for f in files:
-                if os.path.islink(f):
-                    zipInfo = zipfile.ZipInfo(files[f])
-                    zipInfo.create_system = 3
-                    # long type of hex val of '0xA1ED0000L',
-                    # say, symlink attr magic...
-                    zipInfo.external_attr |= 0xA0000000
-                    myzip.writestr(zipInfo, os.readlink(f))
-                else:
-                    myzip.write(f, files[f])
-                i += 1
-                # Update progress bar every 2 minutes
-                if int(timeit.default_timer() - last_bar_update) > 120:
-                    last_bar_update = timeit.default_timer()
-                    bar.update(i)
-            bar.update(i)
-
-    stop = timeit.default_timer()
-    total_time = int(stop - start)
-    print('{} is created. Total time: {} seconds.'.format(package_path, total_time))
-
-    def get_MD5(file_path):
-        from hashlib import md5
-        chunk_size = 200 * 1024
-        h = md5()
-        with open(file_path, 'rb') as f:
-            while True:
-                chunk = f.read(chunk_size)
-                if len(chunk):
-                    h.update(chunk)
-                else:
-                    break
-        return h.hexdigest()
-
-    md5_file = '{}.MD5'.format(package_path)
-    print('Creating MD5 file at {}'.format(md5_file))
-    start = timeit.default_timer()
-    with open(md5_file, 'w') as output:
-        output.write(get_MD5(package_path))
-    stop = timeit.default_timer()
-    total_time = int(stop - start)
-    print('{} is created. Total time: {} seconds.'.format(md5_file, total_time))
-
-
-def upload_package(package_env, package_target):
-    package_name = package_target['PACKAGE_NAME']
-    engine_root = package_env.get('ENGINE_ROOT')
-    internal_s3_bucket = package_env.get('INTERNAL_S3_BUCKET')
-    qa_s3_bucket = package_env.get('QA_S3_BUCKET')
-    s3_prefix = package_env.get('S3_PREFIX')
-    print(f'Uploading {package_name} to S3://{internal_s3_bucket}/{s3_prefix}/{package_name}')
-    cmd = ['aws', 's3', 'cp', os.path.join(engine_root, package_name), f's3://{internal_s3_bucket}/{s3_prefix}/{package_name}']
-    execute_system_call(cmd, stdout=subprocess.DEVNULL)
-    print(f'Uploading {package_name} to S3://{qa_s3_bucket}/{s3_prefix}/{package_name}')
-    cmd = ['aws', 's3', 'cp', os.path.join(engine_root, package_name), f's3://{qa_s3_bucket}/{s3_prefix}/{package_name}', '--acl', 'bucket-owner-full-control']
-    execute_system_call(cmd, stdout=subprocess.DEVNULL)
-
-
-def filter_files(data, base, prefix='', support_symlinks=True):
-    includes = {}
-    excludes = set()
-    for key, value in data.items():
-        pattern = os.path.join(base, prefix, key)
-        if not isinstance(value, dict):
-            pattern = os.path.normpath(pattern)
-            result = glob(pattern, recursive=True)
-            files = [x for x in result if os.path.isfile(x) or (support_symlinks and os.path.islink(x))]
-            if value == "#exclude":
-                excludes.update(files)
-            elif value == "#include":
-                for file in files:
-                    includes[file] = os.path.relpath(file, base)
-            else:
-                if value.startswith('#move:'):
-                    for file in files:
-                        file_name = os.path.relpath(file, os.path.join(base, prefix))
-                        dst_dir = value.replace('#move:', '').strip(' ')
-                        includes[file] = os.path.join(dst_dir, file_name)
-                elif value.startswith('#rename:'):
-                    for file in files:
-                        dst_file = value.replace('#rename:', '').strip(' ')
-                        includes[file] = dst_file
-                else:
-                    warn('Unknown directive {} for pattern {}'.format(value, pattern))
-        else:
-            includes.update(filter_files(value, base, os.path.join(prefix, key), support_symlinks))
-
-    for exclude in excludes:
-        try:
-            includes.pop(exclude)
-        except KeyError:
-            pass
-    return includes
-
-
-def parse_args():
-    parser = OptionParser()
-    parser.add_option("--platform", dest="platform", default='consoles', help="Target platform to package")
-    parser.add_option("--type", dest="type", default='consoles', help="Package type")
-    parser.add_option("--package_env", dest="package_env", default="package_env.json",
-                      help="JSON file that defines package environment variables")
-    (options, args) = parser.parse_args()
-    return options, args
-
-
-if __name__ == "__main__":
-    (options, args) = parse_args()
-    package(options)
diff --git a/scripts/build/package/package_env.json b/scripts/build/package/package_env.json
deleted file mode 100644
index 732ff12286..0000000000
--- a/scripts/build/package/package_env.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "global_env":{
-        "ENGINE_ROOT":"",
-        "THIRDPARTY_HOME":"",
-        "BRANCH_NAME":"",
-        "PACKAGE_NAME_PATTERN":"${BRANCH_NAME}-spectra",
-        "BUILD_NUMBER":"0",
-        "INTERNAL_S3_BUCKET": "ly-spectra-packages",
-        "QA_S3_BUCKET": "amazon.ly.lionbridgeshare/ly-spectra-packages"
-    }
-}
diff --git a/scripts/build/package/package_filelists/all.json b/scripts/build/package/package_filelists/all.json
deleted file mode 100644
index b1f3f270ca..0000000000
--- a/scripts/build/package/package_filelists/all.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "@lyengine": {
-        "**": "#include",
-        ".git/**": "#exclude",
-        ".gitattributes": "#exclude",
-        ".gitignore": "#exclude",
-        ".gitmodules": "#exclude",
-        ".lfsconfig": "#exclude",
-        ".p4ignore": "#exclude",
-        ".submodules": "#exclude",
-        "**/*.pyc": "#exclude",
-        "**/*.pdb": "#exclude",
-        "build/*/packages/*/*.stamp": "#exclude"
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/package/package_filelists/symbols.json b/scripts/build/package/package_filelists/symbols.json
deleted file mode 100644
index 3f30f6ec1f..0000000000
--- a/scripts/build/package/package_filelists/symbols.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "@lyengine": {
-        "**/*.pdb": "#include"
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/package/platform_exclusions.json b/scripts/build/package/platform_exclusions.json
deleted file mode 100644
index f54aeb07c9..0000000000
--- a/scripts/build/package/platform_exclusions.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{ 
-    "all": {
-        "@lyengine": {
-            "**/Gems/Atom/RHI/DX12/External/pix/**": "#exclude",
-            "**/.idea/**": "#exclude",
-            "**/*.csproj*": "#exclude",
-            "**/.owner": "#exclude",
-            "**/WinPixEventRuntime.dll": "#exclude",
-            "**/XenonConsole.exe": "#exclude"
-        }
-    }
-}
diff --git a/scripts/build/tools/copy_file.py b/scripts/build/tools/copy_file.py
new file mode 100644
index 0000000000..45b5e39d7a
--- /dev/null
+++ b/scripts/build/tools/copy_file.py
@@ -0,0 +1,57 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+import argparse
+import os
+import sys
+import glob
+import shutil
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-s', '--src-dir', dest='src_dir', required=True, help='Source directory to copy files from, if not specified, current directory is used.')
+    parser.add_argument('-r', '--file-regex', dest='file_regex', required=True, help='Globbing pattern used to match file names to copy.')
+    parser.add_argument('-t', '--target-dir', dest="target_dir", required=True, help='Target directory to copy files to.')
+    args = parser.parse_args()
+    if not os.path.isdir(args.src_dir):
+        print('ERROR: src_dir is not a valid directory.')
+        exit(1)
+    return args
+
+
+def extended_path(path):
+    """
+    Maximum Path Length Limitation on Windows is 260 characters, use extended-length path to bypass this limitation
+    """
+    if sys.platform in ('win32', 'cli') and len(path) >= 260:
+        if path.startswith('\\'):
+            return r'\\?\UNC\{}'.format(path.lstrip('\\'))
+        else:
+            return r'\\?\{}'.format(path)
+    else:
+        return path
+
+
+def copy_file(src_dir, file_regex, target_dir):
+    if not os.path.isdir(args.target_dir):
+        os.makedirs(target_dir)
+    for f in glob.glob(os.path.join(src_dir, file_regex), recursive=True):
+        if os.path.isfile(f):
+            relative_path = os.path.relpath(f, src_dir)
+            target_file_path = os.path.join(target_dir, relative_path)
+            target_file_dir = os.path.dirname(target_file_path)
+            if not os.path.isdir(target_file_dir):
+                os.makedirs(target_file_dir)
+            shutil.copy2(f, extended_path(target_file_path))
+            print(f'{f} -> {target_file_path}')
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    copy_file(args.src_dir, args.file_regex, args.target_dir)
diff --git a/scripts/commit_validation/CMakeLists.txt b/scripts/commit_validation/CMakeLists.txt
index 6079515eb8..00e8506ef1 100644
--- a/scripts/commit_validation/CMakeLists.txt
+++ b/scripts/commit_validation/CMakeLists.txt
@@ -6,10 +6,8 @@
 #
 #
 
-# this ctest makes sure that the commit validation function
-# also runs its tests during commit validation!
 ly_add_pytest(
     NAME test_commit_validation
-    PATH ${CMAKE_CURRENT_LIST_DIR}
+    PATH ${CMAKE_CURRENT_LIST_DIR}/commit_validation/tests
+    TEST_SUITE smoke
 )
-
diff --git a/scripts/commit_validation/commit_validation/commit_validation.py b/scripts/commit_validation/commit_validation/commit_validation.py
index 513244a735..be8fc4ce1e 100755
--- a/scripts/commit_validation/commit_validation/commit_validation.py
+++ b/scripts/commit_validation/commit_validation/commit_validation.py
@@ -181,4 +181,6 @@ EXCLUDED_VALIDATION_PATTERNS = [
     'restricted/*/Tools/*RemoteControl',
     '*/user/Cache/*',
     '*/user/log/*',
+    '*/user/log_test_1/*',
+    '*/user/log_test_2/*',
 ]
diff --git a/scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py
new file mode 100644
index 0000000000..6fbe86ab29
--- /dev/null
+++ b/scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py
@@ -0,0 +1,47 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+import unittest
+from unittest.mock import patch, mock_open
+
+from commit_validation.tests.mocks.mock_commit import MockCommit
+from commit_validation.validators.crc_validator import CrcValidator
+
+
+class CrcValidatorTests(unittest.TestCase):
+
+    @patch('builtins.open', mock_open(read_data='This file does not contain an AZ_CRC macro'))
+    def test_fileWithNoCrc_passes(self):
+        commit = MockCommit(files=['/someCppFile.cpp'])
+        error_list = []
+        self.assertTrue(CrcValidator().run(commit, error_list))
+        self.assertEqual(len(error_list), 0, f"Unexpected errors: {error_list}")
+
+    @patch('builtins.open', mock_open(read_data='This file contains an invalid CRC macro AZ_CRC("My string", 0xabcdef00)'))
+    def test_fileWithInvalidCrc_fails(self):
+        commit = MockCommit(files=['/someCppFile.cpp'])
+        error_list = []
+        self.assertFalse(CrcValidator().run(commit, error_list))
+        self.assertNotEqual(len(error_list), 0, f"Errors were expected but none were returned.")
+
+    @patch('builtins.open', mock_open(read_data='This file contains a valid CRC macro AZ_CRC("My string", 0x18fbd270)'))
+    def test_fileWithValidCrc_fails(self):
+        commit = MockCommit(files=['/someCppFile.cpp'])
+        error_list = []
+        self.assertTrue(CrcValidator().run(commit, error_list))
+        self.assertEqual(len(error_list), 0, f"Unexpected errors: {error_list}")
+
+    @patch('builtins.open', mock_open(read_data='This file contains an invalid CRC macro AZ_CRC("My string", 0xabcdef00)'))
+    def test_fileExtensionIgnored_passes(self):
+        commit = MockCommit(files=['/someCppFile.somerandomextension'])
+        error_list = []
+        self.assertTrue(CrcValidator().run(commit, error_list))
+        self.assertEqual(len(error_list), 0, f"Unexpected errors: {error_list}")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/scripts/commit_validation/commit_validation/validators/crc_validator.py b/scripts/commit_validation/commit_validation/validators/crc_validator.py
new file mode 100644
index 0000000000..db99d7b50b
--- /dev/null
+++ b/scripts/commit_validation/commit_validation/validators/crc_validator.py
@@ -0,0 +1,48 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+import binascii
+import fnmatch
+import pathlib
+import re
+from typing import Type, List
+
+from commit_validation.commit_validation import Commit, CommitValidator, SOURCE_FILE_EXTENSIONS, EXCLUDED_VALIDATION_PATTERNS, VERBOSE
+
+class CrcValidator(CommitValidator):
+    """A file-level validator that makes sure a file does not contain an invalid CRC"""
+
+    def run(self, commit: Commit, errors: List[str]) -> bool:
+        for file_name in commit.get_files():
+            for pattern in EXCLUDED_VALIDATION_PATTERNS:
+                if fnmatch.fnmatch(file_name, pattern):
+                    if VERBOSE: print(f'{file_name}::{self.__class__.__name__} SKIPPED - Validation pattern excluded on path.')
+                    break
+            else:
+                if pathlib.Path(file_name).suffix.lower() not in SOURCE_FILE_EXTENSIONS:
+                    if VERBOSE: print(f'{file_name}::{self.__class__.__name__} SKIPPED - File excluded based on extension.')
+                    continue
+                
+                with open(file_name, mode='r', encoding='utf8') as fh:
+                    fileContents = fh.read()
+                    matchesFound = re.findall(r'AZ_CRC\("([^"]+)",([^)]*)\)', fileContents)
+                    for element in matchesFound:
+                        stringInCode = element[0]
+                        valueInCode = element[1].strip()
+                        expectedValue = "{0:#0{1}x}".format(binascii.crc32(stringInCode.lower().encode('utf8')), 10)
+                        if expectedValue != valueInCode:
+                            error_message = str(f'{file_name}::{self.__class__.__name__} FAILED - Source file contains a CRC mismatch!\n'
+                                                f'     AZ_CRC("{stringInCode}", {valueInCode}), expected value {expectedValue}')
+                            if VERBOSE: print(error_message)
+                            errors.append(error_message)
+        return (not errors)
+
+
+def get_validator() -> Type[CrcValidator]:
+    """Returns the validator class for this module"""
+    return CrcValidator
diff --git a/scripts/o3de/README.txt b/scripts/o3de/README.txt
index 07d23fab82..39817c2df7 100644
--- a/scripts/o3de/README.txt
+++ b/scripts/o3de/README.txt
@@ -23,7 +23,7 @@ INSTALL
 It is recommended to set up these these tools with O3DE's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
     cd /path/to/od3e/
-    cmake -B windows_vs2019 -S . -G"Visual Studio 16" -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%"
+    cmake -B windows -S . -G"Visual Studio 16"
 
 To manually install the project in development mode using your own installed Python interpreter:
     cd /path/to/od3e/o3de
diff --git a/scripts/o3de/o3de/disable_gem.py b/scripts/o3de/o3de/disable_gem.py
index 01324d8500..158507fca1 100644
--- a/scripts/o3de/o3de/disable_gem.py
+++ b/scripts/o3de/o3de/disable_gem.py
@@ -69,7 +69,7 @@ def disable_gem_in_project(gem_name: str = None,
         return 1
     gem_path = pathlib.Path(gem_path).resolve()
     # make sure this gem already exists if we're adding.  We can always remove a gem.
-    if not gem_path.is_dir():
+    if not gem_path.exists():
         logger.error(f'Gem Path {gem_path} does not exist.')
         return 1
 
diff --git a/scripts/o3de/o3de/download.py b/scripts/o3de/o3de/download.py
index 98f5d051a4..e88355bf06 100644
--- a/scripts/o3de/o3de/download.py
+++ b/scripts/o3de/o3de/download.py
@@ -20,6 +20,7 @@ import sys
 import urllib.parse
 import urllib.request
 import zipfile
+from datetime import datetime
 
 from o3de import manifest, repo, utils, validation, register
 
@@ -43,30 +44,34 @@ def validate_downloaded_zip_sha256(download_uri_json_data: dict, download_zip_pa
     try:
         sha256A = download_uri_json_data['sha256']
     except KeyError as e:
-        logger.warn('SECURITY WARNING: The advertised o3de object you downloaded has no "sha256"!!! Be VERY careful!!!'
+        logger.warning('SECURITY WARNING: The advertised o3de object you downloaded has no "sha256"!!! Be VERY careful!!!'
                     ' We cannot verify this is the actually the advertised object!!!')
         return 1
     else:
-        sha256B = hashlib.sha256(download_zip_path.open('rb').read()).hexdigest()
-        if sha256A != sha256B:
-            logger.error(f'SECURITY VIOLATION: Downloaded zip sha256 {sha256B} does not match'
-                         f' the advertised "sha256":{sha256A} in the f{manifest_json_name}.')
-            return 0
+        if len(sha256A) == 0:
+            logger.warning('SECURITY WARNING: The advertised o3de object you downloaded has no "sha256"!!! Be VERY careful!!!'
+                        ' We cannot verify this is the actually the advertised object!!!')
+            return 1
+
+        with download_zip_path.open('rb') as f:
+            sha256B = hashlib.sha256(f.read()).hexdigest()
+            if sha256A != sha256B:
+                logger.error(f'SECURITY VIOLATION: Downloaded zip sha256 {sha256B} does not match'
+                            f' the advertised "sha256":{sha256A} in the f{manifest_json_name}.')
+                return 0
 
     unzipped_manifest_json_data = unzip_manifest_json_data(download_zip_path, manifest_json_name)
 
-    # remove the sha256 if present in the advertised downloadable manifest json
-    # then compare it to the json in the zip, they should now be identical
-    try:
-        del download_uri_json_data['sha256']
-    except KeyError as e:
-        pass
+    # do not include the data we know will not match/exist
+    for key in ['sha256','repo_name']:
+        if key in download_uri_json_data:
+            del download_uri_json_data[key]
+        if key in unzipped_manifest_json_data:
+            del unzipped_manifest_json_data[key]
 
-    sha256A = hashlib.sha256(json.dumps(download_uri_json_data, indent=4).encode('utf8')).hexdigest()
-    sha256B = hashlib.sha256(json.dumps(unzipped_manifest_json_data, indent=4).encode('utf8')).hexdigest()
-    if sha256A != sha256B:
-        logger.error('SECURITY VIOLATION: Downloaded manifest json does not match'
-                     ' the advertised manifest json.')
+    if download_uri_json_data != unzipped_manifest_json_data:
+        logger.error(f'SECURITY VIOLATION: Downloaded {manifest_json_name} contents do not match'
+                     ' the advertised manifest json contents.')
         return 0
 
     return 1
@@ -88,10 +93,9 @@ def get_downloadable(engine_name: str = None,
     search_func = lambda manifest_json_data: repo.search_repo(manifest_json_data, engine_name, project_name, gem_name, template_name)
     return repo.search_o3de_object(manifest_json, o3de_object_uris, search_func)
 
-
 def download_o3de_object(object_name: str, default_folder_name: str, dest_path: str or pathlib.Path,
                          object_type: str, downloadable_kwarg_key, skip_auto_register: bool,
-                         download_progress_callback = None) -> int:
+                         force_overwrite: bool, download_progress_callback = None) -> int:
 
     download_path = manifest.get_o3de_cache_folder() / default_folder_name / object_name
     download_path.mkdir(parents=True, exist_ok=True)
@@ -102,10 +106,10 @@ def download_o3de_object(object_name: str, default_folder_name: str, dest_path:
         logger.error(f'Downloadable o3de object {object_name} not found.')
         return 1
 
-    origin_uri = downloadable_object_data['originuri']
+    origin_uri = downloadable_object_data['origin_uri']
     parsed_uri = urllib.parse.urlparse(origin_uri)
 
-    download_zip_result = utils.download_zip_file(parsed_uri, download_zip_path, download_progress_callback)
+    download_zip_result = utils.download_zip_file(parsed_uri, download_zip_path, force_overwrite, download_progress_callback)
     if download_zip_result != 0:
         return download_zip_result
 
@@ -125,8 +129,15 @@ def download_o3de_object(object_name: str, default_folder_name: str, dest_path:
         logger.error(f'Destination path cannot be empty.')
         return 1
     if dest_path.exists():
-        logger.error(f'Destination path {dest_path} already exists.')
-        return 1
+        if not force_overwrite:
+            logger.error(f'Destination path {dest_path} already exists.')
+            return 1
+        else:
+            try:
+                shutil.rmtree(dest_path)
+            except OSError:
+                logger.error(f'Could not remove existing destination path {dest_path}.')
+                return 1
 
     dest_path.mkdir(exist_ok=True)
 
@@ -149,38 +160,119 @@ def download_o3de_object(object_name: str, default_folder_name: str, dest_path:
 def download_engine(engine_name: str,
                     dest_path: str or pathlib.Path,
                     skip_auto_register: bool,
+                    force_overwrite: bool,
                     download_progress_callback = None) -> int:
-    return download_o3de_object(engine_name, 'engines', dest_path, 'engine', 'engine_name', skip_auto_register, download_progress_callback)
+    return download_o3de_object(engine_name,
+                                'engines',
+                                dest_path,
+                                'engine',
+                                'engine_name',
+                                skip_auto_register,
+                                force_overwrite,
+                                download_progress_callback)
 
 
 def download_project(project_name: str,
                      dest_path: str or pathlib.Path,
                      skip_auto_register: bool,
+                     force_overwrite: bool,
                      download_progress_callback = None) -> int:
-    return download_o3de_object(project_name, 'projects', dest_path, 'project', 'project_name', skip_auto_register, download_progress_callback)
+    return download_o3de_object(project_name,
+                                'projects',
+                                dest_path,
+                                'project',
+                                'project_name',
+                                skip_auto_register,
+                                force_overwrite,
+                                download_progress_callback)
 
 
 def download_gem(gem_name: str,
                  dest_path: str or pathlib.Path,
                  skip_auto_register: bool,
+                 force_overwrite: bool,
                  download_progress_callback = None) -> int:
-    return download_o3de_object(gem_name, 'gems', dest_path, 'gem', 'gem_name', skip_auto_register, download_progress_callback)
+    return download_o3de_object(gem_name,
+                                'gems',
+                                dest_path,
+                                'gem',
+                                'gem_name',
+                                skip_auto_register,
+                                force_overwrite,
+                                download_progress_callback)
 
 
 def download_template(template_name: str,
                       dest_path: str or pathlib.Path,
                       skip_auto_register: bool,
+                      force_overwrite: bool,
                       download_progress_callback = None) -> int:
-    return download_o3de_object(template_name, 'templates', dest_path, 'template', 'template_name', skip_auto_register, download_progress_callback)
+    return download_o3de_object(template_name,
+                                'templates',
+                                dest_path,
+                                'template',
+                                'template_name',
+                                skip_auto_register,
+                                force_overwrite,
+                                download_progress_callback)
 
 
 
 def download_restricted(restricted_name: str,
                         dest_path: str or pathlib.Path,
                         skip_auto_register: bool,
+                        force_overwrite: bool,
                         download_progress_callback = None) -> int:
-    return download_o3de_object(restricted_name, 'restricted', dest_path, 'restricted', 'restricted_name', skip_auto_register, download_progress_callback)
+    return download_o3de_object(restricted_name,
+                                'restricted',
+                                dest_path,
+                                'restricted',
+                                'restricted_name',
+                                skip_auto_register,
+                                force_overwrite,
+                                download_progress_callback)
 
+def is_o3de_object_update_available(object_name: str, downloadable_kwarg_key, local_last_updated: str) -> bool:
+    downloadable_object_data = get_downloadable(**{downloadable_kwarg_key : object_name})
+    if not downloadable_object_data:
+        logger.error(f'Downloadable o3de object {object_name} not found.')
+        return False
+
+    try:
+        repo_copy_updated_string = downloadable_object_data['last_updated']
+    except KeyError:
+        logger.warning(f'last_updated field not found for {object_name}.')
+        return False
+
+    try:
+        local_last_updated_time = datetime.fromisoformat(local_last_updated)
+    except ValueError:
+        logger.warning(f'last_updated field has incorrect format for local copy of {downloadable_kwarg_key} {object_name}.')
+        # Possible that an earlier version did not have this field so still want to check against cached downloadable version
+        local_last_updated_time = datetime.min
+
+    try:
+        repo_copy_updated_date = datetime.fromisoformat(repo_copy_updated_string)
+    except ValueError:
+        logger.error(f'last_updated field in incorrect format for repository copy of {downloadable_kwarg_key} {object_name}.')
+        return False
+
+    return repo_copy_updated_date > local_last_updated_time
+
+def is_o3de_engine_update_available(engine_name: str, local_last_updated: str):
+    return is_o3de_object_update_available(engine_name, 'engine_name', local_last_updated)
+
+def is_o3de_project_update_available(project_name: str, local_last_updated: str):
+    return is_o3de_object_update_available(project_name, 'project_name', local_last_updated)
+
+def is_o3de_gem_update_available(gem_name: str, local_last_updated: str):
+    return is_o3de_object_update_available(gem_name, 'gem_name', local_last_updated)
+
+def is_o3de_template_update_available(template_name: str, local_last_updated: str):
+    return is_o3de_object_update_available(template_name, 'template_name', local_last_updated)
+
+def is_o3de_restricted_update_available(restricted_name: str, local_last_updated: str):
+    return is_o3de_object_update_available(restricted_name, 'restricted_name', local_last_updated)
 
 def _run_download(args: argparse) -> int:
     if args.override_home_folder:
@@ -189,19 +281,23 @@ def _run_download(args: argparse) -> int:
     if args.engine_name:
         return download_engine(args.engine_name,
                                args.dest_path,
-                               args.skip_auto_register)
+                               args.skip_auto_register,
+                               args.force)
     elif args.project_name:
         return download_project(args.project_name,
                                 args.dest_path,
-                               args.skip_auto_register)
+                                args.skip_auto_register,
+                                args.force)
     elif args.gem_name:
         return download_gem(args.gem_name,
                             args.dest_path,
-                               args.skip_auto_register)
+                            args.skip_auto_register,
+                            args.force)
     elif args.template_name:
         return download_template(args.template_name,
                                  args.dest_path,
-                               args.skip_auto_register)
+                                 args.skip_auto_register,
+                                 args.force)
 
     return 1
 
@@ -230,6 +326,9 @@ def add_parser_args(parser):
     parser.add_argument('-sar', '--skip-auto-register', action='store_true', required=False,
                             default=False,
                             help = 'Skip the automatic registration of new object download')
+    parser.add_argument('-f', '--force', action='store_true', required=False,
+                            default=False,
+                            help = 'Force overwrite the current object')
     parser.add_argument('-ohf', '--override-home-folder', type=str, required=False,
                             help='By default the home folder is the user folder, override it to this folder.')
 
diff --git a/scripts/o3de/o3de/manifest.py b/scripts/o3de/o3de/manifest.py
index 297d8e39d2..e46b819a7c 100644
--- a/scripts/o3de/o3de/manifest.py
+++ b/scripts/o3de/o3de/manifest.py
@@ -108,75 +108,79 @@ def get_o3de_third_party_folder() -> pathlib.Path:
 
 
 # o3de manifest file methods
+def get_default_o3de_manifest_json_data() -> dict:
+    """
+    Returns dict with default values suitable for storing
+    in the o3de_manifests.json
+    """
+    username = os.path.split(get_home_folder())[-1]
+
+    o3de_folder = get_o3de_folder()
+    default_engines_folder = get_o3de_engines_folder()
+    default_projects_folder = get_o3de_projects_folder()
+    default_gems_folder = get_o3de_gems_folder()
+    default_templates_folder = get_o3de_templates_folder()
+    default_restricted_folder = get_o3de_restricted_folder()
+    default_third_party_folder = get_o3de_third_party_folder()
+
+    default_projects_restricted_folder = default_projects_folder / 'Restricted'
+    default_projects_restricted_folder.mkdir(parents=True, exist_ok=True)
+    default_gems_restricted_folder = default_gems_folder / 'Restricted'
+    default_gems_restricted_folder.mkdir(parents=True, exist_ok=True)
+    default_templates_restricted_folder = default_templates_folder / 'Restricted'
+    default_templates_restricted_folder.mkdir(parents=True, exist_ok=True)
+
+    json_data = {}
+    json_data.update({'o3de_manifest_name': f'{username}'})
+    json_data.update({'origin': o3de_folder.as_posix()})
+    json_data.update({'default_engines_folder': default_engines_folder.as_posix()})
+    json_data.update({'default_projects_folder': default_projects_folder.as_posix()})
+    json_data.update({'default_gems_folder': default_gems_folder.as_posix()})
+    json_data.update({'default_templates_folder': default_templates_folder.as_posix()})
+    json_data.update({'default_restricted_folder': default_restricted_folder.as_posix()})
+    json_data.update({'default_third_party_folder': default_third_party_folder.as_posix()})
+
+    json_data.update({'engines': []})
+    json_data.update({'projects': []})
+    json_data.update({'external_subdirectories': []})
+    json_data.update({'templates': []})
+    json_data.update({'restricted': []})
+    json_data.update({'repos': []})
+
+    default_restricted_folder_json = default_restricted_folder / 'restricted.json'
+    if not default_restricted_folder_json.is_file():
+        with default_restricted_folder_json.open('w') as s:
+            restricted_json_data = {}
+            restricted_json_data.update({'restricted_name': 'o3de'})
+            s.write(json.dumps(restricted_json_data, indent=4) + '\n')
+
+    default_projects_restricted_folder_json = default_projects_restricted_folder / 'restricted.json'
+    if not default_projects_restricted_folder_json.is_file():
+        with default_projects_restricted_folder_json.open('w') as s:
+            restricted_json_data = {}
+            restricted_json_data.update({'restricted_name': 'projects'})
+            s.write(json.dumps(restricted_json_data, indent=4) + '\n')
+
+    default_gems_restricted_folder_json = default_gems_restricted_folder / 'restricted.json'
+    if not default_gems_restricted_folder_json.is_file():
+        with default_gems_restricted_folder_json.open('w') as s:
+            restricted_json_data = {}
+            restricted_json_data.update({'restricted_name': 'gems'})
+            s.write(json.dumps(restricted_json_data, indent=4) + '\n')
+
+    default_templates_restricted_folder_json = default_templates_restricted_folder / 'restricted.json'
+    if not default_templates_restricted_folder_json.is_file():
+        with default_templates_restricted_folder_json.open('w') as s:
+            restricted_json_data = {}
+            restricted_json_data.update({'restricted_name': 'templates'})
+            s.write(json.dumps(restricted_json_data, indent=4) + '\n')
+
+    return json_data
+
 def get_o3de_manifest() -> pathlib.Path:
     manifest_path = get_o3de_folder() / 'o3de_manifest.json'
     if not manifest_path.is_file():
-        username = os.path.split(get_home_folder())[-1]
-
-        o3de_folder = get_o3de_folder()
-        default_registry_folder = get_o3de_registry_folder()
-        default_cache_folder = get_o3de_cache_folder()
-        default_downloads_folder = get_o3de_download_folder()
-        default_logs_folder = get_o3de_logs_folder()
-        default_engines_folder = get_o3de_engines_folder()
-        default_projects_folder = get_o3de_projects_folder()
-        default_gems_folder = get_o3de_gems_folder()
-        default_templates_folder = get_o3de_templates_folder()
-        default_restricted_folder = get_o3de_restricted_folder()
-        default_third_party_folder = get_o3de_third_party_folder()
-
-        default_projects_restricted_folder = default_projects_folder / 'Restricted'
-        default_projects_restricted_folder.mkdir(parents=True, exist_ok=True)
-        default_gems_restricted_folder = default_gems_folder / 'Restricted'
-        default_gems_restricted_folder.mkdir(parents=True, exist_ok=True)
-        default_templates_restricted_folder = default_templates_folder / 'Restricted'
-        default_templates_restricted_folder.mkdir(parents=True, exist_ok=True)
-
-        json_data = {}
-        json_data.update({'o3de_manifest_name': f'{username}'})
-        json_data.update({'origin': o3de_folder.as_posix()})
-        json_data.update({'default_engines_folder': default_engines_folder.as_posix()})
-        json_data.update({'default_projects_folder': default_projects_folder.as_posix()})
-        json_data.update({'default_gems_folder': default_gems_folder.as_posix()})
-        json_data.update({'default_templates_folder': default_templates_folder.as_posix()})
-        json_data.update({'default_restricted_folder': default_restricted_folder.as_posix()})
-        json_data.update({'default_third_party_folder': default_third_party_folder.as_posix()})
-
-        json_data.update({'engines': []})
-        json_data.update({'projects': []})
-        json_data.update({'external_subdirectories': []})
-        json_data.update({'templates': []})
-        json_data.update({'restricted': []})
-        json_data.update({'repos': []})
-
-        default_restricted_folder_json = default_restricted_folder / 'restricted.json'
-        if not default_restricted_folder_json.is_file():
-            with default_restricted_folder_json.open('w') as s:
-                restricted_json_data = {}
-                restricted_json_data.update({'restricted_name': 'o3de'})
-                s.write(json.dumps(restricted_json_data, indent=4) + '\n')
-        json_data.update({'default_restricted_folder': default_restricted_folder.as_posix()})
-
-        default_projects_restricted_folder_json = default_projects_restricted_folder / 'restricted.json'
-        if not default_projects_restricted_folder_json.is_file():
-            with default_projects_restricted_folder_json.open('w') as s:
-                restricted_json_data = {}
-                restricted_json_data.update({'restricted_name': 'projects'})
-                s.write(json.dumps(restricted_json_data, indent=4) + '\n')
-
-        default_gems_restricted_folder_json = default_gems_restricted_folder / 'restricted.json'
-        if not default_gems_restricted_folder_json.is_file():
-            with default_gems_restricted_folder_json.open('w') as s:
-                restricted_json_data = {}
-                restricted_json_data.update({'restricted_name': 'gems'})
-                s.write(json.dumps(restricted_json_data, indent=4) + '\n')
-
-        default_templates_restricted_folder_json = default_templates_restricted_folder / 'restricted.json'
-        if not default_templates_restricted_folder_json.is_file():
-            with default_templates_restricted_folder_json.open('w') as s:
-                restricted_json_data = {}
-                restricted_json_data.update({'restricted_name': 'templates'})
-                s.write(json.dumps(restricted_json_data, indent=4) + '\n')
+        json_data = get_default_o3de_manifest_json_data()
 
         with manifest_path.open('w') as s:
             s.write(json.dumps(json_data, indent=4) + '\n')
@@ -188,6 +192,7 @@ def load_o3de_manifest(manifest_path: pathlib.Path = None) -> dict:
     """
     Loads supplied manifest file or ~/.o3de/o3de_manifest.json if None
 
+    raises Json.JSONDecodeError if manifest data could not be decoded to JSON
     :param manifest_path: optional path to manifest file to load
     """
     if not manifest_path:
@@ -196,8 +201,10 @@ def load_o3de_manifest(manifest_path: pathlib.Path = None) -> dict:
         try:
             json_data = json.load(f)
         except json.JSONDecodeError as e:
-            logger.error(f'Manifest json failed to load: {str(e)}')
-            return {}
+            logger.error(f'Manifest json failed to load at path "{manifest_path}": {str(e)}')
+            # Re-raise the exception and let the caller
+            # determine if they can proceed
+            raise
         else:
             return json_data
 
@@ -455,7 +462,7 @@ def get_json_data_file(object_json: pathlib.Path,
         try:
             object_json_data = json.load(f)
         except json.JSONDecodeError as e:
-            logger.warn(f'{object_json} failed to load: {e}')
+            logger.warning(f'{object_json} failed to load: {e}')
         else:
             return object_json_data
 
@@ -589,14 +596,14 @@ def get_registered(engine_name: str = None,
             if isinstance(engine, dict):
                 engine_path = pathlib.Path(engine['path']).resolve()
             else:
-                engine_path = pathlib.Path(engine_object).resolve()
+                engine_path = pathlib.Path(engine).resolve()
 
             engine_json = engine_path / 'engine.json'
             with engine_json.open('r') as f:
                 try:
                     engine_json_data = json.load(f)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{engine_json} failed to load: {str(e)}')
+                    logger.warning(f'{engine_json} failed to load: {str(e)}')
                 else:
                     this_engines_name = engine_json_data['engine_name']
                     if this_engines_name == engine_name:
@@ -611,7 +618,7 @@ def get_registered(engine_name: str = None,
                 try:
                     project_json_data = json.load(f)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{project_json} failed to load: {str(e)}')
+                    logger.warning(f'{project_json} failed to load: {str(e)}')
                 else:
                     this_projects_name = project_json_data['project_name']
                     if this_projects_name == project_name:
@@ -626,7 +633,7 @@ def get_registered(engine_name: str = None,
                 try:
                     gem_json_data = json.load(f)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{gem_json} failed to load: {str(e)}')
+                    logger.warning(f'{gem_json} failed to load: {str(e)}')
                 else:
                     this_gems_name = gem_json_data['gem_name']
                     if this_gems_name == gem_name:
@@ -641,7 +648,7 @@ def get_registered(engine_name: str = None,
                 try:
                     template_json_data = json.load(f)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{template_path} failed to load: {str(e)}')
+                    logger.warning(f'{template_path} failed to load: {str(e)}')
                 else:
                     this_templates_name = template_json_data['template_name']
                     if this_templates_name == template_name:
@@ -656,7 +663,7 @@ def get_registered(engine_name: str = None,
                 try:
                     restricted_json_data = json.load(f)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{restricted_json} failed to load: {str(e)}')
+                    logger.warning(f'{restricted_json} failed to load: {str(e)}')
                 else:
                     this_restricted_name = restricted_json_data['restricted_name']
                     if this_restricted_name == restricted_name:
@@ -689,7 +696,7 @@ def get_registered(engine_name: str = None,
                     try:
                         repo_json_data = json.load(f)
                     except json.JSONDecodeError as e:
-                        logger.warn(f'{cache_file} failed to load: {str(e)}')
+                        logger.warning(f'{cache_file} failed to load: {str(e)}')
                     else:
                         this_repos_name = repo_json_data['repo_name']
                         if this_repos_name == repo_name:
diff --git a/scripts/o3de/o3de/print_registration.py b/scripts/o3de/o3de/print_registration.py
index b164243b7c..4b4c9d6515 100644
--- a/scripts/o3de/o3de/print_registration.py
+++ b/scripts/o3de/o3de/print_registration.py
@@ -326,7 +326,7 @@ def print_repos_data(repos_data: dict) -> int:
                 try:
                     repo_json_data = json.load(s)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{cache_file} failed to load: {str(e)}')
+                    logger.warning(f'{cache_file} failed to load: {str(e)}')
                 else:
                     print(f'{repo_uri}/repo.json cached as:')
                     print(cache_file)
diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py
index 8a2bb788aa..2500df1568 100644
--- a/scripts/o3de/o3de/register.py
+++ b/scripts/o3de/o3de/register.py
@@ -485,12 +485,12 @@ def register_repo(json_data: dict,
             json_data['repos'].remove(repo_uri)
 
     if remove:
-        logger.warn(f'Removing repo uri {repo_uri}.')
+        logger.warning(f'Removing repo uri {repo_uri}.')
         return 0
     repo_sha256 = hashlib.sha256(url.encode())
     cache_file = manifest.get_o3de_cache_folder() / str(repo_sha256.hexdigest() + '.json')
 
-    result = utils.download_file(parsed_uri, cache_file)
+    result = utils.download_file(parsed_uri, cache_file, True)
     if result == 0:
         json_data.setdefault('repos', []).insert(0, repo_uri)
 
@@ -560,6 +560,107 @@ def register_default_third_party_folder(json_data: dict,
                                                manifest.get_o3de_third_party_folder() if remove else default_third_party_folder,
                                                'default_third_party_folder')
 
+
+def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int:
+    if not manifest_path:
+        manifest_path = manifest.get_o3de_manifest()
+
+    json_data = manifest.load_o3de_manifest(manifest_path)
+
+    result = 0
+
+    for project in json_data.get('projects', []):
+        if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'):
+            logger.warning(f"Project path {project} is invalid.")
+            # Attempt to unregister all invalid projects even if previous projects failed to unregister
+            # but combine the result codes of each command.
+            result = register(project_path=pathlib.Path(project), remove=True) or result
+
+    return result
+
+
+def remove_invalid_o3de_objects() -> None:
+    for engine_path in manifest.get_engines():
+        if not validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'):
+            logger.warning(f"Engine path {engine_path} is invalid.")
+            register(engine_path=engine_path, remove=True)
+
+    remove_invalid_o3de_projects()
+
+    for external in manifest.get_external_subdirectories():
+        external = pathlib.Path(external).resolve()
+        if not external.is_dir():
+            logger.warning(f"External subdirectory {external} is invalid.")
+            register(engine_path=engine_path, external_subdir_path=external, remove=True)
+
+    for template in manifest.get_templates():
+        if not validation.valid_o3de_template_json(pathlib.Path(template).resolve() / 'template.json'):
+            logger.warning(f"Template path {template} is invalid.")
+            register(template_path=template, remove=True)
+
+    for restricted in manifest.get_restricted():
+        if not validation.valid_o3de_restricted_json(pathlib.Path(restricted).resolve() / 'restricted.json'):
+            logger.warning(f"Restricted path {restricted} is invalid.")
+            register(restricted_path=restricted, remove=True)
+
+    json_data = manifest.load_o3de_manifest()
+    default_engines_folder = pathlib.Path(
+        json_data.get('default_engines_folder', manifest.get_o3de_engines_folder())).resolve()
+    if not default_engines_folder.is_dir():
+        new_default_engines_folder = manifest.get_o3de_folder() / 'Engines'
+        new_default_engines_folder.mkdir(parents=True, exist_ok=True)
+        logger.warning(
+            f"Default engines folder {default_engines_folder} is invalid. Set default {new_default_engines_folder}")
+        register(default_engines_folder=new_default_engines_folder.as_posix())
+
+    default_projects_folder = pathlib.Path(
+        json_data.get('default_projects_folder', manifest.get_o3de_projects_folder())).resolve()
+    if not default_projects_folder.is_dir():
+        new_default_projects_folder = manifest.get_o3de_folder() / 'Projects'
+        new_default_projects_folder.mkdir(parents=True, exist_ok=True)
+        logger.warning(
+            f"Default projects folder {default_projects_folder} is invalid. Set default {new_default_projects_folder}")
+        register(default_projects_folder=new_default_projects_folder.as_posix())
+
+    default_gems_folder = pathlib.Path(json_data.get('default_gems_folder', manifest.get_o3de_gems_folder())).resolve()
+    if not default_gems_folder.is_dir():
+        new_default_gems_folder = manifest.get_o3de_folder() / 'Gems'
+        new_default_gems_folder.mkdir(parents=True, exist_ok=True)
+        logger.warning(f"Default gems folder {default_gems_folder} is invalid."
+                       f" Set default {new_default_gems_folder}")
+        register(default_gems_folder=new_default_gems_folder.as_posix())
+
+    default_templates_folder = pathlib.Path(
+        json_data.get('default_templates_folder', manifest.get_o3de_templates_folder())).resolve()
+    if not default_templates_folder.is_dir():
+        new_default_templates_folder = manifest.get_o3de_folder() / 'Templates'
+        new_default_templates_folder.mkdir(parents=True, exist_ok=True)
+        logger.warning(
+            f"Default templates folder {default_templates_folder} is invalid."
+            f" Set default {new_default_templates_folder}")
+        register(default_templates_folder=new_default_templates_folder.as_posix())
+
+    default_restricted_folder = pathlib.Path(
+        json_data.get('default_restricted_folder', manifest.get_o3de_restricted_folder())).resolve()
+    if not default_restricted_folder.is_dir():
+        default_restricted_folder = manifest.get_o3de_folder() / 'Restricted'
+        default_restricted_folder.mkdir(parents=True, exist_ok=True)
+        logger.warning(
+            f"Default restricted folder {default_restricted_folder} is invalid."
+            f" Set default {default_restricted_folder}")
+        register(default_restricted_folder=default_restricted_folder.as_posix())
+
+    default_third_party_folder = pathlib.Path(
+        json_data.get('default_third_party_folder', manifest.get_o3de_third_party_folder())).resolve()
+    if not default_third_party_folder.is_dir():
+        default_third_party_folder = manifest.get_o3de_folder() / '3rdParty'
+        default_third_party_folder.mkdir(parents=True, exist_ok=True)
+        logger.warning(
+            f"Default 3rd Party folder {default_third_party_folder} is invalid."
+            f" Set default {default_third_party_folder}")
+        register(default_third_party_folder=default_third_party_folder.as_posix())
+
+
 def register(engine_path: pathlib.Path = None,
              project_path: pathlib.Path = None,
              gem_path: pathlib.Path = None,
@@ -604,7 +705,18 @@ def register(engine_path: pathlib.Path = None,
     :return: 0 for success or non 0 failure code
     """
 
-    json_data = manifest.load_o3de_manifest()
+    try:
+        json_data = manifest.load_o3de_manifest()
+    except json.JSONDecodeError:
+        if not force:
+            logger.error('O3DE object registration has halted due to JSON Decode Error in manifest at path:'
+                         f' "{manifest.get_o3de_manifest()}".'
+                         '\n      Registration can be forced using the --force option,'
+                         ' but that will result in the manifest using default data')
+            return 1
+        else:
+            # Use a default manifest data an proceed
+            json_data = manifest.get_default_o3de_manifest_json_data()
 
     result = 0
 
@@ -679,99 +791,6 @@ def register(engine_path: pathlib.Path = None,
 
     return result
 
-def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int:
-    if not manifest_path:
-        manifest_path = manifest.get_o3de_manifest()
-
-    json_data = manifest.load_o3de_manifest(manifest_path)
-
-    result = 0
-
-    for project in json_data.get('projects', []):
-        if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'):
-            logger.warn(f"Project path {project} is invalid.")
-            # Attempt to unregister all invalid projects even if previous projects failed to unregister
-            # but combine the result codes of each command.
-            result = register(project_path=pathlib.Path(project), remove=True) or result
-
-    return result
-
-def remove_invalid_o3de_objects() -> None:
-    for engine_path in manifest.get_engines():
-        if not validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'):
-            logger.warn(f"Engine path {engine_path} is invalid.")
-            register(engine_path=engine_path, remove=True)
-
-    remove_invalid_o3de_projects()
-
-    for external in manifest.get_external_subdirectories():
-        external = pathlib.Path(external).resolve()
-        if not external.is_dir():
-            logger.warn(f"External subdirectory {external} is invalid.")
-            register(engine_path=engine_path, external_subdir_path=external, remove=True)
-
-    for template in manifest.get_templates():
-        if not validation.valid_o3de_template_json(pathlib.Path(template).resolve() / 'template.json'):
-            logger.warn(f"Template path {template} is invalid.")
-            register(template_path=template, remove=True)
-
-    for restricted in manifest.get_restricted():
-        if not validation.valid_o3de_restricted_json(pathlib.Path(restricted).resolve() / 'restricted.json'):
-            logger.warn(f"Restricted path {restricted} is invalid.")
-            register(restricted_path=restricted, remove=True)
-
-    json_data = manifest.load_o3de_manifest()
-    default_engines_folder = pathlib.Path(json_data.get('default_engines_folder', manifest.get_o3de_engines_folder())).resolve()
-    if not default_engines_folder.is_dir():
-        new_default_engines_folder = manifest.get_o3de_folder() / 'Engines'
-        new_default_engines_folder.mkdir(parents=True, exist_ok=True)
-        logger.warn(
-            f"Default engines folder {default_engines_folder} is invalid. Set default {new_default_engines_folder}")
-        register(default_engines_folder=new_default_engines_folder.as_posix())
-
-    default_projects_folder = pathlib.Path(json_data.get('default_projects_folder', manifest.get_o3de_projects_folder())).resolve()
-    if not default_projects_folder.is_dir():
-        new_default_projects_folder = manifest.get_o3de_folder() / 'Projects'
-        new_default_projects_folder.mkdir(parents=True, exist_ok=True)
-        logger.warn(
-            f"Default projects folder {default_projects_folder} is invalid. Set default {new_default_projects_folder}")
-        register(default_projects_folder=new_default_projects_folder.as_posix())
-
-    default_gems_folder = pathlib.Path(json_data.get('default_gems_folder', manifest.get_o3de_gems_folder())).resolve()
-    if not default_gems_folder.is_dir():
-        new_default_gems_folder = manifest.get_o3de_folder() / 'Gems'
-        new_default_gems_folder.mkdir(parents=True, exist_ok=True)
-        logger.warn(f"Default gems folder {default_gems_folder} is invalid."
-                    f" Set default {new_default_gems_folder}")
-        register(default_gems_folder=new_default_gems_folder.as_posix())
-
-    default_templates_folder = pathlib.Path(json_data.get('default_templates_folder', manifest.get_o3de_templates_folder())).resolve()
-    if not default_templates_folder.is_dir():
-        new_default_templates_folder = manifest.get_o3de_folder() / 'Templates'
-        new_default_templates_folder.mkdir(parents=True, exist_ok=True)
-        logger.warn(
-            f"Default templates folder {default_templates_folder} is invalid."
-            f" Set default {new_default_templates_folder}")
-        register(default_templates_folder=new_default_templates_folder.as_posix())
-
-    default_restricted_folder = pathlib.Path(json_data.get('default_restricted_folder', manifest.get_o3de_restricted_folder())).resolve()
-    if not default_restricted_folder.is_dir():
-        default_restricted_folder = manifest.get_o3de_folder() / 'Restricted'
-        default_restricted_folder.mkdir(parents=True, exist_ok=True)
-        logger.warn(
-            f"Default restricted folder {default_restricted_folder} is invalid."
-            f" Set default {default_restricted_folder}")
-        register(default_restricted_folder=default_restricted_folder.as_posix())
-
-    default_third_party_folder = pathlib.Path(json_data.get('default_third_party_folder', manifest.get_o3de_third_party_folder())).resolve()
-    if not default_third_party_folder.is_dir():
-        default_third_party_folder = manifest.get_o3de_folder() / '3rdParty'
-        default_third_party_folder.mkdir(parents=True, exist_ok=True)
-        logger.warn(
-            f"Default 3rd Party folder {default_third_party_folder} is invalid."
-            f" Set default {default_third_party_folder}")
-        register(default_third_party_folder=default_third_party_folder.as_posix())
-
 
 def _run_register(args: argparse) -> int:
     if args.override_home_folder:
diff --git a/scripts/o3de/o3de/repo.py b/scripts/o3de/o3de/repo.py
index a6b1505761..22c7c54c8f 100644
--- a/scripts/o3de/o3de/repo.py
+++ b/scripts/o3de/o3de/repo.py
@@ -9,7 +9,6 @@
 import json
 import logging
 import pathlib
-import shutil
 import urllib.parse
 import urllib.request
 import hashlib
@@ -24,6 +23,7 @@ def process_add_o3de_repo(file_name: str or pathlib.Path,
                           repo_set: set) -> int:
     file_name = pathlib.Path(file_name).resolve()
     if not validation.valid_o3de_repo_json(file_name):
+        logger.error(f'Repository JSON {file_name} could not be loaded or is missing required values')
         return 1
     cache_folder = manifest.get_o3de_cache_folder()
 
@@ -74,11 +74,11 @@ def process_add_o3de_repo(file_name: str or pathlib.Path,
             manifest_json_uri = f'{o3de_object_uri}/{manifest_json}'
             manifest_json_sha256 = hashlib.sha256(manifest_json_uri.encode())
             cache_file = cache_folder / str(manifest_json_sha256.hexdigest() + '.json')
-            if not cache_file.is_file():
-                parsed_uri = urllib.parse.urlparse(manifest_json_uri)
-                download_file_result = utils.download_file(parsed_uri, cache_file)
-                if download_file_result != 0:
-                    return download_file_result
+
+            parsed_uri = urllib.parse.urlparse(manifest_json_uri)
+            download_file_result = utils.download_file(parsed_uri, cache_file, True)
+            if download_file_result != 0:
+                return download_file_result
 
     # Having a repo is also optional
     repo_list = []
@@ -96,7 +96,7 @@ def process_add_o3de_repo(file_name: str or pathlib.Path,
                 cache_file = cache_folder / str(manifest_json_sha256.hexdigest() + '.json')
                 if cache_file.is_file():
                     cache_file.unlink()
-                download_file_result = utils.download_file(parsed_uri, cache_file)
+                download_file_result = utils.download_file(parsed_uri, cache_file, True)
                 if download_file_result != 0:
                     return download_file_result
 
@@ -114,7 +114,7 @@ def get_gem_json_paths_from_cached_repo(repo_uri: str) -> set:
 
     file_name = pathlib.Path(cache_filename).resolve()
     if not file_name.is_file():
-        logger.error(f'Could not find cached repo json file for {repo_uri}')
+        logger.error(f'Could not find cached repository json file for {repo_uri}. Try refreshing the repository.')
         return gem_set
 
     with file_name.open('r') as f:
@@ -139,7 +139,7 @@ def get_gem_json_paths_from_cached_repo(repo_uri: str) -> set:
                 if cache_gem_json_filepath.is_file():
                     gem_set.add(cache_gem_json_filepath)
                 else:
-                    logger.warn(f'Could not find cached gem json file {cache_gem_json_filepath} for {o3de_object_uri} in repo {repo_uri}')
+                    logger.warning(f'Could not find cached gem json file {cache_gem_json_filepath} for {o3de_object_uri} in repo {repo_uri}')
 
     return gem_set
 
@@ -165,8 +165,9 @@ def refresh_repo(repo_uri: str,
     repo_sha256 = hashlib.sha256(parsed_uri.geturl().encode())
     cache_file = cache_folder / str(repo_sha256.hexdigest() + '.json')
 
-    download_file_result = utils.download_file(parsed_uri, cache_file)
+    download_file_result = utils.download_file(parsed_uri, cache_file, True)
     if download_file_result != 0:
+        logger.error(f'Repo json {repo_uri} could not download.')
         return download_file_result
 
     if not validation.valid_o3de_repo_json(cache_file):
@@ -178,12 +179,7 @@ def refresh_repo(repo_uri: str,
 
 def refresh_repos() -> int:
     json_data = manifest.load_o3de_manifest()
-
-    # clear the cache
     cache_folder = manifest.get_o3de_cache_folder()
-    shutil.rmtree(cache_folder)
-    cache_folder = manifest.get_o3de_cache_folder()  # will recreate it
-
     result = 0
 
     # set will stop circular references
@@ -222,10 +218,10 @@ def search_repo(manifest_json_data: dict,
         json_key = 'gem_name'
         search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == gem_name else None
     elif isinstance(template_name, str) or isinstance(template_name, pathlib.PurePath):
-        o3de_object_uris = manifest_json_data['template']
+        o3de_object_uris = manifest_json_data['templates']
         manifest_json = 'template.json'
         json_key = 'template_name'
-        search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == template_name_name else None
+        search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == template_name else None
     elif isinstance(restricted_name, str) or isinstance(restricted_name, pathlib.PurePath):
         o3de_object_uris = manifest_json_data['restricted']
         manifest_json = 'restricted.json'
@@ -262,7 +258,7 @@ def search_o3de_object(manifest_json, o3de_object_uris, search_func):
                 try:
                     manifest_json_data = json.load(f)
                 except json.JSONDecodeError as e:
-                    logger.warn(f'{cache_file} failed to load: {str(e)}')
+                    logger.warning(f'{cache_file} failed to load: {str(e)}')
                 else:
                     result_json_data = search_func(manifest_json_data)
                     if result_json_data:
diff --git a/scripts/o3de/o3de/utils.py b/scripts/o3de/o3de/utils.py
old mode 100755
new mode 100644
index 8663502a3f..6f1dd8b2c5
--- a/scripts/o3de/o3de/utils.py
+++ b/scripts/o3de/o3de/utils.py
@@ -117,29 +117,43 @@ def backup_folder(folder: str or pathlib.Path) -> None:
             if backup_folder_name.is_dir():
                 renamed = True
 
-def download_file(parsed_uri, download_path: pathlib.Path, download_progress_callback = None) -> int:
+def download_file(parsed_uri, download_path: pathlib.Path, force_overwrite: bool = False, download_progress_callback = None) -> int:
     """
     :param parsed_uri: uniform resource identifier to zip file to download
     :param download_path: location path on disk to download file
     :download_progress_callback: callback called with the download progress as a percentage, returns true to request to cancel the download
     """
     if download_path.is_file():
-        logger.warn(f'File already downloaded to {download_path}.')
-    elif parsed_uri.scheme in ['http', 'https', 'ftp', 'ftps']:
-        with urllib.request.urlopen(parsed_uri.geturl()) as s:
-            download_file_size = 0
+        if not force_overwrite:
+            logger.error(f'File already downloaded to {download_path} and force_overwrite is not set.')
+            return 1
+        else:
             try:
-                download_file_size = s.headers['content-length']
-            except KeyError:
-                pass
-            def download_progress(blocks):
-                if download_progress_callback and download_file_size:
-                    return download_progress_callback(int(blocks/int(download_file_size) * 100))
-                return False
-            with download_path.open('wb') as f:
-                download_cancelled = copyfileobj(s, f, download_progress)
-                if download_cancelled:
-                    return 1
+                os.unlink(download_path)
+            except OSError:
+                logger.error(f'Could not remove existing download path {download_path}.')
+                return 1
+
+    if parsed_uri.scheme in ['http', 'https', 'ftp', 'ftps']:
+        try:
+            with urllib.request.urlopen(parsed_uri.geturl()) as s:
+                download_file_size = 0
+                try:
+                    download_file_size = s.headers['content-length']
+                except KeyError:
+                    pass
+                def download_progress(downloaded_bytes):
+                    if download_progress_callback:
+                        return download_progress_callback(int(downloaded_bytes), int(download_file_size))
+                    return False
+                with download_path.open('wb') as f:
+                    download_cancelled = copyfileobj(s, f, download_progress)
+                    if download_cancelled:
+                        logger.info(f'Download of file to {download_path} cancelled.')
+                        return 1
+        except urllib.error.HTTPError as e:
+            logger.error(f'HTTP Error {e.code} opening {parsed_uri.geturl()}')
+            return 1
     else:
         origin_file = pathlib.Path(parsed_uri.geturl()).resolve()
         if not origin_file.is_file():
@@ -149,17 +163,17 @@ def download_file(parsed_uri, download_path: pathlib.Path, download_progress_cal
     return 0
 
 
-def download_zip_file(parsed_uri, download_zip_path: pathlib.Path, download_progress_callback = None) -> int:
+def download_zip_file(parsed_uri, download_zip_path: pathlib.Path, force_overwrite: bool, download_progress_callback = None) -> int:
     """
     :param parsed_uri: uniform resource identifier to zip file to download
     :param download_zip_path: path to output zip file
     """
-    download_file_result = download_file(parsed_uri, download_zip_path, download_progress_callback)
+    download_file_result = download_file(parsed_uri, download_zip_path, force_overwrite, download_progress_callback)
     if download_file_result != 0:
         return download_file_result
 
     if not zipfile.is_zipfile(download_zip_path):
-        logger.error(f"File zip {download_zip_path} is invalid.")
+        logger.error(f"File zip {download_zip_path} is invalid. Try re-downloading the file.")
         download_zip_path.unlink()
         return 1
 
diff --git a/scripts/scrubbing/scrubbing_job.py b/scripts/scrubbing/scrubbing_job.py
deleted file mode 100755
index 11dbf5ea5a..0000000000
--- a/scripts/scrubbing/scrubbing_job.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-import os
-import sys
-cur_dir = cur_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.abspath(f'{cur_dir}/../build/package'))
-import util
-
-# Run validator
-success = True
-validator_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'validator.py')
-engine_root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
-if sys.platform == 'win32':
-    python = os.path.join(engine_root, 'python', 'python.cmd')
-else:
-    python = os.path.join(engine_root, 'python', 'python.sh')
-args = [python, validator_path, '--package_platform', 'Windows', '--package_type', 'all', engine_root]
-return_code = util.safe_execute_system_call(args)
-if return_code != 0:
-    success = False
-if not success:
-    util.error('Restricted file validator failed.')
-print('Restricted file validator completed successfully.')
diff --git a/scripts/scrubbing/validator.py b/scripts/scrubbing/validator.py
index 39f1a40a18..3b53417755 100755
--- a/scripts/scrubbing/validator.py
+++ b/scripts/scrubbing/validator.py
@@ -29,8 +29,6 @@ else:
     from io import StringIO
 
 import validator_data_LEGAL_REVIEW_REQUIRED # pull in the data we need to configure this tool
-sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'build', 'package'))
-from glob_to_regex import generate_include_exclude_regexes
 
 class Validator(object):
     """Class to contain the validator program"""
@@ -212,9 +210,6 @@ class Validator(object):
     # TODO: Perhaps the directories to skip should become a parameter so we can use the validator
     # on non-Lumberyard trees.
     def validate_directory_tree(self, root, platform):
-        prohibited_platforms = validator_data_LEGAL_REVIEW_REQUIRED.get_prohibited_platforms_for_package(self.options.package_platform)
-        (includes, excludes) = generate_include_exclude_regexes(self.options.package_platform, self.options.package_type, root, prohibited_platforms)
-
         """Walk from root to find all files to validate and call the validator on each file.
         Return 0 if no problems where found, and 1 if any validation failures occured."""
         counter = 0
@@ -227,28 +222,22 @@ class Validator(object):
             # First deal with the files in the current directory
             for filename in filenames:
                 filepath = os.path.join(dirname, filename)
-                include_match = includes.match(filepath)
-                exclude_match = excludes.match(filepath)
-                allowed = include_match and not exclude_match
-
-                if self.options.all or allowed:
-                    scanned += 1
-                    file_failed = self.validate_file(os.path.normpath(filepath))
-                    if file_failed:
-                        platform_failed = file_failed
-                    else:
-                        validations += 1
-                counter += 1
+                scanned += 1
+                file_failed = self.validate_file(os.path.normpath(filepath))
+                if file_failed:
+                    platform_failed = file_failed
+                else:
+                    validations += 1
 
             # Trim out allowlisted subdirectories in the current directory if allowed
             for name in bypassed_directories:
                 if name in dirnames:
                     dirnames.remove(name)
-        if counter == 0 or scanned == 0:
+        if scanned == 0:
             logging.error('No files scanned at target search directory: %s', root)
             platform_failed = 1
         else:
-            print('validated {} of {} package files ({} non-package files skipped)'.format(validations, scanned, counter - scanned))
+            print('validated {} of {} files'.format(validations, scanned))
         return platform_failed
 
 
@@ -387,8 +376,6 @@ def parse_options():
                       choices=platform_choices,
                       dest='package_platform',
                       help='Package platform to validate. Must be one of {}.'.format(platform_choices))
-    parser.add_option('--package_type', action='store', type='string', default='all', dest='package_type',
-                      help='Package type to validate.')
     parser.add_option('-s', '--store-exceptions', action='store', type='string', default='',
                       dest='exception_file',
                       help='Store list of lines that the validator gave exceptions to by matching accepted use patterns. These can be diffed with prior runs to see what is changing.')
@@ -430,7 +417,6 @@ def main():
 
     package_failed = 0
     package_platform = validator.options.package_platform
-    package_type = validator.options.package_type
     prohibited_platforms = validator_data_LEGAL_REVIEW_REQUIRED.get_prohibited_platforms_for_package(package_platform)
 
     if validator.options.exception_file != '':
@@ -441,19 +427,20 @@ def main():
             sys.exit(1)
 
     for platform in prohibited_platforms:
-        print('validating {} against {} for package platform {} package type {}'.format(args[0], platform, package_platform, package_type))
+        print('validating {} against {} for package platform {}'.format(args[0], platform, package_platform))
         platform_failed = validator.validate(platform)
         if platform_failed:
-            print('{} FAILED validation against {} for package platform {} package type {}'.format(args[0], platform, package_platform, package_type))
+            print('{} FAILED validation against {} for package platform {}'.format(args[0], platform, package_platform))
             package_failed = platform_failed
         else:
-            print('{} is VALIDATED against {} for package platform {} package type {}'.format(args[0], platform, package_platform, package_type))
+            print('{} is VALIDATED against {} for package platform {}'.format(args[0], platform, package_platform))
 
     if validator.options.exception_file != '':
         validator.exceptions_output.close()
 
     return package_failed
 
+
 if __name__ == '__main__':
     # pylint: disable-msg=C0103
     main_results = main()
diff --git a/scripts/signer/Platform/Linux/o3de-releases.gpg b/scripts/signer/Platform/Linux/o3de-releases.gpg
new file mode 100644
index 0000000000..b5fbb00392
Binary files /dev/null and b/scripts/signer/Platform/Linux/o3de-releases.gpg differ
diff --git a/scripts/signer/Platform/Linux/signer.sh b/scripts/signer/Platform/Linux/signer.sh
new file mode 100755
index 0000000000..b090012c5a
--- /dev/null
+++ b/scripts/signer/Platform/Linux/signer.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set +x
+
+export GPG_TTY=$(tty) # Required to pass valid tty during ssh sessions
+file=$1
+
+# dpkg-sig depends on a valid and trusted GPG private key. This also assumes a private key password has already been cached via gpg-agent
+# If you do need to pass a password, a gpg argument can be added to the command:
+#   dpkg-sig -k $fingerprint -g "--pinentry-mode loopback --passphrase $pass" --sign builder
+
+fingerprint=$(gpg --list-keys --with-colons  | awk -F: '/fpr:/ {print $10}' | tail -n1) #Get the last certificate in the list, which is the signing cert
+if [ -z $fingerprint ]; then
+    echo "No valid certs found. Exiting with 1"
+    exit 1
+fi
+echo "Signing with $fingerprint"
+dpkg-sig -k $fingerprint --sign builder $file
+dpkg-sig --verify $file && echo "Signing $file complete!"
diff --git a/scripts/build/package/util.py b/scripts/util/util.py
old mode 100755
new mode 100644
similarity index 78%
rename from scripts/build/package/util.py
rename to scripts/util/util.py
index bed2b79833..18970e55b9
--- a/scripts/build/package/util.py
+++ b/scripts/util/util.py
@@ -13,26 +13,11 @@ import sys
 import subprocess
 
 
-class LyBuildError(Exception):
-    def __init__(self, message):
-        super(LyBuildError, self).__init__(message)
-
-
-def ly_build_error(message):
-    raise LyBuildError(message)
-
-
 def error(message):
     print(('Error: {}'.format(message)))
     exit(1)
 
 
-# Exit with status code 0 means it won't fail the whole build process
-def safe_exit_with_error(message):
-    print(('Error: {}'.format(message)))
-    exit(0)
-
-
 def warn(message):
     print(('Warning: {}'.format(message)))
 
diff --git a/system_windows_pc.cfg b/system_windows_pc.cfg
index aa53ed9323..e34c35e581 100644
--- a/system_windows_pc.cfg
+++ b/system_windows_pc.cfg
@@ -15,3 +15,4 @@ r_ShadersAllowCompilation = 1
 
 -- Localization Settings
 sys_localization_format=0
+log_RemoteConsoleAllowedAddresses=127.0.0.1